[TASK] Change namespace and classname of ObjectStorage
authorAlexander Schnitzler <alex.schnitzler@typovision.de>
Wed, 31 Oct 2012 10:53:42 +0000 (11:53 +0100)
committerAlexander Schnitzler <typo3@alexanderschnitzler.de>
Wed, 31 Oct 2012 11:00:20 +0000 (12:00 +0100)
Releases: 6.0
Fixes: #42549
Change-Id: I6ff8f42a53e47fe2e5d83a8a3c4baec8753a5291
Reviewed-on: http://review.typo3.org/16071
Reviewed-by: Alexander Schnitzler
Tested-by: Alexander Schnitzler
29 files changed:
typo3/sysext/extbase/Classes/Domain/Model/BackendUserGroup.php
typo3/sysext/extbase/Classes/Domain/Model/Category.php
typo3/sysext/extbase/Classes/Domain/Model/FrontendUser.php
typo3/sysext/extbase/Classes/Domain/Model/FrontendUserGroup.php
typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php
typo3/sysext/extbase/Classes/Persistence/Generic/BackendInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/IdentityMap.php
typo3/sysext/extbase/Classes/Persistence/Generic/LazyObjectStorage.php
typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapper.php
typo3/sysext/extbase/Classes/Persistence/Generic/PersistenceManager.php
typo3/sysext/extbase/Classes/Persistence/Generic/Session.php
typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php
typo3/sysext/extbase/Classes/Persistence/Repository.php
typo3/sysext/extbase/Classes/Property/Mapper.php
typo3/sysext/extbase/Classes/Property/TypeConverter/ObjectStorageConverter.php
typo3/sysext/extbase/Classes/Service/TypeHandlingService.php
typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php
typo3/sysext/extbase/Classes/Validation/Validator/AbstractCompositeValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/GenericObjectValidator.php
typo3/sysext/extbase/Tests/Functional/Domain/Model/FileContextTest.php
typo3/sysext/extbase/Tests/Functional/Domain/Model/Fixture/FileContext.php
typo3/sysext/extbase/Tests/Unit/Domain/Model/BackendUserGroupTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Model/CategoryTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Model/FrontendUserGroupTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Model/FrontendUserTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/Mapper/DataMapFactoryTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/ObjectStorageTest.php
typo3/sysext/extbase/Tests/Unit/Service/TypeHandlingServiceTest.php
typo3/sysext/extbase/ext_autoload.php [deleted file]

index 268be09..fe0819d 100644 (file)
@@ -52,7 +52,7 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        protected $description = '';
 
        /**
-        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup>
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup>
         */
        protected $subGroups;
 
@@ -125,7 +125,7 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
         * Constructs this backend usergroup
         */
        public function __construct() {
-               $this->subGroups = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $this->subGroups = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
        }
 
        /**
@@ -169,10 +169,10 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        /**
         * Setter for the sub groups
         *
-        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $subGroups
+        * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $subGroups
         * @return void
         */
-       public function setSubGroups(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $subGroups) {
+       public function setSubGroups(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $subGroups) {
                $this->subGroups = $subGroups;
        }
 
@@ -209,7 +209,7 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        /**
         * Getter of sub groups
         *
-        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage
+        * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage
         */
        public function getSubGroups() {
                return $this->subGroups;
index e693f1c..efc9c7a 100755 (executable)
@@ -51,7 +51,7 @@ class Category extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        protected $parent = NULL;
 
        /**
-        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\AbstractEntity>
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\AbstractEntity>
         * @lazy
         */
        protected $items = NULL;
@@ -64,13 +64,13 @@ class Category extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        }
 
        /**
-        * Initializes all \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage properties.
+        * Initializes all \TYPO3\CMS\Extbase\Persistence\ObjectStorage properties.
         *
         * @return void
         * @api
         */
        protected function initStorageObjects() {
-               $this->items = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $this->items = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
        }
 
        /**
@@ -142,7 +142,7 @@ class Category extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        /**
         * Returns the items within this category.
         *
-        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage the items, might be empty
+        * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage the items, might be empty
         * @api
         */
        public function getItems() {
@@ -152,11 +152,11 @@ class Category extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        /**
         * Sets the items within this category.
         *
-        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $items
+        * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $items
         * @return void
         * @api
         */
-       public function setItems(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $items) {
+       public function setItems(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $items) {
                $this->items = $items;
        }
 
index 2619738..2d36a58 100644 (file)
@@ -43,7 +43,7 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        protected $password = '';
 
        /**
-        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup>
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup>
         */
        protected $usergroup;
 
@@ -147,7 +147,7 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        public function __construct($username = '', $password = '') {
                $this->username = $username;
                $this->password = $password;
-               $this->usergroup = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $this->usergroup = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
        }
 
        /**
@@ -196,11 +196,11 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
         * Sets the usergroups. Keep in mind that the property is called "usergroup"
         * although it can hold several usergroups.
         *
-        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $usergroup
+        * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $usergroup
         * @return void
         * @api
         */
-       public function setUsergroup(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $usergroup) {
+       public function setUsergroup(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $usergroup) {
                $this->usergroup = $usergroup;
        }
 
@@ -230,7 +230,7 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
         * Returns the usergroups. Keep in mind that the property is called "usergroup"
         * although it can hold several usergroups.
         *
-        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage An object storage containing the usergroup
+        * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage An object storage containing the usergroup
         * @api
         */
        public function getUsergroup() {
index 5948d96..00bc1dd 100644 (file)
@@ -48,7 +48,7 @@ class FrontendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        protected $description = '';
 
        /**
-        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup>
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup>
         */
        protected $subgroup;
 
@@ -59,7 +59,7 @@ class FrontendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
         */
        public function __construct($title = '') {
                $this->setTitle($title);
-               $this->subgroup = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $this->subgroup = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
        }
 
        /**
@@ -129,11 +129,11 @@ class FrontendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
         * Sets the subgroups. Keep in mind that the property is called "subgroup"
         * although it can hold several subgroups.
         *
-        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $subgroup An object storage containing the subgroups to add
+        * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $subgroup An object storage containing the subgroups to add
         * @return void
         * @api
         */
-       public function setSubgroup(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $subgroup) {
+       public function setSubgroup(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $subgroup) {
                $this->subgroup = $subgroup;
        }
 
@@ -163,7 +163,7 @@ class FrontendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
         * Returns the subgroups. Keep in mind that the property is called "subgroup"
         * although it can hold several subgroups.
         *
-        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage An object storage containing the subgroups
+        * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage An object storage containing the subgroups
         * @api
         */
        public function getSubgroup() {
index 3646b78..068e268 100644 (file)
@@ -38,12 +38,12 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
        protected $session;
 
        /**
-        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage
         */
        protected $aggregateRootObjects;
 
        /**
-        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage
         */
        protected $visitedDuringPersistence;
 
@@ -95,7 +95,7 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
        protected $signalSlotDispatcher;
 
        /**
-        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage
         */
        protected $deletedObjects;
 
@@ -111,7 +111,7 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
                if ($frameworkConfiguration['persistence']['updateReferenceIndex'] === '1') {
                        $this->referenceIndex = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Database\\ReferenceIndex');
                }
-               $this->deletedObjects = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $this->deletedObjects = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
        }
 
        /**
@@ -331,20 +331,20 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
        /**
         * Sets the aggregate root objects
         *
-        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $objects
+        * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $objects
         * @return void
         */
-       public function setAggregateRootObjects(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $objects) {
+       public function setAggregateRootObjects(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $objects) {
                $this->aggregateRootObjects = $objects;
        }
 
        /**
         * Sets the deleted objects
         *
-        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $objects
+        * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $objects
         * @return void
         */
-       public function setDeletedObjects(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $objects) {
+       public function setDeletedObjects(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $objects) {
                $this->deletedObjects = $objects;
        }
 
@@ -364,7 +364,7 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
         * @return void
         */
        protected function persistObjects() {
-               $this->visitedDuringPersistence = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $this->visitedDuringPersistence = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                foreach ($this->aggregateRootObjects as $object) {
                        if (!$this->identityMap->hasObject($object)) {
                                $this->insertObject($object);
@@ -394,7 +394,7 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
                                continue;
                        }
                        $columnMap = $dataMap->getColumnMap($propertyName);
-                       if ($propertyValue instanceof \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage) {
+                       if ($propertyValue instanceof \TYPO3\CMS\Extbase\Persistence\ObjectStorage) {
                                if ($object->_isNew() || $propertyValue->_isDirty()) {
                                        $this->persistObjectStorage($propertyValue, $object, $propertyName, $row);
                                }
@@ -448,13 +448,13 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
         * gets persisted immediately. Objects which were removed from the property were detached from the parent object. They will not be
         * deleted by default. You have to annotate the property with "@cascade remove" if you want them to be deleted as well.
         *
-        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $objectStorage The object storage to be persisted.
+        * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $objectStorage The object storage to be persisted.
         * @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject The parent object. One of the properties holds the object storage.
         * @param string $propertyName The name of the property holding the object storage.
         * @param array $row The row array of the parent object to be persisted. It's passed by reference and gets filled with either a comma separated list of uids (csv) or the number of contained objects.
         * @return void
         */
-       protected function persistObjectStorage(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $objectStorage, \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject, $propertyName, array &$row) {
+       protected function persistObjectStorage(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $objectStorage, \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject, $propertyName, array &$row) {
                $className = get_class($parentObject);
                $columnMap = $this->dataMapper->getDataMap($className)->getColumnMap($propertyName);
                $propertyMetaData = $this->reflectionService->getClassSchema($className)->getProperty($propertyName);
@@ -766,7 +766,7 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
                        $this->removeObject($object);
                        $this->identityMap->unregisterObject($object);
                }
-               $this->deletedObjects = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $this->deletedObjects = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
        }
 
        /**
index 5df2af9..707192a 100644 (file)
@@ -34,18 +34,18 @@ interface BackendInterface
        /**
         * Sets the aggregate root objects
         *
-        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $objects
+        * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $objects
         * @return void
         */
-       public function setAggregateRootObjects(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $objects);
+       public function setAggregateRootObjects(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $objects);
 
        /**
         * Sets the deleted objects
         *
-        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $objects
+        * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $objects
         * @return void
         */
-       public function setDeletedObjects(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $objects);
+       public function setDeletedObjects(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $objects);
 
        /**
         * Commits the current persistence session
index 4c55140..adc8568 100644 (file)
@@ -35,7 +35,7 @@ namespace TYPO3\CMS\Extbase\Persistence\Generic;
 class IdentityMap implements \TYPO3\CMS\Core\SingletonInterface {
 
        /**
-        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage
         */
        protected $objectMap;
 
@@ -50,7 +50,7 @@ class IdentityMap implements \TYPO3\CMS\Core\SingletonInterface {
         * @author Karsten Dambekalns <karsten@typo3.org>
         */
        public function __construct() {
-               $this->objectMap = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $this->objectMap = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
        }
 
        /**
index d08cb1f..57a56b6 100644 (file)
@@ -30,7 +30,7 @@ namespace TYPO3\CMS\Extbase\Persistence\Generic;
  * A proxy that can replace any object and replaces itself in it's parent on
  * first access (call, get, set, isset, unset).
  */
-class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage implements \TYPO3\CMS\Extbase\Persistence\Generic\LoadingStrategyInterface {
+class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\ObjectStorage implements \TYPO3\CMS\Extbase\Persistence\Generic\LoadingStrategyInterface {
 
        /**
         * This field is only needed to make debugging easier:
@@ -125,7 +125,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
 
        // Delegation to the ObjectStorage methods below
        /**
-        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::addAll
+        * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::addAll
         */
        public function addAll($storage) {
                $this->initialize();
@@ -133,7 +133,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::attach
+        * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::attach
         */
        public function attach($object, $data = NULL) {
                $this->initialize();
@@ -141,7 +141,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::contains
+        * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::contains
         */
        public function contains($object) {
                $this->initialize();
@@ -170,7 +170,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::current
+        * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::current
         */
        public function current() {
                $this->initialize();
@@ -178,7 +178,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::detach
+        * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::detach
         */
        public function detach($object) {
                $this->initialize();
@@ -186,7 +186,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::key
+        * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::key
         */
        public function key() {
                $this->initialize();
@@ -194,7 +194,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::next
+        * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::next
         */
        public function next() {
                $this->initialize();
@@ -202,7 +202,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::offsetExists
+        * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::offsetExists
         */
        public function offsetExists($object) {
                $this->initialize();
@@ -210,7 +210,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::offsetGet
+        * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::offsetGet
         */
        public function offsetGet($object) {
                $this->initialize();
@@ -218,7 +218,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::offsetSet
+        * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::offsetSet
         */
        public function offsetSet($object, $info) {
                $this->initialize();
@@ -226,7 +226,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::offsetUnset
+        * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::offsetUnset
         */
        public function offsetUnset($object) {
                $this->initialize();
@@ -234,7 +234,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::removeAll
+        * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::removeAll
         */
        public function removeAll($storage) {
                $this->initialize();
@@ -242,7 +242,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::rewind
+        * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::rewind
         */
        public function rewind() {
                $this->initialize();
@@ -250,7 +250,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::valid
+        * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::valid
         */
        public function valid() {
                $this->initialize();
@@ -258,7 +258,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::toArray
+        * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::toArray
         */
        public function toArray() {
                $this->initialize();
index 8d60931..7856cfa 100644 (file)
@@ -272,7 +272,7 @@ class DataMapper implements \TYPO3\CMS\Core\SingletonInterface {
                                        break;
                                case 'SplObjectStorage':
 
-                               case 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage':
+                               case 'TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage':
                                        $propertyValue = $this->mapResultToPropertyValue($object, $propertyName, $this->fetchRelated($object, $propertyName, $row[$columnName]));
                                        break;
                                default:
@@ -318,7 +318,7 @@ class DataMapper implements \TYPO3\CMS\Core\SingletonInterface {
        public function fetchRelated(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject, $propertyName, $fieldValue = '', $enableLazyLoading = TRUE) {
                $propertyMetaData = $this->reflectionService->getClassSchema(get_class($parentObject))->getProperty($propertyName);
                if ($enableLazyLoading === TRUE && $propertyMetaData['lazy']) {
-                       if ($propertyMetaData['type'] === 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage') {
+                       if ($propertyMetaData['type'] === 'TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage') {
                                $result = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\LazyObjectStorage', $parentObject, $propertyName, $fieldValue);
                        } else {
                                if (empty($fieldValue)) {
@@ -453,15 +453,15 @@ class DataMapper implements \TYPO3\CMS\Core\SingletonInterface {
                        $propertyValue = $result;
                } else {
                        $propertyMetaData = $this->reflectionService->getClassSchema(get_class($parentObject))->getProperty($propertyName);
-                       if (in_array($propertyMetaData['type'], array('array', 'ArrayObject', 'SplObjectStorage', 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage'))) {
+                       if (in_array($propertyMetaData['type'], array('array', 'ArrayObject', 'SplObjectStorage', 'TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage'))) {
                                $objects = array();
                                foreach ($result as $value) {
                                        $objects[] = $value;
                                }
                                if ($propertyMetaData['type'] === 'ArrayObject') {
                                        $propertyValue = new \ArrayObject($objects);
-                               } elseif ($propertyMetaData['type'] === 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage') {
-                                       $propertyValue = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+                               } elseif ($propertyMetaData['type'] === 'TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage') {
+                                       $propertyValue = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                                        foreach ($objects as $object) {
                                                $propertyValue->attach($object);
                                        }
index e649e20..2d102a1 100644 (file)
@@ -174,8 +174,8 @@ class PersistenceManager implements \TYPO3\CMS\Extbase\Persistence\PersistenceMa
         * @api
         */
        public function persistAll() {
-               $aggregateRootObjects = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
-               $removedObjects = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $aggregateRootObjects = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
+               $removedObjects = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                // fetch and inspect objects from all known repositories
                foreach ($this->repositoryClassNames as $repositoryClassName) {
                        $repository = $this->objectManager->get($repositoryClassName);
index 8447e66..2c7c49e 100644 (file)
@@ -32,7 +32,7 @@ class Session implements \TYPO3\CMS\Core\SingletonInterface {
         * Objects which were reconstituted. The relevant objects are registered by
         * the Tx_Extbase_Persistence_Mapper_DataMapper.
         *
-        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage
         */
        protected $reconstitutedObjects;
 
@@ -40,7 +40,7 @@ class Session implements \TYPO3\CMS\Core\SingletonInterface {
         * Constructs a new Session
         */
        public function __construct() {
-               $this->reconstitutedObjects = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $this->reconstitutedObjects = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
        }
 
        /**
index 53c29c6..be3e900 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Extbase\Persistence\Generic;
+namespace TYPO3\CMS\Extbase\Persistence;
 
 /***************************************************************
  *  Copyright notice
@@ -39,7 +39,7 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, \TYPO3\CMS\E
         *
         * @var string
         */
-       private $warning = 'You should never see this warning. If you do, you probably used PHP array functions like current() on the TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage. To retrieve the first result, you can use the rewind() and current() methods.';
+       private $warning = 'You should never see this warning. If you do, you probably used PHP array functions like current() on the TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage. To retrieve the first result, you can use the rewind() and current() methods.';
 
        /**
         * An array holding the objects and the stored information. The key of the array items ist the
@@ -220,10 +220,10 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, \TYPO3\CMS\E
        /**
         * Adds all objects-data pairs from a different storage in the current storage.
         *
-        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $objectStorage
+        * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $objectStorage
         * @return void
         */
-       public function addAll(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $objectStorage) {
+       public function addAll(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $objectStorage) {
                foreach ($objectStorage as $object) {
                        $this->attach($object, $objectStorage->getInfo());
                }
@@ -232,10 +232,10 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, \TYPO3\CMS\E
        /**
         * Removes objects contained in another storage from the current storage.
         *
-        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $objectStorage The storage containing the elements to remove.
+        * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $objectStorage The storage containing the elements to remove.
         * @return void
         */
-       public function removeAll(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $objectStorage) {
+       public function removeAll(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $objectStorage) {
                foreach ($objectStorage as $object) {
                        $this->detach($object);
                }
index 41e3b31..7dc70b5 100644 (file)
@@ -28,14 +28,14 @@ class Repository implements \TYPO3\CMS\Extbase\Persistence\RepositoryInterface,
        /**
         * Objects of this repository
         *
-        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage
         */
        protected $addedObjects;
 
        /**
         * Objects removed but not found in $this->addedObjects at removal time
         *
-        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage
         */
        protected $removedObjects;
 
@@ -85,8 +85,8 @@ class Repository implements \TYPO3\CMS\Extbase\Persistence\RepositoryInterface,
         * @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
         */
        public function __construct(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager = NULL) {
-               $this->addedObjects = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
-               $this->removedObjects = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $this->addedObjects = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
+               $this->removedObjects = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $nsSeparator = strpos($this->getRepositoryClassName(), '\\') !== FALSE ? '\\\\' : '_';
                $this->objectType = preg_replace(array('/' . $nsSeparator . 'Repository' . $nsSeparator . '(?!.*' . $nsSeparator . 'Repository' . $nsSeparator . ')/', '/Repository$/'), array($nsSeparator . 'Model' . $nsSeparator, ''), $this->getRepositoryClassName());
                if ($objectManager === NULL) {
@@ -251,17 +251,17 @@ class Repository implements \TYPO3\CMS\Extbase\Persistence\RepositoryInterface,
         * added to the repository. Those are only objects *added*, not objects
         * fetched from the underlying storage.
         *
-        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage the objects
+        * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage the objects
         */
        public function getAddedObjects() {
                return $this->addedObjects;
        }
 
        /**
-        * Returns an \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage with objects remove()d from the repository
+        * Returns an \TYPO3\CMS\Extbase\Persistence\ObjectStorage with objects remove()d from the repository
         * that had been persisted to the storage layer before.
         *
-        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage the objects
+        * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage the objects
         */
        public function getRemovedObjects() {
                return $this->removedObjects;
@@ -296,7 +296,7 @@ class Repository implements \TYPO3\CMS\Extbase\Persistence\RepositoryInterface,
         * @api
         */
        public function removeAll() {
-               $this->addedObjects = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $this->addedObjects = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                foreach ($this->findAll() as $object) {
                        $this->remove($object);
                }
index f915efc..45e21ff 100644 (file)
@@ -222,7 +222,7 @@ class Mapper implements \TYPO3\CMS\Core\SingletonInterface {
                        } else {
                                if ($targetClassSchema !== NULL && $targetClassSchema->hasProperty($propertyName)) {
                                        $propertyMetaData = $targetClassSchema->getProperty($propertyName);
-                                       if (in_array($propertyMetaData['type'], array('array', 'ArrayObject', 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage')) && (strpos($propertyMetaData['elementType'], '_') !== FALSE || $propertyValue === '')) {
+                                       if (in_array($propertyMetaData['type'], array('array', 'ArrayObject', 'TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage')) && (strpos($propertyMetaData['elementType'], '_') !== FALSE || $propertyValue === '')) {
                                                $objects = array();
                                                if (is_array($propertyValue)) {
                                                        foreach ($propertyValue as $value) {
@@ -235,8 +235,8 @@ class Mapper implements \TYPO3\CMS\Core\SingletonInterface {
                                                // make sure we hand out what is expected
                                                if ($propertyMetaData['type'] === 'ArrayObject') {
                                                        $propertyValue = new \ArrayObject($objects);
-                                               } elseif ($propertyMetaData['type'] === 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage') {
-                                                       $propertyValue = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+                                               } elseif ($propertyMetaData['type'] === 'TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage') {
+                                                       $propertyValue = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                                                        foreach ($objects as $object) {
                                                                $propertyValue->attach($object);
                                                        }
index 279b7bc..770afba 100644 (file)
@@ -49,7 +49,7 @@ class ObjectStorageConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\A
        /**
         * @var string
         */
-       protected $targetType = 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage';
+       protected $targetType = 'TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage';
 
        /**
         * @var integer
@@ -81,7 +81,7 @@ class ObjectStorageConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\A
         * @api
         */
        public function convertFrom($source, $targetType, array $convertedChildProperties = array(), \TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface $configuration = NULL) {
-               $objectStorage = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $objectStorage = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                foreach ($convertedChildProperties as $subProperty) {
                        $objectStorage->attach($subProperty);
                }
index 3ef47d8..f1ac7ee 100644 (file)
@@ -50,7 +50,7 @@ class TypeHandlingService implements \TYPO3\CMS\Core\SingletonInterface {
                if (preg_match(self::PARSE_TYPE_PATTERN, $type, $matches)) {
                        $type = self::normalizeType($matches['type']);
                        $elementType = isset($matches['elementType']) ? self::normalizeType($matches['elementType']) : NULL;
-                       if ($elementType !== NULL && !in_array($type, array('array', 'ArrayObject', 'SplObjectStorage', 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage', 'Tx_Extbase_Persistence_ObjectStorage'))) {
+                       if ($elementType !== NULL && !in_array($type, array('array', 'ArrayObject', 'SplObjectStorage', 'TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage', 'Tx_Extbase_Persistence_ObjectStorage'))) {
                                throw new \InvalidArgumentException(
                                        'Type "' . $type . '" must not have an element type hint (' . $elementType . ').',
                                        1309255650
index d834175..de1dda0 100644 (file)
@@ -35,7 +35,7 @@ class DebuggerUtility {
        const PLAINTEXT_INDENT = '   ';
        const HTML_INDENT = '&nbsp;&nbsp;&nbsp;';
        /**
-        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage
         */
        static protected $renderedObjects;
 
@@ -82,7 +82,7 @@ class DebuggerUtility {
         * @return void
         */
        static protected function clearState() {
-               self::$renderedObjects = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               self::$renderedObjects = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
        }
 
        /**
@@ -240,7 +240,7 @@ class DebuggerUtility {
                                $persistenceType = 'persistent';
                        }
                }
-               if ($object instanceof \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage && $object->_isDirty()) {
+               if ($object instanceof \TYPO3\CMS\Extbase\Persistence\ObjectStorage && $object->_isDirty()) {
                        $persistenceType = 'modified';
                }
                if ($object instanceof \TYPO3\CMS\Extbase\DomainObject\AbstractEntity) {
@@ -293,7 +293,7 @@ class DebuggerUtility {
         */
        static protected function renderContent($object, $level, $plainText, $ansiColors) {
                $dump = '';
-               if ($object instanceof \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage || $object instanceof \Iterator) {
+               if ($object instanceof \TYPO3\CMS\Extbase\Persistence\ObjectStorage || $object instanceof \Iterator) {
                        $dump .= self::renderCollection($object, $level, $plainText, $ansiColors);
                } else {
                        self::$renderedObjects->attach($object);
index 74a82a1..3fdcf3e 100644 (file)
@@ -39,7 +39,7 @@ abstract class AbstractCompositeValidator implements \TYPO3\CMS\Extbase\Validati
        protected $options = array();
 
        /**
-        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage
         */
        protected $validators;
 
@@ -52,7 +52,7 @@ abstract class AbstractCompositeValidator implements \TYPO3\CMS\Extbase\Validati
         * Constructs the validator conjunction
         */
        public function __construct() {
-               $this->validators = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $this->validators = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
        }
 
        /**
index b2adfee..0c285da 100644 (file)
@@ -39,7 +39,7 @@ class GenericObjectValidator extends \TYPO3\CMS\Extbase\Validation\Validator\Abs
        protected $propertyValidators = array();
 
        /**
-        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage
         */
        static protected $instancesCurrentlyUnderValidation;
 
@@ -55,7 +55,7 @@ class GenericObjectValidator extends \TYPO3\CMS\Extbase\Validation\Validator\Abs
        public function validate($object) {
                $messages = new \TYPO3\CMS\Extbase\Error\Result();
                if (self::$instancesCurrentlyUnderValidation === NULL) {
-                       self::$instancesCurrentlyUnderValidation = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+                       self::$instancesCurrentlyUnderValidation = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                }
                if ($object === NULL) {
                        return $messages;
@@ -198,7 +198,7 @@ class GenericObjectValidator extends \TYPO3\CMS\Extbase\Validation\Validator\Abs
         */
        public function addPropertyValidator($propertyName, \TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface $validator) {
                if (!isset($this->propertyValidators[$propertyName])) {
-                       $this->propertyValidators[$propertyName] = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+                       $this->propertyValidators[$propertyName] = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                }
                $this->propertyValidators[$propertyName]->attach($validator);
        }
index c26ac58..e2016b7 100644 (file)
@@ -90,7 +90,7 @@ class FileContextTest extends \Tx_Extbase_Tests_Functional_BaseTestCase {
                );
                /** @var $fixture \TYPO3\CMS\Extbase\Tests\Functional\Domain\Model\Fixture\FileContext */
                $fixture = $this->propertyMapper->convert($data, 'TYPO3\\CMS\\Extbase\\Tests\\Functional\\Domain\\Model\\Fixture\\FileContext', $this->propertyMapperConfiguration);
-               $this->assertInstanceOf('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage', $fixture->getFiles());
+               $this->assertInstanceOf('TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage', $fixture->getFiles());
                $this->assertEquals(2, $fixture->getFiles()->count());
                $fixture->getFiles()->rewind();
                $this->assertEquals(1, $fixture->getFiles()->current()->getObject()->getUid());
@@ -125,7 +125,7 @@ class FileContextTest extends \Tx_Extbase_Tests_Functional_BaseTestCase {
                );
                /** @var $fixture \TYPO3\CMS\Extbase\Tests\Functional\Domain\Model\Fixture\FileContext */
                $fixture = $this->propertyMapper->convert($data, 'TYPO3\\CMS\\Extbase\\Tests\\Functional\\Domain\\Model\\Fixture\\FileContext', $this->propertyMapperConfiguration);
-               $this->assertInstanceOf('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage', $fixture->getFileReferences());
+               $this->assertInstanceOf('TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage', $fixture->getFileReferences());
                $this->assertEquals(2, $fixture->getFileReferences()->count());
                $fixture->getFileReferences()->rewind();
                $this->assertInstanceOf('TYPO3\\CMS\\Core\\Resource\\FileReference', $fixture->getFileReferences()->current()->getObject());
@@ -171,7 +171,7 @@ class FileContextTest extends \Tx_Extbase_Tests_Functional_BaseTestCase {
                );
                /** @var $fixture \TYPO3\CMS\Extbase\Tests\Functional\Domain\Model\Fixture\FileContext */
                $fixture = $this->propertyMapper->convert($data, 'TYPO3\\CMS\\Extbase\\Tests\\Functional\\Domain\\Model\\Fixture\\FileContext', $this->propertyMapperConfiguration);
-               $this->assertInstanceOf('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage', $fixture->getFolders());
+               $this->assertInstanceOf('TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage', $fixture->getFolders());
                $this->assertEquals(2, $fixture->getFolders()->count());
                $fixture->getFolders()->rewind();
                $this->assertInstanceOf('TYPO3\\CMS\\Extbase\\Domain\\Model\\Folder', $fixture->getFolders()->current());
@@ -207,7 +207,7 @@ class FileContextTest extends \Tx_Extbase_Tests_Functional_BaseTestCase {
                );
                /** @var $fixture \TYPO3\CMS\Extbase\Tests\Functional\Domain\Model\Fixture\FileContext */
                $fixture = $this->propertyMapper->convert($data, 'TYPO3\\CMS\\Extbase\\Tests\\Functional\\Domain\\Model\\Fixture\\FileContext', $this->propertyMapperConfiguration);
-               $this->assertInstanceOf('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage', $fixture->getStaticFileCollections());
+               $this->assertInstanceOf('TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage', $fixture->getStaticFileCollections());
                $this->assertEquals(1, $fixture->getStaticFileCollections()->count());
                $this->assertInstanceOf('TYPO3\\CMS\\Extbase\\Domain\\Model\\StaticFileCollection', $fixture->getStaticFileCollections()->current());
                $this->assertEquals(2, $fixture->getStaticFileCollections()->current()->getObject()->getUid());
@@ -237,7 +237,7 @@ class FileContextTest extends \Tx_Extbase_Tests_Functional_BaseTestCase {
                );
                /** @var $fixture \TYPO3\CMS\Extbase\Tests\Functional\Domain\Model\Fixture\FileContext */
                $fixture = $this->propertyMapper->convert($data, 'TYPO3\\CMS\\Extbase\\Tests\\Functional\\Domain\\Model\\Fixture\\FileContext', $this->propertyMapperConfiguration);
-               $this->assertInstanceOf('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage', $fixture->getFolderBasedFileCollections());
+               $this->assertInstanceOf('TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage', $fixture->getFolderBasedFileCollections());
                $this->assertEquals(1, $fixture->getFolderBasedFileCollections()->count());
                $this->assertInstanceOf('TYPO3\\CMS\\Extbase\\Domain\\Model\\FolderBasedFileCollection', $fixture->getFolderBasedFileCollections()->current());
                $this->assertEquals(1, $fixture->getFolderBasedFileCollections()->current()->getObject()->getUid());
index 174a2f0..da75eab 100644 (file)
@@ -38,7 +38,7 @@ class FileContext extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        protected $file;
 
        /**
-        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\File>
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\File>
         */
        protected $files;
 
@@ -48,7 +48,7 @@ class FileContext extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        protected $fileReference;
 
        /**
-        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FileReference>
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FileReference>
         */
        protected $fileReferences;
 
@@ -58,7 +58,7 @@ class FileContext extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        protected $staticFileCollection;
 
        /**
-        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\StaticFileCollection>
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\StaticFileCollection>
         */
        protected $staticFileCollections;
 
@@ -68,7 +68,7 @@ class FileContext extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        protected $folderBasedFileCollection;
 
        /**
-        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FolderBasedFileCollection>
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FolderBasedFileCollection>
         */
        protected $folderBasedFileCollections;
 
@@ -78,16 +78,16 @@ class FileContext extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        protected $folder;
 
        /**
-        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\Folder>
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\Folder>
         */
        protected $folders;
 
        public function __construct() {
-               $this->files = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
-               $this->fileReferences = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
-               $this->staticFileCollections = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
-               $this->folderBasedFileCollections = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
-               $this->folders = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $this->files = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
+               $this->fileReferences = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
+               $this->staticFileCollections = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
+               $this->folderBasedFileCollections = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
+               $this->folders = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
        }
 
        /**
@@ -108,16 +108,16 @@ class FileContext extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        }
 
        /**
-        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\File>
+        * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\File>
         */
        public function getFiles() {
                return $this->files;
        }
 
        /**
-        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\File> $files
+        * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\File> $files
         */
-       public function setFiles(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $files) {
+       public function setFiles(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $files) {
                $this->files = $files;
        }
 
@@ -153,16 +153,16 @@ class FileContext extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        }
 
        /**
-        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\StaticFileCollection>
+        * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\StaticFileCollection>
         */
        public function getStaticFileCollections() {
                return $this->staticFileCollections;
        }
 
        /**
-        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\StaticFileCollection> $staticFileCollections
+        * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\StaticFileCollection> $staticFileCollections
         */
-       public function setStaticFileCollections(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $staticFileCollections) {
+       public function setStaticFileCollections(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $staticFileCollections) {
                $this->staticFileCollections = $staticFileCollections;
        }
 
@@ -195,16 +195,16 @@ class FileContext extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        }
 
        /**
-        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FolderBasedFileCollection>
+        * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FolderBasedFileCollection>
         */
        public function getFolderBasedFileCollections() {
                return $this->folderBasedFileCollections;
        }
 
        /**
-        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FolderBasedFileCollection> $folderBasedFileCollections
+        * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FolderBasedFileCollection> $folderBasedFileCollections
         */
-       public function setFolderBasedFileCollections(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $folderBasedFileCollections) {
+       public function setFolderBasedFileCollections(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $folderBasedFileCollections) {
                $this->folderBasedFileCollections = $folderBasedFileCollections;
        }
 
@@ -240,16 +240,16 @@ class FileContext extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        }
 
        /**
-        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FileReference>
+        * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FileReference>
         */
        public function getFileReferences() {
                return $this->fileReferences;
        }
 
        /**
-        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FileReference> $fileReferences
+        * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FileReference> $fileReferences
         */
-       public function setFileReferences(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $fileReferences) {
+       public function setFileReferences(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $fileReferences) {
                $this->fileReferences = $fileReferences;
        }
 
@@ -285,16 +285,16 @@ class FileContext extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        }
 
        /**
-        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\Folder>
+        * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\Folder>
         */
        public function getFolders() {
                return $this->folders;
        }
 
        /**
-        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\Folder> $folders
+        * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\Folder> $folders
         */
-       public function setFolders(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $folders) {
+       public function setFolders(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $folders) {
                $this->folders = $folders;
        }
 
index 7d95e43..065765c 100644 (file)
@@ -84,7 +84,7 @@ class BackendUserGroupTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function setSubGroupsSetsSubgroups() {
-               $subGroups = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $subGroups = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $this->fixture->setSubGroups($subGroups);
                $this->assertSame($subGroups, $this->fixture->getSubGroups());
        }
index 0cd38d1..c0b8a94 100644 (file)
@@ -93,14 +93,14 @@ class CategoryTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function getItemsInitiallyReturnsEmptyStorage() {
-               $this->assertEquals(new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage(), $this->fixture->getItems());
+               $this->assertEquals(new \TYPO3\CMS\Extbase\Persistence\ObjectStorage(), $this->fixture->getItems());
        }
 
        /**
         * @test
         */
        public function setItemsSetsItems() {
-               $items = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $items = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $items->attach($this->getMockForAbstractClass('TYPO3\\CMS\\Extbase\\DomainObject\\AbstractEntity'));
                $this->fixture->setItems($items);
                $this->assertEquals($items, $this->fixture->getItems());
index 74334f1..63b3f10 100644 (file)
@@ -135,7 +135,7 @@ class FrontendUserGroupTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function setSubgroupSetsSubgroups() {
-               $subgroup = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $subgroup = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $group = new \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup('foo');
                $subgroup->attach($group);
                $this->fixture->setSubgroup($subgroup);
index c20c649..a163ecf 100644 (file)
@@ -84,7 +84,7 @@ class FrontendUserTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function setUsergroupSetsUsergroup() {
-               $usergroup = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $usergroup = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $usergroup->attach(new \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup('foo'));
                $this->fixture->setUsergroup($usergroup);
                $this->assertSame($usergroup, $this->fixture->getUsergroup());
index d966311..0dd9e32 100644 (file)
@@ -82,7 +82,7 @@ class DataMapFactoryTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
                        'foreign_table_field' => 'parenttable'
                );
                $propertyMetaData = array(
-                       'type' => 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage',
+                       'type' => 'TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage',
                        'elementType' => 'Tx_Myext_Domain_Model_Foo'
                );
                $mockDataMapFactory = $this->getAccessibleMock('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Mapper\\DataMapFactory', array('setOneToOneRelation', 'setOneToManyRelation', 'setManyToManyRelation'), array(), '', FALSE);
@@ -103,7 +103,7 @@ class DataMapFactoryTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
                        'MM' => 'tx_myextension_mm'
                );
                $propertyMetaData = array(
-                       'type' => 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage',
+                       'type' => 'TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage',
                        'elementType' => 'Tx_Myext_Domain_Model_Foo'
                );
                $mockDataMapFactory = $this->getAccessibleMock('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Mapper\\DataMapFactory', array('setOneToOneRelation', 'setOneToManyRelation', 'setManyToManyRelation'), array(), '', FALSE);
@@ -124,7 +124,7 @@ class DataMapFactoryTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
                        'MM' => 'tx_myextension_mm'
                );
                $propertyMetaData = array(
-                       'type' => 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage',
+                       'type' => 'TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage',
                        'elementType' => 'Tx_Myext_Domain_Model_Foo'
                );
                $mockDataMapFactory = $this->getAccessibleMock('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Mapper\\DataMapFactory', array('setOneToOneRelation', 'setOneToManyRelation', 'setManyToManyRelation'), array(), '', FALSE);
@@ -146,7 +146,7 @@ class DataMapFactoryTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
                        'foreign_selector' => 'uid_foreign'
                );
                $propertyMetaData = array(
-                       'type' => 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage',
+                       'type' => 'TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage',
                        'elementType' => 'Tx_Myext_Domain_Model_Foo'
                );
                $mockDataMapFactory = $this->getAccessibleMock('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Mapper\\DataMapFactory', array('setOneToOneRelation', 'setOneToManyRelation', 'setManyToManyRelation'), array(), '', FALSE);
index 7158b7c..fadecd4 100644 (file)
@@ -32,7 +32,7 @@ class ObjectStorageTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function anObjectCanBeAttached() {
-               $objectStorage = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $objectStorage = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $object1 = new \StdClass();
                $object2 = new \StdClass();
                $objectStorage->attach($object1);
@@ -45,7 +45,7 @@ class ObjectStorageTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function anObjectCanBeDetached() {
-               $objectStorage = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $objectStorage = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $object1 = new \StdClass();
                $object2 = new \StdClass();
                $objectStorage->attach($object1);
@@ -61,7 +61,7 @@ class ObjectStorageTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function offsetSetAssociatesDataToAnObjectInTheStorage() {
-               $objectStorage = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $objectStorage = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $object1 = new \StdClass();
                $object2 = new \StdClass();
                $objectStorage->offsetSet($object1, 'foo');
@@ -74,7 +74,7 @@ class ObjectStorageTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function offsetUnsetRemovesAnObjectFromTheStorage() {
-               $objectStorage = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $objectStorage = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $object1 = new \StdClass();
                $object2 = new \StdClass();
                $objectStorage->attach($object1);
@@ -90,7 +90,7 @@ class ObjectStorageTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function offsetGetReturnsTheDataAssociatedWithAnObject() {
-               $objectStorage = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $objectStorage = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $object1 = new \StdClass();
                $object2 = new \StdClass();
                $objectStorage[$object1] = 'foo';
@@ -103,7 +103,7 @@ class ObjectStorageTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function offsetExistsChecksWhetherAnObjectExistsInTheStorage() {
-               $objectStorage = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $objectStorage = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $object1 = new \StdClass();
                $object2 = new \StdClass();
                $objectStorage->attach($object1);
@@ -115,7 +115,7 @@ class ObjectStorageTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function getInfoReturnsTheDataAssociatedWithTheCurrentIteratorEntry() {
-               $objectStorage = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $objectStorage = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $object1 = new \StdClass();
                $object2 = new \StdClass();
                $object3 = new \StdClass();
@@ -134,7 +134,7 @@ class ObjectStorageTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function setInfoSetsTheDataAssociatedWithTheCurrentIteratorEntry() {
-               $objectStorage = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $objectStorage = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $object1 = new \StdClass();
                $object2 = new \StdClass();
                $objectStorage->attach($object1);
@@ -153,9 +153,9 @@ class ObjectStorageTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
        public function removeAllRemovesObjectsContainedInAnotherStorageFromTheCurrentStorage() {
                $object1 = new \StdClass();
                $object2 = new \StdClass();
-               $objectStorageA = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $objectStorageA = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $objectStorageA->attach($object1, 'foo');
-               $objectStorageB = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $objectStorageB = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $objectStorageB->attach($object1, 'bar');
                $objectStorageB->attach($object2, 'baz');
                $this->assertEquals(count($objectStorageB), 2);
@@ -169,10 +169,10 @@ class ObjectStorageTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
        public function addAllAddsAllObjectsFromAnotherStorage() {
                $object1 = new \StdClass();
                $object2 = new \StdClass();
-               $objectStorageA = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $objectStorageA = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                // It might be better to mock this
                $objectStorageA->attach($object1, 'foo');
-               $objectStorageB = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $objectStorageB = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $objectStorageB->attach($object2, 'baz');
                $this->assertEquals($objectStorageB->offsetExists($object1), FALSE);
                $objectStorageB->addAll($objectStorageA);
@@ -184,7 +184,7 @@ class ObjectStorageTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function theStorageCanBeRetrievedAsArray() {
-               $objectStorage = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $objectStorage = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $object1 = new \StdClass();
                $object2 = new \StdClass();
                $objectStorage->attach($object1, 'foo');
index 630fd14..d027868 100644 (file)
@@ -72,8 +72,8 @@ class TypeHandlingServiceTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase
                        array('ArrayObject<string>', array('type' => 'ArrayObject', 'elementType' => 'string')),
                        array('SplObjectStorage<Tx_Extbase_Bar>', array('type' => 'SplObjectStorage', 'elementType' => 'Tx_Extbase_Bar')),
                        array('SplObjectStorage<\\ExtbaseTeam\\BlogExample\\Foo\\Bar>', array('type' => 'SplObjectStorage', 'elementType' => 'ExtbaseTeam\\BlogExample\\Foo\\Bar')),
-                       array('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage<Tx_Extbase_Bar>', array('type' => 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage', 'elementType' => 'Tx_Extbase_Bar')),
-                       array('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage<\\ExtbaseTeam\\BlogExample\\Foo\\Bar>', array('type' => 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage', 'elementType' => 'ExtbaseTeam\\BlogExample\\Foo\\Bar')),
+                       array('TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage<Tx_Extbase_Bar>', array('type' => 'TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage', 'elementType' => 'Tx_Extbase_Bar')),
+                       array('TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage<\\ExtbaseTeam\\BlogExample\\Foo\\Bar>', array('type' => 'TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage', 'elementType' => 'ExtbaseTeam\\BlogExample\\Foo\\Bar')),
                        array('Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Bar>', array('type' => 'Tx_Extbase_Persistence_ObjectStorage', 'elementType' => 'Tx_Extbase_Bar')),
                        array('Tx_Extbase_Persistence_ObjectStorage<\\ExtbaseTeam\\BlogExample\\Foo\\Bar>', array('type' => 'Tx_Extbase_Persistence_ObjectStorage', 'elementType' => 'ExtbaseTeam\\BlogExample\\Foo\\Bar')),
                );
diff --git a/typo3/sysext/extbase/ext_autoload.php b/typo3/sysext/extbase/ext_autoload.php
deleted file mode 100644 (file)
index 21284af..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$extensionClassesPath = t3lib_extMgm::extPath('extbase') . 'Classes/';
-return array(
-       'typo3\cms\extbase\persistence\generic\objectstorage' => $extensionClassesPath . 'Persistence/ObjectStorage.php',
-);
\ No newline at end of file