makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-25 12:48:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12575] Use strict comparison
  [ticket/12575] Add missing property
  [ticket/12575] Usethe new header
  [ticket/12575] Fix 2 typos in comments
  [ticket/12575] Fix typos in comments
  [ticket/12575] Skip sniffer issue triggered by the solution of a php bug
  [ticket/12575] Remove  inline assignments
  [ticket/12575] Fix the tests
  [ticket/12575] Move service_collection_iterator to its own file
  [ticket/12575] Speed up load_class()
This commit is contained in:
Andreas Fischer 2014-06-14 12:45:47 +02:00
commit 00b0172962
2 changed files with 131 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
phpBB/phpbb/di/service_collection.php
View file

@ -20,6 +20,11 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
*/ */
class service_collection extends \ArrayObject class service_collection extends \ArrayObject
{ {
/**
* @var \Symfony\Component\DependencyInjection\ContainerInterface
*/
protected $container;
/** /**
* Constructor * Constructor
* *
@ -30,6 +35,44 @@ class service_collection extends \ArrayObject
$this->container = $container; $this->container = $container;
} }
/**
* {@inheritdoc}
*/
public function getIterator()
{
return new service_collection_iterator($this->container, $this);
}
// Because of a PHP issue we have to redefine offsetExists
// (even with a call to the parent):
// https://bugs.php.net/bug.php?id=66834
// https://bugs.php.net/bug.php?id=67067
// But it triggers a sniffer issue that we have to skip
// @codingStandardsIgnoreStart
/**
* {@inheritdoc}
*/
public function offsetExists($index)
{
return parent::offsetExists($index);
}
// @codingStandardsIgnoreEnd
/**
* {@inheritdoc}
*/
public function offsetGet($index)
{
$task = parent::offsetGet($index);
if ($task === null)
{
$task = $this->container->get($index);
$this->offsetSet($index, $task);
}
return $task;
}
/** /**
* Add a service to the collection * Add a service to the collection
* *
@ -38,8 +81,6 @@ class service_collection extends \ArrayObject
*/ */
public function add($name) public function add($name)
{ {
$task = $this->container->get($name); $this->offsetSet($name, null);
$this->offsetSet($name, $task);
} }
} }

87
phpBB/phpbb/di/service_collection_iterator.php Normal file
View file

@ -0,0 +1,87 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
namespace phpbb\di;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Iterator which loads the services when they are requested
*/
class service_collection_iterator extends \ArrayIterator
{
/**
* @var \Symfony\Component\DependencyInjection\ContainerInterface
*/
protected $container;
/**
* Construct an ArrayIterator for service_collection
*
* @param ContainerInterface $container Container object
* @param array $array The array or object to be iterated on.
* @param int $flags Flags to control the behaviour of the ArrayObject object.
* @see ArrayObject::setFlags()
*/
public function __construct(ContainerInterface $container, $array = array(), $flags = 0)
{
parent::__construct($array, $flags);
$this->container = $container;
}
/**
* {@inheritdoc}
*/
public function offsetGet($index)
{
$task = parent::offsetGet($index);
if ($task === null)
{
$task = $this->container->get($index);
$this->offsetSet($index, $task);
}
return $task;
}
// Because of a PHP issue we have to redefine offsetExists
// (even with a call to the parent):
// https://bugs.php.net/bug.php?id=66834
// https://bugs.php.net/bug.php?id=67067
// But it triggers a sniffer issue that we have to skip
// @codingStandardsIgnoreStart
/**
* {@inheritdoc}
*/
public function offsetExists($index)
{
parent::offsetExists($index);
}
// @codingStandardsIgnoreEnd
/**
* {@inheritdoc}
*/
public function current()
{
$task = parent::current();
if ($task === null)
{
$name = $this->key();
$task = $this->container->get($name);
$this->offsetSet($name, $task);
}
return $task;
}
}