[TASK][WIP] Move non class code back to source files
authorThomas Maroschik <tmaroschik@dfau.de>
Wed, 17 Oct 2012 19:05:05 +0000 (21:05 +0200)
committerThomas Maroschik <tmaroschik@dfau.de>
Wed, 17 Oct 2012 19:05:05 +0000 (21:05 +0200)
Change-Id: I916ad5a3a24864a52e945aeb66e6f997b8e6fabd

514 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 [new file with mode: 0644]
typo3/sysext/extbase/Classes/Configuration/Exception/ContainerIsLockedException.php
typo3/sysext/extbase/Classes/Configuration/Exception/InvalidConfigurationType.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Configuration/Exception/InvalidConfigurationTypeException.php
typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchFile.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchFileException.php
typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchOption.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchOptionException.php
typo3/sysext/extbase/Classes/Configuration/Exception/ParseError.php [new file with mode: 0644]
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/AmbiguousCommandIdentifier.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/AmbiguousCommandIdentifierException.php
typo3/sysext/extbase/Classes/Mvc/Exception/Command.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/CommandException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InfiniteLoop.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/InfiniteLoopException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidActionName.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidActionNameException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentMixing.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentMixingException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentName.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentNameException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentType.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentTypeException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentValue.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentValueException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidCommandIdentifier.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidCommandIdentifierException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidController.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidControllerException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidControllerName.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidControllerNameException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidExtensionName.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidExtensionNameException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidMarker.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidMarkerException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidOrNoRequestHash.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidOrNoRequestHashException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidRequestMethod.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidRequestMethodException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidRequestType.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidRequestTypeException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidTemplateResource.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidTemplateResourceException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidUriPattern.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidUriPatternException.php
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidViewHelper.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/InvalidViewHelperException.php
typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchAction.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchActionException.php
typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchArgument.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchArgumentException.php
typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchCommand.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchCommandException.php
typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchController.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchControllerException.php
typo3/sysext/extbase/Classes/Mvc/Exception/RequiredArgumentMissing.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/RequiredArgumentMissingException.php
typo3/sysext/extbase/Classes/Mvc/Exception/StopAction.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Mvc/Exception/StopActionException.php
typo3/sysext/extbase/Classes/Mvc/Exception/UnsupportedRequestType.php [new file with mode: 0644]
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/CannotBuildObject.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Object/Exception/CannotBuildObjectException.php
typo3/sysext/extbase/Classes/Object/Exception/CannotReconstituteObject.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Object/Exception/CannotReconstituteObjectException.php
typo3/sysext/extbase/Classes/Object/Exception/InvalidClass.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Object/Exception/InvalidObject.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Object/Exception/InvalidObjectConfiguration.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Object/Exception/ObjectAlreadyRegistered.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Object/Exception/UnknownClass.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Object/Exception/UnknownInterface.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Object/Exception/UnresolvedDependencies.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Object/Exception/WrongScope.php [new file with mode: 0644]
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 [new file with mode: 0644]
typo3/sysext/extbase/Classes/Persistence/Exception/IllegalObjectTypeException.php
typo3/sysext/extbase/Classes/Persistence/Exception/UnknownObject.php [new file with mode: 0644]
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/CleanStateNotMemorized.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/CleanStateNotMemorizedException.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InconsistentQuerySettings.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InconsistentQuerySettingsException.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidClass.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidClassException.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidNumberOfConstraints.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidNumberOfConstraintsException.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidPropertyType.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidPropertyTypeException.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/MissingBackend.php [new file with mode: 0644]
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 [new file with mode: 0644]
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 [new file with mode: 0644]
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedMethodException.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedOrder.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedOrderException.php
typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedRelation.php [new file with mode: 0644]
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/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
typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Exception/SqlError.php
typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php
typo3/sysext/extbase/Classes/Persistence/Generic/Typo3QuerySettings.php
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/InvalidPropertyType.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Reflection/Exception/InvalidPropertyTypeException.php
typo3/sysext/extbase/Classes/Reflection/Exception/PropertyNotAccessibleException.php
typo3/sysext/extbase/Classes/Reflection/Exception/UnknownClass.php [new file with mode: 0644]
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/InvalidArgumentForHashGeneration.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Security/Exception/InvalidArgumentForHashGenerationException.php
typo3/sysext/extbase/Classes/Security/Exception/InvalidArgumentForRequestHashGeneration.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Security/Exception/InvalidArgumentForRequestHashGenerationException.php
typo3/sysext/extbase/Classes/Security/Exception/InvalidHash.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Security/Exception/InvalidHashException.php
typo3/sysext/extbase/Classes/Security/Exception/SyntacticallyWrongRequestHash.php [new file with mode: 0644]
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/Arrays.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Utility/Cache.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Utility/CacheUtility.php
typo3/sysext/extbase/Classes/Utility/ClassLoader.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Utility/ClassLoaderUtility.php
typo3/sysext/extbase/Classes/Utility/Debugger.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php
typo3/sysext/extbase/Classes/Utility/ExtbaseRequirementsCheck.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Utility/ExtbaseRequirementsCheckUtility.php
typo3/sysext/extbase/Classes/Utility/Extension.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Utility/ExtensionUtility.php
typo3/sysext/extbase/Classes/Utility/FrontendSimulator.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Utility/FrontendSimulatorUtility.php
typo3/sysext/extbase/Classes/Utility/Localization.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php
typo3/sysext/extbase/Classes/Utility/TypeHandling.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Utility/TypeHandlingUtility.php
typo3/sysext/extbase/Classes/Utility/TypoScript.php [new file with mode: 0644]
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/InvalidSubject.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Validation/Exception/InvalidSubjectException.php
typo3/sysext/extbase/Classes/Validation/Exception/InvalidValidationConfiguration.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Validation/Exception/InvalidValidationConfigurationException.php
typo3/sysext/extbase/Classes/Validation/Exception/InvalidValidationOptions.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Validation/Exception/InvalidValidationOptionsException.php
typo3/sysext/extbase/Classes/Validation/Exception/NoSuchValidator.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Validation/Exception/NoSuchValidatorException.php
typo3/sysext/extbase/Classes/Validation/Exception/NoValidatorFound.php [new file with mode: 0644]
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 [new file with mode: 0644]
typo3/sysext/extbase/Tests/Fixture/ClassWithSetters.php [new file with mode: 0644]
typo3/sysext/extbase/Tests/Fixture/ClassWithSettersAndConstructor.php [new file with mode: 0644]
typo3/sysext/extbase/Tests/Fixture/DummyClass.php [new file with mode: 0644]
typo3/sysext/extbase/Tests/Fixture/Entity.php [new file with mode: 0644]
typo3/sysext/extbase/Tests/Fixture/SecondDummyClass.php [new file with mode: 0644]
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/Fixtures/ClassWithInjectProperties.php
typo3/sysext/extbase/Tests/Unit/Fixtures/ClassWithSetters.php
typo3/sysext/extbase/Tests/Unit/Fixtures/ClassWithSettersAndConstructor.php
typo3/sysext/extbase/Tests/Unit/Fixtures/DummyClass.php
typo3/sysext/extbase/Tests/Unit/Fixtures/Entity.php
typo3/sysext/extbase/Tests/Unit/Fixtures/SecondDummyClass.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 [new file with mode: 0644]
typo3/sysext/extbase/Tests/Unit/Mvc/Cli/Fixture/Command/MockBCommandController.php [new file with mode: 0644]
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
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
typo3/sysext/extbase/Tests/Unit/Mvc/Fixture/CLI/Command/MockCommandController.php
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
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/NamespaceTestclasses.php
typo3/sysext/extbase/Tests/Unit/Object/Container/Fixtures/NamespacedClass.php [new file with mode: 0644]
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/ArraysTest.php [new file with mode: 0644]
typo3/sysext/extbase/Tests/Unit/Utility/ExtensionTest.php [new file with mode: 0644]
typo3/sysext/extbase/Tests/Unit/Utility/LocalizationTest.php [new file with mode: 0644]
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_emconf.php
typo3/sysext/extbase/ext_localconf.php
typo3/sysext/extbase/ext_tables.php

index f5eaf6e..397b34b 100644 (file)
@@ -1,25 +1,24 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *  All rights reserved
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * A Command Controller which provides help for available commands
  *
@@ -91,12 +90,10 @@ 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('usage: ./cli_dispatch.phpsh extbase <command identifier>');
                $this->outputLine();
                $this->outputLine('The following commands are currently available:');
-
                foreach ($this->commandsByExtensionsAndControllers as $extensionKey => $commandControllers) {
                        $this->outputLine('');
                        $this->outputLine('EXTENSION "%s":', array(strtoupper($extensionKey)));
@@ -105,7 +102,7 @@ class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller
                                foreach ($commands as $command) {
                                        $description = wordwrap($command->getShortDescription(), self::MAXIMUM_LINE_LENGTH - 43, PHP_EOL . str_repeat(' ', 43), TRUE);
                                        $shortCommandIdentifier = $this->commandManager->getShortestIdentifierForCommand($command);
-                                       $this->outputLine('%-2s%-40s %s', array(' ', $shortCommandIdentifier , $description));
+                                       $this->outputLine('%-2s%-40s %s', array(' ', $shortCommandIdentifier, $description));
                                }
                                $this->outputLine();
                        }
@@ -124,10 +121,8 @@ class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller
                $this->outputLine();
                $this->outputLine($command->getShortDescription());
                $this->outputLine();
-
                $this->outputLine('COMMAND:');
                $this->outputLine('%-2s%s', array(' ', $command->getCommandIdentifier()));
-
                $commandArgumentDefinitions = $command->getArgumentDefinitions();
                $usage = '';
                $hasOptions = FALSE;
@@ -138,16 +133,12 @@ class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller
                                $usage .= sprintf(' <%s>', strtolower(preg_replace('/([A-Z])/', ' $1', $commandArgumentDefinition->getName())));
                        }
                }
-
-               $usage = './cli_dispatch.phpsh extbase ' . $this->commandManager->getShortestIdentifierForCommand($command) . ($hasOptions ? ' [<options>]' : '') . $usage;
-
+               $usage = (('./cli_dispatch.phpsh extbase ' . $this->commandManager->getShortestIdentifierForCommand($command)) . ($hasOptions ? ' [<options>]' : '')) . $usage;
                $this->outputLine();
                $this->outputLine('USAGE:');
                $this->outputLine('  ' . $usage);
-
                $argumentDescriptions = array();
                $optionDescriptions = array();
-
                if ($command->hasArguments()) {
                        foreach ($commandArgumentDefinitions as $commandArgumentDefinition) {
                                $argumentDescription = $commandArgumentDefinition->getDescription();
@@ -159,7 +150,6 @@ class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller
                                }
                        }
                }
-
                if (count($argumentDescriptions) > 0) {
                        $this->outputLine();
                        $this->outputLine('ARGUMENTS:');
@@ -167,7 +157,6 @@ class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller
                                $this->outputLine($argumentDescription);
                        }
                }
-
                if (count($optionDescriptions) > 0) {
                        $this->outputLine();
                        $this->outputLine('OPTIONS:');
@@ -175,7 +164,6 @@ class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller
                                $this->outputLine($optionDescription);
                        }
                }
-
                if ($command->getDescription() !== '') {
                        $this->outputLine();
                        $this->outputLine('DESCRIPTION:');
@@ -184,7 +172,6 @@ class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller
                                $this->outputLine('%-2s%s', array(' ', $descriptionLine));
                        }
                }
-
                $relatedCommandIdentifiers = $command->getRelatedCommandIdentifiers();
                if ($relatedCommandIdentifiers !== array()) {
                        $this->outputLine();
@@ -194,7 +181,6 @@ class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller
                                $this->outputLine('%-2s%s (%s)', array(' ', $commandIdentifier, $command->getShortDescription()));
                        }
                }
-
                $this->outputLine();
        }
 
@@ -240,5 +226,7 @@ class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller
                        $this->commandsByExtensionsAndControllers[$extensionKey][$commandControllerClassName][$commandName] = $command;
                }
        }
+
 }
+
 ?>
\ No newline at end of file
index 7111cae..b7b10e3 100755 (executable)
@@ -1,27 +1,26 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *
+ *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
+ *  All rights reserved
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * Abstract base class for a general purpose configuration manager
  *
@@ -35,9 +34,9 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
         * Default backend storage PID
         */
        const DEFAULT_BACKEND_STORAGE_PID = 0;
-
        /**
         * Storage of the raw TypoScript configuration
+        *
         * @var array
         */
        protected $configuration = array();
@@ -59,12 +58,14 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
 
        /**
         * name of the extension this Configuration Manager instance belongs to
+        *
         * @var string
         */
        protected $extensionName;
 
        /**
         * name of the plugin this Configuration Manager instance belongs to
+        *
         * @var string
         */
        protected $pluginName;
@@ -107,7 +108,6 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
                if ($this->contentObject !== NULL) {
                        return $this->contentObject;
                }
-
                return NULL;
        }
 
@@ -121,7 +121,6 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
        public function setConfiguration(array $configuration = array()) {
                // reset 1st level cache
                $this->configurationCache = array();
-
                $this->extensionName = isset($configuration['extensionName']) ? $configuration['extensionName'] : NULL;
                $this->pluginName = isset($configuration['pluginName']) ? $configuration['pluginName'] : NULL;
                $this->configuration = $this->typoScriptService->convertTypoScriptArrayToPlainArray($configuration);
@@ -139,18 +138,16 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
         */
        public function getConfiguration($extensionName = NULL, $pluginName = NULL) {
                // 1st level cache
-               $configurationCacheKey = strtolower(($extensionName ?: $this->extensionName) . '_' . ($pluginName ?: $this->pluginName));
+               $configurationCacheKey = strtolower((($extensionName ?: $this->extensionName) . '_') . ($pluginName ?: $this->pluginName));
                if (isset($this->configurationCache[$configurationCacheKey])) {
                        return $this->configurationCache[$configurationCacheKey];
                }
-
                $frameworkConfiguration = $this->getExtbaseConfiguration();
                if (!isset($frameworkConfiguration['persistence']['storagePid'])) {
                        $frameworkConfiguration['persistence']['storagePid'] = $this->getDefaultBackendStoragePid();
                }
-
                // only merge $this->configuration and override switchableControllerActions when retrieving configuration of the current plugin
-               if ($extensionName === NULL || ($extensionName === $this->extensionName && $pluginName === $this->pluginName)) {
+               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['controllerConfiguration'] = $this->getSwitchableControllerActions($this->extensionName, $this->pluginName);
@@ -162,19 +159,14 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
                        $pluginConfiguration['controllerConfiguration'] = $this->getSwitchableControllerActions($extensionName, $pluginName);
                }
                $frameworkConfiguration = t3lib_div::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)) {
+               if ($extensionName === NULL || $extensionName === $this->extensionName && $pluginName === $this->pluginName) {
                        $frameworkConfiguration = $this->getContextSpecificFrameworkConfiguration($frameworkConfiguration);
                }
-
-               if (!empty($frameworkConfiguration['persistence']['storagePid']) &&
-                       is_array($frameworkConfiguration['persistence']['storagePid'])) {
-                               /**
-                                * We simulate the frontend to enable the use of cObjects in
-                                * stdWrap. Than we convert the configuration to normal TypoScript
-                                * and apply the stdWrap to the storagePid
-                                */
+               if (!empty($frameworkConfiguration['persistence']['storagePid']) && is_array($frameworkConfiguration['persistence']['storagePid'])) {
+                       /** We simulate the frontend to enable the use of cObjects in
+                       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());
                        }
@@ -184,7 +176,6 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
                                Tx_Extbase_Utility_FrontendSimulator::resetFrontendEnvironment();
                        }
                }
-
                // 1st level cache
                $this->configurationCache[$configurationCacheKey] = $frameworkConfiguration;
                return $frameworkConfiguration;
@@ -216,7 +207,6 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
        /**
         * @param array &$frameworkConfiguration
         * @param array $switchableControllerActions
-        *        in the format array('Controller1' => array('action1', 'action2'), 'Controller2' => ...)
         * @return void
         */
        protected function overrideSwitchableControllerActions(array &$frameworkConfiguration, array $switchableControllerActions) {
@@ -227,13 +217,11 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
                        }
                        $overriddenSwitchableControllerActions[$controllerName] = array('actions' => $actions);
                        $nonCacheableActions = $frameworkConfiguration['controllerConfiguration'][$controllerName]['nonCacheableActions'];
-
                        if (!is_array($nonCacheableActions)) {
                                // There are no non-cacheable actions, thus we can directly continue
                                // with the next controller name.
                                continue;
                        }
-
                        $overriddenNonCacheableActions = array_intersect($nonCacheableActions, $actions);
                        if (!empty($overriddenNonCacheableActions)) {
                                $overriddenSwitchableControllerActions[$controllerName]['nonCacheableActions'] = $overriddenNonCacheableActions;
@@ -275,8 +263,8 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
        /**
         * Returns the configured controller/action pairs of the specified plugin/module in the format
         * array(
-        *  'Controller1' => array('action1', 'action2'),
-        *  'Controller2' => array('action3', 'action4')
+        * 'Controller1' => array('action1', 'action2'),
+        * 'Controller2' => array('action3', 'action4')
         * )
         *
         * @param string $extensionName
@@ -284,5 +272,7 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
         * @return array
         */
        abstract protected function getSwitchableControllerActions($extensionName, $pluginName);
+
 }
+
 ?>
\ No newline at end of file
index 3feb8f9..6894638 100644 (file)
@@ -1,27 +1,26 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *
+ *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
+ *  All rights reserved
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * A general purpose configuration manager used in backend mode.
  *
@@ -44,21 +43,19 @@ class Tx_Extbase_Configuration_BackendConfigurationManager extends Tx_Extbase_Co
        public function getTypoScriptSetup() {
                if ($this->typoScriptSetupCache === NULL) {
                        $template = t3lib_div::makeInstance('t3lib_TStemplate');
-                               // do not log time-performance information
+                       // do not log time-performance information
                        $template->tt_track = 0;
                        $template->init();
-
-                               // Get the root line
+                       // Get the root line
                        $rootline = array();
                        $pageId = $this->getCurrentPageId();
                        if ($pageId > 0) {
                                /** @var $sysPage t3lib_pageSelect */
                                $sysPage = t3lib_div::makeInstance('t3lib_pageSelect');
-                                       // Get the rootline for the current page
+                               // Get the rootline for the current page
                                $rootline = $sysPage->getRootLine($this->getCurrentPageId(), '', TRUE);
                        }
-
-                               // This generates the constants/config + hierarchy info for the template.
+                       // This generates the constants/config + hierarchy info for the template.
                        $template->runThroughTemplates($rootline, 0);
                        $template->generateConfig();
                        $this->typoScriptSetupCache = $template->setup;
@@ -77,25 +74,23 @@ class Tx_Extbase_Configuration_BackendConfigurationManager extends Tx_Extbase_Co
        protected function getPluginConfiguration($extensionName, $pluginName = NULL) {
                $setup = $this->getTypoScriptSetup();
                $pluginConfiguration = array();
-               if (is_array($setup['module.']['tx_' . strtolower($extensionName) . '.'])) {
-                       $pluginConfiguration = $this->typoScriptService->convertTypoScriptArrayToPlainArray($setup['module.']['tx_' . strtolower($extensionName) . '.']);
+               if (is_array($setup['module.'][('tx_' . strtolower($extensionName)) . '.'])) {
+                       $pluginConfiguration = $this->typoScriptService->convertTypoScriptArrayToPlainArray($setup['module.'][('tx_' . strtolower($extensionName)) . '.']);
                }
-
                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 . '.']));
+                       $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) . '.']));
                        }
                }
-
                return $pluginConfiguration;
        }
 
        /**
         * Returns the configured controller/action pairs of the specified module in the format
         * array(
-        *  'Controller1' => array('action1', 'action2'),
-        *  'Controller2' => array('action3', 'action4')
+        * 'Controller1' => array('action1', 'action2'),
+        * 'Controller2' => array('action3', 'action4')
         * )
         *
         * @param string $extensionName
@@ -117,24 +112,21 @@ 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 = (integer)t3lib_div::_GP('id');
+               $pageId = (intt3lib_div::_GP('id');
                if ($pageId > 0) {
                        return $pageId;
                }
-
-                       // get current site root
+               // get current site root
                $rootPages = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('uid', 'pages', 'deleted=0 AND hidden=0 AND is_siteroot=1', '', '', '1');
                if (count($rootPages) > 0) {
                        return $rootPages[0]['uid'];
                }
-
-                       // get root template
+               // get root template
                $rootTemplates = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('pid', 'sys_template', 'deleted=0 AND hidden=0 AND root=1', '', '', '1');
                if (count($rootTemplates) > 0) {
                        return $rootTemplates[0]['pid'];
                }
-
-                       // fallback
+               // fallback
                return self::DEFAULT_BACKEND_STORAGE_PID;
        }
 
@@ -164,5 +156,7 @@ class Tx_Extbase_Configuration_BackendConfigurationManager extends Tx_Extbase_Co
                }
                return $frameworkConfiguration;
        }
+
 }
+
 ?>
\ No newline at end of file
index 6e4e8eb..4c29d14 100644 (file)
@@ -21,7 +21,6 @@
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-
 /**
  * A configuration manager following the strategy pattern (GoF315). It hides the concrete
  * implementation of the configuration manager and provides an unified acccess point.
@@ -41,7 +40,7 @@ class Tx_Extbase_Configuration_ConfigurationManager implements Tx_Extbase_Config
 
        /**
         * @var Tx_Extbase_Configuration_AbstractConfigurationManager
-        **/
+        */
        protected $concreteConfigurationManager;
 
        /**
@@ -103,15 +102,15 @@ class Tx_Extbase_Configuration_ConfigurationManager implements Tx_Extbase_Config
         */
        public function getConfiguration($configurationType, $extensionName = NULL, $pluginName = NULL) {
                switch ($configurationType) {
-                       case self::CONFIGURATION_TYPE_SETTINGS :
-                               $configuration = $this->concreteConfigurationManager->getConfiguration($extensionName, $pluginName);
-                               return $configuration['settings'];
-                       case self::CONFIGURATION_TYPE_FRAMEWORK :
-                               return $this->concreteConfigurationManager->getConfiguration($extensionName, $pluginName);
-                       case self::CONFIGURATION_TYPE_FULL_TYPOSCRIPT :
-                               return $this->concreteConfigurationManager->getTypoScriptSetup();
-                       default :
-                               throw new Tx_Extbase_Configuration_Exception_InvalidConfigurationType('Invalid configuration type "' . $configurationType . '"', 1206031879);
+               case self::CONFIGURATION_TYPE_SETTINGS:
+                       $configuration = $this->concreteConfigurationManager->getConfiguration($extensionName, $pluginName);
+                       return $configuration['settings'];
+               case self::CONFIGURATION_TYPE_FRAMEWORK:
+                       return $this->concreteConfigurationManager->getConfiguration($extensionName, $pluginName);
+               case self::CONFIGURATION_TYPE_FULL_TYPOSCRIPT:
+                       return $this->concreteConfigurationManager->getTypoScriptSetup();
+               default:
+                       throw new Tx_Extbase_Configuration_Exception_InvalidConfigurationType(('Invalid configuration type "' . $configurationType) . '"', 1206031879);
                }
        }
 
@@ -127,8 +126,9 @@ class Tx_Extbase_Configuration_ConfigurationManager implements Tx_Extbase_Config
         */
        public function isFeatureEnabled($featureName) {
                $configuration = $this->getConfiguration(self::CONFIGURATION_TYPE_FRAMEWORK);
-               return (boolean)(isset($configuration['features'][$featureName]) && $configuration['features'][$featureName]);
+               return (bool(isset($configuration['features'][$featureName]) && $configuration['features'][$featureName]);
        }
 
 }
+
 ?>
\ No newline at end of file
index 4aeab65..71201b9 100644 (file)
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-
 /**
- *
- *
  * @package Extbase
  * @subpackage Configuration
  * @version $ID:$
  */
-interface Tx_Extbase_Configuration_ConfigurationManagerInterface extends t3lib_Singleton {
-
+interface Tx_Extbase_Configuration_ConfigurationManagerInterface extends t3lib_Singleton
+{
        const CONFIGURATION_TYPE_FRAMEWORK = 'Framework';
        const CONFIGURATION_TYPE_SETTINGS = 'Settings';
        const CONFIGURATION_TYPE_FULL_TYPOSCRIPT = 'FullTypoScript';
-
        /**
         * @param tslib_cObj $contentObject
         * @return void
index da4529e..0cf476a 100644 (file)
@@ -1,30 +1,29 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
-*  All rights reserved
-*
-*  This class is a backport of the corresponding class of FLOW3.
-*  All credits go to the v5 team.
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *
+ *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
+ *  All rights reserved
+ *
+ *  This class is a backport of the corresponding class of FLOW3.
+ *  All credits go to the v5 team.
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * A generic Configuration Exception
  *
@@ -34,6 +33,7 @@
  */
 class Tx_Extbase_Configuration_Exception extends Tx_Extbase_Exception {
 
+
 }
 
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/extbase/Classes/Configuration/Exception/ContainerIsLocked.php b/typo3/sysext/extbase/Classes/Configuration/Exception/ContainerIsLocked.php
new file mode 100644 (file)
index 0000000..5468b67
--- /dev/null
@@ -0,0 +1,8 @@
+<?php
+/*
+ * @deprecated since 6.0, the classname Tx_Extbase_Configuration_Exception_ContainerIsLocked and this file is obsolete
+ * 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';
+?>
\ No newline at end of file
index bbb19b4..4d004e1 100644 (file)
@@ -1,34 +1,32 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
-*  All rights reserved
-*
-*  This class is a backport of the corresponding class of FLOW3.
-*  All credits go to the v5 team.
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *
+ *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
+ *  All rights reserved
+ *
+ *  This class is a backport of the corresponding class of FLOW3.
+ *  All credits go to the v5 team.
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * @version $Id$
  */
-
 /**
  * A Container Is Locked exception
  *
@@ -38,6 +36,7 @@
  */
 class Tx_Extbase_Configuration_Exception_ContainerIsLocked extends Tx_Extbase_Configuration_Exception {
 
+
 }
 
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/extbase/Classes/Configuration/Exception/InvalidConfigurationType.php b/typo3/sysext/extbase/Classes/Configuration/Exception/InvalidConfigurationType.php
new file mode 100644 (file)
index 0000000..d219c1a
--- /dev/null
@@ -0,0 +1,8 @@
+<?php
+/*
+ * @deprecated since 6.0, the classname Tx_Extbase_Configuration_Exception_InvalidConfigurationType and this file is obsolete
+ * 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';
+?>
\ No newline at end of file
index ad6eb0a..2e98305 100644 (file)
@@ -1,34 +1,32 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
-*  All rights reserved
-*
-*  This class is a backport of the corresponding class of FLOW3.
-*  All credits go to the v5 team.
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *
+ *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
+ *  All rights reserved
+ *
+ *  This class is a backport of the corresponding class of FLOW3.
+ *  All credits go to the v5 team.
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * @version $Id$
  */
-
 /**
  * An Invalid Configuration Type Exception
  *
@@ -38,6 +36,7 @@
  */
 class Tx_Extbase_Configuration_Exception_InvalidConfigurationType extends Tx_Extbase_Configuration_Exception {
 
+
 }
 
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchFile.php b/typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchFile.php
new file mode 100644 (file)
index 0000000..4d89e6f
--- /dev/null
@@ -0,0 +1,8 @@
+<?php
+/*
+ * @deprecated since 6.0, the classname Tx_Extbase_Configuration_Exception_NoSuchFile and this file is obsolete
+ * 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';
+?>
\ No newline at end of file
index 200de25..a677b43 100644 (file)
@@ -1,34 +1,32 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
-*  All rights reserved
-*
-*  This class is a backport of the corresponding class of FLOW3.
-*  All credits go to the v5 team.
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *
+ *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
+ *  All rights reserved
+ *
+ *  This class is a backport of the corresponding class of FLOW3.
+ *  All credits go to the v5 team.
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * @version $Id$
  */
-
 /**
  * A No Such File exception
  *
@@ -38,6 +36,7 @@
  */
 class Tx_Extbase_Configuration_Exception_NoSuchFile extends Tx_Extbase_Configuration_Exception {
 
+
 }
 
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchOption.php b/typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchOption.php
new file mode 100644 (file)
index 0000000..42307e5
--- /dev/null
@@ -0,0 +1,8 @@
+<?php
+/*
+ * @deprecated since 6.0, the classname Tx_Extbase_Configuration_Exception_NoSuchOption and this file is obsolete
+ * 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';
+?>
\ No newline at end of file
index a5f1a07..ee1a758 100644 (file)
@@ -1,34 +1,32 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
-*  All rights reserved
-*
-*  This class is a backport of the corresponding class of FLOW3.
-*  All credits go to the v5 team.
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *
+ *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
+ *  All rights reserved
+ *
+ *  This class is a backport of the corresponding class of FLOW3.
+ *  All credits go to the v5 team.
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * @version $Id$
  */
-
 /**
  * A No Such Option exception
  *
@@ -38,6 +36,7 @@
  */
 class Tx_Extbase_Configuration_Exception_NoSuchOption extends Tx_Extbase_Configuration_Exception {
 
+
 }
 
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/extbase/Classes/Configuration/Exception/ParseError.php b/typo3/sysext/extbase/Classes/Configuration/Exception/ParseError.php
new file mode 100644 (file)
index 0000000..b0b13c2
--- /dev/null
@@ -0,0 +1,8 @@
+<?php
+/*
+ * @deprecated since 6.0, the classname Tx_Extbase_Configuration_Exception_ParseError and this file is obsolete
+ * 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';
+?>
\ No newline at end of file
index f59e950..5787c1f 100644 (file)
@@ -1,34 +1,32 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
-*  All rights reserved
-*
-*  This class is a backport of the corresponding class of FLOW3.
-*  All credits go to the v5 team.
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *
+ *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
+ *  All rights reserved
+ *
+ *  This class is a backport of the corresponding class of FLOW3.
+ *  All credits go to the v5 team.
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * @version $Id$
  */
-
 /**
  * A Parse Error exception
  *
@@ -38,6 +36,7 @@
  */
 class Tx_Extbase_Configuration_Exception_ParseError extends Tx_Extbase_Configuration_Exception {
 
+
 }
 
 ?>
\ No newline at end of file
index 9cd1ff0..6fff4a6 100644 (file)
@@ -1,27 +1,26 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *
+ *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
+ *  All rights reserved
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * A general purpose configuration manager used in frontend mode.
  *
@@ -46,7 +45,6 @@ class Tx_Extbase_Configuration_FrontendConfigurationManager extends Tx_Extbase_C
                $this->flexFormService = $flexFormService;
        }
 
-
        /**
         * Returns TypoScript Setup array from current Environment.
         *
@@ -67,25 +65,23 @@ class Tx_Extbase_Configuration_FrontendConfigurationManager extends Tx_Extbase_C
        protected function getPluginConfiguration($extensionName, $pluginName = NULL) {
                $setup = $this->getTypoScriptSetup();
                $pluginConfiguration = array();
-               if (is_array($setup['plugin.']['tx_' . strtolower($extensionName) . '.'])) {
-                       $pluginConfiguration = $this->typoScriptService->convertTypoScriptArrayToPlainArray($setup['plugin.']['tx_' . strtolower($extensionName) . '.']);
+               if (is_array($setup['plugin.'][('tx_' . strtolower($extensionName)) . '.'])) {
+                       $pluginConfiguration = $this->typoScriptService->convertTypoScriptArrayToPlainArray($setup['plugin.'][('tx_' . strtolower($extensionName)) . '.']);
                }
-
                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 . '.']));
+                       $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) . '.']));
                        }
                }
-
                return $pluginConfiguration;
        }
 
        /**
         * Returns the configured controller/action pairs of the specified plugin in the format
         * array(
-        *  'Controller1' => array('action1', 'action2'),
-        *  'Controller2' => array('action3', 'action4')
+        * 'Controller1' => array('action1', 'action2'),
+        * 'Controller2' => array('action3', 'action4')
         * )
         *
         * @param string $extensionName
@@ -112,7 +108,6 @@ class Tx_Extbase_Configuration_FrontendConfigurationManager extends Tx_Extbase_C
                $frameworkConfiguration = $this->overrideStoragePidIfStartingPointIsSet($frameworkConfiguration);
                $frameworkConfiguration = $this->overrideConfigurationFromPlugin($frameworkConfiguration);
                $frameworkConfiguration = $this->overrideConfigurationFromFlexForm($frameworkConfiguration);
-
                return $frameworkConfiguration;
        }
 
@@ -129,12 +124,12 @@ class Tx_Extbase_Configuration_FrontendConfigurationManager extends Tx_Extbase_C
                        $list = array();
                        if ($this->contentObject->data['recursive'] > 0) {
                                $explodedPages = t3lib_div::trimExplode(',', $pages);
-                               foreach($explodedPages as $pid) {
+                               foreach ($explodedPages as $pid) {
                                        $list[] = trim($this->contentObject->getTreeList($pid, $this->contentObject->data['recursive']), ',');
                                }
                        }
                        if (count($list) > 0) {
-                               $pages = $pages . ',' . implode(',', $list);
+                               $pages = ($pages . ',') . implode(',', $list);
                        }
                        $frameworkConfiguration = t3lib_div::array_merge_recursive_overrule($frameworkConfiguration, array(
                                'persistence' => array(
@@ -153,8 +148,8 @@ class Tx_Extbase_Configuration_FrontendConfigurationManager extends Tx_Extbase_C
         */
        protected function overrideConfigurationFromPlugin(array $frameworkConfiguration) {
                $setup = $this->getTypoScriptSetup();
-               $pluginSignature = strtolower($frameworkConfiguration['extensionName'] . '_' . $frameworkConfiguration['pluginName']);
-               $pluginConfiguration = $setup['plugin.']['tx_' . $pluginSignature . '.'];
+               $pluginSignature = strtolower(($frameworkConfiguration['extensionName'] . '_') . $frameworkConfiguration['pluginName']);
+               $pluginConfiguration = $setup['plugin.'][('tx_' . $pluginSignature) . '.'];
                if (is_array($pluginConfiguration)) {
                        $pluginConfiguration = $this->typoScriptService->convertTypoScriptArrayToPlainArray($pluginConfiguration);
                        $frameworkConfiguration = $this->mergeConfigurationIntoFrameworkConfiguration($frameworkConfiguration, $pluginConfiguration, 'settings');
@@ -174,11 +169,9 @@ class Tx_Extbase_Configuration_FrontendConfigurationManager extends Tx_Extbase_C
        protected function overrideConfigurationFromFlexForm(array $frameworkConfiguration) {
                if (strlen($this->contentObject->data['pi_flexform']) > 0) {
                        $flexFormConfiguration = $this->flexFormService->convertFlexFormContentToArray($this->contentObject->data['pi_flexform']);
-
                        $frameworkConfiguration = $this->mergeConfigurationIntoFrameworkConfiguration($frameworkConfiguration, $flexFormConfiguration, 'settings');
                        $frameworkConfiguration = $this->mergeConfigurationIntoFrameworkConfiguration($frameworkConfiguration, $flexFormConfiguration, 'persistence');
                        $frameworkConfiguration = $this->mergeConfigurationIntoFrameworkConfiguration($frameworkConfiguration, $flexFormConfiguration, 'view');
-
                        $frameworkConfiguration = $this->overrideSwitchableControllerActionsFromFlexForm($frameworkConfiguration, $flexFormConfiguration);
                }
                return $frameworkConfiguration;
@@ -239,11 +232,9 @@ class Tx_Extbase_Configuration_FrontendConfigurationManager extends Tx_Extbase_C
                if (!isset($flexFormConfiguration['switchableControllerActions']) || is_array($flexFormConfiguration['switchableControllerActions'])) {
                        return $frameworkConfiguration;
                }
-
-                       // 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"
+               // 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);
-
                $newSwitchableControllerActionsFromFlexForm = array();
                foreach ($switchableControllerActionPartsFromFlexForm as $switchableControllerActionPartFromFlexForm) {
                        list($controller, $action) = t3lib_div::trimExplode('->', $switchableControllerActionPartFromFlexForm);
@@ -257,5 +248,7 @@ class Tx_Extbase_Configuration_FrontendConfigurationManager extends Tx_Extbase_C
                }
                return $frameworkConfiguration;
        }
+
 }
+
 ?>
\ No newline at end of file
index 7c188f6..a79e38a 100644 (file)
@@ -1,27 +1,26 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2010 Jochen Rau <jochen.rau@typoplanet.de>
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *
+ *  (c) 2010 Jochen Rau <jochen.rau@typoplanet.de>
+ *  All rights reserved
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * Creates a request an dispatches it to the controller which was specified
  * by TS Setup, flexForm and returns the content to the v4 framework.
@@ -43,6 +42,7 @@ class Tx_Extbase_Core_Bootstrap implements Tx_Extbase_Core_BootstrapInterface {
 
        /**
         * The application context
+        *
         * @var string
         */
        protected $context;
@@ -176,7 +176,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'); // singleton
+               $this->persistenceManager = $this->objectManager->get('Tx_Extbase_Persistence_Manager');
        }
 
        /**
@@ -190,8 +190,7 @@ class Tx_Extbase_Core_Bootstrap implements Tx_Extbase_Core_BootstrapInterface {
         */
        public function run($content, $configuration) {
                $this->initialize($configuration);
-
-                       // CLI
+               // CLI
                if (defined('TYPO3_cliMode') && TYPO3_cliMode === TRUE) {
                        $content = $this->handleCommandLineRequest();
                } else {
@@ -205,15 +204,12 @@ 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');
                $extensionName = $request->getControllerExtensionName();
                $this->configurationManager->setConfiguration(array('extensionName' => $extensionName));
                $this->objectManager->get('Tx_Extbase_MVC_Dispatcher')->dispatch($request, $response);
-
                $content = $response->getContent();
-
                $this->resetSingletons();
                return $content;
        }
@@ -224,9 +220,7 @@ class Tx_Extbase_Core_Bootstrap implements Tx_Extbase_Core_BootstrapInterface {
        protected function handleWebRequest() {
                $requestHandlerResolver = $this->objectManager->get('Tx_Extbase_MVC_RequestHandlerResolver');
                $requestHandler = $requestHandlerResolver->resolveRequestHandler();
-
                $response = $requestHandler->handleRequest();
-
                // If response is NULL after handling the request we need to stop
                // This happens for instance, when a USER object was converted to a USER_INT
                // @see Tx_Extbase_MVC_Web_FrontendRequestHandler::handleRequest()
@@ -239,7 +233,6 @@ class Tx_Extbase_Core_Bootstrap implements Tx_Extbase_Core_BootstrapInterface {
                }
                $response->sendHeaders();
                $content = $response->getContent();
-
                $this->resetSingletons();
                return $content;
        }
@@ -254,45 +247,42 @@ class Tx_Extbase_Core_Bootstrap implements Tx_Extbase_Core_BootstrapInterface {
                $this->reflectionService->shutdown();
        }
 
-        /**
-         * This method forwards the call to run(). This method is invoked by the mod.php
-         * function of TYPO3.
-         *
-         * @param string $moduleSignature
-         * @return boolean TRUE, if the request request could be dispatched
-         * @see run()
-         **/
+       /**
+        * This method forwards the call to run(). This method is invoked by the mod.php
+        * function of TYPO3.
+        *
+        * @param string $moduleSignature
+        * @return boolean TRUE, if the request request could be dispatched
+        * @see run()
+        */
        public function callModule($moduleSignature) {
                if (!isset($GLOBALS['TBE_MODULES']['_configuration'][$moduleSignature])) {
                        return FALSE;
                }
                $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')) {
                        // Check page access
                        $permClause = $GLOBALS['BE_USER']->getPagePermsClause(TRUE);
-                       $access = is_array(t3lib_BEfunc::readPageAccess((integer)t3lib_div::_GP('id'), $permClause));
+                       $access = is_array(t3lib_BEfunc::readPageAccess((intt3lib_div::_GP('id'), $permClause));
                        if (!$access) {
                                throw new RuntimeException('You don\'t have access to this page', 1289917924);
                        }
                }
-
                // BACK_PATH is the path from the typo3/ directory from within the
                // directory containing the controller file. We are using mod.php dispatcher
                // and thus we are already within typo3/ because we call typo3/mod.php
                $GLOBALS['BACK_PATH'] = '';
-
                $configuration = array(
                        'extensionName' => $moduleConfiguration['extensionName'],
                        'pluginName' => $moduleSignature
                );
                $content = $this->run('', $configuration);
-
                print $content;
                return TRUE;
        }
 
 }
-?>
+
+?>
\ No newline at end of file
index 8512999..6ee93c1 100644 (file)
  *                                                                        *
  * The TYPO3 project - inspiring people to share!                         *
  *                                                                        */
-
 /**
  * Bootstrap Interface
  *
  * @package Extbase
  */
-interface Tx_Extbase_Core_BootstrapInterface {
-
+interface Tx_Extbase_Core_BootstrapInterface
+{
        /**
         * Runs the the Extbase Framework by resolving an appropriate Request Handler and passing control to it.
         * If the Framework is not initialized yet, it will be initialized.
@@ -30,14 +29,15 @@ interface Tx_Extbase_Core_BootstrapInterface {
         */
        public function run($content, $configuration);
 
-        /**
-         * This method forwards the call to run(). This method is invoked by the mod.php
-         * function of TYPO3.
-         *
-         * @param string $moduleSignature
-         * @return boolean TRUE, if the request request could be dispatched
-         * @see run()
-         **/
+       /**
+        * This method forwards the call to run(). This method is invoked by the mod.php
+        * function of TYPO3.
+        *
+        * @param string $moduleSignature
+        * @return boolean TRUE, if the request request could be dispatched
+        * @see run()
+        */
        public function callModule($moduleSignature);
+
 }
 ?>
\ No newline at end of file
index bd2d801..312d92f 100644 (file)
@@ -21,7 +21,6 @@
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-
 /**
  * A file object (File Abstraction Layer)
  *
@@ -32,6 +31,7 @@
  * @api experimental! This class is experimental and subject to change!
  */
 abstract class Tx_Extbase_Domain_Model_AbstractFileCollection extends Tx_Extbase_DomainObject_AbstractEntity {
+
        /**
         * @var t3lib_file_Collection_AbstractFileCollection
         */
@@ -50,5 +50,7 @@ abstract class Tx_Extbase_Domain_Model_AbstractFileCollection extends Tx_Extbase
        public function getObject() {
                return $this->object;
        }
+
 }
+
 ?>
\ No newline at end of file
index 76dcbab..5537794 100644 (file)
@@ -21,7 +21,6 @@
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-
 /**
  * A file object (File Abstraction Layer)
  *
@@ -32,6 +31,7 @@
  * @api experimental! This class is experimental and subject to change!
  */
 abstract class Tx_Extbase_Domain_Model_AbstractFileFolder extends Tx_Extbase_DomainObject_AbstractEntity {
+
        /**
         * @var t3lib_file_ResourceInterface|t3lib_file_Folder|t3lib_file_AbstractFile
         */
@@ -50,5 +50,7 @@ abstract class Tx_Extbase_Domain_Model_AbstractFileFolder extends Tx_Extbase_Dom
        public function getObject() {
                return $this->object;
        }
+
 }
+
 ?>
\ No newline at end of file
index 8d36dd9..865baf2 100644 (file)
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-
 /**
  * This model represents a back-end user.
  *
  * @author Felix Kopp <felix-source@phorax.com>
  * @author Oliver Klee <typo3-coding@oliverklee.de>
- *
  * @package Extbase
  * @subpackage Domain\Model
- *
  * @scope prototype
  * @entity
  * @api
@@ -98,7 +95,6 @@ class Tx_Extbase_Domain_Model_BackendUser extends Tx_Extbase_DomainObject_Abstra
         * Sets the user name.
         *
         * @param string $userName the user name to set, must not be empty
-        *
         * @return void
         */
        public function setUserName($userName) {
@@ -118,7 +114,6 @@ class Tx_Extbase_Domain_Model_BackendUser extends Tx_Extbase_DomainObject_Abstra
         * Sets whether this user should be an administrator.
         *
         * @param boolean $isAdministrator whether this user should be an administrator
-        *
         * @return void
         */
        public function setIsAdministrator($isAdministrator) {
@@ -138,7 +133,6 @@ class Tx_Extbase_Domain_Model_BackendUser extends Tx_Extbase_DomainObject_Abstra
         * Sets whether this user is disabled.
         *
         * @param boolean $isDisabled whether this user is disabled
-        *
         * @return void
         */
        public function setIsDisabled($isDisabled) {
@@ -158,7 +152,6 @@ class Tx_Extbase_Domain_Model_BackendUser extends Tx_Extbase_DomainObject_Abstra
         * Sets the point in time from which this user is enabled.
         *
         * @param \DateTime|NULL $dateAndTime the start date and time
-        *
         * @return void
         */
        public function setStartDateAndTime(\DateTime $dateAndTime = NULL) {
@@ -178,7 +171,6 @@ class Tx_Extbase_Domain_Model_BackendUser extends Tx_Extbase_DomainObject_Abstra
         * Sets the point in time before which this user is enabled.
         *
         * @param \DateTime|NULL $dateAndTime the end date and time
-        *
         * @return void
         */
        public function setEndDateAndTime(\DateTime $dateAndTime = NULL) {
@@ -198,7 +190,6 @@ class Tx_Extbase_Domain_Model_BackendUser extends Tx_Extbase_DomainObject_Abstra
         * Sets the e-mail address of this user.
         *
         * @param string $email the e-mail address, may be empty
-        *
         * @return void
         */
        public function setEmail($email) {
@@ -231,7 +222,7 @@ class Tx_Extbase_Domain_Model_BackendUser extends Tx_Extbase_DomainObject_Abstra
         * @return boolean whether this user is currently activated
         */
        public function isActivated() {
-               return !$this->getIsDisabled() && $this->isActivatedViaStartDateAndTime() && $this->isActivatedViaEndDateAndTime();
+               return (!$this->getIsDisabled() && $this->isActivatedViaStartDateAndTime()) && $this->isActivatedViaEndDateAndTime();
        }
 
        /**
@@ -243,10 +234,8 @@ class Tx_Extbase_Domain_Model_BackendUser extends Tx_Extbase_DomainObject_Abstra
                if ($this->getStartDateAndTime() === NULL) {
                        return TRUE;
                }
-
                $now = new \DateTime('now');
-
-               return ($this->getStartDateAndTime() <= $now);
+               return $this->getStartDateAndTime() <= $now;
        }
 
        /**
@@ -258,17 +247,14 @@ class Tx_Extbase_Domain_Model_BackendUser extends Tx_Extbase_DomainObject_Abstra
                if ($this->getEndDateAndTime() === NULL) {
                        return TRUE;
                }
-
                $now = new \DateTime('now');
-
-               return ($now <= $this->getEndDateAndTime());
+               return $now <= $this->getEndDateAndTime();
        }
 
        /**
         * Sets whether the IP lock for this user is disabled.
         *
         * @param boolean $disableIpLock whether the IP lock for this user is disabled
-        *
         * @return void
         */
        public function setIpLockIsDisabled($disableIpLock) {
@@ -297,11 +283,12 @@ class Tx_Extbase_Domain_Model_BackendUser extends Tx_Extbase_DomainObject_Abstra
         * Sets this user's last login date and time.
         *
         * @param \DateTime|NULL $dateAndTime this user's last login date and time
-        *
         * @return void
         */
        public function setLastLoginDateAndTime(\DateTime $dateAndTime = NULL) {
                $this->lastLoginDateAndTime = $dateAndTime;
        }
+
 }
+
 ?>
\ No newline at end of file
index fc5f800..a6a20ed 100644 (file)
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-
 /**
  * This model represents a backend usergroup.
  *
  * @author Markus Günther <mail@markus-guenther.de>
- *
  * @package Extbase
  * @subpackage Domain\Model
- *
  * @scope prototype
  * @entity
  * @api
@@ -43,7 +40,6 @@ class Tx_Extbase_Domain_Model_BackendUserGroup extends Tx_Extbase_DomainObject_A
        const DIRECTORY_OPPERATIONS = 4;
        const DIRECTORY_COPY = 8;
        const DIRECTORY_REMOVE_RECURSIVELY = 16;
-
        /**
         * @var string
         * @validate notEmpty
@@ -517,6 +513,7 @@ class Tx_Extbase_Domain_Model_BackendUserGroup extends Tx_Extbase_DomainObject_A
 
        /**
         * Getter for lock to domain
+        *
         * @return string
         */
        public function getLockToDomain() {
@@ -567,7 +564,7 @@ class Tx_Extbase_Domain_Model_BackendUserGroup extends Tx_Extbase_DomainObject_A
         * @return boolean
         */
        protected function isPermissionSet($permission) {
-               return (($this->fileOperationPermissions & $permission) == $permission);
+               return ($this->fileOperationPermissions & $permission) == $permission;
        }
 
        /**
@@ -578,11 +575,13 @@ class Tx_Extbase_Domain_Model_BackendUserGroup extends Tx_Extbase_DomainObject_A
         * @return void
         */
        protected function setPermission($permission, $value) {
-               if($value) {
+               if ($value) {
                        $this->fileOperationPermissions |= $permission;
                } else {
                        $this->fileOperationPermissions &= ~$permission;
                }
        }
+
 }
-?>
+
+?>
\ No newline at end of file
index 98ffdfa..b4734c2 100755 (executable)
@@ -1,27 +1,26 @@
 <?php
 /***************************************************************
  *  Copyright notice
-*
-*  (c) 2012 Fabien Udriot <fabien.udriot@typo3.org>
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *
+ *  (c) 2012 Fabien Udriot <fabien.udriot@typo3.org>
+ *  All rights reserved
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * This model represents a category (for anything).
  *
@@ -33,6 +32,7 @@
  * @api
  */
 class Tx_Extbase_Domain_Model_Category extends Tx_Extbase_DomainObject_AbstractEntity {
+
        /**
         * @var string
         * @validate notEmpty
@@ -90,7 +90,6 @@ class Tx_Extbase_Domain_Model_Category extends Tx_Extbase_DomainObject_AbstractE
         * @return void
         * @api
         */
-
        public function setTitle($title) {
                $this->title = $title;
        }
@@ -126,7 +125,6 @@ class Tx_Extbase_Domain_Model_Category extends Tx_Extbase_DomainObject_AbstractE
                if ($this->parent instanceof Tx_Extbase_Persistence_LazyLoadingProxy) {
                        $this->parent->_loadRealInstance();
                }
-
                return $this->parent;
        }
 
@@ -183,5 +181,7 @@ class Tx_Extbase_Domain_Model_Category extends Tx_Extbase_DomainObject_AbstractE
        public function removeItem(Tx_Extbase_DomainObject_AbstractEntity $item) {
                $this->items->detach($item);
        }
+
 }
+
 ?>
\ No newline at end of file
index c0e07c9..6056c97 100644 (file)
@@ -21,7 +21,6 @@
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-
 /**
  * A file object (File Abstraction Layer)
  *
@@ -33,5 +32,7 @@
  */
 class Tx_Extbase_Domain_Model_File extends Tx_Extbase_Domain_Model_AbstractFileFolder {
 
+
 }
+
 ?>
\ No newline at end of file
index 280a484..0388929 100644 (file)
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-
 /**
  * This model represents a file mount.
  *
  * @author Markus Günther <mail@markus-guenther.de>
- *
  * @package Extbase
- *
  * @scope prototype
  * @entity
  * @api
@@ -120,5 +117,7 @@ class Tx_Extbase_Domain_Model_FileMount extends Tx_Extbase_DomainObject_Abstract
        public function setIsAbsolutePath($value) {
                $this->isAbsolutePath = $value;
        }
+
 }
+
 ?>
\ No newline at end of file
index baa875b..a2a3739 100644 (file)
@@ -21,7 +21,6 @@
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-
 /**
  * A file reference object (File Abstraction Layer)
  *
@@ -33,5 +32,7 @@
  */
 class Tx_Extbase_Domain_Model_FileReference extends Tx_Extbase_Domain_Model_AbstractFileFolder {
 
+
 }
+
 ?>
\ No newline at end of file
index d6f8fb6..ec83493 100644 (file)
@@ -21,7 +21,6 @@
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-
 /**
  * A folder object (File Abstraction Layer)
  *
@@ -33,5 +32,7 @@
  */
 class Tx_Extbase_Domain_Model_Folder extends Tx_Extbase_Domain_Model_AbstractFileFolder {
 
+
 }
+
 ?>
\ No newline at end of file
index 3ab01bb..7664fd4 100644 (file)
@@ -21,7 +21,6 @@
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-
 /**
  * A file collection object (File Abstraction Layer)
  *
@@ -33,5 +32,7 @@
  */
 class Tx_Extbase_Domain_Model_FolderBasedFileCollection extends Tx_Extbase_Domain_Model_AbstractFileCollection {
 
+
 }
+
 ?>
\ No newline at end of file
index 20fdb6f..669619d 100644 (file)
@@ -21,7 +21,6 @@
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-
 /**
  * A Frontend User
  *
@@ -618,4 +617,5 @@ class Tx_Extbase_Domain_Model_FrontendUser extends Tx_Extbase_DomainObject_Abstr
        }
 
 }
+
 ?>
\ No newline at end of file
index 1ae6322..86cb031 100644 (file)
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-
 /**
  * A Frontend User Group
  *
  * @package Extbase
  * @subpackage Domain\Model
- *
  * @scope prototype
  * @entity
  * @api
@@ -173,4 +171,5 @@ class Tx_Extbase_Domain_Model_FrontendUserGroup extends Tx_Extbase_DomainObject_
        }
 
 }
+
 ?>
\ No newline at end of file
index 6bd5adc..a4ca006 100644 (file)
@@ -21,7 +21,6 @@
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-
 /**
  * A file collection object (File Abstraction Layer)
  *
@@ -33,5 +32,7 @@
  */
 class Tx_Extbase_Domain_Model_StaticFileCollection extends Tx_Extbase_Domain_Model_AbstractFileCollection {
 
+
 }
+
 ?>
\ No newline at end of file
index d083218..d9a6333 100644 (file)
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-
 /**
  * Repository for Tx_Extbase_Domain_Model_BackendUserGroup.
  *
  * @author Markus Günther <mail@markus-guenther.de>
- *
  * @package Extbase
  * @subpackage Domain\Repository
  * @api
@@ -46,5 +44,7 @@ class Tx_Extbase_Domain_Repository_BackendUserGroupRepository extends Tx_Extbase
                $querySettings->setRespectStoragePage(FALSE);
                $this->setDefaultQuerySettings($querySettings);
        }
+
 }
+
 ?>
\ No newline at end of file
index 91161c0..b86110c 100644 (file)
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-
 /**
  * Repository for Tx_Extbase_Domain_Model_BackendUser.
  *
  * @author Markus Günther <mail@markus-guenther.de>
  * @author Oliver Klee <typo3-coding@oliverklee.de>
- *
  * @package Extbase
  * @subpackage Domain\Repository
  * @api
@@ -47,5 +45,7 @@ class Tx_Extbase_Domain_Repository_BackendUserRepository extends Tx_Extbase_Pers
                $querySettings->setRespectStoragePage(FALSE);
                $this->setDefaultQuerySettings($querySettings);
        }
+
 }
+
 ?>
\ No newline at end of file
index fd189e9..3e89fa7 100755 (executable)
@@ -1,39 +1,37 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2012 Fabien Udriot <fabien.udriot@typo3.org>
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *
+ *  (c) 2012 Fabien Udriot <fabien.udriot@typo3.org>
+ *  All rights reserved
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * Repository for Category models.
  *
  * @author Fabien Udriot <fabien.udriot@typo3.org>
  * @author Oliver Klee <typo3-coding@oliverklee.de>
- *
  * @package Extbase
  * @subpackage Domain\Repository
- *
  * @api
  */
 class Tx_Extbase_Domain_Repository_CategoryRepository extends Tx_Extbase_Persistence_Repository {
+
        /**
         * Initializes the repository.
         *
@@ -45,5 +43,7 @@ class Tx_Extbase_Domain_Repository_CategoryRepository extends Tx_Extbase_Persist
                $querySettings->setRespectStoragePage(FALSE);
                $this->setDefaultQuerySettings($querySettings);
        }
+
 }
+
 ?>
\ No newline at end of file
index 6dc8145..15e901d 100644 (file)
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-
 /**
  * Repository for Tx_Extbase_Domain_Model_FileMount.
  *
  * @author Markus Günther <mail@markus-guenther.de>
- *
  * @package Extbase
  * @api
  */
 class Tx_Extbase_Domain_Repository_FileMountRepository extends Tx_Extbase_Persistence_Repository {
+
        /**
         * Initializes the repository.
         *
@@ -46,4 +45,5 @@ class Tx_Extbase_Domain_Repository_FileMountRepository extends Tx_Extbase_Persis
        }
 
 }
+
 ?>
\ No newline at end of file
index f53d9cb..5f61cbd 100644 (file)
@@ -21,7 +21,6 @@
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-
 /**
  * A Frontend User Group Repository
  *
@@ -32,5 +31,7 @@
  */
 class Tx_Extbase_Domain_Repository_FrontendUserGroupRepository extends Tx_Extbase_Persistence_Repository {
 
+
 }
+
 ?>
\ No newline at end of file
index 552784b..bd44927 100644 (file)
@@ -21,7 +21,6 @@
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-
 /**
  * A Frontend User repository
  *
@@ -32,5 +31,7 @@
  */
 class Tx_Extbase_Domain_Repository_FrontendUserRepository extends Tx_Extbase_Persistence_Repository {
 
+
 }
+
 ?>
\ No newline at end of file
index 9f6722e..4ecbf79 100644 (file)
@@ -1,27 +1,26 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *
+ *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
+ *  All rights reserved
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * A generic Domain Object.
  *
@@ -55,6 +54,7 @@ abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbas
 
        /**
         * TRUE if the object is a clone
+        *
         * @var boolean
         */
        private $_isClone = FALSE;
@@ -76,6 +76,7 @@ abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbas
        }
 
        public function initializeObject() {
+
        }
 
        /**
@@ -85,7 +86,7 @@ abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbas
         */
        final public function getUid() {
                if ($this->uid !== NULL) {
-                       return (int)$this->uid;
+                       return (int) $this->uid;
                } else {
                        return NULL;
                }
@@ -101,7 +102,7 @@ abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbas
                if ($pid === NULL) {
                        $this->pid = NULL;
                } else {
-                       $this->pid = (int)$pid;
+                       $this->pid = (int) $pid;
                }
        }
 
@@ -114,7 +115,7 @@ abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbas
                if ($this->pid === NULL) {
                        return NULL;
                } else {
-                       return (int)$this->pid;
+                       return (int) $this->pid;
                }
        }
 
@@ -127,7 +128,7 @@ abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbas
         */
        public function _setProperty($propertyName, $propertyValue) {
                if ($this->_hasProperty($propertyName)) {
-                       $this->$propertyName = $propertyValue;
+                       $this->{$propertyName} = $propertyValue;
                        return TRUE;
                }
                return FALSE;
@@ -140,7 +141,7 @@ abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbas
         * @return mixed The propertyValue
         */
        public function _getProperty($propertyName) {
-               return $this->$propertyName;
+               return $this->{$propertyName};
        }
 
        /**
@@ -191,7 +192,10 @@ abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbas
                        $this->_cleanProperties = array();
                        $properties = get_object_vars($this);
                        foreach ($properties as $propertyName => $propertyValue) {
-                               if (substr($propertyName, 0, 1) === '_') continue; // Do not memorize "internal" properties
+                               if (substr($propertyName, 0, 1) === '_') {
+                                       continue;
+                               }
+                               // Do not memorize "internal" properties
                                $this->_memorizePropertyCleanState($propertyName);
                        }
                }
@@ -205,13 +209,12 @@ abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbas
         * @return void
         */
        public function _memorizePropertyCleanState($propertyName) {
-               $propertyValue = $this->$propertyName;
+               $propertyValue = $this->{$propertyName};
                if (!is_array($this->_cleanProperties)) {
                        $this->_cleanProperties = array();
                }
                if (is_object($propertyValue)) {
-                       $this->_cleanProperties[$propertyName] = clone($propertyValue);
-
+                       $this->_cleanProperties[$propertyName] = clone $propertyValue;
                        // We need to make sure the clone and the original object
                        // are identical when compared with == (see _isDirty()).
                        // After the cloning, the Domain Object will have the property
@@ -257,13 +260,19 @@ abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbas
         * @return boolean
         */
        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);
+               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);
+               }
                if ($propertyName === NULL) {
                        foreach ($this->_getCleanProperties() as $propertyName => $cleanPropertyValue) {
-                               if ($this->isPropertyDirty($cleanPropertyValue, $this->$propertyName) === TRUE) return TRUE;
+                               if ($this->isPropertyDirty($cleanPropertyValue, $this->{$propertyName}) === TRUE) {
+                                       return TRUE;
+                               }
                        }
                } else {
-                       if ($this->isPropertyDirty($this->_getCleanProperty($propertyName), $this->$propertyName) === TRUE) return TRUE;
+                       if ($this->isPropertyDirty($this->_getCleanProperty($propertyName), $this->{$propertyName}) === TRUE) {
+                               return TRUE;
+                       }
                }
                return FALSE;
        }
@@ -281,15 +290,15 @@ abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbas
                // 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) {
-                               $result = !is_object($previousValue) || (get_class($previousValue) !== get_class($currentValue)) || ($currentValue->getUid() !== $previousValue->getUid());
+                               $result = (!is_object($previousValue) || get_class($previousValue) !== get_class($currentValue)) || $currentValue->getUid() !== $previousValue->getUid();
                        } elseif ($currentValue instanceof Tx_Extbase_Persistence_ObjectMonitoringInterface) {
-                               $result = !is_object($previousValue) || $currentValue->_isDirty() || (get_class($previousValue) !== get_class($currentValue));
+                               $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.
-                               $result = ($previousValue != $currentValue);
+                               $result = $previousValue != $currentValue;
                        }
                } else {
-                       $result = ($previousValue !== $currentValue);
+                       $result = $previousValue !== $currentValue;
                }
                return $result;
        }
@@ -312,7 +321,7 @@ abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbas
         * @param boolean $clone
         */
        public function _setClone($clone) {
-               $this->_isClone = (boolean)$clone;
+               $this->_isClone = (bool$clone;
        }
 
        /**
@@ -330,8 +339,9 @@ abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbas
         * @return string
         */
        public function __toString() {
-               return get_class($this) . ':' . (string)$this->uid;
+               return (get_class($this) . ':') . (string) $this->uid;
        }
 
 }
+
 ?>
\ No newline at end of file
index 29f694c..31105f3 100644 (file)
@@ -1,27 +1,26 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *
+ *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
+ *  All rights reserved
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * An abstract Entity. An Entity is an object fundamentally defined not by its attributes,
  * but by a thread of continuity and identity (e.g. a person).
@@ -31,5 +30,8 @@
  * @version $ID:$
  */
 abstract class Tx_Extbase_DomainObject_AbstractEntity extends Tx_Extbase_DomainObject_AbstractDomainObject {
+
+
 }
+
 ?>
\ No newline at end of file
index d828c45..f49c860 100644 (file)
@@ -1,27 +1,26 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *
+ *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
+ *  All rights reserved
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * A abstract Value Object. A Value Object is an object that describes some characteristic
  * or attribute (e.g. a color) but carries no concept of identity.
@@ -42,4 +41,5 @@ abstract class Tx_Extbase_DomainObject_AbstractValueObject extends Tx_Extbase_Do
        }
 
 }
+
 ?>
\ No newline at end of file
index 7b565e1..d1495d8 100644 (file)
@@ -1,27 +1,26 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *
+ *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
+ *  All rights reserved
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * A Domain Object Interface. All domain objects which should be persisted need to implement the below interface.
  * Usually you will need to subclass Tx_Extbase_DomainObject_AbstractEntity and Tx_Extbase_DomainObject_AbstractValueObject
  *
  * @see Tx_Extbase_DomainObject_AbstractEntity
  * @see Tx_Extbase_DomainObject_AbstractValueObject
- *
  * @package Extbase
  * @subpackage DomainObject
  * @version $ID:$
  */
-interface Tx_Extbase_DomainObject_DomainObjectInterface {
-
+interface Tx_Extbase_DomainObject_DomainObjectInterface
+{
        /**
         * Getter for uid.
         *
index a527ca1..f0d0e43 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-
 /*                                                                        *
  * This script belongs to the Extbase framework                           *
  *                                                                        *
  *                                                                        *
  * The TYPO3 project - inspiring people to share!                         *
  *                                                                        */
-
 /**
- */
 
+ */
 /**
  * An object representation of a generic error. Subclass this to create
  * more specific errors if necessary.
@@ -36,5 +34,7 @@ class Tx_Extbase_Error_Error extends Tx_Extbase_Error_Message {
         * @var string
         */
        protected $message = 'Unknown error';
+
 }
+
 ?>
\ No newline at end of file
index 915d8af..aa3cdad 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-
 /*                                                                        *
  * This script belongs to the Extbase framework                           *
  *                                                                        *
  *                                                                        *
  * The TYPO3 project - inspiring people to share!                         *
  *                                                                        */
-
 /**
- */
 
+ */
 /**
  * An object representation of a generic message. Usually, you will use Error, Warning or Notice instead of this one.
  *
@@ -33,24 +31,28 @@ class Tx_Extbase_Error_Message {
 
        /**
         * The default (english) error message
+        *
         * @var string
         */
        protected $message = 'Unknown message';
 
        /**
         * The error code
+        *
         * @var string
         */
        protected $code;
 
        /**
         * The message arguments. Will be replaced in the message body.
+        *
         * @var array
         */
        protected $arguments = array();
 
        /**
         * An optional title for the message (used eg. in flashMessages).
+        *
         * @var string
         */
        protected $title = '';
@@ -73,6 +75,7 @@ class Tx_Extbase_Error_Message {
 
        /**
         * Returns the error message
+        *
         * @return string The error message
         * @api
         */
@@ -82,6 +85,7 @@ class Tx_Extbase_Error_Message {
 
        /**
         * Returns the error code
+        *
         * @return string The error code
         * @api
         */
@@ -117,7 +121,7 @@ class Tx_Extbase_Error_Message {
         */
        public function render() {
                if (!empty($this->arguments)) {
-                        return vsprintf($this->message, $this->arguments);
+                       return vsprintf($this->message, $this->arguments);
                } else {
                        return $this->message;
                }
@@ -132,6 +136,7 @@ class Tx_Extbase_Error_Message {
        public function __toString() {
                return $this->render();
        }
+
 }
 
 ?>
\ No newline at end of file
index 76d6770..47bbc61 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-
 /*                                                                        *
  * This script belongs to the Extbase framework                           *
  *                                                                        *
  *                                                                        *
  * The TYPO3 project - inspiring people to share!                         *
  *                                                                        */
-
 /**
- */
 
+ */
 /**
  * An object representation of a generic notice. Subclass this to create
  * more specific notices if necessary.
@@ -36,6 +34,7 @@ class Tx_Extbase_Error_Notice extends Tx_Extbase_Error_Message {
         * @var string
         */
        protected $message = 'Unknown notice';
+
 }
 
 ?>
\ No newline at end of file
index 5319703..5294ab9 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-
 /*                                                                        *
  * This script belongs to the Extbase framework                           *
  *                                                                        *
@@ -19,7 +18,6 @@
  *                                                                        *
  * The TYPO3 project - inspiring people to share!                         *
  *                                                                        */
-
 /**
  * Result object for operations dealing with objects, such as the Property Mapper or the Validators.
  *
@@ -176,13 +174,10 @@ class Tx_Extbase_Error_Result {
                if (count($pathSegments) === 0) {
                        return $this;
                }
-
                $propertyName = array_shift($pathSegments);
-
                if (!isset($this->propertyResults[$propertyName])) {
                        $this->propertyResults[$propertyName] = new Tx_Extbase_Error_Result();
                }
-
                return $this->propertyResults[$propertyName]->recurseThroughResult($pathSegments);
        }
 
@@ -195,16 +190,14 @@ class Tx_Extbase_Error_Result {
         * @author Sebastian Kurfürst <sebastian@typo3.org>
         */
        protected function hasProperty($propertyName, $checkerMethodName) {
-               if (count($this->$propertyName) > 0) {
+               if (count($this->{$propertyName}) > 0) {
                        return TRUE;
                }
-
                foreach ($this->propertyResults as $subResult) {
-                       if ($subResult->$checkerMethodName()) {
+                       if ($subResult->{$checkerMethodName}()) {
                                return TRUE;
                        }
                }
-
                return FALSE;
        }
 
@@ -218,7 +211,6 @@ class Tx_Extbase_Error_Result {
                return $this->hasProperty('errors', 'hasErrors');
        }
 
-
        /**
         * Does the current Result object have Warnings? (Recursively)
         *
@@ -292,8 +284,8 @@ class Tx_Extbase_Error_Result {
         * @return void
         */
        public function flattenTree($propertyName, &$result, $level) {
-               if (count($this->$propertyName) > 0) {
-                       $result[implode('.', $level)] = $this->$propertyName;
+               if (count($this->{$propertyName}) > 0) {
+                       $result[implode('.', $level)] = $this->{$propertyName};
                }
                foreach ($this->propertyResults as $subPropertyName => $subResult) {
                        array_push($level, $subPropertyName);
@@ -314,7 +306,6 @@ class Tx_Extbase_Error_Result {
                $this->mergeProperty($otherResult, 'getErrors', 'addError');
                $this->mergeProperty($otherResult, 'getWarnings', 'addWarning');
                $this->mergeProperty($otherResult, 'getNotices', 'addNotice');
-
                foreach ($otherResult->getSubResults() as $subPropertyName => $subResult) {
                        $this->forProperty($subPropertyName)->merge($subResult);
                }
@@ -330,8 +321,8 @@ class Tx_Extbase_Error_Result {
         * @author Sebastian Kurfürst <sebastian@typo3.org>
         */
        protected function mergeProperty(Tx_Extbase_Error_Result $otherResult, $getterName, $adderName) {
-               foreach ($otherResult->$getterName() as $messageInOtherResult) {
-                       $this->$adderName($messageInOtherResult);
+               foreach ($otherResult->{$getterName}() as $messageInOtherResult) {
+                       $this->{$adderName}($messageInOtherResult);
                }
        }
 
@@ -343,6 +334,7 @@ class Tx_Extbase_Error_Result {
        public function getSubResults() {
                return $this->propertyResults;
        }
+
 }
 
 ?>
\ No newline at end of file
index c65cbbf..6a18b93 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-
 /*                                                                        *
  * This script belongs to the Extbase framework                           *
  *                                                                        *
  *                                                                        *
  * The TYPO3 project - inspiring people to share!                         *
  *                                                                        */
-
 /**
- */
 
+ */
 /**
  * An object representation of a generic warning. Subclass this to create
  * more specific warnings if necessary.
@@ -36,5 +34,7 @@ class Tx_Extbase_Error_Warning extends Tx_Extbase_Error_Message {
         * @var string
         */
        protected $message = 'Unknown warning';
+
 }
+
 ?>
\ No newline at end of file
index 5a45468..d92534a 100644 (file)
@@ -1,30 +1,29 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
-*  All rights reserved
-*
-*  This class is a backport of the corresponding class of FLOW3.
-*  All credits go to the v5 team.
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *
+ *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
+ *  All rights reserved
+ *
+ *  This class is a backport of the corresponding class of FLOW3.
+ *  All credits go to the v5 team.
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * A generic Extbase exception
  *
@@ -33,5 +32,7 @@
  */
 class Tx_Extbase_Exception extends Exception {
 
+
 }
+
 ?>
\ No newline at end of file
index 51de74f..205caf6 100644 (file)
@@ -1,28 +1,27 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*  All rights reserved
-*
-*  This class is a backport of the corresponding class of FLOW3.
-*  All credits go to the v5 team.
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *  All rights reserved
+ *
+ *  This class is a backport of the corresponding class of FLOW3.
+ *  All credits go to the v5 team.
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * Represents a Command
  *
@@ -57,6 +56,7 @@ class Tx_Extbase_MVC_CLI_Command {
 
        /**
         * Reflection service
+        *
         * @var Tx_Extbase_Reflection_Service
         */
        private $reflectionService;
@@ -71,13 +71,12 @@ class Tx_Extbase_MVC_CLI_Command {
        public function __construct($controllerClassName, $controllerCommandName) {
                $this->controllerClassName = $controllerClassName;
                $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]);
-               $this->commandIdentifier = strtolower($extensionKey . ':' . substr($classNameParts[3], 0, -17) . ':' . $controllerCommandName);
+               $this->commandIdentifier = strtolower(((($extensionKey . ':') . substr($classNameParts[3], 0, -17)) . ':') . $controllerCommandName);
        }
 
        /**
@@ -127,7 +126,7 @@ class Tx_Extbase_MVC_CLI_Command {
         */
        public function getShortDescription() {
                $lines = explode(chr(10), $this->getCommandMethodReflection()->getDescription());
-               return (count($lines) > 0) ? trim($lines[0]) : '<no description available>';
+               return count($lines) > 0 ? trim($lines[0]) : '<no description available>';
        }
 
        /**
@@ -184,7 +183,7 @@ class Tx_Extbase_MVC_CLI_Command {
                        $description = implode(' ', $explodedAnnotation);
                        $required = $commandParameterDefinition['optional'] !== TRUE;
                        $commandArgumentDefinitions[] = $this->objectManager->get('Tx_Extbase_MVC_CLI_CommandArgumentDefinition', $commandParameterName, $required, $description);
-                       $i ++;
+                       $i++;
                }
                return $commandArgumentDefinitions;
        }
@@ -226,10 +225,9 @@ class Tx_Extbase_MVC_CLI_Command {
                if (!$commandMethodReflection->isTaggedWith('see')) {
                        return array();
                }
-
                $relatedCommandIdentifiers = array();
                foreach ($commandMethodReflection->getTagValues('see') as $tagValue) {
-                       if (preg_match('/^[\w\d\.]+:[\w\d]+:[\w\d]+$/', $tagValue) === 1) {
+                       if (preg_match('/^[\\w\\d\\.]+:[\\w\\d]+:[\\w\\d]+$/', $tagValue) === 1) {
                                $relatedCommandIdentifiers[] = $tagValue;
                        }
                }
@@ -245,5 +243,7 @@ class Tx_Extbase_MVC_CLI_Command {
                }
                return $this->commandMethodReflection;
        }
+
 }
+
 ?>
\ No newline at end of file
index e30e2e1..775ab47 100644 (file)
@@ -1,28 +1,27 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*  All rights reserved
-*
-*  This class is a backport of the corresponding class of FLOW3.
-*  All credits go to the v5 team.
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *  All rights reserved
+ *
+ *  This class is a backport of the corresponding class of FLOW3.
+ *  All credits go to the v5 team.
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * Represents a CommandArgumentDefinition
  *
@@ -92,4 +91,5 @@ class Tx_Extbase_MVC_CLI_CommandArgumentDefinition {
        }
 
 }
+
 ?>
\ No newline at end of file
index 10154a7..47bb65c 100644 (file)
@@ -1,28 +1,27 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*  All rights reserved
-*
-*  This class is a backport of the corresponding class of FLOW3.
-*  All credits go to the v5 team.
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *  All rights reserved
+ *
+ *  This class is a backport of the corresponding class of FLOW3.
+ *  All credits go to the v5 team.
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * A helper for CLI commands
  *
@@ -64,8 +63,7 @@ class Tx_Extbase_MVC_CLI_CommandManager implements t3lib_Singleton {
        public function getAvailableCommands() {
                if ($this->availableCommands === NULL) {
                        $this->availableCommands = array();
-
-                       $commandControllerClassNames = (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['extbase']['commandControllers']) ? $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['extbase']['commandControllers'] : array());
+                       $commandControllerClassNames = is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['extbase']['commandControllers']) ? $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['extbase']['commandControllers'] : array();
                        foreach ($commandControllerClassNames as $className) {
                                if (!class_exists($className)) {
                                        continue;
@@ -104,10 +102,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 Tx_Extbase_MVC_Exception_NoSuchCommand(('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 Tx_Extbase_MVC_Exception_AmbiguousCommandIdentifier(('More than one command matches the command identifier "' . $commandIdentifier) . '"', 1310557169, NULL, $matchedCommands);
                }
                return current($matchedCommands);
        }
@@ -154,9 +152,9 @@ class Tx_Extbase_MVC_CLI_CommandManager implements t3lib_Singleton {
                        foreach ($this->getAvailableCommands() as $availableCommand) {
                                list($extensionKey, $controllerName, $commandName) = explode(':', $availableCommand->getCommandIdentifier());
                                if (count($commandsByCommandName[$commandName][$controllerName]) > 1) {
-                                       $this->shortCommandIdentifiers[$availableCommand->getCommandIdentifier()] = sprintf('%s:%s:%s', $extensionKey, $controllerName, $commandName);;
+                                       $this->shortCommandIdentifiers[$availableCommand->getCommandIdentifier()] = sprintf('%s:%s:%s', $extensionKey, $controllerName, $commandName);
                                } else {
-                                       $this->shortCommandIdentifiers[$availableCommand->getCommandIdentifier()] = sprintf('%s:%s', $controllerName, $commandName);;
+                                       $this->shortCommandIdentifiers[$availableCommand->getCommandIdentifier()] = sprintf('%s:%s', $controllerName, $commandName);
                                }
                        }
                }
@@ -187,5 +185,7 @@ class Tx_Extbase_MVC_CLI_CommandManager implements t3lib_Singleton {
                }
                return $searchedCommandIdentifierParts === $commandIdentifierParts;
        }
+
 }
+
 ?>
\ No newline at end of file
index cef6e76..87a78d8 100644 (file)
@@ -1,28 +1,27 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*  All rights reserved
-*
-*  This class is a backport of the corresponding class of FLOW3.
-*  All credits go to the v5 team.
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *  All rights reserved
+ *
+ *  This class is a backport of the corresponding class of FLOW3.
+ *  All credits go to the v5 team.
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * Represents a CLI request.
  *
@@ -53,6 +52,7 @@ class Tx_Extbase_MVC_CLI_Request implements Tx_Extbase_MVC_RequestInterface {
 
        /**
         * The arguments for this request
+        *
         * @var array
         */
        protected $arguments = array();
@@ -64,6 +64,7 @@ class Tx_Extbase_MVC_CLI_Request implements Tx_Extbase_MVC_RequestInterface {
 
        /**
         * If this request has been changed and needs to be dispatched again
+        *
         * @var boolean
         */
        protected $dispatched = FALSE;
@@ -127,9 +128,7 @@ class Tx_Extbase_MVC_CLI_Request implements Tx_Extbase_MVC_RequestInterface {
                                (?P<subpackageKey>.+)_Controller
                        )
                        _(?P<controllerName>[a-z_]+)Controller
-                       $/ix', $controllerObjectName, $matches
-               );
-
+                       $/ix', $controllerObjectName, $matches);
                $this->controllerExtensionName = $matches['extensionName'];
                $this->controllerObjectName = $controllerObjectName;
                $this->command = NULL;
@@ -196,7 +195,9 @@ class Tx_Extbase_MVC_CLI_Request implements Tx_Extbase_MVC_RequestInterface {
         * @return void
         */
        public function setArgument($argumentName, $value) {
-               if (!is_string($argumentName) || $argumentName === '') throw new Tx_Extbase_MVC_Exception_InvalidArgumentName('Invalid argument name.', 1300893885);
+               if (!is_string($argumentName) || $argumentName === '') {
+                       throw new Tx_Extbase_MVC_Exception_InvalidArgumentName('Invalid argument name.', 1300893885);
+               }
                $this->arguments[$argumentName] = $value;
        }
 
@@ -219,7 +220,9 @@ class Tx_Extbase_MVC_CLI_Request implements Tx_Extbase_MVC_RequestInterface {
         * @throws Tx_Extbase_MVC_Exception_NoSuchArgument 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);
+               if (!isset($this->arguments[$argumentName])) {
+                       throw new Tx_Extbase_MVC_Exception_NoSuchArgument(('An argument "' . $argumentName) . '" does not exist for this request.', 1300893886);
+               }
                return $this->arguments[$argumentName];
        }
 
@@ -265,5 +268,7 @@ class Tx_Extbase_MVC_CLI_Request implements Tx_Extbase_MVC_RequestInterface {
        public function getExceedingArguments() {
                return $this->exceedingArguments;
        }
+
 }
+
 ?>
\ No newline at end of file
index 88d75fb..7306b5d 100644 (file)
@@ -1,28 +1,27 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*  All rights reserved
-*
-*  This class is a backport of the corresponding class of FLOW3.
-*  All credits go to the v5 team.
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *  All rights reserved
+ *
+ *  This class is a backport of the corresponding class of FLOW3.
+ *  All credits go to the v5 team.
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * Builds a CLI request object from the raw command call
  *
@@ -83,7 +82,6 @@ class Tx_Extbase_MVC_CLI_RequestBuilder {
        public function build($commandLine = '') {
                $request = $this->objectManager->get('Tx_Extbase_MVC_CLI_Request');
                $request->setControllerObjectName('Tx_Extbase_Command_HelpCommandController');
-
                $rawCommandLineArguments = is_array($commandLine) ? $commandLine : explode(' ', $commandLine);
                if (count($rawCommandLineArguments) === 0) {
                        $request->setControllerCommandName('helpStub');
@@ -101,11 +99,9 @@ class Tx_Extbase_MVC_CLI_RequestBuilder {
                $controllerCommandName = $command->getControllerCommandName();
                $request->setControllerObjectName($controllerObjectName);
                $request->setControllerCommandName($controllerCommandName);
-
                list($commandLineArguments, $exceedingCommandLineArguments) = $this->parseRawCommandLineArguments($rawCommandLineArguments, $controllerObjectName, $controllerCommandName);
                $request->setArguments($commandLineArguments);
                $request->setExceedingArguments($exceedingCommandLineArguments);
-
                return $request;
        }
 
@@ -124,7 +120,6 @@ class Tx_Extbase_MVC_CLI_RequestBuilder {
                $exceedingArguments = array();
                $commandMethodName = $controllerCommandName . 'Command';
                $commandMethodParameters = $this->reflectionService->getMethodParameters($controllerObjectName, $commandMethodName);
-
                $requiredArguments = array();
                $optionalArguments = array();
                $argumentNames = array();
@@ -136,14 +131,11 @@ class Tx_Extbase_MVC_CLI_RequestBuilder {
                                $optionalArguments[strtolower($parameterName)] = array('parameterName' => $parameterName, 'type' => $parameterInfo['type']);
                        }
                }
-
                $decidedToUseNamedArguments = FALSE;
                $decidedToUseUnnamedArguments = FALSE;
                $argumentIndex = 0;
                while (count($rawCommandLineArguments) > 0) {
-
                        $rawArgument = array_shift($rawCommandLineArguments);
-
                        if ($rawArgument[0] === '-') {
                                if ($rawArgument[1] === '-') {
                                        $rawArgument = substr($rawArgument, 2);
@@ -151,7 +143,6 @@ class Tx_Extbase_MVC_CLI_RequestBuilder {
                                        $rawArgument = substr($rawArgument, 1);
                                }
                                $argumentName = $this->extractArgumentNameFromCommandLinePart($rawArgument);
-
                                if (isset($optionalArguments[$argumentName])) {
                                        $argumentValue = $this->getValueOfCurrentCommandLineOption($rawArgument, $rawCommandLineArguments, $optionalArguments[$argumentName]['type']);
                                        $commandLineArguments[$optionalArguments[$argumentName]['parameterName']] = $argumentValue;
@@ -180,17 +171,16 @@ class Tx_Extbase_MVC_CLI_RequestBuilder {
                                        }
                                }
                        }
-                       $argumentIndex ++;
+                       $argumentIndex++;
                }
-
                return array($commandLineArguments, $exceedingArguments);
        }
 
        /**
         * Extracts the option or argument name from the name / value pair of a command line.
         *
-        * @param string $commandLinePart Part of the command line, e.g. "my-important-option=SomeInterestingValue"
-        * @return string The lowercased argument name, e.g. "myimportantoption"
+        * @param string $commandLinePart Part of the command line, e.g. "my-important-option=SomeInterestingValue
+        * @return string The lowercased argument name, e.g. "myimportantoption
         */
        protected function extractArgumentNameFromCommandLinePart($commandLinePart) {
                $nameAndValue = explode('=', $commandLinePart, 2);
@@ -208,10 +198,9 @@ class Tx_Extbase_MVC_CLI_RequestBuilder {
         * @author Robert Lemke <robert@typo3.org>
         */
        protected function getValueOfCurrentCommandLineOption($currentArgument, array &$rawCommandLineArguments, $expectedArgumentType) {
-               if ((!isset($rawCommandLineArguments[0]) && (strpos($currentArgument, '=') === FALSE)) || (isset($rawCommandLineArguments[0]) && $rawCommandLineArguments[0][0] === '-' && (strpos($currentArgument, '=') === FALSE))) {
+               if (!isset($rawCommandLineArguments[0]) && strpos($currentArgument, '=') === FALSE || (isset($rawCommandLineArguments[0]) && $rawCommandLineArguments[0][0] === '-') && strpos($currentArgument, '=') === FALSE) {
                        return TRUE;
                }
-
                if (strpos($currentArgument, '=') === FALSE) {
                        $possibleValue = trim(array_shift($rawCommandLineArguments));
                        if (strpos($possibleValue, '=') === FALSE) {
@@ -229,15 +218,15 @@ class Tx_Extbase_MVC_CLI_RequestBuilder {
                        }
                        $currentArgument .= $possibleValue;
                }
-
                $splitArgument = explode('=', $currentArgument, 2);
                while ((!isset($splitArgument[1]) || trim($splitArgument[1]) === '') && count($rawCommandLineArguments) > 0) {
                        $currentArgument .= array_shift($rawCommandLineArguments);
                        $splitArgument = explode('=', $currentArgument);
                }
-
-               $value = (isset($splitArgument[1])) ? $splitArgument[1] : '';
+               $value = isset($splitArgument[1]) ? $splitArgument[1] : '';
                return $value;
        }
+
 }
+
 ?>
\ No newline at end of file
index 0af483e..267f2ea 100644 (file)
@@ -1,28 +1,27 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*  All rights reserved
-*
-*  This class is a backport of the corresponding class of FLOW3.
-*  All credits go to the v5 team.
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *  All rights reserved
+ *
+ *  This class is a backport of the corresponding class of FLOW3.
+ *  All credits go to the v5 team.
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * The generic command line interface request handler for the MVC framework.
  *
@@ -70,7 +69,7 @@ class Tx_Extbase_MVC_CLI_RequestHandler implements Tx_Extbase_MVC_RequestHandler
         */
        public function injectFlashMessageContainer(Tx_Extbase_MVC_Controller_FlashMessages $flashMessageContainer) {
                $this->flashMessageContainer = $flashMessageContainer;
-                       // @deprecated since Extbase 1.1; will be removed in Extbase 6.0
+               // @deprecated since Extbase 1.1; will be removed in Extbase 6.0
                $this->flashMessages = $flashMessageContainer;
        }
 
@@ -111,7 +110,7 @@ class Tx_Extbase_MVC_CLI_RequestHandler implements Tx_Extbase_MVC_RequestHandler
         * @author Karsten Dambekalns <karsten@typo3.org>
         */
        public function canHandleRequest() {
-               return (PHP_SAPI === 'cli');
+               return PHP_SAPI === 'cli';
        }
 
        /**
@@ -124,5 +123,7 @@ class Tx_Extbase_MVC_CLI_RequestHandler implements Tx_Extbase_MVC_RequestHandler
        public function getPriority() {
                return 90;
        }
+
 }
+
 ?>
\ No newline at end of file
index 1195bd2..6b8688f 100644 (file)
@@ -1,28 +1,27 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*  All rights reserved
-*
-*  This class is a backport of the corresponding class of FLOW3.
-*  All credits go to the v5 team.
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *  All rights reserved
+ *
+ *  This class is a backport of the corresponding class of FLOW3.
+ *  All credits go to the v5 team.
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * A CLI specific response implementation
  *
index 1cb9ce6..f03381e 100644 (file)
@@ -1,30 +1,29 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
-*  All rights reserved
-*
-*  This class is a backport of the corresponding class of FLOW3.
-*  All credits go to the v5 team.
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *
+ *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
+ *  All rights reserved
+ *
+ *  This class is a backport of the corresponding class of FLOW3.
+ *  All credits go to the v5 team.
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * An abstract base class for Controllers
  *
@@ -92,6 +91,7 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
 
        /**
         * The results of the mapping of request arguments to controller arguments
+        *
         * @var Tx_Extbase_Property_MappingResults
         * @api
         * @deprecated since Extbase 1.4.0, will be removed in Extbase 6.0
@@ -102,6 +102,7 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
         * An array of supported request types. By default only web requests are supported.
         * Modify or replace this array if your specific controller supports certain
         * (additional) request types.
+        *
         * @var array
         */
        protected $supportedRequestTypes = array('Tx_Extbase_MVC_Request');
@@ -187,7 +188,7 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
         */
        public function injectFlashMessageContainer(Tx_Extbase_MVC_Controller_FlashMessages $flashMessageContainer) {
                $this->flashMessageContainer = $flashMessageContainer;
-                       // @deprecated since Extbase 1.1; will be removed in Extbase 6.0
+               // @deprecated since Extbase 1.1; will be removed in Extbase 6.0
                $this->flashMessages = $flashMessageContainer;
        }
 
@@ -204,7 +205,9 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
         */
        public function canProcessRequest(Tx_Extbase_MVC_RequestInterface $request) {
                foreach ($this->supportedRequestTypes as $supportedRequestType) {
-                       if ($request instanceof $supportedRequestType) return TRUE;
+                       if ($request instanceof $supportedRequestType) {
+                               return TRUE;
+                       }
                }
                return FALSE;
        }
@@ -219,16 +222,15 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
         * @api
         */
        public function processRequest(Tx_Extbase_MVC_RequestInterface $request, Tx_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);
-
+               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);
+               }
                $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->setRequest($request);
-
                $this->initializeControllerArgumentsBaseValidators();
                $this->mapRequestArgumentsToControllerArguments();
                $this->controllerContext = $this->buildControllerContext();
@@ -273,9 +275,15 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
        public function forward($actionName, $controllerName = NULL, $extensionName = NULL, array $arguments = NULL) {
                $this->request->setDispatched(FALSE);
                $this->request->setControllerActionName($actionName);
-               if ($controllerName !== NULL) $this->request->setControllerName($controllerName);
-               if ($extensionName !== NULL) $this->request->setControllerExtensionName($extensionName);
-               if ($arguments !== NULL) $this->request->setArguments($arguments);
+               if ($controllerName !== NULL) {
+                       $this->request->setControllerName($controllerName);
+               }
+               if ($extensionName !== NULL) {
+                       $this->request->setControllerExtensionName($extensionName);
+               }
+               if ($arguments !== NULL) {
+                       $this->request->setArguments($arguments);
+               }
                throw new Tx_Extbase_MVC_Exception_StopAction();
        }
 
@@ -293,7 +301,7 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
         * @param array $arguments Arguments to pass to the target action
         * @param integer $pageUid Target page uid. If NULL, the current page uid is used
         * @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"
+        * @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
@@ -301,17 +309,13 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
         * @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 Tx_Extbase_MVC_Web_Request) {
+                       throw new Tx_Extbase_MVC_Exception_UnsupportedRequestType('redirect() only supports web requests.', 1220539734);
+               }
                if ($controllerName === NULL) {
                        $controllerName = $this->request->getControllerName();
                }
-
-               $uri = $this->uriBuilder
-                       ->reset()
-                       ->setTargetPageUid($pageUid)
-                       ->setCreateAbsoluteUri(TRUE)
-                       ->uriFor($actionName, $arguments, $controllerName, $extensionName);
+               $uri = $this->uriBuilder->reset()->setTargetPageUid($pageUid)->setCreateAbsoluteUri(TRUE)->uriFor($actionName, $arguments, $controllerName, $extensionName);
                $this->redirectToUri($uri, $delay, $statusCode);
        }
 
@@ -322,19 +326,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"
+        * @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
         * @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 Tx_Extbase_MVC_Web_Request) {
+                       throw new Tx_Extbase_MVC_Exception_UnsupportedRequestType('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->setContent(((('<html><head><meta http-equiv="refresh" content="' . intval($delay)) . ';url=') . $escapedUri) . '"/></head></html>');
                $this->response->setStatus($statusCode);
-               $this->response->setHeader('Location', (string)$uri);
+               $this->response->setHeader('Location', (string) $uri);
                throw new Tx_Extbase_MVC_Exception_StopAction();
        }
 
@@ -345,7 +350,7 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
         * @return string
         */
        protected function addBaseUriIfNecessary($uri) {
-               return t3lib_div::locationHeaderUrl((string)$uri);
+               return t3lib_div::locationHeaderUrl((string) $uri);
        }
 
        /**
@@ -361,10 +366,13 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
         * @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 Tx_Extbase_MVC_Web_Request) {
+                       throw new Tx_Extbase_MVC_Exception_UnsupportedRequestType('throwStatus() only supports web requests.', 1220539739);
+               }
                $this->response->setStatus($statusCode, $statusMessage);
-               if ($content === NULL) $content = $this->response->getStatus();
+               if ($content === NULL) {
+                       $content = $this->response->getStatus();
+               }
                $this->response->setContent($content);
                throw new Tx_Extbase_MVC_Exception_StopAction();
        }
@@ -378,7 +386,9 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
        public function initializeControllerArgumentsBaseValidators() {
                foreach ($this->arguments as $argument) {
                        $validator = $this->validatorResolver->getBaseValidatorConjunction($argument->getDataType());
-                       if ($validator !== NULL) $argument->setValidator($validator);
+                       if ($validator !== NULL) {
+                               $argument->setValidator($validator);
+                       }
                }
        }
 
@@ -391,11 +401,10 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
                if ($this->configurationManager->isFeatureEnabled('rewrittenPropertyMapper')) {
                        foreach ($this->arguments as $argument) {
                                $argumentName = $argument->getName();
-
                                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 Tx_Extbase_MVC_Controller_Exception_RequiredArgumentMissingException(('Required argument "' . $argumentName) . '" is not set.', 1298012500);
                                }
                        }
                } else {
@@ -403,14 +412,16 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
                        $optionalPropertyNames = array();
                        $allPropertyNames = $this->arguments->getArgumentNames();
                        foreach ($allPropertyNames as $propertyName) {
-                               if ($this->arguments[$propertyName]->isRequired() === FALSE) $optionalPropertyNames[] = $propertyName;
+                               if ($this->arguments[$propertyName]->isRequired() === FALSE) {
+                                       $optionalPropertyNames[] = $propertyName;
+                               }
                        }
-
                        $validator = $this->objectManager->create('Tx_Extbase_MVC_Controller_ArgumentsValidator');
                        $this->deprecatedPropertyMapper->mapAndValidate($allPropertyNames, $this->request->getArguments(), $this->arguments, $optionalPropertyNames, $validator);
-
                        $this->argumentsMappingResults = $this->deprecatedPropertyMapper->getMappingResults();
                }
        }
+
 }
+
 ?>
\ No newline at end of file
index 8a5264e..34f193e 100644 (file)
@@ -1,30 +1,29 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
-*  All rights reserved
-*
-*  This class is a backport of the corresponding class of FLOW3.
-*  All credits go to the v5 team.
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
+ *  Copyright notice
+ *
+ *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
+ *  All rights reserved
+ *
+ *  This class is a backport of the corresponding class of FLOW3.
+ *  All credits go to the v5 team.
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 /**
  * A multi action controller. This is by far the most common base class for Controllers.
  *
@@ -56,6 +55,7 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
        /**
         * Pattern after which the view object name is built if no Fluid template
         * is found.
+        *
         * @var string
         * @api
         */
@@ -83,6 +83,7 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
 
        /**
         * Name of the action method
+        *
         * @var string
         * @api
         */
@@ -90,6 +91,7 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
 
        /**
         * Name of the special error action method which is called in case of errors
+        *
         * @var string
         * @api
         */
@@ -123,7 +125,6 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
         */
        public function canProcessRequest(Tx_Extbase_MVC_RequestInterface $request) {
                return parent::canProcessRequest($request);
-
        }
 
        /**
@@ -135,30 +136,24 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
         */
        public function processRequest(Tx_Extbase_MVC_RequestInterface $request, Tx_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 Tx_Extbase_MVC_Exception_UnsupportedRequestType((((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) {
                        $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->setRequest($request);
-
                $this->actionMethodName = $this->resolveActionMethodName();
-
                $this->initializeActionMethodArguments();
                $this->initializeActionMethodValidators();
-
                $this->initializeAction();
                $actionInitializationMethodName = 'initialize' . ucfirst($this->actionMethodName);
                if (method_exists($this, $actionInitializationMethodName)) {
                        call_user_func(array($this, $actionInitializationMethodName));
                }
-
                $this->mapRequestArgumentsToControllerArguments();
                $this->checkRequestHash();
                $this->controllerContext = $this->buildControllerContext();
@@ -180,7 +175,6 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
         */
        protected function initializeActionMethodArguments() {
                $methodParameters = $this->reflectionService->getMethodParameters(get_class($this), $this->actionMethodName);
-
                foreach ($methodParameters as $parameterName => $parameterInfo) {
                        $dataType = NULL;
                        if (isset($parameterInfo['type'])) {
@@ -188,11 +182,11 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
                        } elseif ($parameterInfo['array']) {
                                $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);
-
-                       $defaultValue = (isset($parameterInfo['defaultValue']) ? $parameterInfo['defaultValue'] : NULL);
-
-                       $this->arguments->addNewArgument($parameterName, $dataType, ($parameterInfo['optional'] === FALSE), $defaultValue);
+                       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);
+                       }
+                       $defaultValue = isset($parameterInfo['defaultValue']) ? $parameterInfo['defaultValue'] : NULL;
+                       $this->arguments->addNewArgument($parameterName, $dataType, $parameterInfo['optional'] === FALSE, $defaultValue);
                }
        }
 
@@ -211,20 +205,16 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
        protected function initializeActionMethodValidators() {
                // TODO: still needs to be modified
                $parameterValidators = $this->validatorResolver->buildMethodArgumentsValidatorConjunctions(get_class($this), $this->actionMethodName);
-
                $dontValidateAnnotations = array();
-
                if (!$this->configurationManager->isFeatureEnabled('rewrittenPropertyMapper')) {
-                               // If the rewritten property mapper is *enabled*, we do not support @dontvalidate annotation, thus $dontValidateAnnotations stays empty.
+                       // If the rewritten property mapper is *enabled*, we do not support @dontvalidate annotation, thus $dontValidateAnnotations stays empty.
                        $methodTagsValues = $this->reflectionService->getMethodTagsValues(get_class($this), $this->actionMethodName);
                        if (isset($methodTagsValues['dontvalidate'])) {
                                $dontValidateAnnotations = $methodTagsValues['dontvalidate'];
                        }
                }
-
                foreach ($this->arguments as $argument) {
                        $validator = $parameterValidators[$argument->getName()];
-
                        if (array_search('$' . $argument->getName(), $dontValidateAnnotations) === FALSE) {
                                $baseValidatorConjunction = $this->validatorResolver->getBaseValidatorConjunction($argument->getDataType());
                                if ($baseValidatorConjunction !== NULL) {
@@ -243,7 +233,9 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
         */
        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);
+               if (!method_exists($this, $actionMethodName)) {
+                       throw new Tx_Extbase_MVC_Exception_NoSuchAction(((('An action "' . $actionMethodName) . '" does not exist in controller "') . get_class($this)) . '".', 1186669086);
+               }
                return $actionMethodName;
        }
 
@@ -259,14 +251,12 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
         */
        protected function callActionMethod() {
                if ($this->configurationManager->isFeatureEnabled('rewrittenPropertyMapper')) {
-                               // enabled since Extbase 1.4.0.
+                       // enabled since Extbase 1.4.0.
                        $preparedArguments = array();
                        foreach ($this->arguments as $argument) {
                                $preparedArguments[] = $argument->getValue();
                        }
-
                        $validationResult = $this->arguments->getValidationResults();
-
                        if (!$validationResult->hasErrors()) {
                                $actionResult = call_user_func_array(array($this, $this->actionMethodName), $preparedArguments);
                        } else {
@@ -275,18 +265,18 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
                                if (isset($methodTagsValues['ignorevalidation'])) {
                                        $ignoreValidationAnnotations = $methodTagsValues['ignorevalidation'];
                                }
-
-                                       // if there exists more errors than in ignoreValidationAnnotations_=> call error method
-                                       // else => call action method
+                               // if there exists more errors than in ignoreValidationAnnotations_=> call error method
+                               // else => call action method
                                $shouldCallActionMethod = TRUE;
                                foreach ($validationResult->getSubResults() as $argumentName => $subValidationResult) {
-                                       if (!$subValidationResult->hasErrors()) continue;
-
-                                       if (array_search('$' . $argumentName, $ignoreValidationAnnotations) !== FALSE) continue;
-
+                                       if (!$subValidationResult->hasErrors()) {
+                                               continue;
+                                       }
+                                       if (array_search('$' . $argumentName, $ignoreValidationAnnotations) !== FALSE) {
+                                               continue;
+                                       }
                                        $shouldCallActionMethod = FALSE;
                                }
-
                                if ($shouldCallActionMethod) {
                                        $actionResult = call_user_func_array(array($this, $this->actionMethodName), $preparedArguments);
                                } else {
@@ -294,26 +284,24 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
                                }
                        }
                } else {
-                               // @deprecated since Extbase 1.4.0, will be removed with Extbase 6.0
+                       // @deprecated since Extbase 1.4.0, will be removed with Extbase 6.0
                        $argumentsAreValid = TRUE;
                        $preparedArguments = array();
                        foreach ($this->arguments as $argument) {
                                $preparedArguments[] = $argument->getValue();
                        }
-
                        if ($this->argumentsMappingResults->hasErrors()) {
                                $actionResult = call_user_func(array($this, $this->errorMethodName));
                        } else {
                                $actionResult = call_user_func_array(array($this, $this->actionMethodName), $preparedArguments);
                        }
                }
-
                if ($actionResult === NULL && $this->view instanceof Tx_Extbase_MVC_View_ViewInterface) {
                        $this->response->appendContent($this->view->render());
                } elseif (is_string($actionResult) && strlen($actionResult) > 0) {
                        $this->response->appendContent($actionResult);
                } elseif (is_object($actionResult) && method_exists($actionResult, '__toString')) {
-                       $this->response->appendContent((string)$actionResult);
+                       $this->response->appendContent((string) $actionResult);
                }
        }
 
@@ -343,15 +331,16 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
                }
                if (!isset($view)) {
                        $view = $this->objectManager->create('Tx_Extbase_MVC_View_NotFoundView');
-                       $view->assign('errorMessage', 'No template was found. View could not be resolved for action "' . $this->request->getControllerActionName() . '"');
+                       $view->assign('errorMessage', ('No template was found. View could not be resolved for action "' . $this->request->getControllerActionName()) . '"');
                }
                $view->setControllerContext($this->controllerContext);
-
                if (method_exists($view, 'injectSettings')) {
                        $view->injectSettings($this->settings);
                }
-               $view->initializeView(); // In FLOW3, solved through Object Lifecycle methods, we need to call it explicitely
-               $view->assign('settings', $this->settings); // same with settings injection.
+               $view->initializeView();
+               // In FLOW3, solved through Object Lifecycle methods, we need to call it explicitely
+               $view->assign('settings', $this->settings);
+               // same with settings injection.
                return $view;
        }