[BUGFIX] Fix classes without or broken namespace
authorAlexander Schnitzler <alex.schnitzler@typovision.de>
Sun, 26 Aug 2012 15:38:15 +0000 (17:38 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Sun, 26 Aug 2012 19:12:33 +0000 (21:12 +0200)
The update script unfortunetly didn't successfully
rename all classes in Extbase, so I renamed the
remaining ones manually.

Change-Id: Ia084593b8e9bf13ba487ab3b430eddf9b254d85e
Fixes: #40224
Related: #40095
Releases: 6.0
Reviewed-on: http://review.typo3.org/14112
Reviewed-by: Anja Leichsenring
Tested-by: Anja Leichsenring
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
65 files changed:
typo3/sysext/extbase/Classes/Configuration/AbstractConfigurationManager.php
typo3/sysext/extbase/Classes/Domain/Model/AbstractFileFolder.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/Error/Result.php
typo3/sysext/extbase/Classes/Mvc/Cli/Command.php
typo3/sysext/extbase/Classes/Mvc/Cli/CommandManager.php
typo3/sysext/extbase/Classes/Mvc/Controller/Argument.php
typo3/sysext/extbase/Classes/Mvc/Controller/ArgumentsValidator.php
typo3/sysext/extbase/Classes/Mvc/Exception/AmbiguousCommandIdentifierException.php
typo3/sysext/extbase/Classes/Mvc/View/NotFoundView.php
typo3/sysext/extbase/Classes/Mvc/Web/FrontendRequestHandler.php
typo3/sysext/extbase/Classes/Mvc/Web/Routing/UriBuilder.php
typo3/sysext/extbase/Classes/Object/ObjectManagerInterfaceException.php
typo3/sysext/extbase/Classes/Persistence/Generic/LazyObjectStorage.php
typo3/sysext/extbase/Classes/Persistence/Generic/Manager.php
typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMap.php
typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapper.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/QueryObjectModelFactory.php
typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php
typo3/sysext/extbase/Classes/Persistence/QueryInterface.php
typo3/sysext/extbase/Classes/Persistence/Repository.php
typo3/sysext/extbase/Classes/Property/PropertyMappingConfiguration.php
typo3/sysext/extbase/Classes/Property/PropertyMappingConfigurationBuilder.php
typo3/sysext/extbase/Classes/Property/TypeConverter/FileConverter.php
typo3/sysext/extbase/Classes/Service/TypeHandlingService.php
typo3/sysext/extbase/Classes/Utility/FrontendSimulatorUtility.php
typo3/sysext/extbase/Classes/Utility/TypoScriptUtility.php
typo3/sysext/extbase/Classes/Validation/PropertyError.php
typo3/sysext/extbase/Classes/Validation/Validator/AbstractCompositeValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/AbstractValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/GenericObjectValidator.php
typo3/sysext/extbase/Tests/Functional/Domain/Model/Fixture/FileContext.php
typo3/sysext/extbase/Tests/SeleniumBaseTestCase.php
typo3/sysext/extbase/Tests/Unit/BaseTestCase.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/Error/ResultTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandManagerTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentBehaviorBeforeExtbase14Test.php
typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentsTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/RequestTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php
typo3/sysext/extbase/Tests/Unit/Object/Container/ClassInfoFactoryTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/Mapper/DataMapFactoryTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/QueryTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/Storage/Typo3DbBackendTest.php
typo3/sysext/extbase/Tests/Unit/Property/PropertyMapperTest.php
typo3/sysext/extbase/Tests/Unit/Property/PropertyMappingConfigurationBuilderTest.php
typo3/sysext/extbase/Tests/Unit/Property/PropertyMappingConfigurationTest.php
typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/PersistentObjectConverterTest.php
typo3/sysext/extbase/Tests/Unit/Reflection/ObjectAccessTest.php
typo3/sysext/extbase/Tests/Unit/Service/ExtensionServiceTest.php
typo3/sysext/extbase/Tests/Unit/Service/TypeHandlingServiceTest.php
typo3/sysext/extbase/Tests/Unit/Utility/ExtensionUtilityTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/GenericObjectValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/NumberValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/RawValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/RegularExpressionValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/TextValidatorTest.php

index de3878e..b1ea6ea 100755 (executable)
@@ -104,7 +104,7 @@ abstract class AbstractConfigurationManager implements \TYPO3\CMS\Core\Singleton
        }
 
        /**
-        * @return tslib_cObj|NULL
+        * @return \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer|NULL
         */
        public function getContentObject() {
                if ($this->contentObject !== NULL) {
index 316d296..cef1357 100644 (file)
@@ -35,7 +35,7 @@ namespace TYPO3\CMS\Extbase\Domain\Model;
 abstract class AbstractFileFolder extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
        /**
-        * @var t3lib_file_ResourceInterface|t3lib_file_Folder|t3lib_file_AbstractFile
+        * @var \TYPO3\CMS\Core\Resource\ResourceInterface|\TYPO3\CMS\Core\Resource\Folder|\TYPO3\CMS\Core\Resource\AbstractFile
         */
        protected $object;
 
@@ -47,7 +47,7 @@ abstract class AbstractFileFolder extends \TYPO3\CMS\Extbase\DomainObject\Abstra
        }
 
        /**
-        * @return t3lib_file_ResourceInterface|t3lib_file_Folder|t3lib_file_AbstractFile
+        * @return \TYPO3\CMS\Core\Resource\ResourceInterface|\TYPO3\CMS\Core\Resource\Folder|\TYPO3\CMS\Core\Resource\AbstractFile
         */
        public function getObject() {
                return $this->object;
index c0bb9c5..0214b56 100755 (executable)
@@ -47,13 +47,13 @@ class Category extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        protected $description = '';
 
        /**
-        * @var Tx_Extbase_Domain_Model_Category|NULL
+        * @var \TYPO3\CMS\Extbase\Domain\Model\Category|NULL
         * @lazy
         */
        protected $parent = NULL;
 
        /**
-        * @var Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_DomainObject_AbstractEntity>
+        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\AbstractEntity>
         * @lazy
         */
        protected $items = NULL;
@@ -66,7 +66,7 @@ class Category extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        }
 
        /**
-        * Initializes all Tx_Extbase_Persistence_ObjectStorage properties.
+        * Initializes all \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage properties.
         *
         * @return void
         * @api
@@ -120,7 +120,7 @@ class Category extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        /**
         * Gets the parent category.
         *
-        * @return Tx_Extbase_Domain_Model_Category|NULL the parent category
+        * @return \TYPO3\CMS\Extbase\Domain\Model\Category|NULL the parent category
         * @api
         */
        public function getParent() {
index 4779d4b..2167b97 100644 (file)
@@ -46,7 +46,7 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        protected $password = '';
 
        /**
-        * @var Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_FrontendUserGroup>
+        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup>
         */
        protected $usergroup;
 
@@ -199,7 +199,7 @@ 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 Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_FrontendUserGroup> $usergroup An object storage containing the usergroups to add
+        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $usergroup
         * @return void
         * @api
         */
index fc036bc..08b58cf 100644 (file)
@@ -50,7 +50,7 @@ class FrontendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        protected $description = '';
 
        /**
-        * @var Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_FrontendUserGroup>
+        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup>
         */
        protected $subgroup;
 
@@ -131,7 +131,7 @@ 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 Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_FrontendUserGroup> $subgroup An object storage containing the subgroups to add
+        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $subgroup An object storage containing the subgroups to add
         * @return void
         * @api
         */
index 559beb8..684ba03 100644 (file)
@@ -29,24 +29,24 @@ namespace TYPO3\CMS\Extbase\Error;
 class Result {
 
        /**
-        * @var array<Tx_Extbase_Error_Error>
+        * @var array<\TYPO3\CMS\Extbase\Error\Error>
         */
        protected $errors = array();
 
        /**
-        * @var array<Tx_Extbase_Error_Warning>
+        * @var array<\TYPO3\CMS\Extbase\Error\Warning>
         */
        protected $warnings = array();
 
        /**
-        * @var array<Tx_Extbase_Error_Notice>
+        * @var array<\TYPO3\CMS\Extbase\Error\Notice>
         */
        protected $notices = array();
 
        /**
         * The result objects for the sub properties
         *
-        * @var array<Tx_Extbase_Error_Result>
+        * @var array<\TYPO3\CMS\Extbase\Error\Result>
         */
        protected $propertyResults = array();
 
@@ -86,7 +86,7 @@ class Result {
        /**
         * Get all errors in the current Result object (non-recursive)
         *
-        * @return array<Tx_Extbase_Error_Error>
+        * @return array<\TYPO3\CMS\Extbase\Error\Error>
         * @api
         */
        public function getErrors() {
@@ -96,7 +96,7 @@ class Result {
        /**
         * Get all warnings in the current Result object (non-recursive)
         *
-        * @return array<Tx_Extbase_Error_Warning>
+        * @return array<\TYPO3\CMS\Extbase\Error\Warning>
         * @api
         */
        public function getWarnings() {
@@ -106,7 +106,7 @@ class Result {
        /**
         * Get all notices in the current Result object (non-recursive)
         *
-        * @return array<Tx_Extbase_Error_Notice>
+        * @return array<\TYPO3\CMS\Extbase\Error\Notice>
         * @api
         */
        public function getNotices() {
@@ -238,7 +238,7 @@ class Result {
         * where the key is the property path where the error occured, and the
         * value is a list of all errors (stored as array)
         *
-        * @return array<Tx_Extbase_Error_Error>
+        * @return array<\TYPO3\CMS\Extbase\Error\Error>
         * @api
         */
        public function getFlattenedErrors() {
@@ -252,7 +252,7 @@ class Result {
         * where the key is the property path where the warning occured, and the
         * value is a list of all warnings (stored as array)
         *
-        * @return array<Tx_Extbase_Error_Warning>
+        * @return array<\TYPO3\CMS\Extbase\Error\Warning>
         * @api
         */
        public function getFlattenedWarnings() {
@@ -266,7 +266,7 @@ class Result {
         * where the key is the property path where the notice occured, and the
         * value is a list of all notices (stored as array)
         *
-        * @return array<Tx_Extbase_Error_Notice>
+        * @return array<\TYPO3\CMS\Extbase\Error\Notice>
         * @api
         */
        public function getFlattenedNotices() {
@@ -331,7 +331,7 @@ class Result {
        /**
         * Get a list of all sub Result objects available.
         *
-        * @return array<Tx_Extbase_Erro_Result>
+        * @return array<\TYPO3\CMS\Extbase\Error\Result>
         */
        public function getSubResults() {
                return $this->propertyResults;
index 97c7e1f..6d75ac0 100644 (file)
@@ -173,7 +173,7 @@ class Command {
         * information about required/optional arguments of this command.
         * If the command does not expect any arguments, an empty array is returned
         *
-        * @return array<Tx_Extbase_MVC_CLI_CommandArgumentDefinition>
+        * @return array<\TYPO3\CMS\Extbase\Mvc\Cli\CommandArgumentDefinition>
         * @author Bastian Waidelich <bastian@typo3.org>
         */
        public function getArgumentDefinitions() {
index 0da6bf3..485de0b 100644 (file)
@@ -37,7 +37,7 @@ class CommandManager implements \TYPO3\CMS\Core\SingletonInterface {
        protected $objectManager;
 
        /**
-        * @var array<Tx_Extbase_MVC_CLI_Command>
+        * @var array<\TYPO3\CMS\Extbase\Mvc\Cli\Command>
         */
        protected $availableCommands = NULL;
 
@@ -57,7 +57,7 @@ class CommandManager implements \TYPO3\CMS\Core\SingletonInterface {
        /**
         * Returns an array of all commands
         *
-        * @return array<Tx_Extbase_MVC_CLI_Command>
+        * @return array<\TYPO3\CMS\Extbase\Mvc\Cli\Command>
         * @author Robert Lemke <robert@typo3.org>
         * @author Bastian Waidelich <bastian@typo3.org>
         * @api
index 7070bcf..f58beb2 100644 (file)
@@ -571,7 +571,7 @@ class Argument {
        }
 
        /**
-        * @return array<Tx_Extbase_Error_Result> Validation errors which have occured.
+        * @return array<\TYPO3\CMS\Extbase\Error\Result> Validation errors which have occured.
         * @author Sebastian Kurfürst <sebastian@typo3.org>
         * @api
         */
index 7280b2b..47c2816 100644 (file)
@@ -107,7 +107,7 @@ class ArgumentsValidator extends \TYPO3\CMS\Extbase\Validation\Validator\Abstrac
         * Adds the given errors to $this->errors and creates an ArgumentError
         * instance if needed.
         *
-        * @param array $errors Array of Tx_Extbase_Validation_Error
+        * @param array $errors Array of \TYPO3\CMS\Extbase\Validation\Error
         * @param string $argumentName Name of the argument to add errors for
         * @return void
         */
index 69bad32..7157a99 100644 (file)
@@ -34,7 +34,7 @@ namespace TYPO3\CMS\Extbase\Mvc\Exception;
 class AmbiguousCommandIdentifierException extends \TYPO3\CMS\Extbase\Mvc\Exception\CommandException {
 
        /**
-        * @var array<Tx_Extbase_MVC_CLI_Command>
+        * @var array<\TYPO3\CMS\Extbase\Mvc\Cli\Command>
         */
        protected $matchingCommands = array();
 
@@ -44,7 +44,7 @@ class AmbiguousCommandIdentifierException extends \TYPO3\CMS\Extbase\Mvc\Excepti
         * @param string $message
         * @param integer $code
         * @param \Exception|NULL $previousException
-        * @param array $matchingCommands <Tx_Extbase_MVC_CLI_Command> $matchingCommands Commands that matched the command identifier
+        * @param array $matchingCommands <\TYPO3\CMS\Extbase\Mvc\Cli\Command> $matchingCommands Commands that matched the command identifier
         * @see Exception
         * @author Bastian Waidelich <bastian@typo3.org>
         */
@@ -54,7 +54,7 @@ class AmbiguousCommandIdentifierException extends \TYPO3\CMS\Extbase\Mvc\Excepti
        }
 
        /**
-        * @return array<Tx_Extbase_MVC_CLI_Command>
+        * @return array<\TYPO3\CMS\Extbase\Mvc\Cli\Command>
         */
        public function getMatchingCommands() {
                return $this->matchingCommands;
index 5dfb68a..e785009 100644 (file)
@@ -70,7 +70,7 @@ class NotFoundView extends \TYPO3\CMS\Extbase\Mvc\View\AbstractView {
         * @author Bastian Waidelich <bastian@typo3.org>
         */
        protected function getTemplatePathAndFilename() {
-               return \t3lib_extmgm::extPath('extbase') . 'Resources/Private/MVC/NotFoundView_Template.html';
+               return \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Resources/Private/MVC/NotFoundView_Template.html';
        }
 
        /**
index 3196ca6..38f8371 100644 (file)
@@ -73,7 +73,7 @@ class FrontendRequestHandler extends \TYPO3\CMS\Extbase\Mvc\Web\AbstractRequestH
                        $contentObject = $this->configurationManager->getContentObject();
                        if ($contentObject->getUserObjectType() === \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::OBJECTTYPE_USER) {
                                $contentObject->convertToUserIntObject();
-                               // tslib_cObj::convertToUserIntObject() will recreate the object, so we have to stop the request here
+                               // \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::convertToUserIntObject() will recreate the object, so we have to stop the request here
                                return NULL;
                        }
                        $request->setIsCached(FALSE);
index ed4c6ce..09961ee 100644 (file)
@@ -34,7 +34,7 @@ class UriBuilder {
        protected $extensionService;
 
        /**
-        * An instance of tslib_cObj
+        * An instance of \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
         *
         * @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
         */
@@ -514,7 +514,7 @@ class UriBuilder {
         * if they are equal to the default controller/action of the target plugin.
         * Note: This is only active in FE mode and if feature "skipDefaultArguments" is enabled
         *
-        * @see Tx_Extbase_Configuration_ConfigurationManagerInterface::isFeatureEnabled()
+        * @see \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::isFeatureEnabled()
         * @param array $controllerArguments the current controller arguments to be modified
         * @param string $extensionName target extension name
         * @param string $pluginName target plugin name
index a4afa96..5476b89 100644 (file)
@@ -67,7 +67,7 @@ interface ObjectManagerInterfaceException extends \TYPO3\CMS\Core\SingletonInter
         *
         * @param string $objectName The name of the object to create
         * @return object The new object instance
-        * @throws Tx_Extbase_Object_Exception_WrongScropeException if the created object is not of scope prototype
+        * @throws \TYPO3\CMS\Extbase\Object\Exception\WrongScopeException if the created object is not of scope prototype
         * @api
         */
        public function create($objectName);
index b5e55e4..add7b0e 100644 (file)
@@ -129,7 +129,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
 
        // Delegation to the ObjectStorage methods below
        /**
-        * @see Tx_Extbase_Persistence_ObjectStorage::addAll
+        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::addAll
         */
        public function addAll($storage) {
                $this->initialize();
@@ -137,7 +137,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see Tx_Extbase_Persistence_ObjectStorage::attach
+        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::attach
         */
        public function attach($object, $data = NULL) {
                $this->initialize();
@@ -145,7 +145,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see Tx_Extbase_Persistence_ObjectStorage::contains
+        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::contains
         */
        public function contains($object) {
                $this->initialize();
@@ -174,7 +174,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see Tx_Extbase_Persistence_ObjectStorage::current
+        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::current
         */
        public function current() {
                $this->initialize();
@@ -182,7 +182,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see Tx_Extbase_Persistence_ObjectStorage::detach
+        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::detach
         */
        public function detach($object) {
                $this->initialize();
@@ -190,7 +190,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see Tx_Extbase_Persistence_ObjectStorage::key
+        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::key
         */
        public function key() {
                $this->initialize();
@@ -198,7 +198,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see Tx_Extbase_Persistence_ObjectStorage::next
+        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::next
         */
        public function next() {
                $this->initialize();
@@ -206,7 +206,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see Tx_Extbase_Persistence_ObjectStorage::offsetExists
+        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::offsetExists
         */
        public function offsetExists($object) {
                $this->initialize();
@@ -214,7 +214,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see Tx_Extbase_Persistence_ObjectStorage::offsetGet
+        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::offsetGet
         */
        public function offsetGet($object) {
                $this->initialize();
@@ -222,7 +222,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see Tx_Extbase_Persistence_ObjectStorage::offsetSet
+        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::offsetSet
         */
        public function offsetSet($object, $info) {
                $this->initialize();
@@ -230,7 +230,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see Tx_Extbase_Persistence_ObjectStorage::offsetUnset
+        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::offsetUnset
         */
        public function offsetUnset($object) {
                $this->initialize();
@@ -238,7 +238,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see Tx_Extbase_Persistence_ObjectStorage::removeAll
+        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::removeAll
         */
        public function removeAll($storage) {
                $this->initialize();
@@ -246,7 +246,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see Tx_Extbase_Persistence_ObjectStorage::rewind
+        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::rewind
         */
        public function rewind() {
                $this->initialize();
@@ -254,7 +254,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see Tx_Extbase_Persistence_ObjectStorage::valid
+        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::valid
         */
        public function valid() {
                $this->initialize();
@@ -262,7 +262,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\Generic\ObjectSto
        }
 
        /**
-        * @see Tx_Extbase_Persistence_ObjectStorage::toArray
+        * @see \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage::toArray
         */
        public function toArray() {
                $this->initialize();
index 5e62466..330ef4c 100644 (file)
@@ -37,12 +37,12 @@ namespace TYPO3\CMS\Extbase\Persistence\Generic;
 class Manager implements \TYPO3\CMS\Extbase\Persistence\Generic\ManagerInterface, \TYPO3\CMS\Core\SingletonInterface {
 
        /**
-        * @var \TYPO3\CMS\Extbase\Persistence\BackendInterface
+        * @var \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
         */
        protected $backend;
 
        /**
-        * @var \TYPO3\CMS\Extbase\Persistence\Session
+        * @var \TYPO3\CMS\Extbase\Persistence\Generic\Session
         */
        protected $session;
 
@@ -61,20 +61,20 @@ class Manager implements \TYPO3\CMS\Extbase\Persistence\Generic\ManagerInterface
        /**
         * Injects the Persistence Backend
         *
-        * @param \TYPO3\CMS\Extbase\Persistence\BackendInterface $backend The persistence backend
+        * @param \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface $backend The persistence backend
         * @return void
         */
-       public function injectBackend(\TYPO3\CMS\Extbase\Persistence\BackendInterface $backend) {
+       public function injectBackend(\TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface $backend) {
                $this->backend = $backend;
        }
 
        /**
         * Injects the Persistence Session
         *
-        * @param \TYPO3\CMS\Extbase\Persistence\Session $session The persistence session
+        * @param \TYPO3\CMS\Extbase\Persistence\Generic\Session $session The persistence session
         * @return void
         */
-       public function injectSession(\TYPO3\CMS\Extbase\Persistence\Session $session) {
+       public function injectSession(\TYPO3\CMS\Extbase\Persistence\Generic\Session $session) {
                $this->session = $session;
        }
 
@@ -91,7 +91,7 @@ class Manager implements \TYPO3\CMS\Extbase\Persistence\Generic\ManagerInterface
        /**
         * Returns the current persistence session
         *
-        * @return \TYPO3\CMS\Extbase\Persistence\Session
+        * @return \TYPO3\CMS\Extbase\Persistence\Generic\Session
         * @deprecated since Extbase 1.4.0, will be removed in Extbase 6.0
         */
        public function getSession() {
@@ -101,7 +101,7 @@ class Manager implements \TYPO3\CMS\Extbase\Persistence\Generic\ManagerInterface
        /**
         * Returns the persistence backend
         *
-        * @return \TYPO3\CMS\Extbase\Persistence\BackendInterface
+        * @return \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
         * @deprecated since Extbase 1.4.0, will be removed in Extbase 6.0
         */
        public function getBackend() {
@@ -177,8 +177,8 @@ class Manager implements \TYPO3\CMS\Extbase\Persistence\Generic\ManagerInterface
         * @api
         */
        public function persistAll() {
-               $aggregateRootObjects = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
-               $removedObjects = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
+               $aggregateRootObjects = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $removedObjects = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
                // fetch and inspect objects from all known repositories
                foreach ($this->repositoryClassNames as $repositoryClassName) {
                        $repository = $this->objectManager->get($repositoryClassName);
index eace5f5..48855b5 100644 (file)
@@ -232,7 +232,7 @@ class DataMap {
         * Returns the column map corresponding to the given property name.
         *
         * @param string $propertyName
-        * @return Tx_Extbase_Persistence_Mapper_ColumnMap|NULL The column map or NULL if no corresponding column map was found.
+        * @return \TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap|NULL The column map or NULL if no corresponding column map was found.
         */
        public function getColumnMap($propertyName) {
                return $this->columnMaps[$propertyName];
index 87f1fbc..898120d 100644 (file)
@@ -317,7 +317,7 @@ class DataMapper implements \TYPO3\CMS\Core\SingletonInterface {
         * @param string $propertyName The name of the proxied property in it's parent
         * @param mixed $fieldValue The raw field value.
         * @param bool $enableLazyLoading A flag indication if the related objects should be lazy loaded
-        * @return Tx_Extbase_Persistence_LazyObjectStorage|Tx_Extbase_Persistence_QueryResultInterface The result
+        * @return \TYPO3\CMS\Extbase\Persistence\Generic\LazyObjectStorage|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface The result
         */
        public function fetchRelated(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject, $propertyName, $fieldValue = '', $enableLazyLoading = TRUE) {
                $propertyMetaData = $this->reflectionService->getClassSchema(get_class($parentObject))->getProperty($propertyName);
@@ -364,7 +364,7 @@ class DataMapper implements \TYPO3\CMS\Core\SingletonInterface {
         * @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject
         * @param string $propertyName
         * @param string $fieldValue
-        * @return Tx_Extbase_Persistence_QueryResultInterfaces
+        * @return \TYPO3\CMS\Extbase\Persistence\QueryResultInterface
         */
        protected function getNonEmptyRelationValue(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject, $propertyName, $fieldValue) {
                $query = $this->getPreparedQuery($parentObject, $propertyName, $fieldValue);
@@ -491,6 +491,7 @@ class DataMapper implements \TYPO3\CMS\Core\SingletonInterface {
         * @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject The object instance this proxy is part of
         * @param string $propertyName The name of the proxied property in it's parent
         * @param mixed $fieldValue The raw field value.
+        * @return integer
         */
        public function countRelated(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject, $propertyName, $fieldValue = '') {
                $query = $this->getPreparedQuery($parentObject, $propertyName, $fieldValue);
index 98286b8..6a6d4e0 100644 (file)
@@ -70,7 +70,7 @@ class QueryObjectModelFactory implements \TYPO3\CMS\Core\SingletonInterface {
         * @param string $statement The statement
         * @param array $boundVariables An array of variables to bind to the statement
         * @param object|string $language The language of the statement. Must be a supported languanguage defined as Tx_Extbase_Persistence_QOM_QueryObjectModelFactory::TYPO3_*
-        * @return Tx_Extbase_Persistence_QOM_StatementInterface
+        * @return \TYPO3\CMS\Extbase\Persistence\Generic\Qom\Statement
         */
        public function statement($statement, array $boundVariables = array(), $language = \TYPO3\CMS\Extbase\Persistence\Generic\Qom\Statement::TYPO3_SQL_MYSQL) {
                return $this->objectManager->create('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\Statement', $statement, $boundVariables, $language);
index 9f8d95e..03556ba 100644 (file)
@@ -220,7 +220,7 @@ class Query implements \TYPO3\CMS\Extbase\Persistence\QueryInterface {
        /**
         * Executes the query against the database and returns the result
         *
-        * @return Tx_Extbase_Persistence_QueryResultInterface|array The query result object or an array if $this->getQuerySettings()->getReturnRawQueryResult() is TRUE
+        * @return \TYPO3\CMS\Extbase\Persistence\QueryResultInterface|array The query result object or an array if $this->getQuerySettings()->getReturnRawQueryResult() is TRUE
         * @api
         */
        public function execute() {
index d042830..e1916f1 100644 (file)
@@ -288,7 +288,7 @@ class Typo3DbBackend implements \TYPO3\CMS\Extbase\Persistence\Generic\Storage\B
         */
        public function getObjectCountByQuery(\TYPO3\CMS\Extbase\Persistence\QueryInterface $query) {
                $constraint = $query->getConstraint();
-               if ($constraint instanceof \Tx_Extbase_Persistence_QOM_StatementInterface) {
+               if ($constraint instanceof \TYPO3\CMS\Extbase\Persistence\Generic\Qom\Statement) {
                        throw new \TYPO3\CMS\Extbase\Persistence\Generic\Storage\Exception\BadConstraintException('Could not execute count on queries with a constraint of type TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\StatementInterface', 1256661045);
                }
                $parameters = array();
@@ -882,7 +882,7 @@ class Typo3DbBackend implements \TYPO3\CMS\Extbase\Persistence\Generic\Storage\B
                $statement = '';
                if ($ignoreEnableFields && !$includeDeleted) {
                        if (count($enableFieldsToBeIgnored)) {
-                               // array_combine() is necessary because of the way t3lib_pageSelect::enableFields() is implemented
+                               // array_combine() is necessary because of the way \TYPO3\CMS\Frontend\Page\PageRepository::enableFields() is implemented
                                $statement .= $GLOBALS['TSFE']->sys_page->enableFields($tableName, -1, array_combine($enableFieldsToBeIgnored, $enableFieldsToBeIgnored));
                        } else {
                                $statement .= $GLOBALS['TSFE']->sys_page->deleteClause($tableName);
index 34b948d..002397c 100644 (file)
@@ -107,7 +107,7 @@ interface QueryInterface
        /**
         * Executes the query against the backend and returns the result
         *
-        * @return Tx_Extbase_Persistence_QueryResultInterface|array The query result object or an array if $this->getQuerySettings()->getReturnRawQueryResult() is TRUE
+        * @return \TYPO3\CMS\Extbase\Persistence\QueryResultInterface|array The query result object or an array if $this->getQuerySettings()->getReturnRawQueryResult() is TRUE
         * @api
         */
        public function execute();
index 342e093..b9a75d4 100644 (file)
@@ -231,7 +231,7 @@ class Repository implements \TYPO3\CMS\Extbase\Persistence\RepositoryInterface,
        }
 
        /**
-        * Returns an Tx_Extbase_Persistence_ObjectStorage with objects remove()d from the repository
+        * Returns an \TYPO3\CMS\Extbase\Persistence\Generic\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
@@ -243,7 +243,7 @@ class Repository implements \TYPO3\CMS\Extbase\Persistence\RepositoryInterface,
        /**
         * Returns all objects of this repository.
         *
-        * @return Tx_Extbase_Persistence_QueryResultInterface|array
+        * @return \TYPO3\CMS\Extbase\Persistence\QueryResultInterface|array
         * @api
         */
        public function findAll() {
index e1b7135..d0098ca 100644 (file)
@@ -41,7 +41,7 @@ class PropertyMappingConfiguration implements \TYPO3\CMS\Extbase\Property\Proper
        /**
         * Stores the configuration for specific child properties.
         *
-        * @var array<Tx_Extbase_Property_PropertyMappingConfigurationInterface>
+        * @var array<\TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface>
         */
        protected $subConfigurationForProperty = array();
 
index d0587a9..f0060b8 100644 (file)
@@ -30,7 +30,7 @@ class PropertyMappingConfigurationBuilder implements \TYPO3\CMS\Core\SingletonIn
        /**
         * Builds the default property mapping configuration.
         *
-        * @param string $type the implementation class name of the PropertyMappingConfiguration to instanciate; must be a subclass of Tx_Extbase_Property_PropertyMappingConfiguration
+        * @param string $type the implementation class name of the PropertyMappingConfiguration to instanciate; must be a subclass of \TYPO3\CMS\Extbase\Property\PropertyMappingConfiguration
         * @return \TYPO3\CMS\Extbase\Property\PropertyMappingConfiguration
         */
        public function build($type = 'TYPO3\\CMS\\Extbase\\Property\\PropertyMappingConfiguration') {
index 2365ad8..fb57e34 100644 (file)
@@ -47,7 +47,7 @@ class FileConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\AbstractFi
 
        /**
         * @param string|integer $source
-        * @return t3lib_file_FileInterface|t3lib_file_Folder
+        * @return \TYPO3\CMS\Core\Resource\FileInterface|\TYPO3\CMS\Core\Resource\Folder
         */
        protected function getObject($source) {
                return $this->fileFactory->retrieveFileOrFolderObject($source);
index 4e5942b..ee85356 100644 (file)
@@ -53,7 +53,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\\Generic\\ObjectStorage', '\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage'))) {
                                throw new \InvalidArgumentException(
                                        'Type "' . $type . '" must not have an element type hint (' . $elementType . ').',
                                        1309255650
index 9a052ed..3b2e22c 100644 (file)
@@ -41,7 +41,7 @@ class FrontendSimulatorUtility {
 
        /**
         * Sets the $TSFE->cObjectDepthCounter in Backend mode
-        * This somewhat hacky work around is currently needed because the cObjGetSingle() function of tslib_cObj relies on this setting
+        * This somewhat hacky work around is currently needed because the cObjGetSingle() function of \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer relies on this setting
         *
         * @param \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer|NULL $cObj
         * @return void
index 72eec01..b1b07d1 100644 (file)
@@ -38,7 +38,7 @@ class TypoScriptUtility {
        static protected $typoScriptService = NULL;
 
        /**
-        * @return Tx_Extbase_Service_TypoScriptService|NULL
+        * @return \TYPO3\CMS\Extbase\Service\TypoScriptService|NULL
         */
        static protected function getTypoScriptService() {
                if (self::$typoScriptService === NULL) {
index a4b6332..32c113e 100644 (file)
@@ -54,7 +54,7 @@ class PropertyError extends \TYPO3\CMS\Extbase\Validation\Error {
        protected $propertyName;
 
        /**
-        * @var array An array of Tx_Extbase_Validation_Error for the property
+        * @var array An array of \TYPO3\CMS\Extbase\Validation\Error for the property
         */
        protected $errors = array();
 
@@ -71,7 +71,7 @@ class PropertyError extends \TYPO3\CMS\Extbase\Validation\Error {
        /**
         * Add errors
         *
-        * @param array $errors Array of Tx_Extbase_Validation_Error for the property
+        * @param array $errors Array of \TYPO3\CMS\Extbase\Validation\Error for the property
         * @return void
         */
        public function addErrors($errors) {
@@ -81,7 +81,7 @@ class PropertyError extends \TYPO3\CMS\Extbase\Validation\Error {
        /**
         * Get all errors for the property
         *
-        * @return array An array of Tx_Extbase_Validation_Error objects or an empty array if no errors occured for the property
+        * @return array An array of \TYPO3\CMS\Extbase\Validation\Error objects or an empty array if no errors occured for the property
         */
        public function getErrors() {
                return $this->errors;
index 5f777a9..76d05a6 100644 (file)
@@ -73,7 +73,7 @@ abstract class AbstractCompositeValidator implements \TYPO3\CMS\Extbase\Validati
        /**
         * Returns an array of errors which occurred during the last isValid() call.
         *
-        * @return array An array of Tx_Extbase_Validation_Error objects or an empty array if no errors occurred.
+        * @return array An array of \TYPO3\CMS\Extbase\Validation\Error objects or an empty array if no errors occurred.
         * @deprecated since Extbase 1.4.0, will be removed in Extbase 6.0
         */
        public function getErrors() {
index c1717d2..6f36999 100644 (file)
@@ -98,7 +98,7 @@ abstract class AbstractValidator implements \TYPO3\CMS\Extbase\Validation\Valida
        /**
         * Returns an array of errors which occurred during the last isValid() call.
         *
-        * @return array An array of Tx_Extbase_Validation_Error objects or an empty array if no errors occurred.
+        * @return array An array of \TYPO3\CMS\Extbase\Validation\Error objects or an empty array if no errors occurred.
         * @deprecated since Extbase 1.4.0, will be removed in Extbase 6.0. use validate() instead.
         */
        public function getErrors() {
index 093ae7c..cd3ef34 100644 (file)
@@ -179,7 +179,7 @@ class GenericObjectValidator extends \TYPO3\CMS\Extbase\Validation\Validator\Abs
        }
 
        /**
-        * @param array $errors Array of Tx_Extbase_Validation_Error
+        * @param array $errors Array of \TYPO3\CMS\Extbase\Validation\Error
         * @param string $propertyName Name of the property to add errors
         * @return void
         * @deprecated since Extbase 1.4.0, will be removed in Extbase 6.0
index 1833fa1..45fd2b2 100644 (file)
@@ -40,7 +40,7 @@ class FileContext extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        protected $file;
 
        /**
-        * @var Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_File>
+        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\File>
         */
        protected $files;
 
@@ -50,7 +50,7 @@ class FileContext extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        protected $fileReference;
 
        /**
-        * @var Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_FileReference>
+        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FileReference>
         */
        protected $fileReferences;
 
@@ -60,7 +60,7 @@ class FileContext extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        protected $staticFileCollection;
 
        /**
-        * @var Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_StaticFileCollection>
+        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\StaticFileCollection>
         */
        protected $staticFileCollections;
 
@@ -70,7 +70,7 @@ class FileContext extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        protected $folderBasedFileCollection;
 
        /**
-        * @var Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_FolderBasedFileCollection>
+        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FolderBasedFileCollection>
         */
        protected $folderBasedFileCollections;
 
@@ -80,7 +80,7 @@ class FileContext extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        protected $folder;
 
        /**
-        * @var Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_Folder>
+        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\Folder>
         */
        protected $folders;
 
@@ -110,14 +110,14 @@ class FileContext extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        }
 
        /**
-        * @return Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_File>
+        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\File>
         */
        public function getFiles() {
                return $this->files;
        }
 
        /**
-        * @param Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_File> $files
+        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\File> $files
         */
        public function setFiles(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $files) {
                $this->files = $files;
@@ -155,14 +155,14 @@ class FileContext extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        }
 
        /**
-        * @return Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_StaticFileCollection>
+        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\StaticFileCollection>
         */
        public function getStaticFileCollections() {
                return $this->staticFileCollections;
        }
 
        /**
-        * @param Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_StaticFileCollection> $staticFileCollections
+        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\StaticFileCollection> $staticFileCollections
         */
        public function setStaticFileCollections(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $staticFileCollections) {
                $this->staticFileCollections = $staticFileCollections;
@@ -197,14 +197,14 @@ class FileContext extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        }
 
        /**
-        * @return Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_FolderBasedFileCollection>
+        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FolderBasedFileCollection>
         */
        public function getFolderBasedFileCollections() {
                return $this->folderBasedFileCollections;
        }
 
        /**
-        * @param Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_FolderBasedFileCollection> $folderBasedFileCollections
+        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FolderBasedFileCollection> $folderBasedFileCollections
         */
        public function setFolderBasedFileCollections(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $folderBasedFileCollections) {
                $this->folderBasedFileCollections = $folderBasedFileCollections;
@@ -242,14 +242,14 @@ class FileContext extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        }
 
        /**
-        * @return Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_FileReference>
+        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FileReference>
         */
        public function getFileReferences() {
                return $this->fileReferences;
        }
 
        /**
-        * @param Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_FileReference> $fileReferences
+        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FileReference> $fileReferences
         */
        public function setFileReferences(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $fileReferences) {
                $this->fileReferences = $fileReferences;
@@ -287,14 +287,14 @@ class FileContext extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        }
 
        /**
-        * @return Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_Folder>
+        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\Folder>
         */
        public function getFolders() {
                return $this->folders;
        }
 
        /**
-        * @param Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_Folder> $folders
+        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\Folder> $folders
         */
        public function setFolders(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $folders) {
                $this->folders = $folders;
index 0c3bc3e..cd0490b 100644 (file)
@@ -26,7 +26,7 @@ namespace TYPO3\CMS\Extbase\Tests;
 /**
  * Base Selenium testcase for the Extbase extension.
  */
-abstract class SeleniumBaseTestCase extends tx_phpunit_selenium_testcase {
+abstract class SeleniumBaseTestCase extends \tx_phpunit_selenium_testcase {
 
 
 }
index 0aa2d2f..db84d6e 100644 (file)
@@ -43,7 +43,7 @@ abstract class BaseTestCase extends \tx_phpunit_testcase {
         * @return void
         */
        public function runBare() {
-               $objectManager = \t3lib_div::makeInstance('TYPO3\\CMS\\Extbase\\Object\\ObjectManager');
+               $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Object\\ObjectManager');
                $this->objectManager = clone $objectManager;
                parent::runBare();
        }
@@ -71,7 +71,7 @@ abstract class BaseTestCase extends \tx_phpunit_testcase {
         * Creates a proxy class of the specified class which allows
         * for calling even protected methods and access of protected properties.
         *
-        * @param $className Full qualified name of the original class
+        * @param string $className Full qualified name of the original class
         * @return string Full qualified name of the built class
         */
        protected function buildAccessibleProxy($className) {
index 55294d9..d3f733f 100644 (file)
@@ -43,7 +43,7 @@ class BackendUserGroupTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
        protected $fixture = NULL;
 
        public function setUp() {
-               $this->fixture = new \Tx_Extbase_Domain_Model_BackendUserGroup();
+               $this->fixture = new \TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup();
        }
 
        public function tearDown() {
@@ -86,7 +86,7 @@ class BackendUserGroupTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function setSubGroupsSetsSubgroups() {
-               $subGroups = new \Tx_Extbase_Persistence_ObjectStorage();
+               $subGroups = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
                $this->fixture->setSubGroups($subGroups);
                $this->assertSame($subGroups, $this->fixture->getSubGroups());
        }
@@ -95,9 +95,9 @@ class BackendUserGroupTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function anSubGroupCanBeRemoved() {
-               $group1 = new \Tx_Extbase_Domain_Model_BackendUserGroup();
+               $group1 = new \TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup();
                $group1->setTitle('foo');
-               $group2 = new \Tx_Extbase_Domain_Model_BackendUserGroup();
+               $group2 = new \TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup();
                $group2->setTitle('bar');
                $this->fixture->addSubGroup($group1);
                $this->fixture->addSubGroup($group2);
@@ -112,9 +112,9 @@ class BackendUserGroupTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function allSubGroupsCanBeRemoved() {
-               $group1 = new \Tx_Extbase_Domain_Model_BackendUserGroup();
+               $group1 = new \TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup();
                $group1->setTitle('foo');
-               $group2 = new \Tx_Extbase_Domain_Model_BackendUserGroup();
+               $group2 = new \TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup();
                $group2->setTitle('bar');
                $this->fixture->addSubGroup($group1);
                $this->fixture->addSubGroup($group2);
index d4d213f..a34c3bc 100644 (file)
@@ -24,7 +24,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Domain\Model;
  * This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 /**
- * Testcase for the Tx_Extbase_Domain_Model_Category class.
+ * Testcase for the \TYPO3\CMS\Extbase\Domain\Model\Category class.
  *
  * @package Extbase
  * @subpackage Domain\Model
index bd834a7..da8d80a 100644 (file)
@@ -26,7 +26,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Domain\Model;
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 /**
- * Testcase for Tx_Extbase_Domain_Model_FrontendUserGroup.
+ * Testcase for \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup.
  *
  * @author Markus Günther <mail@markus-guenther.de>
  * @package Extbase
@@ -42,7 +42,7 @@ class FrontendUserGroupTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
        protected $fixture = NULL;
 
        public function setUp() {
-               $this->fixture = new \Tx_Extbase_Domain_Model_FrontendUserGroup();
+               $this->fixture = new \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup();
        }
 
        public function tearDown() {
@@ -53,7 +53,7 @@ class FrontendUserGroupTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function getTitleInitiallyReturnsEmptyString() {
-               $this->fixture = new \Tx_Extbase_Domain_Model_FrontendUserGroup();
+               $this->fixture = new \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup();
                $this->assertSame('', $this->fixture->getTitle());
        }
 
@@ -62,7 +62,7 @@ class FrontendUserGroupTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         */
        public function getTitleInitiallyReturnsGivenTitleFromConstruct() {
                $title = 'foo bar';
-               $this->fixture = new \Tx_Extbase_Domain_Model_FrontendUserGroup($title);
+               $this->fixture = new \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup($title);
                $this->assertSame($title, $this->fixture->getTitle());
        }
 
@@ -111,7 +111,7 @@ class FrontendUserGroupTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function addSubgroupAddsSubgroup() {
-               $group1 = new \Tx_Extbase_Domain_Model_FrontendUserGroup('foo');
+               $group1 = new \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup('foo');
                $this->assertEquals(count($this->fixture->getSubgroup()), 0);
                $this->fixture->addSubgroup($group1);
                $this->assertEquals(count($this->fixture->getSubgroup()), 1);
@@ -121,8 +121,8 @@ class FrontendUserGroupTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function removeSubgroupRemovesSubgroup() {
-               $group1 = new \Tx_Extbase_Domain_Model_FrontendUserGroup('foo');
-               $group2 = new \Tx_Extbase_Domain_Model_FrontendUserGroup('bar');
+               $group1 = new \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup('foo');
+               $group2 = new \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup('bar');
                $this->fixture->addSubgroup($group1);
                $this->fixture->addSubgroup($group2);
                $this->assertEquals(count($this->fixture->getSubgroup()), 2);
@@ -136,8 +136,8 @@ class FrontendUserGroupTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function setSubgroupSetsSubgroups() {
-               $subgroup = new \Tx_Extbase_Persistence_ObjectStorage();
-               $group = new \Tx_Extbase_Domain_Model_FrontendUserGroup('foo');
+               $subgroup = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
+               $group = new \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup('foo');
                $subgroup->attach($group);
                $this->fixture->setSubgroup($subgroup);
                $this->assertSame($subgroup, $this->fixture->getSubgroup());
index 37bad45..e9b3eb2 100644 (file)
@@ -49,7 +49,7 @@ class ResultTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
        /**
         * @param string $type
-        * @return PHPUnit_Framework_MockObject_MockObject
+        * @return \PHPUnit_Framework_MockObject_MockObject
         */
        protected function getMockMessage($type) {
                return $this->getMock('Tx_Extbase_Error_' . $type, array(), array(), '', FALSE);
index 879896a..6cfff37 100644 (file)
@@ -58,7 +58,7 @@ class CommandManagerTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @author Bastian Waidelich <bastian@typo3.org>
         */
        public function getAvailableCommandsReturnsAllAvailableCommands() {
-               $commandManager = new \Tx_Extbase_MVC_CLI_CommandManager();
+               $commandManager = new \TYPO3\CMS\Extbase\Mvc\Cli\CommandManager();
                $commandManager->injectObjectManager($this->mockObjectManager);
                $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['extbase']['commandControllers'] = array(
                        'TYPO3\\CMS\\Extbase\\Tests\\Unit\\Mvc\\Cli\\Fixture\\Command\\MockACommandController',
index 5c55fe2..5f0c2d2 100644 (file)
@@ -91,7 +91,7 @@ class CommandTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
        /**
         * @test
         * @dataProvider invalidCommandClassNames
-        * @expectedException InvalidArgumentException
+        * @expectedException \InvalidArgumentException
         * @param string $controllerClassName
         */
        public function constructThrowsExceptionIfCommandClassNameIsInvalid($controllerClassName) {
index 9cb75d6..d3b8327 100644 (file)
@@ -35,7 +35,7 @@ class ArgumentBehaviorBeforeExtbase14Test extends \TYPO3\CMS\Extbase\Tests\Unit\
 
        /**
         * @test
-        * @expectedException InvalidArgumentException
+        * @expectedException \InvalidArgumentException
         */
        public function constructingArgumentWithoutNameThrowsException() {
                new \TYPO3\CMS\Extbase\Mvc\Controller\Argument(NULL, 'Text');
@@ -43,7 +43,7 @@ class ArgumentBehaviorBeforeExtbase14Test extends \TYPO3\CMS\Extbase\Tests\Unit\
 
        /**
         * @test
-        * @expectedException InvalidArgumentException
+        * @expectedException \InvalidArgumentException
         */
        public function constructingArgumentWithInvalidNameThrowsException() {
                new \TYPO3\CMS\Extbase\Mvc\Controller\Argument(new \ArrayObject(), 'Text');
index 39fc36b..39a1290 100644 (file)
@@ -65,7 +65,7 @@ class ArgumentTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
        /**
         * @test
         * @author Robert Lemke <robert@typo3.org>
-        * @expectedException InvalidArgumentException
+        * @expectedException \InvalidArgumentException
         */
        public function constructingArgumentWithoutNameThrowsException() {
                new \TYPO3\CMS\Extbase\Mvc\Controller\Argument('', 'Text');
@@ -73,7 +73,7 @@ class ArgumentTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
        /**
         * @test
-        * @expectedException InvalidArgumentException
+        * @expectedException \InvalidArgumentException
         * @author Robert Lemke <robert@typo3.org>
         */
        public function constructingArgumentWithInvalidNameThrowsException() {
@@ -112,7 +112,7 @@ class ArgumentTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
        /**
         * @test
         * @dataProvider invalidShortNames
-        * @expectedException InvalidArgumentException
+        * @expectedException \InvalidArgumentException
         * @author Sebastian Kurfürst <sebastian@typo3.org>
         * @param string $invalidShortName
         */
index f13bc16..90d86c6 100644 (file)
@@ -221,7 +221,7 @@ class ArgumentsTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
        /**
         * @test
-        * @expectedException LogicException
+        * @expectedException \LogicException
         * @author Bastian Waidelich <bastian@typo3.org>
         */
        public function callingInvalidMethodThrowsException() {
index 4fd5ec9..b73f013 100644 (file)
@@ -59,7 +59,7 @@ class RequestTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
        /**
         * @test
-        * @expectedException Tx_Extbase_MVC_Exception_InvalidArgumentTypeException
+        * @expectedException \TYPO3\CMS\Extbase\Mvc\Exception\InvalidArgumentTypeException
         * @author Bastian Waidelich <bastian@typo3.org>
         */
        public function setArgumentThrowsExceptionIfTheGivenArgumentValueIsAnObject() {
index da391a3..37c39dc 100644 (file)
@@ -71,7 +71,7 @@ class UriBuilderTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
        public function setUp() {
                $this->tsfeBackup = $GLOBALS['TSFE'];
                $GLOBALS['TSFE'] = $this->getMock('TYPO3\\CMS\\Frontend\\Controller\\TypoScriptFrontendController', array(), array(), '', FALSE);
-               $this->getBackup = \t3lib_div::_GET();
+               $this->getBackup = \TYPO3\CMS\Core\Utility\GeneralUtility::_GET();
                $this->mockContentObject = $this->getMock('TYPO3\\CMS\\Frontend\\ContentObject\\ContentObjectRenderer');
                $this->mockRequest = $this->getMock('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Request');
                $this->mockExtensionService = $this->getMock('TYPO3\\CMS\\Extbase\\Service\\ExtensionService');
@@ -85,7 +85,7 @@ class UriBuilderTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
        public function tearDown() {
                $GLOBALS['TSFE'] = $this->tsfeBackup;
-               \t3lib_div::_GETset($this->getBackup);
+               \TYPO3\CMS\Core\Utility\GeneralUtility::_GETset($this->getBackup);
        }
 
        /**
@@ -188,7 +188,7 @@ class UriBuilderTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function buildBackendUriKeepsQueryParametersIfAddQueryStringIsSet() {
-               \t3lib_div::_GETset(array('M' => 'moduleKey', 'id' => 'pageId', 'foo' => 'bar'));
+               \TYPO3\CMS\Core\Utility\GeneralUtility::_GETset(array('M' => 'moduleKey', 'id' => 'pageId', 'foo' => 'bar'));
                $this->uriBuilder->setAddQueryString(TRUE);
                $expectedResult = 'mod.php?M=moduleKey&id=pageId&foo=bar';
                $actualResult = $this->uriBuilder->buildBackendUri();
@@ -199,7 +199,7 @@ class UriBuilderTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function buildBackendUriRemovesSpecifiedQueryParametersIfArgumentsToBeExcludedFromQueryStringIsSet() {
-               \t3lib_div::_GETset(array('M' => 'moduleKey', 'id' => 'pageId', 'foo' => 'bar'));
+               \TYPO3\CMS\Core\Utility\GeneralUtility::_GETset(array('M' => 'moduleKey', 'id' => 'pageId', 'foo' => 'bar'));
                $this->uriBuilder->setAddQueryString(TRUE);
                $this->uriBuilder->setArgumentsToBeExcludedFromQueryString(array('M', 'id'));
                $expectedResult = 'mod.php?foo=bar';
@@ -211,7 +211,7 @@ class UriBuilderTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function buildBackendUriKeepsModuleQueryParametersIfAddQueryStringIsNotSet() {
-               \t3lib_div::_GETset(array('M' => 'moduleKey', 'id' => 'pageId', 'foo' => 'bar'));
+               \TYPO3\CMS\Core\Utility\GeneralUtility::_GETset(array('M' => 'moduleKey', 'id' => 'pageId', 'foo' => 'bar'));
                $expectedResult = 'mod.php?M=moduleKey&id=pageId';
                $actualResult = $this->uriBuilder->buildBackendUri();
                $this->assertEquals($expectedResult, $actualResult);
@@ -221,7 +221,7 @@ class UriBuilderTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function buildBackendUriMergesAndOverrulesQueryParametersWithArguments() {
-               \t3lib_div::_GETset(array('M' => 'moduleKey', 'id' => 'pageId', 'foo' => 'bar'));
+               \TYPO3\CMS\Core\Utility\GeneralUtility::_GETset(array('M' => 'moduleKey', 'id' => 'pageId', 'foo' => 'bar'));
                $this->uriBuilder->setArguments(array('M' => 'overwrittenModuleKey', 'somePrefix' => array('bar' => 'baz')));
                $expectedResult = 'mod.php?M=overwrittenModuleKey&id=pageId&somePrefix%5Bbar%5D=baz';
                $actualResult = $this->uriBuilder->buildBackendUri();
@@ -232,7 +232,7 @@ class UriBuilderTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function buildBackendUriConvertsDomainObjectsAfterArgumentsHaveBeenMerged() {
-               \t3lib_div::_GETset(array('M' => 'moduleKey'));
+               \TYPO3\CMS\Core\Utility\GeneralUtility::_GETset(array('M' => 'moduleKey'));
                $mockDomainObject = $this->getMock($this->buildAccessibleProxy('TYPO3\\CMS\\Extbase\\DomainObject\\AbstractEntity'), array('dummy'));
                $mockDomainObject->_set('uid', '123');
                $this->uriBuilder->setArguments(array('somePrefix' => array('someDomainObject' => $mockDomainObject)));
@@ -245,7 +245,7 @@ class UriBuilderTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function buildBackendUriRespectsSection() {
-               \t3lib_div::_GETset(array('M' => 'moduleKey'));
+               \TYPO3\CMS\Core\Utility\GeneralUtility::_GETset(array('M' => 'moduleKey'));
                $this->uriBuilder->setSection('someSection');
                $expectedResult = 'mod.php?M=moduleKey#someSection';
                $actualResult = $this->uriBuilder->buildBackendUri();
@@ -256,7 +256,7 @@ class UriBuilderTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function buildBackendUriCreatesAbsoluteUrisIfSpecified() {
-               \t3lib_div::_GETset(array('M' => 'moduleKey'));
+               \TYPO3\CMS\Core\Utility\GeneralUtility::_GETset(array('M' => 'moduleKey'));
                $this->mockRequest->expects($this->any())->method('getBaseUri')->will($this->returnValue('http://baseuri/' . TYPO3_mainDir));
                $this->uriBuilder->setCreateAbsoluteUri(TRUE);
                $expectedResult = ('http://baseuri/' . TYPO3_mainDir) . 'mod.php?M=moduleKey';
index 65482de..1d29012 100644 (file)
@@ -47,7 +47,7 @@ class ClassInfoFactoryTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
         */
        public function setUp() {
-               $this->classInfoFactory = new \Tx_Extbase_Object_Container_ClassInfoFactory();
+               $this->classInfoFactory = new \TYPO3\CMS\Extbase\Object\Container\ClassInfoFactory();
        }
 
        /**
index c5c6467..35f7f11 100644 (file)
@@ -367,7 +367,7 @@ class DataMapFactoryTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
                        'Tx_SampleExt_Domain_Model_LevelTwo2',
                        'Tx_SampleExt_Domain_Model_LevelOne2'
                );
-               /** @var $configurationManager Tx_Extbase_Configuration_ConfigurationManager|PHPUnit_Framework_MockObject_MockObject */
+               /** @var $configurationManager \TYPO3\CMS\Extbase\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject */
                $configurationManager = $this->getMock('TYPO3\\CMS\\Extbase\\Configuration\\ConfigurationManager');
                $configurationManager->expects($this->once())->method('getConfiguration')->with('Framework')->will($this->returnValue($configuration));
                $dataMapFactory = $this->getAccessibleMock('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Mapper\\DataMapFactory', array('test'));
index cd1240d..6ee72cd 100644 (file)
@@ -99,7 +99,7 @@ class QueryTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
        /**
         * @test
-        * @expectedException InvalidArgumentException
+        * @expectedException \InvalidArgumentException
         */
        public function setLimitAcceptsOnlyIntegers() {
                $this->query->setLimit(1.5);
@@ -107,7 +107,7 @@ class QueryTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
        /**
         * @test
-        * @expectedException InvalidArgumentException
+        * @expectedException \InvalidArgumentException
         */
        public function setLimitRejectsIntegersLessThanOne() {
                $this->query->setLimit(0);
@@ -115,7 +115,7 @@ class QueryTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
        /**
         * @test
-        * @expectedException InvalidArgumentException
+        * @expectedException \InvalidArgumentException
         */
        public function setOffsetAcceptsOnlyIntegers() {
                $this->query->setOffset(1.5);
@@ -123,7 +123,7 @@ class QueryTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
        /**
         * @test
-        * @expectedException InvalidArgumentException
+        * @expectedException \InvalidArgumentException
         */
        public function setOffsetRejectsIntegersLessThanZero() {
                $this->query->setOffset(-1);
index 9e1df0f..387d6b6 100644 (file)
@@ -381,7 +381,7 @@ class Typo3DbBackendTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
                $languageUid = 2;
                $workspaceUid = 2;
                $sourceMock = new \TYPO3\CMS\Extbase\Persistence\Generic\Qom\Selector('tx_foo', 'Tx_Foo');
-               /** @var $pageSelectMock t3lib_pageSelect|PHPUnit_Framework_MockObject_MockObject */
+               /** @var $pageSelectMock \TYPO3\CMS\Frontend\Page\PageRepository|\PHPUnit_Framework_MockObject_MockObject */
                $pageSelectMock = $this->getMock('TYPO3\\CMS\\Frontend\\Page\\PageRepository', array('movePlhOL', 'getWorkspaceVersionOfRecord'));
                $pageSelectMock->versioningPreview = TRUE;
                $pageSelectMock->expects($this->once())->method('getWorkspaceVersionOfRecord')->with($workspaceUid, 'tx_foo', '42')->will($this->returnValue($workspaceVersion));
index 6dd544f..d086a1b 100644 (file)
@@ -98,7 +98,7 @@ class PropertyMapperTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @param boolean $canConvertFrom
         * @param array $properties
         * @param string $typeOfSubObject
-        * @return PHPUnit_Framework_MockObject_MockObject
+        * @return \PHPUnit_Framework_MockObject_MockObject
         */
        protected function getMockTypeConverter($name = '', $canConvertFrom = TRUE, $properties = array(), $typeOfSubObject = '') {
                $mockTypeConverter = $this->getMock('TYPO3\\CMS\\Extbase\\Property\\TypeConverterInterface');
@@ -282,6 +282,8 @@ class PropertyMapperTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @param mixed $expectedTypeConverter
         * @param mixed $typeConverters
         * @param boolean $shouldFailWithException
+        * @throws \Exception
+        * @return void
         */
        public function findTypeConverterShouldReturnConverterForTargetObjectIfItExists($targetClass, $expectedTypeConverter, $typeConverters, $shouldFailWithException = FALSE) {
                $mockTypeHandlingService = $this->getMock('TYPO3\\CMS\\Extbase\\Service\\TypeHandlingService');
index 2d90bd3..ff5a86e 100644 (file)
@@ -36,7 +36,7 @@ class PropertyMappingConfigurationBuilderTest extends \TYPO3\CMS\Extbase\Tests\U
        protected $propertyMappingConfigurationBuilder;
 
        public function setUp() {
-               $this->propertyMappingConfigurationBuilder = new \Tx_Extbase_Property_PropertyMappingConfigurationBuilder();
+               $this->propertyMappingConfigurationBuilder = new \TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationBuilder();
        }
 
        /**
@@ -45,10 +45,10 @@ class PropertyMappingConfigurationBuilderTest extends \TYPO3\CMS\Extbase\Tests\U
         */
        public function getTargetPropertyNameShouldReturnTheUnmodifiedPropertyNameWithoutConfiguration() {
                $defaultConfiguration = $this->propertyMappingConfigurationBuilder->build();
-               $this->assertTrue($defaultConfiguration->getConfigurationValue('TYPO3\\CMS\\Extbase\\Property\\TypeConverter\\PersistentObjectConverter', \Tx_Extbase_Property_TypeConverter_PersistentObjectConverter::CONFIGURATION_CREATION_ALLOWED));
-               $this->assertTrue($defaultConfiguration->getConfigurationValue('TYPO3\\CMS\\Extbase\\Property\\TypeConverter\\PersistentObjectConverter', \Tx_Extbase_Property_TypeConverter_PersistentObjectConverter::CONFIGURATION_MODIFICATION_ALLOWED));
-               $this->assertNull($defaultConfiguration->getConfigurationFor('foo')->getConfigurationValue('TYPO3\\CMS\\Extbase\\Property\\TypeConverter\\PersistentObjectConverter', \Tx_Extbase_Property_TypeConverter_PersistentObjectConverter::CONFIGURATION_CREATION_ALLOWED));
-               $this->assertNull($defaultConfiguration->getConfigurationFor('foo')->getConfigurationValue('TYPO3\\CMS\\Extbase\\Property\\TypeConverter\\PersistentObjectConverter', \Tx_Extbase_Property_TypeConverter_PersistentObjectConverter::CONFIGURATION_MODIFICATION_ALLOWED));
+               $this->assertTrue($defaultConfiguration->getConfigurationValue('TYPO3\\CMS\\Extbase\\Property\\TypeConverter\\PersistentObjectConverter', \TYPO3\CMS\Extbase\Property\TypeConverter\PersistentObjectConverter::CONFIGURATION_CREATION_ALLOWED));
+               $this->assertTrue($defaultConfiguration->getConfigurationValue('TYPO3\\CMS\\Extbase\\Property\\TypeConverter\\PersistentObjectConverter', \TYPO3\CMS\Extbase\Property\TypeConverter\PersistentObjectConverter::CONFIGURATION_MODIFICATION_ALLOWED));
+               $this->assertNull($defaultConfiguration->getConfigurationFor('foo')->getConfigurationValue('TYPO3\\CMS\\Extbase\\Property\\TypeConverter\\PersistentObjectConverter', \TYPO3\CMS\Extbase\Property\TypeConverter\PersistentObjectConverter::CONFIGURATION_CREATION_ALLOWED));
+               $this->assertNull($defaultConfiguration->getConfigurationFor('foo')->getConfigurationValue('TYPO3\\CMS\\Extbase\\Property\\TypeConverter\\PersistentObjectConverter', \TYPO3\CMS\Extbase\Property\TypeConverter\PersistentObjectConverter::CONFIGURATION_MODIFICATION_ALLOWED));
        }
 
 }
index 2068a50..632a20b 100644 (file)
@@ -36,13 +36,13 @@ class PropertyMappingConfigurationTest extends \TYPO3\CMS\Extbase\Tests\Unit\Bas
        protected $propertyMappingConfiguration;
 
        public function setUp() {
-               $this->propertyMappingConfiguration = new \Tx_Extbase_Property_PropertyMappingConfiguration();
+               $this->propertyMappingConfiguration = new \TYPO3\CMS\Extbase\Property\PropertyMappingConfiguration();
        }
 
        /**
         * @test
         * @author Sebastian Kurfürst <sebastian@typo3.org>
-        * @covers Tx_Extbase_Property_PropertyMappingConfiguration::getTargetPropertyName
+        * @covers \TYPO3\CMS\Extbase\Property\PropertyMappingConfiguration::getTargetPropertyName
         */
        public function getTargetPropertyNameShouldReturnTheUnmodifiedPropertyNameWithoutConfiguration() {
                $this->assertEquals('someSourceProperty', $this->propertyMappingConfiguration->getTargetPropertyName('someSourceProperty'));
@@ -51,7 +51,7 @@ class PropertyMappingConfigurationTest extends \TYPO3\CMS\Extbase\Tests\Unit\Bas
 
        /**
         * @test
-        * @covers Tx_Extbase_Property_PropertyMappingConfiguration::shouldMap
+        * @covers \TYPO3\CMS\Extbase\Property\PropertyMappingConfiguration::shouldMap
         * @author Sebastian Kurfürst <sebastian@typo3.org>
         */
        public function shouldMapReturnsTrue() {
index ee03096..f143285 100644 (file)
@@ -43,7 +43,7 @@ class PersistentObjectConverterTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTe
        protected $mockObjectManager;
 
        public function setUp() {
-               $this->converter = new \Tx_Extbase_Property_TypeConverter_PersistentObjectConverter();
+               $this->converter = new \TYPO3\CMS\Extbase\Property\TypeConverter\PersistentObjectConverter();
                $this->mockReflectionService = $this->getMock('TYPO3\\CMS\\Extbase\\Reflection\\Service');
                $this->converter->injectReflectionService($this->mockReflectionService);
                $this->mockPersistenceManager = $this->getMock('TYPO3\\CMS\\Extbase\\Persistence\\PersistenceManagerInterface');
@@ -144,7 +144,7 @@ class PersistentObjectConverterTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTe
        public function getTypeOfChildPropertyShouldUseConfiguredTypeIfItWasSet() {
                $this->mockReflectionService->expects($this->never())->method('getClassSchema');
                $configuration = $this->buildConfiguration(array());
-               $configuration->forProperty('thePropertyName')->setTypeConverterOption('TYPO3\\CMS\\Extbase\\Property\\TypeConverter\\PersistentObjectConverter', \Tx_Extbase_Property_TypeConverter_PersistentObjectConverter::CONFIGURATION_TARGET_TYPE, 'Foo\\Bar');
+               $configuration->forProperty('thePropertyName')->setTypeConverterOption('TYPO3\\CMS\\Extbase\\Property\\TypeConverter\\PersistentObjectConverter', \TYPO3\CMS\Extbase\Property\TypeConverter\PersistentObjectConverter::CONFIGURATION_TARGET_TYPE, 'Foo\\Bar');
                $this->assertEquals('Foo\\Bar', $this->converter->getTypeOfChildProperty('foo', 'thePropertyName', $configuration));
        }
 
@@ -195,7 +195,7 @@ class PersistentObjectConverterTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTe
         * @return \TYPO3\CMS\Extbase\Property\PropertyMappingConfiguration
         */
        protected function buildConfiguration($typeConverterOptions) {
-               $configuration = new \Tx_Extbase_Property_PropertyMappingConfiguration();
+               $configuration = new \TYPO3\CMS\Extbase\Property\PropertyMappingConfiguration();
                $configuration->setTypeConverterOptions('TYPO3\\CMS\\Extbase\\Property\\TypeConverter\\PersistentObjectConverter', $typeConverterOptions);
                return $configuration;
        }
@@ -206,7 +206,7 @@ class PersistentObjectConverterTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTe
         */
        public function convertFromShouldCloneTheFetchedObjectIfObjectNeedsToBeModified() {
                $identifier = '12345';
-               $object = new \Tx_Extbase_Fixtures_ClassWithSetters();
+               $object = new \TYPO3\CMS\Extbase\Tests\Fixture\ClassWithSetters();
                $object->someProperty = 'asdf';
                $source = array(
                        '__identity' => $identifier,
@@ -216,7 +216,7 @@ class PersistentObjectConverterTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTe
                        'property1' => 'someConvertedValue'
                );
                $this->mockPersistenceManager->expects($this->once())->method('getObjectByIdentifier')->with($identifier)->will($this->returnValue($object));
-               $configuration = $this->buildConfiguration(array(\Tx_Extbase_Property_TypeConverter_PersistentObjectConverter::CONFIGURATION_MODIFICATION_ALLOWED => TRUE));
+               $configuration = $this->buildConfiguration(array(\TYPO3\CMS\Extbase\Property\TypeConverter\PersistentObjectConverter::CONFIGURATION_MODIFICATION_ALLOWED => TRUE));
                $actual = $this->converter->convertFrom($source, 'MySpecialType', $convertedChildProperties, $configuration);
                $this->assertNotSame($object, $actual, 'The object has not been cloned.');
                $this->assertEquals('asdf', $actual->someProperty, 'The object somehow lost its current state.');
@@ -226,7 +226,7 @@ class PersistentObjectConverterTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTe
        /**
         * @param integer $numberOfResults
         * @param Matcher $howOftenIsGetFirstCalled
-        * @return stdClass
+        * @return \stdClass
         * @author Bastian Waidelich <bastian@typo3.org>
         * @author Sebastian Kurfürst <sebastian@typo3.org>
         */
@@ -267,13 +267,13 @@ class PersistentObjectConverterTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTe
                $source = array(
                        'propertyX' => 'bar'
                );
-               $object = new \Tx_Extbase_Fixtures_ClassWithSetters();
+               $object = new \TYPO3\CMS\Extbase\Tests\Fixture\ClassWithSetters();
                $convertedChildProperties = array(
                        'property1' => 'bar'
                );
                $this->mockObjectManager->expects($this->once())->method('create')->with('TYPO3\\CMS\\Extbase\\Tests\\Fixture\\ClassWithSetters')->will($this->returnValue($object));
                $this->mockReflectionService->expects($this->once())->method('getMethodParameters')->with('TYPO3\\CMS\\Extbase\\Tests\\Fixture\\ClassWithSetters', '__construct')->will($this->returnValue(array()));
-               $configuration = $this->buildConfiguration(array(\Tx_Extbase_Property_TypeConverter_PersistentObjectConverter::CONFIGURATION_CREATION_ALLOWED => TRUE));
+               $configuration = $this->buildConfiguration(array(\TYPO3\CMS\Extbase\Property\TypeConverter\PersistentObjectConverter::CONFIGURATION_CREATION_ALLOWED => TRUE));
                $result = $this->converter->convertFrom($source, 'TYPO3\\CMS\\Extbase\\Tests\\Fixture\\ClassWithSetters', $convertedChildProperties, $configuration);
                $this->assertSame($object, $result);
        }
@@ -287,7 +287,7 @@ class PersistentObjectConverterTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTe
                $model = new $className();
                $convertedChildProperties = array('property1' => 'bar');
                $this->mockObjectManager->expects($this->once())->method('create')->with($className)->will($this->returnValue($model));
-               $configuration = $this->buildConfiguration(array(\Tx_Extbase_Property_TypeConverter_PersistentObjectConverter::CONFIGURATION_CREATION_ALLOWED => TRUE));
+               $configuration = $this->buildConfiguration(array(\TYPO3\CMS\Extbase\Property\TypeConverter\PersistentObjectConverter::CONFIGURATION_CREATION_ALLOWED => TRUE));
                $reflectionException = new \ReflectionException(('Method ' . $className) . '::__construct() does not exist');
                $this->mockReflectionService->expects($this->once())->method('getMethodParameters')->with($className, '__construct')->will($this->throwException($reflectionException));
                $result = $this->converter->convertFrom($source, $className, $convertedChildProperties, $configuration);
@@ -303,13 +303,13 @@ class PersistentObjectConverterTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTe
                $source = array(
                        'propertyX' => 'bar'
                );
-               $object = new \Tx_Extbase_Fixtures_ClassWithSetters();
+               $object = new \TYPO3\CMS\Extbase\Tests\Fixture\ClassWithSetters();
                $convertedChildProperties = array(
                        'propertyNotExisting' => 'bar'
                );
                $this->mockObjectManager->expects($this->once())->method('create')->with('TYPO3\\CMS\\Extbase\\Tests\\Fixture\\ClassWithSetters')->will($this->returnValue($object));
                $this->mockReflectionService->expects($this->once())->method('getMethodParameters')->with('TYPO3\\CMS\\Extbase\\Tests\\Fixture\\ClassWithSetters', '__construct')->will($this->returnValue(array()));
-               $configuration = $this->buildConfiguration(array(\Tx_Extbase_Property_TypeConverter_PersistentObjectConverter::CONFIGURATION_CREATION_ALLOWED => TRUE));
+               $configuration = $this->buildConfiguration(array(\TYPO3\CMS\Extbase\Property\TypeConverter\PersistentObjectConverter::CONFIGURATION_CREATION_ALLOWED => TRUE));
                $result = $this->converter->convertFrom($source, 'TYPO3\\CMS\\Extbase\\Tests\\Fixture\\ClassWithSetters', $convertedChildProperties, $configuration);
                $this->assertSame($object, $result);
        }
@@ -322,7 +322,7 @@ class PersistentObjectConverterTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTe
                $source = array(
                        'propertyX' => 'bar'
                );
-               $object = new \Tx_Extbase_Fixtures_ClassWithSettersAndConstructor('param1');
+               $object = new \TYPO3\CMS\Extbase\Tests\Fixture\ClassWithSettersAndConstructor('param1');
                $convertedChildProperties = array(
                        'property1' => 'param1',
                        'property2' => 'bar'
@@ -331,7 +331,7 @@ class PersistentObjectConverterTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTe
                $this->mockReflectionService->expects($this->once())->method('getMethodParameters')->with('TYPO3\\CMS\\Extbase\\Tests\\Fixture\\ClassWithSettersAndConstructor', '__construct')->will($this->returnValue(array(
                        'property1' => array('optional' => FALSE)
                )));
-               $configuration = $this->buildConfiguration(array(\Tx_Extbase_Property_TypeConverter_PersistentObjectConverter::CONFIGURATION_CREATION_ALLOWED => TRUE));
+               $configuration = $this->buildConfiguration(array(\TYPO3\CMS\Extbase\Property\TypeConverter\PersistentObjectConverter::CONFIGURATION_CREATION_ALLOWED => TRUE));
                $result = $this->converter->convertFrom($source, 'TYPO3\\CMS\\Extbase\\Tests\\Fixture\\ClassWithSettersAndConstructor', $convertedChildProperties, $configuration);
                $this->assertSame($object, $result);
                $this->assertEquals('bar', $object->getProperty2());
@@ -345,12 +345,12 @@ class PersistentObjectConverterTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTe
                $source = array(
                        'propertyX' => 'bar'
                );
-               $object = new \Tx_Extbase_Fixtures_ClassWithSettersAndConstructor('param1');
+               $object = new \TYPO3\CMS\Extbase\Tests\Fixture\ClassWithSettersAndConstructor('param1');
                $this->mockObjectManager->expects($this->once())->method('create')->with('TYPO3\\CMS\\Extbase\\Tests\\Fixture\\ClassWithSettersAndConstructor', 'thisIsTheDefaultValue')->will($this->returnValue($object));
                $this->mockReflectionService->expects($this->once())->method('getMethodParameters')->with('TYPO3\\CMS\\Extbase\\Tests\\Fixture\\ClassWithSettersAndConstructor', '__construct')->will($this->returnValue(array(
                        'property1' => array('optional' => TRUE, 'defaultValue' => 'thisIsTheDefaultValue')
                )));
-               $configuration = $this->buildConfiguration(array(\Tx_Extbase_Property_TypeConverter_PersistentObjectConverter::CONFIGURATION_CREATION_ALLOWED => TRUE));
+               $configuration = $this->buildConfiguration(array(\TYPO3\CMS\Extbase\Property\TypeConverter\PersistentObjectConverter::CONFIGURATION_CREATION_ALLOWED => TRUE));
                $result = $this->converter->convertFrom($source, 'TYPO3\\CMS\\Extbase\\Tests\\Fixture\\ClassWithSettersAndConstructor', array(), $configuration);
                $this->assertSame($object, $result);
        }
@@ -364,14 +364,14 @@ class PersistentObjectConverterTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTe
                $source = array(
                        'propertyX' => 'bar'
                );
-               $object = new \Tx_Extbase_Fixtures_ClassWithSettersAndConstructor('param1');
+               $object = new \TYPO3\CMS\Extbase\Tests\Fixture\ClassWithSettersAndConstructor('param1');
                $convertedChildProperties = array(
                        'property2' => 'bar'
                );
                $this->mockReflectionService->expects($this->once())->method('getMethodParameters')->with('TYPO3\\CMS\\Extbase\\Tests\\Fixture\\ClassWithSettersAndConstructor', '__construct')->will($this->returnValue(array(
                        'property1' => array('optional' => FALSE)
                )));
-               $configuration = $this->buildConfiguration(array(\Tx_Extbase_Property_TypeConverter_PersistentObjectConverter::CONFIGURATION_CREATION_ALLOWED => TRUE));
+               $configuration = $this->buildConfiguration(array(\TYPO3\CMS\Extbase\Property\TypeConverter\PersistentObjectConverter::CONFIGURATION_CREATION_ALLOWED => TRUE));
                $result = $this->converter->convertFrom($source, 'TYPO3\\CMS\\Extbase\\Tests\\Fixture\\ClassWithSettersAndConstructor', $convertedChildProperties, $configuration);
                $this->assertSame($object, $result);
        }
index daa81ee..818e41e 100644 (file)
@@ -36,7 +36,7 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
        protected $dummyObject;
 
        public function setUp() {
-               $this->dummyObject = new \Tx_Extbase_Tests_Unit_Reflection_Fixture_DummyClassWithGettersAndSetters();
+               $this->dummyObject = new \TYPO3\CMS\Extbase\Tests\Unit\Reflection\Fixture\DummyClassWithGettersAndSetters();
                $this->dummyObject->setProperty('string1');
                $this->dummyObject->setAnotherProperty(42);
                $this->dummyObject->shouldNotBePickedUp = TRUE;
@@ -46,7 +46,7 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function getPropertyReturnsExpectedValueForGetterProperty() {
-               $property = \Tx_Extbase_Reflection_ObjectAccess::getProperty($this->dummyObject, 'property');
+               $property = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getProperty($this->dummyObject, 'property');
                $this->assertEquals($property, 'string1');
        }
 
@@ -54,7 +54,7 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function getPropertyReturnsExpectedValueForPublicProperty() {
-               $property = \Tx_Extbase_Reflection_ObjectAccess::getProperty($this->dummyObject, 'publicProperty2');
+               $property = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getProperty($this->dummyObject, 'publicProperty2');
                $this->assertEquals($property, 42, 'A property of a given object was not returned correctly.');
        }
 
@@ -62,7 +62,7 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function getPropertyReturnsExpectedValueForUnexposedPropertyIfForceDirectAccessIsTrue() {
-               $property = \Tx_Extbase_Reflection_ObjectAccess::getProperty($this->dummyObject, 'unexposedProperty', TRUE);
+               $property = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getProperty($this->dummyObject, 'unexposedProperty', TRUE);
                $this->assertEquals($property, 'unexposed', 'A property of a given object was not returned correctly.');
        }
 
@@ -71,7 +71,7 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         */
        public function getPropertyReturnsExpectedValueForUnknownPropertyIfForceDirectAccessIsTrue() {
                $this->dummyObject->unknownProperty = 'unknown';
-               $property = \Tx_Extbase_Reflection_ObjectAccess::getProperty($this->dummyObject, 'unknownProperty', TRUE);
+               $property = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getProperty($this->dummyObject, 'unknownProperty', TRUE);
                $this->assertEquals($property, 'unknown', 'A property of a given object was not returned correctly.');
        }
 
@@ -80,7 +80,7 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @expectedException \TYPO3\CMS\Extbase\Reflection\Exception\PropertyNotAccessibleException
         */
        public function getPropertyReturnsPropertyNotAccessibleExceptionForNotExistingPropertyIfForceDirectAccessIsTrue() {
-               $property = \Tx_Extbase_Reflection_ObjectAccess::getProperty($this->dummyObject, 'notExistingProperty', TRUE);
+               $property = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getProperty($this->dummyObject, 'notExistingProperty', TRUE);
        }
 
        /**
@@ -88,7 +88,7 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @expectedException \TYPO3\CMS\Extbase\Reflection\Exception\PropertyNotAccessibleException
         */
        public function getPropertyReturnsThrowsExceptionIfPropertyDoesNotExist() {
-               \Tx_Extbase_Reflection_ObjectAccess::getProperty($this->dummyObject, 'notExistingProperty');
+               \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getProperty($this->dummyObject, 'notExistingProperty');
        }
 
        /**
@@ -96,45 +96,45 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @expectedException \TYPO3\CMS\Extbase\Reflection\Exception\PropertyNotAccessibleException
         */
        public function getPropertyReturnsThrowsExceptionIfArrayKeyDoesNotExist() {
-               \Tx_Extbase_Reflection_ObjectAccess::getProperty(array(), 'notExistingProperty');
+               \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getProperty(array(), 'notExistingProperty');
        }
 
        /**
         * @test
         */
        public function getPropertyTriesToCallABooleanGetterMethodIfItExists() {
-               $property = \Tx_Extbase_Reflection_ObjectAccess::getProperty($this->dummyObject, 'booleanProperty');
+               $property = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getProperty($this->dummyObject, 'booleanProperty');
                $this->assertTrue($property);
        }
 
        /**
         * @test
-        * @expectedException InvalidArgumentException
+        * @expectedException \InvalidArgumentException
         */
        public function getPropertyThrowsExceptionIfThePropertyNameIsNotAString() {
-               \Tx_Extbase_Reflection_ObjectAccess::getProperty($this->dummyObject, new \ArrayObject());
+               \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getProperty($this->dummyObject, new \ArrayObject());
        }
 
        /**
         * @test
-        * @expectedException InvalidArgumentException
+        * @expectedException \InvalidArgumentException
         */
        public function setPropertyThrowsExceptionIfThePropertyNameIsNotAString() {
-               \Tx_Extbase_Reflection_ObjectAccess::setProperty($this->dummyObject, new \ArrayObject(), 42);
+               \TYPO3\CMS\Extbase\Reflection\ObjectAccess::setProperty($this->dummyObject, new \ArrayObject(), 42);
        }
 
        /**
         * @test
         */
        public function setPropertyReturnsFalseIfPropertyIsNotAccessible() {
-               $this->assertFalse(\Tx_Extbase_Reflection_ObjectAccess::setProperty($this->dummyObject, 'protectedProperty', 42));
+               $this->assertFalse(\TYPO3\CMS\Extbase\Reflection\ObjectAccess::setProperty($this->dummyObject, 'protectedProperty', 42));
        }
 
        /**
         * @test
         */
        public function setPropertySetsValueIfPropertyIsNotAccessibleWhenForceDirectAccessIsTrue() {
-               $this->assertTrue(\Tx_Extbase_Reflection_ObjectAccess::setProperty($this->dummyObject, 'unexposedProperty', 'was set anyway', TRUE));
+               $this->assertTrue(\TYPO3\CMS\Extbase\Reflection\ObjectAccess::setProperty($this->dummyObject, 'unexposedProperty', 'was set anyway', TRUE));
                $this->assertAttributeEquals('was set anyway', 'unexposedProperty', $this->dummyObject);
        }
 
@@ -142,7 +142,7 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function setPropertySetsValueIfPropertyDoesNotExistWhenForceDirectAccessIsTrue() {
-               $this->assertTrue(\Tx_Extbase_Reflection_ObjectAccess::setProperty($this->dummyObject, 'unknownProperty', 'was set anyway', TRUE));
+               $this->assertTrue(\TYPO3\CMS\Extbase\Reflection\ObjectAccess::setProperty($this->dummyObject, 'unknownProperty', 'was set anyway', TRUE));
                $this->assertAttributeEquals('was set anyway', 'unknownProperty', $this->dummyObject);
        }
 
@@ -150,7 +150,7 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function setPropertyCallsASetterMethodToSetThePropertyValueIfOneIsAvailable() {
-               \Tx_Extbase_Reflection_ObjectAccess::setProperty($this->dummyObject, 'property', 4242);
+               \TYPO3\CMS\Extbase\Reflection\ObjectAccess::setProperty($this->dummyObject, 'property', 4242);
                $this->assertEquals($this->dummyObject->getProperty(), 4242, 'setProperty does not work with setter.');
        }
 
@@ -158,7 +158,7 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function setPropertyWorksWithPublicProperty() {
-               \Tx_Extbase_Reflection_ObjectAccess::setProperty($this->dummyObject, 'publicProperty', 4242);
+               \TYPO3\CMS\Extbase\Reflection\ObjectAccess::setProperty($this->dummyObject, 'publicProperty', 4242);
                $this->assertEquals($this->dummyObject->publicProperty, 4242, 'setProperty does not work with public property.');
        }
 
@@ -168,8 +168,8 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
        public function setPropertyCanDirectlySetValuesInAnArrayObjectOrArray() {
                $arrayObject = new \ArrayObject();
                $array = array();
-               \Tx_Extbase_Reflection_ObjectAccess::setProperty($arrayObject, 'publicProperty', 4242);
-               \Tx_Extbase_Reflection_ObjectAccess::setProperty($array, 'key', 'value');
+               \TYPO3\CMS\Extbase\Reflection\ObjectAccess::setProperty($arrayObject, 'publicProperty', 4242);
+               \TYPO3\CMS\Extbase\Reflection\ObjectAccess::setProperty($array, 'key', 'value');
                $this->assertEquals(4242, $arrayObject['publicProperty']);
                $this->assertEquals('value', $array['key']);
        }
@@ -179,7 +179,7 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         */
        public function getPropertyCanAccessPropertiesOfAnArrayObject() {
                $arrayObject = new \ArrayObject(array('key' => 'value'));
-               $expected = \Tx_Extbase_Reflection_ObjectAccess::getProperty($arrayObject, 'key');
+               $expected = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getProperty($arrayObject, 'key');
                $this->assertEquals($expected, 'value', 'getProperty does not work with ArrayObject property.');
        }
 
@@ -187,8 +187,8 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function getPropertyCanAccessPropertiesOfAnObjectImplementingArrayAccess() {
-               $arrayAccessInstance = new \Tx_Extbase_Tests_Unit_Reflection_Fixture_ArrayAccessClass(array('key' => 'value'));
-               $expected = \Tx_Extbase_Reflection_ObjectAccess::getProperty($arrayAccessInstance, 'key');
+               $arrayAccessInstance = new \TYPO3\CMS\Extbase\Tests\Unit\Reflection\Fixture\ArrayAccessClass(array('key' => 'value'));
+               $expected = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getProperty($arrayAccessInstance, 'key');
                $this->assertEquals($expected, 'value', 'getPropertyPath does not work with Array Access property.');
        }
 
@@ -197,7 +197,7 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         */
        public function getPropertyCanAccessPropertiesOfAnArray() {
                $array = array('key' => 'value');
-               $expected = \Tx_Extbase_Reflection_ObjectAccess::getProperty($array, 'key');
+               $expected = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getProperty($array, 'key');
                $this->assertEquals($expected, 'value', 'getProperty does not work with Array property.');
        }
 
@@ -206,7 +206,7 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         */
        public function getPropertyPathCanAccessPropertiesOfAnArray() {
                $array = array('parent' => array('key' => 'value'));
-               $expected = \Tx_Extbase_Reflection_ObjectAccess::getPropertyPath($array, 'parent.key');
+               $expected = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getPropertyPath($array, 'parent.key');
                $this->assertEquals($expected, 'value', 'getPropertyPath does not work with Array property.');
        }
 
@@ -215,7 +215,7 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         */
        public function getPropertyPathCanAccessPropertiesOfAnObjectImplementingArrayAccess() {
                $array = array('parent' => new \ArrayObject(array('key' => 'value')));
-               $expected = \Tx_Extbase_Reflection_ObjectAccess::getPropertyPath($array, 'parent.key');
+               $expected = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getPropertyPath($array, 'parent.key');
                $this->assertEquals($expected, 'value', 'getPropertyPath does not work with Array Access property.');
        }
 
@@ -223,7 +223,7 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function getGettablePropertyNamesReturnsAllPropertiesWhichAreAvailable() {
-               $gettablePropertyNames = \Tx_Extbase_Reflection_ObjectAccess::getGettablePropertyNames($this->dummyObject);
+               $gettablePropertyNames = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getGettablePropertyNames($this->dummyObject);
                $expectedPropertyNames = array('anotherProperty', 'booleanProperty', 'property', 'property2', 'publicProperty', 'publicProperty2');
                $this->assertEquals($gettablePropertyNames, $expectedPropertyNames, 'getGettablePropertyNames returns not all gettable properties.');
        }
@@ -232,7 +232,7 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function getSettablePropertyNamesReturnsAllPropertiesWhichAreAvailable() {
-               $settablePropertyNames = \Tx_Extbase_Reflection_ObjectAccess::getSettablePropertyNames($this->dummyObject);
+               $settablePropertyNames = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getSettablePropertyNames($this->dummyObject);
                $expectedPropertyNames = array('anotherProperty', 'property', 'property2', 'publicProperty', 'publicProperty2', 'writeOnlyMagicProperty');
                $this->assertEquals($settablePropertyNames, $expectedPropertyNames, 'getSettablePropertyNames returns not all settable properties.');
        }
@@ -244,7 +244,7 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
                $stdClassObject = new \stdClass();
                $stdClassObject->property = 'string1';
                $stdClassObject->property2 = NULL;
-               $settablePropertyNames = \Tx_Extbase_Reflection_ObjectAccess::getSettablePropertyNames($stdClassObject);
+               $settablePropertyNames = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getSettablePropertyNames($stdClassObject);
                $expectedPropertyNames = array('property', 'property2');
                $this->assertEquals($expectedPropertyNames, $settablePropertyNames, 'getSettablePropertyNames returns not all settable properties.');
        }
@@ -253,7 +253,7 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function getGettablePropertiesReturnsTheCorrectValuesForAllProperties() {
-               $allProperties = \Tx_Extbase_Reflection_ObjectAccess::getGettableProperties($this->dummyObject);
+               $allProperties = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getGettableProperties($this->dummyObject);
                $expectedProperties = array(
                        'anotherProperty' => 42,
                        'booleanProperty' => TRUE,
@@ -273,7 +273,7 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
                $stdClassObject->property = 'string1';
                $stdClassObject->property2 = NULL;
                $stdClassObject->publicProperty2 = 42;
-               $allProperties = \Tx_Extbase_Reflection_ObjectAccess::getGettableProperties($stdClassObject);
+               $allProperties = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getGettableProperties($stdClassObject);
                $expectedProperties = array(
                        'property' => 'string1',
                        'property2' => NULL,
@@ -286,11 +286,11 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function isPropertySettableTellsIfAPropertyCanBeSet() {
-               $this->assertTrue(\Tx_Extbase_Reflection_ObjectAccess::isPropertySettable($this->dummyObject, 'writeOnlyMagicProperty'));
-               $this->assertTrue(\Tx_Extbase_Reflection_ObjectAccess::isPropertySettable($this->dummyObject, 'publicProperty'));
-               $this->assertTrue(\Tx_Extbase_Reflection_ObjectAccess::isPropertySettable($this->dummyObject, 'property'));
-               $this->assertFalse(\Tx_Extbase_Reflection_ObjectAccess::isPropertySettable($this->dummyObject, 'privateProperty'));
-               $this->assertFalse(\Tx_Extbase_Reflection_ObjectAccess::isPropertySettable($this->dummyObject, 'shouldNotBePickedUp'));
+               $this->assertTrue(\TYPO3\CMS\Extbase\Reflection\ObjectAccess::isPropertySettable($this->dummyObject, 'writeOnlyMagicProperty'));
+               $this->assertTrue(\TYPO3\CMS\Extbase\Reflection\ObjectAccess::isPropertySettable($this->dummyObject, 'publicProperty'));
+               $this->assertTrue(\TYPO3\CMS\Extbase\Reflection\ObjectAccess::isPropertySettable($this->dummyObject, 'property'));
+               $this->assertFalse(\TYPO3\CMS\Extbase\Reflection\ObjectAccess::isPropertySettable($this->dummyObject, 'privateProperty'));
+               $this->assertFalse(\TYPO3\CMS\Extbase\Reflection\ObjectAccess::isPropertySettable($this->dummyObject, 'shouldNotBePickedUp'));
        }
 
        /**
@@ -299,20 +299,20 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
        public function isPropertySettableWorksOnStdClass() {
                $stdClassObject = new \stdClass();
                $stdClassObject->property = 'foo';
-               $this->assertTrue(\Tx_Extbase_Reflection_ObjectAccess::isPropertySettable($stdClassObject, 'property'));
-               $this->assertFalse(\Tx_Extbase_Reflection_ObjectAccess::isPropertySettable($stdClassObject, 'undefinedProperty'));
+               $this->assertTrue(\TYPO3\CMS\Extbase\Reflection\ObjectAccess::isPropertySettable($stdClassObject, 'property'));
+               $this->assertFalse(\TYPO3\CMS\Extbase\Reflection\ObjectAccess::isPropertySettable($stdClassObject, 'undefinedProperty'));
        }
 
        /**
         * @test
         */
        public function isPropertyGettableTellsIfAPropertyCanBeRetrieved() {
-               $this->assertTrue(\Tx_Extbase_Reflection_ObjectAccess::isPropertyGettable($this->dummyObject, 'publicProperty'));
-               $this->assertTrue(\Tx_Extbase_Reflection_ObjectAccess::isPropertyGettable($this->dummyObject, 'property'));
-               $this->assertTrue(\Tx_Extbase_Reflection_ObjectAccess::isPropertyGettable($this->dummyObject, 'booleanProperty'));
-               $this->assertFalse(\Tx_Extbase_Reflection_ObjectAccess::isPropertyGettable($this->dummyObject, 'privateProperty'));
-               $this->assertFalse(\Tx_Extbase_Reflection_ObjectAccess::isPropertyGettable($this->dummyObject, 'writeOnlyMagicProperty'));
-               $this->assertFalse(\Tx_Extbase_Reflection_ObjectAccess::isPropertyGettable($this->dummyObject, 'shouldNotBePickedUp'));
+               $this->assertTrue(\TYPO3\CMS\Extbase\Reflection\ObjectAccess::isPropertyGettable($this->dummyObject, 'publicProperty'));
+               $this->assertTrue(\TYPO3\CMS\Extbase\Reflection\ObjectAccess::isPropertyGettable($this->dummyObject, 'property'));
+               $this->assertTrue(\TYPO3\CMS\Extbase\Reflection\ObjectAccess::isPropertyGettable($this->dummyObject, 'booleanProperty'));
+               $this->assertFalse(\TYPO3\CMS\Extbase\Reflection\ObjectAccess::isPropertyGettable($this->dummyObject, 'privateProperty'));
+               $this->assertFalse(\TYPO3\CMS\Extbase\Reflection\ObjectAccess::isPropertyGettable($this->dummyObject, 'writeOnlyMagicProperty'));
+               $this->assertFalse(\TYPO3\CMS\Extbase\Reflection\ObjectAccess::isPropertyGettable($this->dummyObject, 'shouldNotBePickedUp'));
        }
 
        /**
@@ -321,8 +321,8 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
        public function isPropertyGettableWorksOnArrayAccessObjects() {
                $arrayObject = new \ArrayObject();
                $arrayObject['key'] = 'v';
-               $this->assertTrue(\Tx_Extbase_Reflection_ObjectAccess::isPropertyGettable($arrayObject, 'key'));
-               $this->assertFalse(\Tx_Extbase_Reflection_ObjectAccess::isPropertyGettable($arrayObject, 'undefinedKey'));
+               $this->assertTrue(\TYPO3\CMS\Extbase\Reflection\ObjectAccess::isPropertyGettable($arrayObject, 'key'));
+               $this->assertFalse(\TYPO3\CMS\Extbase\Reflection\ObjectAccess::isPropertyGettable($arrayObject, 'undefinedKey'));
        }
 
        /**
@@ -331,19 +331,19 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
        public function isPropertyGettableWorksOnStdClass() {
                $stdClassObject = new \stdClass();
                $stdClassObject->property = 'foo';
-               $this->assertTrue(\Tx_Extbase_Reflection_ObjectAccess::isPropertyGettable($stdClassObject, 'property'));
-               $this->assertFalse(\Tx_Extbase_Reflection_ObjectAccess::isPropertyGettable($stdClassObject, 'undefinedProperty'));
+               $this->assertTrue(\TYPO3\CMS\Extbase\Reflection\ObjectAccess::isPropertyGettable($stdClassObject, 'property'));
+               $this->assertFalse(\TYPO3\CMS\Extbase\Reflection\ObjectAccess::isPropertyGettable($stdClassObject, 'undefinedProperty'));
        }
 
        /**
         * @test
         */
        public function getPropertyPathCanRecursivelyGetPropertiesOfAnObject() {
-               $alternativeObject = new \Tx_Extbase_Tests_Unit_Reflection_Fixture_DummyClassWithGettersAndSetters();
+               $alternativeObject = new \TYPO3\CMS\Extbase\Tests\Unit\Reflection\Fixture\DummyClassWithGettersAndSetters();
                $alternativeObject->setProperty('test');
                $this->dummyObject->setProperty2($alternativeObject);
                $expected = 'test';
-               $actual = \Tx_Extbase_Reflection_ObjectAccess::getPropertyPath($this->dummyObject, 'property2.property');
+               $actual = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getPropertyPath($this->dummyObject, 'property2.property');
                $this->assertEquals($expected, $actual);
        }
 
@@ -351,10 +351,10 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         * @test
         */
        public function getPropertyPathReturnsNullForNonExistingPropertyPath() {
-               $alternativeObject = new \Tx_Extbase_Tests_Unit_Reflection_Fixture_DummyClassWithGettersAndSetters();
+               $alternativeObject = new \TYPO3\CMS\Extbase\Tests\Unit\Reflection\Fixture\DummyClassWithGettersAndSetters();
                $alternativeObject->setProperty(new \stdClass());
                $this->dummyObject->setProperty2($alternativeObject);
-               $this->assertNull(\Tx_Extbase_Reflection_ObjectAccess::getPropertyPath($this->dummyObject, 'property2.property.not.existing'));
+               $this->assertNull(\TYPO3\CMS\Extbase\Reflection\ObjectAccess::getPropertyPath($this->dummyObject, 'property2.property.not.existing'));
        }
 
        /**
@@ -362,7 +362,7 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         */
        public function getPropertyPathReturnsNullIfSubjectIsNoObject() {
                $string = 'Hello world';
-               $this->assertNull(\Tx_Extbase_Reflection_ObjectAccess::getPropertyPath($string, 'property2'));
+               $this->assertNull(\TYPO3\CMS\Extbase\Reflection\ObjectAccess::getPropertyPath($string, 'property2'));
        }
 
        /**
@@ -371,7 +371,7 @@ class ObjectAccessTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
        public function getPropertyPathReturnsNullIfSubjectOnPathIsNoObject() {
                $object = new \stdClass();
                $object->foo = 'Hello World';
-               $this->assertNull(\Tx_Extbase_Reflection_ObjectAccess::getPropertyPath($object, 'foo.bar'));
+               $this->assertNull(\TYPO3\CMS\Extbase\Reflection\ObjectAccess::getPropertyPath($object, 'foo.bar'));
        }
 
 }
index 9b6a7cf..0887913 100644 (file)
@@ -44,7 +44,7 @@ class ExtensionServiceTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
        protected $typo3DbBackup;
 
        /**
-        * @var t3lib_fe contains a backup of the current $GLOBALS['TSFE']
+        * @var \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController contains a backup of the current $GLOBALS['TSFE']
         */
        protected $tsfeBackup;
 
index bac07e2..b10f53c 100644 (file)
@@ -50,7 +50,7 @@ class TypeHandlingServiceTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase
 
        /**
         * @test
-        * @expectedException InvalidArgumentException
+        * @expectedException \InvalidArgumentException
         * @author Karsten Dambekalns <karsten@typo3.org>
         */
        public function parseTypeThrowsExceptionOnInvalidElementTypeHint() {
index 450a15e..1ec84ca 100644 (file)
@@ -39,7 +39,7 @@ class ExtensionUtilityTest extends \tx_phpunit_testcase {
        protected $typo3ConfVars = array();
 
        /**
-        * @var t3lib_fe contains a backup of the current $GLOBALS['TSFE']
+        * @var \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController contains a backup of the current $GLOBALS['TSFE']
         */
        protected $tsfeBackup;
 
@@ -159,7 +159,7 @@ plugin.tx_myextension {
 
        /**
         * @test
-        * @expectedException InvalidArgumentException
+        * @expectedException \InvalidArgumentException
         * @see Tx_Extbase_Utility_Extension::registerPlugin
         */
        public function configurePluginThrowsExceptionIfExtensionNameIsEmpty() {
@@ -170,7 +170,7 @@ plugin.tx_myextension {
 
        /**
         * @test
-        * @expectedException InvalidArgumentException
+        * @expectedException \InvalidArgumentException
         * @see Tx_Extbase_Utility_Extension::registerPlugin
         */
        public function configurePluginThrowsExceptionIfPluginNameIsEmpty() {
index 9a99354..ec5f164 100644 (file)
@@ -51,13 +51,13 @@ class GenericObjectValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validatio
         * @return array
         */
        public function dataProviderForValidator() {
-               $error1 = new \Tx_Extbase_Error_Error('error1', 1);
-               $error2 = new \Tx_Extbase_Error_Error('error2', 2);
-               $emptyResult1 = new \Tx_Extbase_Error_Result();
-               $emptyResult2 = new \Tx_Extbase_Error_Result();
-               $resultWithError1 = new \Tx_Extbase_Error_Result();
+               $error1 = new \TYPO3\CMS\Extbase\Error\Error('error1', 1);
+               $error2 = new \TYPO3\CMS\Extbase\Error\Error('error2', 2);
+               $emptyResult1 = new \TYPO3\CMS\Extbase\Error\Result();
+               $emptyResult2 = new \TYPO3\CMS\Extbase\Error\Result();
+               $resultWithError1 = new \TYPO3\CMS\Extbase\Error\Result();
                $resultWithError1->addError($error1);
-               $resultWithError2 = new \Tx_Extbase_Error_Result();
+               $resultWithError2 = new \TYPO3\CMS\Extbase\Error\Result();
                $resultWithError2->addError($error2);
                $classNameForObjectWithPrivateProperties = 'B' . md5(uniqid(mt_rand(), TRUE));
                eval(('class ' . $classNameForObjectWithPrivateProperties) . '{ protected $foo = \'foovalue\'; protected $bar = \'barvalue\'; }');
@@ -102,8 +102,8 @@ class GenericObjectValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validatio
                $B = new $classNameB();
                $A->b = $B;
                $B->a = $A;
-               $aValidator = new \Tx_Extbase_Validation_Validator_GenericObjectValidator(array());
-               $bValidator = new \Tx_Extbase_Validation_Validator_GenericObjectValidator(array());
+               $aValidator = new \TYPO3\CMS\Extbase\Validation\Validator\GenericObjectValidator(array());
+               $bValidator = new \TYPO3\CMS\Extbase\Validation\Validator\GenericObjectValidator(array());
                $aValidator->addPropertyValidator('b', $bValidator);
                $bValidator->addPropertyValidator('a', $aValidator);
                $this->assertFalse($aValidator->validate($A)->hasErrors());
@@ -126,8 +126,8 @@ class GenericObjectValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validatio
                $bValidator = $this->getValidator();
                $aValidator->addPropertyValidator('b', $bValidator);
                $bValidator->addPropertyValidator('a', $aValidator);
-               $error = new \Tx_Extbase_Error_Error('error1', 123);
-               $result = new \Tx_Extbase_Error_Result();
+               $error = new \TYPO3\CMS\Extbase\Error\Error('error1', 123);
+               $result = new \TYPO3\CMS\Extbase\Error\Result();
                $result->addError($error);
                $mockUuidValidator = $this->getMock('TYPO3\\CMS\\Extbase\\Validation\\Validator\\ValidatorInterface', array('validate'));
                $mockUuidValidator->expects($this->any())->method('validate')->with(15)->will($this->returnValue($result));
@@ -152,8 +152,8 @@ class GenericObjectValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validatio
                $bValidator = $this->getValidator();
                $aValidator->addPropertyValidator('b', $bValidator);
                $bValidator->addPropertyValidator('a', $aValidator);
-               $error1 = new \Tx_Extbase_Error_Error('error1', 123);
-               $result1 = new \Tx_Extbase_Error_Result();
+               $error1 = new \TYPO3\CMS\Extbase\Error\Error('error1', 123);
+               $result1 = new \TYPO3\CMS\Extbase\Error\Result();
                $result1->addError($error1);
                $mockUuidValidator = $this->getMock('TYPO3\\CMS\\Extbase\\Validation\\Validator\\ValidatorInterface', array('validate'));
                $mockUuidValidator->expects($this->any())->method('validate')->with(15)->will($this->returnValue($result1));
index a640c3f..6aaf8f4 100644 (file)
@@ -35,7 +35,7 @@ class NumberValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validation\Valid
         * @test
         */
        public function numberValidatorReturnsTrueForASimpleInteger() {
-               $numberValidator = new \Tx_Extbase_Validation_Validator_NumberValidator();
+               $numberValidator = new \TYPO3\CMS\Extbase\Validation\Validator\NumberValidator();
                $this->assertFalse($numberValidator->validate(1029437)->hasErrors());
        }
 
@@ -43,9 +43,9 @@ class NumberValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validation\Valid
         * @test
         */
        public function numberValidatorReturnsFalseForAString() {
-               $expectedResult = new \Tx_Extbase_Error_Result();
-               $expectedResult->addError(new \Tx_Extbase_Validation_Error('The given subject was not a valid number.', 1221563685));
-               $numberValidator = new \Tx_Extbase_Validation_Validator_NumberValidator();
+               $expectedResult = new \TYPO3\CMS\Extbase\Error\Result();
+               $expectedResult->addError(new \TYPO3\CMS\Extbase\Validation\Error('The given subject was not a valid number.', 1221563685));
+               $numberValidator = new \TYPO3\CMS\Extbase\Validation\Validator\NumberValidator();
                $this->assertEquals($expectedResult, $numberValidator->validate('not a number'));
        }
 
index f3cf91e..aa861b2 100644 (file)
@@ -36,7 +36,7 @@ class RawValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validation\Validato
         * @author Robert Lemke <robert@typo3.org>
         */
        public function theRawValidatorAlwaysReturnsNoErrors() {
-               $rawValidator = new \Tx_Extbase_Validation_Validator_RawValidator(array());
+               $rawValidator = new \TYPO3\CMS\Extbase\Validation\Validator\RawValidator(array());
                $this->assertFalse($rawValidator->validate('simple1expression')->hasErrors());
                $this->assertFalse($rawValidator->validate('')->hasErrors());
                $this->assertFalse($rawValidator->validate(NULL)->hasErrors());
index 4c6d209..62f5238 100644 (file)
@@ -48,7 +48,7 @@ class RegularExpressionValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Valid
        public function regularExpressionValidatorCreatesTheCorrectErrorIfTheExpressionDidNotMatch() {
                $this->validatorOptions(array('regularExpression' => '/^simple[0-9]expression$/'));
                $errors = $this->validator->validate('some subject that will not match')->getErrors();
-               $this->assertEquals(array(new \Tx_Extbase_Validation_Error('The given subject did not match the pattern.', 1221565130)), $errors);
+               $this->assertEquals(array(new \TYPO3\CMS\Extbase\Validation\Error('The given subject did not match the pattern.', 1221565130)), $errors);
        }
 
 }
index 38d34a6..0f5041c 100644 (file)
@@ -70,7 +70,7 @@ class TextValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validation\Validat
         * @author Andreas Förthner <andreas.foerthner@netlogix.de>
         */
        public function textValidatorCreatesTheCorrectErrorIfTheSubjectContainsHtmlEntities() {
-               $expected = array(new \Tx_Extbase_Validation_Error('The given subject was not a valid text (e.g. contained XML tags).', 1221565786));
+               $expected = array(new \TYPO3\CMS\Extbase\Validation\Error('The given subject was not a valid text (e.g. contained XML tags).', 1221565786));
                $this->assertEquals($expected, $this->validator->validate('<span style="color: #BBBBBB;">a nice text</span>')->getErrors());
        }