[BUGFIX] Replace generic ObjectStorage in the whole core
authorAlexander Schnitzler <alex.schnitzler@typovision.de>
Wed, 31 Oct 2012 11:37:07 +0000 (12:37 +0100)
committerHelmut Hummel <helmut.hummel@typo3.org>
Wed, 31 Oct 2012 20:19:46 +0000 (21:19 +0100)
Releases: 6.0
Fixes: #42553

Change-Id: Ie2cfa7f3d736391385511dd87c576d5b8124baf1
Reviewed-on: http://review.typo3.org/16075
Reviewed-by: Helmut Hummel
Tested-by: Helmut Hummel
typo3/sysext/about/Classes/Domain/Repository/ExtensionRepository.php
typo3/sysext/beuser/Classes/Domain/Model/BackendUser.php
typo3/sysext/beuser/Classes/Domain/Model/BackendUserGroup.php
typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationCategory.php
typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationSubcategory.php

index 6ac8ea0..cf1160a 100644 (file)
@@ -48,10 +48,10 @@ class ExtensionRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
        /**
         * Finds all loaded extensions
         *
-        * @return Tx_Extbase_Persistence_ObjectStorage<Tx_About_Domain_Model_Extension>
+        * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\About\Domain\Model\Extension>
         */
        public function findAllLoaded() {
-               $loadedExtensions = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage');
+               $loadedExtensions = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage');
                $loadedExtensionsArray = $GLOBALS['TYPO3_LOADED_EXT'];
                foreach ($loadedExtensionsArray as $extensionKey => $extension) {
                        if (is_array($extension) && $extension['type'] != 'S') {
index bf00ebd..5758e9e 100755 (executable)
@@ -53,7 +53,7 @@ class BackendUser extends \TYPO3\CMS\Extbase\Domain\Model\BackendUser {
        protected $fileMountPoints = '';
 
        /**
-        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Beuser\Domain\Model\BackendUserGroup>
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Beuser\Domain\Model\BackendUserGroup>
         */
        protected $backendUserGroups;
 
@@ -116,14 +116,14 @@ class BackendUser extends \TYPO3\CMS\Extbase\Domain\Model\BackendUser {
        }
 
        /**
-        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $backendUserGroups
+        * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $backendUserGroups
         */
        public function setBackendUserGroups($backendUserGroups) {
                $this->backendUserGroups = $backendUserGroups;
        }
 
        /**
-        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage
+        * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage
         */
        public function getBackendUserGroups() {
                return $this->backendUserGroups;
index a9ce9ec..7aa5362 100755 (executable)
@@ -40,7 +40,7 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        protected $title;
 
        /**
-        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Beuser\Domain\Model\BackendUserGroup>
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Beuser\Domain\Model\BackendUserGroup>
         * @lazy
         */
        protected $subGroups;
@@ -60,14 +60,14 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        }
 
        /**
-        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $subGroups
+        * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $subGroups
         */
        public function setSubGroups($subGroups) {
                $this->subGroups = $subGroups;
        }
 
        /**
-        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage
+        * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage
         */
        public function getSubGroups() {
                return $this->subGroups;
index 6cebdd8..8d0ce9c 100644 (file)
@@ -40,7 +40,7 @@ class ConfigurationCategory extends \TYPO3\CMS\Extbase\DomainObject\AbstractEnti
        protected $name = '';
 
        /**
-        * @var Tx_Extbase_Persistence_ObjectStorage<Tx_Extensionmanager_Domain_Model_ConfigurationSubcategory>
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationSubcategory>
         */
        protected $subcategories;
 
@@ -53,11 +53,11 @@ class ConfigurationCategory extends \TYPO3\CMS\Extbase\DomainObject\AbstractEnti
         * Constructs this Category
         */
        public function __construct() {
-               $this->subcategories = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $this->subcategories = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
        }
 
        /**
-        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $subcategories
+        * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $subcategories
         * @return void
         */
        public function setSubcategories($subcategories) {
@@ -65,7 +65,7 @@ class ConfigurationCategory extends \TYPO3\CMS\Extbase\DomainObject\AbstractEnti
        }
 
        /**
-        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage
+        * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage
         */
        public function getSubcategories() {
                return $this->subcategories;
index 31579f4..00ff51a 100644 (file)
@@ -41,7 +41,7 @@ class ConfigurationSubcategory extends \TYPO3\CMS\Extbase\DomainObject\AbstractE
        protected $name = '';
 
        /**
-        * @var Tx_Extbase_Persistence_ObjectStorage<Tx_Extensionmanager_Domain_Model_ConfigurationItem>
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationItem>
         */
        protected $items;
 
@@ -49,11 +49,11 @@ class ConfigurationSubcategory extends \TYPO3\CMS\Extbase\DomainObject\AbstractE
         * Constructs this Category
         */
        public function __construct() {
-               $this->items = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $this->items = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
        }
 
        /**
-        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $items
+        * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $items
         * @return void
         */
        public function setItems($items) {
@@ -61,7 +61,7 @@ class ConfigurationSubcategory extends \TYPO3\CMS\Extbase\DomainObject\AbstractE
        }
 
        /**
-        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage
+        * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage
         */
        public function getItems() {
                return $this->items;