EXTMVC
authorJochen Rau <j.rau@web.de>
Thu, 5 Mar 2009 11:09:07 +0000 (11:09 +0000)
committerJochen Rau <j.rau@web.de>
Thu, 5 Mar 2009 11:09:07 +0000 (11:09 +0000)
* removed declare(ENCODING = 'utf-8')
* added option to switch to an uncached plugin by defining $nonCachableActions in the controller

92 files changed:
typo3/sysext/extbase/Classes/Configuration/Exception/TX_EXTMVC_Configuration_Exception_ContainerIsLocked.php
typo3/sysext/extbase/Classes/Configuration/Exception/TX_EXTMVC_Configuration_Exception_InvalidConfigurationType.php
typo3/sysext/extbase/Classes/Configuration/Exception/TX_EXTMVC_Configuration_Exception_NoSuchFile.php
typo3/sysext/extbase/Classes/Configuration/Exception/TX_EXTMVC_Configuration_Exception_NoSuchOption.php
typo3/sysext/extbase/Classes/Configuration/Exception/TX_EXTMVC_Configuration_Exception_ParseError.php
typo3/sysext/extbase/Classes/Configuration/Source/TX_EXTMVC_Configuration_Source_PHP.php
typo3/sysext/extbase/Classes/Configuration/Source/TX_EXTMVC_Configuration_Source_YAML.php
typo3/sysext/extbase/Classes/Configuration/TX_EXTMVC_Configuration_Container.php
typo3/sysext/extbase/Classes/Configuration/TX_EXTMVC_Configuration_Exception.php
typo3/sysext/extbase/Classes/Configuration/TX_EXTMVC_Configuration_Manager.php
typo3/sysext/extbase/Classes/Configuration/TX_EXTMVC_Configuration_SourceInterface.php
typo3/sysext/extbase/Classes/Controller/TX_EXTMVC_Controller_AbstractController.php
typo3/sysext/extbase/Classes/Controller/TX_EXTMVC_Controller_ActionController.php
typo3/sysext/extbase/Classes/Controller/TX_EXTMVC_Controller_Argument.php
typo3/sysext/extbase/Classes/Controller/TX_EXTMVC_Controller_Arguments.php
typo3/sysext/extbase/Classes/Controller/TX_EXTMVC_Controller_ControllerInterface.php
typo3/sysext/extbase/Classes/Controller/TX_EXTMVC_Controller_DefaultController.php
typo3/sysext/extbase/Classes/DomainObject/TX_EXTMVC_DomainObject_AbstractDomainObject.php
typo3/sysext/extbase/Classes/DomainObject/TX_EXTMVC_DomainObject_Entity.php
typo3/sysext/extbase/Classes/DomainObject/TX_EXTMVC_DomainObject_ValueObject.php
typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_InfiniteLoop.php
typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_InvalidActionName.php
typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_InvalidArgumentName.php
typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_InvalidArgumentType.php
typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_InvalidArgumentValue.php
typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_InvalidController.php
typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_InvalidControllerName.php
typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_InvalidFormat.php
typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_InvalidMarker.php
typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_InvalidPackageKey.php
typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_InvalidPart.php
typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_InvalidRequestMethod.php
typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_InvalidRequestType.php
typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_InvalidRoutePartHandler.php
typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_InvalidTemplateSource.php
typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_InvalidViewHelper.php
typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_NoSuchAction.php
typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_NoSuchArgument.php
typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_NoSuchController.php
typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_StopAction.php
typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_StopUncachedAction.php [new file with mode: 0644]
typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_SuccessiveDynamicRouteParts.php
typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_UnsupportedRequestType.php
typo3/sysext/extbase/Classes/Persistence/Exception/TX_EXTMVC_Persistence_Exception_InvalidClass.php
typo3/sysext/extbase/Classes/Persistence/Exception/TX_EXTMVC_Persistence_Exception_InvalidPropertyType.php
typo3/sysext/extbase/Classes/Persistence/Exception/TX_EXTMVC_Persistence_Exception_MissingBackend.php
typo3/sysext/extbase/Classes/Persistence/Exception/TX_EXTMVC_Persistence_Exception_TooDirty.php
typo3/sysext/extbase/Classes/Persistence/Exception/TX_EXTMVC_Persistence_Exception_UnsupportedMethod.php
typo3/sysext/extbase/Classes/Persistence/Mapper/TX_EXTMVC_Persistence_Mapper_ColumnMap.php
typo3/sysext/extbase/Classes/Persistence/Mapper/TX_EXTMVC_Persistence_Mapper_DataMap.php
typo3/sysext/extbase/Classes/Persistence/Mapper/TX_EXTMVC_Persistence_Mapper_ObjectRelationalMapper.php
typo3/sysext/extbase/Classes/Persistence/TX_EXTMVC_Persistence_Exception.php
typo3/sysext/extbase/Classes/Persistence/TX_EXTMVC_Persistence_ObjectStorage.php
typo3/sysext/extbase/Classes/Persistence/TX_EXTMVC_Persistence_QueryFactoryInterface.php
typo3/sysext/extbase/Classes/Persistence/TX_EXTMVC_Persistence_QueryInterface.php
typo3/sysext/extbase/Classes/Persistence/TX_EXTMVC_Persistence_Repository.php
typo3/sysext/extbase/Classes/Persistence/TX_EXTMVC_Persistence_RepositoryInterface.php
typo3/sysext/extbase/Classes/Persistence/TX_EXTMVC_Persistence_Session.php
typo3/sysext/extbase/Classes/TX_EXTMVC_Exception.php
typo3/sysext/extbase/Classes/TX_EXTMVC_Request.php
typo3/sysext/extbase/Classes/TX_EXTMVC_Response.php
typo3/sysext/extbase/Classes/Utility/TX_EXTMVC_Utility_Strings.php
typo3/sysext/extbase/Classes/Validation/Exception/TX_EXTMVC_Validation_Exception_InvalidSubject.php
typo3/sysext/extbase/Classes/Validation/Exception/TX_EXTMVC_Validation_Exception_NoValidatorFound.php
typo3/sysext/extbase/Classes/Validation/TX_EXTMVC_Validation_Errors.php
typo3/sysext/extbase/Classes/Validation/TX_EXTMVC_Validation_Exception.php
typo3/sysext/extbase/Classes/Validation/TX_EXTMVC_Validation_ValidatorInterface.php
typo3/sysext/extbase/Classes/Validation/Validator/TX_EXTMVC_Validation_Validator_Alphanumeric.php
typo3/sysext/extbase/Classes/Validation/Validator/TX_EXTMVC_Validation_Validator_EmailAddress.php
typo3/sysext/extbase/Classes/Validation/Validator/TX_EXTMVC_Validation_Validator_Float.php
typo3/sysext/extbase/Classes/Validation/Validator/TX_EXTMVC_Validation_Validator_Integer.php
typo3/sysext/extbase/Classes/Validation/Validator/TX_EXTMVC_Validation_Validator_NotEmpty.php
typo3/sysext/extbase/Classes/Validation/Validator/TX_EXTMVC_Validation_Validator_Number.php
typo3/sysext/extbase/Classes/Validation/Validator/TX_EXTMVC_Validation_Validator_NumberRange.php
typo3/sysext/extbase/Classes/Validation/Validator/TX_EXTMVC_Validation_Validator_Raw.php
typo3/sysext/extbase/Classes/Validation/Validator/TX_EXTMVC_Validation_Validator_RegularExpression.php
typo3/sysext/extbase/Classes/Validation/Validator/TX_EXTMVC_Validation_Validator_Text.php
typo3/sysext/extbase/Classes/Validation/Validator/TX_EXTMVC_Validation_Validator_UUID.php
typo3/sysext/extbase/Classes/View/Helper/TX_EXTMVC_View_Helper_AbstractHelper.php
typo3/sysext/extbase/Classes/View/Helper/TX_EXTMVC_View_Helper_HelperInterface.php
typo3/sysext/extbase/Classes/View/Helper/TX_EXTMVC_View_Helper_URIHelper.php
typo3/sysext/extbase/Classes/View/TX_EXTMVC_View_AbstractView.php
typo3/sysext/extbase/Classes/View/TX_EXTMVC_View_DefaultView.php
typo3/sysext/extbase/Classes/View/TX_EXTMVC_View_EmptyView.php
typo3/sysext/extbase/Classes/View/TX_EXTMVC_View_TemplateView.php
typo3/sysext/extbase/Classes/View/TX_EXTMVC_View_ViewInterface.php
typo3/sysext/extbase/Classes/Web/TX_EXTMVC_Web_Request.php
typo3/sysext/extbase/Classes/Web/TX_EXTMVC_Web_Response.php
typo3/sysext/extbase/Tests/Fixtures/TX_EXTMVC_Tests_Fixtures_Entity.php
typo3/sysext/extbase/Tests/TX_EXTMVC_Persistence_Mapper_DataMap_testcase.php
typo3/sysext/extbase/Tests/TX_EXTMVC_Persistence_Session_testcase.php
typo3/sysext/extbase/class.tx_extmvc_dispatcher.php

index 62469b9..4eddebb 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 1e96aa4..c7b83d4 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index c9432aa..f119121 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 6c6a741..0f8b3bc 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 5f22be5..8c28ff3 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index afe2be0..78e9da5 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 0eec3ac..9fd63e3 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index b1fefcb..cb3a36a 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 40dc88b..156ca57 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 78b4f39..da22653 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 825ea4b..2538b18 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index a3faa68..16e298a 100755 (executable)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
@@ -44,7 +43,7 @@ abstract class TX_EXTMVC_Controller_AbstractController implements TX_EXTMVC_Cont
         * @var array
         */
        protected $settings;
-
+       
        /**
         * @var TX_EXTMVC_Request The current request
         */
index 02a031f..1b20b13 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
@@ -22,6 +21,7 @@ declare(ENCODING = 'utf-8');
  *                                                                        */
 
 require_once(t3lib_extMgm::extPath('extmvc') . 'Classes/Controller/TX_EXTMVC_Controller_AbstractController.php');
+require_once(t3lib_extMgm::extPath('extmvc') . 'Classes/Exception/TX_EXTMVC_Exception_StopUncachedAction.php');
 
 /**
  * A multi action controller
@@ -46,7 +46,13 @@ class TX_EXTMVC_Controller_ActionController extends TX_EXTMVC_Controller_Abstrac
         * Name of the action method
         * @var string
         */
-       protected $actionMethodName = 'indexAction';
+       protected $actionMethodName = 'index';
+       
+       /**
+        * Actions that schould not be cached (changes the invocated dispatcher to a USER_INT cObject)
+        * @var array
+        */
+       protected $nonCachableActions = array();
 
        /**
         * Handles a request. The result output is returned by altering the given response.
@@ -68,6 +74,9 @@ class TX_EXTMVC_Controller_ActionController extends TX_EXTMVC_Controller_Abstrac
                $this->initializeAction();
 
                $this->callActionMethod();
+               if (in_array($this->request->getControllerActionName(), $this->nonCachableActions)) {
+                       throw new TX_EXTMVC_Exception_StopUncachedAction();
+               }
        }
 
        /**
index 96c2afb..03718d9 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index ae6d59f..0d034b2 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 25318ce..44586f2 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 10c8a09..3be31f3 100755 (executable)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index e2e1d3f..cbf497d 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 863bfc6..26e5166 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 049d303..b9d94b3 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 02d222c..18d8d9b 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 977acaf..580f2af 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index de5e48e..378befd 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 728ca67..1a071e7 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 7095e53..1ae10a4 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index bcdc9dd..4216731 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 5003dc4..5ffd726 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 29e8e9d..41260f4 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 0f8ef36..426b877 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index f472aff..067e805 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 4bc9fcb..f437f62 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 26befa3..adfad42 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index ea50ad5..fa8c395 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 343301e..4724b9f 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 91b07ac..43a3c8a 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 6eaf508..616e954 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 0ef2249..197aa45 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 2bb1666..8e6bac1 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 0a4d6ac..571733c 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 02ded8a..e7c0b7f 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
diff --git a/typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_StopUncachedAction.php b/typo3/sysext/extbase/Classes/Exception/TX_EXTMVC_Exception_StopUncachedAction.php
new file mode 100644 (file)
index 0000000..8cff4d9
--- /dev/null
@@ -0,0 +1,37 @@
+<?php
+
+/*                                                                        *
+ * This script belongs to the FLOW3 framework.                            *
+ *                                                                        *
+ * It is free software; you can redistribute it and/or modify it under    *
+ * the terms of the GNU Lesser General Public License as published by the *
+ * Free Software Foundation, either version 3 of the License, or (at your *
+ * option) any later version.                                             *
+ *                                                                        *
+ * This script is distributed in the hope that it will be useful, but     *
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHAN-    *
+ * TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser       *
+ * General Public License for more details.                               *
+ *                                                                        *
+ * You should have received a copy of the GNU Lesser General Public       *
+ * License along with the script.                                         *
+ * If not, see http://www.gnu.org/licenses/lgpl.html                      *
+ *                                                                        *
+ * The TYPO3 project - inspiring people to share!                         *
+ *                                                                        */
+
+require_once(t3lib_extMgm::extPath('extmvc') . 'Classes/TX_EXTMVC_Exception.php');
+
+/**
+ * This exception is thrown by a controller to stop the execution of the current
+ * action and return the control to the dispatcher. The dispatcher catches this
+ * exception and sets the extension to USER_INT (not cached)
+ *
+ * @version $Id:$
+ * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License, version 3 or later
+ */
+class TX_EXTMVC_Exception_StopUncachedAction extends TX_EXTMVC_Exception {
+
+}
+
+?>
\ No newline at end of file
index 56c7b40..2faa2a1 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 1fa69e5..8a6d089 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 0eb9715..8ec961c 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 4e188b9..ca46a1e 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 20c4dfb..ce21bd0 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 86c01f2..d7de31b 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 37c3808..752e6f4 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 3166aa4..7d5dec6 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 3f53f8a..4688c92 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index d405eed..e730c5f 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 3a893db..c902cdc 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index c96577e..48610f4 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index d00b52c..f03c9a1 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index d4611a2..6daf741 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 57b6d99..948ac74 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index ab7cd2e..9c96362 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 79c0900..67160f2 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index a5d6a3c..f2a8f93 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 320ca69..99116a7 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 02b2c89..f2059ee 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 2d09ec2..d7e02c9 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 3d5b1c9..05e303f 100755 (executable)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index fe3441f..68998ea 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 4af2899..ca4e4f3 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 0038dc1..75d4d12 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 9d070c0..8fa2889 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index d079039..c8ce774 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 3a09cdb..2c8cf3f 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index ebabaf2..011002d 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 00047a5..41a6dae 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 8537cc2..925b67f 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index ac38821..a2ef8e3 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index daec419..9639e77 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index c7422c2..2328821 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index c44919d..1910a31 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 7dbb68f..f8d16a6 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index b213d40..15166f9 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 9127a92..4247223 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 71fa899..9990b67 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 551fd3a..ff65a43 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index b1e080a..e7d1f15 100755 (executable)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 6c0838c..e6e9bbd 100755 (executable)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index da48528..a65e0bc 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 4110798..a6e48b4 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 10ca24a..0570046 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index d6f670a..66418ae 100755 (executable)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 36b99e4..03535cb 100755 (executable)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 8c63f26..71ec723 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script is part of the TYPO3 project - inspiring people to share!  *
index ee2cdbc..d56e450 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index 4c8e1fe..3c0679e 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
index ca5e29f..5e03e70 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-declare(ENCODING = 'utf-8');
 
 /*                                                                        *
  * This script belongs to the FLOW3 framework.                            *
@@ -35,9 +34,6 @@ require_once(t3lib_extMgm::extPath('extmvc') . 'Classes/View/TX_EXTMVC_View_Abst
 require_once(t3lib_extMgm::extPath('extmvc') . 'Classes/Persistence/TX_EXTMVC_Persistence_Session.php');
 require_once(t3lib_extMgm::extPath('extmvc') . 'Classes/Persistence/Mapper/TX_EXTMVC_Persistence_Mapper_ObjectRelationalMapper.php');
 
-// FIXME
-// require_once(t3lib_extMgm::extPath('blogexample') . 'Classes/Controller/TX_Blogexample_Controller_PostsController.php');
-
 /**
  * Creates a request an dispatches it to the controller which was specified by TS Setup, Flexform,
  * or Extension Configuration (ExtConf), and returns the content to the v4 framework.
@@ -85,7 +81,7 @@ class TX_EXTMVC_Dispatcher {
         * @return String $content The processed content
         * @author Jochen Rau <jochen.rau@typoplanet.de>
         */
-       public function dispatch($content, $configuration) {
+       public function dispatch($content, $configuration) {            
                // TODO Add an AJAX dispatcher
                // debug($configuration);
                $request = t3lib_div::makeInstance('TX_EXTMVC_Web_Request');
@@ -111,9 +107,11 @@ class TX_EXTMVC_Dispatcher {
                $session = t3lib_div::makeInstance('TX_EXTMVC_Persistence_Session');
                try {
                        $controller->processRequest($request, $response);                       
-               } catch (TX_EXTMVC_Exception_StopAction $ignoredException) {
+               } catch (TX_EXTMVC_Exception_StopAction $ignoredException) {                    
+               } catch (TX_EXTMVC_Exception_StopUncachedAction $ignoredException) {
+                       $this->cObj->convertToUserIntObject();
                }
-               // TODO catch $this->cObj->convertToUserIntObject();
+               
                $session->commit();
                $session->clear();