[TASK] Rename FlashMessages to FlashMessageContainer
authorHelmut Hummel <helmut.hummel@typo3.org>
Sun, 4 Nov 2012 09:47:26 +0000 (10:47 +0100)
committerHelmut Hummel <helmut.hummel@typo3.org>
Sun, 4 Nov 2012 11:13:50 +0000 (12:13 +0100)
Variable and method names already use this name, so
it makes sense to use this name as class name, also
to be in line with Flow.

Resolves: #42665
Releases: 6.0

Change-Id: I36743462dd6e6d42acc2e976e4aa3371d9d98d7a
Reviewed-on: http://review.typo3.org/16180
Reviewed-by: Anja Leichsenring
Tested-by: Anja Leichsenring
Reviewed-by: Helmut Hummel
Tested-by: Helmut Hummel
typo3/sysext/extbase/Classes/Mvc/Cli/RequestHandler.php
typo3/sysext/extbase/Classes/Mvc/Controller/AbstractController.php
typo3/sysext/extbase/Classes/Mvc/Controller/ControllerContext.php
typo3/sysext/extbase/Classes/Mvc/Controller/FlashMessages.php
typo3/sysext/extbase/Classes/Mvc/Web/AbstractRequestHandler.php
typo3/sysext/extbase/Migrations/Code/ClassAliasMap.php
typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php

index 30f5136..d123dfd 100644 (file)
@@ -47,7 +47,7 @@ class RequestHandler implements \TYPO3\CMS\Extbase\Mvc\RequestHandlerInterface {
        protected $requestBuilder;
 
        /**
-        * @var \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessages
+        * @var \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessageContainer
         */
        protected $flashMessageContainer;
 
@@ -60,10 +60,10 @@ class RequestHandler implements \TYPO3\CMS\Extbase\Mvc\RequestHandlerInterface {
        }
 
        /**
-        * @param \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessages $flashMessageContainer
+        * @param \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessageContainer $flashMessageContainer
         * @return void
         */
-       public function injectFlashMessageContainer(\TYPO3\CMS\Extbase\Mvc\Controller\FlashMessages $flashMessageContainer) {
+       public function injectFlashMessageContainer(\TYPO3\CMS\Extbase\Mvc\Controller\FlashMessageContainer $flashMessageContainer) {
                $this->flashMessageContainer = $flashMessageContainer;
        }
 
index fd4eea7..32318a5 100644 (file)
@@ -115,7 +115,7 @@ abstract class AbstractController implements \TYPO3\CMS\Extbase\Mvc\Controller\C
        /**
         * The flash messages. Use $this->flashMessageContainer->add(...) to add a new Flash message.
         *
-        * @var \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessages
+        * @var \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessageContainer
         * @api
         */
        protected $flashMessageContainer;
@@ -176,10 +176,10 @@ abstract class AbstractController implements \TYPO3\CMS\Extbase\Mvc\Controller\C
        /**
         * Injects the flash messages container
         *
-        * @param \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessages $flashMessageContainer
+        * @param \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessageContainer $flashMessageContainer
         * @return void
         */
-       public function injectFlashMessageContainer(\TYPO3\CMS\Extbase\Mvc\Controller\FlashMessages $flashMessageContainer) {
+       public function injectFlashMessageContainer(\TYPO3\CMS\Extbase\Mvc\Controller\FlashMessageContainer $flashMessageContainer) {
                $this->flashMessageContainer = $flashMessageContainer;
        }
 
index 48a4c72..8698040 100644 (file)
@@ -62,7 +62,7 @@ class ControllerContext {
        protected $uriBuilder;
 
        /**
-        * @var \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessages
+        * @var \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessageContainer
         */
        protected $flashMessageContainer;
 
@@ -169,17 +169,17 @@ class ControllerContext {
        /**
         * Set the flash messages
         *
-        * @param \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessages $flashMessageContainer
+        * @param \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessageContainer $flashMessageContainer
         * @return void
         */
-       public function setFlashMessageContainer(\TYPO3\CMS\Extbase\Mvc\Controller\FlashMessages $flashMessageContainer) {
+       public function setFlashMessageContainer(\TYPO3\CMS\Extbase\Mvc\Controller\FlashMessageContainer $flashMessageContainer) {
                $this->flashMessageContainer = $flashMessageContainer;
        }
 
        /**
         * Get the flash messages
         *
-        * @return \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessages
+        * @return \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessageContainer
         * @api
         */
        public function getFlashMessageContainer() {
index aae6f51..de929e7 100644 (file)
@@ -34,7 +34,7 @@ namespace TYPO3\CMS\Extbase\Mvc\Controller;
  * @scope session
  * @api
  */
-class FlashMessages implements \TYPO3\CMS\Core\SingletonInterface {
+class FlashMessageContainer implements \TYPO3\CMS\Core\SingletonInterface {
 
        /**
         * Add another flash message.
index 8da409d..fa868e6 100644 (file)
@@ -47,7 +47,7 @@ abstract class AbstractRequestHandler implements \TYPO3\CMS\Extbase\Mvc\RequestH
        protected $requestBuilder;
 
        /**
-        * @var \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessages
+        * @var \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessageContainer
         */
        protected $flashMessageContainer;
 
@@ -60,10 +60,10 @@ abstract class AbstractRequestHandler implements \TYPO3\CMS\Extbase\Mvc\RequestH
        }
 
        /**
-        * @param \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessages $flashMessageContainer
+        * @param \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessageContainer $flashMessageContainer
         * @return void
         */
-       public function injectFlashMessageContainer(\TYPO3\CMS\Extbase\Mvc\Controller\FlashMessages $flashMessageContainer) {
+       public function injectFlashMessageContainer(\TYPO3\CMS\Extbase\Mvc\Controller\FlashMessageContainer $flashMessageContainer) {
                $this->flashMessageContainer = $flashMessageContainer;
        }
 
index e7b01ed..719601a 100644 (file)
@@ -61,7 +61,7 @@ return array(
        'Tx_Extbase_MVC_Controller_ControllerContext' => 'TYPO3\\CMS\\Extbase\\Mvc\\Controller\\ControllerContext',
        'Tx_Extbase_MVC_Controller_ControllerInterface' => 'TYPO3\\CMS\\Extbase\\Mvc\\Controller\\ControllerInterface',
        'Tx_Extbase_MVC_Controller_Exception_RequiredArgumentMissingException' => 'TYPO3\\CMS\\Extbase\\Mvc\\Controller\\Exception\\RequiredArgumentMissingException',
-       'Tx_Extbase_MVC_Controller_FlashMessages' => 'TYPO3\\CMS\\Extbase\\Mvc\\Controller\\FlashMessages',
+       'Tx_Extbase_MVC_Controller_FlashMessages' => 'TYPO3\\CMS\\Extbase\\Mvc\\Controller\\FlashMessageContainer',
        'Tx_Extbase_MVC_Controller_MvcPropertyMappingConfiguration' => 'TYPO3\\CMS\\Extbase\\Mvc\\Controller\\MvcPropertyMappingConfiguration',
        'Tx_Extbase_MVC_Dispatcher' => 'TYPO3\\CMS\\Extbase\\Mvc\\Dispatcher',
        'Tx_Extbase_MVC_Exception' => 'TYPO3\\CMS\\Extbase\\Mvc\\Exception',
index a66dbb2..e9378ed 100644 (file)
@@ -460,7 +460,7 @@ class ActionControllerTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
         */
        public function defaultErrorActionSetsArgumentMappingResultsErrorsInRequest() {
                $mockRequest = $this->getMock('TYPO3\\CMS\\Extbase\\Mvc\\Request', array(), array(), '', FALSE);
-               $mockFlashMessages = $this->getMock('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\FlashMessages', array(), array(), '', FALSE);
+               $mockFlashMessageContainer = $this->getMock('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\FlashMessageContainer', array(), array(), '', FALSE);
                $mockError = $this->getMock('TYPO3\\CMS\\Extbase\\Error\\Error', array('getMessage'), array(), '', FALSE);
                $mockArgumentsMappingResults = $this->getMock('TYPO3\\CMS\\Extbase\\Property\\MappingResults', array('getErrors', 'getWarnings'), array(), '', FALSE);
                $mockArgumentsMappingResults->expects($this->atLeastOnce())->method('getErrors')->will($this->returnValue(array($mockError)));
@@ -468,7 +468,7 @@ class ActionControllerTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
                $mockController = $this->getAccessibleMock('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\ActionController', array('pushFlashMessage', 'clearCacheOnError'), array(), '', FALSE);
                $this->enableDeprecatedPropertyMapperInController($mockController);
                $mockController->_set('request', $mockRequest);
-               $mockController->_set('flashMessageContainer', $mockFlashMessages);
+               $mockController->_set('flashMessageContainer', $mockFlashMessageContainer);
                $mockController->_set('argumentsMappingResults', $mockArgumentsMappingResults);
                $mockRequest->expects($this->once())->method('setErrors')->with(array($mockError));
                $mockController->_call('errorAction');