[CLEANUP] Cleaned up Extbase
authorAlexander Schnitzler <alex.schnitzler@typovision.de>
Tue, 1 May 2012 12:04:42 +0000 (14:04 +0200)
committerMarc Bastian Heinrichs <typo3@mbh-software.de>
Tue, 1 May 2012 12:04:42 +0000 (14:04 +0200)
* Uninitialized vars
* Uninitialized properties
* Undefined classes
* PHPdoc

Change-Id: I7679c8020c56883825cb7dd1bb6d6033ee38148f
Fixes: #34970
Releases: 6.0

94 files changed:
typo3/sysext/extbase/Classes/Configuration/AbstractConfigurationManager.php
typo3/sysext/extbase/Classes/Configuration/BackendConfigurationManager.php
typo3/sysext/extbase/Classes/Configuration/FrontendConfigurationManager.php
typo3/sysext/extbase/Classes/Core/Bootstrap.php
typo3/sysext/extbase/Classes/Domain/Model/FrontendUser.php
typo3/sysext/extbase/Classes/Domain/Model/FrontendUserGroup.php
typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php
typo3/sysext/extbase/Classes/DomainObject/AbstractValueObject.php
typo3/sysext/extbase/Classes/DomainObject/DomainObjectInterface.php
typo3/sysext/extbase/Classes/MVC/CLI/Request.php
typo3/sysext/extbase/Classes/MVC/CLI/RequestHandler.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/Arguments.php
typo3/sysext/extbase/Classes/MVC/Controller/CommandController.php
typo3/sysext/extbase/Classes/MVC/Controller/ControllerContext.php
typo3/sysext/extbase/Classes/MVC/Controller/ControllerInterface.php
typo3/sysext/extbase/Classes/MVC/Controller/FlashMessages.php
typo3/sysext/extbase/Classes/MVC/Request.php
typo3/sysext/extbase/Classes/MVC/View/EmptyView.php
typo3/sysext/extbase/Classes/MVC/View/NotFoundView.php
typo3/sysext/extbase/Classes/MVC/Web/BackendRequestHandler.php
typo3/sysext/extbase/Classes/MVC/Web/FrontendRequestHandler.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/Container.php
typo3/sysext/extbase/Classes/Persistence/Repository.php
typo3/sysext/extbase/Classes/Property/PropertyMappingConfiguration.php
typo3/sysext/extbase/Classes/Property/PropertyMappingConfigurationInterface.php
typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractTypeConverter.php
typo3/sysext/extbase/Classes/Property/TypeConverter/ObjectStorageConverter.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/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/Security/Channel/RequestHashService.php
typo3/sysext/extbase/Classes/Service/CacheService.php
typo3/sysext/extbase/Classes/Service/ExtensionService.php
typo3/sysext/extbase/Classes/Service/TypoScriptService.php
typo3/sysext/extbase/Classes/Utility/Debugger.php
typo3/sysext/extbase/Classes/Utility/ExtbaseRequirementsCheck.php
typo3/sysext/extbase/Classes/Utility/Extension.php
typo3/sysext/extbase/Classes/Utility/FrontendSimulator.php
typo3/sysext/extbase/Classes/Utility/Localization.php
typo3/sysext/extbase/Classes/Utility/TypeHandling.php
typo3/sysext/extbase/Classes/Utility/TypoScript.php
typo3/sysext/extbase/Classes/Validation/Validator/AbstractCompositeValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/AbstractValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/ConjunctionValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/DateTimeValidator.php
typo3/sysext/extbase/Classes/Validation/Validator/GenericObjectValidator.php
typo3/sysext/extbase/Classes/Validation/ValidatorResolver.php
typo3/sysext/extbase/Tests/Unit/BaseTestCase.php
typo3/sysext/extbase/Tests/Unit/Error/ResultTest.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/CommandTest.php
typo3/sysext/extbase/Tests/Unit/MVC/Controller/ActionControllerTest.php
typo3/sysext/extbase/Tests/Unit/MVC/Controller/ArgumentTest.php
typo3/sysext/extbase/Tests/Unit/MVC/Fixture/CLI/Command/MockCommandController.php
typo3/sysext/extbase/Tests/Unit/MVC/Web/Routing/UriBuilderTest.php
typo3/sysext/extbase/Tests/Unit/Object/Container/Fixtures/NamespaceTestclasses.php
typo3/sysext/extbase/Tests/Unit/Object/Container/Fixtures/Testclasses.php
typo3/sysext/extbase/Tests/Unit/Persistence/QueryResultTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/Storage/Typo3DbBackendTest.php
typo3/sysext/extbase/Tests/Unit/Property/PropertyMapperTest.php
typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/PersistentObjectConverterTest.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/Security/Channel/RequestHashServiceTest.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/Validation/Validator/AbstractValidatorTestcase.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/IntegerValidatorTest.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/ValidatorResolverTest.php

index 91ad464..7111cae 100755 (executable)
@@ -101,12 +101,14 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
        }
 
        /**
-        * @return tslib_cObj
+        * @return tslib_cObj|NULL
         */
        public function getContentObject() {
                if ($this->contentObject !== NULL) {
                        return $this->contentObject;
                }
+
+               return NULL;
        }
 
        /**
@@ -212,8 +214,9 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
        }
 
        /**
-        * @param array $frameworkConfiguration
-        * @param array $overriddenSwitchableControllerActions in the format array('Controller1' => array('action1', 'action2'), 'Controller2' => ...)
+        * @param array &$frameworkConfiguration
+        * @param array $switchableControllerActions
+        *        in the format array('Controller1' => array('action1', 'action2'), 'Controller2' => ...)
         * @return void
         */
        protected function overrideSwitchableControllerActions(array &$frameworkConfiguration, array $switchableControllerActions) {
index 0c84d6f..1f75e0f 100644 (file)
@@ -145,6 +145,7 @@ class Tx_Extbase_Configuration_BackendConfigurationManager extends Tx_Extbase_Co
         * could not be loaded; to make sure Extbase also works in Backend modules
         * in all contexts.
         *
+        * @param array $frameworkConfiguration
         * @return array
         */
        protected function getContextSpecificFrameworkConfiguration(array $frameworkConfiguration) {
index bf4b683..40bfbd6 100644 (file)
@@ -205,6 +205,7 @@ class Tx_Extbase_Configuration_FrontendConfigurationManager extends Tx_Extbase_C
         *
         * @param array $nodeArray The flexForm node to parse
         * @param string $valuePointer The valuePointer to use for value retrieval
+        * @return array
         * @deprecated since Extbase 1.4; will be removed in Extbase 6.0
         */
        protected function walkFlexformNode($nodeArray, $valuePointer = 'vDEF') {
index c12b8c4..7c188f6 100644 (file)
@@ -232,7 +232,7 @@ class Tx_Extbase_Core_Bootstrap implements Tx_Extbase_Core_BootstrapInterface {
                // @see Tx_Extbase_MVC_Web_FrontendRequestHandler::handleRequest()
                if ($response === NULL) {
                        $this->reflectionService->shutdown();
-                       return;
+                       return '';
                }
                if (count($response->getAdditionalHeaderData()) > 0) {
                        $GLOBALS['TSFE']->additionalHeaderData[] = implode(chr(10), $response->getAdditionalHeaderData());
index d789012..f263abe 100644 (file)
@@ -143,6 +143,8 @@ class Tx_Extbase_Domain_Model_FrontendUser extends Tx_Extbase_DomainObject_Abstr
         * Constructs a new Front-End User
         *
         * @api
+        * @param string $username
+        * @param string $password
         */
        public function __construct($username = '', $password = '') {
                $this->username = $username;
index fe2aa8d..c33e4a9 100644 (file)
@@ -57,6 +57,7 @@ class Tx_Extbase_Domain_Model_FrontendUserGroup extends Tx_Extbase_DomainObject_
        /**
         * Constructs a new Frontend User Group
         *
+        * @param string $title
         */
        public function __construct($title) {
                $this->setTitle($title);
index 37d16a9..9f6722e 100644 (file)
@@ -94,6 +94,7 @@ abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbas
        /**
         * Setter for the pid.
         *
+        * @param integer|NULL $pid
         * @return void
         */
        public function setPid($pid) {
@@ -116,13 +117,13 @@ abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbas
                        return (int)$this->pid;
                }
        }
-       
+
        /**
         * Reconstitutes a property. Only for internal use.
         *
         * @param string $propertyName
-        * @param string $value
-        * @return void
+        * @param mixed $propertyValue
+        * @return boolean
         */
        public function _setProperty($propertyName, $propertyValue) {
                if ($this->_hasProperty($propertyName)) {
@@ -135,6 +136,7 @@ abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbas
        /**
         * Returns the property value of the given property name. Only for internal use.
         *
+        * @param string $propertyName
         * @return mixed The propertyValue
         */
        public function _getProperty($propertyName) {
@@ -155,12 +157,12 @@ abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbas
                }
                return $properties;
        }
-       
+
        /**
         * Returns the property value of the given property name. Only for internal use.
         *
-        * @return boolean TRUE bool true if the property exists, FALSE if it doesn't exist or
-        * NULL in case of an error.
+        * @param string $propertyName
+        * @return boolean TRUE bool true if the property exists, FALSE if it doesn't exist or NULL in case of an error.
         */
        public function _hasProperty($propertyName) {
                return property_exists($this, $propertyName);
@@ -247,7 +249,7 @@ abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbas
                        return NULL;
                }
        }
-       
+
        /**
         * Returns TRUE if the properties were modified after reconstitution
         *
@@ -291,7 +293,7 @@ abstract class Tx_Extbase_DomainObject_AbstractDomainObject implements Tx_Extbas
                }
                return $result;
        }
-       
+
        /**
         * Returns TRUE if the object has been clonesd, cloned, FALSE otherwise.
         *
index 983dcc7..d828c45 100644 (file)
@@ -35,7 +35,7 @@ abstract class Tx_Extbase_DomainObject_AbstractValueObject extends Tx_Extbase_Do
        /**
         * Returns the value of the Value Object. Must be overwritten by a concrete value object.
         *
-        * @return void
+        * @return string
         */
        public function getValue() {
                return $this->__toString();
index b4da515..7b565e1 100644 (file)
@@ -46,6 +46,7 @@ interface Tx_Extbase_DomainObject_DomainObjectInterface {
        /**
         * Setter for the pid.
         *
+        * @param integer $pid
         * @return void
         */
        public function setPid($pid);
@@ -76,6 +77,7 @@ interface Tx_Extbase_DomainObject_DomainObjectInterface {
        /**
         * Returns the property value of the given property name. Only for internal use.
         *
+        * @param string $propertyName
         * @return mixed The propertyValue
         */
        public function _getProperty($propertyName);
index 277fa44..cef6e76 100644 (file)
@@ -69,7 +69,6 @@ class Tx_Extbase_MVC_CLI_Request implements Tx_Extbase_MVC_RequestInterface {
        protected $dispatched = FALSE;
 
        /**
-        *
         * @var array
         */
        protected $commandLineArguments;
index 51963d5..7797db3 100644 (file)
@@ -98,6 +98,7 @@ class Tx_Extbase_MVC_CLI_RequestHandler implements Tx_Extbase_MVC_RequestHandler
         */
        public function handleRequest() {
                $request = $this->requestBuilder->build();
+               /** @var $response Tx_Extbase_MVC_CLI_Response */
                $response = $this->objectManager->create('Tx_Extbase_MVC_CLI_Response');
                $this->dispatcher->dispatch($request, $response);
                $response->send();
index 19d8e83..4bbf1b2 100644 (file)
@@ -197,7 +197,7 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
         * replace / modify the supporteRequestTypes property or override this
         * method.
         *
-        * @param Tx_Extbase_MVC_Request $request The current request
+        * @param Tx_Extbase_MVC_RequestInterface $request The current request
         * @return boolean TRUE if this request type is supported, otherwise FALSE
         * @api
         */
@@ -211,8 +211,8 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
        /**
         * Processes a general request. The result can be returned by altering the given response.
         *
-        * @param Tx_Extbase_MVC_Request $request The request object
-        * @param Tx_Extbase_MVC_Response $response The response, modified by this handler
+        * @param Tx_Extbase_MVC_RequestInterface $request The request object
+        * @param Tx_Extbase_MVC_ResponseInterface $response The response, modified by this handler
         * @return void
         * @throws Tx_Extbase_MVC_Exception_UnsupportedRequestType if the controller doesn't support the current request type
         * @api
@@ -340,7 +340,7 @@ abstract class Tx_Extbase_MVC_Controller_AbstractController implements Tx_Extbas
         * Adds the base uri if not already in place.
         *
         * @param string $uri The URI
-        * @return void
+        * @return string
         */
        protected function addBaseUriIfNecessary($uri) {
                $baseUri = $this->request->getBaseUri();
index 58c6910..6063f71 100644 (file)
@@ -118,7 +118,7 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
         * replace / modify the supporteRequestTypes property or override this
         * method.
         *
-        * @param Tx_Extbase_MVC_Request $request The current request
+        * @param Tx_Extbase_MVC_RequestInterface $request The current request
         * @return boolean TRUE if this request type is supported, otherwise FALSE
         */
        public function canProcessRequest(Tx_Extbase_MVC_RequestInterface $request) {
@@ -129,8 +129,8 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
        /**
         * Handles a request. The result output is returned by altering the given response.
         *
-        * @param Tx_Extbase_MVC_Request $request The request object
-        * @param Tx_Extbase_MVC_Response $response The response, modified by this handler
+        * @param Tx_Extbase_MVC_RequestInterface $request The request object
+        * @param Tx_Extbase_MVC_ResponseInterface $response The response, modified by this handler
         * @return void
         */
        public function processRequest(Tx_Extbase_MVC_RequestInterface $request, Tx_Extbase_MVC_ResponseInterface $response) {
@@ -252,7 +252,6 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
         * response object. If the action doesn't return anything and a valid
         * view exists, the view is rendered automatically.
         *
-        * @param string $actionMethodName Name of the action method to call
         * @return void
         * @api
         */
@@ -321,7 +320,7 @@ class Tx_Extbase_MVC_Controller_ActionController extends Tx_Extbase_MVC_Controll
         * By default, this method tries to locate a view with a name matching
         * the current action.
         *
-        * @return void
+        * @return string
         * @api
         */
        protected function resolveView() {
index 7db1a51..f768c68 100644 (file)
@@ -158,6 +158,11 @@ class Tx_Extbase_MVC_Controller_Argument {
        protected $origin = 0;
 
        /**
+        * @var Tx_Extbase_Persistence_ManagerInterface
+        */
+       protected $persistenceManager;
+
+       /**
         * Constructs this controller argument
         *
         * @param string $name Name of this argument
index d23c63b..036e75c 100644 (file)
@@ -45,6 +45,11 @@ class Tx_Extbase_MVC_Controller_Arguments extends ArrayObject {
        protected $argumentNames = array();
 
        /**
+        * @var array
+        */
+       protected $argumentShortNames = array();
+
+       /**
         * Constructor. If this one is removed, reflection breaks.
         */
        public function __construct() {
@@ -142,6 +147,7 @@ class Tx_Extbase_MVC_Controller_Arguments extends ArrayObject {
         * @return Tx_Extbase_MVC_Controller_Argument The new argument
         */
        public function addNewArgument($name, $dataType = 'Text', $isRequired = FALSE, $defaultValue = NULL) {
+               /** @var $argument Tx_Extbase_MVC_Controller_Argument */
                $argument = $this->objectManager->create('Tx_Extbase_MVC_Controller_Argument', $name, $dataType);
                $argument->setRequired($isRequired);
                $argument->setDefaultValue($defaultValue);
index 9a3097e..7f063a9 100644 (file)
@@ -245,7 +245,7 @@ class Tx_Extbase_MVC_Controller_CommandController implements Tx_Extbase_MVC_Cont
         *
         * @param string $text Text to output
         * @param array $arguments Optional arguments to use for sprintf
-        * @return void
+        * @return string
         * @see output()
         */
        protected function outputLine($text = '', array $arguments = array()) {
index 312a5fe..fd6816a 100644 (file)
@@ -91,7 +91,7 @@ class Tx_Extbase_MVC_Controller_ControllerContext {
        /**
         * Set the response of the controller
         *
-        * @param Tx_Extbase_MVC_Response $request
+        * @param Tx_Extbase_MVC_Response $response
         * @return void
         */
        public function setResponse(Tx_Extbase_MVC_Response $response) {
@@ -152,6 +152,7 @@ class Tx_Extbase_MVC_Controller_ControllerContext {
 
        /**
         * Tx_Extbase_MVC_Web_Routing_UriBuilder $uriBuilder
+        * @param Tx_Extbase_MVC_Web_Routing_UriBuilder $uriBuilder
         * @return void
         */
        public function setUriBuilder(Tx_Extbase_MVC_Web_Routing_UriBuilder $uriBuilder) {
index 7a4359d..d93767e 100644 (file)
@@ -46,7 +46,7 @@ interface Tx_Extbase_MVC_Controller_ControllerInterface {
        /**
         * Processes a general request. The result can be returned by altering the given response.
         *
-        * @param Tx_Extbase_MVC_Request $request The request object
+        * @param Tx_Extbase_MVC_RequestInterface $request The request object
         * @param Tx_Extbase_MVC_ResponseInterface $response The response, modified by the controller
         * @return void
         * @throws Tx_Extbase_MVC_Exception_UnsupportedRequestType if the controller doesn't support the current request type
index aec0920..2b154e0 100644 (file)
@@ -56,6 +56,7 @@ class Tx_Extbase_MVC_Controller_FlashMessages implements t3lib_Singleton {
                if (!is_string($message)) {
                        throw new InvalidArgumentException('The flash message must be string, ' . gettype($message) . ' given.', 1243258395);
                }
+               /** @var $flashMessage t3lib_FlashMessage */
                $flashMessage = t3lib_div::makeInstance(
                        't3lib_FlashMessage',
                        $message,
index 7d0b505..3c76527 100644 (file)
@@ -191,7 +191,7 @@ class Tx_Extbase_MVC_Request implements Tx_Extbase_MVC_RequestInterface {
        /**
         * Sets the plugin name.
         *
-        * @param string $extensionName The plugin name.
+        * @param string|NULL $pluginName
         * @return void
         */
        public function setPluginName($pluginName = NULL) {
index 1e682bd..c500562 100644 (file)
@@ -95,6 +95,8 @@ final class Tx_Extbase_MVC_View_EmptyView implements Tx_Extbase_MVC_View_ViewInt
         * directed to another type of view. This magic method should prevent PHP from issuing
         * a fatal error.
         *
+        * @param string $methodName
+        * @param array $arguments
         * @return void
         */
        public function __call($methodName, array $arguments) {
index 3999d81..c7c7955 100644 (file)
@@ -82,6 +82,8 @@ class Tx_Extbase_MVC_View_NotFoundView extends Tx_Extbase_MVC_View_AbstractView
         * directed to another type of view. This magic method should prevent PHP from issuing
         * a fatal error.
         *
+        * @param string $methodName
+        * @param array $arguments
         * @return void
         */
        public function __call($methodName, array $arguments) {
index 29ca2b3..37b60d2 100644 (file)
@@ -34,13 +34,13 @@ class Tx_Extbase_MVC_Web_BackendRequestHandler extends Tx_Extbase_MVC_Web_Abstra
        /**
         * Handles the web request. The response will automatically be sent to the client.
         *
-        * @return void
+        * @return Tx_Extbase_MVC_Web_Response
         */
        public function handleRequest() {
                $request = $this->requestBuilder->build();
 
-                       // Request hash service
-               $requestHashService = $this->objectManager->get('Tx_Extbase_Security_Channel_RequestHashService'); // singleton
+               /** @var $requestHashService Tx_Extbase_Security_Channel_RequestHashService */
+               $requestHashService = $this->objectManager->get('Tx_Extbase_Security_Channel_RequestHashService');
                $requestHashService->verifyRequest($request);
 
                $response = $this->objectManager->create('Tx_Extbase_MVC_Web_Response');
index 7e7c255..62871e5 100644 (file)
@@ -60,13 +60,13 @@ class Tx_Extbase_MVC_Web_FrontendRequestHandler extends Tx_Extbase_MVC_Web_Abstr
        /**
         * Handles the web request. The response will automatically be sent to the client.
         *
-        * @return Tx_Extbase_MVC_Web_Response
+        * @return Tx_Extbase_MVC_Web_Response|NULL
         */
        public function handleRequest() {
                $request = $this->requestBuilder->build();
 
-               // Request hash service
-               $requestHashService = $this->objectManager->get('Tx_Extbase_Security_Channel_RequestHashService'); // singleton
+               /** @var $requestHashService Tx_Extbase_Security_Channel_RequestHashService */
+               $requestHashService = $this->objectManager->get('Tx_Extbase_Security_Channel_RequestHashService');
                $requestHashService->verifyRequest($request);
 
                if ($this->extensionService->isActionCacheable(NULL, NULL, $request->getControllerName(), $request->getControllerActionName())) {
@@ -76,7 +76,7 @@ class Tx_Extbase_MVC_Web_FrontendRequestHandler extends Tx_Extbase_MVC_Web_Abstr
                        if ($contentObject->getUserObjectType() === tslib_cObj::OBJECTTYPE_USER) {
                                $contentObject->convertToUserIntObject();
                                // tslib_cObj::convertToUserIntObject() will recreate the object, so we have to stop the request here
-                               return;
+                               return NULL;
                        }
                        $request->setIsCached(FALSE);
                }
index 38082fb..29aabbd 100644 (file)
@@ -343,7 +343,7 @@ class Tx_Extbase_MVC_Web_Routing_UriBuilder {
        /**
         * Uid of the target page
         *
-        * @param integer $pageUid
+        * @param integer $targetPageUid
         * @return Tx_Extbase_MVC_Web_Routing_UriBuilder the current UriBuilder to allow method chaining
         * @api
         */
@@ -365,7 +365,7 @@ class Tx_Extbase_MVC_Web_Routing_UriBuilder {
        /**
         * Sets the page type of the target URI. Defaults to 0
         *
-        * @param integer $pageType
+        * @param integer $targetPageType
         * @return Tx_Extbase_MVC_Web_Routing_UriBuilder the current UriBuilder to allow method chaining
         * @api
         */
@@ -687,7 +687,7 @@ class Tx_Extbase_MVC_Web_Routing_UriBuilder {
         * Converts a given object recursively into an array.
         *
         * @param Tx_Extbase_DomainObject_AbstractDomainObject $object
-        * @return void
+        * @return array
         */
        // TODO Refactore this into convertDomainObjectsToIdentityArrays()
        public function convertTransientObjectToArray(Tx_Extbase_DomainObject_AbstractDomainObject $object) {
index a1ae30c..397eb7d 100644 (file)
@@ -84,12 +84,12 @@ class Tx_Extbase_Object_Container_ClassInfo {
        private $isInitializeable = FALSE;
 
        /**
-        *
         * @param string $className
         * @param array $constructorArguments
         * @param array $injectMethods
         * @param boolean $isSingleton
         * @param boolean $isInitializeable
+        * @param array $injectProperties
         */
        public function __construct($className, array $constructorArguments, array $injectMethods, $isSingleton = FALSE, $isInitializeable = FALSE, array $injectProperties = array()) {
                $this->className = $className;
index a6c46c3..dbd007a 100644 (file)
@@ -54,6 +54,7 @@ class Tx_Extbase_Object_Container_ClassInfoCache {
        /**
         * checks if cacheentry exists for id
         * @param string $id
+        * @return boolean
         */
        public function has($id) {
                return isset($this->level1Cache[$id]) || $this->level2Cache->has($id);
index d8567c3..2e34c24 100644 (file)
@@ -75,8 +75,6 @@ class Tx_Extbase_Object_Container_Container implements t3lib_Singleton {
         * be a singleton.
         *
         * @see getContainer()
-        * @param void
-        * @return void
         */
        public function __construct() { }
 
@@ -346,4 +344,6 @@ class Tx_Extbase_Object_Container_Container implements t3lib_Singleton {
 
                return $this->getClassInfoCache()->get($classNameHash);
        }
-}
\ No newline at end of file
+}
+
+?>
\ No newline at end of file
index 9369cbb..09494ca 100644 (file)
@@ -350,7 +350,7 @@ class Tx_Extbase_Persistence_Repository implements Tx_Extbase_Persistence_Reposi
         * @param string $methodName The name of the magic method
         * @param string $arguments The arguments of the magic method
         * @throws Tx_Extbase_Persistence_Exception_UnsupportedMethod
-        * @return void
+        * @return mixed
         * @api
         */
        public function __call($methodName, $arguments) {
index ae65829..12ad414 100644 (file)
@@ -76,6 +76,7 @@ class Tx_Extbase_Property_PropertyMappingConfiguration implements Tx_Extbase_Pro
        }
 
        /**
+        * @param string $propertyName
         * @return TRUE if the given propertyName should be mapped, FALSE otherwise.
         * @todo: extend to enable whitelisting / blacklisting of properties.
         * @author Sebastian Kurfürst <sebastian@typo3.org>
index 488eb1a..061e61a 100644 (file)
@@ -29,6 +29,7 @@
 interface Tx_Extbase_Property_PropertyMappingConfigurationInterface {
 
        /**
+        * @param string $propertyName
         * @return TRUE if the given propertyName should be mapped, FALSE otherwise.
         * @api
         */
index 07e1d35..94b196c 100644 (file)
@@ -104,6 +104,7 @@ abstract class Tx_Extbase_Property_TypeConverter_AbstractTypeConverter implement
        /**
         * Returns an empty list of sub property names
         *
+        * @param mixed $source (unused)
         * @return array<string>
         * @api
         */
index c45e280..86895e4 100644 (file)
@@ -59,6 +59,7 @@ class Tx_Extbase_Property_TypeConverter_ObjectStorageConverter extends Tx_Extbas
        /**
         * Returns the source, if it is an array, otherwise an empty array.
         *
+        * @param mixed $source
         * @return array
         * @api
         */
index 56549a3..35f2f22 100644 (file)
@@ -71,6 +71,7 @@ interface Tx_Extbase_Property_TypeConverterInterface {
         * Return a list of sub-properties inside the source object.
         * The "key" is the sub-property name, and the "value" is the value of the sub-property.
         *
+        * @param mixed $source
         * @return array<mixed>
         * @api
         */
index b10c2d6..3283015 100644 (file)
@@ -68,6 +68,7 @@ class Tx_Extbase_Reflection_ClassReflection extends ReflectionClass {
         * that Tx_Extbase_Reflection_MethodReflection objects are returned instead of the
         * orginal ReflectionMethod instances.
         *
+        * @param string $name
         * @return Tx_Extbase_Reflection_MethodReflection Method reflection object of the named method
         */
        public function getMethod($name) {
@@ -169,6 +170,7 @@ class Tx_Extbase_Reflection_ClassReflection extends ReflectionClass {
 
        /**
         * Returns the values of the specified tag
+        * @param string $tag
         * @return array Values of the given tag
         */
        public function getTagValues($tag) {
index 356c080..3912169 100644 (file)
@@ -38,7 +38,7 @@ class Tx_Extbase_Reflection_ClassSchema {
         */
        const MODELTYPE_ENTITY = 1;
        const MODELTYPE_VALUEOBJECT = 2;
-       
+
        /**
         * Name of the class this schema is referring to
         *
@@ -136,6 +136,7 @@ class Tx_Extbase_Reflection_ClassSchema {
         * Returns the given property defined in this schema. Check with
         * hasProperty($propertyName) before!
         *
+        * @param string $propertyName
         * @return array
         * @author Karsten Dambekalns <karsten@typo3.org>
         */
index cfe0a54..ccabf15 100644 (file)
@@ -89,7 +89,7 @@ class Tx_Extbase_Reflection_ObjectAccess {
         */
        static public function getPropertyInternal($subject, $propertyName, $forceDirectAccess, &$propertyExists) {
                if ($subject === NULL) {
-                       return;
+                       return NULL;
                }
                $propertyExists = TRUE;
                if (is_array($subject)) {
@@ -97,7 +97,7 @@ class Tx_Extbase_Reflection_ObjectAccess {
                                return $subject[$propertyName];
                        }
                        $propertyExists = FALSE;
-                       return;
+                       return NULL;
                }
                if ($forceDirectAccess === TRUE) {
                        if (property_exists(get_class($subject), $propertyName)) {
@@ -124,6 +124,8 @@ class Tx_Extbase_Reflection_ObjectAccess {
                        return $subject->$propertyName;
                }
                $propertyExists = FALSE;
+
+               return NULL;
        }
 
        /**
@@ -328,7 +330,7 @@ class Tx_Extbase_Reflection_ObjectAccess {
         * Build the setter method name for a given property by capitalizing the
         * first letter of the property, and prepending it with "set".
         *
-        * @param string $property Name of the property
+        * @param string $propertyName Name of the property
         * @return string Name of the setter method name
         */
        static public function buildSetterMethodName($propertyName) {
index 5f52d16..990ac65 100644 (file)
@@ -34,9 +34,8 @@ class Tx_Extbase_Reflection_ParameterReflection extends ReflectionParameter {
        /**
         * The constructor, initializes the reflection parameter
         *
-        * @param  string $functionName: Name of the function
-        * @param  string $propertyName: Name of the property to reflect
-        * @return void
+        * @param string $function
+        * @param string $parameterName
         */
        public function __construct($function, $parameterName) {
                parent::__construct($function, $parameterName);
index 0ac47af..bb3cb49 100644 (file)
@@ -41,7 +41,6 @@ class Tx_Extbase_Reflection_PropertyReflection extends ReflectionProperty {
         *
         * @param string $className Name of the property's class
         * @param string $propertyName Name of the property to reflect
-        * @return void
         */
        public function __construct($className, $propertyName) {
                parent::__construct($className, $propertyName);
@@ -71,6 +70,7 @@ class Tx_Extbase_Reflection_PropertyReflection extends ReflectionProperty {
        /**
         * Returns the values of the specified tag
         *
+        * @param string $tag
         * @return array Values of the given tag
         */
        public function getTagValues($tag) {
index b857f2c..b918cd2 100644 (file)
@@ -145,6 +145,11 @@ class Tx_Extbase_Reflection_Service implements t3lib_Singleton {
        protected $cacheIdentifier;
 
        /**
+        * @var array
+        */
+       protected $methodReflections;
+
+       /**
         * @param Tx_Extbase_Object_ObjectManagerInterface $objectManager
         * @return void
         */
@@ -401,6 +406,7 @@ class Tx_Extbase_Reflection_Service implements t3lib_Singleton {
        /**
         * Builds class schemata from classes annotated as entities or value objects
         *
+        * @param string $className
         * @return Tx_Extbase_Reflection_ClassSchema The class schema
         */
        protected function buildClassSchema($className) {
@@ -442,6 +448,8 @@ class Tx_Extbase_Reflection_Service implements t3lib_Singleton {
         * Converts the given parameter reflection into an information array
         *
         * @param ReflectionParameter $parameter The parameter to reflect
+        * @param integer $parameterPosition
+        * @param ReflectionMethod|NULL $method
         * @return array Parameter information array
         */
        protected function convertParameterReflectionToArray(ReflectionParameter $parameter, $parameterPosition, ReflectionMethod $method = NULL) {
index 29281d8..c9811f9 100644 (file)
@@ -206,6 +206,8 @@ class Tx_Extbase_Scheduler_FieldProvider implements Tx_Scheduler_AdditionalField
                                return $argumentType;
                        }
                }
+
+               return '';
        }
 
        /**
index 27d0ba6..4e674d3 100644 (file)
@@ -63,6 +63,7 @@ class Tx_Extbase_Security_Channel_RequestHashService implements t3lib_singleton
         * Generate a request hash for a list of form fields
         *
         * @param array $formFieldNames Array of form fields
+        * @param string $fieldNamePrefix
         * @return string request hash
         * @author Sebastian Kurfürst <sebastian@typo3.org>
         * @todo might need to become public API lateron, as we need to call it from Fluid
@@ -159,7 +160,7 @@ class Tx_Extbase_Security_Channel_RequestHashService implements t3lib_singleton
         * Check if every element in $requestArguments is in $allowedFields as well.
         *
         * @param array $requestArguments
-        * @param array $allowedFiels
+        * @param array $allowedFields
         * @return boolean TRUE if ALL fields inside requestArguments are in $allowedFields, FALSE otherwise.
         */
        protected function checkFieldNameInclusion(array $requestArguments, array $allowedFields) {
index 8de4ed6..9ff7721 100644 (file)
@@ -48,7 +48,7 @@ class Tx_Extbase_Service_CacheService implements t3lib_Singleton {
        /**
         * Flushes cache_pages or cachingframework_cache_pages.
         *
-        * @param array $pageIdsToClear pageIds to clear the cache for
+        * @param array|NULL $pageIds pageIds to clear the cache for
         * @return void
         */
        protected function flushPageCache($pageIds = NULL) {
@@ -66,7 +66,7 @@ class Tx_Extbase_Service_CacheService implements t3lib_Singleton {
        /**
         * Flushes cache_pagesection or cachingframework_cache_pagesection.
         *
-        * @param array $pageIdsToClear pageIds to clear the cache for
+        * @param array|NULL $pageIds pageIds to clear the cache for
         * @return void
         */
        protected function flushPageSectionCache($pageIds = NULL) {
index 70ee787..c0448ce 100644 (file)
@@ -44,7 +44,7 @@ class Tx_Extbase_Service_ExtensionService implements t3lib_Singleton {
        protected $configurationManager;
 
        /**
-        * @param Tx_Extbase_Object_ManagerInterface $objectManager
+        * @param Tx_Extbase_Object_ObjectManagerInterface $objectManager
         * @return void
         */
        public function injectObjectManager(Tx_Extbase_Object_ObjectManagerInterface $objectManager) {
@@ -182,11 +182,11 @@ class Tx_Extbase_Service_ExtensionService implements t3lib_Singleton {
         *
         * @param string $extensionName name of the extension to retrieve the target PID for
         * @param string $pluginName name of the plugin to retrieve the target PID for
-        * @return string
+        * @return string|NULL
         */
        public function getDefaultControllerNameByPlugin($extensionName, $pluginName) {
                if (!is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['extbase']['extensions'][$extensionName]['plugins'][$pluginName]['controllers'])) {
-                       return;
+                       return NULL;
                }
                $controllers = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['extbase']['extensions'][$extensionName]['plugins'][$pluginName]['controllers'];
                return key($controllers);
@@ -198,11 +198,11 @@ class Tx_Extbase_Service_ExtensionService implements t3lib_Singleton {
         * @param string $extensionName name of the extension to retrieve the target PID for
         * @param string $pluginName name of the plugin to retrieve the target PID for
         * @param string $controllerName name of the controller to retrieve default action for
-        * @return string
+        * @return string|NULL
         */
        public function getDefaultActionNameByPluginAndController($extensionName, $pluginName, $controllerName) {
                if (!is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['extbase']['extensions'][$extensionName]['plugins'][$pluginName]['controllers'][$controllerName]['actions'])) {
-                       return;
+                       return NULL;
                }
                $actions = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['extbase']['extensions'][$extensionName]['plugins'][$pluginName]['controllers'][$controllerName]['actions'];
                return current($actions);
index 87d46e8..41da787 100644 (file)
@@ -38,7 +38,7 @@ class Tx_Extbase_Service_TypoScriptService implements t3lib_Singleton {
         * to be more future-proof and not to have any conflicts with Fluid object accessor syntax.
         *
         * @param array $typoScriptArray The TypoScript array (e.g. array('foo' => 'TEXT', 'foo.' => array('bar' => 'baz')))
-        * @return void
+        * @return array
         * @api
         */
        public function convertTypoScriptArrayToPlainArray(array $typoScriptArray) {
index 2fb2469..19ed2e2 100644 (file)
@@ -121,7 +121,6 @@ class Tx_Extbase_Utility_Debugger {
         *
         * @param array $array
         * @param integer $level
-        * @param boolean $renderItems
         * @param boolean $plainText
         * @param boolean $ansiColors
         * @return string
@@ -160,7 +159,6 @@ class Tx_Extbase_Utility_Debugger {
         *
         * @param object $object
         * @param integer $level
-        * @param boolean $renderProperties
         * @param boolean $plainText
         * @param boolean $ansiColors
         * @return string
@@ -222,6 +220,7 @@ class Tx_Extbase_Utility_Debugger {
         */
        protected static function renderHeader($object, $level, $plainText, $ansiColors) {
                $dump = '';
+               $persistenceType = '';
 
                $className = get_class($object);
                if ($plainText) {
@@ -333,6 +332,13 @@ class Tx_Extbase_Utility_Debugger {
                return $dump;
        }
 
+       /**
+        * @param mixed $collection
+        * @param integer $level
+        * @param boolean $plainText
+        * @param boolean $ansiColors
+        * @return string
+        */
        protected static function renderCollection($collection, $level, $plainText, $ansiColors) {
                $dump = '';
                foreach ($collection as $key => $value) {
@@ -369,7 +375,7 @@ class Tx_Extbase_Utility_Debugger {
         * @param boolean $return if TRUE, the dump is returned for custom post-processing (e.g. embed in custom HTML). If FALSE (default), the dump is directly displayed.
         * @param array $blacklistedClassNames An array of class names (RegEx) to be filtered. Default is an array of some common class names.
         * @param array $blacklistedPropertyNames An array of property names and/or array keys (RegEx) to be filtered. Default is an array of some common property names.
-        * @return void/string if $return is TRUE, the dump is returned. By default, the dump is directly displayed, and nothing is returned.
+        * @return string if $return is TRUE, the dump is returned. By default, the dump is directly displayed, and nothing is returned.
         * @api
         */
        public static function var_dump($variable, $title = NULL, $maxDepth = 8, $plainText = FALSE, $ansiColors = TRUE, $return = FALSE, $blacklistedClassNames = NULL, $blacklistedPropertyNames = NULL) {
@@ -437,6 +443,8 @@ class Tx_Extbase_Utility_Debugger {
                } else {
                        echo $output;
                }
+
+               return '';
        }
 }
 ?>
\ No newline at end of file
index 7b3879e..e280af4 100644 (file)
@@ -39,6 +39,7 @@ class Tx_Extbase_Utility_ExtbaseRequirementsCheck implements tx_reports_StatusPr
         * Compiles a collection of system status checks as a status report.
         *
         * @see typo3/sysext/reports/interfaces/tx_reports_StatusProvider::getStatus()
+        * @return array
         */
        public function getStatus() {
                $reports = array(
index 572b2a7..03a2d95 100644 (file)
@@ -40,7 +40,7 @@ class Tx_Extbase_Utility_Extension {
        protected static $extensionService = NULL;
 
        /**
-        * @return void
+        * @return string
         */
        static protected function getExtensionService() {
                if (self::$extensionService === NULL) {
@@ -65,9 +65,8 @@ class Tx_Extbase_Utility_Extension {
         *
         * @param string $extensionName The extension name (in UpperCamelCase) or the extension key (in lower_underscore)
         * @param string $pluginName must be a unique id for your plugin in UpperCamelCase (the string length of the extension key added to the length of the plugin name should be less than 32!)
-        * @param string $controllerActions is an array of allowed combinations of controller and action stored in an array (controller name as key and a comma separated list of action names as value, the first controller and its first action is chosen as default)
-        * @param string $nonCacheableControllerActions is an optional array of controller name and  action names which should not be cached (array as defined in $controllerActions)
-        * @param string $defaultControllerAction is an optional array controller name (as array key) and action name (as array value) that should be called as default
+        * @param array $controllerActions is an array of allowed combinations of controller and action stored in an array (controller name as key and a comma separated list of action names as value, the first controller and its first action is chosen as default)
+        * @param array $nonCacheableControllerActions is an optional array of controller name and  action names which should not be cached (array as defined in $controllerActions)
         * @param string $pluginType either Tx_Extbase_Utility_Extension::TYPE_PLUGIN (default) or Tx_Extbase_Utility_Extension::TYPE_CONTENT_ELEMENT
         * @return void
         */
@@ -282,10 +281,10 @@ tt_content.' . $pluginSignature . ' {
        /**
         * Build the autoload registry for a given extension and place it ext_autoload.php.
         *
-        * @param       string  $extensionKey   Key of the extension
-        * @param       string  $extensionPath  full path of the extension
-        * @param   array   $additionalAutoloadClasses additional classes to be added to the autoloader. The key must be the classname all-lowercase, the value must be the entry to be inserted
-        * @return      string  HTML string which should be outputted
+        * @param string $extensionKey Key of the extension
+        * @param string $extensionPath full path of the extension
+        * @param array $additionalAutoloadClasses additional classes to be added to the autoloader. The key must be the classname all-lowercase, the value must be the entry to be inserted
+        * @return string HTML string which should be outputted
         * @deprecated since Extbase 1.4.0; will be removed in Extbase 6.0
         */
        static public function createAutoloadRegistryForExtension($extensionKey, $extensionPath, $additionalAutoloadClasses = array()) {
@@ -318,9 +317,9 @@ tt_content.' . $pluginSignature . ' {
         * Generate autoload PHP file data. Takes an associative array with class name to file mapping, and outputs it as PHP.
         * Does NOT escape the values in the associative array. Includes the <?php ... ?> syntax and an optional global prefix.
         *
-        * @param       array   $classNameToFileMapping class name to file mapping
-        * @param       string  $globalPrefix   Global prefix which is prepended to all code.
-        * @return      string  The full PHP string
+        * @param array $classNameToFileMapping class name to file mapping
+        * @param string $globalPrefix Global prefix which is prepended to all code.
+        * @return string The full PHP string
         * @deprecated since Extbase 1.4.0; will be removed in Extbase 6.0
         */
        protected function generateAutoloadPhpFileData($classNameToFileMapping, $globalPrefix = '') {
@@ -341,17 +340,14 @@ tt_content.' . $pluginSignature . ' {
        /**
         * Generate the $classNameToFileMapping for a given filePath.
         *
-        * @param       array   $classNameToFileMapping (Reference to array) All values are appended to this array.
-        * @param       string  $path   Path which should be crawled
-        * @param       string  $excludeRegularExpression       Exclude regular expression, to exclude certain files from being processed
-        * @param       string  $valueWrap      Wrap for the file name
+        * @param array $classNameToFileMapping (Reference to array) All values are appended to this array.
+        * @param string $path Path which should be crawled
+        * @param string $excludeRegularExpression Exclude regular expression, to exclude certain files from being processed
+        * @param string $valueWrap Wrap for the file name
         * @return void
         * @deprecated since Extbase 1.4.0; will be removed in Extbase 6.0
         */
        static protected function buildAutoloadRegistryForSinglePath(&$classNameToFileMapping, $path, $excludeRegularExpression = '', $valueWrap = '\'|\'') {
-//             if (file_exists($path . 'Classes/')) {
-//                     return "<b>This appears to be a new-style extension which has its PHP classes inside the Classes/ subdirectory. It is not needed to generate the autoload registry for these extensions.</b>";
-//             }
                $extensionFileNames = t3lib_div::removePrefixPathFromList(t3lib_div::getAllFilesAndFoldersInPath(array(), $path, 'php', FALSE, 99, $excludeRegularExpression), $path);
 
                foreach ($extensionFileNames as $extensionFileName) {
@@ -366,8 +362,8 @@ tt_content.' . $pluginSignature . ' {
        /**
         * Extracts class names from the given file.
         *
-        * @param       string  $filePath       File path (absolute)
-        * @return      array   Class names
+        * @param string $filePath file path (absolute)
+        * @return array class names
         * @deprecated since Extbase 1.4.0; will be removed in Extbase 6.0
         */
        static protected function extractClassNames($filePath) {
@@ -412,10 +408,10 @@ tt_content.' . $pluginSignature . ' {
        /**
         * Find tokens in the tokenList
         *
-        * @param       array   $tokenList      list of tokens as returned by token_get_all()
-        * @param       array   $wantedToken    the tokens to be found
-        * @param       array   $intermediateTokens     optional: list of tokens that are allowed to skip when looking for the wanted token
-        * @return      mixed
+        * @param array &$tokenList list of tokens as returned by token_get_all()
+        * @param array $wantedTokens
+        * @param array $intermediateTokens optional: list of tokens that are allowed to skip when looking for the wanted token
+        * @return mixed
         * @deprecated since Extbase 1.4.0; will be removed in Extbase 6.0
         */
        static protected function findToken(array &$tokenList, array $wantedTokens, array $intermediateTokens = array()) {
index 77b1f1e..41108aa 100644 (file)
@@ -43,7 +43,7 @@ class Tx_Extbase_Utility_FrontendSimulator {
         * Sets the $TSFE->cObjectDepthCounter in Backend mode
         * This somewhat hacky work around is currently needed because the cObjGetSingle() function of tslib_cObj relies on this setting
         *
-        * @param tslib_cObj $addCObj
+        * @param tslib_cObj|NULL $cObj
         * @return void
         * @author Bastian Waidelich <bastian@typo3.org>
         */
index fa0e315..737ccc3 100644 (file)
@@ -71,7 +71,7 @@ class Tx_Extbase_Utility_Localization {
         * @param string $key The key from the LOCAL_LANG array for which to return the value.
         * @param string $extensionName The name of the extension
         * @param array $arguments the arguments of the extension, being passed over to vsprintf
-        * @return string The value from LOCAL_LANG or NULL if no translation was found.
+        * @return string|NULL The value from LOCAL_LANG or NULL if no translation was found.
         * @author Christopher Hlubek <hlubek@networkteam.com>
         * @author Bastian Waidelich <bastian@typo3.org>
         * @author Sebastian Kurfuerst <sebastian@typo3.org>
@@ -79,6 +79,8 @@ class Tx_Extbase_Utility_Localization {
         * @todo: If vsprintf gets a malformed string, it returns FALSE! Should we throw an exception there?
         */
        static public function translate($key, $extensionName, $arguments = NULL) {
+               $value = NULL;
+
                if (t3lib_div::isFirstPartOfStr($key, 'LLL:')) {
                        $value = self::translateFileReference($key);
                } else {
@@ -149,6 +151,7 @@ class Tx_Extbase_Utility_Localization {
         * Loads local-language values by looking for a "locallang.php" (or "locallang.xml") file in the plugin resources directory and if found includes it.
         * Also locallang values set in the TypoScript property "_LOCAL_LANG" are merged onto the values found in the "locallang.php" file.
         *
+        * @param string $extensionName
         * @return void
         * @author Christopher Hlubek <hlubek@networkteam.com>
         * @author Bastian Waidelich <bastian@typo3.org>
@@ -198,6 +201,7 @@ class Tx_Extbase_Utility_Localization {
         * TS locallang labels have to be configured like:
         * plugin.tx_myextension._LOCAL_LANG.languageKey.key = value
         *
+        * @param string $extensionName
         * @return void
         * @author Christopher Hlubek <hlubek@networkteam.com>
         * @author Bastian Waidelich <bastian@typo3.org>
index ec4eb36..a7f26d9 100644 (file)
@@ -39,7 +39,7 @@ class Tx_Extbase_Utility_TypeHandling {
        protected static $typeHandlingService = NULL;
 
        /**
-        * @return void
+        * @return string
         */
        static protected function getTypeHandlingService() {
                if (self::$typeHandlingService === NULL) {
index 3b02869..86da7e1 100644 (file)
@@ -37,7 +37,7 @@ class Tx_Extbase_Utility_TypoScript {
        protected static $typoScriptService = NULL;
 
        /**
-        * @return void
+        * @return Tx_Extbase_Service_TypoScriptService|NULL
         */
        static protected function getTypoScriptService() {
                if (self::$typoScriptService === NULL) {
@@ -55,7 +55,7 @@ class Tx_Extbase_Utility_TypoScript {
         * to be more future-proof and not to have any conflicts with Fluid object accessor syntax.
         *
         * @param array $settings The settings array
-        * @return void
+        * @return array
         * @deprecated since Extbase 1.4.0; will be removed in Extbase 6.0 - Use Tx_Extbase_Service_TypoScriptService instead
         */
        static public function convertTypoScriptArrayToPlainArray(array $settings) {
index 8dc5f3b..73a9b70 100644 (file)
@@ -92,7 +92,7 @@ abstract class Tx_Extbase_Validation_Validator_AbstractCompositeValidator implem
        /**
         * Removes the specified validator.
         *
-        * @param Tx_Extbase_Validation_ValidatorInterface $validator The validator to remove
+        * @param Tx_Extbase_Validation_Validator_ValidatorInterface $validator The validator to remove
         */
        public function removeValidator(Tx_Extbase_Validation_Validator_ValidatorInterface $validator) {
                if (!$this->validators->contains($validator)) throw new Tx_Extbase_Validation_Exception_NoSuchValidator('Cannot remove validator because its not in the conjunction.', 1207020177);
index 62e35b7..f94354d 100644 (file)
@@ -53,7 +53,6 @@ abstract class Tx_Extbase_Validation_Validator_AbstractValidator implements Tx_E
         * Sets options for the validator
         *
         * @param array $validationOptions Options for the validator
-        * @return void
         * @api
         */
        public function __construct($validationOptions = array()) {
@@ -78,6 +77,7 @@ abstract class Tx_Extbase_Validation_Validator_AbstractValidator implements Tx_E
         * Check if $value is valid. If it is not valid, needs to add an error
         * to Result.
         *
+        * @param mixed $value
         * @return void
         */
        abstract protected function isValid($value);
index bcd28b2..faa98f1 100644 (file)
@@ -58,6 +58,7 @@ class Tx_Extbase_Validation_Validator_ConjunctionValidator extends Tx_Extbase_Va
         * If at least one error occurred, the result is FALSE.
         *
         * @param mixed $value The value that should be validated
+        * @return boolean
         * @deprecated since Extbase 1.4.0, will be removed in Extbase 6.0
         */
        public function isValid($value) {
index 5bb6f12..06dca62 100644 (file)
@@ -40,7 +40,6 @@ class Tx_Extbase_Validation_Validator_DateTimeValidator extends Tx_Extbase_Valid
         * If at least one error occurred, the result is FALSE.
         *
         * @param mixed $value The value that should be validated
-        * @param array $validationOptions Not used
         * @return boolean TRUE if the value is valid, FALSE if an error occured
         */
        public function isValid($value) {
index e9c9383..6844db0 100644 (file)
@@ -52,7 +52,7 @@ class Tx_Extbase_Validation_Validator_GenericObjectValidator extends Tx_Extbase_
         *
         * If at least one error occurred, the result is FALSE.
         *
-        * @param mixed $value The value that should be validated
+        * @param mixed $object
         * @return Tx_Extbase_Error_Result
         * @api
         */
index bd5927b..33227bc 100644 (file)
@@ -142,9 +142,10 @@ class Tx_Extbase_Validation_ValidatorResolver implements t3lib_Singleton {
 
        /**
         * Detects and registers any validators for arguments:
-        * - by the data type specified in the @param annotations
-        * - additional validators specified in the @validate annotations of a method
+        * - by the data type specified in the
         *
+        * @param string $className
+        * @param string $methodName
         * @return array An Array of ValidatorConjunctions for each method parameters.
         */
        public function buildMethodArgumentsValidatorConjunctions($className, $methodName) {
@@ -237,6 +238,7 @@ class Tx_Extbase_Validation_ValidatorResolver implements t3lib_Singleton {
        /**
         * Parses the validator options given in @validate annotations.
         *
+        * @param string $validateValue
         * @return array
         */
        protected function parseValidatorAnnotation($validateValue) {
index 32ed58d..fbaecdb 100644 (file)
@@ -51,7 +51,7 @@ abstract class Tx_Extbase_Tests_Unit_BaseTestCase extends tx_phpunit_testcase {
         * Returns a mock object which allows for calling protected methods and access
         * of protected properties.
         *
-        * @param string $className Full qualified name of the original class
+        * @param string $originalClassName
         * @param array $methods
         * @param array $arguments
         * @param string $mockClassName
index 1f16143..55b3972 100644 (file)
@@ -37,6 +37,9 @@ class Tx_Extbase_Tests_Unit_Error_ResultTest extends Tx_Extbase_Tests_Unit_BaseT
                $this->result = new Tx_Extbase_Error_Result();
        }
 
+       /**
+        * @return array
+        */
        public function dataTypes() {
                return array(
                        array('Error', 'Errors'),
@@ -45,6 +48,10 @@ class Tx_Extbase_Tests_Unit_Error_ResultTest extends Tx_Extbase_Tests_Unit_BaseT
                );
        }
 
+       /**
+        * @param string $type
+        * @return PHPUnit_Framework_MockObject_MockObject
+        */
        protected function getMockMessage($type) {
                return $this->getMock('Tx_Extbase_Error_' . $type, array(), array(), '', FALSE);
        }
@@ -53,6 +60,8 @@ class Tx_Extbase_Tests_Unit_Error_ResultTest extends Tx_Extbase_Tests_Unit_BaseT
         * @test
         * @dataProvider dataTypes
         * @author Sebastian Kurfürst <sebastian@typo3.org>
+        * @param string $dataTypeInSingular
+        * @param string $dataTypeInPlural
         */
        public function addedMessagesShouldBeRetrievableAgain($dataTypeInSingular, $dataTypeInPlural) {
                $message = $this->getMockMessage($dataTypeInSingular);
@@ -67,6 +76,8 @@ class Tx_Extbase_Tests_Unit_Error_ResultTest extends Tx_Extbase_Tests_Unit_BaseT
         * @test
         * @dataProvider dataTypes
         * @author Sebastian Kurfürst <sebastian@typo3.org>
+        * @param string $dataTypeInSingular
+        * @param string $dataTypeInPlural
         */
        public function getMessageShouldNotBeRecursive($dataTypeInSingular, $dataTypeInPlural) {
                $message = $this->getMockMessage($dataTypeInSingular);
@@ -81,6 +92,8 @@ class Tx_Extbase_Tests_Unit_Error_ResultTest extends Tx_Extbase_Tests_Unit_BaseT
         * @test
         * @dataProvider dataTypes
         * @author Sebastian Kurfürst <sebastian@typo3.org>
+        * @param string $dataTypeInSingular
+        * @param string $dataTypeInPlural
         */
        public function getFirstMessageShouldReturnFirstMessage($dataTypeInSingular, $dataTypeInPlural) {
                $message1 = $this->getMockMessage($dataTypeInSingular);
@@ -125,6 +138,8 @@ class Tx_Extbase_Tests_Unit_Error_ResultTest extends Tx_Extbase_Tests_Unit_BaseT
         * @test
         * @dataProvider dataTypes
         * @author Sebastian Kurfürst <sebastian@typo3.org>
+        * @param string $dataTypeInSingular
+        * @param string $dataTypeInPlural
         */
        public function hasMessagesShouldReturnTrueIfTopLevelObjectHasMessages($dataTypeInSingular, $dataTypeInPlural) {
                $message = $this->getMockMessage($dataTypeInSingular);
@@ -139,6 +154,8 @@ class Tx_Extbase_Tests_Unit_Error_ResultTest extends Tx_Extbase_Tests_Unit_BaseT
         * @test
         * @dataProvider dataTypes
         * @author Sebastian Kurfürst <sebastian@typo3.org>
+        * @param string $dataTypeInSingular
+        * @param string $dataTypeInPlural
         */
        public function hasMessageshouldReturnTrueIfSubObjectHasErrors($dataTypeInSingular, $dataTypeInPlural) {
                $addMethodName = 'add' . $dataTypeInSingular;
@@ -153,6 +170,8 @@ class Tx_Extbase_Tests_Unit_Error_ResultTest extends Tx_Extbase_Tests_Unit_BaseT
         * @test
         * @dataProvider dataTypes
         * @author Sebastian Kurfürst <sebastian@typo3.org>
+        * @param string $dataTypeInSingular
+        * @param string $dataTypeInPlural
         */
        public function hasMessagesShouldReturnFalseIfSubObjectHasNoErrors($dataTypeInSingular, $dataTypeInPlural) {
                $methodName = 'has' . $dataTypeInPlural;
@@ -166,6 +185,8 @@ class Tx_Extbase_Tests_Unit_Error_ResultTest extends Tx_Extbase_Tests_Unit_BaseT
         * @test
         * @dataProvider dataTypes
         * @author Sebastian Kurfürst <sebastian@typo3.org>
+        * @param string $dataTypeInSingular
+        * @param string $dataTypeInPlural
         */
        public function getFlattenedMessagesShouldReturnAllSubMessages($dataTypeInSingular, $dataTypeInPlural) {
                $message1 = $this->getMockMessage($dataTypeInSingular);
@@ -196,6 +217,8 @@ class Tx_Extbase_Tests_Unit_Error_ResultTest extends Tx_Extbase_Tests_Unit_BaseT
         * @test
         * @dataProvider dataTypes
         * @author Sebastian Kurfürst <sebastian@typo3.org>
+        * @param string $dataTypeInSingular
+        * @param string $dataTypeInPlural
         */
        public function getFlattenedMessagesShouldNotContainEmptyResults($dataTypeInSingular, $dataTypeInPlural) {
                $message1 = $this->getMockMessage($dataTypeInSingular);
index 387dfcf..07f8d8a 100644 (file)
@@ -47,14 +47,23 @@ class Tx_Extbase_Fixtures_ClassWithSetters {
         */
        public $property4;
 
+       /**
+        * @param mixed $value
+        */
        public function setProperty3($value) {
                $this->property3 = $value;
        }
 
+       /**
+        * @param mixed $value
+        */
        protected function setProperty4($value) {
                $this->property4 = $value;
        }
 
+       /**
+        * @return mixed
+        */
        public function getProperty2() {
                return $this->property2;
        }
index 98bc660..9c433cf 100644 (file)
@@ -37,18 +37,30 @@ class Tx_Extbase_Fixtures_ClassWithSettersAndConstructor {
         */
        protected $property2;
 
+       /**
+        * @param mixed $property1
+        */
        public function __construct($property1) {
                $this->property1 = $property1;
        }
 
+       /**
+        * @return mixed
+        */
        public function getProperty1() {
                return $this->property1;
        }
 
+       /**
+        * @return mixed
+        */
        public function getProperty2() {
                return $this->property2;
        }
 
+       /**
+        * @param mixed $property2
+        */
        public function setProperty2($property2) {
                $this->property2 = $property2;
        }
index 00e6303..3774d5d 100644 (file)
  *                                                                        *
  * The TYPO3 project - inspiring people to share!                         *
  *                                                                        */
+
+/**
+ * Dummy Class
+ */
 class Tx_Extbase_Fixture_DummyClass {
 
        public function someMethod() {
index 505c70a..4569b4a 100644 (file)
@@ -5,7 +5,7 @@
 *  (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
 *  All rights reserved
 *
-*  This class is a backport of the corresponding class of FLOW3. 
+*  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
@@ -42,17 +42,15 @@ class Tx_Extbase_Tests_Fixtures_Entity extends Tx_Extbase_DomainObject_AbstractE
         */
        protected $name;
 
-
        /**
         * Constructs this entity
         *
         * @param string $name Name of this blog
-        * @return void
         */
        public function __construct($name) {
                $this->setName($name);
        }
-       
+
        /**
         * Sets this entity's name
         *
@@ -71,6 +69,6 @@ class Tx_Extbase_Tests_Fixtures_Entity extends Tx_Extbase_DomainObject_AbstractE
        public function getName() {
                return $this->name;
        }
-       
+
 }
 ?>
\ No newline at end of file
index fefa0e0..e58fb6c 100644 (file)
  *                                                                        *
  * The TYPO3 project - inspiring people to share!                         *
  *                                                                        */
+
+/**
+ * Second Dummy Class
+ */
 class Tx_Extbase_Fixture_SecondDummyClass {
 
 }
index e6d8989..a06ead7 100644 (file)
@@ -65,6 +65,9 @@ class Tx_Extbase_Tests_Unit_MVC_CLI_CommandTest extends Tx_Extbase_Tests_Unit_Ba
         * @test
         * @dataProvider commandIdentifiers
         * @author Robert Lemke <robert@typo3.org>
+        * @param string $controllerClassName
+        * @param string $commandName
+        * @param string $expectedCommandIdentifier
         */
        public function constructRendersACommandIdentifierByTheGivenControllerAndCommandName($controllerClassName, $commandName, $expectedCommandIdentifier) {
                $command = new Tx_Extbase_MVC_CLI_Command($controllerClassName, $commandName);
@@ -86,6 +89,7 @@ class Tx_Extbase_Tests_Unit_MVC_CLI_CommandTest extends Tx_Extbase_Tests_Unit_Ba
         * @test
         * @dataProvider invalidCommandClassNames
         * @expectedException InvalidArgumentException
+        * @param string $controllerClassName
         */
        public function constructThrowsExceptionIfCommandClassNameIsInvalid($controllerClassName) {
                new Tx_Extbase_MVC_CLI_Command($controllerClassName, 'foo');
index 7746ddf..1dd9e6f 100644 (file)
@@ -559,6 +559,7 @@ class Tx_Extbase_Tests_Unit_MVC_Controller_ActionControllerTest extends Tx_Extba
 
        /**
         * Data Provider for checkRequestHashDoesNotThrowExceptionInNormalOperations
+        * @return array
         */
        public function checkRequestHashInNormalOperation() {
                return array(
@@ -575,8 +576,16 @@ class Tx_Extbase_Tests_Unit_MVC_Controller_ActionControllerTest extends Tx_Extba
         * @test
         * @author Sebastian Kurfürst <sebastian@typo3.org>
         * @dataProvider checkRequestHashInNormalOperation
+        * @param boolean $hmacVerified
+        * @param boolean $reflectionServiceNeedsInitialization
+        * @param integer $argument1Origin
+        * @param integer $argument2Origin
+        * @param array $methodTagsValues
         */
-       public function checkRequestHashDoesNotThrowExceptionInNormalOperations($hmacVerified, $reflectionServiceNeedsInitialization = FALSE, $argument1Origin = 3, $argument2Origin = 3, $methodTagsValues = array()) {
+       public function checkRequestHashDoesNotThrowExceptionInNormalOperations(
+               $hmacVerified, $reflectionServiceNeedsInitialization = FALSE, $argument1Origin = 3, $argument2Origin = 3,
+               array $methodTagsValues = array()
+       ) {
                $mockRequest = $this->getMock('Tx_Extbase_MVC_Web_Request', array('isHmacVerified'), array(), '', FALSE);
                $mockRequest->expects($this->once())->method('isHmacVerified')->will($this->returnValue($hmacVerified));
 
index 8417c6f..edbd80b 100644 (file)
@@ -100,6 +100,9 @@ class Tx_Extbase_Tests_Unit_MVC_Controller_ArgumentTest extends Tx_Extbase_Tests
                $this->assertSame($this->simpleValueArgument, $returnedArgument, 'The returned argument is not the original argument.');
        }
 
+       /**
+        * @return array
+        */
        public function invalidShortNames() {
                return array(
                        array(''),
@@ -107,11 +110,13 @@ class Tx_Extbase_Tests_Unit_MVC_Controller_ArgumentTest extends Tx_Extbase_Tests
                        array(5)
                );
        }
+
        /**
         * @test
         * @dataProvider invalidShortNames
         * @expectedException InvalidArgumentException
         * @author Sebastian Kurfürst <sebastian@typo3.org>
+        * @param string $invalidShortName
         */
        public function shortNameShouldThrowExceptionIfInvalid($invalidShortName) {
                $this->simpleValueArgument->setShortName($invalidShortName);
@@ -189,6 +194,9 @@ class Tx_Extbase_Tests_Unit_MVC_Controller_ArgumentTest extends Tx_Extbase_Tests
                $this->objectArgument->setValue(new DateTime());
        }
 
+       /**
+        * @return Tx_Extbase_MVC_Controller_Argument $this
+        */
        protected function setupPropertyMapperAndSetValue() {
                $this->mockPropertyMapper->expects($this->once())->method('convert')->with('someRawValue', 'string', $this->mockConfiguration)->will($this->returnValue('convertedValue'));
                $this->mockPropertyMapper->expects($this->once())->method('getMessages')->will($this->returnValue(new Tx_Extbase_Error_Result()));
index b653f49..bc4641f 100644 (file)
@@ -27,6 +27,9 @@ class Tx_Extbase_MVC_Fixture_CLI_Command_MockACommandController extends Tx_Extba
        public function fooCommand() {
        }
 
+       /**
+        * @param mixed $someArgument
+        */
        public function barCommand($someArgument) {
        }
 }
index 732fb3b..a29a351 100644 (file)
@@ -27,6 +27,9 @@
 
 require_once (t3lib_extMgm::extPath('extbase') . 'Tests/Unit/Fixtures/Entity.php');
 
+/**
+ * Uri Builder Test Class
+ */
 class Tx_Extbase_Tests_Unit_MVC_Web_Routing_UriBuilderTest extends Tx_Extbase_Tests_Unit_BaseTestCase {
 
        /**
index 2d2c7a0..0873597 100644 (file)
@@ -16,6 +16,10 @@ class t3lib_object_tests_a {
        public $b;
        public $c;
 
+       /**
+        * @param t3lib_object_tests_c $c
+        * @param t3lib_object_tests_b $b
+        */
        public function __construct( t3lib_object_tests_c $c, t3lib_object_tests_b $b) {
                $this->b = $b;
                $this->c = $c;
@@ -29,6 +33,12 @@ class t3lib_object_tests_amixed_array {
        public $b;
        public $c;
        public $myvalue;
+
+       /**
+        * @param t3lib_object_tests_b $b
+        * @param t3lib_object_tests_c $c
+        * @param array $myvalue
+        */
        public function __construct(t3lib_object_tests_b $b, t3lib_object_tests_c $c, array $myvalue=array('some' => 'default')) {
                $this->b = $b;
                $this->c = $c;
@@ -44,6 +54,12 @@ class t3lib_object_tests_amixed_null {
        public $b;
        public $c;
        public $myvalue;
+
+       /**
+        * @param t3lib_object_tests_b $b
+        * @param t3lib_object_tests_c $c
+        * @param mixed $myvalue
+        */
        public function __construct(t3lib_object_tests_b $b, t3lib_object_tests_c $c, $myvalue = NULL) {
                $this->b = $b;
                $this->c = $c;
@@ -59,6 +75,12 @@ class t3lib_object_tests_amixed_array_singleton implements t3lib_Singleton {
        public $b;
        public $c;
        public $myvalue;
+
+       /**
+        * @param t3lib_object_tests_b $b
+        * @param t3lib_object_tests_c $c
+        * @param array $someDefaultParameter
+        */
        public function __construct(t3lib_object_tests_b $b, t3lib_object_tests_c $c, $someDefaultParameter = array('some' => 'default')) {
                $this->b = $b;
                $this->c = $c;
@@ -72,6 +94,10 @@ class t3lib_object_tests_amixed_array_singleton implements t3lib_Singleton {
  */
 class t3lib_object_tests_b implements t3lib_Singleton {
        public $c;
+
+       /**
+        * @param t3lib_object_tests_c $c
+        */
        public function __construct(t3lib_object_tests_c $c) {
                $this->c = $c;
        }
@@ -93,6 +119,9 @@ class t3lib_object_tests_c implements t3lib_Singleton {
 class t3lib_object_tests_b_child extends t3lib_object_tests_b {
 }
 
+/**
+ *
+ */
 interface t3lib_object_tests_someinterface extends t3lib_Singleton {
 
 }
@@ -116,6 +145,10 @@ class t3lib_object_tests_b_child_someimplementation extends t3lib_object_tests_b
  *
  */
 class t3lib_object_tests_needsinterface {
+
+       /**
+        * @param t3lib_object_tests_someinterface $i
+        */
        public function __construct(t3lib_object_tests_someinterface $i) {
                $this->dependency = $i;
        }
@@ -126,24 +159,49 @@ class t3lib_object_tests_needsinterface {
  *
  */
 class t3lib_object_tests_cyclic1 {
+
+       /**
+        * @param t3lib_object_tests_cyclic2 $c
+        */
        public function __construct(t3lib_object_tests_cyclic2 $c) {
 
        }
 }
 
+/**
+ *
+ */
 class t3lib_object_tests_cyclic2 {
+
+       /**
+        * @param t3lib_object_tests_cyclic1 $c
+        */
        public function __construct(t3lib_object_tests_cyclic1 $c) {
 
        }
 }
 
+/**
+ *
+ */
 class t3lib_object_tests_cyclic1WithSetterDependency {
+
+       /**
+        * @param t3lib_object_tests_cyclic2WithSetterDependency $c
+        */
        public function injectFoo(t3lib_object_tests_cyclic2WithSetterDependency $c) {
 
        }
 }
 
+/**
+ *
+ */
 class t3lib_object_tests_cyclic2WithSetterDependency {
+
+       /**
+        * @param t3lib_object_tests_cyclic1WithSetterDependency $c
+        */
        public function injectFoo(t3lib_object_tests_cyclic1WithSetterDependency $c) {
 
        }
@@ -157,13 +215,16 @@ class t3lib_object_tests_injectmethods {
        public $b;
        public $bchild;
 
+       /**
+        * @param t3lib_object_tests_b $o
+        */
        public function injectClassB(t3lib_object_tests_b $o) {
                $this->b = $o;
        }
 
        /**
         * @inject
-        * @param t3lib_object_tests_b $o
+        * @param t3lib_object_tests_b_child $o
         */
        public function setClassBChild(t3lib_object_tests_b_child $o) {
                $this->bchild = $o;
@@ -176,6 +237,10 @@ class t3lib_object_tests_injectmethods {
  */
 class t3lib_object_tests_injectsettings {
        public $settings;
+
+       /**
+        * @param array $settings
+        */
        public function injectExtensionSettings(array $settings) {
                $this->settings = $settings;
        }
@@ -187,6 +252,10 @@ class t3lib_object_tests_injectsettings {
  */
 class t3lib_object_tests_resolveablecyclic1 implements t3lib_Singleton {
        public $o2;
+
+       /**
+        * @param t3lib_object_tests_resolveablecyclic2 $cyclic2
+        */
        public function __construct(t3lib_object_tests_resolveablecyclic2 $cyclic2) {
                $this->o2 = $cyclic2;
        }
@@ -199,9 +268,17 @@ class t3lib_object_tests_resolveablecyclic1 implements t3lib_Singleton {
 class t3lib_object_tests_resolveablecyclic2 implements t3lib_Singleton {
        public $o1;
        public $o3;
+
+       /**
+        * @param t3lib_object_tests_resolveablecyclic1 $cyclic1
+        */
        public function injectCyclic1(t3lib_object_tests_resolveablecyclic1 $cyclic1) {
                $this->o1 = $cyclic1;
        }
+
+       /**
+        * @param t3lib_object_tests_resolveablecyclic3 $cyclic3
+        */
        public function injectCyclic3(t3lib_object_tests_resolveablecyclic3 $cyclic3) {
                $this->o3 = $cyclic3;
        }
@@ -213,15 +290,29 @@ class t3lib_object_tests_resolveablecyclic2 implements t3lib_Singleton {
  */
 class t3lib_object_tests_resolveablecyclic3 implements t3lib_Singleton {
        public $o1;
+
+       /**
+        * @param t3lib_object_tests_resolveablecyclic1 $cyclic1
+        */
        public function injectCyclic1(t3lib_object_tests_resolveablecyclic1 $cyclic1) {
                $this->o1 = $cyclic1;
        }
 }
 
+/**
+ *
+ */
 class t3lib_object_tests_class_with_injectsettings {
+
+       /**
+        * @param t3lib_object_tests_resolveablecyclic1 $c1
+        */
        public function injectFoo(t3lib_object_tests_resolveablecyclic1 $c1) {
        }
 
+       /**
+        * @param array $settings
+        */
        public function injectSettings(array $settings) {
        }
 }
@@ -232,51 +323,137 @@ If a Singleton requires a Singleton for Injection -> allowed, autowiring active
 If a Prototype requires a Prototype for Injection -> allowed, autowiring active
 If a Prototype requires a Singleton for Injection -> allowed, autowiring active
  */
+/**
+ *
+ */
 class t3lib_object_singleton implements t3lib_Singleton {
 }
 
+/**
+ *
+ */
 class t3lib_object_prototype {
 }
 
+/**
+ *
+ */
 class t3lib_object_singletonNeedsPrototype implements t3lib_Singleton {
+
+       /**
+        * @var t3lib_object_prototype
+        */
+       public $dependency;
+
+       /**
+        * @param t3lib_object_prototype $dependency
+        */
        public function injectDependency(t3lib_object_prototype $dependency) {
                $this->dependency = $dependency;
        }
 }
 
+/**
+ *
+ */
 class t3lib_object_singletonNeedsSingleton implements t3lib_Singleton {
+
+       /**
+        * @var t3lib_object_singleton
+        */
+       public $dependency;
+
+       /**
+        * @param t3lib_object_singleton $dependency
+        */
        public function injectDependency(t3lib_object_singleton $dependency) {
                $this->dependency = $dependency;
        }
 }
+
+/**
+ *
+ */
 class t3lib_object_prototypeNeedsPrototype {
+
+       /**
+        * @var t3lib_object_prototype
+        */
+       public $dependency;
+
+       /**
+        * @param t3lib_object_prototype $dependency
+        */
        public function injectDependency(t3lib_object_prototype $dependency) {
                $this->dependency = $dependency;
        }
 }
+
+/**
+ *
+ */
 class t3lib_object_prototypeNeedsSingleton {
+
+       /**
+        * @var t3lib_object_singleton
+        */
+       public $dependency;
+
+       /**
+        * @param t3lib_object_singleton $dependency
+        */
        public function injectDependency(t3lib_object_singleton $dependency) {
                $this->dependency = $dependency;
        }
 }
 
+/**
+ *
+ */
 class t3lib_object_singletonNeedsPrototypeInConstructor implements t3lib_Singleton {
+
+       /**
+        * @param t3lib_object_prototype $dependency
+        */
        public function __construct(t3lib_object_prototype $dependency) {
                $this->dependency = $dependency;
        }
 }
 
+/**
+ *
+ */
 class t3lib_object_singletonNeedsSingletonInConstructor implements t3lib_Singleton {
+
+       /**
+        * @param t3lib_object_singleton $dependency
+        */
        public function __construct(t3lib_object_singleton $dependency) {
                $this->dependency = $dependency;
        }
 }
+
+/**
+ *
+ */
 class t3lib_object_prototypeNeedsPrototypeInConstructor {
+
+       /**
+        * @param t3lib_object_prototype $dependency
+        */
        public function __construct(t3lib_object_prototype $dependency) {
                $this->dependency = $dependency;
        }
 }
+
+/**
+ *
+ */
 class t3lib_object_prototypeNeedsSingletonInConstructor {
+
+       /**
+        * @param t3lib_object_singleton $dependency
+        */
        public function __construct(t3lib_object_singleton $dependency) {
                $this->dependency = $dependency;
        }
index e3cbc38..8bcbf46 100644 (file)
@@ -45,6 +45,11 @@ class Tx_Extbase_Tests_Unit_Persistence_QueryResultTest extends Tx_Extbase_Tests
        protected $mockDataMapper;
 
        /**
+        * @var array
+        */
+       protected $sampleResult = array();
+
+       /**
         * Sets up this test case
         *
         * @return void
index 3449649..59cdf65 100644 (file)
@@ -59,6 +59,11 @@ class Tx_Extbase_Tests_Unit_Persistence_RepositoryTest extends Tx_Extbase_Tests_
         */
        protected $querySettings;
 
+       /**
+        * @var Tx_Extbase_Persistence_QuerySettingsInterface
+        */
+       protected $mockQuerySettings;
+
        public function setUp() {
                $this->mockIdentityMap = $this->getMock('Tx_Extbase_Persistence_IdentityMap');
                $this->mockQueryFactory = $this->getMock('Tx_Extbase_Persistence_QueryFactory');
@@ -155,6 +160,7 @@ class Tx_Extbase_Tests_Unit_Persistence_RepositoryTest extends Tx_Extbase_Tests_
 
        /**
         * dataProvider for createQueryCallsQueryFactoryWithExpectedType
+        * @return array
         */
        public function modelAndRepositoryClassNames() {
                return array(
@@ -169,6 +175,8 @@ class Tx_Extbase_Tests_Unit_Persistence_RepositoryTest extends Tx_Extbase_Tests_
        /**
         * @test
         * @dataProvider modelAndRepositoryClassNames
+        * @param string $repositoryClassName
+        * @param string $modelClassName
         */
        public function constructSetsObjectTypeFromClassName($repositoryClassName, $modelClassName) {
                $mockClassName = 'MockRepository' . uniqid();
index 24b8a6e..4202c6e 100644 (file)
@@ -177,8 +177,9 @@ class Tx_Extbase_Tests_Unit_Persistence_Storage_Typo3DbBackendTest extends Tx_Ex
 
                $sourceMock = new Tx_Extbase_Persistence_QOM_Selector('tx_foo', 'Tx_Foo');
 
+               /** @var $pageSelectMock t3lib_pageSelect|PHPUnit_Framework_MockObject_MockObject */
                $pageSelectMock = $this->getMock('t3lib_pageSelect', array('movePlhOL', 'getWorkspaceVersionOfRecord'));
-               $pageSelectMock->versioningPreview = 1;
+               $pageSelectMock->versioningPreview = TRUE;
 
                $pageSelectMock->expects($this->once())
                        ->method('getWorkspaceVersionOfRecord')
index 29883a5..8f1dc98 100644 (file)
@@ -45,6 +45,9 @@ class Tx_Extbase_Tests_Unit_Property_PropertyMapperTest extends Tx_Extbase_Tests
                $this->mockConfiguration = $this->getMock('Tx_Extbase_Property_PropertyMappingConfigurationInterface');
        }
 
+       /**
+        * @return array
+        */
        public function validSourceTypes() {
                return array(
                        array('someString', 'string'),
@@ -59,13 +62,17 @@ class Tx_Extbase_Tests_Unit_Property_PropertyMapperTest extends Tx_Extbase_Tests
         * @test
         * @dataProvider validSourceTypes
         * @author Sebastian Kurfürst <sebastian@typo3.org>
+        * @param mixed $source
+        * @param mixed $sourceType
         */
        public function sourceTypeCanBeCorrectlyDetermined($source, $sourceType) {
                $propertyMapper = $this->getAccessibleMock('Tx_Extbase_Property_PropertyMapper', array('dummy'));
                $this->assertEquals($sourceType, $propertyMapper->_call('determineSourceType', $source));
        }
 
-
+       /**
+        * @return array
+        */
        public function invalidSourceTypes() {
                return array(
                        array(NULL),
@@ -73,17 +80,26 @@ class Tx_Extbase_Tests_Unit_Property_PropertyMapperTest extends Tx_Extbase_Tests
                        array(new ArrayObject())
                );
        }
+
        /**
         * @test
         * @dataProvider invalidSourceTypes
         * @expectedException Tx_Extbase_Property_Exception_InvalidSourceException
         * @author Sebastian Kurfürst <sebastian@typo3.org>
+        * @param mixed $source
         */
        public function sourceWhichIsNoSimpleTypeThrowsException($source) {
                $propertyMapper = $this->getAccessibleMock('Tx_Extbase_Property_PropertyMapper', array('dummy'));
                $propertyMapper->_call('determineSourceType', $source);
        }
 
+       /**
+        * @param string $name
+        * @param boolean $canConvertFrom
+        * @param array $properties
+        * @param string $typeOfSubObject
+        * @return PHPUnit_Framework_MockObject_MockObject
+        */
        protected function getMockTypeConverter($name = '', $canConvertFrom = TRUE, $properties = array(), $typeOfSubObject = '') {
                $mockTypeConverter = $this->getMock('Tx_Extbase_Property_TypeConverterInterface');
                $mockTypeConverter->_name = $name;
@@ -107,7 +123,11 @@ class Tx_Extbase_Tests_Unit_Property_PropertyMapperTest extends Tx_Extbase_Tests
                $this->assertSame($mockTypeConverter, $propertyMapper->_call('findTypeConverter', 'someSource', 'someTargetType', $this->mockConfiguration));
        }
 
-       // Simple type conversion
+       /**
+        * Simple type conversion
+        *
+        * @return array
+        */
        public function dataProviderForFindTypeConverter() {
                return array(
                        array('someStringSource', 'string', array(
@@ -133,6 +153,10 @@ class Tx_Extbase_Tests_Unit_Property_PropertyMapperTest extends Tx_Extbase_Tests
         * @test
         * @dataProvider dataProviderForFindTypeConverter
         * @author Sebastian Kurfürst <sebastian@typo3.org>
+        * @param mixed $source
+        * @param mixed $targetType
+        * @param mixed $typeConverters
+        * @param mixed $expectedTypeConverter
         */
        public function findTypeConverterShouldReturnHighestPriorityTypeConverterForSimpleType($source, $targetType, $typeConverters, $expectedTypeConverter) {
                $mockTypeHandlingService = $this->getMock('Tx_Extbase_Service_TypeHandlingService');
@@ -144,6 +168,9 @@ class Tx_Extbase_Tests_Unit_Property_PropertyMapperTest extends Tx_Extbase_Tests
                $this->assertSame($expectedTypeConverter, $actualTypeConverter->_name);
        }
 
+       /**
+        * @return array
+        */
        public function dataProviderForObjectTypeConverters() {
                $data = array();
 
@@ -275,6 +302,10 @@ class Tx_Extbase_Tests_Unit_Property_PropertyMapperTest extends Tx_Extbase_Tests
         * @test
         * @dataProvider dataProviderForObjectTypeConverters
         * @author Sebastian Kurfürst <sebastian@typo3.org>
+        * @param mixed $targetClass
+        * @param mixed $expectedTypeConverter
+        * @param mixed $typeConverters
+        * @param boolean $shouldFailWithException
         */
        public function findTypeConverterShouldReturnConverterForTargetObjectIfItExists($targetClass, $expectedTypeConverter, $typeConverters, $shouldFailWithException = FALSE) {
                $mockTypeHandlingService = $this->getMock('Tx_Extbase_Service_TypeHandlingService');
index 0cbfb80..2a93fda 100644 (file)
@@ -62,6 +62,9 @@ class Tx_Extbase_Tests_Unit_Property_TypeConverter_PersistentObjectConverterTest
                $this->assertEquals(1, $this->converter->getPriority(), 'Priority does not match');
        }
 
+       /**
+        * @return array
+        */
        public function dataProviderForCanConvert() {
                return array(
                        array(TRUE, FALSE, TRUE), // is entity => can convert
@@ -74,6 +77,9 @@ class Tx_Extbase_Tests_Unit_Property_TypeConverter_PersistentObjectConverterTest
         * @test
         * @dataProvider dataProviderForCanConvert
         * @author Sebastian Kurfürst <sebastian@typo3.org>
+        * @param boolean $isEntity
+        * @param boolean $isValueObject
+        * @param mixed $expected
         */
        public function canConvertFromReturnsTrueIfClassIsTaggedWithEntityOrValueObject($isEntity, $isValueObject, $expected) {
                $className = uniqid('Test_Class');
@@ -225,6 +231,7 @@ class Tx_Extbase_Tests_Unit_Property_TypeConverter_PersistentObjectConverterTest
        /**
         * @param integer $numberOfResults
         * @param Matcher $howOftenIsGetFirstCalled
+        * @return stdClass
         * @author Bastian Waidelich <bastian@typo3.org>
         * @author Sebastian Kurfürst <sebastian@typo3.org>
         */
index 1c097be..b42582b 100644 (file)
@@ -33,22 +33,40 @@ class Tx_Extbase_Tests_Unit_Reflection_Fixture_ArrayAccessClass implements Array
 
        protected $array = array();
 
+       /**
+        * @param array $array
+        */
        public function __construct(array $array) {
                $this->array = $array;
        }
 
+       /**
+        * @param mixed $offset
+        * @return boolean
+        */
        public function offsetExists($offset) {
                return array_key_exists($offset, $this->array);
        }
 
+       /**
+        * @param mixed $offset
+        * @return mixed
+        */
        public function offsetGet($offset) {
                return $this->array[$offset];
        }
 
+       /**
+        * @param mixed $offset
+        * @param mixed $value
+        */
        public function offsetSet($offset, $value) {
                $this->array[$offset] = $value;
        }
 
+       /**
+        * @param mixed $offset
+        */
        public function offsetUnset($offset) {
                unset($this->array[$offset]);
        }
index c1e81fe..c0ac451 100644 (file)
@@ -43,33 +43,58 @@ class Tx_Extbase_Tests_Unit_Reflection_Fixture_DummyClassWithGettersAndSetters {
        public $publicProperty;
        public $publicProperty2 = 42;
 
+       /**
+        * @param mixed $property
+        */
        public function setProperty($property) {
                $this->property = $property;
        }
 
+       /**
+        * @return mixed
+        */
        public function getProperty() {
                return $this->property;
        }
 
+       /**
+        * @param mixed $anotherProperty
+        */
        public function setAnotherProperty($anotherProperty) {
                $this->anotherProperty = $anotherProperty;
        }
 
+       /**
+        * @return mixed
+        */
        public function getAnotherProperty() {
                return $this->anotherProperty;
        }
 
+       /**
+        * @return mixed
+        */
        public function getProperty2() {
                return $this->property2;
        }
+
+       /**
+        * @param mixed $property2
+        */
        public function setProperty2($property2) {
                $this->property2 = $property2;
        }
 
+       /**
+        * @return string
+        */
        protected function getProtectedProperty() {
                return '42';
        }
 
+       /**
+        * @param mixed $value
+        */
        protected function setProtectedProperty($value) {
                $this->protectedProperty = $value;
        }
@@ -81,10 +106,16 @@ class Tx_Extbase_Tests_Unit_Reflection_Fixture_DummyClassWithGettersAndSetters {
                return $this->booleanProperty;
        }
 
+       /**
+        * @return string
+        */
        protected function getPrivateProperty() {
                return '21';
        }
 
+       /**
+        * @param mixed $value
+        */
        public function setWriteOnlyMagicProperty($value) {
        }
 }
index 715733b..5e7912d 100644 (file)
@@ -27,6 +27,9 @@
 require_once('Fixture/DummyClassWithGettersAndSetters.php');
 require_once('Fixture/ArrayAccessClass.php');
 
+/**
+ * Test Unit Test Base Class
+ */
 class Tx_Extbase_Tests_Unit_Reflection_ObjectAccessTest extends Tx_Extbase_Tests_Unit_BaseTestCase {
 
        protected $dummyObject;
index 74f2e20..9831a6c 100644 (file)
@@ -33,6 +33,9 @@
  */
 class Tx_Extbase_Tests_Unit_Security_Channel_RequestHashServiceTest extends Tx_Extbase_Tests_Unit_BaseTestCase {
 
+       /**
+        * @return array
+        */
        public function dataProviderForGenerateRequestHash() {
                return array(
                        // Simple cases
@@ -90,7 +93,11 @@ class Tx_Extbase_Tests_Unit_Security_Channel_RequestHashServiceTest extends Tx_E
                );
        }
 
-       // Data provider for error cases which should throw an exception
+       /**
+        * Data provider for error cases which should throw an exception
+        *
+        * @return array
+        */
        public function dataProviderForGenerateRequestHashWithUnallowedValues() {
                return array(
                        // Overriding form fields (string overridden by array)
@@ -119,6 +126,8 @@ class Tx_Extbase_Tests_Unit_Security_Channel_RequestHashServiceTest extends Tx_E
         * @test
         * @author Sebastian Kurfürst <sebastian@typo3.org>
         * @dataProvider dataProviderForGenerateRequestHash
+        * @param mixed $input
+        * @param mixed $expected
         */
        public function generateRequestHashGeneratesTheCorrectHashesInNormalOperation($input, $expected) {
                $requestHashService = $this->getMock('Tx_Extbase_Security_Channel_RequestHashService', array('serializeAndHashFormFieldArray'));
@@ -131,6 +140,7 @@ class Tx_Extbase_Tests_Unit_Security_Channel_RequestHashServiceTest extends Tx_E
         * @author Sebastian Kurfürst <sebastian@typo3.org>
         * @dataProvider dataProviderForGenerateRequestHashWithUnallowedValues
         * @expectedException Tx_Extbase_Security_Exception_InvalidArgumentForRequestHashGeneration
+        * @param mixed $input
         */
        public function generateRequestHashThrowsExceptionInWrongCases($input) {
                $requestHashService = $this->getMock('Tx_Extbase_Security_Channel_RequestHashService', array('serializeAndHashFormFieldArray'));
@@ -253,6 +263,7 @@ class Tx_Extbase_Tests_Unit_Security_Channel_RequestHashServiceTest extends Tx_E
 
        /**
         * Data Provider for checkFieldNameInclusionWorks
+        * @return array
         */
        public function dataProviderForCheckFieldNameInclusion() {
                return array(
@@ -414,6 +425,9 @@ class Tx_Extbase_Tests_Unit_Security_Channel_RequestHashServiceTest extends Tx_E
         * @test
         * @author Sebastian Kurfürst <sebastian@typo3.org>
         * @dataProvider dataProviderForCheckFieldNameInclusion
+        * @param mixed $requestArguments
+        * @param mixed $allowedFields
+        * @param mixed $expectedResult
         */
        public function checkFieldNameInclusionWorks($requestArguments, $allowedFields, $expectedResult) {
                $requestHashService = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_Security_Channel_RequestHashService'), array('dummy'));
index 08cfe7f..bb42ed0 100644 (file)
@@ -126,6 +126,9 @@ class Tx_Extbase_Tests_Unit_Service_ExtensionServiceTest extends Tx_Extbase_Test
        /**
         * @test
         * @dataProvider getPluginNamespaceDataProvider
+        * @param string $extensionName
+        * @param string $pluginName
+        * @param mixed $expectedResult
         */
        public function getPluginNamespaceTests($extensionName, $pluginName, $expectedResult) {
                $this->mockConfigurationManager->expects($this->once())->method('getConfiguration')->will($this->returnValue(array()));
@@ -164,6 +167,10 @@ class Tx_Extbase_Tests_Unit_Service_ExtensionServiceTest extends Tx_Extbase_Test
        /**
         * @test
         * @dataProvider getPluginNameByActionDataProvider
+        * @param string $extensionName
+        * @param string $controllerName
+        * @param string $actionName
+        * @param mixed $expectedResult
         */
        public function getPluginNameByActionTests($extensionName, $controllerName, $actionName, $expectedResult) {
                $this->mockConfigurationManager->expects($this->once())->method('getConfiguration')->with(Tx_Extbase_Configuration_ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK)->will($this->returnValue(array('view' => array('pluginNamespace' => 'overridden_plugin_namespace'))));
index 9d15510..7c800d6 100644 (file)
@@ -113,6 +113,8 @@ class Tx_Extbase_Tests_Unit_Service_FlexFormServiceTest extends Tx_Extbase_Tests
        /**
         * @test
         * @dataProvider convertFlexFormContentToArrayTestData
+        * @param string $flexFormXML
+        * @param array $expectedFlexFormArray
         */
        public function convertFlexFormContentToArrayResolvesComplexArrayStructure($flexFormXML, $expectedFlexFormArray) {
                $convertedFlexFormArray = $this->flexFormService->convertFlexFormContentToArray($flexFormXML);
index 907cb8a..19706d7 100644 (file)
@@ -61,6 +61,7 @@ class Tx_Extbase_Tests_Unit_Service_TypeHandlingServiceTest extends Tx_Extbase_T
        /**
         * data provider for parseTypeReturnsArrayWithInformation
         * @author Karsten Dambekalns <karsten@typo3.org>
+        * @return array
         */
        public function types() {
                return array(
@@ -80,6 +81,8 @@ class Tx_Extbase_Tests_Unit_Service_TypeHandlingServiceTest extends Tx_Extbase_T
         * @test
         * @dataProvider types
         * @author Karsten Dambekalns <karsten@typo3.org>
+        * @param mixed $type
+        * @param mixed $expectedResult
         */
        public function parseTypeReturnsArrayWithInformation($type, $expectedResult) {
                $this->assertEquals(
@@ -91,6 +94,7 @@ class Tx_Extbase_Tests_Unit_Service_TypeHandlingServiceTest extends Tx_Extbase_T
        /**
         * data provider for normalizeTypesReturnsNormalizedType
         * @author Karsten Dambekalns <karsten@typo3.org>
+        * @return array
         */
        public function normalizeTypes() {
                return array(
@@ -105,6 +109,8 @@ class Tx_Extbase_Tests_Unit_Service_TypeHandlingServiceTest extends Tx_Extbase_T
         * @test
         * @dataProvider normalizeTypes
         * @author Karsten Dambekalns <karsten@typo3.org>
+        * @param mixed $type
+        * @param mixed $normalized
         */
        public function normalizeTypesReturnsNormalizedType($type, $normalized) {
                $this->assertEquals($this->typeHandlingService->normalizeType($type), $normalized);
@@ -113,6 +119,7 @@ class Tx_Extbase_Tests_Unit_Service_TypeHandlingServiceTest extends Tx_Extbase_T
        /**
         * data provider for isLiteralReturnsFalseForNonLiteralTypes
         * @author Karsten Dambekalns <karsten@typo3.org>
+        * @return array
         */
        public function nonLiteralTypes() {
                return array(
@@ -128,6 +135,7 @@ class Tx_Extbase_Tests_Unit_Service_TypeHandlingServiceTest extends Tx_Extbase_T
         * @test
         * @dataProvider nonliteralTypes
         * @author Karsten Dambekalns <karsten@typo3.org>
+        * @param mixed $type
         */
        public function isLiteralReturnsFalseForNonLiteralTypes($type) {
                $this->assertFalse($this->typeHandlingService->isLiteral($type));
@@ -136,6 +144,7 @@ class Tx_Extbase_Tests_Unit_Service_TypeHandlingServiceTest extends Tx_Extbase_T
        /**
         * data provider for isLiteralReturnsTrueForLiteralType
         * @author Karsten Dambekalns <karsten@typo3.org>
+        * @return array
         */
        public function literalTypes() {
                return array(
@@ -153,6 +162,7 @@ class Tx_Extbase_Tests_Unit_Service_TypeHandlingServiceTest extends Tx_Extbase_T
         * @test
         * @dataProvider literalTypes
         * @author Karsten Dambekalns <karsten@typo3.org>
+        * @param mixed $type
         */
        public function isLiteralReturnsTrueForLiteralType($type) {
                $this->assertTrue($this->typeHandlingService->isLiteral($type));
index 499a2f0..b65a122 100644 (file)
@@ -142,6 +142,8 @@ class Tx_Extbase_Tests_Unit_Service_TypoScriptServiceTest extends Tx_Extbase_Tes
        /**
         * @test
         * @dataProvider convertTypoScriptArrayToPlainArrayTestdata
+        * @param mixed $typoScriptSettings
+        * @param mixed $expectedSettings
         */
        public function convertTypoScriptArrayToPlainArrayRemovesTrailingDotsWithChangedOrderInTheTypoScriptArray($typoScriptSettings,$expectedSettings) {
                $typoScriptService = new Tx_Extbase_Service_TypoScriptService();
@@ -234,6 +236,8 @@ class Tx_Extbase_Tests_Unit_Service_TypoScriptServiceTest extends Tx_Extbase_Tes
        /**
         * @test
         * @dataProvider convertPlainArrayToTypoScriptArrayTestdata
+        * @param mixed $extbaseTS
+        * @param mixed $classic
         */
        public function convertPlainArrayToTypoScriptArray($extbaseTS, $classic) {
                $typoScriptService = new Tx_Extbase_Service_TypoScriptService();
index 56de355..8c050ee 100644 (file)
@@ -39,12 +39,19 @@ abstract class Tx_Extbase_Tests_Unit_Validation_Validator_AbstractValidatorTestc
                $this->validator = $this->getValidator();
        }
 
+       /**
+        * @param array $options
+        * @return mixed
+        */
        protected function getValidator($options = array()) {
                $validator = new $this->validatorClassName($options);
 
                return $validator;
        }
 
+       /**
+        * @param array $options
+        */
        protected function validatorOptions($options) {
                $this->validator = $this->getValidator($options);
        }
index 481cd40..adc6636 100644 (file)
@@ -57,6 +57,7 @@ class Tx_Extbase_Tests_Unit_Validation_Validator_BeforeExtbase14_EmailAddressVal
        /**
         * @test
         * @dataProvider validAddresses
+        * @param mixed $address
         */
        public function emailAddressValidatorReturnsTrueForAValidEmailAddress($address) {
                $emailAddressValidator = new Tx_Extbase_Validation_Validator_EmailAddressValidator();
@@ -83,6 +84,7 @@ class Tx_Extbase_Tests_Unit_Validation_Validator_BeforeExtbase14_EmailAddressVal
        /**
         * @test
         * @dataProvider invalidAddresses
+        * @param mixed $address
         */
        public function emailAddressValidatorReturnsFalseForAnInvalidEmailAddress($address) {
                $emailAddressValidator = $this->getMock('Tx_Extbase_Validation_Validator_EmailAddressValidator', array('addError'), array(), '', FALSE);
index f1a7f4b..ef2c4af 100644 (file)
@@ -72,6 +72,7 @@ class Tx_Extbase_Tests_Unit_Validation_Validator_BeforeExtbase14_FloatValidatorT
        /**
         * @test
         * @dataProvider validFloatingPointNumbers
+        * @param mixed $number
         */
        public function floatValidatorReturnsTrueForAValidFloat($number) {
                $floatValidator = new Tx_Extbase_Validation_Validator_FloatValidator();
@@ -81,6 +82,7 @@ class Tx_Extbase_Tests_Unit_Validation_Validator_BeforeExtbase14_FloatValidatorT
        /**
         * @test
         * @dataProvider invalidFloatingPointNumbers
+        * @param mixed $number
         */
        public function floatValidatorReturnsFalseForAnInvalidFloat($number) {
                $floatValidator = $this->getMock('Tx_Extbase_Validation_Validator_FloatValidator', array('addError'), array(), '', FALSE);
index 233fe15..1a06298 100644 (file)
@@ -70,6 +70,7 @@ class Tx_Extbase_Tests_Unit_Validation_Validator_BeforeExtbase14_IntegerValidato
        /**
         * @test
         * @dataProvider validIntegerNumbers
+        * @param mixed $number
         */
        public function integerValidatorReturnsTrueForAValidInteger($number) {
                $integerValidator = new Tx_Extbase_Validation_Validator_IntegerValidator();
@@ -79,6 +80,7 @@ class Tx_Extbase_Tests_Unit_Validation_Validator_BeforeExtbase14_IntegerValidato
        /**
         * @test
         * @dataProvider invalidIntegerNumbers
+        * @param mixed $number
         */
        public function integerValidatorReturnsFalseForAnInvalidInteger($number) {
                $integerValidator = $this->getMock('Tx_Extbase_Validation_Validator_IntegerValidator', array('addError'), array(), '', FALSE);
index 98a27b4..7b25cec 100644 (file)
@@ -54,6 +54,7 @@ class Tx_Extbase_Tests_Unit_Validation_Validator_EmailAddressValidatorTest exten
         * @author Karsten Dambekalns <karsten@typo3.org>
         * @test
         * @dataProvider validAddresses
+        * @param mixed $address
         */
        public function emailAddressValidatorReturnsNoErrorsForAValidEmailAddress($address) {
                $this->assertFalse($this->validator->validate($address)->hasErrors());
@@ -83,6 +84,7 @@ class Tx_Extbase_Tests_Unit_Validation_Validator_EmailAddressValidatorTest exten
         * @author Karsten Dambekalns <karsten@typo3.org>
         * @test
         * @dataProvider invalidAddresses
+        * @param mixed $address
         */
        public function emailAddressValidatorReturnsFalseForAnInvalidEmailAddress($address) {
                $this->assertTrue($this->validator->validate($address)->hasErrors());
index 4add06c..df09e52 100644 (file)
@@ -52,6 +52,7 @@ class Tx_Extbase_Tests_Unit_Validation_Validator_FloatValidatorTest extends Tx_E
         * @author Karsten Dambekalns <karsten@typo3.org>
         * @test
         * @dataProvider validFloats
+        * @param mixed $float
         */
        public function floatValidatorReturnsNoErrorsForAValidFloat($float) {
                $this->assertFalse($this->validator->validate($float)->hasErrors());
@@ -75,6 +76,7 @@ class Tx_Extbase_Tests_Unit_Validation_Validator_FloatValidatorTest extends Tx_E
         * @author Karsten Dambekalns <karsten@typo3.org>
         * @test
         * @dataProvider invalidFloats
+        * @param mixed $float
         */
        public function floatValidatorReturnsErrorForAnInvalidFloat($float) {
                $this->assertTrue($this->validator->validate($float)->hasErrors());
index 9e1280b..5e2728b 100644 (file)
@@ -47,6 +47,9 @@ class Tx_Extbase_Tests_Unit_Validation_Validator_GenericObjectValidatorTest exte
                $this->assertFalse($this->validator->validate(NULL)->hasErrors());
        }
 
+       /**
+        * @return array
+        */
        public function dataProviderForValidator() {
                $error1 = new Tx_Extbase_Error_Error('error1', 1);
                $error2 = new Tx_Extbase_Error_Error('error2', 2);
@@ -77,6 +80,10 @@ class Tx_Extbase_Tests_Unit_Validation_Validator_GenericObjectValidatorTest exte
         * @test
         * @dataProvider dataProviderForValidator
         * @author Robert Lemke <robert@typo3.org>
+        * @param mixed $mockObject
+        * @param mixed $validationResultForFoo
+        * @param mixed $validationResultForBar
+        * @param mixed $errors
         */
        public function validateChecksAllPropertiesForWhichAPropertyValidatorExists($mockObject, $validationResultForFoo, $validationResultForBar, $errors) {
 
index 1a6c7fe..59e31c9 100644 (file)
@@ -50,6 +50,7 @@ class Tx_Extbase_Tests_Unit_Validation_Validator_IntegerValidatorTest extends Tx
         * @author Karsten Dambekalns <karsten@typo3.org>
         * @test
         * @dataProvider validIntegers
+        * @param mixed $integer
         */
        public function integerValidatorReturnsNoErrorsForAValidInteger($integer) {
                $this->assertFalse($this->validator->validate($integer)->hasErrors());
@@ -73,6 +74,7 @@ class Tx_Extbase_Tests_Unit_Validation_Validator_IntegerValidatorTest extends Tx
         * @author Karsten Dambekalns <karsten@typo3.org>
         * @test
         * @dataProvider invalidIntegers
+        * @param mixed $invalidInteger
         */
        public function integerValidatorReturnsErrorForAnInvalidInteger($invalidInteger) {
                $this->assertTrue($this->validator->validate($invalidInteger)->hasErrors());
index f05900f..e7c385f 100644 (file)
@@ -345,6 +345,7 @@ class Tx_Extbase_Tests_Unit_Validation_ValidatorResolverTest extends Tx_Extbase_
         * dataProvider for parseValidatorAnnotationCanParseAnnotations
         * @author Karsten Dambekalns <karsten@typo3.org>
         * @author Christopher Hlubek <hlubek@networkteam.com>
+        * @return array
         */
        public function validatorAnnotations() {
                return array(
@@ -386,6 +387,8 @@ class Tx_Extbase_Tests_Unit_Validation_ValidatorResolverTest extends Tx_Extbase_
         * @test
         * @dataProvider validatorAnnotations
         * @author Karsten Dambekalns <karsten@typo3.org>
+        * @param mixed $annotation
+        * @param mixed $expectedResult
         */
        public function parseValidatorAnnotationCanParseAnnotations($annotation, $expectedResult) {
                $mockValidatorResolver = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_Validation_ValidatorResolver'), array('dummy'));