[~TASK] Extbase: Some minor cleanup.
authorJochen Rau <j.rau@web.de>
Mon, 14 Sep 2009 07:45:12 +0000 (07:45 +0000)
committerJochen Rau <j.rau@web.de>
Mon, 14 Sep 2009 07:45:12 +0000 (07:45 +0000)
typo3/sysext/extbase/Classes/Dispatcher.php
typo3/sysext/extbase/Classes/Validation/Validator/GenericObjectValidator.php
typo3/sysext/extbase/Tests/MVC/Controller/ActionController_testcase.php

index c2b85a3..039c599 100644 (file)
@@ -26,7 +26,7 @@
  * Creates a request an dispatches it to the controller which was specified
  * by TS Setup, Flexform and returns the content to the v4 framework.
  *
- * This class is the main entry point for extbase extensions in the frontend.
+ * This class is the main entry point for extbase extensions.
  *
  * @package Extbase
  * @version $ID:$
@@ -436,8 +436,8 @@ class Tx_Extbase_Dispatcher {
                        // directory containing the controller file. We are using mod.php dispatcher
                        // and thus we are already within typo3/ because we call typo3/mod.php
                $GLOBALS['BACK_PATH'] = '';
-               return $this->dispatch('Here comes Extbase BE Module', $extbaseConfiguration);
+               return $this->dispatch('', $extbaseConfiguration);
        }
        
 }
-?>
\ No newline at end of file
+?>
index 6b21ed8..19f2168 100644 (file)
@@ -98,7 +98,6 @@ class Tx_Extbase_Validation_Validator_GenericObjectValidator extends Tx_Extbase_
         * @param array $errors Array of Tx_Extbase_Validation_Error
         * @param string $propertyName Name of the property to add errors
         * @return void
-
         */
        protected function addErrorsForProperty($errors, $propertyName) {
                if (!isset($this->errors[$propertyName])) {
index 50a7cb0..24013ba 100644 (file)
@@ -177,7 +177,7 @@ class Tx_Extbase_MVC_Controller_ActionController_testcase extends Tx_Extbase_Bas
                $mockObjectManager = $this->getMock('Tx_Extbase_Object_ManagerInterface', array(), array(), '', FALSE);
                $mockObjectManager->expects($this->at(0))->method('getObject')->with('Tx_Fluid_View_TemplateView')->will($this->returnValue($mockFluidTemplateView));
 
-               $mockController = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_MVC_Controller_ActionController'), array('buildControllerContext', 'resolveViewObjectName'), array(), '', FALSE);
+               $mockController = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_MVC_Controller_ActionController'), array('buildControllerContext', 'resolveViewObjectName', 'popFlashMessages'), array(), '', FALSE);
                $mockController->expects($this->once())->method('buildControllerContext')->will($this->returnValue($mockControllerContext));
                $mockController->_set('objectManager', $mockObjectManager);
 
@@ -200,15 +200,16 @@ class Tx_Extbase_MVC_Controller_ActionController_testcase extends Tx_Extbase_Bas
                $mockFluidTemplateView = $this->getMock('Tx_Extbase_MVC_View_ViewInterface', array('setControllerContext', 'getViewHelper', 'assign', 'assignMultiple', 'render', 'hasTemplate', 'initializeView'));
                $mockFluidTemplateView->expects($this->once())->method('setControllerContext')->with($mockControllerContext);
                $mockFluidTemplateView->expects($this->once())->method('hasTemplate')->will($this->returnValue(FALSE));
-               $mockView = $this->getMock('Tx_Extbase_MVC_View_ViewInterface');
+
+               $mockView = $this->getMock('Tx_Extbase_MVC_View_ViewInterface', array('setControllerContext', 'getViewHelper', 'assign', 'assignMultiple', 'render', 'hasTemplate', 'initializeView'));
                $mockView->expects($this->once())->method('setControllerContext')->with($mockControllerContext);
                $mockView->expects($this->once())->method('initializeView');
 
-               $mockObjectManager = $this->getMock('Tx_Extbase_Object_ManagerInterface', array(), array(), '', FALSE);
+               $mockObjectManager = $this->getMock('Tx_Extbase_Object_ManagerInterface');
                $mockObjectManager->expects($this->at(0))->method('getObject')->with('Tx_Fluid_View_TemplateView')->will($this->returnValue($mockFluidTemplateView));
                $mockObjectManager->expects($this->at(1))->method('getObject')->with('Tx_Extbase_MVC_View_EmptyView')->will($this->returnValue($mockView));
 
-               $mockController = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_MVC_Controller_ActionController'), array('buildControllerContext'), array(), '', FALSE);
+               $mockController = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_MVC_Controller_ActionController'), array('buildControllerContext', 'popFlashMessages'), array(), '', FALSE);
                $mockController->expects($this->once())->method('buildControllerContext')->will($this->returnValue($mockControllerContext));
                $mockController->_set('request', $mockRequest);
                $mockController->_set('objectManager', $mockObjectManager);
@@ -395,4 +396,4 @@ class Tx_Extbase_MVC_Controller_ActionController_testcase extends Tx_Extbase_Bas
        }
 
 }
-?>
\ No newline at end of file
+?>