From: Anja Leichsenring Date: Sun, 6 Jan 2013 09:28:45 +0000 (+0100) Subject: Revert "[FEATURE] Introduce beforeCallActionMethod signal" X-Git-Tag: TYPO3_6-2-0alpha1~21^2~122 X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/049bf490ac3ac9565f676207fcef70681a08ccf4?ds=sidebyside Revert "[FEATURE] Introduce beforeCallActionMethod signal" This reverts commit f0614b4c7f7dc566889ea3de7d400f81ebb82740 Change-Id: Ic8908fb9cd959639f4f41ce5c35330ecfd521b6b Reviewed-on: https://review.typo3.org/17382 Reviewed-by: Anja Leichsenring Tested-by: Anja Leichsenring --- diff --git a/typo3/sysext/extbase/Classes/Mvc/Controller/AbstractController.php b/typo3/sysext/extbase/Classes/Mvc/Controller/AbstractController.php index a011abe6e942..268a70089ab2 100644 --- a/typo3/sysext/extbase/Classes/Mvc/Controller/AbstractController.php +++ b/typo3/sysext/extbase/Classes/Mvc/Controller/AbstractController.php @@ -36,10 +36,7 @@ abstract class AbstractController implements \TYPO3\CMS\Extbase\Mvc\Controller\C /** * @var \TYPO3\CMS\Extbase\SignalSlot\Dispatcher -<<<<<<< HEAD * @inject -======= ->>>>>>> 39173cc... [FEATURE] Introduce beforeCallActionMethod signal */ protected $signalSlotDispatcher; @@ -204,16 +201,6 @@ abstract class AbstractController implements \TYPO3\CMS\Extbase\Mvc\Controller\C $this->flashMessageContainer = $flashMessageContainer; } - /** - * injects the signal slot dispatcher - * - * @param \TYPO3\CMS\Extbase\SignalSlot\Dispatcher $signalSlotDispatcher - * @return void - */ - public function injectSignalSlotDispatcher(\TYPO3\CMS\Extbase\SignalSlot\Dispatcher $signalSlotDispatcher) { - $this->signalSlotDispatcher = $signalSlotDispatcher; - } - /** * Checks if the current request type is supported by the controller. * diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php index 51ee80599a7c..e47ca6fca0be 100644 --- a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php +++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php @@ -100,8 +100,6 @@ class ActionControllerTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase { $mockArgumentMappingResults = $this->getMock('TYPO3\\CMS\\Extbase\\Property\\MappingResults', array(), array(), '', FALSE); $mockArgumentMappingResults->expects($this->once())->method('hasErrors')->will($this->returnValue(FALSE)); $mockController = $this->getAccessibleMock('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\ActionController', array('fooAction', 'initializeAction'), array(), '', FALSE); - $mockSignalSlotDispatcher = $this->getMock('TYPO3\\CMS\Extbase\\SignalSlot\\Dispatcher', array(), array(), '', FALSE); - $mockController->injectSignalSlotDispatcher($mockSignalSlotDispatcher); $this->enableDeprecatedPropertyMapperInController($mockController); $mockController->expects($this->once())->method('fooAction')->will($this->returnValue('the returned string')); $mockController->_set('request', $mockRequest); @@ -126,8 +124,6 @@ class ActionControllerTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase { $mockArgumentMappingResults = $this->getMock('TYPO3\\CMS\\Extbase\\Property\\MappingResults', array(), array(), '', FALSE); $mockArgumentMappingResults->expects($this->once())->method('hasErrors')->will($this->returnValue(FALSE)); $mockController = $this->getAccessibleMock('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\ActionController', array('fooAction', 'initializeAction'), array(), '', FALSE); - $mockSignalSlotDispatcher = $this->getMock('TYPO3\\CMS\Extbase\\SignalSlot\\Dispatcher', array(), array(), '', FALSE); - $mockController->injectSignalSlotDispatcher($mockSignalSlotDispatcher); $this->enableDeprecatedPropertyMapperInController($mockController); $mockController->expects($this->once())->method('fooAction'); $mockController->_set('request', $mockRequest); @@ -176,8 +172,6 @@ class ActionControllerTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase { $mockArgumentMappingResults = $this->getMock('TYPO3\\CMS\\Extbase\\Property\\MappingResults', array(), array(), '', FALSE); $mockArgumentMappingResults->expects($this->once())->method('hasErrors')->will($this->returnValue(FALSE)); $mockController = $this->getAccessibleMock('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\ActionController', array('fooAction', 'initializeAction'), array(), '', FALSE); - $mockSignalSlotDispatcher = $this->getMock('TYPO3\\CMS\Extbase\\SignalSlot\\Dispatcher', array(), array(), '', FALSE); - $mockController->injectSignalSlotDispatcher($mockSignalSlotDispatcher); $this->enableDeprecatedPropertyMapperInController($mockController); $mockController->expects($this->once())->method('fooAction')->with('Default value'); $mockController->_set('request', $mockRequest);