Revert "[FEATURE] Introduce beforeCallActionMethod signal"
authorAnja Leichsenring <aleichsenring@ab-softlab.de>
Sun, 6 Jan 2013 09:28:45 +0000 (10:28 +0100)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Sun, 6 Jan 2013 09:28:57 +0000 (10:28 +0100)
This reverts commit f0614b4c7f7dc566889ea3de7d400f81ebb82740

Change-Id: Ic8908fb9cd959639f4f41ce5c35330ecfd521b6b
Reviewed-on: https://review.typo3.org/17382
Reviewed-by: Anja Leichsenring
Tested-by: Anja Leichsenring
typo3/sysext/extbase/Classes/Mvc/Controller/AbstractController.php
typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php

index a011abe..268a700 100644 (file)
@@ -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;
 
@@ -205,16 +202,6 @@ abstract class AbstractController implements \TYPO3\CMS\Extbase\Mvc\Controller\C
        }
 
        /**
-        * 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.
         *
         * If your controller only supports certain request types, either
index 51ee805..e47ca6f 100644 (file)
@@ -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);