[TASK] Namespace classes
authorThomas Maroschik <tmaroschik@dfau.de>
Wed, 17 Oct 2012 20:25:57 +0000 (22:25 +0200)
committerThomas Maroschik <tmaroschik@dfau.de>
Wed, 17 Oct 2012 20:25:57 +0000 (22:25 +0200)
Change-Id: I403aee9d244a65e51547b21dac3b1228ffd3478e

462 files changed:
typo3/sysext/extbase/Classes/Command/HelpCommandController.php
typo3/sysext/extbase/Classes/Configuration/AbstractConfigurationManager.php
typo3/sysext/extbase/Classes/Configuration/BackendConfigurationManager.php
typo3/sysext/extbase/Classes/Configuration/ConfigurationManager.php
typo3/sysext/extbase/Classes/Configuration/ConfigurationManagerInterface.php
typo3/sysext/extbase/Classes/Configuration/Exception.php
typo3/sysext/extbase/Classes/Configuration/Exception/ContainerIsLocked.php
typo3/sysext/extbase/Classes/Configuration/Exception/ContainerIsLockedException.php
typo3/sysext/extbase/Classes/Configuration/Exception/InvalidConfigurationType.php
typo3/sysext/extbase/Classes/Configuration/Exception/InvalidConfigurationTypeException.php
typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchFile.php
typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchFileException.php
typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchOption.php
typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchOptionException.php
typo3/sysext/extbase/Classes/Configuration/Exception/ParseError.php
typo3/sysext/extbase/Classes/Configuration/Exception/ParseErrorException.php
typo3/sysext/extbase/Classes/Configuration/FrontendConfigurationManager.php
typo3/sysext/extbase/Classes/Core/Bootstrap.php
typo3/sysext/extbase/Classes/Core/BootstrapInterface.php
typo3/sysext/extbase/Classes/Domain/Model/AbstractFileCollection.php
typo3/sysext/extbase/Classes/Domain/Model/AbstractFileFolder.php
typo3/sysext/extbase/Classes/Domain/Model/BackendUser.php
typo3/sysext/extbase/Classes/Domain/Model/BackendUserGroup.php
typo3/sysext/extbase/Classes/Domain/Model/Category.php
typo3/sysext/extbase/Classes/Domain/Model/File.php
typo3/sysext/extbase/Classes/Domain/Model/FileMount.php
typo3/sysext/extbase/Classes/Domain/Model/FileReference.php
typo3/sysext/extbase/Classes/Domain/Model/Folder.php
typo3/sysext/extbase/Classes/Domain/Model/FolderBasedFileCollection.php
typo3/sysext/extbase/Classes/Domain/Model/FrontendUser.php
typo3/sysext/extbase/Classes/Domain/Model/FrontendUserGroup.php
typo3/sysext/extbase/Classes/Domain/Model/StaticFileCollection.php
typo3/sysext/extbase/Classes/Domain/Repository/BackendUserGroupRepository.php
typo3/sysext/extbase/Classes/Domain/Repository/BackendUserRepository.php
typo3/sysext/extbase/Classes/Domain/Repository/CategoryRepository.php
typo3/sysext/extbase/Classes/Domain/Repository/FileMountRepository.php
typo3/sysext/extbase/Classes/Domain/Repository/FrontendUserGroupRepository.php
typo3/sysext/extbase/Classes/Domain/Repository/FrontendUserRepository.php
typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php
typo3/sysext/extbase/Classes/DomainObject/AbstractEntity.php
typo3/sysext/extbase/Classes/DomainObject/AbstractValueObject.php
typo3/sysext/extbase/Classes/DomainObject/DomainObjectInterface.php
typo3/sysext/extbase/Classes/Error/Error.php
typo3/sysext/extbase/Classes/Error/Message.php
typo3/sysext/extbase/Classes/Error/Notice.php
typo3/sysext/extbase/Classes/Error/Result.php
typo3/sysext/extbase/Classes/Error/Warning.php
typo3/sysext/extbase/Classes/Exception.php
typo3/sysext/extbase/Classes/Mvc/Cli/Command.php
typo3/sysext/extbase/Classes/Mvc/Cli/CommandArgumentDefinition.php
typo3/sysext/extbase/Classes/Mvc/Cli/CommandManager.php
typo3/sysext/extbase/Classes/Mvc/Cli/Request.php
typo3/sysext/extbase/Classes/Mvc/Cli/RequestBuilder.php
typo3/sysext/extbase/Classes/Mvc/Cli/RequestHandler.php
typo3/sysext/extbase/Classes/Mvc/Cli/Response.php
typo3/sysext/extbase/Classes/Mvc/Controller/AbstractController.php
typo3/sysext/extbase/Classes/Mvc/Controller/ActionController.php
typo3/sysext/extbase/Classes/Mvc/Controller/Argument.php
typo3/sysext/extbase/Classes/Mvc/Controller/ArgumentError.php
typo3/sysext/extbase/Classes/Mvc/Controller/Arguments.php
typo3/sysext/extbase/Classes/Mvc/Controller/ArgumentsValidator.php
typo3/sysext/extbase/Classes/Mvc/Controller/CommandController.php
typo3/sysext/extbase/Classes/Mvc/Controller/CommandControllerInterface.php
typo3/sysext/extbase/Classes/Mvc/Controller/ControllerContext.php
typo3/sysext/extbase/Classes/Mvc/Controller/ControllerInterface.php
typo3/sysext/extbase/Classes/Mvc/Controller/Exception/RequiredArgumentMissingException.php
typo3/sysext/extbase/Classes/Mvc/Controller/FlashMessages.php
typo3/sysext/extbase/Classes/Mvc/Controller/MvcPropertyMappingConfiguration.php
typo3/sysext/extbase/Classes/Mvc/Dispatcher.php
typo3/sysext/extbase/Classes/Mvc/Exception.php
typo3/sysext/extbase/Classes/Mvc/Exception/AmbiguousCommandIdentifierException.php
typo3/sysext/extbase/Classes/Mvc/Exception/CommandException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InfiniteLoopException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidActionNameException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentMixingException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentNameException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentTypeException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentValueException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidCommandIdentifierException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidControllerException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidControllerNameException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidExtensionNameException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidMarkerException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidOrNoRequestHashException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidRequestMethodException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidRequestTypeException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidTemplateResourceException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidUriPatternException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidViewHelperException.php
typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchActionException.php
typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchArgumentException.php
typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchCommandException.php
typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchControllerException.php
typo3/sysext/extbase/Classes/Mvc/Exception/RequiredArgumentMissingException.php
typo3/sysext/extbase/Classes/Mvc/Exception/StopActionException.php
typo3/sysext/extbase/Classes/Mvc/Exception/UnsupportedRequestTypeException.php
typo3/sysext/extbase/Classes/Mvc/Request.php
typo3/sysext/extbase/Classes/Mvc/RequestHandlerInterface.php
typo3/sysext/extbase/Classes/Mvc/RequestHandlerResolver.php
typo3/sysext/extbase/Classes/Mvc/RequestInterface.php
typo3/sysext/extbase/Classes/Mvc/Response.php
typo3/sysext/extbase/Classes/Mvc/ResponseInterface.php
typo3/sysext/extbase/Classes/Mvc/View/AbstractView.php
typo3/sysext/extbase/Classes/Mvc/View/EmptyView.php
typo3/sysext/extbase/Classes/Mvc/View/NotFoundView.php
typo3/sysext/extbase/Classes/Mvc/View/ViewInterface.php
typo3/sysext/extbase/Classes/Mvc/Web/AbstractRequestHandler.php
typo3/sysext/extbase/Classes/Mvc/Web/BackendRequestHandler.php
typo3/sysext/extbase/Classes/Mvc/Web/FrontendRequestHandler.php
typo3/sysext/extbase/Classes/Mvc/Web/Request.php
typo3/sysext/extbase/Classes/Mvc/Web/RequestBuilder.php
typo3/sysext/extbase/Classes/Mvc/Web/Response.php
typo3/sysext/extbase/Classes/Mvc/Web/Routing/UriBuilder.php
typo3/sysext/extbase/Classes/Object/Container/ClassInfo.php
typo3/sysext/extbase/Classes/Object/Container/ClassInfoCache.php
typo3/sysext/extbase/Classes/Object/Container/ClassInfoFactory.php
typo3/sysext/extbase/Classes/Object/Container/Container.php
typo3/sysext/extbase/Classes/Object/Container/Exception/CannotInitializeCacheException.php
typo3/sysext/extbase/Classes/Object/Container/Exception/TooManyRecursionLevelsException.php
typo3/sysext/extbase/Classes/Object/Container/Exception/UnknownObjectException.php
typo3/sysext/extbase/Classes/Object/Exception.php
typo3/sysext/extbase/Classes/Object/Exception/CannotBuildObjectException.php
typo3/sysext/extbase/Classes/Object/Exception/CannotReconstituteObjectException.php
typo3/sysext/extbase/Classes/Object/Exception/InvalidClassException.php
typo3/sysext/extbase/Classes/Object/Exception/InvalidObjectConfigurationException.php
typo3/sysext/extbase/Classes/Object/Exception/InvalidObjectException.php
typo3/sysext/extbase/Classes/Object/Exception/ObjectAlreadyRegisteredException.php
typo3/sysext/extbase/Classes/Object/Exception/ObjectManagerException.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Object/Exception/ObjectManagerInterfaceException.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Object/Exception/UnknownClassException.php
typo3/sysext/extbase/Classes/Object/Exception/UnknownInterfaceException.php
typo3/sysext/extbase/Classes/Object/Exception/UnresolvedDependenciesException.php
typo3/sysext/extbase/Classes/Object/Exception/WrongScopeException.php
typo3/sysext/extbase/Classes/Object/ObjectManager.php
typo3/sysext/extbase/Classes/Object/ObjectManagerInterface.php
typo3/sysext/extbase/Classes/Persistence/Exception.php
typo3/sysext/extbase/Classes/Persistence/Exception/IllegalObjectType.php
typo3/sysext/extbase/Classes/Persistence/Exception/IllegalObjectTypeException.php
typo3/sysext/extbase/Classes/Persistence/Exception/UnknownObject.php
typo3/sysext/extbase/Classes/Persistence/Exception/UnknownObjectException.php
typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php
typo3/sysext/extbase/Classes/Persistence/Generic/BackendInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/CleanStateNotMemorized.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/CleanStateNotMemorizedException.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InconsistentQuerySettings.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InconsistentQuerySettingsException.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidClass.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidClassException.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidNumberOfConstraints.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidNumberOfConstraintsException.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidPropertyType.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidPropertyTypeException.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/MissingBackend.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/MissingBackendException.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/RepositoryException.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/TooDirty.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/TooDirtyException.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnexpectedTypeException.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedMethod.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedMethodException.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedOrder.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedOrderException.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedRelation.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedRelationException.php
typo3/sysext/extbase/Classes/Persistence/Generic/IdentityMap.php
typo3/sysext/extbase/Classes/Persistence/Generic/LazyLoadingProxy.php
typo3/sysext/extbase/Classes/Persistence/Generic/LazyObjectStorage.php
typo3/sysext/extbase/Classes/Persistence/Generic/LoadingStrategyInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Manager.php
typo3/sysext/extbase/Classes/Persistence/Generic/ManagerInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/ColumnMap.php
typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMap.php
typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapFactory.php
typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapper.php
typo3/sysext/extbase/Classes/Persistence/Generic/ObjectMonitoringInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/ObjectStorage.php
typo3/sysext/extbase/Classes/Persistence/Generic/PersistenceManager.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Persistence/Generic/PropertyType.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/AndInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/BindVariableValue.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/BindVariableValueInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Comparison.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/ComparisonInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Constraint.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/ConstraintInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/DynamicOperand.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/DynamicOperandInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/EquiJoinCondition.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/EquiJoinConditionInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Join.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/JoinConditionInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/JoinInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/LogicalAnd.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/LogicalNot.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/LogicalOr.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/LowerCase.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/LowerCaseInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/NotInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Operand.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/OperandInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/OrInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Ordering.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/OrderingInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/PropertyValue.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/PropertyValueInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/QueryObjectModelConstantsInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/QueryObjectModelFactory.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/QueryObjectModelFactoryInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Selector.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/SelectorInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/SourceInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Statement.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/StaticOperand.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/StaticOperandInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/UpperCase.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/UpperCaseInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
typo3/sysext/extbase/Classes/Persistence/Generic/QueryFactory.php
typo3/sysext/extbase/Classes/Persistence/Generic/QueryFactoryInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/QueryResult.php
typo3/sysext/extbase/Classes/Persistence/Generic/QuerySettingsInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Session.php
typo3/sysext/extbase/Classes/Persistence/Generic/Storage/BackendInterface.php
typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Exception/BadConstraint.php [deleted file]
typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Exception/BadConstraintException.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Exception/SqlError.php [deleted file]
typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Exception/SqlErrorException.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php
typo3/sysext/extbase/Classes/Persistence/Generic/Typo3QuerySettings.php
typo3/sysext/extbase/Classes/Persistence/ObjectMonitoringInterface.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Persistence/PersistenceManagerInterface.php
typo3/sysext/extbase/Classes/Persistence/QueryInterface.php
typo3/sysext/extbase/Classes/Persistence/QueryResultInterface.php
typo3/sysext/extbase/Classes/Persistence/Repository.php
typo3/sysext/extbase/Classes/Persistence/RepositoryInterface.php
typo3/sysext/extbase/Classes/Property/Exception.php
typo3/sysext/extbase/Classes/Property/Exception/DuplicateObjectException.php
typo3/sysext/extbase/Classes/Property/Exception/DuplicateTypeConverterException.php
typo3/sysext/extbase/Classes/Property/Exception/FormatNotSupported.php
typo3/sysext/extbase/Classes/Property/Exception/FormatNotSupportedException.php
typo3/sysext/extbase/Classes/Property/Exception/InvalidDataType.php
typo3/sysext/extbase/Classes/Property/Exception/InvalidDataTypeException.php
typo3/sysext/extbase/Classes/Property/Exception/InvalidFormat.php
typo3/sysext/extbase/Classes/Property/Exception/InvalidFormatException.php
typo3/sysext/extbase/Classes/Property/Exception/InvalidProperty.php
typo3/sysext/extbase/Classes/Property/Exception/InvalidPropertyException.php
typo3/sysext/extbase/Classes/Property/Exception/InvalidPropertyMappingConfigurationException.php
typo3/sysext/extbase/Classes/Property/Exception/InvalidSource.php
typo3/sysext/extbase/Classes/Property/Exception/InvalidSourceException.php
typo3/sysext/extbase/Classes/Property/Exception/InvalidTarget.php
typo3/sysext/extbase/Classes/Property/Exception/InvalidTargetException.php
typo3/sysext/extbase/Classes/Property/Exception/TargetNotFoundException.php
typo3/sysext/extbase/Classes/Property/Exception/TypeConverterException.php
typo3/sysext/extbase/Classes/Property/Mapper.php
typo3/sysext/extbase/Classes/Property/MappingResults.php
typo3/sysext/extbase/Classes/Property/PropertyMapper.php
typo3/sysext/extbase/Classes/Property/PropertyMappingConfiguration.php
typo3/sysext/extbase/Classes/Property/PropertyMappingConfigurationBuilder.php
typo3/sysext/extbase/Classes/Property/PropertyMappingConfigurationInterface.php
typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractFileCollectionConverter.php
typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractFileFolderConverter.php
typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractTypeConverter.php
typo3/sysext/extbase/Classes/Property/TypeConverter/ArrayConverter.php
typo3/sysext/extbase/Classes/Property/TypeConverter/BooleanConverter.php
typo3/sysext/extbase/Classes/Property/TypeConverter/DateTimeConverter.php
typo3/sysext/extbase/Classes/Property/TypeConverter/FileConverter.php
typo3/sysext/extbase/Classes/Property/TypeConverter/FileReferenceConverter.php
typo3/sysext/extbase/Classes/Property/TypeConverter/FloatConverter.php
typo3/sysext/extbase/Classes/Property/TypeConverter/FolderBasedFileCollectionConverter.php
typo3/sysext/extbase/Classes/Property/TypeConverter/FolderConverter.php
typo3/sysext/extbase/Classes/Property/TypeConverter/IntegerConverter.php
typo3/sysext/extbase/Classes/Property/TypeConverter/ObjectStorageConverter.php
typo3/sysext/extbase/Classes/Property/TypeConverter/PersistentObjectConverter.php
typo3/sysext/extbase/Classes/Property/TypeConverter/StaticFileCollectionConverter.php
typo3/sysext/extbase/Classes/Property/TypeConverter/StringConverter.php
typo3/sysext/extbase/Classes/Property/TypeConverterInterface.php
typo3/sysext/extbase/Classes/Reflection/ClassReflection.php
typo3/sysext/extbase/Classes/Reflection/ClassSchema.php
typo3/sysext/extbase/Classes/Reflection/DocCommentParser.php
typo3/sysext/extbase/Classes/Reflection/Exception.php
typo3/sysext/extbase/Classes/Reflection/Exception/InvalidPropertyTypeException.php
typo3/sysext/extbase/Classes/Reflection/Exception/PropertyNotAccessibleException.php
typo3/sysext/extbase/Classes/Reflection/Exception/UnknownClassException.php
typo3/sysext/extbase/Classes/Reflection/MethodReflection.php
typo3/sysext/extbase/Classes/Reflection/ObjectAccess.php
typo3/sysext/extbase/Classes/Reflection/ParameterReflection.php
typo3/sysext/extbase/Classes/Reflection/PropertyReflection.php
typo3/sysext/extbase/Classes/Reflection/Service.php
typo3/sysext/extbase/Classes/Scheduler/FieldProvider.php
typo3/sysext/extbase/Classes/Scheduler/Task.php
typo3/sysext/extbase/Classes/Scheduler/TaskExecutor.php
typo3/sysext/extbase/Classes/Security/Channel/RequestHashService.php
typo3/sysext/extbase/Classes/Security/Cryptography/HashService.php
typo3/sysext/extbase/Classes/Security/Exception.php
typo3/sysext/extbase/Classes/Security/Exception/InvalidArgumentForHashGenerationException.php
typo3/sysext/extbase/Classes/Security/Exception/InvalidArgumentForRequestHashGenerationException.php
typo3/sysext/extbase/Classes/Security/Exception/InvalidHashException.php
typo3/sysext/extbase/Classes/Security/Exception/SyntacticallyWrongRequestHashException.php
typo3/sysext/extbase/Classes/Service/CacheService.php
typo3/sysext/extbase/Classes/Service/ExtensionService.php
typo3/sysext/extbase/Classes/Service/FlexFormService.php
typo3/sysext/extbase/Classes/Service/TypeHandlingService.php
typo3/sysext/extbase/Classes/Service/TypoScriptService.php
typo3/sysext/extbase/Classes/SignalSlot/Dispatcher.php
typo3/sysext/extbase/Classes/SignalSlot/Exception/InvalidSlotException.php
typo3/sysext/extbase/Classes/Utility/ArrayUtility.php
typo3/sysext/extbase/Classes/Utility/CacheUtility.php
typo3/sysext/extbase/Classes/Utility/ClassLoaderUtility.php
typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php
typo3/sysext/extbase/Classes/Utility/ExtbaseRequirementsCheckUtility.php
typo3/sysext/extbase/Classes/Utility/ExtensionUtility.php
typo3/sysext/extbase/Classes/Utility/FrontendSimulatorUtility.php
typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php
typo3/sysext/extbase/Classes/Utility/TypeHandlingUtility.php
typo3/sysext/extbase/Classes/Utility/TypoScriptUtility.php
typo3/sysext/extbase/Classes/Validation/Error.php
typo3/sysext/extbase/Classes/Validation/Exception.php
typo3/sysext/extbase/Classes/Validation/Exception/InvalidSubjectException.php
typo3/sysext/extbase/Classes/Validation/Exception/InvalidValidationConfigurationException.php
typo3/sysext/extbase/Classes/Validation/Exception/InvalidValidationOptionsException.php
typo3/sysext/extbase/Classes/Validation/Exception/NoSuchValidatorException.php
typo3/sysext/extbase/Classes/Validation/Exception/NoValidatorFoundException.php
typo3/sysext/extbase/Classes/Validation/PropertyError.php
typo3/sysext/extbase/Classes/Validation/Validator/AbstractCompositeValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/AbstractObjectValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/AbstractValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/AlphanumericValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/ConjunctionValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/DateTimeValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/DisjunctionValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/EmailAddressValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/FloatValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/GenericObjectValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/IntegerValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/NotEmptyValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/NumberRangeValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/NumberValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/ObjectValidatorInterface.php
typo3/sysext/extbase/Classes/Validation/Validator/RawValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/RegularExpressionValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/StringLengthValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/StringValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/TextValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/ValidatorInterface.php
typo3/sysext/extbase/Classes/Validation/ValidatorResolver.php
typo3/sysext/extbase/Scripts/CommandLineLauncher.php
typo3/sysext/extbase/Tests/Fixture/ClassWithInjectProperties.php
typo3/sysext/extbase/Tests/Fixture/ClassWithSetters.php
typo3/sysext/extbase/Tests/Fixture/ClassWithSettersAndConstructor.php
typo3/sysext/extbase/Tests/Fixture/DummyClass.php
typo3/sysext/extbase/Tests/Fixture/Entity.php
typo3/sysext/extbase/Tests/Fixture/SecondDummyClass.php
typo3/sysext/extbase/Tests/Functional/BaseTestCase.php
typo3/sysext/extbase/Tests/Functional/Domain/Model/FileContextTest.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/Configuration/AbstractConfigurationManagerTest.php
typo3/sysext/extbase/Tests/Unit/Configuration/BackendConfigurationManagerTest.php
typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Model/BackendUserGroupTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Model/BackendUserTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Model/CategoryTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Model/FileMountTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Model/FrontendUserGroupTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Model/FrontendUserTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserGroupRepositoryTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Repository/CategoryRepositoryTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Repository/FileMountRepositoryTest.php
typo3/sysext/extbase/Tests/Unit/DomainObject/AbstractEntityTest.php
typo3/sysext/extbase/Tests/Unit/Error/ErrorTest.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/Cli/Fixture/Command/MockACommandController.php
typo3/sysext/extbase/Tests/Unit/Mvc/Cli/Fixture/Command/MockBCommandController.php
typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestBuilderTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/Controller/AbstractControllerTest.php [deleted file]
typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.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/Controller/CommandControllerTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/DispatcherTest.php [deleted file]
typo3/sysext/extbase/Tests/Unit/Mvc/RequestTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/Web/RequestBuilderTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/Web/RequestTest.php [deleted file]
typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php
typo3/sysext/extbase/Tests/Unit/Object/Container/ClassInfoFactoryTest.php
typo3/sysext/extbase/Tests/Unit/Object/Container/ContainerTest.php
typo3/sysext/extbase/Tests/Unit/Object/Container/Fixtures/Testclasses.php
typo3/sysext/extbase/Tests/Unit/Persistence/Mapper/DataMapFactoryTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/Mapper/DataMapperTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/ObjectStorageTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/QueryResultTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/QueryTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/SessionTest.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/ArrayConverterTest.php
typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/BooleanConverterTest.php
typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/DateTimeConverterTest.php
typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/FloatConverterTest.php
typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/IntegerConverterTest.php
typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/PersistentObjectConverterTest.php
typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/StringConverterTest.php
typo3/sysext/extbase/Tests/Unit/Reflection/Fixture/ArrayAccessClass.php
typo3/sysext/extbase/Tests/Unit/Reflection/Fixture/DummyClassWithGettersAndSetters.php
typo3/sysext/extbase/Tests/Unit/Reflection/ObjectAccessTest.php
typo3/sysext/extbase/Tests/Unit/Reflection/ServiceTest.php
typo3/sysext/extbase/Tests/Unit/Security/Channel/RequestHashServiceTest.php
typo3/sysext/extbase/Tests/Unit/Security/Cryptography/HashServiceTest.php
typo3/sysext/extbase/Tests/Unit/Service/CacheServiceTest.php
typo3/sysext/extbase/Tests/Unit/Service/ExtensionServiceTest.php
typo3/sysext/extbase/Tests/Unit/Service/FlexFormServiceTest.php
typo3/sysext/extbase/Tests/Unit/Service/TypeHandlingServiceTest.php
typo3/sysext/extbase/Tests/Unit/Service/TypoScriptServiceTest.php
typo3/sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php
typo3/sysext/extbase/Tests/Unit/Utility/ArrayUtilityTest.php
typo3/sysext/extbase/Tests/Unit/Utility/ExtensionUtilityTest.php
typo3/sysext/extbase/Tests/Unit/Utility/LocalizationUtilityTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/AbstractValidatorTestcase.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/AlphanumericValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/BeforeExtbase14/AlphanumericValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/BeforeExtbase14/ConjunctionValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/BeforeExtbase14/DateTimeValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/BeforeExtbase14/EmailAddressValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/BeforeExtbase14/FloatValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/BeforeExtbase14/GenericObjectValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/BeforeExtbase14/IntegerValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/BeforeExtbase14/NotEmptyValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/BeforeExtbase14/NumberRangeValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/BeforeExtbase14/NumberValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/BeforeExtbase14/RawValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/BeforeExtbase14/RegularExpressionValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/BeforeExtbase14/StringLengthValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/BeforeExtbase14/TextValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/ConjunctionValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/DisjunctionValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/EmailAddressValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/FloatValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/GenericObjectValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/IntegerValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/NotEmptyValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/NumberRangeValidatorTest.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/StringLengthValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/TextValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/ValidatorResolverTest.php
typo3/sysext/extbase/ext_autoload.php
typo3/sysext/extbase/ext_localconf.php
typo3/sysext/extbase/ext_tables.php
typo3/sysext/extbase/ext_typoscript_setup.txt

index 397b34b..94dac11 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Command;
+
 /***************************************************************
  *  Copyright notice
  *  All rights reserved
  *
  * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License, version 3 or later
  */
-class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller_CommandController {
+class HelpCommandController extends \TYPO3\CMS\Extbase\Mvc\Controller\CommandController {
 
        /**
-        * @var Tx_Extbase_MVC_CLI_CommandManager
+        * @var \TYPO3\CMS\Extbase\Mvc\Cli\CommandManager
         */
        protected $commandManager;
 
@@ -37,11 +39,11 @@ class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller
        protected $commandsByExtensionsAndControllers = array();
 
        /**
-        * @param Tx_Extbase_MVC_CLI_CommandManager $commandManager
+        * @param \TYPO3\CMS\Extbase\Mvc\Cli\CommandManager $commandManager
         * @return void
         * @author Bastian Waidelich <bastian@typo3.org>
         */
-       public function injectCommandManager(Tx_Extbase_MVC_CLI_CommandManager $commandManager) {
+       public function injectCommandManager(\TYPO3\CMS\Extbase\Mvc\Cli\CommandManager $commandManager) {
                $this->commandManager = $commandManager;
        }
 
@@ -55,7 +57,7 @@ class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller
         * @internal
         */
        public function helpStubCommand() {
-               $this->outputLine('Extbase %s', array(t3lib_extMgm::getExtensionVersion('extbase')));
+               $this->outputLine('Extbase %s', array(\TYPO3\CMS\Core\Extension\ExtensionManager::getExtensionVersion('extbase')));
                $this->outputLine('usage: ./cli_dispatch.phpsh extbase <command identifier>');
                $this->outputLine();
                $this->outputLine('See \'./cli_dispatch.phpsh extbase help\' for a list of all available commands.');
@@ -77,7 +79,7 @@ class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller
                } else {
                        try {
                                $command = $this->commandManager->getCommandByIdentifier($commandIdentifier);
-                       } catch (Tx_Extbase_MVC_Exception_Command $exception) {
+                       } catch (\TYPO3\CMS\Extbase\Mvc\Exception\CommandException $exception) {
                                $this->outputLine($exception->getMessage());
                                return;
                        }
@@ -90,7 +92,7 @@ class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller
         */
        protected function displayHelpIndex() {
                $this->buildCommandsIndex();
-               $this->outputLine('Extbase %s', array(t3lib_extMgm::getExtensionVersion('extbase')));
+               $this->outputLine('Extbase %s', array(\TYPO3\CMS\Core\Extension\ExtensionManager::getExtensionVersion('extbase')));
                $this->outputLine('usage: ./cli_dispatch.phpsh extbase <command identifier>');
                $this->outputLine();
                $this->outputLine('The following commands are currently available:');
@@ -114,10 +116,10 @@ class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller
        /**
         * Render help text for a single command
         *
-        * @param Tx_Extbase_MVC_CLI_Command $command
+        * @param \TYPO3\CMS\Extbase\Mvc\Cli\Command $command
         * @return void
         */
-       protected function displayHelpForCommand(Tx_Extbase_MVC_CLI_Command $command) {
+       protected function displayHelpForCommand(\TYPO3\CMS\Extbase\Mvc\Cli\Command $command) {
                $this->outputLine();
                $this->outputLine($command->getShortDescription());
                $this->outputLine();
@@ -188,13 +190,13 @@ class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller
         * Displays an error message
         *
         * @internal
-        * @param Tx_Extbase_MVC_Exception_Command $exception
+        * @param \TYPO3\CMS\Extbase\Mvc\Exception\CommandException $exception
         * @return void
         * @author Bastian Waidelich <bastian@typo3.org>
         */
-       public function errorCommand(Tx_Extbase_MVC_Exception_Command $exception) {
+       public function errorCommand(\TYPO3\CMS\Extbase\Mvc\Exception\CommandException $exception) {
                $this->outputLine($exception->getMessage());
-               if ($exception instanceof Tx_Extbase_MVC_Exception_AmbiguousCommandIdentifier) {
+               if ($exception instanceof \TYPO3\CMS\Extbase\Mvc\Exception\AmbiguousCommandIdentifierException) {
                        $this->outputLine('Please specify the complete command identifier. Matched commands:');
                        foreach ($exception->getMatchingCommands() as $matchingCommand) {
                                $this->outputLine('    %s', array($matchingCommand->getCommandIdentifier()));
@@ -229,4 +231,5 @@ class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller
 
 }
 
+
 ?>
\ No newline at end of file
index b7b10e3..de3878e 100755 (executable)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Configuration;
+
 /***************************************************************
  *  Copyright notice
  *
@@ -28,7 +30,7 @@
  * @subpackage Configuration
  * @version $ID:$
  */
-abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements t3lib_Singleton {
+abstract class AbstractConfigurationManager implements \TYPO3\CMS\Core\SingletonInterface {
 
        /**
         * Default backend storage PID
@@ -42,17 +44,17 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
        protected $configuration = array();
 
        /**
-        * @var tslib_cObj
+        * @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
         */
        protected $contentObject;
 
        /**
-        * @var Tx_Extbase_Object_ObjectManagerInterface
+        * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
         */
        protected $objectManager;
 
        /**
-        * @var Tx_Extbase_Service_TypoScriptService
+        * @var \TYPO3\CMS\Extbase\Service\TypoScriptService
         */
        protected $typoScriptService;
 
@@ -78,26 +80,26 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
        protected $configurationCache = array();
 
        /**
-        * @param Tx_Extbase_Object_ObjectManagerInterface $objectManager
+        * @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
         * @return void
         */
-       public function injectObjectManager(Tx_Extbase_Object_ObjectManagerInterface $objectManager) {
+       public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager) {
                $this->objectManager = $objectManager;
        }
 
        /**
-        * @param Tx_Extbase_Service_TypoScriptService $typoScriptService
+        * @param \TYPO3\CMS\Extbase\Service\TypoScriptService $typoScriptService
         * @return void
         */
-       public function injectTypoScriptService(Tx_Extbase_Service_TypoScriptService $typoScriptService) {
+       public function injectTypoScriptService(\TYPO3\CMS\Extbase\Service\TypoScriptService $typoScriptService) {
                $this->typoScriptService = $typoScriptService;
        }
 
        /**
-        * @param tslib_cObj $contentObject
+        * @param \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $contentObject
         * @return void
         */
-       public function setContentObject(tslib_cObj $contentObject = NULL) {
+       public function setContentObject(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $contentObject = NULL) {
                $this->contentObject = $contentObject;
        }
 
@@ -149,7 +151,7 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
                // only merge $this->configuration and override switchableControllerActions when retrieving configuration of the current plugin
                if ($extensionName === NULL || $extensionName === $this->extensionName && $pluginName === $this->pluginName) {
                        $pluginConfiguration = $this->getPluginConfiguration($this->extensionName, $this->pluginName);
-                       $pluginConfiguration = t3lib_div::array_merge_recursive_overrule($pluginConfiguration, $this->configuration);
+                       $pluginConfiguration = \TYPO3\CMS\Core\Utility\GeneralUtility::array_merge_recursive_overrule($pluginConfiguration, $this->configuration);
                        $pluginConfiguration['controllerConfiguration'] = $this->getSwitchableControllerActions($this->extensionName, $this->pluginName);
                        if (isset($this->configuration['switchableControllerActions'])) {
                                $this->overrideSwitchableControllerActions($pluginConfiguration, $this->configuration['switchableControllerActions']);
@@ -158,7 +160,7 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
                        $pluginConfiguration = $this->getPluginConfiguration($extensionName, $pluginName);
                        $pluginConfiguration['controllerConfiguration'] = $this->getSwitchableControllerActions($extensionName, $pluginName);
                }
-               $frameworkConfiguration = t3lib_div::array_merge_recursive_overrule($frameworkConfiguration, $pluginConfiguration);
+               $frameworkConfiguration = \TYPO3\CMS\Core\Utility\GeneralUtility::array_merge_recursive_overrule($frameworkConfiguration, $pluginConfiguration);
                // only load context specific configuration when retrieving configuration of the current plugin
                if ($extensionName === NULL || $extensionName === $this->extensionName && $pluginName === $this->pluginName) {
                        $frameworkConfiguration = $this->getContextSpecificFrameworkConfiguration($frameworkConfiguration);
@@ -168,12 +170,12 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
                        stdWrap. Than we convert the configuration to normal TypoScript
                        and apply the stdWrap to the storagePid */
                        if (TYPO3_MODE !== 'FE') {
-                               Tx_Extbase_Utility_FrontendSimulator::simulateFrontendEnvironment($this->getContentObject());
+                               \TYPO3\CMS\Extbase\Utility\FrontendSimulatorUtility::simulateFrontendEnvironment($this->getContentObject());
                        }
                        $configuration = $this->typoScriptService->convertPlainArrayToTypoScriptArray($frameworkConfiguration['persistence']);
                        $frameworkConfiguration['persistence']['storagePid'] = $GLOBALS['TSFE']->cObj->stdWrap($configuration['storagePid'], $configuration['storagePid.']);
                        if (TYPO3_MODE !== 'FE') {
-                               Tx_Extbase_Utility_FrontendSimulator::resetFrontendEnvironment();
+                               \TYPO3\CMS\Extbase\Utility\FrontendSimulatorUtility::resetFrontendEnvironment();
                        }
                }
                // 1st level cache
@@ -275,4 +277,5 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
 
 }
 
+
 ?>
\ No newline at end of file
index 6894638..797f9c1 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Configuration;
+
 /***************************************************************
  *  Copyright notice
  *
@@ -28,7 +30,7 @@
  * @subpackage Configuration
  * @version $ID:$
  */
-class Tx_Extbase_Configuration_BackendConfigurationManager extends Tx_Extbase_Configuration_AbstractConfigurationManager {
+class BackendConfigurationManager extends \TYPO3\CMS\Extbase\Configuration\AbstractConfigurationManager {
 
        /**
         * @var array
@@ -42,7 +44,7 @@ class Tx_Extbase_Configuration_BackendConfigurationManager extends Tx_Extbase_Co
         */
        public function getTypoScriptSetup() {
                if ($this->typoScriptSetupCache === NULL) {
-                       $template = t3lib_div::makeInstance('t3lib_TStemplate');
+                       $template = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\TypoScript\\TemplateService');
                        // do not log time-performance information
                        $template->tt_track = 0;
                        $template->init();
@@ -50,8 +52,8 @@ class Tx_Extbase_Configuration_BackendConfigurationManager extends Tx_Extbase_Co
                        $rootline = array();
                        $pageId = $this->getCurrentPageId();
                        if ($pageId > 0) {
-                               /** @var $sysPage t3lib_pageSelect */
-                               $sysPage = t3lib_div::makeInstance('t3lib_pageSelect');
+                               /** @var $sysPage \TYPO3\CMS\Frontend\Page\PageRepository */
+                               $sysPage = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\Page\\PageRepository');
                                // Get the rootline for the current page
                                $rootline = $sysPage->getRootLine($this->getCurrentPageId(), '', TRUE);
                        }
@@ -80,7 +82,7 @@ class Tx_Extbase_Configuration_BackendConfigurationManager extends Tx_Extbase_Co
                if ($pluginName !== NULL) {
                        $pluginSignature = strtolower(($extensionName . '_') . $pluginName);
                        if (is_array($setup['module.'][('tx_' . $pluginSignature) . '.'])) {
-                               $pluginConfiguration = t3lib_div::array_merge_recursive_overrule($pluginConfiguration, $this->typoScriptService->convertTypoScriptArrayToPlainArray($setup['module.'][('tx_' . $pluginSignature) . '.']));
+                               $pluginConfiguration = \TYPO3\CMS\Core\Utility\GeneralUtility::array_merge_recursive_overrule($pluginConfiguration, $this->typoScriptService->convertTypoScriptArrayToPlainArray($setup['module.'][('tx_' . $pluginSignature) . '.']));
                        }
                }
                return $pluginConfiguration;
@@ -112,7 +114,7 @@ class Tx_Extbase_Configuration_BackendConfigurationManager extends Tx_Extbase_Co
         * @return integer current page id. If no page is selected current root page id is returned
         */
        protected function getCurrentPageId() {
-               $pageId = (int) t3lib_div::_GP('id');
+               $pageId = (int) \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('id');
                if ($pageId > 0) {
                        return $pageId;
                }
@@ -150,8 +152,8 @@ class Tx_Extbase_Configuration_BackendConfigurationManager extends Tx_Extbase_Co
        protected function getContextSpecificFrameworkConfiguration(array $frameworkConfiguration) {
                if (!isset($frameworkConfiguration['mvc']['requestHandlers'])) {
                        $frameworkConfiguration['mvc']['requestHandlers'] = array(
-                               'Tx_Extbase_MVC_Web_FrontendRequestHandler' => 'Tx_Extbase_MVC_Web_FrontendRequestHandler',
-                               'Tx_Extbase_MVC_Web_BackendRequestHandler' => 'Tx_Extbase_MVC_Web_BackendRequestHandler'
+                               'TYPO3\\CMS\\Extbase\\Mvc\\Web\\FrontendRequestHandler' => 'TYPO3\\CMS\\Extbase\\Mvc\\Web\\FrontendRequestHandler',
+                               'TYPO3\\CMS\\Extbase\\Mvc\\Web\\BackendRequestHandler' => 'TYPO3\\CMS\\Extbase\\Mvc\\Web\\BackendRequestHandler'
                        );
                }
                return $frameworkConfiguration;
@@ -159,4 +161,5 @@ class Tx_Extbase_Configuration_BackendConfigurationManager extends Tx_Extbase_Co
 
 }
 
+
 ?>
\ No newline at end of file
index 4c29d14..2caa076 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Configuration;
+
 /***************************************************************
  *  Copyright notice
  *
  * @subpackage Configuration
  * @version $ID:$
  */
-class Tx_Extbase_Configuration_ConfigurationManager implements Tx_Extbase_Configuration_ConfigurationManagerInterface {
+class ConfigurationManager implements \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface {
 
        /**
-        * @var Tx_Extbase_Object_ObjectManagerInterface
+        * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
         */
        protected $objectManager;
 
        /**
-        * @var Tx_Extbase_Configuration_AbstractConfigurationManager
+        * @var \TYPO3\CMS\Extbase\Configuration\AbstractConfigurationManager
         */
        protected $concreteConfigurationManager;
 
        /**
-        * @param Tx_Extbase_Object_ObjectManagerInterface $objectManager
+        * @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
         * @return void
         */
-       public function injectObjectManager(Tx_Extbase_Object_ObjectManagerInterface $objectManager) {
+       public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager) {
                $this->objectManager = $objectManager;
                $this->initializeConcreteConfigurationManager();
        }
@@ -57,22 +59,22 @@ class Tx_Extbase_Configuration_ConfigurationManager implements Tx_Extbase_Config
         */
        protected function initializeConcreteConfigurationManager() {
                if (TYPO3_MODE === 'FE') {
-                       $this->concreteConfigurationManager = $this->objectManager->get('Tx_Extbase_Configuration_FrontendConfigurationManager');
+                       $this->concreteConfigurationManager = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Configuration\\FrontendConfigurationManager');
                } else {
-                       $this->concreteConfigurationManager = $this->objectManager->get('Tx_Extbase_Configuration_BackendConfigurationManager');
+                       $this->concreteConfigurationManager = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Configuration\\BackendConfigurationManager');
                }
        }
 
        /**
-        * @param tslib_cObj $contentObject
+        * @param \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $contentObject
         * @return void
         */
-       public function setContentObject(tslib_cObj $contentObject = NULL) {
+       public function setContentObject(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $contentObject = NULL) {
                $this->concreteConfigurationManager->setContentObject($contentObject);
        }
 
        /**
-        * @return tslib_cObj
+        * @return \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
         */
        public function getContentObject() {
                return $this->concreteConfigurationManager->getContentObject();
@@ -110,7 +112,7 @@ class Tx_Extbase_Configuration_ConfigurationManager implements Tx_Extbase_Config
                case self::CONFIGURATION_TYPE_FULL_TYPOSCRIPT:
                        return $this->concreteConfigurationManager->getTypoScriptSetup();
                default:
-                       throw new Tx_Extbase_Configuration_Exception_InvalidConfigurationType(('Invalid configuration type "' . $configurationType) . '"', 1206031879);
+                       throw new \TYPO3\CMS\Extbase\Configuration\Exception\InvalidConfigurationType(('Invalid configuration type "' . $configurationType) . '"', 1206031879);
                }
        }
 
@@ -131,4 +133,5 @@ class Tx_Extbase_Configuration_ConfigurationManager implements Tx_Extbase_Config
 
 }
 
+
 ?>
\ No newline at end of file
index 71201b9..94c91b0 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Configuration;
+
 /***************************************************************
  *  Copyright notice
  *
  * @subpackage Configuration
  * @version $ID:$
  */
-interface Tx_Extbase_Configuration_ConfigurationManagerInterface extends t3lib_Singleton
+interface ConfigurationManagerInterface extends \TYPO3\CMS\Core\SingletonInterface
 {
        const CONFIGURATION_TYPE_FRAMEWORK = 'Framework';
        const CONFIGURATION_TYPE_SETTINGS = 'Settings';
        const CONFIGURATION_TYPE_FULL_TYPOSCRIPT = 'FullTypoScript';
        /**
-        * @param tslib_cObj $contentObject
+        * @param \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $contentObject
         * @return void
         */
-       public function setContentObject(tslib_cObj $contentObject = NULL);
+       public function setContentObject(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $contentObject = NULL);
 
        /**
         * Get the content object
         *
-        * @return tslib_cObj
+        * @return \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
         * @api (v4 only)
         */
        public function getContentObject();
@@ -80,4 +82,5 @@ interface Tx_Extbase_Configuration_ConfigurationManagerInterface extends t3lib_S
        public function isFeatureEnabled($featureName);
 
 }
+
 ?>
\ No newline at end of file
index 0cf476a..ce6fd17 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Configuration;
+
 /***************************************************************
  *  Copyright notice
  *
  * @subpackage Configuration
  * @version $ID:$
  */
-class Tx_Extbase_Configuration_Exception extends Tx_Extbase_Exception {
+class Exception extends \TYPO3\CMS\Extbase\Exception {
 
 
 }
 
+
 ?>
\ No newline at end of file
index 5468b67..d147fee 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Configuration/Exception/ContainerIsLockedException.php
  */
-require_once t3lib_extMgm::extPath('extbase') . 'Classes/Configuration/Exception/ContainerIsLockedException.php';
+require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Configuration/Exception/ContainerIsLockedException.php';
 ?>
\ No newline at end of file
index 4d004e1..d76fa58 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Configuration\Exception;
+
 /***************************************************************
  *  Copyright notice
  *
  * @subpackage Configuration\Exception
  * @version $ID:$
  */
-class Tx_Extbase_Configuration_Exception_ContainerIsLocked extends Tx_Extbase_Configuration_Exception {
+class ContainerIsLocked extends \TYPO3\CMS\Extbase\Configuration\Exception {
 
 
 }
 
+
 ?>
\ No newline at end of file
index d219c1a..decf64c 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Configuration/Exception/InvalidConfigurationTypeException.php
  */
-require_once t3lib_extMgm::extPath('extbase') . 'Classes/Configuration/Exception/InvalidConfigurationTypeException.php';
+require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Configuration/Exception/InvalidConfigurationTypeException.php';
 ?>
\ No newline at end of file
index 2e98305..bb5319a 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Configuration\Exception;
+
 /***************************************************************
  *  Copyright notice
  *
  * @subpackage Configuration\Exception
  * @version $ID:$
  */
-class Tx_Extbase_Configuration_Exception_InvalidConfigurationType extends Tx_Extbase_Configuration_Exception {
+class InvalidConfigurationType extends \TYPO3\CMS\Extbase\Configuration\Exception {
 
 
 }
 
+
 ?>
\ No newline at end of file
index 4d89e6f..fd23feb 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchFileException.php
  */
-require_once t3lib_extMgm::extPath('extbase') . 'Classes/Configuration/Exception/NoSuchFileException.php';
+require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Configuration/Exception/NoSuchFileException.php';
 ?>
\ No newline at end of file
index a677b43..d3dbf91 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Configuration\Exception;
+
 /***************************************************************
  *  Copyright notice
  *
  * @subpackage Configuration\Exception
  * @version $ID:$
  */
-class Tx_Extbase_Configuration_Exception_NoSuchFile extends Tx_Extbase_Configuration_Exception {
+class NoSuchFile extends \TYPO3\CMS\Extbase\Configuration\Exception {
 
 
 }
 
+
 ?>
\ No newline at end of file
index 42307e5..6d6393d 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchOptionException.php
  */
-require_once t3lib_extMgm::extPath('extbase') . 'Classes/Configuration/Exception/NoSuchOptionException.php';
+require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Configuration/Exception/NoSuchOptionException.php';
 ?>
\ No newline at end of file
index ee1a758..7a99bc3 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Configuration\Exception;
+
 /***************************************************************
  *  Copyright notice
  *
  * @subpackage Configuration\Exception
  * @version $ID:$
  */
-class Tx_Extbase_Configuration_Exception_NoSuchOption extends Tx_Extbase_Configuration_Exception {
+class NoSuchOption extends \TYPO3\CMS\Extbase\Configuration\Exception {
 
 
 }
 
+
 ?>
\ No newline at end of file
index b0b13c2..a38f0d9 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Configuration/Exception/ParseErrorException.php
  */
-require_once t3lib_extMgm::extPath('extbase') . 'Classes/Configuration/Exception/ParseErrorException.php';
+require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Configuration/Exception/ParseErrorException.php';
 ?>
\ No newline at end of file
index 5787c1f..eef1aad 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Configuration\Exception;
+
 /***************************************************************
  *  Copyright notice
  *
  * @subpackage Configuration\Exception
  * @version $ID:$
  */
-class Tx_Extbase_Configuration_Exception_ParseError extends Tx_Extbase_Configuration_Exception {
+class ParseError extends \TYPO3\CMS\Extbase\Configuration\Exception {
 
 
 }
 
+
 ?>
\ No newline at end of file
index 6fff4a6..bd643d5 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Configuration;
+
 /***************************************************************
  *  Copyright notice
  *
  * @subpackage Configuration
  * @version $ID:$
  */
-class Tx_Extbase_Configuration_FrontendConfigurationManager extends Tx_Extbase_Configuration_AbstractConfigurationManager {
+class FrontendConfigurationManager extends \TYPO3\CMS\Extbase\Configuration\AbstractConfigurationManager {
 
        /**
-        * @var Tx_Extbase_Service_FlexFormService
+        * @var \TYPO3\CMS\Extbase\Service\FlexFormService
         */
        protected $flexFormService;
 
        /**
-        * @param Tx_Extbase_Service_FlexFormService $flexFormService
+        * @param \TYPO3\CMS\Extbase\Service\FlexFormService $flexFormService
         * @return void
         */
-       public function injectFlexFormService(Tx_Extbase_Service_FlexFormService $flexFormService) {
+       public function injectFlexFormService(\TYPO3\CMS\Extbase\Service\FlexFormService $flexFormService) {
                $this->flexFormService = $flexFormService;
        }
 
@@ -71,7 +73,7 @@ class Tx_Extbase_Configuration_FrontendConfigurationManager extends Tx_Extbase_C
                if ($pluginName !== NULL) {
                        $pluginSignature = strtolower(($extensionName . '_') . $pluginName);
                        if (is_array($setup['plugin.'][('tx_' . $pluginSignature) . '.'])) {
-                               $pluginConfiguration = t3lib_div::array_merge_recursive_overrule($pluginConfiguration, $this->typoScriptService->convertTypoScriptArrayToPlainArray($setup['plugin.'][('tx_' . $pluginSignature) . '.']));
+                               $pluginConfiguration = \TYPO3\CMS\Core\Utility\GeneralUtility::array_merge_recursive_overrule($pluginConfiguration, $this->typoScriptService->convertTypoScriptArrayToPlainArray($setup['plugin.'][('tx_' . $pluginSignature) . '.']));
                        }
                }
                return $pluginConfiguration;
@@ -123,7 +125,7 @@ class Tx_Extbase_Configuration_FrontendConfigurationManager extends Tx_Extbase_C
                if (is_string($pages) && strlen($pages) > 0) {
                        $list = array();
                        if ($this->contentObject->data['recursive'] > 0) {
-                               $explodedPages = t3lib_div::trimExplode(',', $pages);
+                               $explodedPages = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $pages);
                                foreach ($explodedPages as $pid) {
                                        $list[] = trim($this->contentObject->getTreeList($pid, $this->contentObject->data['recursive']), ',');
                                }
@@ -131,7 +133,7 @@ class Tx_Extbase_Configuration_FrontendConfigurationManager extends Tx_Extbase_C
                        if (count($list) > 0) {
                                $pages = ($pages . ',') . implode(',', $list);
                        }
-                       $frameworkConfiguration = t3lib_div::array_merge_recursive_overrule($frameworkConfiguration, array(
+                       $frameworkConfiguration = \TYPO3\CMS\Core\Utility\GeneralUtility::array_merge_recursive_overrule($frameworkConfiguration, array(
                                'persistence' => array(
                                        'storagePid' => $pages
                                )
@@ -189,7 +191,7 @@ class Tx_Extbase_Configuration_FrontendConfigurationManager extends Tx_Extbase_C
         * @deprecated since Extbase 1.4; will be removed in Extbase 6.0
         */
        protected function convertFlexformContentToArray($flexFormContent) {
-               t3lib_div::logDeprecatedFunction();
+               \TYPO3\CMS\Core\Utility\GeneralUtility::logDeprecatedFunction();
                return $this->flexFormService->convertFlexFormContentToArray($flexFormContent);
        }
 
@@ -202,7 +204,7 @@ class Tx_Extbase_Configuration_FrontendConfigurationManager extends Tx_Extbase_C
         * @deprecated since Extbase 1.4; will be removed in Extbase 6.0
         */
        protected function walkFlexformNode($nodeArray, $valuePointer = 'vDEF') {
-               t3lib_div::logDeprecatedFunction();
+               \TYPO3\CMS\Core\Utility\GeneralUtility::logDeprecatedFunction();
                return $this->flexFormService->walkFlexFormNode($nodeArray, $valuePointer);
        }
 
@@ -216,7 +218,7 @@ class Tx_Extbase_Configuration_FrontendConfigurationManager extends Tx_Extbase_C
         */
        protected function mergeConfigurationIntoFrameworkConfiguration(array $frameworkConfiguration, array $configuration, $configurationPartName) {
                if (is_array($frameworkConfiguration[$configurationPartName]) && is_array($configuration[$configurationPartName])) {
-                       $frameworkConfiguration[$configurationPartName] = t3lib_div::array_merge_recursive_overrule($frameworkConfiguration[$configurationPartName], $configuration[$configurationPartName]);
+                       $frameworkConfiguration[$configurationPartName] = \TYPO3\CMS\Core\Utility\GeneralUtility::array_merge_recursive_overrule($frameworkConfiguration[$configurationPartName], $configuration[$configurationPartName]);
                }
                return $frameworkConfiguration;
        }
@@ -234,12 +236,12 @@ class Tx_Extbase_Configuration_FrontendConfigurationManager extends Tx_Extbase_C
                }
                // As "," is the flexForm field value delimiter, we need to use ";" as in-field delimiter. That's why we need to replace ; by  , first.
                // The expected format is: "Controller1->action2;Controller2->action3;Controller2->action1"
-               $switchableControllerActionPartsFromFlexForm = t3lib_div::trimExplode(',', str_replace(';', ',', $flexFormConfiguration['switchableControllerActions']), TRUE);
+               $switchableControllerActionPartsFromFlexForm = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', str_replace(';', ',', $flexFormConfiguration['switchableControllerActions']), TRUE);
                $newSwitchableControllerActionsFromFlexForm = array();
                foreach ($switchableControllerActionPartsFromFlexForm as $switchableControllerActionPartFromFlexForm) {
-                       list($controller, $action) = t3lib_div::trimExplode('->', $switchableControllerActionPartFromFlexForm);
+                       list($controller, $action) = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode('->', $switchableControllerActionPartFromFlexForm);
                        if (empty($controller) || empty($action)) {
-                               throw new Tx_Extbase_Configuration_Exception_ParseError('Controller or action were empty when overriding switchableControllerActions from flexForm.', 1257146403);
+                               throw new \TYPO3\CMS\Extbase\Configuration\Exception\ParseError('Controller or action were empty when overriding switchableControllerActions from flexForm.', 1257146403);
                        }
                        $newSwitchableControllerActionsFromFlexForm[$controller][] = $action;
                }
@@ -251,4 +253,5 @@ class Tx_Extbase_Configuration_FrontendConfigurationManager extends Tx_Extbase_C
 
 }
 
+
 ?>
\ No newline at end of file
index a79e38a..87fc615 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Core;
+
 /***************************************************************
  *  Copyright notice
  *
  * @package Extbase
  * @version $ID:$
  */
-class Tx_Extbase_Core_Bootstrap implements Tx_Extbase_Core_BootstrapInterface {
+class Bootstrap implements \TYPO3\CMS\Extbase\Core\BootstrapInterface {
 
        /**
         * Back reference to the parent content object
         * This has to be public as it is set directly from TYPO3
         *
-        * @var tslib_cObj
+        * @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
         */
        public $cObj;
 
@@ -48,27 +50,27 @@ class Tx_Extbase_Core_Bootstrap implements Tx_Extbase_Core_BootstrapInterface {
        protected $context;
 
        /**
-        * @var Tx_Extbase_Configuration_ConfigurationManager
+        * @var \TYPO3\CMS\Extbase\Configuration\ConfigurationManager
         */
        protected $configurationManager;
 
        /**
-        * @var Tx_Extbase_Object_ObjectManagerInterface
+        * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
         */
        protected $objectManager;
 
        /**
-        * @var t3lib_cache_Manager
+        * @var \TYPO3\CMS\Core\Cache\CacheManager
         */
        protected $cacheManager;
 
        /**
-        * @var Tx_Extbase_Reflection_Service
+        * @var \TYPO3\CMS\Extbase\Reflection\Service
         */
        protected $reflectionService;
 
        /**
-        * @var Tx_Extbase_Persistence_Manager
+        * @var \TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager
         */
        protected $persistenceManager;
 
@@ -86,10 +88,10 @@ class Tx_Extbase_Core_Bootstrap implements Tx_Extbase_Core_BootstrapInterface {
        public function initialize($configuration) {
                if (!defined('TYPO3_cliMode') || TYPO3_cliMode !== TRUE) {
                        if (!isset($configuration['extensionName']) || strlen($configuration['extensionName']) === 0) {
-                               throw new RuntimeException('Invalid configuration: "extensionName" is not set', 1290623020);
+                               throw new \RuntimeException('Invalid configuration: "extensionName" is not set', 1290623020);
                        }
                        if (!isset($configuration['pluginName']) || strlen($configuration['pluginName']) === 0) {
-                               throw new RuntimeException('Invalid configuration: "pluginName" is not set', 1290623027);
+                               throw new \RuntimeException('Invalid configuration: "pluginName" is not set', 1290623027);
                        }
                }
                $this->initializeObjectManager();
@@ -107,7 +109,7 @@ class Tx_Extbase_Core_Bootstrap implements Tx_Extbase_Core_BootstrapInterface {
         * @see initialize()
         */
        protected function initializeObjectManager() {
-               $this->objectManager = t3lib_div::makeInstance('Tx_Extbase_Object_ObjectManager');
+               $this->objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Object\\ObjectManager');
        }
 
        /**
@@ -118,8 +120,8 @@ class Tx_Extbase_Core_Bootstrap implements Tx_Extbase_Core_BootstrapInterface {
         * @see initialize()
         */
        public function initializeConfiguration($configuration) {
-               $this->configurationManager = $this->objectManager->get('Tx_Extbase_Configuration_ConfigurationManagerInterface');
-               $contentObject = isset($this->cObj) ? $this->cObj : t3lib_div::makeInstance('tslib_cObj');
+               $this->configurationManager = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Configuration\\ConfigurationManagerInterface');
+               $contentObject = isset($this->cObj) ? $this->cObj : \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\ContentObject\\ContentObjectRenderer');
                $this->configurationManager->setContentObject($contentObject);
                $this->configurationManager->setConfiguration($configuration);
        }
@@ -132,11 +134,11 @@ class Tx_Extbase_Core_Bootstrap implements Tx_Extbase_Core_BootstrapInterface {
         * @see initialize()
         */
        public function configureObjectManager() {
-               $typoScriptSetup = $this->configurationManager->getConfiguration(Tx_Extbase_Configuration_ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
+               $typoScriptSetup = $this->configurationManager->getConfiguration(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
                if (!is_array($typoScriptSetup['config.']['tx_extbase.']['objects.'])) {
                        return;
                }
-               $objectContainer = t3lib_div::makeInstance('Tx_Extbase_Object_Container_Container');
+               $objectContainer = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Object\\Container\\Container');
                foreach ($typoScriptSetup['config.']['tx_extbase.']['objects.'] as $classNameWithDot => $classConfiguration) {
                        if (isset($classConfiguration['className'])) {
                                $originalClassName = rtrim($classNameWithDot, '.');
@@ -162,7 +164,7 @@ class Tx_Extbase_Core_Bootstrap implements Tx_Extbase_Core_BootstrapInterface {
         * @see initialize()
         */
        protected function initializeReflection() {
-               $this->reflectionService = $this->objectManager->get('Tx_Extbase_Reflection_Service');
+               $this->reflectionService = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Reflection\\Service');
                $this->reflectionService->setDataCache($this->cacheManager->getCache('extbase_reflection'));
                if (!$this->reflectionService->isInitialized()) {
                        $this->reflectionService->initialize();
@@ -176,7 +178,7 @@ class Tx_Extbase_Core_Bootstrap implements Tx_Extbase_Core_BootstrapInterface {
         * @see initialize()
         */
        public function initializePersistence() {
-               $this->persistenceManager = $this->objectManager->get('Tx_Extbase_Persistence_Manager');
+               $this->persistenceManager = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\PersistenceManager');
        }
 
        /**
@@ -204,11 +206,11 @@ class Tx_Extbase_Core_Bootstrap implements Tx_Extbase_Core_BootstrapInterface {
         */
        protected function handleCommandLineRequest() {
                $commandLine = isset($_SERVER['argv']) ? $_SERVER['argv'] : array();
-               $request = $this->objectManager->get('Tx_Extbase_MVC_CLI_RequestBuilder')->build(array_slice($commandLine, 1));
-               $response = $this->objectManager->get('Tx_Extbase_MVC_CLI_Response');
+               $request = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Cli\\RequestBuilder')->build(array_slice($commandLine, 1));
+               $response = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Cli\\Response');
                $extensionName = $request->getControllerExtensionName();
                $this->configurationManager->setConfiguration(array('extensionName' => $extensionName));
-               $this->objectManager->get('Tx_Extbase_MVC_Dispatcher')->dispatch($request, $response);
+               $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Dispatcher')->dispatch($request, $response);
                $content = $response->getContent();
                $this->resetSingletons();
                return $content;
@@ -218,7 +220,7 @@ class Tx_Extbase_Core_Bootstrap implements Tx_Extbase_Core_BootstrapInterface {
         * @return string
         */
        protected function handleWebRequest() {
-               $requestHandlerResolver = $this->objectManager->get('Tx_Extbase_MVC_RequestHandlerResolver');
+               $requestHandlerResolver = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\RequestHandlerResolver');
                $requestHandler = $requestHandlerResolver->resolveRequestHandler();
                $response = $requestHandler->handleRequest();
                // If response is NULL after handling the request we need to stop
@@ -262,12 +264,12 @@ class Tx_Extbase_Core_Bootstrap implements Tx_Extbase_Core_BootstrapInterface {
                $moduleConfiguration = $GLOBALS['TBE_MODULES']['_configuration'][$moduleSignature];
                // Check permissions and exit if the user has no permission for entry
                $GLOBALS['BE_USER']->modAccess($moduleConfiguration, TRUE);
-               if (t3lib_div::_GP('id')) {
+               if (\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('id')) {
                        // Check page access
                        $permClause = $GLOBALS['BE_USER']->getPagePermsClause(TRUE);
-                       $access = is_array(t3lib_BEfunc::readPageAccess((int) t3lib_div::_GP('id'), $permClause));
+                       $access = is_array(\TYPO3\CMS\Backend\Utility\BackendUtility::readPageAccess((int) \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('id'), $permClause));
                        if (!$access) {
-                               throw new RuntimeException('You don\'t have access to this page', 1289917924);
+                               throw new \RuntimeException('You don\'t have access to this page', 1289917924);
                        }
                }
                // BACK_PATH is the path from the typo3/ directory from within the
@@ -285,4 +287,5 @@ class Tx_Extbase_Core_Bootstrap implements Tx_Extbase_Core_BootstrapInterface {
 
 }
 
+
 ?>
\ No newline at end of file
index 6ee93c1..2bff6d4 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Core;
+
 /*                                                                        *
  * This script belongs to the Extbase framework.                          *
  *                                                                        *
@@ -16,7 +18,7 @@
  *
  * @package Extbase
  */
-interface Tx_Extbase_Core_BootstrapInterface
+interface BootstrapInterface
 {
        /**
         * Runs the the Extbase Framework by resolving an appropriate Request Handler and passing control to it.
@@ -40,4 +42,5 @@ interface Tx_Extbase_Core_BootstrapInterface
        public function callModule($moduleSignature);
 
 }
+
 ?>
\ No newline at end of file
index 312d92f..964f90b 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Domain\Model;
+
 /***************************************************************
  *  Copyright notice
  *
  * @entity
  * @api experimental! This class is experimental and subject to change!
  */
-abstract class Tx_Extbase_Domain_Model_AbstractFileCollection extends Tx_Extbase_DomainObject_AbstractEntity {
+abstract class AbstractFileCollection extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
        /**
-        * @var t3lib_file_Collection_AbstractFileCollection
+        * @var \TYPO3\CMS\Core\Resource\Collection\AbstractFileCollection
         */
        protected $object;
 
        /**
-        * @param t3lib_file_Collection_AbstractFileCollection $object
+        * @param \TYPO3\CMS\Core\Resource\Collection\AbstractFileCollection $object
         */
-       public function setObject(t3lib_file_Collection_AbstractFileCollection $object) {
+       public function setObject(\TYPO3\CMS\Core\Resource\Collection\AbstractFileCollection $object) {
                $this->object = $object;
        }
 
        /**
-        * @return t3lib_file_Collection_AbstractFileCollection
+        * @return \TYPO3\CMS\Core\Resource\Collection\AbstractFileCollection
         */
        public function getObject() {
                return $this->object;
@@ -53,4 +55,5 @@ abstract class Tx_Extbase_Domain_Model_AbstractFileCollection extends Tx_Extbase
 
 }
 
+
 ?>
\ No newline at end of file
index 5537794..316d296 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Domain\Model;
+
 /***************************************************************
  *  Copyright notice
  *
@@ -30,7 +32,7 @@
  * @entity
  * @api experimental! This class is experimental and subject to change!
  */
-abstract class Tx_Extbase_Domain_Model_AbstractFileFolder extends Tx_Extbase_DomainObject_AbstractEntity {
+abstract class AbstractFileFolder extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
        /**
         * @var t3lib_file_ResourceInterface|t3lib_file_Folder|t3lib_file_AbstractFile
@@ -38,9 +40,9 @@ abstract class Tx_Extbase_Domain_Model_AbstractFileFolder extends Tx_Extbase_Dom
        protected $object;
 
        /**
-        * @param t3lib_file_ResourceInterface $object
+        * @param \TYPO3\CMS\Core\Resource\ResourceInterface $object
         */
-       public function setObject(t3lib_file_ResourceInterface $object) {
+       public function setObject(\TYPO3\CMS\Core\Resource\ResourceInterface $object) {
                $this->object = $object;
        }
 
@@ -53,4 +55,5 @@ abstract class Tx_Extbase_Domain_Model_AbstractFileFolder extends Tx_Extbase_Dom
 
 }
 
+
 ?>
\ No newline at end of file
index 865baf2..6a89a91 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Domain\Model;
+
 /***************************************************************
  *  Copyright notice
  *
@@ -34,7 +36,7 @@
  * @entity
  * @api
  */
-class Tx_Extbase_Domain_Model_BackendUser extends Tx_Extbase_DomainObject_AbstractEntity {
+class BackendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
        /**
         * @var string
@@ -291,4 +293,5 @@ class Tx_Extbase_Domain_Model_BackendUser extends Tx_Extbase_DomainObject_Abstra
 
 }
 
+
 ?>
\ No newline at end of file
index a6a20ed..7e86f00 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Domain\Model;
+
 /***************************************************************
  *  Copyright notice
  *
@@ -33,7 +35,7 @@
  * @entity
  * @api
  */
-class Tx_Extbase_Domain_Model_BackendUserGroup extends Tx_Extbase_DomainObject_AbstractEntity {
+class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
        const FILE_OPPERATIONS = 1;
        const FILE_UNZIP = 2;
@@ -52,7 +54,7 @@ class Tx_Extbase_Domain_Model_BackendUserGroup extends Tx_Extbase_DomainObject_A
        protected $description = '';
 
        /**
-        * @var Tx_Extbase_Persistence_ObjectStorage<Tx_Extbase_Domain_Model_BackendUserGroup>
+        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup>
         */
        protected $subGroups;
 
@@ -125,7 +127,7 @@ class Tx_Extbase_Domain_Model_BackendUserGroup extends Tx_Extbase_DomainObject_A
         * Constructs this backend usergroup
         */
        public function __construct() {
-               $this->subGroups = new Tx_Extbase_Persistence_ObjectStorage();
+               $this->subGroups = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
        }
 
        /**
@@ -169,30 +171,30 @@ class Tx_Extbase_Domain_Model_BackendUserGroup extends Tx_Extbase_DomainObject_A
        /**
         * Setter for the sub groups
         *
-        * @param Tx_Extbase_Persistence_ObjectStorage $subGroups
+        * @param \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $subGroups
         * @return void
         */
-       public function setSubGroups(Tx_Extbase_Persistence_ObjectStorage $subGroups) {
+       public function setSubGroups(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $subGroups) {
                $this->subGroups = $subGroups;
        }
 
        /**
         * Adds a sub group to this backend user group
         *
-        * @param Tx_Extbase_Domain_Model_BackendUserGroup $beGroup
+        * @param \TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup $beGroup
         * @return void
         */
-       public function addSubGroup(Tx_Extbase_Domain_Model_BackendUserGroup $beGroup) {
+       public function addSubGroup(\TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup $beGroup) {
                $this->subGroups->attach($beGroup);
        }
 
        /**
         * Removes sub group from this backend user group
         *
-        * @param Tx_Extbase_Domain_Model_BackendUserGroup $groupToDelete
+        * @param \TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup $groupToDelete
         * @return void
         */
-       public function removeSubGroup(Tx_Extbase_Domain_Model_BackendUserGroup $groupToDelete) {
+       public function removeSubGroup(\TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup $groupToDelete) {
                $this->subGroups->detach($groupToDelete);
        }
 
@@ -209,7 +211,7 @@ class Tx_Extbase_Domain_Model_BackendUserGroup extends Tx_Extbase_DomainObject_A
        /**
         * Getter of sub groups
         *
-        * @return Tx_Extbase_Persistence_ObjectStorage
+        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage
         */
        public function getSubGroups() {
                return $this->subGroups;
@@ -584,4 +586,5 @@ class Tx_Extbase_Domain_Model_BackendUserGroup extends Tx_Extbase_DomainObject_A
 
 }
 
+
 ?>
\ No newline at end of file
index b4734c2..bd0c286 100755 (executable)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Domain\Model;
+
 /***************************************************************
  *  Copyright notice
  *
@@ -31,7 +33,7 @@
  * @entity
  * @api
  */
-class Tx_Extbase_Domain_Model_Category extends Tx_Extbase_DomainObject_AbstractEntity {
+class Category extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
        /**
         * @var string
@@ -70,7 +72,7 @@ class Tx_Extbase_Domain_Model_Category extends Tx_Extbase_DomainObject_AbstractE
         * @api
         */
        protected function initStorageObjects() {
-               $this->items = new Tx_Extbase_Persistence_ObjectStorage();
+               $this->items = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
        }
 
        /**
@@ -122,7 +124,7 @@ class Tx_Extbase_Domain_Model_Category extends Tx_Extbase_DomainObject_AbstractE
         * @api
         */
        public function getParent() {
-               if ($this->parent instanceof Tx_Extbase_Persistence_LazyLoadingProxy) {
+               if ($this->parent instanceof \TYPO3\CMS\Extbase\Persistence\Generic\LazyLoadingProxy) {
                        $this->parent->_loadRealInstance();
                }
                return $this->parent;
@@ -131,11 +133,11 @@ class Tx_Extbase_Domain_Model_Category extends Tx_Extbase_DomainObject_AbstractE
        /**
         * Sets the parent category.
         *
-        * @param Tx_Extbase_Domain_Model_Category $parent the parent category
+        * @param \TYPO3\CMS\Extbase\Domain\Model\Category $parent the parent category
         * @return void
         * @api
         */
-       public function setParent(Tx_Extbase_Domain_Model_Category $parent) {
+       public function setParent(\TYPO3\CMS\Extbase\Domain\Model\Category $parent) {
                $this->parent = $parent;
        }
 
@@ -156,32 +158,33 @@ class Tx_Extbase_Domain_Model_Category extends Tx_Extbase_DomainObject_AbstractE
         * @return void
         * @api
         */
-       public function setItems(Tx_Extbase_Persistence_ObjectStorage $items) {
+       public function setItems(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $items) {
                $this->items = $items;
        }
 
        /**
         * Adds a item to the items property
         *
-        * @param Tx_Extbase_DomainObject_AbstractEntity $item
+        * @param \TYPO3\CMS\Extbase\DomainObject\AbstractEntity $item
         * @return void
         * @api
         */
-       public function addItem(Tx_Extbase_DomainObject_AbstractEntity $item) {
+       public function addItem(\TYPO3\CMS\Extbase\DomainObject\AbstractEntity $item) {
                $this->items->attach($item);
        }
 
        /**
         * Removes a item of the items property
         *
-        * @param Tx_Extbase_DomainObject_AbstractEntity $item
+        * @param \TYPO3\CMS\Extbase\DomainObject\AbstractEntity $item
         * @return void
         * @api
         */
-       public function removeItem(Tx_Extbase_DomainObject_AbstractEntity $item) {
+       public function removeItem(\TYPO3\CMS\Extbase\DomainObject\AbstractEntity $item) {
                $this->items->detach($item);
        }
 
 }
 
+
 ?>
\ No newline at end of file
index 6056c97..5d28fc1 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Domain\Model;
+
 /***************************************************************
  *  Copyright notice
  *
  * @entity
  * @api experimental! This class is experimental and subject to change!
  */
-class Tx_Extbase_Domain_Model_File extends Tx_Extbase_Domain_Model_AbstractFileFolder {
+class File extends \TYPO3\CMS\Extbase\Domain\Model\AbstractFileFolder {
 
 
 }
 
+
 ?>
\ No newline at end of file
index 0388929..9af09b0 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Domain\Model;
+
 /***************************************************************
  *  Copyright notice
  *
@@ -32,7 +34,7 @@
  * @entity
  * @api
  */
-class Tx_Extbase_Domain_Model_FileMount extends Tx_Extbase_DomainObject_AbstractEntity {
+class FileMount extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
        /**
         * Title of the file mount.
@@ -120,4 +122,5 @@ class Tx_Extbase_Domain_Model_FileMount extends Tx_Extbase_DomainObject_Abstract
 
 }
 
+
 ?>
\ No newline at end of file
index a2a3739..2d2d7f2 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Domain\Model;
+
 /***************************************************************
  *  Copyright notice
  *
  * @entity
  * @api experimental! This class is experimental and subject to change!
  */
-class Tx_Extbase_Domain_Model_FileReference extends Tx_Extbase_Domain_Model_AbstractFileFolder {
+class FileReference extends \TYPO3\CMS\Extbase\Domain\Model\AbstractFileFolder {
 
 
 }
 
+
 ?>
\ No newline at end of file
index ec83493..52cd195 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Domain\Model;
+
 /***************************************************************
  *  Copyright notice
  *
  * @entity
  * @api experimental! This class is experimental and subject to change!
  */
-class Tx_Extbase_Domain_Model_Folder extends Tx_Extbase_Domain_Model_AbstractFileFolder {
+class Folder extends \TYPO3\CMS\Extbase\Domain\Model\AbstractFileFolder {
 
 
 }
 
+
 ?>
\ No newline at end of file
index 7664fd4..e66cfb2 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Domain\Model;
+
 /***************************************************************
  *  Copyright notice
  *
  * @entity
  * @api experimental! This class is experimental and subject to change!
  */
-class Tx_Extbase_Domain_Model_FolderBasedFileCollection extends Tx_Extbase_Domain_Model_AbstractFileCollection {
+class FolderBasedFileCollection extends \TYPO3\CMS\Extbase\Domain\Model\AbstractFileCollection {
 
 
 }
 
+
 ?>
\ No newline at end of file
index 669619d..e8af8a3 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Domain\Model;
+
 /***************************************************************
  *  Copyright notice
  *
@@ -31,7 +33,7 @@
  * @entity
  * @api
  */
-class Tx_Extbase_Domain_Model_FrontendUser extends Tx_Extbase_DomainObject_AbstractEntity {
+class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
        /**
         * @var string
@@ -148,7 +150,7 @@ class Tx_Extbase_Domain_Model_FrontendUser extends Tx_Extbase_DomainObject_Abstr
        public function __construct($username = '', $password = '') {
                $this->username = $username;
                $this->password = $password;
-               $this->usergroup = new Tx_Extbase_Persistence_ObjectStorage();
+               $this->usergroup = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
        }
 
        /**
@@ -201,29 +203,29 @@ class Tx_Extbase_Domain_Model_FrontendUser extends Tx_Extbase_DomainObject_Abstr
         * @return void
         * @api
         */
-       public function setUsergroup(Tx_Extbase_Persistence_ObjectStorage $usergroup) {
+       public function setUsergroup(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $usergroup) {
                $this->usergroup = $usergroup;
        }
 
        /**
         * Adds a usergroup to the frontend user
         *
-        * @param Tx_Extbase_Domain_Model_FrontendUserGroup $usergroup
+        * @param \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup $usergroup
         * @return void
         * @api
         */
-       public function addUsergroup(Tx_Extbase_Domain_Model_FrontendUserGroup $usergroup) {
+       public function addUsergroup(\TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup $usergroup) {
                $this->usergroup->attach($usergroup);
        }
 
        /**
         * Removes a usergroup from the frontend user
         *
-        * @param Tx_Extbase_Domain_Model_FrontendUserGroup $usergroup
+        * @param \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup $usergroup
         * @return void
         * @api
         */
-       public function removeUsergroup(Tx_Extbase_Domain_Model_FrontendUserGroup $usergroup) {
+       public function removeUsergroup(\TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup $usergroup) {
                $this->usergroup->detach($usergroup);
        }
 
@@ -231,7 +233,7 @@ class Tx_Extbase_Domain_Model_FrontendUser extends Tx_Extbase_DomainObject_Abstr
         * Returns the usergroups. Keep in mind that the property is called "usergroup"
         * although it can hold several usergroups.
         *
-        * @return Tx_Extbase_Persistence_ObjectStorage An object storage containing the usergroup
+        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage An object storage containing the usergroup
         * @api
         */
        public function getUsergroup() {
@@ -581,7 +583,7 @@ class Tx_Extbase_Domain_Model_FrontendUser extends Tx_Extbase_DomainObject_Abstr
         * @return void
         * @api
         */
-       public function setLastlogin(DateTime $lastlogin) {
+       public function setLastlogin(\DateTime $lastlogin) {
                $this->lastlogin = $lastlogin;
        }
 
@@ -618,4 +620,5 @@ class Tx_Extbase_Domain_Model_FrontendUser extends Tx_Extbase_DomainObject_Abstr
 
 }
 
+
 ?>
\ No newline at end of file
index 86cb031..fc036bc 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Domain\Model;
+
 /***************************************************************
  *  Copyright notice
  *
@@ -30,7 +32,7 @@
  * @entity
  * @api
  */
-class Tx_Extbase_Domain_Model_FrontendUserGroup extends Tx_Extbase_DomainObject_AbstractEntity {
+class FrontendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
        /**
         * @var string
@@ -59,7 +61,7 @@ class Tx_Extbase_Domain_Model_FrontendUserGroup extends Tx_Extbase_DomainObject_
         */
        public function __construct($title = '') {
                $this->setTitle($title);
-               $this->subgroup = new Tx_Extbase_Persistence_ObjectStorage();
+               $this->subgroup = new \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage();
        }
 
        /**
@@ -133,29 +135,29 @@ class Tx_Extbase_Domain_Model_FrontendUserGroup extends Tx_Extbase_DomainObject_
         * @return void
         * @api
         */
-       public function setSubgroup(Tx_Extbase_Persistence_ObjectStorage $subgroup) {
+       public function setSubgroup(\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage $subgroup) {
                $this->subgroup = $subgroup;
        }
 
        /**
         * Adds a subgroup to the frontend user
         *
-        * @param Tx_Extbase_Domain_Model_FrontendUserGroup $subgroup
+        * @param \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup $subgroup
         * @return void
         * @api
         */
-       public function addSubgroup(Tx_Extbase_Domain_Model_FrontendUserGroup $subgroup) {
+       public function addSubgroup(\TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup $subgroup) {
                $this->subgroup->attach($subgroup);
        }
 
        /**
         * Removes a subgroup from the frontend user group
         *
-        * @param Tx_Extbase_Domain_Model_FrontendUserGroup $subgroup
+        * @param \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup $subgroup
         * @return void
         * @api
         */
-       public function removeSubgroup(Tx_Extbase_Domain_Model_FrontendUserGroup $subgroup) {
+       public function removeSubgroup(\TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup $subgroup) {
                $this->subgroup->detach($subgroup);
        }
 
@@ -163,7 +165,7 @@ class Tx_Extbase_Domain_Model_FrontendUserGroup extends Tx_Extbase_DomainObject_
         * Returns the subgroups. Keep in mind that the property is called "subgroup"
         * although it can hold several subgroups.
         *
-        * @return Tx_Extbase_Persistence_ObjectStorage An object storage containing the subgroups
+        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage An object storage containing the subgroups
         * @api
         */
        public function getSubgroup() {
@@ -172,4 +174,5 @@ class Tx_Extbase_Domain_Model_FrontendUserGroup extends Tx_Extbase_DomainObject_
 
 }
 
+
 ?>
\ No newline at end of file
index a4ca006..243d2f3 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Domain\Model;
+
 /***************************************************************
  *  Copyright notice
  *
  * @entity
  * @api experimental! This class is experimental and subject to change!
  */
-class Tx_Extbase_Domain_Model_StaticFileCollection extends Tx_Extbase_Domain_Model_AbstractFileCollection {
+class StaticFileCollection extends \TYPO3\CMS\Extbase\Domain\Model\AbstractFileCollection {
 
 
 }
 
+
 ?>
\ No newline at end of file
index d9a6333..b7ab23e 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Domain\Repository;
+
 /***************************************************************
  *  Copyright notice
  *
@@ -31,7 +33,7 @@
  * @subpackage Domain\Repository
  * @api
  */
-class Tx_Extbase_Domain_Repository_BackendUserGroupRepository extends Tx_Extbase_Persistence_Repository {
+class BackendUserGroupRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 
        /**
         * Initializes the repository.
@@ -39,12 +41,13 @@ class Tx_Extbase_Domain_Repository_BackendUserGroupRepository extends Tx_Extbase
         * @return void
         */
        public function initializeObject() {
-               /** @var $querySettings Tx_Extbase_Persistence_Typo3QuerySettings */
-               $querySettings = $this->objectManager->create('Tx_Extbase_Persistence_Typo3QuerySettings');
+               /** @var $querySettings \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings */
+               $querySettings = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Typo3QuerySettings');
                $querySettings->setRespectStoragePage(FALSE);
                $this->setDefaultQuerySettings($querySettings);
        }
 
 }
 
+
 ?>
\ No newline at end of file
index b86110c..1d7b047 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Domain\Repository;
+
 /***************************************************************
  *  Copyright notice
  *
@@ -32,7 +34,7 @@
  * @subpackage Domain\Repository
  * @api
  */
-class Tx_Extbase_Domain_Repository_BackendUserRepository extends Tx_Extbase_Persistence_Repository {
+class BackendUserRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 
        /**
         * Initializes the repository.
@@ -40,12 +42,13 @@ class Tx_Extbase_Domain_Repository_BackendUserRepository extends Tx_Extbase_Pers
         * @return void
         */
        public function initializeObject() {
-               /** @var $querySettings Tx_Extbase_Persistence_Typo3QuerySettings */
-               $querySettings = $this->objectManager->create('Tx_Extbase_Persistence_Typo3QuerySettings');
+               /** @var $querySettings \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings */
+               $querySettings = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Typo3QuerySettings');
                $querySettings->setRespectStoragePage(FALSE);
                $this->setDefaultQuerySettings($querySettings);
        }
 
 }
 
+
 ?>
\ No newline at end of file
index 3e89fa7..01b4121 100755 (executable)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Domain\Repository;
+
 /***************************************************************
  *  Copyright notice
  *
@@ -30,7 +32,7 @@
  * @subpackage Domain\Repository
  * @api
  */
-class Tx_Extbase_Domain_Repository_CategoryRepository extends Tx_Extbase_Persistence_Repository {
+class CategoryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 
        /**
         * Initializes the repository.
@@ -38,12 +40,13 @@ class Tx_Extbase_Domain_Repository_CategoryRepository extends Tx_Extbase_Persist
         * @return void
         */
        public function initializeObject() {
-               /** @var $querySettings Tx_Extbase_Persistence_Typo3QuerySettings */
-               $querySettings = $this->objectManager->create('Tx_Extbase_Persistence_Typo3QuerySettings');
+               /** @var $querySettings \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings */
+               $querySettings = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Typo3QuerySettings');
                $querySettings->setRespectStoragePage(FALSE);
                $this->setDefaultQuerySettings($querySettings);
        }
 
 }
 
+
 ?>
\ No newline at end of file
index 15e901d..9ae02c2 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Domain\Repository;
+
 /***************************************************************
  *  Copyright notice
  *
@@ -30,7 +32,7 @@
  * @package Extbase
  * @api
  */
-class Tx_Extbase_Domain_Repository_FileMountRepository extends Tx_Extbase_Persistence_Repository {
+class FileMountRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 
        /**
         * Initializes the repository.
@@ -38,12 +40,13 @@ class Tx_Extbase_Domain_Repository_FileMountRepository extends Tx_Extbase_Persis
         * @return void
         */
        public function initializeObject() {
-               /** @var $querySettings Tx_Extbase_Persistence_Typo3QuerySettings */
-               $querySettings = $this->objectManager->create('Tx_Extbase_Persistence_Typo3QuerySettings');
+               /** @var $querySettings \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings */
+               $querySettings = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Typo3QuerySettings');
                $querySettings->setRespectStoragePage(FALSE);
                $this->setDefaultQuerySettings($querySettings);
        }
 
 }
 
+
 ?>
\ No newline at end of file
index 5f61cbd..dddfdb8 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Domain\Repository;
+
 /***************************************************************
  *  Copyright notice
  *
  * @version $Id$
  * @api
  */
-class Tx_Extbase_Domain_Repository_FrontendUserGroupRepository extends Tx_Extbase_Persistence_Repository {
+class FrontendUserGroupRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 
 
 }
 
+
 ?>
\ No newline at end of file
index bd44927..507db6e 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Domain\Repository;
+
 /***************************************************************
  *  Copyright notice
  *
  * @version $Id$
  * @api
  */
-class Tx_Extbase_Domain_Repository_FrontendUserRepository extends Tx_Extbase_Persistence_Repository {
+class FrontendUserRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 
 
 }
 
+
 ?>
\ No newline at end of file
index 4ecbf79..2ee7508 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\DomainObject;
+
 /***************************************************************
  *  Copyright notice
  *
@@ -30,7 +32,7 @@
  * @subpackage DomainObject
  * @version $ID:$
  */
-abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbase_DomainObject_DomainObjectInterface, Tx_Extbase_Persistence_ObjectMonitoringInterface {
+abstract class AbstractDomainObject implements \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface, \TYPO3\CMS\Extbase\Persistence\ObjectMonitoringInterface {
 
        /**
         * @var int The uid of the record. The uid is only unique in the context of the database table.
@@ -221,7 +223,7 @@ abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbas
                        // "isClone" set to TRUE, so we manually have to set it to FALSE
                        // again. Possible fix: Somehow get rid of the "isClone" property,
                        // which is currently needed in Fluid.
-                       if ($propertyValue instanceof Tx_Extbase_DomainObject_AbstractDomainObject) {
+                       if ($propertyValue instanceof \TYPO3\CMS\Extbase\DomainObject\AbstractDomainObject) {
                                $this->_cleanProperties[$propertyName]->_setClone(FALSE);
                        }
                } else {
@@ -261,7 +263,7 @@ abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbas
         */
        public function _isDirty($propertyName = NULL) {
                if (($this->uid !== NULL && is_array($this->_cleanProperties)) && $this->uid != $this->_getCleanProperty('uid')) {
-                       throw new Tx_Extbase_Persistence_Exception_TooDirty(('The uid "' . $this->uid) . '" has been modified, that is simply too much.', 1222871239);
+                       throw new \TYPO3\CMS\Extbase\Persistence\Generic\Exception\TooDirtyException(('The uid "' . $this->uid) . '" has been modified, that is simply too much.', 1222871239);
                }
                if ($propertyName === NULL) {
                        foreach ($this->_getCleanProperties() as $propertyName => $cleanPropertyValue) {
@@ -289,9 +291,9 @@ abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbas
                // In case it is an object and it implements the ObjectMonitoringInterface, we call _isDirty() instead of a simple comparison of objects.
                // We do this, because if the object itself contains a lazy loaded property, the comparison of the objects might fail even if the object didn't change
                if (is_object($currentValue)) {
-                       if ($currentValue instanceof Tx_Extbase_DomainObject_DomainObjectInterface) {
+                       if ($currentValue instanceof \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface) {
                                $result = (!is_object($previousValue) || get_class($previousValue) !== get_class($currentValue)) || $currentValue->getUid() !== $previousValue->getUid();
-                       } elseif ($currentValue instanceof Tx_Extbase_Persistence_ObjectMonitoringInterface) {
+                       } elseif ($currentValue instanceof \TYPO3\CMS\Extbase\Persistence\ObjectMonitoringInterface) {
                                $result = (!is_object($previousValue) || $currentValue->_isDirty()) || get_class($previousValue) !== get_class($currentValue);
                        } else {
                                // For all other objects we do only a simple comparison (!=) as we want cloned objects to return the same values.
@@ -344,4 +346,5 @@ abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbas
 
 }
 
+
 ?>
\ No newline at end of file
index 31105f3..7e92843 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\DomainObject;
+
 /***************************************************************
  *  Copyright notice
  *
  * @subpackage DomainObject
  * @version $ID:$
  */
-abstract class Tx_Extbase_DomainObject_AbstractEntity extends Tx_Extbase_DomainObject_AbstractDomainObject {
+abstract class AbstractEntity extends \TYPO3\CMS\Extbase\DomainObject\AbstractDomainObject {
 
 
 }
 
+
 ?>
\ No newline at end of file
index f49c860..52c3d9a 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\DomainObject;
+
 /***************************************************************
  *  Copyright notice
  *
@@ -29,7 +31,7 @@
  * @subpackage DomainObject
  * @version $ID:$
  */
-abstract class Tx_Extbase_DomainObject_AbstractValueObject extends Tx_Extbase_DomainObject_AbstractDomainObject {
+abstract class AbstractValueObject extends \TYPO3\CMS\Extbase\DomainObject\AbstractDomainObject {
 
        /**
         * Returns the value of the Value Object. Must be overwritten by a concrete value object.
@@ -42,4 +44,5 @@ abstract class Tx_Extbase_DomainObject_AbstractValueObject extends Tx_Extbase_Do
 
 }
 
+
 ?>
\ No newline at end of file
index d1495d8..af9bbdc 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\DomainObject;
+
 /***************************************************************
  *  Copyright notice
  *
@@ -32,7 +34,7 @@
  * @subpackage DomainObject
  * @version $ID:$
  */
-interface Tx_Extbase_DomainObject_DomainObjectInterface
+interface DomainObjectInterface
 {
        /**
         * Getter for uid.
@@ -88,4 +90,5 @@ interface Tx_Extbase_DomainObject_DomainObjectInterface
        public function _getProperties();
 
 }
+
 ?>
\ No newline at end of file
index f0d0e43..2ef47c9 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Error;
+
 /*                                                                        *
  * This script belongs to the Extbase framework                           *
  *                                                                        *
@@ -28,7 +30,7 @@
  * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License, version 3 or later
  * @api
  */
-class Tx_Extbase_Error_Error extends Tx_Extbase_Error_Message {
+class Error extends \TYPO3\CMS\Extbase\Error\Message {
 
        /**
         * @var string
@@ -37,4 +39,5 @@ class Tx_Extbase_Error_Error extends Tx_Extbase_Error_Message {
 
 }
 
+
 ?>
\ No newline at end of file
index aa3cdad..880b657 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Error;
+
 /*                                                                        *
  * This script belongs to the Extbase framework                           *
  *                                                                        *
@@ -27,7 +29,7 @@
  * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License, version 3 or later
  * @api
  */
-class Tx_Extbase_Error_Message {
+class Message {
 
        /**
         * The default (english) error message
@@ -139,4 +141,5 @@ class Tx_Extbase_Error_Message {
 
 }
 
+
 ?>
\ No newline at end of file
index 47bbc61..7d5ab2f 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Error;
+
 /*                                                                        *
  * This script belongs to the Extbase framework                           *
  *                                                                        *
@@ -28,7 +30,7 @@
  * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License, version 3 or later
  * @api
  */
-class Tx_Extbase_Error_Notice extends Tx_Extbase_Error_Message {
+class Notice extends \TYPO3\CMS\Extbase\Error\Message {
 
        /**
         * @var string
@@ -37,4 +39,5 @@ class Tx_Extbase_Error_Notice extends Tx_Extbase_Error_Message {
 
 }
 
+
 ?>
\ No newline at end of file
index 5294ab9..559beb8 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Error;
+
 /*                                                                        *
  * This script belongs to the Extbase framework                           *
  *                                                                        *
@@ -24,7 +26,7 @@
  * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License, version 3 or later
  * @api
  */
-class Tx_Extbase_Error_Result {
+class Result {
 
        /**
         * @var array<Tx_Extbase_Error_Error>
@@ -51,33 +53,33 @@ class Tx_Extbase_Error_Result {
        /**
         * Add an error to the current Result object
         *
-        * @param Tx_Extbase_Error_Error $error
+        * @param \TYPO3\CMS\Extbase\Error\Error $error
         * @return void
         * @api
         */
-       public function addError(Tx_Extbase_Error_Error $error) {
+       public function addError(\TYPO3\CMS\Extbase\Error\Error $error) {
                $this->errors[] = $error;
        }
 
        /**
         * Add a warning to the current Result object
         *
-        * @param Tx_Extbase_Error_Warning $warning
+        * @param \TYPO3\CMS\Extbase\Error\Warning $warning
         * @return void
         * @api
         */
-       public function addWarning(Tx_Extbase_Error_Warning $warning) {
+       public function addWarning(\TYPO3\CMS\Extbase\Error\Warning $warning) {
                $this->warnings[] = $warning;
        }
 
        /**
         * Add a notice to the current Result object
         *
-        * @param Tx_Extbase_Error_Notice $notice
+        * @param \TYPO3\CMS\Extbase\Error\Notice $notice
         * @return void
         * @api
         */
-       public function addNotice(Tx_Extbase_Error_Notice $notice) {
+       public function addNotice(\TYPO3\CMS\Extbase\Error\Notice $notice) {
                $this->notices[] = $notice;
        }
 
@@ -114,7 +116,7 @@ class Tx_Extbase_Error_Result {
        /**
         * Get the first error object of the current Result object (non-recursive)
         *
-        * @return Tx_Extbase_Error_Error
+        * @return \TYPO3\CMS\Extbase\Error\Error
         * @api
         */
        public function getFirstError() {
@@ -125,7 +127,7 @@ class Tx_Extbase_Error_Result {
        /**
         * Get the first warning object of the current Result object (non-recursive)
         *
-        * @return Tx_Extbase_Error_Warning
+        * @return \TYPO3\CMS\Extbase\Error\Warning
         * @api
         */
        public function getFirstWarning() {
@@ -136,7 +138,7 @@ class Tx_Extbase_Error_Result {
        /**
         * Get the first notice object of the curren Result object (non-recursive)
         *
-        * @return Tx_Extbase_Error_Notice
+        * @return \TYPO3\CMS\Extbase\Error\Notice
         * @api
         */
        public function getFirstNotice() {
@@ -151,7 +153,7 @@ class Tx_Extbase_Error_Result {
         * for property "foo.bar"
         *
         * @param string $propertyPath
-        * @return Tx_Extbase_Error_Result
+        * @return \TYPO3\CMS\Extbase\Error\Result
         * @author Sebastian Kurfürst <sebastian@typo3.org>
         * @api
         */
@@ -167,7 +169,7 @@ class Tx_Extbase_Error_Result {
         * Internal use only!
         *
         * @param array $pathSegments
-        * @return Tx_Extbase_Error_Result
+        * @return \TYPO3\CMS\Extbase\Error\Result
         * @author Sebastian Kurfürst <sebastian@typo3.org>
         */
        public function recurseThroughResult(array $pathSegments) {
@@ -176,7 +178,7 @@ class Tx_Extbase_Error_Result {
                }
                $propertyName = array_shift($pathSegments);
                if (!isset($this->propertyResults[$propertyName])) {
-                       $this->propertyResults[$propertyName] = new Tx_Extbase_Error_Result();
+                       $this->propertyResults[$propertyName] = new \TYPO3\CMS\Extbase\Error\Result();
                }
                return $this->propertyResults[$propertyName]->recurseThroughResult($pathSegments);
        }
@@ -297,12 +299,12 @@ class Tx_Extbase_Error_Result {
        /**
         * Merge the given Result object into this one.
         *
-        * @param Tx_Extbase_Error_Result $otherResult
+        * @param \TYPO3\CMS\Extbase\Error\Result $otherResult
         * @return void
         * @author Sebastian Kurfürst <sebastian@typo3.org>
         * @api
         */
-       public function merge(Tx_Extbase_Error_Result $otherResult) {
+       public function merge(\TYPO3\CMS\Extbase\Error\Result $otherResult) {
                $this->mergeProperty($otherResult, 'getErrors', 'addError');
                $this->mergeProperty($otherResult, 'getWarnings', 'addWarning');
                $this->mergeProperty($otherResult, 'getNotices', 'addNotice');
@@ -314,13 +316,13 @@ class Tx_Extbase_Error_Result {
        /**
         * Merge a single property from the other result object.
         *
-        * @param Tx_Extbase_Error_Result $otherResult
+        * @param \TYPO3\CMS\Extbase\Error\Result $otherResult
         * @param string $getterName
         * @param string $adderName
         * @return void
         * @author Sebastian Kurfürst <sebastian@typo3.org>
         */
-       protected function mergeProperty(Tx_Extbase_Error_Result $otherResult, $getterName, $adderName) {
+       protected function mergeProperty(\TYPO3\CMS\Extbase\Error\Result $otherResult, $getterName, $adderName) {
                foreach ($otherResult->{$getterName}() as $messageInOtherResult) {
                        $this->{$adderName}($messageInOtherResult);
                }
@@ -337,4 +339,5 @@ class Tx_Extbase_Error_Result {
 
 }
 
+
 ?>
\ No newline at end of file
index 6a18b93..0340bdf 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Error;
+
 /*                                                                        *
  * This script belongs to the Extbase framework                           *
  *                                                                        *
@@ -28,7 +30,7 @@
  * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License, version 3 or later
  * @api
  */
-class Tx_Extbase_Error_Warning extends Tx_Extbase_Error_Message {
+class Warning extends \TYPO3\CMS\Extbase\Error\Message {
 
        /**
         * @var string
@@ -37,4 +39,5 @@ class Tx_Extbase_Error_Warning extends Tx_Extbase_Error_Message {
 
 }
 
+
 ?>
\ No newline at end of file
index d92534a..1d40ee6 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase;
+
 /***************************************************************
  *  Copyright notice
  *
  * @package Extbase
  * @version $ID: $
  */
-class Tx_Extbase_Exception extends Exception {
+class Exception extends \Exception {
 
 
 }
 
+
 ?>
\ No newline at end of file
index 205caf6..c57cfb6 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Mvc\Cli;
+
 /***************************************************************
  *  Copyright notice
  *  All rights reserved
  *
  * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License, version 3 or later
  */
-class Tx_Extbase_MVC_CLI_Command {
+class Command {
 
        /**
-        * @var Tx_Extbase_Object_ObjectManagerInterface
+        * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
         */
        protected $objectManager;
 
@@ -50,14 +52,14 @@ class Tx_Extbase_MVC_CLI_Command {
        protected $commandIdentifier;
 
        /**
-        * @var Tx_Extbase_Reflection_MethodReflection
+        * @var \TYPO3\CMS\Extbase\Reflection\MethodReflection
         */
        protected $commandMethodReflection;
 
        /**
         * Reflection service
         *
-        * @var Tx_Extbase_Reflection_Service
+        * @var \TYPO3\CMS\Extbase\Reflection\Service
         */
        private $reflectionService;
 
@@ -73,24 +75,24 @@ class Tx_Extbase_MVC_CLI_Command {
                $this->controllerCommandName = $controllerCommandName;
                $classNameParts = explode('_', $controllerClassName);
                if (count($classNameParts) !== 4 || strpos($classNameParts[3], 'CommandController') === FALSE) {
-                       throw new InvalidArgumentException(('Invalid controller class name "' . $controllerClassName) . '"', 1305100019);
+                       throw new \InvalidArgumentException(('Invalid controller class name "' . $controllerClassName) . '"', 1305100019);
                }
-               $extensionKey = t3lib_div::camelCaseToLowerCaseUnderscored($classNameParts[1]);
+               $extensionKey = \TYPO3\CMS\Core\Utility\GeneralUtility::camelCaseToLowerCaseUnderscored($classNameParts[1]);
                $this->commandIdentifier = strtolower(((($extensionKey . ':') . substr($classNameParts[3], 0, -17)) . ':') . $controllerCommandName);
        }
 
        /**
-        * @param Tx_Extbase_Reflection_Service $reflectionService Reflection service
+        * @param \TYPO3\CMS\Extbase\Reflection\Service $reflectionService Reflection service
         */
-       public function injectReflectionService(Tx_Extbase_Reflection_Service $reflectionService) {
+       public function injectReflectionService(\TYPO3\CMS\Extbase\Reflection\Service $reflectionService) {
                $this->reflectionService = $reflectionService;
        }
 
        /**
-        * @param Tx_Extbase_Object_ObjectManagerInterface $objectManager A reference to the object manager
+        * @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager A reference to the object manager
         * @return void
         */
-       public function injectObjectManager(Tx_Extbase_Object_ObjectManagerInterface $objectManager) {
+       public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager) {
                $this->objectManager = $objectManager;
        }
 
@@ -182,7 +184,7 @@ class Tx_Extbase_MVC_CLI_Command {
                        array_shift($explodedAnnotation);
                        $description = implode(' ', $explodedAnnotation);
                        $required = $commandParameterDefinition['optional'] !== TRUE;
-                       $commandArgumentDefinitions[] = $this->objectManager->get('Tx_Extbase_MVC_CLI_CommandArgumentDefinition', $commandParameterName, $required, $description);
+                       $commandArgumentDefinitions[] = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Cli\\CommandArgumentDefinition', $commandParameterName, $required, $description);
                        $i++;
                }
                return $commandArgumentDefinitions;
@@ -235,15 +237,16 @@ class Tx_Extbase_MVC_CLI_Command {
        }
 
        /**
-        * @return Tx_Extbase_Reflection_MethodReflection
+        * @return \TYPO3\CMS\Extbase\Reflection\MethodReflection
         */
        protected function getCommandMethodReflection() {
                if ($this->commandMethodReflection === NULL) {
-                       $this->commandMethodReflection = $this->objectManager->get('Tx_Extbase_Reflection_MethodReflection', $this->controllerClassName, $this->controllerCommandName . 'Command');
+                       $this->commandMethodReflection = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Reflection\\MethodReflection', $this->controllerClassName, $this->controllerCommandName . 'Command');
                }
                return $this->commandMethodReflection;
        }
 
 }
 
+
 ?>
\ No newline at end of file
index 775ab47..f543461 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Mvc\Cli;
+
 /***************************************************************
  *  Copyright notice
  *  All rights reserved
@@ -27,7 +29,7 @@
  *
  * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License, version 3 or later
  */
-class Tx_Extbase_MVC_CLI_CommandArgumentDefinition {
+class CommandArgumentDefinition {
 
        /**
         * @var string
@@ -92,4 +94,5 @@ class Tx_Extbase_MVC_CLI_CommandArgumentDefinition {
 
 }
 
+
 ?>
\ No newline at end of file
index 47bb65c..0da6bf3 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Mvc\Cli;
+
 /***************************************************************
  *  Copyright notice
  *  All rights reserved
  *
  * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License, version 3 or later
  */
-class Tx_Extbase_MVC_CLI_CommandManager implements t3lib_Singleton {
+class CommandManager implements \TYPO3\CMS\Core\SingletonInterface {
 
        /**
-        * @var Tx_Extbase_Object_ObjectManagerInterface
+        * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
         */
        protected $objectManager;
 
@@ -45,10 +47,10 @@ class Tx_Extbase_MVC_CLI_CommandManager implements t3lib_Singleton {
        protected $shortCommandIdentifiers = NULL;
 
        /**
-        * @param Tx_Extbase_Object_ObjectManagerInterface $objectManager A reference to the object manager
+        * @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager A reference to the object manager
         * @return void
         */
-       public function injectObjectManager(Tx_Extbase_Object_ObjectManagerInterface $objectManager) {
+       public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager) {
                $this->objectManager = $objectManager;
        }
 
@@ -70,7 +72,7 @@ class Tx_Extbase_MVC_CLI_CommandManager implements t3lib_Singleton {
                                }
                                foreach (get_class_methods($className) as $methodName) {
                                        if (substr($methodName, -7, 7) === 'Command') {
-                                               $this->availableCommands[] = $this->objectManager->get('Tx_Extbase_MVC_CLI_Command', $className, substr($methodName, 0, -7));
+                                               $this->availableCommands[] = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Cli\\Command', $className, substr($methodName, 0, -7));
                                        }
                                }
                        }
@@ -84,9 +86,9 @@ class Tx_Extbase_MVC_CLI_CommandManager implements t3lib_Singleton {
         * If more than one Command matches an AmbiguousCommandIdentifierException is thrown that contains the matched Commands
         *
         * @param string $commandIdentifier command identifier in the format foo:bar:baz
-        * @return Tx_Extbase_MVC_CLI_Command
-        * @throws Tx_Extbase_MVC_Exception_NoSuchCommand if no matching command is available
-        * @throws Tx_Extbase_MVC_Exception_AmbiguousCommandIdentifier if more than one Command matches the identifier (the exception contains the matched commands)
+        * @return \TYPO3\CMS\Extbase\Mvc\Cli\Command
+        * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchCommandException if no matching command is available
+        * @throws \TYPO3\CMS\Extbase\Mvc\Exception\AmbiguousCommandIdentifierException if more than one Command matches the identifier (the exception contains the matched commands)
         * @api
         */
        public function getCommandByIdentifier($commandIdentifier) {
@@ -102,10 +104,10 @@ class Tx_Extbase_MVC_CLI_CommandManager implements t3lib_Singleton {
                        }
                }
                if (count($matchedCommands) === 0) {
-                       throw new Tx_Extbase_MVC_Exception_NoSuchCommand(('No command could be found that matches the command identifier "' . $commandIdentifier) . '".', 1310556663);
+                       throw new \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchCommandException(('No command could be found that matches the command identifier "' . $commandIdentifier) . '".', 1310556663);
                }
                if (count($matchedCommands) > 1) {
-                       throw new Tx_Extbase_MVC_Exception_AmbiguousCommandIdentifier(('More than one command matches the command identifier "' . $commandIdentifier) . '"', 1310557169, NULL, $matchedCommands);
+                       throw new \TYPO3\CMS\Extbase\Mvc\Exception\AmbiguousCommandIdentifierException(('More than one command matches the command identifier "' . $commandIdentifier) . '"', 1310557169, NULL, $matchedCommands);
                }
                return current($matchedCommands);
        }
@@ -113,13 +115,13 @@ class Tx_Extbase_MVC_CLI_CommandManager implements t3lib_Singleton {
        /**
         * Returns the shortest, non-ambiguous command identifier for the given command
         *
-        * @param Tx_Extbase_MVC_CLI_Command $command The command
+        * @param \TYPO3\CMS\Extbase\Mvc\Cli\Command $command The command
         * @return string The shortest possible command identifier
         * @author Robert Lemke <robert@typo3.org>
         * @author Bastian Waidelich <bastian@typo3.org>
         * @api
         */
-       public function getShortestIdentifierForCommand(Tx_Extbase_MVC_CLI_Command $command) {
+       public function getShortestIdentifierForCommand(\TYPO3\CMS\Extbase\Mvc\Cli\Command $command) {
                if ($command->getCommandIdentifier() === 'extbase:help:help') {
                        return 'help';
                }
@@ -165,12 +167,12 @@ class Tx_Extbase_MVC_CLI_CommandManager implements t3lib_Singleton {
         * Returns TRUE if the specified command identifier matches the identifier of the specified command.
         * This is the case, if the identifiers are the same or if at least the last two command parts match (case sensitive).
         *
-        * @param Tx_Extbase_MVC_CLI_Command $command
+        * @param \TYPO3\CMS\Extbase\Mvc\Cli\Command $command
         * @param string $commandIdentifier command identifier in the format foo:bar:baz (all lower case)
         * @return boolean TRUE if the specified command identifier matches this commands identifier
         * @author Bastian Waidelich <bastian@typo3.org>
         */
-       protected function commandMatchesIdentifier(Tx_Extbase_MVC_CLI_Command $command, $commandIdentifier) {
+       protected function commandMatchesIdentifier(\TYPO3\CMS\Extbase\Mvc\Cli\Command $command, $commandIdentifier) {
                $commandIdentifierParts = explode(':', $command->getCommandIdentifier());
                $searchedCommandIdentifierParts = explode(':', $commandIdentifier);
                $extensionKey = array_shift($commandIdentifierParts);
@@ -188,4 +190,5 @@ class Tx_Extbase_MVC_CLI_CommandManager implements t3lib_Singleton {
 
 }
 
+
 ?>
\ No newline at end of file
index 87a78d8..8aa945c 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Mvc\Cli;
+
 /***************************************************************
  *  Copyright notice
  *  All rights reserved
  * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License, version 3 or later
  * @api
  */
-class Tx_Extbase_MVC_CLI_Request implements Tx_Extbase_MVC_RequestInterface {
+class Request implements \TYPO3\CMS\Extbase\Mvc\RequestInterface {
 
        /**
-        * @var Tx_Extbase_Object_ObjectManagerInterface
+        * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
         */
        protected $objectManager;
 
@@ -75,15 +77,15 @@ class Tx_Extbase_MVC_CLI_Request implements Tx_Extbase_MVC_RequestInterface {
        protected $commandLineArguments;
 
        /**
-        * @var Tx_Extbase_MVC_CLI_Command | NULL
+        * @var \TYPO3\CMS\Extbase\Mvc\Cli\Command | NULL
         */
        protected $command = NULL;
 
        /**
-        * @param Tx_Extbase_Object_ObjectManagerInterface $objectManager A reference to the object manager
+        * @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager A reference to the object manager
         * @return void
         */
-       public function injectObjectManager(Tx_Extbase_Object_ObjectManagerInterface $objectManager) {
+       public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager) {
                $this->objectManager = $objectManager;
        }
 
@@ -177,12 +179,12 @@ class Tx_Extbase_MVC_CLI_Request implements Tx_Extbase_MVC_RequestInterface {
        /**
         * Returns the command object for this request
         *
-        * @return Tx_Extbase_MVC_CLI_Command
+        * @return \TYPO3\CMS\Extbase\Mvc\Cli\Command
         * @author Robert Lemke <robert@typo3.org>
         */
        public function getCommand() {
                if ($this->command === NULL) {
-                       $this->command = $this->objectManager->get('Tx_Extbase_MVC_CLI_Command', $this->controllerObjectName, $this->controllerCommandName);
+                       $this->command = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Cli\\Command', $this->controllerObjectName, $this->controllerCommandName);
                }
                return $this->command;
        }
@@ -196,7 +198,7 @@ class Tx_Extbase_MVC_CLI_Request implements Tx_Extbase_MVC_RequestInterface {
         */
        public function setArgument($argumentName, $value) {
                if (!is_string($argumentName) || $argumentName === '') {
-                       throw new Tx_Extbase_MVC_Exception_InvalidArgumentName('Invalid argument name.', 1300893885);
+                       throw new \TYPO3\CMS\Extbase\Mvc\Exception\InvalidArgumentNameException('Invalid argument name.', 1300893885);
                }
                $this->arguments[$argumentName] = $value;
        }
@@ -217,11 +219,11 @@ class Tx_Extbase_MVC_CLI_Request implements Tx_Extbase_MVC_RequestInterface {
         *
         * @param string $argumentName Name of the argument
         * @return string Value of the argument
-        * @throws Tx_Extbase_MVC_Exception_NoSuchArgument if such an argument does not exist
+        * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException if such an argument does not exist
         */
        public function getArgument($argumentName) {
                if (!isset($this->arguments[$argumentName])) {
-                       throw new Tx_Extbase_MVC_Exception_NoSuchArgument(('An argument "' . $argumentName) . '" does not exist for this request.', 1300893886);
+                       throw new \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException(('An argument "' . $argumentName) . '" does not exist for this request.', 1300893886);
                }
                return $this->arguments[$argumentName];
        }
@@ -271,4 +273,5 @@ class Tx_Extbase_MVC_CLI_Request implements Tx_Extbase_MVC_RequestInterface {
 
 }
 
+
 ?>
\ No newline at end of file
index 7306b5d..67ed255 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Mvc\Cli;
+
 /***************************************************************
  *  Copyright notice
  *  All rights reserved
  *
  * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License, version 3 or later
  */
-class Tx_Extbase_MVC_CLI_RequestBuilder {
+class RequestBuilder {
 
        /**
-        * @var Tx_Extbase_Object_ObjectManagerInterface
+        * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
         */
        protected $objectManager;
 
        /**
-        * @var Tx_Extbase_Reflection_Service
+        * @var \TYPO3\CMS\Extbase\Reflection\Service
         */
        protected $reflectionService;
 
        /**
-        * @var Tx_Extbase_MVC_CLI_CommandManager
+        * @var \TYPO3\CMS\Extbase\Mvc\Cli\CommandManager
         */
        protected $commandManager;
 
        /**
-        * @param Tx_Extbase_Object_ObjectManagerInterface $objectManager
+        * @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
         * @return void
         */
-       public function injectObjectManager(Tx_Extbase_Object_ObjectManagerInterface $objectManager) {
+       public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager) {
                $this->objectManager = $objectManager;
        }
 
        /**
-        * @param Tx_Extbase_Reflection_Service $reflectionService
+        * @param \TYPO3\CMS\Extbase\Reflection\Service $reflectionService
         * @return void
         */
-       public function injectReflectionService(Tx_Extbase_Reflection_Service $reflectionService) {
+       public function injectReflectionService(\TYPO3\CMS\Extbase\Reflection\Service $reflectionService) {
                $this->reflectionService = $reflectionService;
        }
 
        /**
-        * @param Tx_Extbase_MVC_CLI_CommandManager $commandManager
+        * @param \TYPO3\CMS\Extbase\Mvc\Cli\CommandManager $commandManager
         * @return void
         */
-       public function injectCommandManager(Tx_Extbase_MVC_CLI_CommandManager $commandManager) {
+       public function injectCommandManager(\TYPO3\CMS\Extbase\Mvc\Cli\CommandManager $commandManager) {
                $this->commandManager = $commandManager;
        }
 
@@ -76,12 +78,12 @@ class Tx_Extbase_MVC_CLI_RequestBuilder {
         * name (like in $argv) but start with command right away.
         *
         * @param mixed $commandLine The command line, either as a string or as an array
-        * @return Tx_Extbase_MVC_CLI_Request The CLI request as an object
+        * @return \TYPO3\CMS\Extbase\Mvc\Cli\Request The CLI request as an object
         * @author Robert Lemke <robert@typo3.org>
         */
        public function build($commandLine = '') {
-               $request = $this->objectManager->get('Tx_Extbase_MVC_CLI_Request');
-               $request->setControllerObjectName('Tx_Extbase_Command_HelpCommandController');
+               $request = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Cli\\Request');
+               $request->setControllerObjectName('TYPO3\\CMS\\Extbase\\Command\\HelpCommandController');
                $rawCommandLineArguments = is_array($commandLine) ? $commandLine : explode(' ', $commandLine);
                if (count($rawCommandLineArguments) === 0) {
                        $request->setControllerCommandName('helpStub');
@@ -90,7 +92,7 @@ class Tx_Extbase_MVC_CLI_RequestBuilder {
                $commandIdentifier = trim(array_shift($rawCommandLineArguments));
                try {
                        $command = $this->commandManager->getCommandByIdentifier($commandIdentifier);
-               } catch (Tx_Extbase_MVC_Exception_Command $exception) {
+               } catch (\TYPO3\CMS\Extbase\Mvc\Exception\CommandException $exception) {
                        $request->setArgument('exception', $exception);
                        $request->setControllerCommandName('error');
                        return $request;
@@ -148,7 +150,7 @@ class Tx_Extbase_MVC_CLI_RequestBuilder {
                                        $commandLineArguments[$optionalArguments[$argumentName]['parameterName']] = $argumentValue;
                                } elseif (isset($requiredArguments[$argumentName])) {
                                        if ($decidedToUseUnnamedArguments) {
-                                               throw new Tx_Extbase_MVC_Exception_InvalidArgumentMixing(sprintf('Unexpected named argument "%s". If you use unnamed arguments, all required arguments must be passed without a name.', $argumentName), 1309971821);
+                                               throw new \TYPO3\CMS\Extbase\Mvc\Exception\InvalidArgumentMixingException(sprintf('Unexpected named argument "%s". If you use unnamed arguments, all required arguments must be passed without a name.', $argumentName), 1309971821);
                                        }
                                        $decidedToUseNamedArguments = TRUE;
                                        $argumentValue = $this->getValueOfCurrentCommandLineOption($rawArgument, $rawCommandLineArguments, $requiredArguments[$argumentName]['type']);
@@ -158,7 +160,7 @@ class Tx_Extbase_MVC_CLI_RequestBuilder {
                        } else {
                                if (count($requiredArguments) > 0) {
                                        if ($decidedToUseNamedArguments) {
-                                               throw new Tx_Extbase_MVC_Exception_InvalidArgumentMixing(sprintf('Unexpected unnamed argument "%s". If you use named arguments, all required arguments must be passed named.', $rawArgument), 1309971820);
+                                               throw new \TYPO3\CMS\Extbase\Mvc\Exception\InvalidArgumentMixingException(sprintf('Unexpected unnamed argument "%s". If you use named arguments, all required arguments must be passed named.', $rawArgument), 1309971820);
                                        }
                                        $argument = array_shift($requiredArguments);
                                        $commandLineArguments[$argument['parameterName']] = $rawArgument;
@@ -229,4 +231,5 @@ class Tx_Extbase_MVC_CLI_RequestBuilder {
 
 }
 
+
 ?>
\ No newline at end of file
index 267f2ea..765d57c 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Mvc\Cli;
+
 /***************************************************************
  *  Copyright notice
  *  All rights reserved
  *
  * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License, version 3 or later
  */
-class Tx_Extbase_MVC_CLI_RequestHandler implements Tx_Extbase_MVC_RequestHandlerInterface {
+class RequestHandler implements \TYPO3\CMS\Extbase\Mvc\RequestHandlerInterface {
 
        /**
-        * @var Tx_Extbase_Object_ObjectManagerInterface
+        * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
         */
        protected $objectManager;
 
        /**
-        * @var Tx_Extbase_MVC_Dispatcher
+        * @var \TYPO3\CMS\Extbase\Mvc\Dispatcher
         */
        protected $dispatcher;
 
        /**
-        * @var Tx_Extbase_MVC_CLI_RequestBuilder
+        * @var \TYPO3\CMS\Extbase\Mvc\Cli\RequestBuilder
         */
        protected $requestBuilder;
 
        /**
-        * @var Tx_Extbase_MVC_Controller_FlashMessages
+        * @var \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessages
         * @deprecated since Extbase 1.1; will be removed in Extbase 6.0
         */
        protected $flashMessages;
 
        /**
-        * @var Tx_Extbase_MVC_Controller_FlashMessages
+        * @var \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessages
         */
        protected $flashMessageContainer;
 
        /**
-        * @param Tx_Extbase_Object_ObjectManagerInterface $objectManager
+        * @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
         * @return void
         */
-       public function injectObjectManager(Tx_Extbase_Object_ObjectManagerInterface $objectManager) {
+       public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager) {
                $this->objectManager = $objectManager;
        }
 
        /**
-        * @param Tx_Extbase_MVC_Controller_FlashMessages $flashMessageContainer
+        * @param \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessages $flashMessageContainer
         * @return void
         */
-       public function injectFlashMessageContainer(Tx_Extbase_MVC_Controller_FlashMessages $flashMessageContainer) {
+       public function injectFlashMessageContainer(\TYPO3\CMS\Extbase\Mvc\Controller\FlashMessages $flashMessageContainer) {
                $this->flashMessageContainer = $flashMessageContainer;
                // @deprecated since Extbase 1.1; will be removed in Extbase 6.0
                $this->flashMessages = $flashMessageContainer;
        }
 
        /**
-        * @param Tx_Extbase_MVC_Dispatcher $dispatcher
+        * @param \TYPO3\CMS\Extbase\Mvc\Dispatcher $dispatcher
         * @return void
         */
-       public function injectDispatcher(Tx_Extbase_MVC_Dispatcher $dispatcher) {
+       public function injectDispatcher(\TYPO3\CMS\Extbase\Mvc\Dispatcher $dispatcher) {
                $this->dispatcher = $dispatcher;
        }
 
        /**
-        * @param Tx_Extbase_MVC_CLI_RequestBuilder $requestBuilder
+        * @param \TYPO3\CMS\Extbase\Mvc\Cli\RequestBuilder $requestBuilder
         * @return void
         */
-       public function injectRequestBuilder(Tx_Extbase_MVC_CLI_RequestBuilder $requestBuilder) {
+       public function injectRequestBuilder(\TYPO3\CMS\Extbase\Mvc\Cli\RequestBuilder $requestBuilder) {
                $this->requestBuilder = $requestBuilder;
        }
 
@@ -97,8 +99,8 @@ class Tx_Extbase_MVC_CLI_RequestHandler implements Tx_Extbase_MVC_RequestHandler
         */
        public function handleRequest() {
                $request = $this->requestBuilder->build();
-               /** @var $response Tx_Extbase_MVC_CLI_Response */
-               $response = $this->objectManager->create('Tx_Extbase_MVC_CLI_Response');
+               /** @var $response \TYPO3\CMS\Extbase\Mvc\Cli\Response */
+               $response = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Mvc\\Cli\\Response');
                $this->dispatcher->dispatch($request, $response);
                $response->send();
        }
@@ -126,4 +128,5 @@ class Tx_Extbase_MVC_CLI_RequestHandler implements Tx_Extbase_MVC_RequestHandler
 
 }
 
+
 ?>
\ No newline at end of file
index 6b8688f..a1cc332 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Mvc\Cli;
+
 /***************************************************************
  *  Copyright notice
  *  All rights reserved
@@ -28,7 +30,7 @@
  * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License, version 3 or later
  * @scope prototype
  */
-class Tx_Extbase_MVC_CLI_Response extends Tx_Extbase_MVC_Response {
+class Response extends \TYPO3\CMS\Extbase\Mvc\Response {
 
        /**
         * @var integer
@@ -44,7 +46,7 @@ class Tx_Extbase_MVC_CLI_Response extends Tx_Extbase_MVC_Response {
         */
        public function setExitCode($exitCode) {
                if (!is_integer($exitCode)) {
-                       throw new InvalidArgumentException(sprintf('Tried to set invalid exit code. The value must be integer, %s given.', gettype($exitCode)), 1312222064);
+                       throw new \InvalidArgumentException(sprintf('Tried to set invalid exit code. The value must be integer, %s given.', gettype($exitCode)), 1312222064);
                }
                $this->exitCode = $exitCode;
        }
@@ -73,4 +75,5 @@ class Tx_Extbase_MVC_CLI_Response extends Tx_Extbase_MVC_Response {
 
 }
 
+
 ?>
\ No newline at end of file
index f03381e..34e088a 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Mvc\Controller;
+
 /***************************************************************
  *  Copyright notice
  *
  * @version $ID:$
  * @api
  */
-abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbase_MVC_Controller_ControllerInterface {
+abstract class AbstractController implements \TYPO3\CMS\Extbase\Mvc\Controller\ControllerInterface {
 
        /**
-        * @var Tx_Extbase_Object_ObjectManagerInterface
+        * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
         */
        protected $objectManager;
 
        /**
-        * @var Tx_Extbase_MVC_Web_Routing_UriBuilder
+        * @var \TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder
         */
        protected $uriBuilder;
 
@@ -60,7 +62,7 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
        /**
         * The current request.
         *
-        * @var Tx_Extbase_MVC_Request
+        * @var \TYPO3\CMS\Extbase\Mvc\Request
         * @api
         */
        protected $request;
@@ -68,31 +70,31 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
        /**
         * The response which will be returned by this action controller
         *
-        * @var Tx_Extbase_MVC_Response
+        * @var \TYPO3\CMS\Extbase\Mvc\Response
         * @api
         */
        protected $response;
 
        /**
-        * @var Tx_Extbase_Property_Mapper
+        * @var \TYPO3\CMS\Extbase\Property\Mapper
         * @deprecated since Extbase 1.4.0, will be removed in Extbase 6.0
         */
        protected $deprecatedPropertyMapper;
 
        /**
-        * @var Tx_Extbase_Validation_ValidatorResolver
+        * @var \TYPO3\CMS\Extbase\Validation\ValidatorResolver
         */
        protected $validatorResolver;
 
        /**
-        * @var Tx_Extbase_MVC_Controller_Arguments Arguments passed to the controller
+        * @var \TYPO3\CMS\Extbase\Mvc\Controller\Arguments Arguments passed to the controller
         */
        protected $arguments;
 
        /**
         * The results of the mapping of request arguments to controller arguments
         *
-        * @var Tx_Extbase_Property_MappingResults
+        * @var \TYPO3\CMS\Extbase\Property\MappingResults
         * @api
         * @deprecated since Extbase 1.4.0, will be removed in Extbase 6.0
         */
@@ -105,16 +107,16 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
         *
         * @var array
         */
-       protected $supportedRequestTypes = array('Tx_Extbase_MVC_Request');
+       protected $supportedRequestTypes = array('TYPO3\\CMS\\Extbase\\Mvc\\Request');
 
        /**
-        * @var Tx_Extbase_MVC_Controller_ControllerContext
+        * @var \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext
         * @api
         */
        protected $controllerContext;
 
        /**
-        * @var Tx_Extbase_MVC_Controller_FlashMessages
+        * @var \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessages
         * @deprecated since Extbase 1.1; will be removed in Extbase 6.0
         */
        protected $flashMessages;
@@ -122,13 +124,13 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
        /**
         * The flash messages. Use $this->flashMessageContainer->add(...) to add a new Flash message.
         *
-        * @var Tx_Extbase_MVC_Controller_FlashMessages
+        * @var \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessages
         * @api
         */
        protected $flashMessageContainer;
 
        /**
-        * @var Tx_Extbase_Configuration_ConfigurationManagerInterface
+        * @var \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface
         */
        protected $configurationManager;
 
@@ -140,53 +142,53 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
        }
 
        /**
-        * @param Tx_Extbase_Configuration_ConfigurationManagerInterface $configurationManager
+        * @param \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface $configurationManager
         * @return void
         */
-       public function injectConfigurationManager(Tx_Extbase_Configuration_ConfigurationManagerInterface $configurationManager) {
+       public function injectConfigurationManager(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface $configurationManager) {
                $this->configurationManager = $configurationManager;
-               $this->settings = $this->configurationManager->getConfiguration(Tx_Extbase_Configuration_ConfigurationManagerInterface::CONFIGURATION_TYPE_SETTINGS);
+               $this->settings = $this->configurationManager->getConfiguration(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_SETTINGS);
        }
 
        /**
         * Injects the property mapper
         *
-        * @param Tx_Extbase_Property_Mapper $deprecatedPropertyMapper The property mapper
+        * @param \TYPO3\CMS\Extbase\Property\Mapper $deprecatedPropertyMapper The property mapper
         * @return void
         * @deprecated since Extbase 1.4.0, will be removed in Extbase 6.0
         */
-       public function injectDeprecatedPropertyMapper(Tx_Extbase_Property_Mapper $deprecatedPropertyMapper) {
+       public function injectDeprecatedPropertyMapper(\TYPO3\CMS\Extbase\Property\Mapper $deprecatedPropertyMapper) {
                $this->deprecatedPropertyMapper = $deprecatedPropertyMapper;
        }
 
        /**
         * Injects the object manager
         *
-        * @param Tx_Extbase_Object_ObjectManagerInterface $objectManager
+        * @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
         * @return void
         */
-       public function injectObjectManager(Tx_Extbase_Object_ObjectManagerInterface $objectManager) {
+       public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager) {
                $this->objectManager = $objectManager;
-               $this->arguments = $this->objectManager->create('Tx_Extbase_MVC_Controller_Arguments');
+               $this->arguments = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\Arguments');
        }
 
        /**
         * Injects the validator resolver
         *
-        * @param Tx_Extbase_Validation_ValidatorResolver $validatorResolver
+        * @param \TYPO3\CMS\Extbase\Validation\ValidatorResolver $validatorResolver
         * @return void
         */
-       public function injectValidatorResolver(Tx_Extbase_Validation_ValidatorResolver $validatorResolver) {
+       public function injectValidatorResolver(\TYPO3\CMS\Extbase\Validation\ValidatorResolver $validatorResolver) {
                $this->validatorResolver = $validatorResolver;
        }
 
        /**
         * Injects the flash messages container
         *
-        * @param Tx_Extbase_MVC_Controller_FlashMessages $flashMessageContainer
+        * @param \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessages $flashMessageContainer
         * @return void
         */
-       public function injectFlashMessageContainer(Tx_Extbase_MVC_Controller_FlashMessages $flashMessageContainer) {
+       public function injectFlashMessageContainer(\TYPO3\CMS\Extbase\Mvc\Controller\FlashMessages $flashMessageContainer) {
                $this->flashMessageContainer = $flashMessageContainer;
                // @deprecated since Extbase 1.1; will be removed in Extbase 6.0
                $this->flashMessages = $flashMessageContainer;
@@ -199,11 +201,11 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
         * replace / modify the supporteRequestTypes property or override this
         * method.
         *
-        * @param Tx_Extbase_MVC_RequestInterface $request The current request
+        * @param \TYPO3\CMS\Extbase\Mvc\RequestInterface $request The current request
         * @return boolean TRUE if this request type is supported, otherwise FALSE
         * @api
         */
-       public function canProcessRequest(Tx_Extbase_MVC_RequestInterface $request) {
+       public function canProcessRequest(\TYPO3\CMS\Extbase\Mvc\RequestInterface $request) {
                foreach ($this->supportedRequestTypes as $supportedRequestType) {
                        if ($request instanceof $supportedRequestType) {
                                return TRUE;
@@ -215,21 +217,21 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
        /**
         * Processes a general request. The result can be returned by altering the given response.
         *
-        * @param Tx_Extbase_MVC_RequestInterface $request The request object
-        * @param Tx_Extbase_MVC_ResponseInterface $response The response, modified by this handler
+        * @param \TYPO3\CMS\Extbase\Mvc\RequestInterface $request The request object
+        * @param \TYPO3\CMS\Extbase\Mvc\ResponseInterface $response The response, modified by this handler
         * @return void
-        * @throws Tx_Extbase_MVC_Exception_UnsupportedRequestType if the controller doesn't support the current request type
+        * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException if the controller doesn't support the current request type
         * @api
         */
-       public function processRequest(Tx_Extbase_MVC_RequestInterface $request, Tx_Extbase_MVC_ResponseInterface $response) {
+       public function processRequest(\TYPO3\CMS\Extbase\Mvc\RequestInterface $request, \TYPO3\CMS\Extbase\Mvc\ResponseInterface $response) {
                if (!$this->canProcessRequest($request)) {
-                       throw new Tx_Extbase_MVC_Exception_UnsupportedRequestType((((get_class($this) . ' does not support requests of type "') . get_class($request)) . '". Supported types are: ') . implode(' ', $this->supportedRequestTypes), 1187701131);
+                       throw new \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException((((get_class($this) . ' does not support requests of type "') . get_class($request)) . '". Supported types are: ') . implode(' ', $this->supportedRequestTypes), 1187701131);
                }
                $response->setRequest($request);
                $this->request = $request;
                $this->request->setDispatched(TRUE);
                $this->response = $response;
-               $this->uriBuilder = $this->objectManager->create('Tx_Extbase_MVC_Web_Routing_UriBuilder');
+               $this->uriBuilder = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Routing\\UriBuilder');
                $this->uriBuilder->setRequest($request);
                $this->initializeControllerArgumentsBaseValidators();
                $this->mapRequestArgumentsToControllerArguments();
@@ -239,11 +241,11 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
        /**
         * Initialize the controller context
         *
-        * @return Tx_Extbase_MVC_Controller_ControllerContext ControllerContext to be passed to the view
+        * @return \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext ControllerContext to be passed to the view
         * @api
         */
        protected function buildControllerContext() {
-               $controllerContext = $this->objectManager->create('Tx_Extbase_MVC_Controller_ControllerContext');
+               $controllerContext = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\ControllerContext');
                $controllerContext->setRequest($this->request);
                $controllerContext->setResponse($this->response);
                if ($this->arguments !== NULL) {
@@ -268,7 +270,7 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
         * @param string $extensionName Name of the extension containing the controller to forward to. If not specified, the current extension is assumed.
         * @param array $arguments Arguments to pass to the target action
         * @return void
-        * @throws Tx_Extbase_MVC_Exception_StopAction
+        * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
         * @see redirect()
         * @api
         */
@@ -284,7 +286,7 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
                if ($arguments !== NULL) {
                        $this->request->setArguments($arguments);
                }
-               throw new Tx_Extbase_MVC_Exception_StopAction();
+               throw new \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException();
        }
 
        /**
@@ -303,14 +305,14 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
         * @param integer $delay (optional) The delay in seconds. Default is no delay.
         * @param integer $statusCode (optional) The HTTP status code for the redirect. Default is "303 See Other
         * @return void
-        * @throws Tx_Extbase_MVC_Exception_UnsupportedRequestType If the request is not a web request
-        * @throws Tx_Extbase_MVC_Exception_StopAction
+        * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException If the request is not a web request
+        * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
         * @see forward()
         * @api
         */
        protected function redirect($actionName, $controllerName = NULL, $extensionName = NULL, array $arguments = NULL, $pageUid = NULL, $delay = 0, $statusCode = 303) {
-               if (!$this->request instanceof Tx_Extbase_MVC_Web_Request) {
-                       throw new Tx_Extbase_MVC_Exception_UnsupportedRequestType('redirect() only supports web requests.', 1220539734);
+               if (!$this->request instanceof \TYPO3\CMS\Extbase\Mvc\Web\Request) {
+                       throw new \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException('redirect() only supports web requests.', 1220539734);
                }
                if ($controllerName === NULL) {
                        $controllerName = $this->request->getControllerName();
@@ -327,20 +329,20 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
         * @param mixed $uri A string representation of a URI
         * @param integer $delay (optional) The delay in seconds. Default is no delay.
         * @param integer $statusCode (optional) The HTTP status code for the redirect. Default is "303 See Other
-        * @throws Tx_Extbase_MVC_Exception_UnsupportedRequestType If the request is not a web request
-        * @throws Tx_Extbase_MVC_Exception_StopAction
+        * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException If the request is not a web request
+        * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
         * @api
         */
        protected function redirectToUri($uri, $delay = 0, $statusCode = 303) {
-               if (!$this->request instanceof Tx_Extbase_MVC_Web_Request) {
-                       throw new Tx_Extbase_MVC_Exception_UnsupportedRequestType('redirect() only supports web requests.', 1220539734);
+               if (!$this->request instanceof \TYPO3\CMS\Extbase\Mvc\Web\Request) {
+                       throw new \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException('redirect() only supports web requests.', 1220539734);
                }
                $uri = $this->addBaseUriIfNecessary($uri);
                $escapedUri = htmlentities($uri, ENT_QUOTES, 'utf-8');
                $this->response->setContent(((('<html><head><meta http-equiv="refresh" content="' . intval($delay)) . ';url=') . $escapedUri) . '"/></head></html>');
                $this->response->setStatus($statusCode);
                $this->response->setHeader('Location', (string) $uri);
-               throw new Tx_Extbase_MVC_Exception_StopAction();
+               throw new \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException();
        }
 
        /**
@@ -350,7 +352,7 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
         * @return string
         */
        protected function addBaseUriIfNecessary($uri) {
-               return t3lib_div::locationHeaderUrl((string) $uri);
+               return \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl((string) $uri);
        }
 
        /**
@@ -361,20 +363,20 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
         * @param integer $statusCode The HTTP status code
         * @param string $statusMessage A custom HTTP status message
         * @param string $content Body content which further explains the status
-        * @throws Tx_Extbase_MVC_Exception_UnsupportedRequestType If the request is not a web request
-        * @throws Tx_Extbase_MVC_Exception_StopAction
+        * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException If the request is not a web request
+        * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
         * @api
         */
        public function throwStatus($statusCode, $statusMessage = NULL, $content = NULL) {
-               if (!$this->request instanceof Tx_Extbase_MVC_Web_Request) {
-                       throw new Tx_Extbase_MVC_Exception_UnsupportedRequestType('throwStatus() only supports web requests.', 1220539739);
+               if (!$this->request instanceof \TYPO3\CMS\Extbase\Mvc\Web\Request) {
+                       throw new \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException('throwStatus() only supports web requests.', 1220539739);
                }
                $this->response->setStatus($statusCode, $statusMessage);
                if ($content === NULL) {
                        $content = $this->response->getStatus();
                }
                $this->response->setContent($content);
-               throw new Tx_Extbase_MVC_Exception_StopAction();
+               throw new \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException();
        }
 
        /**
@@ -404,7 +406,7 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
                                if ($this->request->hasArgument($argumentName)) {
                                        $argument->setValue($this->request->getArgument($argumentName));
                                } elseif ($argument->isRequired()) {
-                                       throw new Tx_Extbase_MVC_Controller_Exception_RequiredArgumentMissingException(('Required argument "' . $argumentName) . '" is not set.', 1298012500);
+                                       throw new \TYPO3\CMS\Extbase\Mvc\Controller\Exception\RequiredArgumentMissingException(('Required argument "' . $argumentName) . '" is not set.', 1298012500);
                                }
                        }
                } else {
@@ -416,7 +418,7 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
                                        $optionalPropertyNames[] = $propertyName;
                                }
                        }
-                       $validator = $this->objectManager->create('Tx_Extbase_MVC_Controller_ArgumentsValidator');
+                       $validator = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\ArgumentsValidator');
                        $this->deprecatedPropertyMapper->mapAndValidate($allPropertyNames, $this->request->getArguments(), $this->arguments, $optionalPropertyNames, $validator);
                        $this->argumentsMappingResults = $this->deprecatedPropertyMapper->getMappingResults();
                }
@@ -424,4 +426,5 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
 
 }
 
+
 ?>
\ No newline at end of file
index 34f193e..3549969 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Mvc\Controller;
+
 /***************************************************************
  *  Copyright notice
  *
  * @version $ID:$
  * @api
  */
-class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controller_AbstractController {
+class ActionController extends \TYPO3\CMS\Extbase\Mvc\Controller\AbstractController {
 
        /**
-        * @var Tx_Extbase_Reflection_Service
+        * @var \TYPO3\CMS\Extbase\Reflection\Service
         */
        protected $reflectionService;
 
        /**
-        * @var Tx_Extbase_Service_CacheService
+        * @var \TYPO3\CMS\Extbase\Service\CacheService
         */
        protected $cacheService;
 
        /**
         * The current view, as resolved by resolveView()
         *
-        * @var Tx_Extbase_MVC_View_ViewInterface
+        * @var \TYPO3\CMS\Extbase\Mvc\View\ViewInterface
         * @api
         */
        protected $view = NULL;
@@ -79,7 +81,7 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
         * @var string
         * @api
         */
-       protected $defaultViewObjectName = 'Tx_Fluid_View_TemplateView';
+       protected $defaultViewObjectName = 'TYPO3\\CMS\\Fluid\\View\\TemplateView';
 
        /**
         * Name of the action method
@@ -98,18 +100,18 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
        protected $errorMethodName = 'errorAction';
 
        /**
-        * @param Tx_Extbase_Reflection_Service $reflectionService
+        * @param \TYPO3\CMS\Extbase\Reflection\Service $reflectionService
         * @return void
         */
-       public function injectReflectionService(Tx_Extbase_Reflection_Service $reflectionService) {
+       public function injectReflectionService(\TYPO3\CMS\Extbase\Reflection\Service $reflectionService) {
                $this->reflectionService = $reflectionService;
        }
 
        /**
-        * @param Tx_Extbase_Service_CacheService $cacheService
+        * @param \TYPO3\CMS\Extbase\Service\CacheService $cacheService
         * @return void
         */
-       public function injectCacheService(Tx_Extbase_Service_CacheService $cacheService) {
+       public function injectCacheService(\TYPO3\CMS\Extbase\Service\CacheService $cacheService) {
                $this->cacheService = $cacheService;
        }
 
@@ -120,31 +122,31 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
         * replace / modify the supporteRequestTypes property or override this
         * method.
         *
-        * @param Tx_Extbase_MVC_RequestInterface $request The current request
+        * @param \TYPO3\CMS\Extbase\Mvc\RequestInterface $request The current request
         * @return boolean TRUE if this request type is supported, otherwise FALSE
         */
-       public function canProcessRequest(Tx_Extbase_MVC_RequestInterface $request) {
+       public function canProcessRequest(\TYPO3\CMS\Extbase\Mvc\RequestInterface $request) {
                return parent::canProcessRequest($request);
        }
 
        /**
         * Handles a request. The result output is returned by altering the given response.
         *
-        * @param Tx_Extbase_MVC_RequestInterface $request The request object
-        * @param Tx_Extbase_MVC_ResponseInterface $response The response, modified by this handler
+        * @param \TYPO3\CMS\Extbase\Mvc\RequestInterface $request The request object
+        * @param \TYPO3\CMS\Extbase\Mvc\ResponseInterface $response The response, modified by this handler
         * @return void
         */
-       public function processRequest(Tx_Extbase_MVC_RequestInterface $request, Tx_Extbase_MVC_ResponseInterface $response) {
+       public function processRequest(\TYPO3\CMS\Extbase\Mvc\RequestInterface $request, \TYPO3\CMS\Extbase\Mvc\ResponseInterface $response) {
                if (!$this->canProcessRequest($request)) {
-                       throw new Tx_Extbase_MVC_Exception_UnsupportedRequestType((((get_class($this) . ' does not support requests of type "') . get_class($request)) . '". Supported types are: ') . implode(' ', $this->supportedRequestTypes), 1187701131);
+                       throw new \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException((((get_class($this) . ' does not support requests of type "') . get_class($request)) . '". Supported types are: ') . implode(' ', $this->supportedRequestTypes), 1187701131);
                }
-               if ($response instanceof Tx_Extbase_MVC_Web_Response) {
+               if ($response instanceof \TYPO3\CMS\Extbase\Mvc\Web\Response) {
                        $response->setRequest($request);
                }
                $this->request = $request;
                $this->request->setDispatched(TRUE);
                $this->response = $response;
-               $this->uriBuilder = $this->objectManager->create('Tx_Extbase_MVC_Web_Routing_UriBuilder');
+               $this->uriBuilder = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Routing\\UriBuilder');
                $this->uriBuilder->setRequest($request);
                $this->actionMethodName = $this->resolveActionMethodName();
                $this->initializeActionMethodArguments();
@@ -183,7 +185,7 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
                                $dataType = 'array';
                        }
                        if ($dataType === NULL) {
-                               throw new Tx_Extbase_MVC_Exception_InvalidArgumentType(((((('The argument type for parameter $' . $parameterName) . ' of method ') . get_class($this)) . '->') . $this->actionMethodName) . '() could not be detected.', 1253175643);
+                               throw new \TYPO3\CMS\Extbase\Mvc\Exception\InvalidArgumentTypeException(((((('The argument type for parameter $' . $parameterName) . ' of method ') . get_class($this)) . '->') . $this->actionMethodName) . '() could not be detected.', 1253175643);
                        }
                        $defaultValue = isset($parameterInfo['defaultValue']) ? $parameterInfo['defaultValue'] : NULL;
                        $this->arguments->addNewArgument($parameterName, $dataType, $parameterInfo['optional'] === FALSE, $defaultValue);
@@ -229,12 +231,12 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
         * Resolves and checks the current action method name
         *
         * @return string Method name of the current action
-        * @throws Tx_Extbase_MVC_Exception_NoSuchAction if the action specified in the request object does not exist (and if there's no default action either).
+        * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchActionException if the action specified in the request object does not exist (and if there's no default action either).
         */
        protected function resolveActionMethodName() {
                $actionMethodName = $this->request->getControllerActionName() . 'Action';
                if (!method_exists($this, $actionMethodName)) {
-                       throw new Tx_Extbase_MVC_Exception_NoSuchAction(((('An action "' . $actionMethodName) . '" does not exist in controller "') . get_class($this)) . '".', 1186669086);
+                       throw new \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchActionException(((('An action "' . $actionMethodName) . '" does not exist in controller "') . get_class($this)) . '".', 1186669086);
                }
                return $actionMethodName;
        }
@@ -296,7 +298,7 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
                                $actionResult = call_user_func_array(array($this, $this->actionMethodName), $preparedArguments);
                        }
                }
-               if ($actionResult === NULL && $this->view instanceof Tx_Extbase_MVC_View_ViewInterface) {
+               if ($actionResult === NULL && $this->view instanceof \TYPO3\CMS\Extbase\Mvc\View\ViewInterface) {
                        $this->response->appendContent($this->view->render());
                } elseif (is_string($actionResult) && strlen($actionResult) > 0) {
                        $this->response->appendContent($actionResult);
@@ -330,7 +332,7 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
                        }
                }
                if (!isset($view)) {
-                       $view = $this->objectManager->create('Tx_Extbase_MVC_View_NotFoundView');
+                       $view = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Mvc\\View\\NotFoundView');
                        $view->assign('errorMessage', ('No template was found. View could not be resolved for action "' . $this->request->getControllerActionName()) . '"');
                }
                $view->setControllerContext($this->controllerContext);
@@ -345,20 +347,20 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
        }
 
        /**
-        * @param Tx_Extbase_MVC_View_ViewInterface $view
+        * @param \TYPO3\CMS\Extbase\Mvc\View\ViewInterface $view
         * @return void
         */
-       protected function setViewConfiguration(Tx_Extbase_MVC_View_ViewInterface $view) {
+       protected function setViewConfiguration(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface $view) {
                // Template Path Override
-               $extbaseFrameworkConfiguration = $this->configurationManager->getConfiguration(Tx_Extbase_Configuration_ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK);
+               $extbaseFrameworkConfiguration = $this->configurationManager->getConfiguration(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK);
                if ((isset($extbaseFrameworkConfiguration['view']['templateRootPath']) && strlen($extbaseFrameworkConfiguration['view']['templateRootPath']) > 0) && method_exists($view, 'setTemplateRootPath')) {
-                       $view->setTemplateRootPath(t3lib_div::getFileAbsFileName($extbaseFrameworkConfiguration['view']['templateRootPath']));
+                       $view->setTemplateRootPath(\TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName($extbaseFrameworkConfiguration['view']['templateRootPath']));
                }
                if ((isset($extbaseFrameworkConfiguration['view']['layoutRootPath']) && strlen($extbaseFrameworkConfiguration['view']['layoutRootPath']) > 0) && method_exists($view, 'setLayoutRootPath')) {
-                       $view->setLayoutRootPath(t3lib_div::getFileAbsFileName($extbaseFrameworkConfiguration['view']['layoutRootPath']));
+                       $view->setLayoutRootPath(\TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName($extbaseFrameworkConfiguration['view']['layoutRootPath']));
                }
                if ((isset($extbaseFrameworkConfiguration['view']['partialRootPath']) && strlen($extbaseFrameworkConfiguration['view']['partialRootPath']) > 0) && method_exists($view, 'setPartialRootPath')) {
-                       $view->setPartialRootPath(t3lib_div::getFileAbsFileName($extbaseFrameworkConfiguration['view']['partialRootPath']));
+                       $view->setPartialRootPath(\TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName($extbaseFrameworkConfiguration['view']['partialRootPath']));
                }
        }
 
@@ -391,11 +393,11 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
         * Override this method to solve assign variables common for all actions
         * or prepare the view in another way before the action is called.
         *
-        * @param Tx_Extbase_MVC_View_ViewInterface $view The view to be initialized
+        * @param \TYPO3\CMS\Extbase\Mvc\View\ViewInterface $view The view to be initialized
         * @return void
         * @api
         */
-       protected function initializeView(Tx_Extbase_MVC_View_ViewInterface $view) {
+       protected function initializeView(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface $view) {
 
        }
 
@@ -430,7 +432,7 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
                if ($this->configurationManager->isFeatureEnabled('rewrittenPropertyMapper')) {
                        $errorFlashMessage = $this->getErrorFlashMessage();
                        if ($errorFlashMessage !== FALSE) {
-                               $this->flashMessageContainer->add($errorFlashMessage, '', t3lib_FlashMessage::ERROR);
+                               $this->flashMessageContainer->add($errorFlashMessage, '', \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
                        }
                        $referringRequest = $this->request->getReferringRequest();
                        if ($referringRequest !== NULL) {
@@ -451,7 +453,7 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
                        $this->request->setErrors($this->argumentsMappingResults->getErrors());
                        $errorFlashMessage = $this->getErrorFlashMessage();
                        if ($errorFlashMessage !== FALSE) {
-                               $this->flashMessageContainer->add($errorFlashMessage, '', t3lib_FlashMessage::ERROR);
+                               $this->flashMessageContainer->add($errorFlashMessage, '', \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
                        }
                        $referrer = $this->request->getInternalArgument('__referrer');
                        if ($referrer !== NULL) {
@@ -486,7 +488,7 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
         * In case the @dontverifyrequesthash-Annotation has been set, this suppresses the exception.
         *
         * @return void
-        * @throws Tx_Extbase_MVC_Exception_InvalidOrNoRequestHash In case request hash checking failed
+        * @throws \TYPO3\CMS\Extbase\Mvc\Exception\InvalidOrNoRequestHashException In case request hash checking failed
         * @author Sebastian Kurfürst <sebastian@typo3.org>
         * @deprecated since Extbase 1.4.0, will be removed in Extbase 6.0
         */
@@ -495,7 +497,7 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
                        // If the new property mapper is enabled, the request hash is not needed anymore.
                        return;
                }
-               if (!$this->request instanceof Tx_Extbase_MVC_Web_Request) {
+               if (!$this->request instanceof \TYPO3\CMS\Extbase\Mvc\Web\Request) {
                        return;
                }
                // We only want to check it for now for web requests.
@@ -505,14 +507,14 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
                // all good
                $verificationNeeded = FALSE;
                foreach ($this->arguments as $argument) {
-                       if ($argument->getOrigin() == Tx_Extbase_MVC_Controller_Argument::ORIGIN_NEWLY_CREATED || $argument->getOrigin() == Tx_Extbase_MVC_Controller_Argument::ORIGIN_PERSISTENCE_AND_MODIFIED) {
+                       if ($argument->getOrigin() == \TYPO3\CMS\Extbase\Mvc\Controller\Argument::ORIGIN_NEWLY_CREATED || $argument->getOrigin() == \TYPO3\CMS\Extbase\Mvc\Controller\Argument::ORIGIN_PERSISTENCE_AND_MODIFIED) {
                                $verificationNeeded = TRUE;
                        }
                }
                if ($verificationNeeded) {
                        $methodTagsValues = $this->reflectionService->getMethodTagsValues(get_class($this), $this->actionMethodName);
                        if (!isset($methodTagsValues['dontverifyrequesthash'])) {
-                               throw new Tx_Extbase_MVC_Exception_InvalidOrNoRequestHash('Request hash (HMAC) checking failed. The parameter __hmac was invalid or not set, and objects were modified.', 1255082824);
+                               throw new \TYPO3\CMS\Extbase\Mvc\Exception\InvalidOrNoRequestHashException('Request hash (HMAC) checking failed. The parameter __hmac was invalid or not set, and objects were modified.', 1255082824);
                        }
                }
        }
@@ -524,7 +526,7 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
         * @return void
         */
        protected function clearCacheOnError() {
-               $extbaseSettings = $this->configurationManager->getConfiguration(Tx_Extbase_Configuration_ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK);
+               $extbaseSettings = $this->configurationManager->getConfiguration(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK);
                if (isset($extbaseSettings['persistence']['enableAutomaticCacheClearing']) && $extbaseSettings['persistence']['enableAutomaticCacheClearing'] === '1') {
                        if (isset($GLOBALS['TSFE'])) {
                                $pageUid = $GLOBALS['TSFE']->id;
@@ -535,4 +537,5 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
 
 }
 
+
 ?>
\ No newline at end of file
index cc508f0..ad048ec 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Mvc\Controller;
+
 /***************************************************************
  *  Copyright notice
  *
  * @scope prototype
  * @api
  */
-class Tx_Extbase_MVC_Controller_Argument {
+class Argument {
 
        /**
-        * @var Tx_Extbase_Object_ObjectManagerInterface
+        * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
         */
        protected $objectManager;
 
        /**
-        * @var Tx_Extbase_Persistence_QueryFactory
+        * @var \TYPO3\CMS\Extbase\Persistence\Generic\QueryFactory
         */
        protected $queryFactory;
 
        /**
-        * @var Tx_Extbase_Configuration_ConfigurationManagerInterface
+        * @var \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface
         */
        protected $configurationManager;
 
        /**
         * This is the old property mapper, which has been completely rewritten for 1.4.
         *
-        * @var Tx_Extbase_Property_Mapper
+        * @var \TYPO3\CMS\Extbase\Property\Mapper
         */
        protected $deprecatedPropertyMapper;
 
        /**
         * The new, completely rewritten property mapper since Extbase 1.4.
         *
-        * @var Tx_Extbase_Property_PropertyMapper
+        * @var \TYPO3\CMS\Extbase\Property\PropertyMapper
         */
        protected $propertyMapper;
 
        /**
-        * @var Tx_Extbase_Property_PropertyMappingConfigurationBuilder
+        * @var \TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationBuilder
         */
        protected $propertyMappingConfigurationBuilder;
 
        /**
-        * @var Tx_Extbase_MVC_Controller_MvcPropertyMappingConfiguration
+        * @var \TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfiguration
         */
        protected $propertyMappingConfiguration;
 
        /**
-        * @var Tx_Extbase_Reflection_Service
+        * @var \TYPO3\CMS\Extbase\Reflection\Service
         */
        protected $reflectionService;
 
        /**
-        * @var Tx_Extbase_Service_TypeHandlingService
+        * @var \TYPO3\CMS\Extbase\Service\TypeHandlingService
         */
        protected $typeHandlingService;
 
@@ -108,7 +110,7 @@ class Tx_Extbase_MVC_Controller_Argument {
        /**
         * If the data type is an object, the class schema of the data type class is resolved
         *
-        * @var Tx_Extbase_Reflection_ClassSchema
+        * @var \TYPO3\CMS\Extbase\Reflection\ClassSchema
         */
        protected $dataTypeClassSchema;
 
@@ -136,14 +138,14 @@ class Tx_Extbase_MVC_Controller_Argument {
        /**
         * A custom validator, used supplementary to the base validation
         *
-        * @var Tx_Extbase_Validation_Validator_ValidatorInterface
+        * @var \TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface
         */
        protected $validator = NULL;
 
        /**
         * The validation results. This can be asked if the argument has errors.
         *
-        * @var Tx_Extbase_Error_Result
+        * @var \TYPO3\CMS\Extbase\Error\Result
         */
        protected $validationResults = NULL;
 
@@ -168,7 +170,7 @@ class Tx_Extbase_MVC_Controller_Argument {
        protected $origin = 0;
 
        /**
-        * @var Tx_Extbase_Persistence_ManagerInterface
+        * @var \TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface
         */
        protected $persistenceManager;
 
@@ -182,10 +184,10 @@ class Tx_Extbase_MVC_Controller_Argument {
         */
        public function __construct($name, $dataType) {
                if (!is_string($name)) {
-                       throw new InvalidArgumentException(('$name must be of type string, ' . gettype($name)) . ' given.', 1187951688);
+                       throw new \InvalidArgumentException(('$name must be of type string, ' . gettype($name)) . ' given.', 1187951688);
                }
                if (strlen($name) === 0) {
-                       throw new InvalidArgumentException(('$name must be a non-empty string, ' . strlen($name)) . ' characters given.', 1232551853);
+                       throw new \InvalidArgumentException(('$name must be a non-empty string, ' . strlen($name)) . ' characters given.', 1232551853);
                }
                $this->name = $name;
                $this->dataType = $dataType;
@@ -194,42 +196,42 @@ class Tx_Extbase_MVC_Controller_Argument {
        /**
         * Injects the object manager
         *
-        * @param Tx_Extbase_Object_ObjectManagerInterface $objectManager
+        * @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
         * @return void
         */
-       public function injectObjectManager(Tx_Extbase_Object_ObjectManagerInterface $objectManager) {
+       public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager) {
                $this->objectManager = $objectManager;
        }
 
        /**
-        * @param Tx_Extbase_Property_Mapper $deprecatedPropertyMapper
+        * @param \TYPO3\CMS\Extbase\Property\Mapper $deprecatedPropertyMapper
         * @return void
         */
-       public function injectDeprecatedPropertyMapper(Tx_Extbase_Property_Mapper $deprecatedPropertyMapper) {
+       public function injectDeprecatedPropertyMapper(\TYPO3\CMS\Extbase\Property\Mapper $deprecatedPropertyMapper) {
                $this->deprecatedPropertyMapper = $deprecatedPropertyMapper;
        }
 
        /**
-        * @param Tx_Extbase_Property_PropertyMapper $propertyMapper
+        * @param \TYPO3\CMS\Extbase\Property\PropertyMapper $propertyMapper
         * @return void
         */
-       public function injectPropertyMapper(Tx_Extbase_Property_PropertyMapper $propertyMapper) {
+       public function injectPropertyMapper(\TYPO3\CMS\Extbase\Property\PropertyMapper $propertyMapper) {
                $this->propertyMapper = $propertyMapper;
        }
 
        /**
-        * @param Tx_Extbase_Property_PropertyMappingConfigurationBuilder $propertyMappingConfigurationBuilder
+        * @param \TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationBuilder $propertyMappingConfigurationBuilder
         * @return void
         */
-       public function injectPropertyMappingConfigurationBuilder(Tx_Extbase_Property_PropertyMappingConfigurationBuilder $propertyMappingConfigurationBuilder) {
+       public function injectPropertyMappingConfigurationBuilder(\TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationBuilder $propertyMappingConfigurationBuilder) {
                $this->propertyMappingConfigurationBuilder = $propertyMappingConfigurationBuilder;
        }
 
        /**
-        * @param Tx_Extbase_Reflection_Service $reflectionService
+        * @param \TYPO3\CMS\Extbase\Reflection\Service $reflectionService
         * @return void
         */
-       public function injectReflectionService(Tx_Extbase_Reflection_Service $reflectionService) {
+       public function injectReflectionService(\TYPO3\CMS\Extbase\Reflection\Service $reflectionService) {
                $this->reflectionService = $reflectionService;
                $this->dataTypeClassSchema = strpos($this->dataType, '_') !== FALSE ? $this->reflectionService->getClassSchema($this->dataType) : NULL;
        }
@@ -237,28 +239,28 @@ class Tx_Extbase_MVC_Controller_Argument {
        /**
         * Injects the Persistence Manager
         *
-        * @param Tx_Extbase_Persistence_ManagerInterface
+        * @param \TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface
         * @return void
         */
-       public function injectPersistenceManager(Tx_Extbase_Persistence_ManagerInterface $persistenceManager) {
+       public function injectPersistenceManager(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface $persistenceManager) {
                $this->persistenceManager = $persistenceManager;
        }
 
        /**
         * Injects a QueryFactory instance
         *
-        * @param Tx_Extbase_Persistence_QueryFactoryInterface $queryFactory
+        * @param \TYPO3\CMS\Extbase\Persistence\Generic\QueryFactoryInterface $queryFactory
         * @return void
         */
-       public function injectQueryFactory(Tx_Extbase_Persistence_QueryFactoryInterface $queryFactory) {
+       public function injectQueryFactory(\TYPO3\CMS\Extbase\Persistence\Generic\QueryFactoryInterface $queryFactory) {
                $this->queryFactory = $queryFactory;
        }
 
        /**
-        * @param Tx_Extbase_Configuration_ConfigurationManagerInterface $configurationManager
+        * @param \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface $configurationManager
         * @return void
         */
-       public function injectConfigurationManager(Tx_Extbase_Configuration_ConfigurationManagerInterface $configurationManager) {
+       public function injectConfigurationManager(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface $configurationManager) {
                $this->configurationManager = $configurationManager;
        }
 
@@ -268,14 +270,14 @@ class Tx_Extbase_MVC_Controller_Argument {
         * @return void
         */
        public function initializeObject() {
-               $this->propertyMappingConfiguration = $this->propertyMappingConfigurationBuilder->build('Tx_Extbase_MVC_Controller_MvcPropertyMappingConfiguration');
+               $this->propertyMappingConfiguration = $this->propertyMappingConfigurationBuilder->build('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\MvcPropertyMappingConfiguration');
        }
 
        /**
-        * @param Tx_Extbase_Service_TypeHandlingService $typeHandlingService
+        * @param \TYPO3\CMS\Extbase\Service\TypeHandlingService $typeHandlingService
         * @return void
         */
-       public function injectTypeHandlingService(Tx_Extbase_Service_TypeHandlingService $typeHandlingService) {
+       public function injectTypeHandlingService(\TYPO3\CMS\Extbase\Service\TypeHandlingService $typeHandlingService) {
                $this->typeHandlingService = $typeHandlingService;
                $this->dataType = $this->typeHandlingService->normalizeType($this->dataType);
        }
@@ -294,13 +296,13 @@ class Tx_Extbase_MVC_Controller_Argument {
         * Sets the short name of this argument.
         *
         * @param string $shortName A "short name" - a single character
-        * @return Tx_Extbase_MVC_Controller_Argument $this
+        * @return \TYPO3\CMS\Extbase\Mvc\Controller\Argument $this
         * @throws InvalidArgumentException if $shortName is not a character
         * @api
         */
        public function setShortName($shortName) {
                if ($shortName !== NULL && (!is_string($shortName) || strlen($shortName) !== 1)) {
-                       throw new InvalidArgumentException('$shortName must be a single character or NULL', 1195824959);
+                       throw new \InvalidArgumentException('$shortName must be a single character or NULL', 1195824959);
                }
                $this->shortName = $shortName;
                return $this;
@@ -320,7 +322,7 @@ class Tx_Extbase_MVC_Controller_Argument {
         * Sets the data type of this argument's value
         *
         * @param string $dataType The data type. Can be either a built-in type such as "Text" or "Integer" or a fully qualified object name
-        * @return Tx_Extbase_MVC_Controller_Argument $this
+        * @return \TYPO3\CMS\Extbase\Mvc\Controller\Argument $this
         * @api
         */
        public function setDataType($dataType) {
@@ -343,7 +345,7 @@ class Tx_Extbase_MVC_Controller_Argument {
         * Marks this argument to be required
         *
         * @param boolean $required TRUE if this argument should be required
-        * @return Tx_Extbase_MVC_Controller_Argument $this
+        * @return \TYPO3\CMS\Extbase\Mvc\Controller\Argument $this
         * @api
         */
        public function setRequired($required) {
@@ -365,7 +367,7 @@ class Tx_Extbase_MVC_Controller_Argument {
         * Sets the default value of the argument
         *
         * @param mixed $defaultValue Default value
-        * @return Tx_Extbase_MVC_Controller_Argument $this
+        * @return \TYPO3\CMS\Extbase\Mvc\Controller\Argument $this
         * @api
         */
        public function setDefaultValue($defaultValue) {
@@ -386,11 +388,11 @@ class Tx_Extbase_MVC_Controller_Argument {
        /**
         * Sets a custom validator which is used supplementary to the base validation
         *
-        * @param Tx_Extbase_Validation_Validator_ValidatorInterface $validator The actual validator object
-        * @return Tx_Extbase_MVC_Controller_Argument Returns $this (used for fluent interface)
+        * @param \TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface $validator The actual validator object
+        * @return \TYPO3\CMS\Extbase\Mvc\Controller\Argument Returns $this (used for fluent interface)
         * @api
         */
-       public function setValidator(Tx_Extbase_Validation_Validator_ValidatorInterface $validator) {
+       public function setValidator(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface $validator) {
                $this->validator = $validator;
                return $this;
        }
@@ -399,13 +401,13 @@ class Tx_Extbase_MVC_Controller_Argument {
         * Create and set a validator chain
         *
         * @param array Object names of the validators
-        * @return Tx_Extbase_MVC_Controller_Argument Returns $this (used for fluent interface)
+        * @return \TYPO3\CMS\Extbase\Mvc\Controller\Argument Returns $this (used for fluent interface)
         * @api
         * @deprecated since Extbase 1.4.0, will be removed in Extbase 6.0
         */
        public function setNewValidatorConjunction(array $objectNames) {
                if ($this->validator === NULL) {
-                       $this->validator = $this->objectManager->create('Tx_Extbase_Validation_Validator_ConjunctionValidator');
+                       $this->validator = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Validation\\Validator\\ConjunctionValidator');
                }
                foreach ($objectNames as $objectName) {
                        if (!class_exists($objectName)) {
@@ -419,7 +421,7 @@ class Tx_Extbase_MVC_Controller_Argument {
        /**
         * Returns the set validator
         *
-        * @return Tx_Extbase_Validation_Validator_ValidatorInterface The set validator, NULL if none was set
+        * @return \TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface The set validator, NULL if none was set
         * @api
         */
        public function getValidator() {
@@ -441,8 +443,8 @@ class Tx_Extbase_MVC_Controller_Argument {
         * Sets the value of this argument.
         *
         * @param mixed $rawValue: The value of this argument
-        * @return Tx_Extbase_MVC_Controller_Argument $this
-        * @throws Tx_Extbase_MVC_Exception_InvalidArgumentValue if the argument is not a valid object of type $dataType
+        * @return \TYPO3\CMS\Extbase\Mvc\Controller\Argument $this
+        * @throws \TYPO3\CMS\Extbase\Mvc\Exception\InvalidArgumentValueException if the argument is not a valid object of type $dataType
         */
        public function setValue($rawValue) {
                if ($this->configurationManager->isFeatureEnabled('rewrittenPropertyMapper')) {
@@ -499,13 +501,13 @@ class Tx_Extbase_MVC_Controller_Argument {
                        }
                } else {
                        if (!is_array($value)) {
-                               throw new Tx_Extbase_MVC_Exception_InvalidArgumentValue('The value was a simple type, so we could not map it to an object. Maybe the @entity or @valueobject annotations are missing?', 1251730701);
+                               throw new \TYPO3\CMS\Extbase\Mvc\Exception\InvalidArgumentValueException('The value was a simple type, so we could not map it to an object. Maybe the @entity or @valueobject annotations are missing?', 1251730701);
                        }
                        $this->origin = self::ORIGIN_NEWLY_CREATED;
                        $transformedValue = $this->deprecatedPropertyMapper->map(array_keys($value), $value, $this->dataType);
                }
                if (!$transformedValue instanceof $this->dataType && ($transformedValue !== NULL || $this->isRequired())) {
-                       throw new Tx_Extbase_MVC_Exception_InvalidArgumentValue((((('The value must be of type "' . $this->dataType) . '", but was of type "') . (is_object($transformedValue) ? get_class($transformedValue) : gettype($transformedValue))) . '".') . ($this->deprecatedPropertyMapper->getMappingResults()->hasErrors() ? ('<p>' . implode('<br />', $this->deprecatedPropertyMapper->getMappingResults()->getErrors())) . '</p>' : ''), 1251730701);
+                       throw new \TYPO3\CMS\Extbase\Mvc\Exception\InvalidArgumentValueException((((('The value must be of type "' . $this->dataType) . '", but was of type "') . (is_object($transformedValue) ? get_class($transformedValue) : gettype($transformedValue))) . '".') . ($this->deprecatedPropertyMapper->getMappingResults()->hasErrors() ? ('<p>' . implode('<br />', $this->deprecatedPropertyMapper->getMappingResults()->getErrors())) . '</p>' : ''), 1251730701);
                }
                return $transformedValue;
        }
@@ -550,7 +552,7 @@ class Tx_Extbase_MVC_Controller_Argument {
        /**
         * Return the Property Mapping Configuration used for this argument; can be used by the initialize*action to modify the Property Mapping.
         *
-        * @return Tx_Extbase_MVC_Controller_MvcPropertyMappingConfiguration
+        * @return \TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfiguration
         * @author Sebastian Kurfürst <sebastian@typo3.org>
         * @api
         */
@@ -588,4 +590,5 @@ class Tx_Extbase_MVC_Controller_Argument {
 
 }
 
+
 ?>
\ No newline at end of file
index c598f20..4ac9a77 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Mvc\Controller;
+
 /***************************************************************
  *  Copyright notice
  *
@@ -34,7 +36,7 @@
  * @scope prototype
  * @deprecated since Extbase 1.4.0, will be removed in Extbase 6.0
  */
-class Tx_Extbase_MVC_Controller_ArgumentError extends Tx_Extbase_Validation_PropertyError {
+class ArgumentError extends \TYPO3\CMS\Extbase\Validation\PropertyError {
 
        /**
         * @var string The default (english) error message.
@@ -48,4 +50,5 @@ class Tx_Extbase_MVC_Controller_ArgumentError extends Tx_Extbase_Validation_Prop
 
 }
 
+
 ?>
\ No newline at end of file
index b2627b0..c559270 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Extbase\Mvc\Controller;
+
 /***************************************************************
  *  Copyright notice
  *
  * @version $ID:$
  * @scope prototype
  */
-class Tx_Extbase_MVC_Controller_Arguments extends ArrayObject {
+class Arguments extends \ArrayObject {
 
        /**
-        * @var Tx_Extbase_Object_ObjectManagerInterface
+        * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
         */
        protected $objectManager;
 
@@ -59,10 +61,10 @@ class Tx_Extbase_MVC_Controller_Arguments extends ArrayObject {
        /**
         * Injects the object manager
         *
-        * @param Tx_Extbase_Object_ObjectManagerInterface $objectManager
+        * @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
         * @return void
         */
-       public function injectObjectManager(Tx_Extbase_Object_ObjectManagerInterface $objectManager) {
+       public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager) {
                $this->objectManager = $objectManager;
        }
 
@@ -76,8 +78,8 @@ class Tx_Extbase_MVC_Controller_Arguments extends ArrayObject {
         * @throws InvalidArgumentException if the argument is not a valid Controller Argument object
         */
        public function offsetSet($offset, $value) {
-               if (!$value instanceof Tx_Extbase_MVC_Controller_Argument) {
-                       throw new InvalidArgumentException('Controller arguments must be valid Tx_Extbase_MVC_Controller_Argument objects.', 1187953786);
+               if (!$value instanceof \TYPO3\CMS\Extbase\Mvc\Controller\Argument) {
+                       throw new \InvalidArgumentException('Controller arguments must be valid TYPO3\\CMS\\Extbase\\Mvc\\Controller\\Argument objects.', 1187953786);
                }
                $argumentName = $value->getName();
                parent::offsetSet($argumentName, $value);
@@ -92,8 +94,8 @@ class Tx_Extbase_MVC_Controller_Arguments extends ArrayObject {
         * @throws InvalidArgumentException if the argument is not a valid Controller Argument object
         */
        public function append($value) {
-               if (!$value instanceof Tx_Extbase_MVC_Controller_Argument) {
-                       throw new InvalidArgumentException('Controller arguments must be valid Tx_Extbase_MVC_Controller_Argument objects.', 1187953786);
+               if (!$value instanceof \TYPO3\CMS\Extbase\Mvc\Controller\Argument) {
+                       throw new \InvalidArgumentException('Controller arguments must be valid TYPO3\\CMS\\Extbase\\Mvc\\Controller\\Argument objects.', 1187953786);
                }
                $this->offsetSet(NULL, $value);
        }
@@ -128,13 +130,13 @@ class Tx_Extbase_MVC_Controller_Arguments extends ArrayObject {
         * Returns the value at the specified index
         *
         * @param mixed $offset Offset
-        * @return Tx_Extbase_MVC_Controller_Argument The requested argument object
-        * @throws Tx_Extbase_MVC_Exception_NoSuchArgument if the argument does not exist
+        * @return \TYPO3\CMS\Extbase\Mvc\Controller\Argument The requested argument object
+        * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException if the argument does not exist
         */
        public function offsetGet($offset) {
                $translatedOffset = $this->translateToLongArgumentName($offset);
                if ($translatedOffset === '') {
-                       throw new Tx_Extbase_MVC_Exception_NoSuchArgument(('The argument "' . $offset) . '" does not exist.', 1216909923);
+                       throw new \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException(('The argument "' . $offset) . '" does not exist.', 1216909923);
                }
                return parent::offsetGet($translatedOffset);
        }
@@ -148,11 +150,11 @@ class Tx_Extbase_MVC_Controller_Arguments extends ArrayObject {
         * @param string $dataType Name of one of the built-in data types
         * @param boolean $isRequired TRUE if this argument should be marked as required
         * @param mixed $defaultValue Default value of the argument. Only makes sense if $isRequired==FALSE
-        * @return Tx_Extbase_MVC_Controller_Argument The new argument
+        * @return \TYPO3\CMS\Extbase\Mvc\Controller\Argument The new argument
         */
        public function addNewArgument($name, $dataType = 'Text', $isRequired = FALSE, $defaultValue = NULL) {
-               /** @var $argument Tx_Extbase_MVC_Controller_Argument */
-               $argument = $this->objectManager->create('Tx_Extbase_MVC_Controller_Argument', $name, $dataType);
+               /** @var $argument \TYPO3\CMS\Extbase\Mvc\Controller\Argument */
+               $argument = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\Argument', $name, $dataType);
                $argument->setRequired($isRequired);
                $argument->setDefaultValue($defaultValue);
                $this->addArgument($argument);
@@ -166,10 +168,10 @@ class Tx_Extbase_MVC_Controller_Arguments extends ArrayObject {
         *
         * Note that the argument will be cloned, not referenced.
         *
-        * @param Tx_Extbase_MVC_Controller_Argument $argument The argument to add
+        * @param \TYPO3\CMS\Extbase\Mvc\Controller\Argument $argument The argument to add
         * @return void
         */
-       public function addArgument(Tx_Extbase_MVC_Controller_Argument $argument) {
+       public function addArgument(\TYPO3\CMS\Extbase\Mvc\Controller\Argument $argument) {
                $this->offsetSet(NULL, $argument);
        }
 
@@ -177,12 +179,12 @@ class Tx_Extbase_MVC_Controller_Arguments extends ArrayObject {
         * Returns an argument specified by name
         *
         * @param string $argumentName Name of the argument to retrieve
-        * @return Tx_Extbase_MVC_Controller_Argument
-        * @throws Tx_Extbase_MVC_Exception_NoSuchArgument
+        * @return \TYPO3\CMS\Extbase\Mvc\Controller\Argument
+        * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException
         */
        public function getArgument($argumentName) {
                if (!$this->offsetExists($argumentName)) {
-                       throw new Tx_Extbase_MVC_Exception_NoSuchArgument(('An argument "' . $argumentName) . '" does not exist.', 1195815178);
+                       throw new \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException(('An argument "' . $argumentName) . '" does not exist.', 1195815178);
                }
                return $this->offsetGet($argumentName);
        }
@@ -230,7 +232,7 @@ class Tx_Extbase_MVC_Controller_Arguments extends ArrayObject {
         */
        public function __call($methodName, array $arguments) {
                if (substr($methodName, 0, 3) !== 'set') {
-                       throw new LogicException(('Unknown method "' . $methodName) . '".', 1210858451);
+                       throw new \LogicException(('Unknown method "' . $methodName) . '".', 1210858451);
                }
                $firstLowerCaseArgumentName = $this->translateToLongArgumentName(strtolower($methodName[3]) . substr($methodName, 4));
                $firstUpperCaseArgumentName = $this->translateToLongArgumentName(ucfirst(substr($methodName, 3)));
@@ -280,10 +282,10 @@ class Tx_Extbase_MVC_Controller_Arguments extends ArrayObject {
        /**
         * Get all property mapping / validation errors
         *
-        * @return Tx_Extbase_Error_Result
+        * @return \TYPO3\CMS\Extbase\Error\Result
         */
        public function getValidationResults() {
-               $results = new Tx_Extbase_Error_Result();
+               $results = new \TYPO3\CMS\Extbase\Error\Result();
                foreach ($this as $argument) {
                        $argumentValidationResults = $argument->getValidationResults();
                        if ($argumentValidationResults === NULL) {
@@ -296,4 +298,5 @@ class Tx_Extbase_MVC_Controller_Arguments extends ArrayObject {
 
 }
 
+
 ?>
\ No newline at end of file
diff --git