diff options
| author |   Mate Bartus <mate.bartus@gmail.com> | 2015-06-26 01:02:04 +0200 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2015-06-26 01:04:36 +0200 |
| commit | b09293d5ff38633d506083cffc0a9dd2c98c15c4 (patch) | |
| tree | 33a330239989bcd84eb58d3bdf90b046a1788bac /phpBB/phpbb/di | |
| parent | [ticket/13961] Fix compatibility issue with parent class (diff) | |
| download | phpbb-b09293d5ff38633d506083cffc0a9dd2c98c15c4.tar.gz phpbb-b09293d5ff38633d506083cffc0a9dd2c98c15c4.tar.bz2 phpbb-b09293d5ff38633d506083cffc0a9dd2c98c15c4.zip | |
[ticket/13961] Move back service_collections under original namespace
PHPBB3-13961
Diffstat (limited to 'phpBB/phpbb/di')
| -rw-r--r-- | phpBB/phpbb/di/ordered_service_collection.php (renamed from phpBB/phpbb/di/service_collection/ordered_service_collection.php) | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/di/service_collection.php (renamed from phpBB/phpbb/di/service_collection/service_collection.php) | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/di/service_collection_iterator.php (renamed from phpBB/phpbb/di/service_collection/service_collection_iterator.php) | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/phpbb/di/service_collection/ordered_service_collection.php b/phpBB/phpbb/di/ordered_service_collection.php index 8d56434504..46f397a004 100644 --- a/phpBB/phpbb/di/service_collection/ordered_service_collection.php +++ b/phpBB/phpbb/di/ordered_service_collection.php @@ -11,7 +11,7 @@ * */ -namespace phpbb\di\service_collection; +namespace phpbb\di; use Symfony\Component\DependencyInjection\ContainerInterface; diff --git a/phpBB/phpbb/di/service_collection/service_collection.php b/phpBB/phpbb/di/service_collection.php index 8085128fed..82ca9bf679 100644 --- a/phpBB/phpbb/di/service_collection/service_collection.php +++ b/phpBB/phpbb/di/service_collection.php @@ -11,7 +11,7 @@ * */ -namespace phpbb\di\service_collection; +namespace phpbb\di; use Symfony\Component\DependencyInjection\ContainerInterface; diff --git a/phpBB/phpbb/di/service_collection/service_collection_iterator.php b/phpBB/phpbb/di/service_collection_iterator.php index 76e22b048e..0d031ab52d 100644 --- a/phpBB/phpbb/di/service_collection/service_collection_iterator.php +++ b/phpBB/phpbb/di/service_collection_iterator.php @@ -11,7 +11,7 @@ * */ -namespace phpbb\di\service_collection; +namespace phpbb\di; /** * Iterator which loads the services when they are requested @@ -19,14 +19,14 @@ namespace phpbb\di\service_collection; class service_collection_iterator extends \ArrayIterator { /** - * @var \phpbb\di\service_collection\service_collection + * @var \phpbb\di\service_collection */ protected $collection; /** * Construct an ArrayIterator for service_collection * - * @param \phpbb\di\service_collection\service_collection $collection The collection to iterate over + * @param \phpbb\di\service_collection $collection The collection to iterate over * @param int $flags Flags to control the behaviour of the ArrayObject object. * @see ArrayObject::setFlags() */ |