[TASK] Namespace classes
authorThomas Maroschik <tmaroschik@dfau.de>
Wed, 17 Oct 2012 20:20:17 +0000 (22:20 +0200)
committerThomas Maroschik <tmaroschik@dfau.de>
Wed, 17 Oct 2012 20:20:17 +0000 (22:20 +0200)
Change-Id: Ia7432e1c923826ed58206bca15fb94509adbd508

230 files changed:
typo3/sysext/fluid/Classes/Compatibility/DocbookGeneratorService.php
typo3/sysext/fluid/Classes/Compatibility/TemplateParserBuilder.php
typo3/sysext/fluid/Classes/Core/Compiler/AbstractCompiledTemplate.php
typo3/sysext/fluid/Classes/Core/Compiler/TemplateCompiler.php
typo3/sysext/fluid/Classes/Core/Exception.php
typo3/sysext/fluid/Classes/Core/Parser/Configuration.php
typo3/sysext/fluid/Classes/Core/Parser/Exception.php
typo3/sysext/fluid/Classes/Core/Parser/Interceptor/Escape.php
typo3/sysext/fluid/Classes/Core/Parser/InterceptorInterface.php
typo3/sysext/fluid/Classes/Core/Parser/ParsedTemplateInterface.php
typo3/sysext/fluid/Classes/Core/Parser/ParsingState.php
typo3/sysext/fluid/Classes/Core/Parser/SyntaxTree/AbstractNode.php
typo3/sysext/fluid/Classes/Core/Parser/SyntaxTree/ArrayNode.php
typo3/sysext/fluid/Classes/Core/Parser/SyntaxTree/BooleanNode.php
typo3/sysext/fluid/Classes/Core/Parser/SyntaxTree/NodeInterface.php
typo3/sysext/fluid/Classes/Core/Parser/SyntaxTree/ObjectAccessorNode.php
typo3/sysext/fluid/Classes/Core/Parser/SyntaxTree/RenderingContextAwareInterface.php
typo3/sysext/fluid/Classes/Core/Parser/SyntaxTree/RootNode.php
typo3/sysext/fluid/Classes/Core/Parser/SyntaxTree/TextNode.php
typo3/sysext/fluid/Classes/Core/Parser/SyntaxTree/ViewHelperNode.php
typo3/sysext/fluid/Classes/Core/Parser/TemplateParser.php
typo3/sysext/fluid/Classes/Core/Rendering/RenderingContext.php
typo3/sysext/fluid/Classes/Core/Rendering/RenderingContextInterface.php
typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractConditionViewHelper.php
typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractTagBasedViewHelper.php
typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractViewHelper.php
typo3/sysext/fluid/Classes/Core/ViewHelper/ArgumentDefinition.php
typo3/sysext/fluid/Classes/Core/ViewHelper/Arguments.php
typo3/sysext/fluid/Classes/Core/ViewHelper/Exception.php
typo3/sysext/fluid/Classes/Core/ViewHelper/Exception/InvalidVariableException.php
typo3/sysext/fluid/Classes/Core/ViewHelper/Exception/RenderingContextNotAccessibleException.php
typo3/sysext/fluid/Classes/Core/ViewHelper/Facets/ChildNodeAccessInterface.php
typo3/sysext/fluid/Classes/Core/ViewHelper/Facets/CompilableInterface.php
typo3/sysext/fluid/Classes/Core/ViewHelper/Facets/PostParseInterface.php
typo3/sysext/fluid/Classes/Core/ViewHelper/TagBasedViewHelper.php
typo3/sysext/fluid/Classes/Core/ViewHelper/TagBuilder.php
typo3/sysext/fluid/Classes/Core/ViewHelper/TemplateVariableContainer.php
typo3/sysext/fluid/Classes/Core/ViewHelper/ViewHelperInterface.php
typo3/sysext/fluid/Classes/Core/ViewHelper/ViewHelperVariableContainer.php
typo3/sysext/fluid/Classes/Core/Widget/AbstractWidgetController.php
typo3/sysext/fluid/Classes/Core/Widget/AbstractWidgetViewHelper.php
typo3/sysext/fluid/Classes/Core/Widget/AjaxWidgetContextHolder.php
typo3/sysext/fluid/Classes/Core/Widget/Bootstrap.php
typo3/sysext/fluid/Classes/Core/Widget/Exception.php
typo3/sysext/fluid/Classes/Core/Widget/Exception/MissingControllerException.php
typo3/sysext/fluid/Classes/Core/Widget/Exception/RenderingContextNotFoundException.php
typo3/sysext/fluid/Classes/Core/Widget/Exception/WidgetContextNotFoundException.php
typo3/sysext/fluid/Classes/Core/Widget/Exception/WidgetRequestNotFoundException.php
typo3/sysext/fluid/Classes/Core/Widget/WidgetContext.php
typo3/sysext/fluid/Classes/Core/Widget/WidgetRequest.php
typo3/sysext/fluid/Classes/Core/Widget/WidgetRequestBuilder.php
typo3/sysext/fluid/Classes/Core/Widget/WidgetRequestHandler.php
typo3/sysext/fluid/Classes/Exception.php
typo3/sysext/fluid/Classes/Fluid.php
typo3/sysext/fluid/Classes/Service/DocbookGenerator.php
typo3/sysext/fluid/Classes/View/AbstractTemplateView.php
typo3/sysext/fluid/Classes/View/Exception.php
typo3/sysext/fluid/Classes/View/Exception/InvalidSectionException.php
typo3/sysext/fluid/Classes/View/Exception/InvalidTemplateResourceException.php
typo3/sysext/fluid/Classes/View/StandaloneView.php
typo3/sysext/fluid/Classes/View/TemplateView.php
typo3/sysext/fluid/Classes/ViewHelpers/AliasViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/BaseViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Be/AbstractBackendViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Be/Buttons/CshViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Be/Buttons/IconViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Be/Buttons/ShortcutViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Be/ContainerViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Be/Menus/ActionMenuItemViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Be/Menus/ActionMenuViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Be/PageInfoViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Be/PagePathViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Be/Security/IfAuthenticatedViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Be/Security/IfHasRoleViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Be/TableListViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/CommentViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/CountViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/CycleViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/DebugViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/ElseViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/EscapeViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/FlashMessagesViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/ForViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormFieldViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Form/CheckboxViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Form/ErrorsViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Form/HiddenViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Form/PasswordViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Form/RadioViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Form/SelectViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Form/SubmitViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Form/TextareaViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Form/TextboxViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Form/TextfieldViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Form/UploadViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Form/ValidationResultsViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/FormViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Format/AbstractEncodingViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Format/CdataViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Format/CropViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Format/CurrencyViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Format/DateViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlentitiesDecodeViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlentitiesViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlspecialcharsViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Format/Nl2brViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Format/NumberViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Format/PaddingViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Format/PrintfViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Format/RawViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Format/StripTagsViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Format/UrlencodeViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/GroupedForViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/IfViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/ImageViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/LayoutViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Link/ActionViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Link/EmailViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Link/ExternalViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Link/PageViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/RenderChildrenViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/RenderFlashMessagesViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/RenderViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/SectionViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Security/IfAuthenticatedViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Security/IfHasRoleViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/ThenViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/TranslateViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Uri/ActionViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Uri/EmailViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Uri/ExternalViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Uri/ImageViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Uri/PageViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Uri/ResourceViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Widget/AutocompleteViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Widget/Controller/AutocompleteController.php
typo3/sysext/fluid/Classes/ViewHelpers/Widget/Controller/PaginateController.php
typo3/sysext/fluid/Classes/ViewHelpers/Widget/LinkViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Widget/PaginateViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Widget/UriViewHelper.php
typo3/sysext/fluid/Tests/Unit/Core/Compiler/AbstractCompiledTemplateTest.php
typo3/sysext/fluid/Tests/Unit/Core/Compiler/AbstractCompilerTemplateTest.php
typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestViewHelper.php
typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestViewHelper2.php
typo3/sysext/fluid/Tests/Unit/Core/Parser/Fixtures/ChildNodeAccessFacetViewHelper.php
typo3/sysext/fluid/Tests/Unit/Core/Parser/Fixtures/PostParseFacetViewHelper.php
typo3/sysext/fluid/Tests/Unit/Core/Parser/Interceptor/EscapeTest.php
typo3/sysext/fluid/Tests/Unit/Core/Parser/ParsingStateTest.php
typo3/sysext/fluid/Tests/Unit/Core/Parser/SyntaxTree/AbstractNodeTest.php
typo3/sysext/fluid/Tests/Unit/Core/Parser/SyntaxTree/BooleanNodeTest.php
typo3/sysext/fluid/Tests/Unit/Core/Parser/SyntaxTree/TextNodeTest.php
typo3/sysext/fluid/Tests/Unit/Core/Parser/SyntaxTree/ViewHelperNodeTest.php
typo3/sysext/fluid/Tests/Unit/Core/Parser/TemplateParserPatternTest.php
typo3/sysext/fluid/Tests/Unit/Core/Parser/TemplateParserTest.php
typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextTest.php
typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/AbstractConditionViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/AbstractTagBasedViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/AbstractViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/ArgumentDefinitionTest.php
typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/TagBuilderTest.php
typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/TemplateVariableContainerTest.php
typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/ViewHelperVariableContainerTest.php
typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetControllerTest.php
typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/Core/Widget/AjaxWidgetContextHolderTest.php
typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetContextTest.php
typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestBuilderTest.php
typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestHandlerTest.php
typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestTest.php
typo3/sysext/fluid/Tests/Unit/View/AbstractTemplateViewTest.php
typo3/sysext/fluid/Tests/Unit/View/Fixtures/TemplateViewFixture.php
typo3/sysext/fluid/Tests/Unit/View/Fixtures/TransparentSyntaxTreeNode.php
typo3/sysext/fluid/Tests/Unit/View/StandaloneViewTest.php
typo3/sysext/fluid/Tests/Unit/View/TemplateViewTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/AliasViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/BaseViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Be/IfAuthenticatedViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Be/IfHasRoleViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/CountViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/CycleViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/ElseViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Fixtures/ConstraintSyntaxTreeNode.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/ForViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/AbstractFormFieldViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/AbstractFormViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/CheckboxViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/EmptySyntaxTreeNode.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/Fixture_UserDomainClass.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/FormFieldViewHelperBaseTestcase.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/HiddenViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/PasswordViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/RadioViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/SelectViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/SubmitViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/TextareaViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/TextfieldViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/UploadViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/FormViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CropViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CurrencyViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/DateViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/HtmlentitiesDecodeViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/HtmlentitiesViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/HtmlspecialcharsViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/Nl2brViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/NumberViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/PaddingViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/PrintfViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/RawViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/StripTagsViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/UrlencodeViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/GroupedForViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/IfViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/EmailViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/ExternalViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/RenderChildrenViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/RenderViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Security/IfAuthenticatedViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Security/IfHasRoleViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/ThenViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/EmailViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/ExternalViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/ViewHelperBaseTestcase.php
typo3/sysext/fluid/ext_autoload.php
typo3/sysext/fluid/ext_localconf.php
typo3/sysext/fluid/ext_tables.php
typo3/sysext/fluid/ext_typoscript_setup.txt

index b3d684a..e21979e 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Compatibility;
+
 /*                                                                        *
  * This script is part of the TYPO3 project - inspiring people to share!  *
  *                                                                        *
  *
  * @internal
  */
-class Tx_Fluid_Compatibility_DocbookGeneratorService extends Tx_Fluid_Service_DocbookGenerator {
+class DocbookGeneratorService extends \TYPO3\CMS\Fluid\Service\DocbookGenerator {
 
        public function userFunc() {
-               if (!class_exists('Tx_Extbase_Utility_ClassLoader')) {
-                       require t3lib_extmgm::extPath('extbase') . 'Classes/Utility/ClassLoader.php';
+               if (!class_exists('TYPO3\\CMS\\Extbase\\Utility\\ClassLoaderUtility')) {
+                       require \t3lib_extmgm::extPath('extbase') . 'Classes/Utility/ClassLoader.php';
                }
-               $classLoader = new Tx_Extbase_Utility_ClassLoader();
+               $classLoader = new \TYPO3\CMS\Extbase\Utility\ClassLoaderUtility();
                spl_autoload_register(array($classLoader, 'loadClass'));
                return $this->generateDocbook('Tx_Fluid_ViewHelpers');
        }
@@ -44,7 +46,7 @@ class Tx_Fluid_Compatibility_DocbookGeneratorService extends Tx_Fluid_Service_Do
                if ($namespaceParts[count($namespaceParts) - 1] == '') {
 
                }
-               $classFilePathAndName = t3lib_extMgm::extPath(t3lib_div::camelCaseToLowerCaseUnderscored($namespaceParts[1])) . 'Classes/';
+               $classFilePathAndName = \TYPO3\CMS\Core\Extension\ExtensionManager::extPath(\TYPO3\CMS\Core\Utility\GeneralUtility::camelCaseToLowerCaseUnderscored($namespaceParts[1])) . 'Classes/';
                $classFilePathAndName .= implode(array_slice($namespaceParts, 2, -1), '/') . '/';
                $classNames = array();
                $this->recursiveClassNameSearch($namespace, $classFilePathAndName, $classNames);
@@ -71,10 +73,11 @@ class Tx_Fluid_Compatibility_DocbookGeneratorService extends Tx_Fluid_Service_Do
        }
 
        protected function instanciateViewHelper($className) {
-               $objectFactory = t3lib_div::makeInstance('Tx_Extbase_Object_ObjectManager');
+               $objectFactory = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Object\\ObjectManager');
                return $objectFactory->create($className);
        }
 
 }
 
+
 ?>
\ No newline at end of file
index 5675477..8c1bd23 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Compatibility;
+
 /*                                                                        *
  * This script is part of the TYPO3 project - inspiring people to share!  *
  *                                                                        *
@@ -18,7 +20,7 @@
  * Build a template parser.
  * Use this class to get a fresh instance of a correctly initialized Fluid template parser.
  */
-class Tx_Fluid_Compatibility_TemplateParserBuilder {
+class TemplateParserBuilder {
 
        /**
         * Creates a new TemplateParser which is correctly initialized. This is the correct
@@ -27,11 +29,12 @@ class Tx_Fluid_Compatibility_TemplateParserBuilder {
         * @return Tx_Fluid_Core_TemplateParser A correctly initialized Template Parser
         */
        static public function build() {
-               $templateParser = t3lib_div::makeInstance('Tx_Fluid_Core_Parser_TemplateParser');
-               $templateParser->injectObjectManager(t3lib_div::makeInstance('Tx_Extbase_Object_ObjectManager'));
+               $templateParser = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Fluid\\Core\\Parser\\TemplateParser');
+               $templateParser->injectObjectManager(\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Object\\ObjectManager'));
                return $templateParser;
        }
 
 }
 
+
 ?>
\ No newline at end of file
index b6f6415..ad5e4d3 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Compiler;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -13,7 +15,7 @@
  *
  * INTERNAL!!
  */
-abstract class Tx_Fluid_Core_Compiler_AbstractCompiledTemplate implements Tx_Fluid_Core_Parser_ParsedTemplateInterface {
+abstract class AbstractCompiledTemplate implements \TYPO3\CMS\Fluid\Core\Parser\ParsedTemplateInterface {
 
        /**
         * @var array
@@ -22,7 +24,7 @@ abstract class Tx_Fluid_Core_Compiler_AbstractCompiledTemplate implements Tx_Flu
 
        // These tokens are replaced by the Backporter for implementing different behavior in TYPO3 v4
        /**
-        * @var Tx_Extbase_Object_Container_Container
+        * @var \TYPO3\CMS\Extbase\Object\Container\Container
         */
        static protected $objectContainer;
 
@@ -35,14 +37,14 @@ abstract class Tx_Fluid_Core_Compiler_AbstractCompiledTemplate implements Tx_Flu
         * Public such that it is callable from within closures
         *
         * @param integer $uniqueCounter
-        * @param Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext
+        * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
         * @param string $viewHelperName
-        * @return Tx_Fluid_Core_ViewHelper_AbstractViewHelper
+        * @return \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper
         * @internal
         */
-       public function getViewHelper($uniqueCounter, Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext, $viewHelperName) {
+       public function getViewHelper($uniqueCounter, \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext, $viewHelperName) {
                if (self::$objectContainer === NULL) {
-                       self::$objectContainer = t3lib_div::makeInstance('Tx_Extbase_Object_Container_Container');
+                       self::$objectContainer = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Object\\Container\\Container');
                }
                if (isset($this->viewHelpersByPositionAndContext[$uniqueCounter])) {
                        if ($this->viewHelpersByPositionAndContext[$uniqueCounter]->contains($renderingContext)) {
@@ -51,16 +53,16 @@ abstract class Tx_Fluid_Core_Compiler_AbstractCompiledTemplate implements Tx_Flu
                                return $viewHelper;
                        } else {
                                $viewHelperInstance = self::$objectContainer->getInstance($viewHelperName);
-                               if ($viewHelperInstance instanceof t3lib_Singleton) {
+                               if ($viewHelperInstance instanceof \TYPO3\CMS\Core\SingletonInterface) {
                                        $viewHelperInstance->resetState();
                                }
                                $this->viewHelpersByPositionAndContext[$uniqueCounter]->attach($renderingContext, $viewHelperInstance);
                                return $viewHelperInstance;
                        }
                } else {
-                       $this->viewHelpersByPositionAndContext[$uniqueCounter] = t3lib_div::makeInstance('Tx_Extbase_Persistence_ObjectStorage');
+                       $this->viewHelpersByPositionAndContext[$uniqueCounter] = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage');
                        $viewHelperInstance = self::$objectContainer->getInstance($viewHelperName);
-                       if ($viewHelperInstance instanceof t3lib_Singleton) {
+                       if ($viewHelperInstance instanceof \TYPO3\CMS\Core\SingletonInterface) {
                                $viewHelperInstance->resetState();
                        }
                        $this->viewHelpersByPositionAndContext[$uniqueCounter]->attach($renderingContext, $viewHelperInstance);
@@ -95,4 +97,5 @@ abstract class Tx_Fluid_Core_Compiler_AbstractCompiledTemplate implements Tx_Flu
 
 }
 
+
 ?>
\ No newline at end of file
index 791d26d..44fba96 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Compiler;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
 /**
 
  */
-class Tx_Fluid_Core_Compiler_TemplateCompiler implements t3lib_Singleton {
+class TemplateCompiler implements \TYPO3\CMS\Core\SingletonInterface {
 
        const SHOULD_GENERATE_VIEWHELPER_INVOCATION = '##should_gen_viewhelper##';
        /**
-        * @var t3lib_cache_frontend_PhpFrontend
+        * @var \TYPO3\CMS\Core\Cache\Frontend\PhpFrontend
         */
        protected $templateCache;
 
@@ -30,10 +32,10 @@ class Tx_Fluid_Core_Compiler_TemplateCompiler implements t3lib_Singleton {
        protected $syntaxTreeInstanceCache = array();
 
        /**
-        * @param t3lib_cache_frontend_PhpFrontend $templateCache
+        * @param \TYPO3\CMS\Core\Cache\Frontend\PhpFrontend $templateCache
         * @return void
         */
-       public function setTemplateCache(t3lib_cache_frontend_PhpFrontend $templateCache) {
+       public function setTemplateCache(\TYPO3\CMS\Core\Cache\Frontend\PhpFrontend $templateCache) {
                $this->templateCache = $templateCache;
        }
 
@@ -48,7 +50,7 @@ class Tx_Fluid_Core_Compiler_TemplateCompiler implements t3lib_Singleton {
 
        /**
         * @param string $identifier
-        * @return Tx_Fluid_Core_Parser_ParsedTemplateInterface
+        * @return \TYPO3\CMS\Fluid\Core\Parser\ParsedTemplateInterface
         */
        public function get($identifier) {
                $identifier = $this->sanitizeIdentifier($identifier);
@@ -62,10 +64,10 @@ class Tx_Fluid_Core_Compiler_TemplateCompiler implements t3lib_Singleton {
 
        /**
         * @param string $identifier
-        * @param Tx_Fluid_Core_Parser_ParsingState $parsingState
+        * @param \TYPO3\CMS\Fluid\Core\Parser\ParsingState $parsingState
         * @return void
         */
-       public function store($identifier, Tx_Fluid_Core_Parser_ParsingState $parsingState) {
+       public function store($identifier, \TYPO3\CMS\Fluid\Core\Parser\ParsingState $parsingState) {
                $identifier = $this->sanitizeIdentifier($identifier);
                $this->variableCounter = 0;
                $generatedRenderFunctions = '';
@@ -78,14 +80,14 @@ class Tx_Fluid_Core_Compiler_TemplateCompiler implements t3lib_Singleton {
                }
                $generatedRenderFunctions .= $this->generateCodeForSection($this->convertListOfSubNodes($parsingState->getRootNode()), 'render', 'Main Render function');
                $convertedLayoutNameNode = $parsingState->hasLayout() ? $this->convert($parsingState->getLayoutNameNode()) : array('initialization' => '', 'execution' => 'NULL');
-               $classDefinition = ('class FluidCache_' . $identifier) . ' extends Tx_Fluid_Core_Compiler_AbstractCompiledTemplate';
+               $classDefinition = ('class FluidCache_' . $identifier) . ' extends TYPO3\\CMS\\Fluid\\Core\\Compiler\\AbstractCompiledTemplate';
                $templateCode = '%s {
 
 public function getVariableContainer() {
        // TODO
-       return new Tx_Fluid_Core_ViewHelper_TemplateVariableContainer();
+       return new TYPO3\\CMS\\Fluid\\Core\\ViewHelper\\TemplateVariableContainer();
 }
-public function getLayoutName(Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext) {
+public function getLayoutName(TYPO3\\CMS\\Fluid\\Core\\Rendering\\RenderingContextInterface $renderingContext) {
 %s
 return %s;
 }
@@ -115,7 +117,7 @@ return %s;
                $templateCode = '/**
  * %s
  */
-public function %s(Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext) {
+public function %s(TYPO3\\CMS\\Fluid\\Core\\Rendering\\RenderingContextInterface $renderingContext) {
 $self = $this;
 %s
 return %s;
@@ -128,33 +130,33 @@ return %s;
         * - initialization: contains PHP code which is inserted *before* the actual rendering call. Must be valid, i.e. end with semi-colon.
         * - execution: contains *a single PHP instruction* which needs to return the rendered output of the given element. Should NOT end with semi-colon.
         *
-        * @param Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode $node
+        * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode $node
         * @return array two-element array, see above
         */
-       protected function convert(Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode $node) {
-               if ($node instanceof Tx_Fluid_Core_Parser_SyntaxTree_TextNode) {
+       protected function convert(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode $node) {
+               if ($node instanceof \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\TextNode) {
                        return $this->convertTextNode($node);
-               } elseif ($node instanceof Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode) {
+               } elseif ($node instanceof \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ViewHelperNode) {
                        return $this->convertViewHelperNode($node);
-               } elseif ($node instanceof Tx_Fluid_Core_Parser_SyntaxTree_ObjectAccessorNode) {
+               } elseif ($node instanceof \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ObjectAccessorNode) {
                        return $this->convertObjectAccessorNode($node);
-               } elseif ($node instanceof Tx_Fluid_Core_Parser_SyntaxTree_ArrayNode) {
+               } elseif ($node instanceof \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ArrayNode) {
                        return $this->convertArrayNode($node);
-               } elseif ($node instanceof Tx_Fluid_Core_Parser_SyntaxTree_RootNode) {
+               } elseif ($node instanceof \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\RootNode) {
                        return $this->convertListOfSubNodes($node);
-               } elseif ($node instanceof Tx_Fluid_Core_Parser_SyntaxTree_BooleanNode) {
+               } elseif ($node instanceof \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\BooleanNode) {
                        return $this->convertBooleanNode($node);
                } else {
-                       throw new Exception('TODO: TYPE XY NOT FOUND');
+                       throw new \Exception('TODO: TYPE XY NOT FOUND');
                }
        }
 
        /**
-        * @param Tx_Fluid_Core_Parser_SyntaxTree_TextNode $node
+        * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\TextNode $node
         * @return array
         * @see convert()
         */
-       protected function convertTextNode(Tx_Fluid_Core_Parser_SyntaxTree_TextNode $node) {
+       protected function convertTextNode(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\TextNode $node) {
                return array(
                        'initialization' => '',
                        'execution' => ('\'' . $this->escapeTextForUseInSingleQuotes($node->getText())) . '\''
@@ -165,11 +167,11 @@ return %s;
         * Convert a single ViewHelperNode into its cached representation. If the ViewHelper implements the "Compilable" facet,
         * the ViewHelper itself is asked for its cached PHP code representation. If not, a ViewHelper is built and then invoked.
         *
-        * @param Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode $node
+        * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ViewHelperNode $node
         * @return array
         * @see convert()
         */
-       protected function convertViewHelperNode(Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode $node) {
+       protected function convertViewHelperNode(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ViewHelperNode $node) {
                $initializationPhpCode = ('// Rendering ViewHelper ' . $node->getViewHelperClassName()) . chr(10);
                // Build up $arguments array
                $argumentsVariableName = $this->variableName('arguments');
@@ -189,7 +191,7 @@ return %s;
                // Build up closure which renders the child nodes
                $renderChildrenClosureVariableName = $this->variableName('renderChildrenClosure');
                $initializationPhpCode .= sprintf('%s = %s;', $renderChildrenClosureVariableName, $this->wrapChildNodesInClosure($node)) . chr(10);
-               if ($node->getUninitializedViewHelper() instanceof Tx_Fluid_Core_ViewHelper_Facets_CompilableInterface) {
+               if ($node->getUninitializedViewHelper() instanceof \TYPO3\CMS\Fluid\Core\ViewHelper\Facets\CompilableInterface) {
                        // ViewHelper is compilable
                        $viewHelperInitializationPhpCode = '';
                        $convertedViewHelperExecutionCode = $node->getUninitializedViewHelper()->compile($argumentsVariableName, $renderChildrenClosureVariableName, $viewHelperInitializationPhpCode, $node, $this);
@@ -215,28 +217,28 @@ return %s;
        }
 
        /**
-        * @param Tx_Fluid_Core_Parser_SyntaxTree_ObjectAccessorNode $node
+        * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ObjectAccessorNode $node
         * @return array
         * @see convert()
         */
-       protected function convertObjectAccessorNode(Tx_Fluid_Core_Parser_SyntaxTree_ObjectAccessorNode $node) {
+       protected function convertObjectAccessorNode(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ObjectAccessorNode $node) {
                return array(
                        'initialization' => '',
-                       'execution' => sprintf('Tx_Fluid_Core_Parser_SyntaxTree_ObjectAccessorNode::getPropertyPath($renderingContext->getTemplateVariableContainer(), \'%s\', $renderingContext)', $node->getObjectPath())
+                       'execution' => sprintf('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\ObjectAccessorNode::getPropertyPath($renderingContext->getTemplateVariableContainer(), \'%s\', $renderingContext)', $node->getObjectPath())
                );
        }
 
        /**
-        * @param Tx_Fluid_Core_Parser_SyntaxTree_ArrayNode $node
+        * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ArrayNode $node
         * @return array
         * @see convert()
         */
-       protected function convertArrayNode(Tx_Fluid_Core_Parser_SyntaxTree_ArrayNode $node) {
+       protected function convertArrayNode(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ArrayNode $node) {
                $initializationPhpCode = '// Rendering Array' . chr(10);
                $arrayVariableName = $this->variableName('array');
                $initializationPhpCode .= sprintf('%s = array();', $arrayVariableName) . chr(10);
                foreach ($node->getInternalArray() as $key => $value) {
-                       if ($value instanceof Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode) {
+                       if ($value instanceof \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode) {
                                $converted = $this->convert($value);
                                $initializationPhpCode .= $converted['initialization'];
                                $initializationPhpCode .= sprintf('%s[\'%s\'] = %s;', $arrayVariableName, $key, $converted['execution']) . chr(10);
@@ -255,11 +257,11 @@ return %s;
        }
 
        /**
-        * @param Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode $node
+        * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode $node
         * @return array
         * @see convert()
         */
-       public function convertListOfSubNodes(Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode $node) {
+       public function convertListOfSubNodes(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode $node) {
                switch (count($node->getChildNodes())) {
                case 0:
                        return array(
@@ -285,25 +287,25 @@ return %s;
        }
 
        /**
-        * @param Tx_Fluid_Core_Parser_SyntaxTree_BooleanNode $node
+        * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\BooleanNode $node
         * @return array
         * @see convert()
         */
-       protected function convertBooleanNode(Tx_Fluid_Core_Parser_SyntaxTree_BooleanNode $node) {
+       protected function convertBooleanNode(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\BooleanNode $node) {
                $initializationPhpCode = '// Rendering Boolean node' . chr(10);
                if ($node->getComparator() !== NULL) {
                        $convertedLeftSide = $this->convert($node->getLeftSide());
                        $convertedRightSide = $this->convert($node->getRightSide());
                        return array(
                                'initialization' => ($initializationPhpCode . $convertedLeftSide['initialization']) . $convertedRightSide['initialization'],
-                               'execution' => sprintf('Tx_Fluid_Core_Parser_SyntaxTree_BooleanNode::evaluateComparator(\'%s\', %s, %s)', $node->getComparator(), $convertedLeftSide['execution'], $convertedRightSide['execution'])
+                               'execution' => sprintf('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\BooleanNode::evaluateComparator(\'%s\', %s, %s)', $node->getComparator(), $convertedLeftSide['execution'], $convertedRightSide['execution'])
                        );
                } else {
                        // simple case, no comparator.
                        $converted = $this->convert($node->getSyntaxTreeNode());
                        return array(
                                'initialization' => $initializationPhpCode . $converted['initialization'],
-                               'execution' => sprintf('Tx_Fluid_Core_Parser_SyntaxTree_BooleanNode::convertToBoolean(%s)', $converted['execution'])
+                               'execution' => sprintf('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\BooleanNode::convertToBoolean(%s)', $converted['execution'])
                        );
                }
        }
@@ -317,10 +319,10 @@ return %s;
        }
 
        /**
-        * @param Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode $node
+        * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode $node
         * @return string
         */
-       public function wrapChildNodesInClosure(Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode $node) {
+       public function wrapChildNodesInClosure(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode $node) {
                $closure = '';
                $closure .= 'function() use ($renderingContext, $self) {' . chr(10);
                $convertedSubNodes = $this->convertListOfSubNodes($node);
@@ -342,4 +344,5 @@ return %s;
 
 }
 
+
 ?>
\ No newline at end of file
index bf53803..fe65fee 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
  *
  * @api
  */
-class Tx_Fluid_Core_Exception extends Tx_Fluid_Exception {
+class Exception extends \TYPO3\CMS\Fluid\Exception {
 
 
 }
 
+
 ?>
\ No newline at end of file
index 14d0fe8..6aea8fb 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Parser;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -12,7 +14,7 @@
  * The parser configuration. Contains all configuration needed to configure
  * the building of a SyntaxTree.
  */
-class Tx_Fluid_Core_Parser_Configuration {
+class Configuration {
 
        /**
         * Generic interceptors registered with the configuration.
@@ -24,13 +26,13 @@ class Tx_Fluid_Core_Parser_Configuration {
        /**
         * Adds an interceptor to apply to values coming from object accessors.
         *
-        * @param Tx_Fluid_Core_Parser_InterceptorInterface $interceptor
+        * @param \TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface $interceptor
         * @return void
         */
-       public function addInterceptor(Tx_Fluid_Core_Parser_InterceptorInterface $interceptor) {
+       public function addInterceptor(\TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface $interceptor) {
                foreach ($interceptor->getInterceptionPoints() as $interceptionPoint) {
                        if (!isset($this->interceptors[$interceptionPoint])) {
-                               $this->interceptors[$interceptionPoint] = t3lib_div::makeInstance('Tx_Extbase_Persistence_ObjectStorage');
+                               $this->interceptors[$interceptionPoint] = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage');
                        }
                        if (!$this->interceptors[$interceptionPoint]->contains($interceptor)) {
                                $this->interceptors[$interceptionPoint]->attach($interceptor);
@@ -45,12 +47,13 @@ class Tx_Fluid_Core_Parser_Configuration {
         * @return Tx_Extbase_Persistence_ObjectStorage<Tx_Fluid_Core_Parser_InterceptorInterface>
         */
        public function getInterceptors($interceptionPoint) {
-               if (isset($this->interceptors[$interceptionPoint]) && $this->interceptors[$interceptionPoint] instanceof Tx_Extbase_Persistence_ObjectStorage) {
+               if (isset($this->interceptors[$interceptionPoint]) && $this->interceptors[$interceptionPoint] instanceof \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage) {
                        return $this->interceptors[$interceptionPoint];
                }
-               return t3lib_div::makeInstance('Tx_Extbase_Persistence_ObjectStorage');
+               return \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage');
        }
 
 }
 
+
 ?>
\ No newline at end of file
index dfd9c86..0f22f24 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Parser;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
  *
  * @api
  */
-class Tx_Fluid_Core_Parser_Exception extends Tx_Fluid_Core_Exception {
+class Exception extends \TYPO3\CMS\Fluid\Core\Exception {
 
 
 }
 
+
 ?>
\ No newline at end of file
index b85e0a7..d301259 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Parser\Interceptor;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -11,7 +13,7 @@
 /**
  * An interceptor adding the escape viewhelper to the suitable places.
  */
-class Tx_Fluid_Core_Parser_Interceptor_Escape implements Tx_Fluid_Core_Parser_InterceptorInterface {
+class Escape implements \TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface {
 
        /**
         * Is the interceptor enabled right now?
@@ -29,17 +31,17 @@ class Tx_Fluid_Core_Parser_Interceptor_Escape implements Tx_Fluid_Core_Parser_In
        protected $viewHelperNodesWhichDisableTheInterceptor = array();
 
        /**
-        * @var Tx_Extbase_Object_ObjectManagerInterface
+        * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
         */
        protected $objectManager;
 
        /**
         * Inject object manager
         *
-        * @param Tx_Extbase_Object_ObjectManagerInterface $objectManager
+        * @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
         * @return void
         */
-       public function injectObjectManager(Tx_Extbase_Object_ObjectManagerInterface $objectManager) {
+       public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager) {
                $this->objectManager = $objectManager;
        }
 
@@ -47,27 +49,27 @@ class Tx_Fluid_Core_Parser_Interceptor_Escape implements Tx_Fluid_Core_Parser_In
         * Adds a ViewHelper node using the Format\HtmlspecialcharsViewHelper to the given node.
         * If "escapingInterceptorEnabled" in the ViewHelper is FALSE, will disable itself inside the ViewHelpers body.
         *
-        * @param Tx_Fluid_Core_Parser_SyntaxTree_NodeInterface $node
+        * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\NodeInterface $node
         * @param integer $interceptorPosition One of the INTERCEPT_* constants for the current interception point
-        * @param Tx_Fluid_Core_Parser_ParsingState $parsingState the current parsing state. Not needed in this interceptor.
-        * @return Tx_Fluid_Core_Parser_SyntaxTree_NodeInterface
+        * @param \TYPO3\CMS\Fluid\Core\Parser\ParsingState $parsingState the current parsing state. Not needed in this interceptor.
+        * @return \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\NodeInterface
         */
-       public function process(Tx_Fluid_Core_Parser_SyntaxTree_NodeInterface $node, $interceptorPosition, Tx_Fluid_Core_Parser_ParsingState $parsingState) {
-               if ($interceptorPosition === Tx_Fluid_Core_Parser_InterceptorInterface::INTERCEPT_OPENING_VIEWHELPER) {
+       public function process(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\NodeInterface $node, $interceptorPosition, \TYPO3\CMS\Fluid\Core\Parser\ParsingState $parsingState) {
+               if ($interceptorPosition === \TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface::INTERCEPT_OPENING_VIEWHELPER) {
                        if (!$node->getUninitializedViewHelper()->isEscapingInterceptorEnabled()) {
                                $this->interceptorEnabled = FALSE;
                                $this->viewHelperNodesWhichDisableTheInterceptor[] = $node;
                        }
-               } elseif ($interceptorPosition === Tx_Fluid_Core_Parser_InterceptorInterface::INTERCEPT_CLOSING_VIEWHELPER) {
+               } elseif ($interceptorPosition === \TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface::INTERCEPT_CLOSING_VIEWHELPER) {
                        if (end($this->viewHelperNodesWhichDisableTheInterceptor) === $node) {
                                array_pop($this->viewHelperNodesWhichDisableTheInterceptor);
                                if (count($this->viewHelperNodesWhichDisableTheInterceptor) === 0) {
                                        $this->interceptorEnabled = TRUE;
                                }
                        }
-               } elseif ($this->interceptorEnabled && $node instanceof Tx_Fluid_Core_Parser_SyntaxTree_ObjectAccessorNode) {
-                       $escapeViewHelper = $this->objectManager->get('Tx_Fluid_ViewHelpers_Format_HtmlspecialcharsViewHelper');
-                       $node = $this->objectManager->create('Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode', $escapeViewHelper, array('value' => $node));
+               } elseif ($this->interceptorEnabled && $node instanceof \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ObjectAccessorNode) {
+                       $escapeViewHelper = $this->objectManager->get('TYPO3\\CMS\\Fluid\\ViewHelpers\\Format\\HtmlspecialcharsViewHelper');
+                       $node = $this->objectManager->create('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\ViewHelperNode', $escapeViewHelper, array('value' => $node));
                }
                return $node;
        }
@@ -79,12 +81,13 @@ class Tx_Fluid_Core_Parser_Interceptor_Escape implements Tx_Fluid_Core_Parser_In
         */
        public function getInterceptionPoints() {
                return array(
-                       Tx_Fluid_Core_Parser_InterceptorInterface::INTERCEPT_OPENING_VIEWHELPER,
-                       Tx_Fluid_Core_Parser_InterceptorInterface::INTERCEPT_CLOSING_VIEWHELPER,
-                       Tx_Fluid_Core_Parser_InterceptorInterface::INTERCEPT_OBJECTACCESSOR
+                       \TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface::INTERCEPT_OPENING_VIEWHELPER,
+                       \TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface::INTERCEPT_CLOSING_VIEWHELPER,
+                       \TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface::INTERCEPT_OBJECTACCESSOR
                );
        }
 
 }
 
+
 ?>
\ No newline at end of file
index d173f68..47da23c 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Parser;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -12,7 +14,7 @@
  * An interceptor interface. Interceptors are used in the parsing stage to change
  * the syntax tree of a template, e.g. by adding viewhelper nodes.
  */
-interface Tx_Fluid_Core_Parser_InterceptorInterface
+interface InterceptorInterface
 {
        const INTERCEPT_OPENING_VIEWHELPER = 1;
        const INTERCEPT_CLOSING_VIEWHELPER = 2;
@@ -22,12 +24,12 @@ interface Tx_Fluid_Core_Parser_InterceptorInterface
         * The interceptor can process the given node at will and must return a node
         * that will be used in place of the given node.
         *
-        * @param Tx_Fluid_Core_Parser_SyntaxTree_NodeInterface $node
+        * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\NodeInterface $node
         * @param integer $interceptorPosition One of the INTERCEPT_* constants for the current interception point
-        * @param Tx_Fluid_Core_Parser_ParsingState $parsingState the parsing state
-        * @return Tx_Fluid_Core_Parser_SyntaxTree_NodeInterface
+        * @param \TYPO3\CMS\Fluid\Core\Parser\ParsingState $parsingState the parsing state
+        * @return \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\NodeInterface
         */
-       public function process(Tx_Fluid_Core_Parser_SyntaxTree_NodeInterface $node, $interceptorPosition, Tx_Fluid_Core_Parser_ParsingState $parsingState);
+       public function process(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\NodeInterface $node, $interceptorPosition, \TYPO3\CMS\Fluid\Core\Parser\ParsingState $parsingState);
 
        /**
         * The interceptor should define at which interception positions it wants to be called.
@@ -37,4 +39,5 @@ interface Tx_Fluid_Core_Parser_InterceptorInterface
        public function getInterceptionPoints();
 
 }
+
 ?>
\ No newline at end of file
index b96df92..54cf61c 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Parser;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
  * This interface is returned by Tx_Fluid_Core_Parser_TemplateParser->parse()
  * method and is a parsed template
  */
-interface Tx_Fluid_Core_Parser_ParsedTemplateInterface
+interface ParsedTemplateInterface
 {
        /**
         * Render the parsed template with rendering context
         *
-        * @param Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext The rendering context to use
+        * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext The rendering context to use
         * @return Rendered string
         */
-       public function render(Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext);
+       public function render(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext);
 
        /**
         * Returns a variable container used in the PostParse Facet.
         *
-        * @return Tx_Fluid_Core_ViewHelper_TemplateVariableContainer
+        * @return \TYPO3\CMS\Fluid\Core\ViewHelper\TemplateVariableContainer
         */
        // TODO remove
        public function getVariableContainer();
@@ -35,10 +37,10 @@ interface Tx_Fluid_Core_Parser_ParsedTemplateInterface
         * If no layout is defined, this returns NULL
         * This requires the current rendering context in order to be able to evaluate the layout name
         *
-        * @param Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext
+        * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
         * @return string
         */
-       public function getLayoutName(Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext);
+       public function getLayoutName(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext);
 
        /**
         * Returns TRUE if the current template has a template defined via <f:layout name="..." />
@@ -62,4 +64,5 @@ interface Tx_Fluid_Core_Parser_ParsedTemplateInterface
        public function isCompiled();
 
 }
+
 ?>
\ No newline at end of file
index 7a73c62..1664a30 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Parser;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
  * and the current stack of open nodes (nodeStack) and a variable container used
  * for PostParseFacets.
  */
-class Tx_Fluid_Core_Parser_ParsingState implements Tx_Fluid_Core_Parser_ParsedTemplateInterface {
+class ParsingState implements \TYPO3\CMS\Fluid\Core\Parser\ParsedTemplateInterface {
 
        /**
         * Root node reference
         *
-        * @var Tx_Fluid_Core_Parser_SyntaxTree_RootNode
+        * @var \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\RootNode
         */
        protected $rootNode;
 
@@ -33,14 +35,14 @@ class Tx_Fluid_Core_Parser_ParsingState implements Tx_Fluid_Core_Parser_ParsedTe
         * Variable container where ViewHelpers implementing the PostParseFacet can
         * store things in.
         *
-        * @var Tx_Fluid_Core_ViewHelper_TemplateVariableContainer
+        * @var \TYPO3\CMS\Fluid\Core\ViewHelper\TemplateVariableContainer
         */
        protected $variableContainer;
 
        /**
         * The layout name of the current template or NULL if the template does not contain a layout definition
         *
-        * @var Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode
+        * @var \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode
         */
        protected $layoutNameNode;
 
@@ -53,27 +55,27 @@ class Tx_Fluid_Core_Parser_ParsingState implements Tx_Fluid_Core_Parser_ParsedTe
         * Injects a variable container. ViewHelpers implementing the PostParse
         * Facet can store information inside this variableContainer.
         *
-        * @param Tx_Fluid_Core_ViewHelper_TemplateVariableContainer $variableContainer
+        * @param \TYPO3\CMS\Fluid\Core\ViewHelper\TemplateVariableContainer $variableContainer
         * @return void
         */
-       public function injectVariableContainer(Tx_Fluid_Core_ViewHelper_TemplateVariableContainer $variableContainer) {
+       public function injectVariableContainer(\TYPO3\CMS\Fluid\Core\ViewHelper\TemplateVariableContainer $variableContainer) {
                $this->variableContainer = $variableContainer;
        }
 
        /**
         * Set root node of this parsing state
         *
-        * @param Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode $rootNode
+        * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode $rootNode
         * @return void
         */
-       public function setRootNode(Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode $rootNode) {
+       public function setRootNode(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode $rootNode) {
                $this->rootNode = $rootNode;
        }
 
        /**
         * Get root node of this parsing state.
         *
-        * @return Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode The root node
+        * @return \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode The root node
         */
        public function getRootNode() {
                return $this->rootNode;
@@ -82,10 +84,10 @@ class Tx_Fluid_Core_Parser_ParsingState implements Tx_Fluid_Core_Parser_ParsedTe
        /**
         * Render the parsed template with rendering context
         *
-        * @param Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext The rendering context to use
+        * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext The rendering context to use
         * @return Rendered string
         */
-       public function render(Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext) {
+       public function render(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext) {
                return $this->rootNode->evaluate($renderingContext);
        }
 
@@ -93,17 +95,17 @@ class Tx_Fluid_Core_Parser_ParsingState implements Tx_Fluid_Core_Parser_ParsedTe
         * Push a node to the node stack. The node stack holds all currently open
         * templating tags.
         *
-        * @param Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode $node Node to push to node stack
+        * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode $node Node to push to node stack
         * @return void
         */
-       public function pushNodeToStack(Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode $node) {
+       public function pushNodeToStack(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode $node) {
                array_push($this->nodeStack, $node);
        }
 
        /**
         * Get the top stack element, without removing it.
         *
-        * @return Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode the top stack element.
+        * @return \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode the top stack element.
         */
        public function getNodeFromStack() {
                return $this->nodeStack[count($this->nodeStack) - 1];
@@ -112,7 +114,7 @@ class Tx_Fluid_Core_Parser_ParsingState implements Tx_Fluid_Core_Parser_ParsedTe
        /**
         * Pop the top stack element (=remove it) and return it back.
         *
-        * @return Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode the top stack element, which was removed.
+        * @return \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode the top stack element, which was removed.
         */
        public function popNodeFromStack() {
                return array_pop($this->nodeStack);
@@ -130,7 +132,7 @@ class Tx_Fluid_Core_Parser_ParsingState implements Tx_Fluid_Core_Parser_ParsedTe
        /**
         * Returns a variable container which will be then passed to the postParseFacet.
         *
-        * @return Tx_Fluid_Core_ViewHelper_TemplateVariableContainer The variable container or NULL if none has been set yet
+        * @return \TYPO3\CMS\Fluid\Core\ViewHelper\TemplateVariableContainer The variable container or NULL if none has been set yet
         * @todo Rename to getPostParseVariableContainer
         */
        public function getVariableContainer() {
@@ -138,15 +140,15 @@ class Tx_Fluid_Core_Parser_ParsingState implements Tx_Fluid_Core_Parser_ParsedTe
        }
 
        /**
-        * @param Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode $layoutNameNode name of the layout that is defined in this template via <f:layout name="..." />
+        * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode $layoutNameNode name of the layout that is defined in this template via <f:layout name="..." />
         * @return void
         */
-       public function setLayoutNameNode(Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode $layoutNameNode) {
+       public function setLayoutNameNode(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode $layoutNameNode) {
                $this->layoutNameNode = $layoutNameNode;
        }
 
        /**
-        * @return Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode
+        * @return \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode
         */
        public function getLayoutNameNode() {
                return $this->layoutNameNode;
@@ -167,10 +169,10 @@ class Tx_Fluid_Core_Parser_ParsingState implements Tx_Fluid_Core_Parser_ParsedTe
         * If no layout is defined, this returns NULL
         * This requires the current rendering context in order to be able to evaluate the layout name
         *
-        * @param Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext
+        * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
         * @return string
         */
-       public function getLayoutName(Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext) {
+       public function getLayoutName(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext) {
                if (!$this->hasLayout()) {
                        return NULL;
                }
@@ -178,7 +180,7 @@ class Tx_Fluid_Core_Parser_ParsingState implements Tx_Fluid_Core_Parser_ParsedTe
                if (!empty($layoutName)) {
                        return $layoutName;
                }
-               throw new Tx_Fluid_View_Exception('The layoutName could not be evaluated to a string', 1296805368);
+               throw new \TYPO3\CMS\Fluid\View\Exception('The layoutName could not be evaluated to a string', 1296805368);
        }
 
        /**
@@ -204,4 +206,5 @@ class Tx_Fluid_Core_Parser_ParsingState implements Tx_Fluid_Core_Parser_ParsedTe
 
 }
 
+
 ?>
\ No newline at end of file
index 59da3ac..717d065 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Parser\SyntaxTree;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -11,7 +13,7 @@
 /**
  * Abstract node in the syntax tree which has been built.
  */
-abstract class Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode implements Tx_Fluid_Core_Parser_SyntaxTree_NodeInterface {
+abstract class AbstractNode implements \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\NodeInterface {
 
        /**
         * List of Child Nodes.
@@ -23,10 +25,10 @@ abstract class Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode implements Tx_Fluid_
        /**
         * Evaluate all child nodes and return the evaluated results.
         *
-        * @param Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext
+        * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
         * @return mixed Normally, an object is returned - in case it is concatenated with a string, a string is returned.
         */
-       public function evaluateChildNodes(Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext) {
+       public function evaluateChildNodes(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext) {
                $output = NULL;
                foreach ($this->childNodes as $subNode) {
                        if ($output === NULL) {
@@ -34,7 +36,7 @@ abstract class Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode implements Tx_Fluid_
                        } else {
                                if (is_object($output)) {
                                        if (!method_exists($output, '__toString')) {
-                                               throw new Tx_Fluid_Core_Parser_Exception(('Cannot cast object of type "' . get_class($output)) . '" to string.', 1248356140);
+                                               throw new \TYPO3\CMS\Fluid\Core\Parser\Exception(('Cannot cast object of type "' . get_class($output)) . '" to string.', 1248356140);
                                        }
                                        $output = $output->__toString();
                                } else {
@@ -43,7 +45,7 @@ abstract class Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode implements Tx_Fluid_
                                $subNodeOutput = $subNode->evaluate($renderingContext);
                                if (is_object($subNodeOutput)) {
                                        if (!method_exists($subNodeOutput, '__toString')) {
-                                               throw new Tx_Fluid_Core_Parser_Exception(('Cannot cast object of type "' . get_class($subNodeOutput)) . '" to string.', 1273753083);
+                                               throw new \TYPO3\CMS\Fluid\Core\Parser\Exception(('Cannot cast object of type "' . get_class($subNodeOutput)) . '" to string.', 1273753083);
                                        }
                                        $output .= $subNodeOutput->__toString();
                                } else {
@@ -67,13 +69,14 @@ abstract class Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode implements Tx_Fluid_
        /**
         * Appends a subnode to this node. Is used inside the parser to append children
         *
-        * @param Tx_Fluid_Core_Parser_SyntaxTree_NodeInterface $childNode The subnode to add
+        * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\NodeInterface $childNode The subnode to add
         * @return void
         */
-       public function addChildNode(Tx_Fluid_Core_Parser_SyntaxTree_NodeInterface $childNode) {
+       public function addChildNode(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\NodeInterface $childNode) {
                $this->childNodes[] = $childNode;
        }
 
 }
 
+
 ?>
\ No newline at end of file
index 64d538c..bf450f5 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Parser\SyntaxTree;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -11,7 +13,7 @@
 /**
  * Array Syntax Tree Node. Handles JSON-like arrays.
  */
-class Tx_Fluid_Core_Parser_SyntaxTree_ArrayNode extends Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode {
+class ArrayNode extends \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode {
 
        /**
         * An associative array. Each key is a string. Each value is either a literal, or an AbstractNode.
@@ -32,13 +34,13 @@ class Tx_Fluid_Core_Parser_SyntaxTree_ArrayNode extends Tx_Fluid_Core_Parser_Syn
        /**
         * Evaluate the array and return an evaluated array
         *
-        * @param Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext
+        * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
         * @return array An associative array with literal values
         */
-       public function evaluate(Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext) {
+       public function evaluate(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext) {
                $arrayToBuild = array();
                foreach ($this->internalArray as $key => $value) {
-                       if ($value instanceof Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode) {
+                       if ($value instanceof \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode) {
                                $arrayToBuild[$key] = $value->evaluate($renderingContext);
                        } else {
                                // TODO - this case should not happen!
@@ -59,4 +61,5 @@ class Tx_Fluid_Core_Parser_SyntaxTree_ArrayNode extends Tx_Fluid_Core_Parser_Syn
 
 }
 
+
 ?>
\ No newline at end of file
index e644b76..ab0dfa5 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Parser\SyntaxTree;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -11,7 +13,7 @@
 /**
  * A node which is used inside boolean arguments
  */
-class Tx_Fluid_Core_Parser_SyntaxTree_BooleanNode extends Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode {
+class BooleanNode extends \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode {
 
        /**
         * List of comparators which are supported in the boolean expression language.
@@ -47,14 +49,14 @@ class Tx_Fluid_Core_Parser_SyntaxTree_BooleanNode extends Tx_Fluid_Core_Parser_S
        /**
         * Left side of the comparison
         *
-        * @var Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode
+        * @var \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode
         */
        protected $leftSide;
 
        /**
         * Right side of the comparison
         *
-        * @var Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode
+        * @var \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode
         */
        protected $rightSide;
 
@@ -71,7 +73,7 @@ class Tx_Fluid_Core_Parser_SyntaxTree_BooleanNode extends Tx_Fluid_Core_Parser_S
         * If no comparator was found, the syntax tree node should be
         * converted to boolean.
         *
-        * @var Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode
+        * @var \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode
         */
        protected $syntaxTreeNode;
 
@@ -79,22 +81,22 @@ class Tx_Fluid_Core_Parser_SyntaxTree_BooleanNode extends Tx_Fluid_Core_Parser_S
         * Constructor. Parses the syntax tree node and fills $this->leftSide, $this->rightSide,
         * $this->comparator and $this->syntaxTreeNode.
         *
-        * @param Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode $syntaxTreeNode
+        * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode $syntaxTreeNode
         */
-       public function __construct(Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode $syntaxTreeNode) {
+       public function __construct(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode $syntaxTreeNode) {
                $childNodes = $syntaxTreeNode->getChildNodes();
                if (count($childNodes) > 3) {
-                       throw new Tx_Fluid_Core_Parser_Exception('A boolean expression has more than tree parts.', 1244201848);
+                       throw new \TYPO3\CMS\Fluid\Core\Parser\Exception('A boolean expression has more than tree parts.', 1244201848);
                } elseif (count($childNodes) === 0) {
                        // In this case, we do not have child nodes; i.e. the current SyntaxTreeNode
                        // is a text node with a literal comparison like "1 == 1"
                        $childNodes = array($syntaxTreeNode);
                }
-               $this->leftSide = new Tx_Fluid_Core_Parser_SyntaxTree_RootNode();
-               $this->rightSide = new Tx_Fluid_Core_Parser_SyntaxTree_RootNode();
+               $this->leftSide = new \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\RootNode();
+               $this->rightSide = new \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\RootNode();
                $this->comparator = NULL;
                foreach ($childNodes as $childNode) {
-                       if ($childNode instanceof Tx_Fluid_Core_Parser_SyntaxTree_TextNode && !preg_match(str_replace('COMPARATORS', implode('|', self::$comparators), self::$booleanExpressionTextNodeCheckerRegularExpression), $childNode->getText())) {
+                       if ($childNode instanceof \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\TextNode && !preg_match(str_replace('COMPARATORS', implode('|', self::$comparators), self::$booleanExpressionTextNodeCheckerRegularExpression), $childNode->getText())) {
                                // $childNode is text node, and no comparator found.
                                $this->comparator = NULL;
                                // skip loop and fall back to classical to boolean conversion.
@@ -103,14 +105,14 @@ class Tx_Fluid_Core_Parser_SyntaxTree_BooleanNode extends Tx_Fluid_Core_Parser_S
                        if ($this->comparator !== NULL) {
                                // comparator already set, we are evaluating the right side of the comparator
                                $this->rightSide->addChildNode($childNode);
-                       } elseif ($childNode instanceof Tx_Fluid_Core_Parser_SyntaxTree_TextNode && ($this->comparator = $this->getComparatorFromString($childNode->getText()))) {
+                       } elseif ($childNode instanceof \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\TextNode && ($this->comparator = $this->getComparatorFromString($childNode->getText()))) {
                                // comparator in current string segment
                                $explodedString = explode($this->comparator, $childNode->getText());
                                if (isset($explodedString[0]) && trim($explodedString[0]) !== '') {
-                                       $this->leftSide->addChildNode(new Tx_Fluid_Core_Parser_SyntaxTree_TextNode(trim($explodedString[0])));
+                                       $this->leftSide->addChildNode(new \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\TextNode(trim($explodedString[0])));
                                }
                                if (isset($explodedString[1]) && trim($explodedString[1]) !== '') {
-                                       $this->rightSide->addChildNode(new Tx_Fluid_Core_Parser_SyntaxTree_TextNode(trim($explodedString[1])));
+                                       $this->rightSide->addChildNode(new \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\TextNode(trim($explodedString[1])));
                                }
                        } else {
                                // comparator not found yet, on the left side of the comparator
@@ -132,7 +134,7 @@ class Tx_Fluid_Core_Parser_SyntaxTree_BooleanNode extends Tx_Fluid_Core_Parser_S
        }
 
        /**
-        * @return Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode
+        * @return \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode
         * @internal
         */
        public function getSyntaxTreeNode() {
@@ -140,7 +142,7 @@ class Tx_Fluid_Core_Parser_SyntaxTree_BooleanNode extends Tx_Fluid_Core_Parser_S
        }
 
        /**
-        * @return Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode
+        * @return \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode
         * @internal
         */
        public function getLeftSide() {
@@ -148,7 +150,7 @@ class Tx_Fluid_Core_Parser_SyntaxTree_BooleanNode extends Tx_Fluid_Core_Parser_S
        }
 
        /**
-        * @return Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode
+        * @return \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode
         * @internal
         */
        public function getRightSide() {
@@ -156,10 +158,10 @@ class Tx_Fluid_Core_Parser_SyntaxTree_BooleanNode extends Tx_Fluid_Core_Parser_S
        }
 
        /**
-        * @param Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext
+        * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
         * @return boolean the boolean value
         */
-       public function evaluate(Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext) {
+       public function evaluate(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext) {
                if ($this->comparator !== NULL) {
                        return self::evaluateComparator($this->comparator, $this->leftSide->evaluate($renderingContext), $this->rightSide->evaluate($renderingContext));
                } else {
@@ -182,9 +184,9 @@ class Tx_Fluid_Core_Parser_SyntaxTree_BooleanNode extends Tx_Fluid_Core_Parser_S
         *
         * This function must be static public, as it is also directly called from cached templates.
         *
-        * @param Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext
+        * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
         * @return boolean TRUE if comparison of left and right side using the comparator emit TRUE, false otherwise
-        * @throws Tx_Fluid_Core_Parser_Exception
+        * @throws \TYPO3\CMS\Fluid\Core\Parser\Exception
         */
        static public function evaluateComparator($comparator, $evaluatedLeftSide, $evaluatedRightSide) {
                switch ($comparator) {
@@ -228,7 +230,7 @@ class Tx_Fluid_Core_Parser_SyntaxTree_BooleanNode extends Tx_Fluid_Core_Parser_S
                        }
                        return $evaluatedLeftSide <= $evaluatedRightSide;
                default:
-                       throw new Tx_Fluid_Core_Parser_Exception(('Comparator "' . $comparator) . '" is not implemented.', 1244234398);
+                       throw new \TYPO3\CMS\Fluid\Core\Parser\Exception(('Comparator "' . $comparator) . '" is not implemented.', 1244234398);
                }
        }
 
@@ -292,7 +294,7 @@ class Tx_Fluid_Core_Parser_SyntaxTree_BooleanNode extends Tx_Fluid_Core_Parser_S
                if (is_string($value)) {
                        return !empty($value) && strtolower($value) !== 'false';
                }
-               if (is_array($value) || is_object($value) && $value instanceof Countable) {
+               if (is_array($value) || is_object($value) && $value instanceof \Countable) {
                        return count($value) > 0;
                }
                if (is_object($value)) {
@@ -303,4 +305,5 @@ class Tx_Fluid_Core_Parser_SyntaxTree_BooleanNode extends Tx_Fluid_Core_Parser_S
 
 }
 
+
 ?>
\ No newline at end of file
index 2ec2b7c..cc5e317 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Parser\SyntaxTree;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
 /**
  * Node in the syntax tree.
  */
-interface Tx_Fluid_Core_Parser_SyntaxTree_NodeInterface
+interface NodeInterface
 {
        /**
         * Evaluate all child nodes and return the evaluated results.
         *
-        * @param Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext
+        * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
         * @return mixed Normally, an object is returned - in case it is concatenated with a string, a string is returned.
         */
-       public function evaluateChildNodes(Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext);
+       public function evaluateChildNodes(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext);
 
        /**
         * Returns all child nodes for a given node.
@@ -31,18 +33,19 @@ interface Tx_Fluid_Core_Parser_SyntaxTree_NodeInterface
        /**
         * Appends a subnode to this node. Is used inside the parser to append children
         *
-        * @param Tx_Fluid_Core_Parser_SyntaxTree_NodeInterface $childNode The subnode to add
+        * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\NodeInterface $childNode The subnode to add
         * @return void
         */
-       public function addChildNode(Tx_Fluid_Core_Parser_SyntaxTree_NodeInterface $childNode);
+       public function addChildNode(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\NodeInterface $childNode);
 
        /**
         * Evaluates the node - can return not only strings, but arbitary objects.
         *
-        * @param Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext
+        * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
         * @return mixed Evaluated node
         */
-       public function evaluate(Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext);
+       public function evaluate(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext);
 
 }
+
 ?>
\ No newline at end of file
index a397bd7..b9c8f66 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Parser\SyntaxTree;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -11,7 +13,7 @@
 /**
  * A node which handles object access. This means it handles structures like {object.accessor.bla}
  */
-class Tx_Fluid_Core_Parser_SyntaxTree_ObjectAccessorNode extends Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode {
+class ObjectAccessorNode extends \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode {
 
        /**
         * Object path which will be called. Is a list like "post.name.email"
@@ -53,10 +55,10 @@ class Tx_Fluid_Core_Parser_SyntaxTree_ObjectAccessorNode extends Tx_Fluid_Core_P
         * The first part of the object path has to be a variable in the
         * TemplateVariableContainer.
         *
-        * @param Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext
+        * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
         * @return object The evaluated object, can be any object type.
         */
-       public function evaluate(Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext) {
+       public function evaluate(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext) {
                return self::getPropertyPath($renderingContext->getTemplateVariableContainer(), $this->objectPath, $renderingContext);
        }
 
@@ -70,20 +72,20 @@ class Tx_Fluid_Core_Parser_SyntaxTree_ObjectAccessorNode extends Tx_Fluid_Core_P
         *
         * @param mixed $subject An object or array
         * @param string $propertyPath
-        * @param Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext
+        * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
         * @return mixed Value of the property
         */
-       static public function getPropertyPath($subject, $propertyPath, Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext) {
+       static public function getPropertyPath($subject, $propertyPath, \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext) {
                $propertyPathSegments = explode('.', $propertyPath);
                foreach ($propertyPathSegments as $pathSegment) {
                        $propertyExists = FALSE;
-                       $propertyValue = Tx_Extbase_Reflection_ObjectAccess::getPropertyInternal($subject, $pathSegment, FALSE, $propertyExists);
-                       if (($propertyExists !== TRUE && (is_array($subject) || $subject instanceof ArrayAccess)) && isset($subject[$pathSegment])) {
+                       $propertyValue = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getPropertyInternal($subject, $pathSegment, FALSE, $propertyExists);
+                       if (($propertyExists !== TRUE && (is_array($subject) || $subject instanceof \ArrayAccess)) && isset($subject[$pathSegment])) {
                                $subject = $subject[$pathSegment];
                        } else {
                                $subject = $propertyValue;
                        }
-                       if ($subject instanceof Tx_Fluid_Core_Parser_SyntaxTree_RenderingContextAwareInterface) {
+                       if ($subject instanceof \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\RenderingContextAwareInterface) {
                                $subject->setRenderingContext($renderingContext);
                        }
                }
@@ -92,4 +94,5 @@ class Tx_Fluid_Core_Parser_SyntaxTree_ObjectAccessorNode extends Tx_Fluid_Core_P
 
 }
 
+
 ?>
\ No newline at end of file
index 0cb0fb4..1fba15f 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Parser\SyntaxTree;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
  * marked with this interface will get the current rendering context injected
  * by the ObjectAccessorNode on trying to evaluate them.
  */
-interface Tx_Fluid_Core_Parser_SyntaxTree_RenderingContextAwareInterface
+interface RenderingContextAwareInterface
 {
        /**
         * Sets the current rendering context
         *
-        * @param Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext
+        * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
         * @return void
         */
-       public function setRenderingContext(Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext);
+       public function setRenderingContext(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext);
 
 }
+
 ?>
\ No newline at end of file
index c8c96d9..e8291ea 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Parser\SyntaxTree;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
 /**
  * Root node of every syntax tree.
  */
-class Tx_Fluid_Core_Parser_SyntaxTree_RootNode extends Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode {
+class RootNode extends \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode {
 
        /**
         * Evaluate the root node, by evaluating the subtree.
         *
-        * @param Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext
+        * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
         * @return mixed Evaluated subtree
         */
-       public function evaluate(Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext) {
+       public function evaluate(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext) {
                return $this->evaluateChildNodes($renderingContext);
        }
 
 }
 
+
 ?>
\ No newline at end of file
index 7f9b113..c387dab 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Parser\SyntaxTree;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -11,7 +13,7 @@
 /**
  * Text Syntax Tree Node - is a container for strings.
  */
-class Tx_Fluid_Core_Parser_SyntaxTree_TextNode extends Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode {
+class TextNode extends \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode {
 
        /**
         * Contents of the text node
@@ -27,7 +29,7 @@ class Tx_Fluid_Core_Parser_SyntaxTree_TextNode extends Tx_Fluid_Core_Parser_Synt
         */
        public function __construct($text) {
                if (!is_string($text)) {
-                       throw new Tx_Fluid_Core_Parser_Exception(('Text node requires an argument of type string, "' . gettype($text)) . '" given.');
+                       throw new \TYPO3\CMS\Fluid\Core\Parser\Exception(('Text node requires an argument of type string, "' . gettype($text)) . '" given.');
                }
                $this->text = $text;
        }
@@ -36,10 +38,10 @@ class Tx_Fluid_Core_Parser_SyntaxTree_TextNode extends Tx_Fluid_Core_Parser_Synt
         * Return the text associated to the syntax tree. Text from child nodes is
         * appended to the text in the node's own text.
         *
-        * @param Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext
+        * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
         * @return string the text stored in this node/subtree.
         */
-       public function evaluate(Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext) {
+       public function evaluate(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext) {
                return $this->text . $this->evaluateChildNodes($renderingContext);
        }
 
@@ -54,4 +56,5 @@ class Tx_Fluid_Core_Parser_SyntaxTree_TextNode extends Tx_Fluid_Core_Parser_Synt
 
 }
 
+
 ?>
\ No newline at end of file
index 8b4dc53..a066cf3 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Parser\SyntaxTree;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -11,7 +13,7 @@
 /**
  * Node which will call a ViewHelper associated with this node.
  */
-class Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode extends Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode {
+class ViewHelperNode extends \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode {
 
        /**
         * Class name of view helper
@@ -30,7 +32,7 @@ class Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode extends Tx_Fluid_Core_Parse
        /**
         * The ViewHelper associated with this node
         *
-        * @var Tx_Fluid_Core_ViewHelper_AbstractViewHelper
+        * @var \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper
         */
        protected $uninitializedViewHelper = NULL;
 
@@ -38,19 +40,19 @@ class Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode extends Tx_Fluid_Core_Parse
         * A mapping RenderingContext -> ViewHelper to only re-initialize ViewHelpers
         * when a context change occurs.
         *
-        * @var Tx_Extbase_Persistence_ObjectStorage
+        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage
         */
        protected $viewHelpersByContext = NULL;
 
        /**
         * Constructor.
         *
-        * @param Tx_Fluid_Core_ViewHelper_AbstractViewHelper $viewHelper The view helper
+        * @param \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper $viewHelper The view helper
         * @param array $arguments Arguments of view helper - each value is a RootNode.
         */
-       public function __construct(Tx_Fluid_Core_ViewHelper_AbstractViewHelper $viewHelper, array $arguments) {
+       public function __construct(\TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper $viewHelper, array $arguments) {
                $this->uninitializedViewHelper = $viewHelper;
-               $this->viewHelpersByContext = t3lib_div::makeInstance('Tx_Extbase_Persistence_ObjectStorage');
+               $this->viewHelpersByContext = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage');
                $this->arguments = $arguments;
                $this->viewHelperClassName = get_class($this->uninitializedViewHelper);
        }
@@ -59,7 +61,7 @@ class Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode extends Tx_Fluid_Core_Parse
         * Returns the attached (but still uninitialized) ViewHelper for this ViewHelperNode.
         * We need this method because sometimes Interceptors need to ask some information from the ViewHelper.
         *
-        * @return Tx_Fluid_Core_ViewHelper_AbstractViewHelper the attached ViewHelper, if it is initialized
+        * @return \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper the attached ViewHelper, if it is initialized
         */
        public function getUninitializedViewHelper() {
                return $this->uninitializedViewHelper;
@@ -94,10 +96,10 @@ class Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode extends Tx_Fluid_Core_Parse
         *
         * Afterwards, checks that the view helper did not leave a variable lying around.
         *
-        * @param Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext
+        * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
         * @return object evaluated node after the view helper has been called.
         */
-       public function evaluate(Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext) {
+       public function evaluate(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext) {
                if ($this->viewHelpersByContext->contains($renderingContext)) {
                        $viewHelper = $this->viewHelpersByContext[$renderingContext];
                        $viewHelper->resetState();
@@ -119,7 +121,7 @@ class Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode extends Tx_Fluid_Core_Parse
                $viewHelper->setArguments($evaluatedArguments);
                $viewHelper->setViewHelperNode($this);
                $viewHelper->setRenderingContext($renderingContext);
-               if ($viewHelper instanceof Tx_Fluid_Core_ViewHelper_Facets_ChildNodeAccessInterface) {
+               if ($viewHelper instanceof \TYPO3\CMS\Fluid\Core\ViewHelper\Facets\ChildNodeAccessInterface) {
                        $viewHelper->setChildNodes($this->childNodes);
                }
                $output = $viewHelper->initializeArgumentsAndRender();
@@ -137,4 +139,5 @@ class Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode extends Tx_Fluid_Core_Parse
 
 }
 
+
 ?>
\ No newline at end of file
index 2ad73ed..faa12f4 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Parser;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -11,9 +13,9 @@
 /**
  * Template parser building up an object syntax tree
  */
-class Tx_Fluid_Core_Parser_TemplateParser {
+class TemplateParser {
 
-       static public $SCAN_PATTERN_NAMESPACEDECLARATION = '/(?<!\\\\){namespace\\s*([a-zA-Z]+[a-zA-Z0-9]*)\\s*=\\s*((?:Tx|t3lib|tslib)(?:FLUID_NAMESPACE_SEPARATOR\\w+)+)\\s*}/m';
+       static public $SCAN_PATTERN_NAMESPACEDECLARATION = '/(?<!\\\\){namespace\\s*([a-zA-Z]+[a-zA-Z0-9]*)\\s*=\\s*((?:[A-Za-z0-9\.]+|Tx)(?:LEGACY_NAMESPACE_SEPARATOR\\w+|FLUID_NAMESPACE_SEPARATOR\\w+)+)\\s*}/m';
 
        /**
         * This regular expression splits the input string at all dynamic tags, AND
@@ -231,16 +233,16 @@ class Tx_Fluid_Core_Parser_TemplateParser {
         * @var array
         */
        protected $namespaces = array(
-               'f' => 'Tx_Fluid_ViewHelpers'
+               'f' => 'TYPO3\\CMS\\Fluid\\ViewHelpers'
        );
 
        /**
-        * @var Tx_Extbase_Object_ObjectManagerInterface
+        * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
         */
        protected $objectManager;
 
        /**
-        * @var Tx_Fluid_Core_Parser_Configuration
+        * @var \TYPO3\CMS\Fluid\Core\Parser\Configuration
         */
        protected $configuration;
 
@@ -249,26 +251,27 @@ class Tx_Fluid_Core_Parser_TemplateParser {
         * inserting the correct namespace separator.
         */
        public function __construct() {
-               self::$SCAN_PATTERN_NAMESPACEDECLARATION = str_replace('FLUID_NAMESPACE_SEPARATOR', preg_quote(Tx_Fluid_Fluid::NAMESPACE_SEPARATOR), self::$SCAN_PATTERN_NAMESPACEDECLARATION);
+               self::$SCAN_PATTERN_NAMESPACEDECLARATION = str_replace('LEGACY_NAMESPACE_SEPARATOR', preg_quote(\TYPO3\CMS\Fluid\Fluid::LEGACY_NAMESPACE_SEPARATOR), self::$SCAN_PATTERN_NAMESPACEDECLARATION);
+               self::$SCAN_PATTERN_NAMESPACEDECLARATION = str_replace('FLUID_NAMESPACE_SEPARATOR', preg_quote(\TYPO3\CMS\Fluid\Fluid::NAMESPACE_SEPARATOR), self::$SCAN_PATTERN_NAMESPACEDECLARATION);
        }
 
        /**
         * Inject object factory
         *
-        * @param Tx_Extbase_Object_ObjectManagerInterface $objectManager
+        * @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
         * @return void
         */
-       public function injectObjectManager(Tx_Extbase_Object_ObjectManagerInterface $objectManager) {
+       public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager) {
                $this->objectManager = $objectManager;
        }
 
        /**
         * Set the configuration for the parser.
         *
-        * @param Tx_Fluid_Core_Parser_Configuration $configuration
+        * @param \TYPO3\CMS\Fluid\Core\Parser\Configuration $configuration
         * @return void
         */
-       public function setConfiguration(Tx_Fluid_Core_Parser_Configuration $configuration = NULL) {
+       public function setConfiguration(\TYPO3\CMS\Fluid\Core\Parser\Configuration $configuration = NULL) {
                $this->configuration = $configuration;
        }
 
@@ -281,11 +284,11 @@ class Tx_Fluid_Core_Parser_TemplateParser {
         * TemplateParser directly.
         *
         * @param string $templateString The template to parse as a string
-        * @return Tx_Fluid_Core_Parser_ParsedTemplateInterface Parsed template
+        * @return \TYPO3\CMS\Fluid\Core\Parser\ParsedTemplateInterface Parsed template
         */
        public function parse($templateString) {
                if (!is_string($templateString)) {
-                       throw new Tx_Fluid_Core_Parser_Exception(('Parse requires a template string as argument, ' . gettype($templateString)) . ' given.', 1224237899);
+                       throw new \TYPO3\CMS\Fluid\Core\Parser\Exception(('Parse requires a template string as argument, ' . gettype($templateString)) . ' given.', 1224237899);
                }
                $this->reset();
                $templateString = $this->extractNamespaceDefinitions($templateString);
@@ -314,7 +317,7 @@ class Tx_Fluid_Core_Parser_TemplateParser {
         */
        protected function reset() {
                $this->namespaces = array(
-                       'f' => 'Tx_Fluid_ViewHelpers'
+                       'f' => 'TYPO3\\CMS\\Fluid\\ViewHelpers'
                );
        }
 
@@ -332,7 +335,7 @@ class Tx_Fluid_Core_Parser_TemplateParser {
                                $namespaceIdentifier = $matchedVariables[1][$index];
                                $fullyQualifiedNamespace = $matchedVariables[2][$index];
                                if (key_exists($namespaceIdentifier, $this->namespaces)) {
-                                       throw new Tx_Fluid_Core_Parser_Exception(('Namespace identifier "' . $namespaceIdentifier) . '" is already registered. Do not redeclare namespaces!', 1224241246);
+                                       throw new \TYPO3\CMS\Fluid\Core\Parser\Exception(('Namespace identifier "' . $namespaceIdentifier) . '" is already registered. Do not redeclare namespaces!', 1224241246);
                                }
                                $this->namespaces[$namespaceIdentifier] = $fullyQualifiedNamespace;
                        }
@@ -356,13 +359,13 @@ class Tx_Fluid_Core_Parser_TemplateParser {
         * Build object tree from the split template
         *
         * @param array $splitTemplate The split template, so that every tag with a namespace declaration is already a seperate array element.
-        * @return Tx_Fluid_Core_Parser_ParsingState
+        * @return \TYPO3\CMS\Fluid\Core\Parser\ParsingState
         */
        protected function buildObjectTree($splitTemplate) {
                $regularExpression_openingViewHelperTag = $this->prepareTemplateRegularExpression(self::$SCAN_PATTERN_TEMPLATE_VIEWHELPERTAG);
                $regularExpression_closingViewHelperTag = $this->prepareTemplateRegularExpression(self::$SCAN_PATTERN_TEMPLATE_CLOSINGVIEWHELPERTAG);
-               $state = $this->objectManager->create('Tx_Fluid_Core_Parser_ParsingState');
-               $rootNode = $this->objectManager->create('Tx_Fluid_Core_Parser_SyntaxTree_RootNode');
+               $state = $this->objectManager->create('TYPO3\\CMS\\Fluid\\Core\\Parser\\ParsingState');
+               $rootNode = $this->objectManager->create('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\RootNode');
                $state->setRootNode($rootNode);
                $state->pushNodeToStack($rootNode);
                foreach ($splitTemplate as $templateElement) {
@@ -378,7 +381,7 @@ class Tx_Fluid_Core_Parser_TemplateParser {
                        }
                }
                if ($state->countNodeStack() !== 1) {
-                       throw new Tx_Fluid_Core_Parser_Exception('Not all tags were closed!', 1238169398);
+                       throw new \TYPO3\CMS\Fluid\Core\Parser\Exception('Not all tags were closed!', 1238169398);
                }
                return $state;
        }
@@ -386,19 +389,19 @@ class Tx_Fluid_Core_Parser_TemplateParser {
        /**
         * Handles an opening or self-closing view helper tag.
         *
-        * @param Tx_Fluid_Core_Parser_ParsingState $state Current parsing state
+        * @param \TYPO3\CMS\Fluid\Core\Parser\ParsingState $state Current parsing state
         * @param string $namespaceIdentifier Namespace identifier - being looked up in $this->namespaces
         * @param string $methodIdentifier Method identifier
         * @param string $arguments Arguments string, not yet parsed
         * @param boolean $selfclosing true, if the tag is a self-closing tag.
         * @return void
         */
-       protected function openingViewHelperTagHandler(Tx_Fluid_Core_Parser_ParsingState $state, $namespaceIdentifier, $methodIdentifier, $arguments, $selfclosing) {
+       protected function openingViewHelperTagHandler(\TYPO3\CMS\Fluid\Core\Parser\ParsingState $state, $namespaceIdentifier, $methodIdentifier, $arguments, $selfclosing) {
                $argumentsObjectTree = $this->parseArguments($arguments);
                $this->initializeViewHelperAndAddItToStack($state, $namespaceIdentifier, $methodIdentifier, $argumentsObjectTree);
                if ($selfclosing) {
                        $node = $state->popNodeFromStack();
-                       $this->callInterceptor($node, Tx_Fluid_Core_Parser_InterceptorInterface::INTERCEPT_CLOSING_VIEWHELPER, $state);
+                       $this->callInterceptor($node, \TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface::INTERCEPT_CLOSING_VIEWHELPER, $state);
                }
        }
 
@@ -406,15 +409,15 @@ class Tx_Fluid_Core_Parser_TemplateParser {
         * Initialize the given ViewHelper and adds it to the current node and to
         * the stack.
         *
-        * @param Tx_Fluid_Core_Parser_ParsingState $state Current parsing state
+        * @param \TYPO3\CMS\Fluid\Core\Parser\ParsingState $state Current parsing state
         * @param string $namespaceIdentifier Namespace identifier - being looked up in $this->namespaces
         * @param string $methodIdentifier Method identifier
         * @param array $argumentsObjectTree Arguments object tree
         * @return void
         */
-       protected function initializeViewHelperAndAddItToStack(Tx_Fluid_Core_Parser_ParsingState $state, $namespaceIdentifier, $methodIdentifier, $argumentsObjectTree) {
+       protected function initializeViewHelperAndAddItToStack(\TYPO3\CMS\Fluid\Core\Parser\ParsingState $state, $namespaceIdentifier, $methodIdentifier, $argumentsObjectTree) {
                if (!array_key_exists($namespaceIdentifier, $this->namespaces)) {
-                       throw new Tx_Fluid_Core_Parser_Exception('Namespace could not be resolved. This exception should never be thrown!', 1224254792);
+                       throw new \TYPO3\CMS\Fluid\Core\Parser\Exception('Namespace could not be resolved. This exception should never be thrown!', 1224254792);
                }
                $viewHelper = $this->objectManager->get($this->resolveViewHelperName($namespaceIdentifier, $methodIdentifier));
                // The following three checks are only done *in an uncached template*, and not needed anymore in the cached version
@@ -422,18 +425,18 @@ class Tx_Fluid_Core_Parser_TemplateParser {
                $this->abortIfUnregisteredArgumentsExist($expectedViewHelperArguments, $argumentsObjectTree);
                $this->abortIfRequiredArgumentsAreMissing($expectedViewHelperArguments, $argumentsObjectTree);
                $this->rewriteBooleanNodesInArgumentsObjectTree($expectedViewHelperArguments, $argumentsObjectTree);
-               $currentViewHelperNode = $this->objectManager->create('Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode', $viewHelper, $argumentsObjectTree);
+               $currentViewHelperNode = $this->objectManager->create('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\ViewHelperNode', $viewHelper, $argumentsObjectTree);
                $state->getNodeFromStack()->addChildNode($currentViewHelperNode);
-               if ($viewHelper instanceof Tx_Fluid_Core_ViewHelper_Facets_ChildNodeAccessInterface && !$viewHelper instanceof Tx_Fluid_Core_ViewHelper_Facets_CompilableInterface) {
+               if ($viewHelper instanceof \TYPO3\CMS\Fluid\Core\ViewHelper\Facets\ChildNodeAccessInterface && !$viewHelper instanceof \TYPO3\CMS\Fluid\Core\ViewHelper\Facets\CompilableInterface) {
                        $state->setCompilable(FALSE);
                }
                // PostParse Facet
-               if ($viewHelper instanceof Tx_Fluid_Core_ViewHelper_Facets_PostParseInterface) {
+               if ($viewHelper instanceof \TYPO3\CMS\Fluid\Core\ViewHelper\Facets\PostParseInterface) {
                        // Don't just use $viewHelper::postParseEvent(...),
                        // as this will break with PHP < 5.3.
                        call_user_func(array($viewHelper, 'postParseEvent'), $currentViewHelperNode, $argumentsObjectTree, $state->getVariableContainer());
                }
-               $this->callInterceptor($currentViewHelperNode, Tx_Fluid_Core_Parser_InterceptorInterface::INTERCEPT_OPENING_VIEWHELPER, $state);
+               $this->callInterceptor($currentViewHelperNode, \TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface::INTERCEPT_OPENING_VIEWHELPER, $state);
                $state->pushNodeToStack($currentViewHelperNode);
        }
 
@@ -443,7 +446,7 @@ class Tx_Fluid_Core_Parser_TemplateParser {
         *
         * @param array $expectedArguments Array of Tx_Fluid_Core_ViewHelper_ArgumentDefinition of all expected arguments
         * @param array $actualArguments Actual arguments
-        * @throws Tx_Fluid_Core_Parser_Exception
+        * @throws \TYPO3\CMS\Fluid\Core\Parser\Exception
         */
        protected function abortIfUnregisteredArgumentsExist($expectedArguments, $actualArguments) {
                $expectedArgumentNames = array();
@@ -452,7 +455,7 @@ class Tx_Fluid_Core_Parser_TemplateParser {
                }
                foreach (array_keys($actualArguments) as $argumentName) {
                        if (!in_array($argumentName, $expectedArgumentNames)) {
-                               throw new Tx_Fluid_Core_Parser_Exception(('Argument "' . $argumentName) . '" was not registered.', 1237823695);
+                               throw new \TYPO3\CMS\Fluid\Core\Parser\Exception(('Argument "' . $argumentName) . '" was not registered.', 1237823695);
                        }
                }
        }
@@ -462,13 +465,13 @@ class Tx_Fluid_Core_Parser_TemplateParser {
         *
         * @param array $expectedArguments Array of Tx_Fluid_Core_ViewHelper_ArgumentDefinition of all expected arguments
         * @param array $actualArguments Actual arguments
-        * @throws Tx_Fluid_Core_Parser_Exception
+        * @throws \TYPO3\CMS\Fluid\Core\Parser\Exception
         */
        protected function abortIfRequiredArgumentsAreMissing($expectedArguments, $actualArguments) {
                $actualArgumentNames = array_keys($actualArguments);
                foreach ($expectedArguments as $expectedArgument) {
                        if ($expectedArgument->isRequired() && !in_array($expectedArgument->getName(), $actualArgumentNames)) {
-                               throw new Tx_Fluid_Core_Parser_Exception(('Required argument "' . $expectedArgument->getName()) . '" was not supplied.', 1237823699);
+                               throw new \TYPO3\CMS\Fluid\Core\Parser\Exception(('Required argument "' . $expectedArgument->getName()) . '" was not supplied.', 1237823699);
                        }
                }
        }
@@ -483,7 +486,7 @@ class Tx_Fluid_Core_Parser_TemplateParser {
        protected function rewriteBooleanNodesInArgumentsObjectTree($argumentDefinitions, &$argumentsObjectTree) {
                foreach ($argumentDefinitions as $argumentName => $argumentDefinition) {
                        if ($argumentDefinition->getType() === 'boolean' && isset($argumentsObjectTree[$argumentName])) {
-                               $argumentsObjectTree[$argumentName] = new Tx_Fluid_Core_Parser_SyntaxTree_BooleanNode($argumentsObjectTree[$argumentName]);
+                               $argumentsObjectTree[$argumentName] = new \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\BooleanNode($argumentsObjectTree[$argumentName]);
                        }
                }
        }
@@ -497,37 +500,38 @@ class Tx_Fluid_Core_Parser_TemplateParser {
         */
        protected function resolveViewHelperName($namespaceIdentifier, $methodIdentifier) {
                $explodedViewHelperName = explode('.', $methodIdentifier);
+               $namespaceSeperator = strpos($this->namespaces[$namespaceIdentifier], \TYPO3\CMS\Fluid\Fluid::NAMESPACE_SEPARATOR) !== FALSE ? \TYPO3\CMS\Fluid\Fluid::NAMESPACE_SEPARATOR : \TYPO3\CMS\Fluid\Fluid::LEGACY_NAMESPACE_SEPARATOR;
                if (count($explodedViewHelperName) > 1) {
-                       $className = implode(Tx_Fluid_Fluid::NAMESPACE_SEPARATOR, array_map('ucfirst', $explodedViewHelperName));
+                       $className = implode($namespaceSeperator, array_map('ucfirst', $explodedViewHelperName));
                } else {
                        $className = ucfirst($explodedViewHelperName[0]);
                }
                $className .= 'ViewHelper';
-               $name = ($this->namespaces[$namespaceIdentifier] . Tx_Fluid_Fluid::NAMESPACE_SEPARATOR) . $className;
+               $name = ($this->namespaces[$namespaceIdentifier] . $namespaceSeperator) . $className;
                return $name;
        }
 
        /**
         * Handles a closing view helper tag
         *
-        * @param Tx_Fluid_Core_Parser_ParsingState $state The current parsing state
+        * @param \TYPO3\CMS\Fluid\Core\Parser\ParsingState $state The current parsing state
         * @param string $namespaceIdentifier Namespace identifier for the closing tag.
         * @param string $methodIdentifier Method identifier.
         * @return void
-        * @throws Tx_Fluid_Core_Parser_Exception
+        * @throws \TYPO3\CMS\Fluid\Core\Parser\Exception
         */
-       protected function closingViewHelperTagHandler(Tx_Fluid_Core_Parser_ParsingState $state, $namespaceIdentifier, $methodIdentifier) {
+       protected function closingViewHelperTagHandler(\TYPO3\CMS\Fluid\Core\Parser\ParsingState $state, $namespaceIdentifier, $methodIdentifier) {
                if (!array_key_exists($namespaceIdentifier, $this->namespaces)) {
-                       throw new Tx_Fluid_Core_Parser_Exception('Namespace could not be resolved. This exception should never be thrown!', 1224256186);
+                       throw new \TYPO3\CMS\Fluid\Core\Parser\Exception('Namespace could not be resolved. This exception should never be thrown!', 1224256186);
                }
                $lastStackElement = $state->popNodeFromStack();
-               if (!$lastStackElement instanceof Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode) {
-                       throw new Tx_Fluid_Core_Parser_Exception('You closed a templating tag which you never opened!', 1224485838);
+               if (!$lastStackElement instanceof \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ViewHelperNode) {
+                       throw new \TYPO3\CMS\Fluid\Core\Parser\Exception('You closed a templating tag which you never opened!', 1224485838);
                }
                if ($lastStackElement->getViewHelperClassName() != $this->resolveViewHelperName($namespaceIdentifier, $methodIdentifier)) {
-                       throw new Tx_Fluid_Core_Parser_Exception((('Templating tags not properly nested. Expected: ' . $lastStackElement->getViewHelperClassName()) . '; Actual: ') . $this->resolveViewHelperName($namespaceIdentifier, $methodIdentifier), 1224485398);
+                       throw new \TYPO3\CMS\Fluid\Core\Parser\Exception((('Templating tags not properly nested. Expected: ' . $lastStackElement->getViewHelperClassName()) . '; Actual: ') . $this->resolveViewHelperName($namespaceIdentifier, $methodIdentifier), 1224485398);
                }
-               $this->callInterceptor($lastStackElement, Tx_Fluid_Core_Parser_InterceptorInterface::INTERCEPT_CLOSING_VIEWHELPER, $state);
+               $this->callInterceptor($lastStackElement, \TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface::INTERCEPT_CLOSING_VIEWHELPER, $state);
        }
 
        /**
@@ -536,14 +540,14 @@ class Tx_Fluid_Core_Parser_TemplateParser {
         *
         * Handles ViewHelpers as well which are in the shorthand syntax.
         *
-        * @param Tx_Fluid_Core_Parser_ParsingState $state The current parsing state
+        * @param \TYPO3\CMS\Fluid\Core\Parser\ParsingState $state The current parsing state
         * @param string $objectAccessorString String which identifies which objects to fetch
         * @param string $delimiter
         * @param string $viewHelperString
         * @param string $additionalViewHelpersString
         * @return void
         */
-       protected function objectAccessorHandler(Tx_Fluid_Core_Parser_ParsingState $state, $objectAccessorString, $delimiter, $viewHelperString, $additionalViewHelpersString) {
+       protected function objectAccessorHandler(\TYPO3\CMS\Fluid\Core\Parser\ParsingState $state, $objectAccessorString, $delimiter, $viewHelperString, $additionalViewHelpersString) {
                $viewHelperString .= $additionalViewHelpersString;
                $numberOfViewHelpers = 0;
                // The following post-processing handles a case when there is only a ViewHelper, and no Object Accessor.
@@ -568,26 +572,26 @@ class Tx_Fluid_Core_Parser_TemplateParser {
                }
                // Object Accessor
                if (strlen($objectAccessorString) > 0) {
-                       $node = $this->objectManager->create('Tx_Fluid_Core_Parser_SyntaxTree_ObjectAccessorNode', $objectAccessorString);
-                       $this->callInterceptor($node, Tx_Fluid_Core_Parser_InterceptorInterface::INTERCEPT_OBJECTACCESSOR, $state);
+                       $node = $this->objectManager->create('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\ObjectAccessorNode', $objectAccessorString);
+                       $this->callInterceptor($node, \TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface::INTERCEPT_OBJECTACCESSOR, $state);
                        $state->getNodeFromStack()->addChildNode($node);
                }
                // Close ViewHelper Tags if needed.
                for ($i = 0; $i < $numberOfViewHelpers; $i++) {
                        $node = $state->popNodeFromStack();
-                       $this->callInterceptor($node, Tx_Fluid_Core_Parser_InterceptorInterface::INTERCEPT_CLOSING_VIEWHELPER, $state);
+                       $this->callInterceptor($node, \TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface::INTERCEPT_CLOSING_VIEWHELPER, $state);
                }
        }
 
        /**
         * Call all interceptors registered for a given interception point.
         *
-        * @param Tx_Fluid_Core_Parser_SyntaxTree_NodeInterface $node The syntax tree node which can be modified by the interceptors.
+        * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\NodeInterface $node The syntax tree node which can be modified by the interceptors.
         * @param integer $interceptionPoint the interception point. One of the Tx_Fluid_Core_Parser_InterceptorInterface::INTERCEPT_* constants.
-        * @param Tx_Fluid_Core_Parser_ParsingState the parsing state
+        * @param \TYPO3\CMS\Fluid\Core\Parser\ParsingState the parsing state
         * @return void
         */
-       protected function callInterceptor(Tx_Fluid_Core_Parser_SyntaxTree_NodeInterface &$node, $interceptionPoint, Tx_Fluid_Core_Parser_ParsingState $state) {
+       protected function callInterceptor(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\NodeInterface &$node, $interceptionPoint, \TYPO3\CMS\Fluid\Core\Parser\ParsingState $state) {
                if ($this->configuration !== NULL) {
                        // $this->configuration is UNSET inside the arguments of a ViewHelper.
                        // That's why the interceptors are only called if the object accesor is not inside a ViewHelper Argument
@@ -612,8 +616,8 @@ class Tx_Fluid_Core_Parser_TemplateParser {
         */
        protected function postProcessArgumentsForObjectAccessor(array $arguments) {
                foreach ($arguments as $argumentName => $argumentValue) {
-                       if (!$argumentValue instanceof Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode) {
-                               $arguments[$argumentName] = $this->objectManager->create('Tx_Fluid_Core_Parser_SyntaxTree_TextNode', (string) $argumentValue);
+                       if (!$argumentValue instanceof \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode) {
+                               $arguments[$argumentName] = $this->objectManager->create('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\TextNode', (string) $argumentValue);
                        }
                }
                return $arguments;
@@ -656,7 +660,7 @@ class Tx_Fluid_Core_Parser_TemplateParser {
         */
        protected function buildArgumentObjectTree($argumentString) {
                if (strpos($argumentString, '{') === FALSE && strpos($argumentString, '<') === FALSE) {
-                       return $this->objectManager->create('Tx_Fluid_Core_Parser_SyntaxTree_TextNode', $argumentString);
+                       return $this->objectManager->create('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\TextNode', $argumentString);
                }
                $splitArgument = $this->splitTemplateAtDynamicTags($argumentString);
                $rootNode = $this->buildObjectTree($splitArgument)->getRootNode();
@@ -701,11 +705,11 @@ class Tx_Fluid_Core_Parser_TemplateParser {
         *
         * This includes Text, array syntax, and object accessor syntax.
         *
-        * @param Tx_Fluid_Core_Parser_ParsingState $state Current parsing state
+        * @param \TYPO3\CMS\Fluid\Core\Parser\ParsingState $state Current parsing state
         * @param string $text Text to process
         * @return void
         */
-       protected function textAndShorthandSyntaxHandler(Tx_Fluid_Core_Parser_ParsingState $state, $text) {
+       protected function textAndShorthandSyntaxHandler(\TYPO3\CMS\Fluid\Core\Parser\ParsingState $state, $text) {
                $sections = preg_split($this->prepareTemplateRegularExpression(self::$SPLIT_PATTERN_SHORTHANDSYNTAX), $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
                foreach ($sections as $section) {
                        $matchedVariables = array();
@@ -723,12 +727,12 @@ class Tx_Fluid_Core_Parser_TemplateParser {
         * Handler for array syntax. This creates the array object recursively and
         * adds it to the current node.
         *
-        * @param Tx_Fluid_Core_Parser_ParsingState $state The current parsing state
+        * @param \TYPO3\CMS\Fluid\Core\Parser\ParsingState $state The current parsing state
         * @param string $arrayText The array as string.
         * @return void
         */
-       protected function arrayHandler(Tx_Fluid_Core_Parser_ParsingState $state, $arrayText) {
-               $state->getNodeFromStack()->addChildNode($this->objectManager->create('Tx_Fluid_Core_Parser_SyntaxTree_ArrayNode', $this->recursiveArrayHandler($arrayText)));
+       protected function arrayHandler(\TYPO3\CMS\Fluid\Core\Parser\ParsingState $state, $arrayText) {
+               $state->getNodeFromStack()->addChildNode($this->objectManager->create('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\ArrayNode', $this->recursiveArrayHandler($arrayText)));
        }
 
        /**
@@ -751,37 +755,38 @@ class Tx_Fluid_Core_Parser_TemplateParser {
                        foreach ($matches as $singleMatch) {
                                $arrayKey = $singleMatch['Key'];
                                if (!empty($singleMatch['VariableIdentifier'])) {
-                                       $arrayToBuild[$arrayKey] = $this->objectManager->create('Tx_Fluid_Core_Parser_SyntaxTree_ObjectAccessorNode', $singleMatch['VariableIdentifier']);
+                                       $arrayToBuild[$arrayKey] = $this->objectManager->create('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\ObjectAccessorNode', $singleMatch['VariableIdentifier']);
                                } elseif (array_key_exists('Number', $singleMatch) && (!empty($singleMatch['Number']) || $singleMatch['Number'] === '0')) {
                                        $arrayToBuild[$arrayKey] = floatval($singleMatch['Number']);
                                } elseif (array_key_exists('QuotedString', $singleMatch) && !empty($singleMatch['QuotedString'])) {
                                        $argumentString = $this->unquoteString($singleMatch['QuotedString']);
                                        $arrayToBuild[$arrayKey] = $this->buildArgumentObjectTree($argumentString);
                                } elseif (array_key_exists('Subarray', $singleMatch) && !empty($singleMatch['Subarray'])) {
-                                       $arrayToBuild[$arrayKey] = $this->objectManager->create('Tx_Fluid_Core_Parser_SyntaxTree_ArrayNode', $this->recursiveArrayHandler($singleMatch['Subarray']));
+                                       $arrayToBuild[$arrayKey] = $this->objectManager->create('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\ArrayNode', $this->recursiveArrayHandler($singleMatch['Subarray']));
                                } else {
-                                       throw new Tx_Fluid_Core_Parser_Exception(('This exception should never be thrown, as the array value has to be of some type (Value given: "' . var_export($singleMatch, TRUE)) . '"). Please post your template to the bugtracker at forge.typo3.org.', 1225136013);
+                                       throw new \TYPO3\CMS\Fluid\Core\Parser\Exception(('This exception should never be thrown, as the array value has to be of some type (Value given: "' . var_export($singleMatch, TRUE)) . '"). Please post your template to the bugtracker at forge.typo3.org.', 1225136013);
                                }
                        }
                        return $arrayToBuild;
                } else {
-                       throw new Tx_Fluid_Core_Parser_Exception('This exception should never be thrown, there is most likely some error in the regular expressions. Please post your template to the bugtracker at forge.typo3.org.', 1225136013);
+                       throw new \TYPO3\CMS\Fluid\Core\Parser\Exception('This exception should never be thrown, there is most likely some error in the regular expressions. Please post your template to the bugtracker at forge.typo3.org.', 1225136013);
                }
        }
 
        /**
         * Text node handler
         *
-        * @param Tx_Fluid_Core_Parser_ParsingState $state
+        * @param \TYPO3\CMS\Fluid\Core\Parser\ParsingState $state
         * @param string $text
         * @return void
         */
-       protected function textHandler(Tx_Fluid_Core_Parser_ParsingState $state, $text) {
-               $node = $this->objectManager->create('Tx_Fluid_Core_Parser_SyntaxTree_TextNode', $text);
-               $this->callInterceptor($node, Tx_Fluid_Core_Parser_InterceptorInterface::INTERCEPT_TEXT, $state);
+       protected function textHandler(\TYPO3\CMS\Fluid\Core\Parser\ParsingState $state, $text) {
+               $node = $this->objectManager->create('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\TextNode', $text);
+               $this->callInterceptor($node, \TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface::INTERCEPT_TEXT, $state);
                $state->getNodeFromStack()->addChildNode($node);
        }
 
 }
 
+
 ?>
\ No newline at end of file
index ad36799..b773fb5 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Rendering;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
 /**
 
  */
-class Tx_Fluid_Core_Rendering_RenderingContext implements Tx_Fluid_Core_Rendering_RenderingContextInterface {
+class RenderingContext implements \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface {
 
        /**
         * Template Variable Container. Contains all variables available through object accessors in the template
         *
-        * @var Tx_Fluid_Core_ViewHelper_TemplateVariableContainer
+        * @var \TYPO3\CMS\Fluid\Core\ViewHelper\TemplateVariableContainer
         */
        protected $templateVariableContainer;
 
@@ -24,37 +26,37 @@ class Tx_Fluid_Core_Rendering_RenderingContext implements Tx_Fluid_Core_Renderin
         * Object manager which is bubbled through. The ViewHelperNode cannot get an ObjectManager injected because
         * the whole syntax tree should be cacheable
         *
-        * @var Tx_Extbase_Object_ObjectManagerInterface
+        * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
         */
        protected $objectManager;
 
        /**
         * Controller context being passed to the ViewHelper
         *
-        * @var Tx_Extbase_MVC_Controller_ControllerContext
+        * @var \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext
         */
        protected $controllerContext;
 
        /**
         * ViewHelper Variable Container
         *
-        * @var Tx_Fluid_Core_ViewHelper_ViewHelperVariableContainer
+        * @var \TYPO3\CMS\Fluid\Core\ViewHelper\ViewHelperVariableContainer
         */
        protected $viewHelperVariableContainer;
 
        /**
         * Inject the object manager
         *
-        * @param Tx_Extbase_Object_ObjectManagerInterface $objectManager
+        * @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
         */
-       public function injectObjectManager(Tx_Extbase_Object_ObjectManagerInterface $objectManager) {
+       public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager) {
                $this->objectManager = $objectManager;
        }
 
        /**
         * Returns the object manager. Only the ViewHelperNode should do this.
         *
-        * @param Tx_Extbase_Object_ObjectManagerInterface $objectManager
+        * @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
         */
        public function getObjectManager() {
                return $this->objectManager;
@@ -64,16 +66,16 @@ class Tx_Fluid_Core_Rendering_RenderingContext implements Tx_Fluid_Core_Renderin
         * Injects the template variable container containing all variables available through ObjectAccessors
         * in the template
         *
-        * @param Tx_Fluid_Core_ViewHelper_TemplateVariableContainer $templateVariableContainer The template variable container to set
+        * @param \TYPO3\CMS\Fluid\Core\ViewHelper\TemplateVariableContainer $templateVariableContainer The template variable container to set
         */
-       public function injectTemplateVariableContainer(Tx_Fluid_Core_ViewHelper_TemplateVariableContainer $templateVariableContainer) {
+       public function injectTemplateVariableContainer(\TYPO3\CMS\Fluid\Core\ViewHelper\TemplateVariableContainer $templateVariableContainer) {
                $this->templateVariableContainer = $templateVariableContainer;
        }
 
        /**
         * Get the template variable container
         *
-        * @return Tx_Fluid_Core_ViewHelper_TemplateVariableContainer The Template Variable Container
+        * @return \TYPO3\CMS\Fluid\Core\ViewHelper\TemplateVariableContainer The Template Variable Container
         */
        public function getTemplateVariableContainer() {
                return $this->templateVariableContainer;
@@ -82,16 +84,16 @@ class Tx_Fluid_Core_Rendering_RenderingContext implements Tx_Fluid_Core_Renderin
        /**
         * Set the controller context which will be passed to the ViewHelper
         *
-        * @param Tx_Extbase_MVC_Controller_ControllerContext $controllerContext The controller context to set
+        * @param \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext The controller context to set
         */
-       public function setControllerContext(Tx_Extbase_MVC_Controller_ControllerContext $controllerContext) {
+       public function setControllerContext(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext) {
                $this->controllerContext = $controllerContext;
        }
 
        /**
         * Get the controller context which will be passed to the ViewHelper
         *
-        * @return Tx_Extbase_MVC_Controller_ControllerContext The controller context to set
+        * @return \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext The controller context to set
         */
        public function getControllerContext() {
                return $this->controllerContext;
@@ -100,17 +102,17 @@ class Tx_Fluid_Core_Rendering_RenderingContext implements Tx_Fluid_Core_Renderin
        /**
         * Set the ViewHelperVariableContainer
         *
-        * @param Tx_Fluid_Core_ViewHelper_ViewHelperVariableContainer $viewHelperVariableContainer
+        * @param \TYPO3\CMS\Fluid\Core\ViewHelper\ViewHelperVariableContainer $viewHelperVariableContainer
         * @return void
         */
-       public function injectViewHelperVariableContainer(Tx_Fluid_Core_ViewHelper_ViewHelperVariableContainer $viewHelperVariableContainer) {
+       public function injectViewHelperVariableContainer(\TYPO3\CMS\Fluid\Core\ViewHelper\ViewHelperVariableContainer $viewHelperVariableContainer) {
                $this->viewHelperVariableContainer = $viewHelperVariableContainer;
        }
 
        /**
         * Get the ViewHelperVariableContainer
         *
-        * @return Tx_Fluid_Core_ViewHelper_ViewHelperVariableContainer
+        * @return \TYPO3\CMS\Fluid\Core\ViewHelper\ViewHelperVariableContainer
         */
        public function getViewHelperVariableContainer() {
                return $this->viewHelperVariableContainer;
@@ -118,4 +120,5 @@ class Tx_Fluid_Core_Rendering_RenderingContext implements Tx_Fluid_Core_Renderin
 
 }
 
+
 ?>
\ No newline at end of file
index 354bb03..9ccba2d 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Rendering;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
 /**
 
  */
-interface Tx_Fluid_Core_Rendering_RenderingContextInterface
+interface RenderingContextInterface
 {
        /**
         * Get the template variable container
         *
-        * @return Tx_Fluid_Core_ViewHelper_TemplateVariableContainer The Template Variable Container
+        * @return \TYPO3\CMS\Fluid\Core\ViewHelper\TemplateVariableContainer The Template Variable Container
         */
        public function getTemplateVariableContainer();
 
        /**
         * Get the controller context which will be passed to the ViewHelper
         *
-        * @return Tx_Extbase_MVC_Controller_ControllerContext The controller context to set
+        * @return \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext The controller context to set
         */
        public function getControllerContext();
 
        /**
         * Get the ViewHelperVariableContainer
         *
-        * @return Tx_Fluid_Core_ViewHelper_ViewHelperVariableContainer
+        * @return \TYPO3\CMS\Fluid\Core\ViewHelper\ViewHelperVariableContainer
         */
        public function getViewHelperVariableContainer();
 
 }
+
 ?>
\ No newline at end of file
index f20de62..a6e5bcc 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\ViewHelper;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -15,7 +17,7 @@
  * @see Tx_Fluid_ViewHelpers_IfViewHelper for a more detailed explanation and a simple usage example.
  * @api
  */
-abstract class Tx_Fluid_Core_ViewHelper_AbstractConditionViewHelper extends Tx_Fluid_Core_ViewHelper_AbstractViewHelper implements Tx_Fluid_Core_ViewHelper_Facets_ChildNodeAccessInterface, Tx_Fluid_Core_ViewHelper_Facets_CompilableInterface {
+abstract class AbstractConditionViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper implements \TYPO3\CMS\Fluid\Core\ViewHelper\Facets\ChildNodeAccessInterface, \TYPO3\CMS\Fluid\Core\ViewHelper\Facets\CompilableInterface {
 
        /**
         * An array of Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode
@@ -62,11 +64,11 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractConditionViewHelper extends Tx_F
                }
                $elseViewHelperEncountered = FALSE;
                foreach ($this->childNodes as $childNode) {
-                       if ($childNode instanceof Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode && $childNode->getViewHelperClassName() === 'Tx_Fluid_ViewHelpers_ThenViewHelper') {
+                       if ($childNode instanceof \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ViewHelperNode && $childNode->getViewHelperClassName() === 'TYPO3\\CMS\\Fluid\\ViewHelpers\\ThenViewHelper') {
                                $data = $childNode->evaluate($this->renderingContext);
                                return $data;
                        }
-                       if ($childNode instanceof Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode && $childNode->getViewHelperClassName() === 'Tx_Fluid_ViewHelpers_ElseViewHelper') {
+                       if ($childNode instanceof \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ViewHelperNode && $childNode->getViewHelperClassName() === 'TYPO3\\CMS\\Fluid\\ViewHelpers\\ElseViewHelper') {
                                $elseViewHelperEncountered = TRUE;
                        }
                }
@@ -94,7 +96,7 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractConditionViewHelper extends Tx_F
                        return $elseClosure();
                }
                foreach ($this->childNodes as $childNode) {
-                       if ($childNode instanceof Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode && $childNode->getViewHelperClassName() === 'Tx_Fluid_ViewHelpers_ElseViewHelper') {
+                       if ($childNode instanceof \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ViewHelperNode && $childNode->getViewHelperClassName() === 'TYPO3\\CMS\\Fluid\\ViewHelpers\\ElseViewHelper') {
                                return $childNode->evaluate($this->renderingContext);
                        }
                }
@@ -108,25 +110,26 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractConditionViewHelper extends Tx_F
         * @param string $argumentsVariableName
         * @param string $renderChildrenClosureVariableName
         * @param string $initializationPhpCode
-        * @param Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode $syntaxTreeNode
-        * @param Tx_Fluid_Core_Compiler_TemplateCompiler $templateCompiler
+        * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode $syntaxTreeNode
+        * @param \TYPO3\CMS\Fluid\Core\Compiler\TemplateCompiler $templateCompiler
         * @return string
         * @internal
         */
-       public function compile($argumentsVariableName, $renderChildrenClosureVariableName, &$initializationPhpCode, Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode $syntaxTreeNode, Tx_Fluid_Core_Compiler_TemplateCompiler $templateCompiler) {
+       public function compile($argumentsVariableName, $renderChildrenClosureVariableName, &$initializationPhpCode, \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode $syntaxTreeNode, \TYPO3\CMS\Fluid\Core\Compiler\TemplateCompiler $templateCompiler) {
                foreach ($syntaxTreeNode->getChildNodes() as $childNode) {
-                       if ($childNode instanceof Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode && $childNode->getViewHelperClassName() === 'Tx_Fluid_ViewHelpers_ThenViewHelper') {
+                       if ($childNode instanceof \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ViewHelperNode && $childNode->getViewHelperClassName() === 'TYPO3\\CMS\\Fluid\\ViewHelpers\\ThenViewHelper') {
                                $childNodesAsClosure = $templateCompiler->wrapChildNodesInClosure($childNode);
                                $initializationPhpCode .= sprintf('%s[\'__thenClosure\'] = %s;', $argumentsVariableName, $childNodesAsClosure) . chr(10);
                        }
-                       if ($childNode instanceof Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode && $childNode->getViewHelperClassName() === 'Tx_Fluid_ViewHelpers_ElseViewHelper') {
+                       if ($childNode instanceof \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ViewHelperNode && $childNode->getViewHelperClassName() === 'TYPO3\\CMS\\Fluid\\ViewHelpers\\ElseViewHelper') {
                                $childNodesAsClosure = $templateCompiler->wrapChildNodesInClosure($childNode);
                                $initializationPhpCode .= sprintf('%s[\'__elseClosure\'] = %s;', $argumentsVariableName, $childNodesAsClosure) . chr(10);
                        }
                }
-               return Tx_Fluid_Core_Compiler_TemplateCompiler::SHOULD_GENERATE_VIEWHELPER_INVOCATION;
+               return \TYPO3\CMS\Fluid\Core\Compiler\TemplateCompiler::SHOULD_GENERATE_VIEWHELPER_INVOCATION;
        }
 
 }
 
+
 ?>
\ No newline at end of file
index ff3b7ba..49dc821 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\ViewHelper;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -15,7 +17,7 @@
  *
  * @api
  */
-abstract class Tx_Fluid_Core_ViewHelper_AbstractTagBasedViewHelper extends Tx_Fluid_Core_ViewHelper_AbstractViewHelper {
+abstract class AbstractTagBasedViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
 
        /**
         * Names of all registered tag attributes
@@ -27,7 +29,7 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractTagBasedViewHelper extends Tx_Fl
        /**
         * Tag builder instance
         *
-        * @var Tx_Fluid_Core_ViewHelper_TagBuilder
+        * @var \TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder
         * @api
         */
        protected $tag = NULL;
@@ -43,10 +45,10 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractTagBasedViewHelper extends Tx_Fl
        /**
         * Inject a TagBuilder
         *
-        * @param Tx_Fluid_Core_ViewHelper_TagBuilder $tagBuilder Tag builder
+        * @param \TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder $tagBuilder Tag builder
         * @return void
         */
-       public function injectTagBuilder(Tx_Fluid_Core_ViewHelper_TagBuilder $tagBuilder) {
+       public function injectTagBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder $tagBuilder) {
                $this->tag = $tagBuilder;
        }
 
@@ -122,4 +124,5 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractTagBasedViewHelper extends Tx_Fl
 
 }
 
+
 ?>
\ No newline at end of file
index d750c1c..dffa430 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\ViewHelper;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -13,7 +15,7 @@
  *
  * @api
  */
-abstract class Tx_Fluid_Core_ViewHelper_AbstractViewHelper {
+abstract class AbstractViewHelper {
 
        /**
         * TRUE if arguments have already been initialized
@@ -43,7 +45,7 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractViewHelper {
        /**
         * Current view helper node
         *
-        * @var Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode
+        * @var \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ViewHelperNode
         */
        private $viewHelperNode;
 
@@ -58,7 +60,7 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractViewHelper {
        /**
         * Current variable container reference.
         *
-        * @var Tx_Fluid_Core_ViewHelper_TemplateVariableContainer
+        * @var \TYPO3\CMS\Fluid\Core\ViewHelper\TemplateVariableContainer
         * @api
         */
        protected $templateVariableContainer;
@@ -66,13 +68,13 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractViewHelper {
        /**
         * Controller Context to use
         *
-        * @var Tx_Extbase_MVC_Controller_ControllerContext
+        * @var \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext
         * @api
         */
        protected $controllerContext;
 
        /**
-        * @var Tx_Fluid_Core_Rendering_RenderingContextInterface
+        * @var \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface
         */
        protected $renderingContext;
 
@@ -85,7 +87,7 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractViewHelper {
        /**
         * ViewHelper Variable Container
         *
-        * @var Tx_Fluid_Core_ViewHelper_ViewHelperVariableContainer
+        * @var \TYPO3\CMS\Fluid\Core\ViewHelper\ViewHelperVariableContainer
         * @api
         */
        protected $viewHelperVariableContainer;
@@ -93,7 +95,7 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractViewHelper {
        /**
         * Reflection service
         *
-        * @var Tx_Extbase_Reflection_Service
+        * @var \TYPO3\CMS\Extbase\Reflection\Service
         */
        private $reflectionService;
 
@@ -115,10 +117,10 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractViewHelper {
        }
 
        /**
-        * @param Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext
+        * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
         * @return void
         */
-       public function setRenderingContext(Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext) {
+       public function setRenderingContext(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext) {
                $this->renderingContext = $renderingContext;
                $this->templateVariableContainer = $renderingContext->getTemplateVariableContainer();
                if ($renderingContext->getControllerContext() !== NULL) {
@@ -130,9 +132,9 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractViewHelper {
        /**
         * Inject a Reflection service
         *
-        * @param Tx_Extbase_Reflection_Service $reflectionService Reflection service
+        * @param \TYPO3\CMS\Extbase\Reflection\Service $reflectionService Reflection service
         */
-       public function injectReflectionService(Tx_Extbase_Reflection_Service $reflectionService) {
+       public function injectReflectionService(\TYPO3\CMS\Extbase\Reflection\Service $reflectionService) {
                $this->reflectionService = $reflectionService;
        }
 
@@ -157,14 +159,14 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractViewHelper {
         * @param string $description Description of the argument
         * @param boolean $required If TRUE, argument is required. Defaults to FALSE.
         * @param mixed $defaultValue Default value of argument
-        * @return Tx_Fluid_Core_ViewHelper_AbstractViewHelper $this, to allow chaining.
+        * @return \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper $this, to allow chaining.
         * @api
         */
        protected function registerArgument($name, $type, $description, $required = FALSE, $defaultValue = NULL) {
                if (array_key_exists($name, $this->argumentDefinitions)) {
-                       throw new Tx_Fluid_Core_ViewHelper_Exception(('Argument "' . $name) . '" has already been defined, thus it should not be defined again.', 1253036401);
+                       throw new \TYPO3\CMS\Fluid\Core\ViewHelper\Exception(('Argument "' . $name) . '" has already been defined, thus it should not be defined again.', 1253036401);
                }
-               $this->argumentDefinitions[$name] = new Tx_Fluid_Core_ViewHelper_ArgumentDefinition($name, $type, $description, $required, $defaultValue);
+               $this->argumentDefinitions[$name] = new \TYPO3\CMS\Fluid\Core\ViewHelper\ArgumentDefinition($name, $type, $description, $required, $defaultValue);
                return $this;
        }
 
@@ -178,14 +180,14 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractViewHelper {
         * @param string $description Description of the argument
         * @param boolean $required If TRUE, argument is required. Defaults to FALSE.
         * @param mixed $defaultValue Default value of argument
-        * @return Tx_Fluid_Core_ViewHelper_AbstractViewHelper $this, to allow chaining.
+        * @return \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper $this, to allow chaining.
         * @api
         */
        protected function overrideArgument($name, $type, $description, $required = FALSE, $defaultValue = NULL) {
                if (!array_key_exists($name, $this->argumentDefinitions)) {
-                       throw new Tx_Fluid_Core_ViewHelper_Exception(('Argument "' . $name) . '" has not been defined, thus it can\'t be overridden.', 1279212461);
+                       throw new \TYPO3\CMS\Fluid\Core\ViewHelper\Exception(('Argument "' . $name) . '" has not been defined, thus it can\'t be overridden.', 1279212461);
                }
-               $this->argumentDefinitions[$name] = new Tx_Fluid_Core_ViewHelper_ArgumentDefinition($name, $type, $description, $required, $defaultValue);
+               $this->argumentDefinitions[$name] = new \TYPO3\CMS\Fluid\Core\ViewHelper\ArgumentDefinition($name, $type, $description, $required, $defaultValue);
                return $this;
        }
 
@@ -194,10 +196,10 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractViewHelper {
         * framework. Populates $this->viewHelperNode.
         * This is PURELY INTERNAL! Never override this method!!
         *
-        * @param Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode $node View Helper node to be set.
+        * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ViewHelperNode $node View Helper node to be set.
         * @return void
         */
-       public function setViewHelperNode(Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode $node) {
+       public function setViewHelperNode(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ViewHelperNode $node) {
                $this->viewHelperNode = $node;
        }
 
@@ -208,7 +210,7 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractViewHelper {
         * @return void
         * @internal
         */
-       public function setRenderChildrenClosure(Closure $renderChildrenClosure) {
+       public function setRenderChildrenClosure(\Closure $renderChildrenClosure) {
                $this->renderChildrenClosure = $renderChildrenClosure;
        }
 
@@ -237,7 +239,7 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractViewHelper {
                }
                try {
                        return call_user_func_array(array($this, 'render'), $renderMethodParameters);
-               } catch (Tx_Fluid_Core_ViewHelper_Exception $exception) {
+               } catch (\TYPO3\CMS\Fluid\Core\ViewHelper\Exception $exception) {
                        // @todo [BW] rethrow exception, log, ignore.. depending on the current context
                        return $exception->getMessage();
                }
@@ -316,7 +318,7 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractViewHelper {
                if (count($methodParameters) === 0) {
                        return;
                }
-               if (Tx_Fluid_Fluid::$debugMode) {
+               if (\TYPO3\CMS\Fluid\Fluid::$debugMode) {
                        $methodTags = $this->reflectionService->getMethodTagsValues(get_class($this), 'render');
                        $paramAnnotations = array();
                        if (isset($methodTags['param'])) {
@@ -332,10 +334,10 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractViewHelper {
                                $dataType = 'array';
                        }
                        if ($dataType === NULL) {
-                               throw new Tx_Fluid_Core_Parser_Exception(((('could not determine type of argument "' . $parameterName) . '" of the render-method in ViewHelper "') . get_class($this)) . '". Either the methods docComment is invalid or some PHP optimizer strips off comments.', 1242292003);
+                               throw new \TYPO3\CMS\Fluid\Core\Parser\Exception(((('could not determine type of argument "' . $parameterName) . '" of the render-method in ViewHelper "') . get_class($this)) . '". Either the methods docComment is invalid or some PHP optimizer strips off comments.', 1242292003);
                        }
                        $description = '';
-                       if (Tx_Fluid_Fluid::$debugMode && isset($paramAnnotations[$i])) {
+                       if (\TYPO3\CMS\Fluid\Fluid::$debugMode && isset($paramAnnotations[$i])) {
                                $explodedAnnotation = explode(' ', $paramAnnotations[$i]);
                                array_shift($explodedAnnotation);
                                array_shift($explodedAnnotation);
@@ -345,7 +347,7 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractViewHelper {
                        if (isset($parameterInfo['defaultValue'])) {
                                $defaultValue = $parameterInfo['defaultValue'];
                        }
-                       $this->argumentDefinitions[$parameterName] = new Tx_Fluid_Core_ViewHelper_ArgumentDefinition($parameterName, $dataType, $description, $parameterInfo['optional'] === FALSE, $defaultValue, TRUE);
+                       $this->argumentDefinitions[$parameterName] = new \TYPO3\CMS\Fluid\Core\ViewHelper\ArgumentDefinition($parameterName, $dataType, $description, $parameterInfo['optional'] === FALSE, $defaultValue, TRUE);
                        $i++;
                }
        }
@@ -367,19 +369,19 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractViewHelper {
                                        continue;
                                }
                                if ($type === 'array') {
-                                       if ((!is_array($this->arguments[$argumentName]) && !$this->arguments[$argumentName] instanceof ArrayAccess) && !$this->arguments[$argumentName] instanceof Traversable) {
-                                               throw new InvalidArgumentException(((((('The argument "' . $argumentName) . '" was registered with type "array", but is of type "') . gettype($this->arguments[$argumentName])) . '" in view helper "') . get_class($this)) . '"', 1237900529);
+                                       if ((!is_array($this->arguments[$argumentName]) && !$this->arguments[$argumentName] instanceof \ArrayAccess) && !$this->arguments[$argumentName] instanceof \Traversable) {
+                                               throw new \InvalidArgumentException(((((('The argument "' . $argumentName) . '" was registered with type "array", but is of type "') . gettype($this->arguments[$argumentName])) . '" in view helper "') . get_class($this)) . '"', 1237900529);
                                        }
                                } elseif ($type === 'boolean') {
                                        if (!is_bool($this->arguments[$argumentName])) {
-                                               throw new InvalidArgumentException(((((('The argument "' . $argumentName) . '" was registered with type "boolean", but is of type "') . gettype($this->arguments[$argumentName])) . '" in view helper "') . get_class($this)) . '".', 1240227732);
+                                               throw new \InvalidArgumentException(((((('The argument "' . $argumentName) . '" was registered with type "boolean", but is of type "') . gettype($this->arguments[$argumentName])) . '" in view helper "') . get_class($this)) . '".', 1240227732);
                                        }
                                } elseif (class_exists($type, FALSE)) {
                                        if (!$this->arguments[$argumentName] instanceof $type) {
                                                if (is_object($this->arguments[$argumentName])) {
-                                                       throw new InvalidArgumentException(((((((('The argument "' . $argumentName) . '" was registered with type "') . $type) . '", but is of type "') . get_class($this->arguments[$argumentName])) . '" in view helper "') . get_class($this)) . '".', 1256475114);
+                                                       throw new \InvalidArgumentException(((((((('The argument "' . $argumentName) . '" was registered with type "') . $type) . '", but is of type "') . get_class($this->arguments[$argumentName])) . '" in view helper "') . get_class($this)) . '".', 1256475114);
                                                } else {
-                                                       throw new InvalidArgumentException(((((((('The argument "' . $argumentName) . '" was registered with type "') . $type) . '", but is of type "') . gettype($this->arguments[$argumentName])) . '" in view helper "') . get_class($this)) . '".', 1256475113);
+                                                       throw new \InvalidArgumentException(((((((('The argument "' . $argumentName) . '" was registered with type "') . $type) . '", but is of type "') . gettype($this->arguments[$argumentName])) . '" in view helper "') . get_class($this)) . '".', 1256475113);
                                                }
                                        }
                                }
@@ -411,7 +413,7 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractViewHelper {
        /**
         * Get the rendering context interface.
         *
-        * @return Tx_Fluid_Core_Rendering_RenderingContextInterface
+        * @return \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface
         * @deprecated since Extbase 1.4.0, will be removed in Extbase 1.6.0. use $this->renderingContext instead
         */
        public function getRenderingContext() {
@@ -440,13 +442,13 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractViewHelper {
         * @param string $argumentsVariableName
         * @param string $renderChildrenClosureVariableName
         * @param string $initializationPhpCode
-        * @param Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode $syntaxTreeNode
-        * @param Tx_Fluid_Core_Compiler_TemplateCompiler $templateCompiler
+        * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode $syntaxTreeNode
+        * @param \TYPO3\CMS\Fluid\Core\Compiler\TemplateCompiler $templateCompiler
         * @return string
         * @internal
         * @see Tx_Fluid_Core_ViewHelper_Facets_CompilableInterface
         */
-       public function compile($argumentsVariableName, $renderChildrenClosureVariableName, &$initializationPhpCode, Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode $syntaxTreeNode, Tx_Fluid_Core_Compiler_TemplateCompiler $templateCompiler) {
+       public function compile($argumentsVariableName, $renderChildrenClosureVariableName, &$initializationPhpCode, \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode $syntaxTreeNode, \TYPO3\CMS\Fluid\Core\Compiler\TemplateCompiler $templateCompiler) {
                return sprintf('%s::renderStatic(%s, %s, $renderingContext)', get_class($this), $argumentsVariableName, $renderChildrenClosureVariableName);
        }
 
@@ -456,12 +458,12 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractViewHelper {
         *
         * @param array $arguments
         * @param Closure $renderChildrenClosure
-        * @param Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext
+        * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
         * @return mixed
         * @internal
         * @see Tx_Fluid_Core_ViewHelper_Facets_CompilableInterface
         */
-       static public function renderStatic(array $arguments, Closure $renderChildrenClosure, Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext) {
+       static public function renderStatic(array $arguments, \Closure $renderChildrenClosure, \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext) {
                return NULL;
        }
 
@@ -478,4 +480,5 @@ abstract class Tx_Fluid_Core_ViewHelper_AbstractViewHelper {
 
 }
 
+
 ?>
\ No newline at end of file
index 2999e24..938023e 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\ViewHelper;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -11,7 +13,7 @@
 /**
  * Argument definition of each view helper argument
  */
-class Tx_Fluid_Core_ViewHelper_ArgumentDefinition {
+class ArgumentDefinition {
 
        /**
         * Name of argument
@@ -130,4 +132,5 @@ class Tx_Fluid_Core_ViewHelper_ArgumentDefinition {
 
 }
 
+
 ?>
\ No newline at end of file
index 0b043e2..06302d6 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\ViewHelper;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -25,7 +27,7 @@
  *
  * @api
  */
-class Tx_Fluid_Core_ViewHelper_Arguments implements ArrayAccess {
+class Arguments implements ArrayAccess {
 
        /**
         * Array storing the arguments themselves
@@ -72,7 +74,7 @@ class Tx_Fluid_Core_ViewHelper_Arguments implements ArrayAccess {
         * @param object $value
         */
        public function offsetSet($key, $value) {
-               throw new Tx_Fluid_Core_Exception(('Tried to set argument "' . $key) . '", but setting arguments is forbidden.', 1236080693);
+               throw new \TYPO3\CMS\Fluid\Core\Exception(('Tried to set argument "' . $key) . '", but setting arguments is forbidden.', 1236080693);
        }
 
        /**
@@ -81,7 +83,7 @@ class Tx_Fluid_Core_ViewHelper_Arguments implements ArrayAccess {
         * @param string $key
         */
        public function offsetUnset($key) {
-               throw new Tx_Fluid_Core_Exception(('Tried to unset argument "' . $key) . '", but setting arguments is forbidden.', 1236080702);
+               throw new \TYPO3\CMS\Fluid\Core\Exception(('Tried to unset argument "' . $key) . '", but setting arguments is forbidden.', 1236080702);
        }
 
        /**
@@ -97,4 +99,5 @@ class Tx_Fluid_Core_ViewHelper_Arguments implements ArrayAccess {
 
 }
 
+
 ?>
\ No newline at end of file
index 75a8d32..d077302 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\ViewHelper;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
  *
  * @api
  */
-class Tx_Fluid_Core_ViewHelper_Exception extends Tx_Fluid_Core_Exception {
+class Exception extends \TYPO3\CMS\Fluid\Core\Exception {
 
 
 }
 
+
 ?>
\ No newline at end of file
index a0c703d..f456c49 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
  *
  * @api
  */
-class Tx_Fluid_Core_ViewHelper_Exception_InvalidVariableException extends Tx_Fluid_Core_ViewHelper_Exception {
+class InvalidVariableException extends \TYPO3\CMS\Fluid\Core\ViewHelper\Exception {
 
 
 }
 
+
 ?>
\ No newline at end of file
index fdb3e5b..2260020 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
  *
  * @api
  */
-class Tx_Fluid_Core_ViewHelper_Exception_RenderingContextNotAccessibleException extends Tx_Fluid_Core_ViewHelper_Exception {
+class RenderingContextNotAccessibleException extends \TYPO3\CMS\Fluid\Core\ViewHelper\Exception {
 
 
 }
 
+
 ?>
\ No newline at end of file
index c3159c5..f7a1c2b 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\ViewHelper\Facets;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -20,7 +22,7 @@
  *
  * See Tx_Fluid_ViewHelpers_IfViewHelper for an example how it is used.
  */
-interface Tx_Fluid_Core_ViewHelper_Facets_ChildNodeAccessInterface
+interface ChildNodeAccessInterface
 {
        /**
         * Sets the direct child nodes of the current syntax tree node.
@@ -31,4 +33,5 @@ interface Tx_Fluid_Core_ViewHelper_Facets_ChildNodeAccessInterface
        public function setChildNodes(array $childNodes);
 
 }
+
 ?>
\ No newline at end of file
index 34e062a..3410de8 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\ViewHelper\Facets;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -42,7 +44,7 @@
  * A ViewHelper which wants to directly influence the resulting PHP code must implement
  * the CompilableInterface, and only implement the compile() method.
  */
-interface Tx_Fluid_Core_ViewHelper_Facets_CompilableInterface
+interface CompilableInterface
 {
        /**
         * Here follows a more detailed description of the arguments of this function:
@@ -60,10 +62,10 @@ interface Tx_Fluid_Core_ViewHelper_Facets_CompilableInterface
         *
         * @var array $arguments
         * @var Closure $renderChildrenClosure
-        * @var Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext
+        * @var \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
         * @return string the resulting string which is directly shown
         */
-       static public function renderStatic(array $arguments, Closure $renderChildrenClosure, Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext);
+       static public function renderStatic(array $arguments, \Closure $renderChildrenClosure, \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext);
 
        /**
         * This method is called on compilation time.
@@ -91,11 +93,12 @@ interface Tx_Fluid_Core_ViewHelper_Facets_CompilableInterface
         * @param string $argumentsVariableName Name of the variable in which the ViewHelper arguments are stored
         * @param string $renderChildrenClosureVariableName Name of the closure which can be executed to render the child nodes
         * @param string $initializationPhpCode
-        * @param Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode $syntaxTreeNode
-        * @param Tx_Fluid_Core_Compiler_TemplateCompiler $templateCompiler
+        * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode $syntaxTreeNode
+        * @param \TYPO3\CMS\Fluid\Core\Compiler\TemplateCompiler $templateCompiler
         * @return string
         */
-       public function compile($argumentsVariableName, $renderChildrenClosureVariableName, &$initializationPhpCode, Tx_Fluid_Core_Parser_SyntaxTree_AbstractNode $syntaxTreeNode, Tx_Fluid_Core_Compiler_TemplateCompiler $templateCompiler);
+       public function compile($argumentsVariableName, $renderChildrenClosureVariableName, &$initializationPhpCode, \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode $syntaxTreeNode, \TYPO3\CMS\Fluid\Core\Compiler\TemplateCompiler $templateCompiler);
 
 }
+
 ?>
\ No newline at end of file
index a20ccdc..b6900c6 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\ViewHelper\Facets;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -20,7 +22,7 @@
  *
  * Normally, this facet is not needed, except in really really rare cases.
  */
-interface Tx_Fluid_Core_ViewHelper_Facets_PostParseInterface
+interface PostParseInterface
 {
        /**
         * Callback which is called directly after the corresponding syntax tree
@@ -31,12 +33,13 @@ interface Tx_Fluid_Core_ViewHelper_Facets_PostParseInterface
         * You can store some data inside the variableContainer given here, which
         * can be used f.e. inside the TemplateView.
         *
-        * @param Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode $syntaxTreeNode The current node in the syntax tree corresponding to this view helper.
+        * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ViewHelperNode $syntaxTreeNode The current node in the syntax tree corresponding to this view helper.
         * @param array $viewHelperArguments View helper arguments as an array of SyntaxTrees. If you really need an argument, make sure to call $viewHelperArguments[$argName]->render(...)!
-        * @param Tx_Fluid_Core_ViewHelper_TemplateVariableContainer $variableContainer Variable container you can use to pass on some variables to the view.
+        * @param \TYPO3\CMS\Fluid\Core\ViewHelper\TemplateVariableContainer $variableContainer Variable container you can use to pass on some variables to the view.
         * @return void
         */
-       static public function postParseEvent(Tx_Fluid_Core_Parser_SyntaxTree_ViewHelperNode $syntaxTreeNode, array $viewHelperArguments, Tx_Fluid_Core_ViewHelper_TemplateVariableContainer $variableContainer);
+       static public function postParseEvent(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ViewHelperNode $syntaxTreeNode, array $viewHelperArguments, \TYPO3\CMS\Fluid\Core\ViewHelper\TemplateVariableContainer $variableContainer);
 
 }
+
 ?>
\ No newline at end of file
index 0011d24..d3d2b4c 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\ViewHelper;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
  * @deprecated . Extend Tx_Fluid_Core_ViewHelper_AbstractTagBasedViewHelper instead!
  * @api
  */
-abstract class Tx_Fluid_Core_ViewHelper_TagBasedViewHelper extends Tx_Fluid_Core_ViewHelper_AbstractTagBasedViewHelper {
+abstract class TagBasedViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper {
 
        /**
         * Constructor
         */
        public function __construct() {
-               t3lib_div::deprecationLog(('the ViewHelper "' . get_class($this)) . '" extends "Tx_Fluid_Core_ViewHelper_TagBasedViewHelper". This is deprecated since TYPO3 4.5. Please extend the class "Tx_Fluid_Core_ViewHelper_AbstractTagBasedViewHelper"');
+               \TYPO3\CMS\Core\Utility\GeneralUtility::deprecationLog(('the ViewHelper "' . get_class($this)) . '" extends "TYPO3\\CMS\\Fluid\\Core\\ViewHelper\\TagBasedViewHelper". This is deprecated since TYPO3 4.5. Please extend the class "TYPO3\\CMS\\Fluid\\Core\\ViewHelper\\AbstractTagBasedViewHelper"');
                parent::__construct();
        }
 
 }
 
+
 ?>
\ No newline at end of file
index 716f0e8..ba3690f 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\ViewHelper;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -13,7 +15,7 @@
  *
  * @api
  */
-class Tx_Fluid_Core_ViewHelper_TagBuilder {
+class TagBuilder {
 
        /**
         * Name of the Tag to be rendered
@@ -200,4 +202,5 @@ class Tx_Fluid_Core_ViewHelper_TagBuilder {
 
 }
 
+
 ?>
\ No newline at end of file
index c11d101..5de01cf 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\ViewHelper;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -17,7 +19,7 @@
  *
  * @api
  */
-class Tx_Fluid_Core_ViewHelper_TemplateVariableContainer implements ArrayAccess {
+class TemplateVariableContainer implements \ArrayAccess {
 
        /**
         * List of reserved words that can't be used as variable identifiers in Fluid templates
@@ -53,10 +55,10 @@ class Tx_Fluid_Core_ViewHelper_TemplateVariableContainer implements ArrayAccess
         */
        public function add($identifier, $value) {
                if (array_key_exists($identifier, $this->variables)) {
-                       throw new Tx_Fluid_Core_ViewHelper_Exception_InvalidVariableException('Duplicate variable declarations!', 1224479063);
+                       throw new \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException('Duplicate variable declarations!', 1224479063);
                }
                if (in_array(strtolower($identifier), self::$reservedVariableNames)) {
-                       throw new Tx_Fluid_Core_ViewHelper_Exception_InvalidVariableException(('"' . $identifier) . '" is a reserved variable name and can\'t be used as variable identifier.', 1256730379);
+                       throw new \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException(('"' . $identifier) . '" is a reserved variable name and can\'t be used as variable identifier.', 1256730379);
                }
                $this->variables[$identifier] = $value;
        }
@@ -73,7 +75,7 @@ class Tx_Fluid_Core_ViewHelper_TemplateVariableContainer implements ArrayAccess
                        return $this->variables;
                }
                if (!array_key_exists($identifier, $this->variables)) {
-                       throw new Tx_Fluid_Core_ViewHelper_Exception_InvalidVariableException(('Tried to get a variable "' . $identifier) . '" which is not stored in the context!', 1224479370);
+                       throw new \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException(('Tried to get a variable "' . $identifier) . '" which is not stored in the context!', 1224479370);
                }
                return $this->variables[$identifier];
        }
@@ -87,7 +89,7 @@ class Tx_Fluid_Core_ViewHelper_TemplateVariableContainer implements ArrayAccess
         */
        public function remove($identifier) {
                if (!array_key_exists($identifier, $this->variables)) {
-                       throw new Tx_Fluid_Core_ViewHelper_Exception_InvalidVariableException(('Tried to remove a variable "' . $identifier) . '" which is not stored in the context!', 1224479372);
+                       throw new \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException(('Tried to remove a variable "' . $identifier) . '" which is not stored in the context!', 1224479372);
                }
                unset($this->variables[$identifier]);
        }
@@ -176,4 +178,5 @@ class Tx_Fluid_Core_ViewHelper_TemplateVariableContainer implements ArrayAccess
 
 }
 
+
 ?>
\ No newline at end of file
index 43963c1..64c23f4 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\ViewHelper;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -21,8 +23,9 @@
 /**
 
  */
-interface Tx_Fluid_Core_ViewHelper_ViewHelperInterface
+interface ViewHelperInterface
 {
 
 }
+
 ?>
\ No newline at end of file
index 214cc1c..36f8296 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\ViewHelper;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -11,7 +13,7 @@
 /**
  * @api
  */
-class Tx_Fluid_Core_ViewHelper_ViewHelperVariableContainer {
+class ViewHelperVariableContainer {
 
        /**
         * Two-dimensional object array storing the values. The first dimension is the fully qualified ViewHelper name,
@@ -22,7 +24,7 @@ class Tx_Fluid_Core_ViewHelper_ViewHelperVariableContainer {
        protected $objects = array();
 
        /**
-        * @var Tx_Fluid_View_AbstractTemplateView
+        * @var \TYPO3\CMS\Fluid\View\AbstractTemplateView
         */
        protected $view;
 
@@ -36,12 +38,12 @@ class Tx_Fluid_Core_ViewHelper_ViewHelperVariableContainer {
         * @param string $key Key of the data
         * @param object $value The value to store
         * @return void
-        * @throws Tx_Fluid_Core_ViewHelper_Exception_InvalidVariableException if there was no key with the specified name
+        * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException if there was no key with the specified name
         * @api
         */
        public function add($viewHelperName, $key, $value) {
                if ($this->exists($viewHelperName, $key)) {
-                       throw new Tx_Fluid_Core_ViewHelper_Exception_InvalidVariableException(((('The key "' . $viewHelperName) . '->') . $key) . '" was already stored and you cannot override it.', 1243352010);
+                       throw new \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException(((('The key "' . $viewHelperName) . '->') . $key) . '" was already stored and you cannot override it.', 1243352010);
                }
                $this->addOrUpdate($viewHelperName, $key, $value);
        }
@@ -69,12 +71,12 @@ class Tx_Fluid_Core_ViewHelper_ViewHelperVariableContainer {
         * @param string $viewHelperName The ViewHelper Class name (Fully qualified, like Tx_Fluid_ViewHelpers_ForViewHelper)
         * @param string $key Key of the data
         * @return object The object stored
-        * @throws Tx_Fluid_Core_ViewHelper_Exception_InvalidVariableException if there was no key with the specified name
+        * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException if there was no key with the specified name
         * @api
         */
        public function get($viewHelperName, $key) {
                if (!$this->exists($viewHelperName, $key)) {
-                       throw new Tx_Fluid_Core_ViewHelper_Exception_InvalidVariableException(((('No value found for key "' . $viewHelperName) . '->') . $key) . '"', 1243325768);
+                       throw new \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException(((('No value found for key "' . $viewHelperName) . '->') . $key) . '"', 1243325768);
                }
                return $this->objects[$viewHelperName][$key];
        }
@@ -97,12 +99,12 @@ class Tx_Fluid_Core_ViewHelper_ViewHelperVariableContainer {
         * @param string $viewHelperName The ViewHelper Class name (Fully qualified, like Tx_Fluid_ViewHelpers_ForViewHelper)
         * @param string $key Key of the data to remove
         * @return void
-        * @throws Tx_Fluid_Core_ViewHelper_Exception_InvalidVariableException if there was no key with the specified name
+        * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException if there was no key with the specified name
         * @api
         */
        public function remove($viewHelperName, $key) {
                if (!$this->exists($viewHelperName, $key)) {
-                       throw new Tx_Fluid_Core_ViewHelper_Exception_InvalidVariableException(((('No value found for key "' . $viewHelperName) . '->') . $key) . '", thus the key cannot be removed.', 1243352249);
+                       throw new \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException(((('No value found for key "' . $viewHelperName) . '->') . $key) . '", thus the key cannot be removed.', 1243352249);
                }
                unset($this->objects[$viewHelperName][$key]);
        }
@@ -110,10 +112,10 @@ class Tx_Fluid_Core_ViewHelper_ViewHelperVariableContainer {
        /**
         * Set the view to pass it to ViewHelpers.
         *
-        * @param Tx_Fluid_View_AbstractTemplateView $view View to set
+        * @param \TYPO3\CMS\Fluid\View\AbstractTemplateView $view View to set
         * @return void
         */
-       public function setView(Tx_Fluid_View_AbstractTemplateView $view) {
+       public function setView(\TYPO3\CMS\Fluid\View\AbstractTemplateView $view) {
                $this->view = $view;
        }
 
@@ -122,7 +124,7 @@ class Tx_Fluid_Core_ViewHelper_ViewHelperVariableContainer {
         *
         * !!! This is NOT a public API and might still change!!!
         *
-        * @return Tx_Fluid_View_AbstractTemplateView The View
+        * @return \TYPO3\CMS\Fluid\View\AbstractTemplateView The View
         */
        public function getView() {
                return $this->view;
@@ -139,4 +141,5 @@ class Tx_Fluid_Core_ViewHelper_ViewHelperVariableContainer {
 
 }
 
+
 ?>
\ No newline at end of file
index a34bcea..5672caa 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Widget;
+
 /*
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
  *
  * @api
  */
-abstract class Tx_Fluid_Core_Widget_AbstractWidgetController extends Tx_Extbase_MVC_Controller_ActionController implements t3lib_Singleton {
+abstract class AbstractWidgetController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController implements \TYPO3\CMS\Core\SingletonInterface {
 
        /**
         * @var array
         */
-       protected $supportedRequestTypes = array('Tx_Fluid_Core_Widget_WidgetRequest');
+       protected $supportedRequestTypes = array('TYPO3\\CMS\\Fluid\\Core\\Widget\\WidgetRequest');
 
        /**
         * Configuration for this widget.
@@ -43,12 +45,12 @@ abstract class Tx_Fluid_Core_Widget_AbstractWidgetController extends Tx_Extbase_
        /**
         * Handles a request. The result output is returned by altering the given response.
         *
-        * @param Tx_Extbase_MVC_RequestInterface $request The request object
-        * @param Tx_Extbase_MVC_ResponseInterface $response The response, modified by this handler
+        * @param \TYPO3\CMS\Extbase\Mvc\RequestInterface $request The request object
+        * @param \TYPO3\CMS\Extbase\Mvc\ResponseInterface $response The response, modified by this handler
         * @return void
         * @api
         */
-       public function processRequest(Tx_Extbase_MVC_RequestInterface $request, Tx_Extbase_MVC_ResponseInterface $response) {
+       public function processRequest(\TYPO3\CMS\Extbase\Mvc\RequestInterface $request, \TYPO3\CMS\Extbase\Mvc\ResponseInterface $response) {
                $this->widgetConfiguration = $request->getWidgetContext()->getWidgetConfiguration();
                parent::processRequest($request, $response);
        }
@@ -57,17 +59,18 @@ abstract class Tx_Fluid_Core_Widget_AbstractWidgetController extends Tx_Extbase_
         * Allows the widget template root path to be overriden via the framework configuration,
         * e.g. plugin.tx_extension.view.widget.<WidgetViewHelperClassName>.templateRootPath
         *
-        * @param Tx_Extbase_MVC_View_ViewInterface $view
+        * @param \TYPO3\CMS\Extbase\Mvc\View\ViewInterface $view
         * @return void
         */
-       protected function setViewConfiguration(Tx_Extbase_MVC_View_ViewInterface $view) {
-               $extbaseFrameworkConfiguration = $this->configurationManager->getConfiguration(Tx_Extbase_Configuration_ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK);
+       protected function setViewConfiguration(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface $view) {
+               $extbaseFrameworkConfiguration = $this->configurationManager->getConfiguration(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK);
                $widgetViewHelperClassName = $this->request->getWidgetContext()->getWidgetViewHelperClassName();
-               if ((isset($extbaseFrameworkConfiguration['view']['widget'][$widgetViewHelperClassName]['templateRootPath']) && strlen($extbaseFrameworkConfiguration['view']['widget'][$widgetViewHelperClassName]['templateRootPath']) > 0) && method_exists($view, 'setTemplateRootPath')) {
-                       $view->setTemplateRootPath(t3lib_div::getFileAbsFileName($extbaseFrameworkConfiguration['view']['widget'][$widgetViewHelperClassName]['templateRootPath']));
+               if ((isset($extbaseFrameworkConfiguration['view']['widget'][$widgetViewHelperClassName]['template']) && strlen($extbaseFrameworkConfiguration['view']['widget'][$widgetViewHelperClassName]['template']) > 0) && method_exists($view, 'setTemplateRootPath')) {
+                       $view->setTemplateRootPath(\TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName($extbaseFrameworkConfiguration['view']['widget'][$widgetViewHelperClassName]['template']));
                }
        }
 
 }
 
+
 ?>
\ No newline at end of file
index df1254d..f8e672e 100644 (file)
@@ -2,6 +2,8 @@
 declare (ENCODING = 'utf-8') {
 
 }
+namespace TYPO3\CMS\Fluid\Core\Widget;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -24,14 +26,14 @@ declare (ENCODING = 'utf-8') {
 /**
  * @api
  */
-abstract class Tx_Fluid_Core_Widget_AbstractWidgetViewHelper extends Tx_Fluid_Core_ViewHelper_AbstractViewHelper implements Tx_Fluid_Core_ViewHelper_Facets_ChildNodeAccessInterface {
+abstract class AbstractWidgetViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper implements \TYPO3\CMS\Fluid\Core\ViewHelper\Facets\ChildNodeAccessInterface {
 
        /**
         * The Controller associated to this widget.
         * This needs to be filled by the individual subclass by an @inject
         * annotation.
         *
-        * @var Tx_Fluid_Core_Widget_AbstractWidgetController
+        * @var \TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetController
         * @api
         */
        protected $controller;
@@ -45,47 +47,47 @@ abstract class Tx_Fluid_Core_Widget_AbstractWidgetViewHelper extends Tx_Fluid_Co
        protected $ajaxWidget = FALSE;
 
        /**
-        * @var Tx_Fluid_Core_Widget_AjaxWidgetContextHolder
+        * @var \TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder
         */
        private $ajaxWidgetContextHolder;
 
        /**
-        * @var Tx_Extbase_Object_ObjectManagerInterface
+        * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
         */
        private $objectManager;
 
        /**
-        * @var Tx_Extbase_Service_ExtensionService
+        * @var \TYPO3\CMS\Extbase\Service\ExtensionService
         */
        protected $extensionService;
 
        /**
-        * @var Tx_Fluid_Core_Widget_WidgetContext
+        * @var \TYPO3\CMS\Fluid\Core\Widget\WidgetContext
         */
        private $widgetContext;
 
        /**
-        * @param Tx_Fluid_Core_Widget_AjaxWidgetContextHolder $ajaxWidgetContextHolder
+        * @param \TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder $ajaxWidgetContextHolder
         * @return void
         */
-       public function injectAjaxWidgetContextHolder(Tx_Fluid_Core_Widget_AjaxWidgetContextHolder $ajaxWidgetContextHolder) {
+       public function injectAjaxWidgetContextHolder(\TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder $ajaxWidgetContextHolder) {
                $this->ajaxWidgetContextHolder = $ajaxWidgetContextHolder;
        }
 
        /**
-        * @param Tx_Extbase_Object_ObjectManagerInterface $objectManager
+        * @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
         * @return void
         */
-       public function injectObjectManager(Tx_Extbase_Object_ObjectManagerInterface $objectManager) {
+       public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager) {
                $this->objectManager = $objectManager;
-               $this->widgetContext = $this->objectManager->create('Tx_Fluid_Core_Widget_WidgetContext');
+               $this->widgetContext = $this->objectManager->create('TYPO3\\CMS\\Fluid\\Core\\Widget\\WidgetContext');
        }
 
        /**
-        * @param Tx_Extbase_Service_ExtensionService $extensionService
+        * @param \TYPO3\CMS\Extbase\Service\ExtensionService $extensionService
         * @return void
         */
-       public function injectExtensionService(Tx_Extbase_Service_ExtensionService $extensionService) {
+       public function injectExtensionService(\TYPO3\CMS\Extbase\Service\ExtensionService $extensionService) {
                $this->extensionService = $extensionService;
        }
 
@@ -109,7 +111,7 @@ abstract class Tx_Fluid_Core_Widget_AbstractWidgetViewHelper extends Tx_Fluid_Co
        private function initializeWidgetContext() {
                $this->widgetContext->setWidgetConfiguration($this->getWidgetConfiguration());
                $this->initializeWidgetIdentifier();
-               $controllerObjectName = $this->controller instanceof Tx_Fluid_AOP_ProxyInterface ? $this->controller->FLOW3_AOP_Proxy_getProxyTargetClassName() : get_class($this->controller);
+               $controllerObjectName = $this->controller instanceof \Tx_Fluid_AOP_ProxyInterface ? $this->controller->FLOW3_AOP_Proxy_getProxyTargetClassName() : get_class($this->controller);
                $this->widgetContext->setControllerObjectName($controllerObjectName);
                $extensionName = $this->controllerContext->getRequest()->getControllerExtensionName();
                $pluginName = $this->controllerContext->getRequest()->getPluginName();
@@ -131,7 +133,7 @@ abstract class Tx_Fluid_Core_Widget_AbstractWidgetViewHelper extends Tx_Fluid_Co
         * @return void
         */
        public function setChildNodes(array $childNodes) {
-               $rootNode = $this->objectManager->create('Tx_Fluid_Core_Parser_SyntaxTree_RootNode');
+               $rootNode = $this->objectManager->create('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\RootNode');
                foreach ($childNodes as $childNode) {
                        $rootNode->addChildNode($childNode);
                }
@@ -152,20 +154,20 @@ abstract class Tx_Fluid_Core_Widget_AbstractWidgetViewHelper extends Tx_Fluid_Co
         * Initiate a sub request to $this->controller. Make sure to fill $this->controller
         * via Dependency Injection.
         *
-        * @return Tx_Extbase_MVC_ResponseInterface the response of this request.
+        * @return \TYPO3\CMS\Extbase\Mvc\ResponseInterface the response of this request.
         * @api
         */
        protected function initiateSubRequest() {
-               if (!$this->controller instanceof Tx_Fluid_Core_Widget_AbstractWidgetController) {
+               if (!$this->controller instanceof \TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetController) {
                        if (isset($this->controller)) {
-                               throw new Tx_Fluid_Core_Widget_Exception_MissingControllerException(((('initiateSubRequest() can not be called if there is no valid controller extending Tx_Fluid_Core_Widget_AbstractWidgetController. Got "' . get_class($this->controller)) . '" in class "') . get_class($this)) . '".', 1289422564);
+                               throw new \TYPO3\CMS\Fluid\Core\Widget\Exception\MissingControllerException(((('initiateSubRequest() can not be called if there is no valid controller extending TYPO3\\CMS\\Fluid\\Core\\Widget\\AbstractWidgetController. Got "' . get_class($this->controller)) . '" in class "') . get_class($this)) . '".', 1289422564);
                        }
-                       throw new Tx_Fluid_Core_Widget_Exception_MissingControllerException(('initiateSubRequest() can not be called if there is no controller inside $this->controller. Make sure to add a corresponding injectController method to your WidgetViewHelper class "' . get_class($this)) . '".', 1284401632);
+                       throw new \TYPO3\CMS\Fluid\Core\Widget\Exception\MissingControllerException(('initiateSubRequest() can not be called if there is no controller inside $this->controller. Make sure to add a corresponding injectController method to your WidgetViewHelper class "' . get_class($this)) . '".', 1284401632);
                }
-               $subRequest = $this->objectManager->create('Tx_Fluid_Core_Widget_WidgetRequest');
+               $subRequest = $this->objectManager->create('TYPO3\\CMS\\Fluid\\Core\\Widget\\WidgetRequest');
                $subRequest->setWidgetContext($this->widgetContext);
                $this->passArgumentsToSubRequest($subRequest);
-               $subResponse = $this->objectManager->create('Tx_Extbase_MVC_Web_Response');
+               $subResponse = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Response');
                $this->controller->processRequest($subRequest, $subResponse);
                return $subResponse;
        }
@@ -173,10 +175,10 @@ abstract class Tx_Fluid_Core_Widget_AbstractWidgetViewHelper extends Tx_Fluid_Co
        /**
         * Pass the arguments of the widget to the subrequest.
         *
-        * @param Tx_Fluid_Core_Widget_WidgetRequest $subRequest
+        * @param \TYPO3\CMS\Fluid\Core\Widget\WidgetRequest $subRequest
         * @return void
         */
-       private function passArgumentsToSubRequest(Tx_Fluid_Core_Widget_WidgetRequest $subRequest) {
+       private function passArgumentsToSubRequest(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest $subRequest) {
                $arguments = $this->controllerContext->getRequest()->getArguments();
                $widgetIdentifier = $this->widgetContext->getWidgetIdentifier();
                if (isset($arguments[$widgetIdentifier])) {
@@ -197,16 +199,17 @@ abstract class Tx_Fluid_Core_Widget_AbstractWidgetViewHelper extends Tx_Fluid_Co
         * @todo clean up, and make it somehow more routing compatible.
         */
        private function initializeWidgetIdentifier() {
-               if (!$this->viewHelperVariableContainer->exists('Tx_Fluid_Core_Widget_AbstractWidgetViewHelper', 'nextWidgetNumber')) {
+               if (!$this->viewHelperVariableContainer->exists('TYPO3\\CMS\\Fluid\\Core\\Widget\\AbstractWidgetViewHelper', 'nextWidgetNumber')) {
                        $widgetCounter = 0;
                } else {
-                       $widgetCounter = $this->viewHelperVariableContainer->get('Tx_Fluid_Core_Widget_AbstractWidgetViewHelper', 'nextWidgetNumber');
+                       $widgetCounter = $this->viewHelperVariableContainer->get('TYPO3\\CMS\\Fluid\\Core\\Widget\\AbstractWidgetViewHelper', 'nextWidgetNumber');
                }
                $widgetIdentifier = '@widget_' . $widgetCounter;
-               $this->viewHelperVariableContainer->addOrUpdate('Tx_Fluid_Core_Widget_AbstractWidgetViewHelper', 'nextWidgetNumber', $widgetCounter + 1);
+               $this->viewHelperVariableContainer->addOrUpdate('TYPO3\\CMS\\Fluid\\Core\\Widget\\AbstractWidgetViewHelper', 'nextWidgetNumber', $widgetCounter + 1);
                $this->widgetContext->setWidgetIdentifier($widgetIdentifier);
        }
 
 }
 
+
 ?>
\ No newline at end of file
index 64d025b..7ab17e7 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Widget;
+
 /*
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -25,7 +27,7 @@
  *
  * This class is only used internally by the widget framework.
  */
-class Tx_Fluid_Core_Widget_AjaxWidgetContextHolder implements t3lib_Singleton {
+class AjaxWidgetContextHolder implements \TYPO3\CMS\Core\SingletonInterface {
 
        /**
         * An array $ajaxWidgetIdentifier => $widgetContext
@@ -38,7 +40,7 @@ class Tx_Fluid_Core_Widget_AjaxWidgetContextHolder implements t3lib_Singleton {
        /**
         * @var string
         */
-       protected $widgetContextsStorageKey = 'Tx_Fluid_Core_Widget_AjaxWidgetContextHolder_widgetContexts';
+       protected $widgetContextsStorageKey = 'TYPO3\\CMS\\Fluid\\Core\\Widget\\AjaxWidgetContextHolder_widgetContexts';
 
        /**
         * Constructor
@@ -65,11 +67,11 @@ class Tx_Fluid_Core_Widget_AjaxWidgetContextHolder implements t3lib_Singleton {
         * Get the widget context for the given $ajaxWidgetId.
         *
         * @param string $ajaxWidgetId
-        * @return Tx_Fluid_Core_Widget_WidgetContext
+        * @return \TYPO3\CMS\Fluid\Core\Widget\WidgetContext
         */
        public function get($ajaxWidgetId) {
                if (!isset($this->widgetContexts[$ajaxWidgetId])) {
-                       throw new Tx_Fluid_Core_Widget_Exception_WidgetContextNotFoundException(('No widget context was found for the Ajax Widget Identifier "' . $ajaxWidgetId) . '". This only happens if AJAX URIs are called without including the widget on a page.', 1284793775);
+                       throw new \TYPO3\CMS\Fluid\Core\Widget\Exception\WidgetContextNotFoundException(('No widget context was found for the Ajax Widget Identifier "' . $ajaxWidgetId) . '". This only happens if AJAX URIs are called without including the widget on a page.', 1284793775);
                }
                return $this->widgetContexts[$ajaxWidgetId];
        }
@@ -78,10 +80,10 @@ class Tx_Fluid_Core_Widget_AjaxWidgetContextHolder implements t3lib_Singleton {
         * Stores the WidgetContext inside the Context, and sets the
         * AjaxWidgetIdentifier inside the Widget Context correctly.
         *
-        * @param Tx_Fluid_Core_Widget_WidgetContext $widgetContext
+        * @param \TYPO3\CMS\Fluid\Core\Widget\WidgetContext $widgetContext
         * @return void
         */
-       public function store(Tx_Fluid_Core_Widget_WidgetContext $widgetContext) {
+       public function store(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext $widgetContext) {
                $ajaxWidgetId = md5(uniqid(mt_rand(), TRUE));
                $widgetContext->setAjaxWidgetIdentifier($ajaxWidgetId);
                $this->widgetContexts[$ajaxWidgetId] = $widgetContext;
@@ -105,4 +107,5 @@ class Tx_Fluid_Core_Widget_AjaxWidgetContextHolder implements t3lib_Singleton {
 
 }
 
+
 ?>
\ No newline at end of file
index 287fa11..b567899 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Widget;
+
 /*
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
 /**
  * This is the bootstrap for Ajax Widget responses
  */
-class Tx_Fluid_Core_Widget_Bootstrap {
+class Bootstrap {
 
        /**
         * Back reference to the parent content object
         * This has to be public as it is set directly from TYPO3
         *
-        * @var tslib_cObj
+        * @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
         */
        public $cObj;
 
        /**
-        * @var Tx_Extbase_Object_ObjectManagerInterface
+        * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
         */
        protected $objectManager;
 
@@ -42,15 +44,15 @@ class Tx_Fluid_Core_Widget_Bootstrap {
         * @return string $content The processed content
         */
        public function run($content, $configuration) {
-               $this->objectManager = t3lib_div::makeInstance('Tx_Extbase_Object_ObjectManager');
+               $this->objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Object\\ObjectManager');
                $this->initializeConfiguration($configuration);
                $this->configureObjectManager();
-               $ajaxWidgetContextHolder = $this->objectManager->get('Tx_Fluid_Core_Widget_AjaxWidgetContextHolder');
-               $widgetIdentifier = t3lib_div::_GET('fluid-widget-id');
+               $ajaxWidgetContextHolder = $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Widget\\AjaxWidgetContextHolder');
+               $widgetIdentifier = \TYPO3\CMS\Core\Utility\GeneralUtility::_GET('fluid-widget-id');
                $widgetContext = $ajaxWidgetContextHolder->get($widgetIdentifier);
                $configuration['extensionName'] = $widgetContext->getParentExtensionName();
                $configuration['pluginName'] = $widgetContext->getParentPluginName();
-               $extbaseBootstrap = $this->objectManager->get('Tx_Extbase_Core_Bootstrap');
+               $extbaseBootstrap = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Core\\Bootstrap');
                $extbaseBootstrap->cObj = $this->cObj;
                return $extbaseBootstrap->run($content, $configuration);
        }
@@ -62,8 +64,8 @@ class Tx_Fluid_Core_Widget_Bootstrap {
         * @see initialize()
         */
        public function initializeConfiguration($configuration) {
-               $this->configurationManager = $this->objectManager->get('Tx_Extbase_Configuration_ConfigurationManagerInterface');
-               $contentObject = isset($this->cObj) ? $this->cObj : t3lib_div::makeInstance('tslib_cObj');
+               $this->configurationManager = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Configuration\\ConfigurationManagerInterface');
+               $contentObject = isset($this->cObj) ? $this->cObj : \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\ContentObject\\ContentObjectRenderer');
                $this->configurationManager->setContentObject($contentObject);
                $this->configurationManager->setConfiguration($configuration);
        }
@@ -77,11 +79,11 @@ class Tx_Fluid_Core_Widget_Bootstrap {
         * @todo this is duplicated code (see Tx_Extbase_Core_Bootstrap::configureObjectManager())
         */
        public function configureObjectManager() {
-               $typoScriptSetup = $this->configurationManager->getConfiguration(Tx_Extbase_Configuration_ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
+               $typoScriptSetup = $this->configurationManager->getConfiguration(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
                if (!is_array($typoScriptSetup['config.']['tx_extbase.']['objects.'])) {
                        return;
                }
-               $objectContainer = t3lib_div::makeInstance('Tx_Extbase_Object_Container_Container');
+               $objectContainer = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Object\\Container\\Container');
                foreach ($typoScriptSetup['config.']['tx_extbase.']['objects.'] as $classNameWithDot => $classConfiguration) {
                        if (isset($classConfiguration['className'])) {
                                $originalClassName = rtrim($classNameWithDot, '.');
@@ -92,4 +94,5 @@ class Tx_Fluid_Core_Widget_Bootstrap {
 
 }
 
+
 ?>
\ No newline at end of file
index 2dbeea9..7fe0ef7 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Widget;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
  *
  * @api
  */
-class Tx_Fluid_Core_Widget_Exception extends Tx_Fluid_Core_Exception {
+class Exception extends \TYPO3\CMS\Fluid\Core\Exception {
 
 
 }
 
+
 ?>
\ No newline at end of file
index 032c407..2c0564e 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Widget\Exception;
+
 /*
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
 /**
  * An exception if the controller is missing.
  */
-class Tx_Fluid_Core_Widget_Exception_MissingControllerException extends Tx_Fluid_Core_Widget_Exception {
+class MissingControllerException extends \TYPO3\CMS\Fluid\Core\Widget\Exception {
 
 
 }
 
+
 ?>
\ No newline at end of file
index 3a150ef..584215d 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Widget\Exception;
+
 /*
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
 /**
  * An exception if no widget context could be found inside the AjaxWidgetContextHolder.
  */
-class Tx_Fluid_Core_Widget_Exception_RenderingContextNotFoundException extends Tx_Fluid_Core_Widget_Exception {
+class RenderingContextNotFoundException extends \TYPO3\CMS\Fluid\Core\Widget\Exception {
 
 
 }
 
+
 ?>
\ No newline at end of file
index cc9447d..61a59b2 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Widget\Exception;
+
 /*
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
 /**
  * An exception if no widget context could be found inside the AjaxWidgetContextHolder.
  */
-class Tx_Fluid_Core_Widget_Exception_WidgetContextNotFoundException extends Tx_Fluid_Core_Widget_Exception {
+class WidgetContextNotFoundException extends \TYPO3\CMS\Fluid\Core\Widget\Exception {
 
 
 }
 
+
 ?>
\ No newline at end of file
index f6f9a3b..6f71b51 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Widget\Exception;
+
 /*
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
 /**
  * An exception if no widget Request could be found inside <f:renderChildren>.
  */
-class Tx_Fluid_Core_Widget_Exception_WidgetRequestNotFoundException extends Tx_Fluid_Core_Widget_Exception {
+class WidgetRequestNotFoundException extends \TYPO3\CMS\Fluid\Core\Widget\Exception {
 
 
 }
 
+
 ?>
\ No newline at end of file
index 0dcf189..cad2190 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Widget;
+
 /*
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -29,7 +31,7 @@
  *
  * It is a purely internal class which should not be used outside of Fluid.
  */
-class Tx_Fluid_Core_Widget_WidgetContext {
+class WidgetContext {
 
        /**
         * Uniquely idenfies a Widget Instance on a certain page.
@@ -64,7 +66,7 @@ class Tx_Fluid_Core_Widget_WidgetContext {
         * The child nodes of the Widget ViewHelper.
         * Only available inside non-AJAX requests.
         *
-        * @var Tx_Fluid_Core_Parser_SyntaxTree_RootNode
+        * @var \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\RootNode
         * @transient
         */
        protected $viewHelperChildNodes;
@@ -74,7 +76,7 @@ class Tx_Fluid_Core_Widget_WidgetContext {
         * The rendering context of the ViewHelperChildNodes.
         * Only available inside non-AJAX requests.
         *
-        * @var Tx_Fluid_Core_Rendering_RenderingContextInterface
+        * @var \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface
         * @transient
         */
        protected $viewHelperChildNodeRenderingContext;
@@ -236,24 +238,24 @@ class Tx_Fluid_Core_Widget_WidgetContext {
        }
 
        /**
-        * @param Tx_Fluid_Core_Parser_SyntaxTree_RootNode $viewHelperChildNodes
-        * @param Tx_Fluid_Core_Rendering_RenderingContextInterface $viewHelperChildNodeRenderingContext
+        * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\RootNode $viewHelperChildNodes
+        * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $viewHelperChildNodeRenderingContext
         * @return void
         */
-       public function setViewHelperChildNodes(Tx_Fluid_Core_Parser_SyntaxTree_RootNode $viewHelperChildNodes, Tx_Fluid_Core_Rendering_RenderingContextInterface $viewHelperChildNodeRenderingContext) {
+       public function setViewHelperChildNodes(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\RootNode $viewHelperChildNodes, \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $viewHelperChildNodeRenderingContext) {
                $this->viewHelperChildNodes = $viewHelperChildNodes;
                $this->viewHelperChildNodeRenderingContext = $viewHelperChildNodeRenderingContext;
        }
 
        /**
-        * @return Tx_Fluid_Core_Parser_SyntaxTree_RootNode
+        * @return \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\RootNode
         */
        public function getViewHelperChildNodes() {
                return $this->viewHelperChildNodes;
        }
 
        /**
-        * @return Tx_Fluid_Core_Rendering_RenderingContextInterface
+        * @return \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface
         */
        public function getViewHelperChildNodeRenderingContext() {
                return $this->viewHelperChildNodeRenderingContext;
@@ -268,4 +270,5 @@ class Tx_Fluid_Core_Widget_WidgetContext {
 
 }
 
+
 ?>
\ No newline at end of file
index 901c2b1..4453c22 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Widget;
+
 /*
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
 /**
  * Represents a widget request.
  */
-class Tx_Fluid_Core_Widget_WidgetRequest extends Tx_Extbase_MVC_Web_Request {
+class WidgetRequest extends \TYPO3\CMS\Extbase\Mvc\Web\Request {
 
        /**
-        * @var Tx_Fluid_Core_Widget_WidgetContext
+        * @var \TYPO3\CMS\Fluid\Core\Widget\WidgetContext
         */
        protected $widgetContext;
 
        /**
-        * @return Tx_Fluid_Core_Widget_WidgetContext
+        * @return \TYPO3\CMS\Fluid\Core\Widget\WidgetContext
         */
        public function getWidgetContext() {
                return $this->widgetContext;
        }
 
        /**
-        * @param Tx_Fluid_Core_Widget_WidgetContext $widgetContext
+        * @param \TYPO3\CMS\Fluid\Core\Widget\WidgetContext $widgetContext
         * @return void
         */
-       public function setWidgetContext(Tx_Fluid_Core_Widget_WidgetContext $widgetContext) {
+       public function setWidgetContext(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext $widgetContext) {
                $this->widgetContext = $widgetContext;
                $this->setControllerObjectName($widgetContext->getControllerObjectName());
        }
@@ -55,4 +57,5 @@ class Tx_Fluid_Core_Widget_WidgetRequest extends Tx_Extbase_MVC_Web_Request {
 
 }
 
+
 ?>
\ No newline at end of file
index 7ccb555..0cffe66 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Widget;
+
 /*
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
 /**
  * Builds the WidgetRequest if an AJAX widget is called.
  */
-class Tx_Fluid_Core_Widget_WidgetRequestBuilder extends Tx_Extbase_MVC_Web_RequestBuilder {
+class WidgetRequestBuilder extends \TYPO3\CMS\Extbase\Mvc\Web\RequestBuilder {
 
        /**
-        * @var Tx_Fluid_Core_Widget_AjaxWidgetContextHolder
+        * @var \TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder
         */
        private $ajaxWidgetContextHolder;
 
        /**
-        * @param Tx_Fluid_Core_Widget_AjaxWidgetContextHolder $ajaxWidgetContextHolder
+        * @param \TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder $ajaxWidgetContextHolder
         * @return void
         */
-       public function injectAjaxWidgetContextHolder(Tx_Fluid_Core_Widget_AjaxWidgetContextHolder $ajaxWidgetContextHolder) {
+       public function injectAjaxWidgetContextHolder(\TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder $ajaxWidgetContextHolder) {
                $this->ajaxWidgetContextHolder = $ajaxWidgetContextHolder;
        }
 
        /**
         * Builds a widget request object from the raw HTTP information
         *
-        * @return Tx_Fluid_Core_Widget_WidgetRequest The widget request as an object
+        * @return \TYPO3\CMS\Fluid\Core\Widget\WidgetRequest The widget request as an object
         */
        public function build() {
-               $request = $this->objectManager->create('Tx_Fluid_Core_Widget_WidgetRequest');
-               $request->setRequestURI(t3lib_div::getIndpEnv('TYPO3_REQUEST_URL'));
-               $request->setBaseURI(t3lib_div::getIndpEnv('TYPO3_SITE_URL'));
+               $request = $this->objectManager->create('TYPO3\\CMS\\Fluid\\Core\\Widget\\WidgetRequest');
+               $request->setRequestURI(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_REQUEST_URL'));
+               $request->setBaseURI(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_URL'));
                $request->setMethod(isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : NULL);
                if (strtolower($_SERVER['REQUEST_METHOD']) === 'post') {
-                       $request->setArguments(t3lib_div::_POST());
+                       $request->setArguments(\TYPO3\CMS\Core\Utility\GeneralUtility::_POST());
                } else {
-                       $request->setArguments(t3lib_div::_GET());
+                       $request->setArguments(\TYPO3\CMS\Core\Utility\GeneralUtility::_GET());
                }
-               $rawGetArguments = t3lib_div::_GET();
+               $rawGetArguments = \TYPO3\CMS\Core\Utility\GeneralUtility::_GET();
                // TODO: rename to @action, to be consistent with normal naming?
                if (isset($rawGetArguments['action'])) {
                        $request->setControllerActionName($rawGetArguments['action']);
@@ -63,4 +65,5 @@ class Tx_Fluid_Core_Widget_WidgetRequestBuilder extends Tx_Extbase_MVC_Web_Reque
 
 }
 
+
 ?>
\ No newline at end of file
index e7048a8..89b0d72 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Core\Widget;
+
 /*
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
  *
  * This Request Handler gets the WidgetRequestBuilder injected.
  */
-class Tx_Fluid_Core_Widget_WidgetRequestHandler extends Tx_Extbase_MVC_Web_AbstractRequestHandler {
+class WidgetRequestHandler extends \TYPO3\CMS\Extbase\Mvc\Web\AbstractRequestHandler {
 
        /**
-        * @var Tx_Fluid_Core_Widget_AjaxWidgetContextHolder
+        * @var \TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder
         */
        protected $ajaxWidgetContextHolder;
 
        /**
-        * @var Tx_Extbase_Configuration_ConfigurationManagerInterface
+        * @var \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface
         */
        protected $configurationManager;
 
        /**
-        * @param Tx_Extbase_Configuration_ConfigurationManagerInterface $configurationManager
+        * @param \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface $configurationManager
         * @return void
         */
-       public function injectConfigurationManager(Tx_Extbase_Configuration_ConfigurationManagerInterface $configurationManager) {
+       public function injectConfigurationManager(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface $configurationManager) {
                $this->configurationManager = $configurationManager;
        }
 
        /**
-        * @param Tx_Fluid_Core_Widget_AjaxWidgetContextHolder $ajaxWidgetContextHolder
+        * @param \TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder $ajaxWidgetContextHolder
         * @return void
         */
-       public function injectAjaxWidgetContextHolder(Tx_Fluid_Core_Widget_AjaxWidgetContextHolder $ajaxWidgetContextHolder) {
+       public function injectAjaxWidgetContextHolder(\TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder $ajaxWidgetContextHolder) {
                $this->ajaxWidgetContextHolder = $ajaxWidgetContextHolder;
        }
 
        /**
         * Injects the request handler
         *
-        * @param Tx_Fluid_Core_Widget_WidgetRequestBuilder $requestBuilder
+        * @param \TYPO3\CMS\Fluid\Core\Widget\WidgetRequestBuilder $requestBuilder
         * @return void
         */
-       public function injectRequestBuilder(Tx_Fluid_Core_Widget_WidgetRequestBuilder $requestBuilder) {
+       public function injectRequestBuilder(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequestBuilder $requestBuilder) {
                $this->requestBuilder = $requestBuilder;
        }
 
        /**
         * Handles the web request. The response will automatically be sent to the client.
         *
-        * @return Tx_Extbase_MVC_Web_Response
+        * @return \TYPO3\CMS\Extbase\Mvc\Web\Response
         */
        public function handleRequest() {
                $request = $this->requestBuilder->build();
                if (isset($this->cObj->data) && is_array($this->cObj->data)) {
                        $request->setContentObjectData($this->cObj->data);
                }
-               $response = $this->objectManager->create('Tx_Extbase_MVC_Web_Response');
+               $response = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Response');
                $this->dispatcher->dispatch($request, $response);
                return $response;
        }
@@ -81,7 +83,7 @@ class Tx_Fluid_Core_Widget_WidgetRequestHandler extends Tx_Extbase_MVC_Web_Abstr
         * @return boolean TRUE if it is an AJAX widget request
         */
        public function canHandleRequest() {
-               $rawGetArguments = t3lib_div::_GET();
+               $rawGetArguments = \TYPO3\CMS\Core\Utility\GeneralUtility::_GET();
                return isset($rawGetArguments['fluid-widget-id']);
        }
 
@@ -96,4 +98,5 @@ class Tx_Fluid_Core_Widget_WidgetRequestHandler extends Tx_Extbase_MVC_Web_Abstr
 
 }
 
+
 ?>
\ No newline at end of file
index be486e0..e591ea2 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid;
+
 /*                                                                        *
  * This script is part of the TYPO3 project - inspiring people to share!  *
  *                                                                        *
 /**
 
  */
-class Tx_Fluid_Exception extends Exception {
+class Exception extends \Exception {
 
 
 }
 
+
 ?>
\ No newline at end of file
index 07f8b68..80cf1b4 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid;
+
 /*                                                                        *
  * This script is part of the TYPO3 project - inspiring people to share!  *
  *                                                                        *
 /**
 
  */
-class Tx_Fluid_Fluid {
+class Fluid {
 
-       const NAMESPACE_SEPARATOR = '_';
+       const LEGACY_NAMESPACE_SEPARATOR = '_';
+       const NAMESPACE_SEPARATOR = '\\';
        static public $debugMode = FALSE;
 
 }
 
+
 ?>
\ No newline at end of file
index 62b500e..fb1ebe9 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\Service;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -12,7 +14,7 @@
  * XML Schema (XSD) Generator. Will generate an XML schema which can be used for autocompletion
  * in schema-aware editors like Eclipse XML editor.
  */
-class Tx_Fluid_Service_DocbookGenerator extends Tx_Fluid_Service_AbstractGenerator {
+class DocbookGenerator extends Tx_Fluid_Service_AbstractGenerator {
 
        /**
         * Generate the XML Schema definition for a given namespace.
@@ -21,11 +23,11 @@ class Tx_Fluid_Service_DocbookGenerator extends Tx_Fluid_Service_AbstractGenerat
         * @return string XML Schema definition
         */
        public function generateDocbook($namespace) {
-               if (substr($namespace, -1) !== Tx_Fluid_Fluid::NAMESPACE_SEPARATOR) {
-                       $namespace .= Tx_Fluid_Fluid::NAMESPACE_SEPARATOR;
+               if (substr($namespace, -1) !== \TYPO3\CMS\Fluid\Fluid::NAMESPACE_SEPARATOR) {
+                       $namespace .= \TYPO3\CMS\Fluid\Fluid::NAMESPACE_SEPARATOR;
                }
                $classNames = $this->getClassNamesInNamespace($namespace);
-               $xmlRootNode = new SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?>
+               $xmlRootNode = new \SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?>
 <section version="5.0" xmlns="http://docbook.org/ns/docbook"
          xml:id="fluid.usermanual.standardviewhelpers"
          xmlns:xl="http://www.w3.org/1999/xlink"
@@ -52,8 +54,8 @@ class Tx_Fluid_Service_DocbookGenerator extends Tx_Fluid_Service_AbstractGenerat
         * @param SimpleXMLElement $xmlRootNode XML root node where the xsd:element is appended.
         * @return void
         */
-       protected function generateXmlForClassName($className, $namespace, SimpleXMLElement $xmlRootNode) {
-               $reflectionClass = new Tx_Extbase_Reflection_ClassReflection($className);
+       protected function generateXmlForClassName($className, $namespace, \SimpleXMLElement $xmlRootNode) {
+               $reflectionClass = new \TYPO3\CMS\Extbase\Reflection\ClassReflection($className);
                if (!$reflectionClass->isSubclassOf($this->abstractViewHelperReflectionClass)) {
                        return;
                }
@@ -76,7 +78,7 @@ class Tx_Fluid_Service_DocbookGenerator extends Tx_Fluid_Service_AbstractGenerat
         * @param SimpleXMLElement $docbookSection DocBook section to add the attributes to.
         * @return void
         */
-       protected function addArguments($className, SimpleXMLElement $docbookSection) {
+       protected function addArguments($className, \SimpleXMLElement $docbookSection) {
                $viewHelper = $this->instanciateViewHelper($className);
                $argumentDefinitions = $viewHelper->prepareArguments();
                if (count($argumentDefinitions) === 0) {
@@ -113,7 +115,7 @@ class Tx_Fluid_Service_DocbookGenerator extends Tx_Fluid_Service_AbstractGenerat
         * @param string $default
         * @return void
         */
-       private function addArgumentTableRow(SimpleXMLElement $parent, $name, $type, $required, $description, $default) {
+       private function addArgumentTableRow(\SimpleXMLElement $parent, $name, $type, $required, $description, $default) {
                $row = $parent->addChild('row');
                $row->addChild('entry', $name);
                $row->addChild('entry', $type);
@@ -134,7 +136,7 @@ class Tx_Fluid_Service_DocbookGenerator extends Tx_Fluid_Service_AbstractGenerat
         * @param SimpleXMLElement $docbookSection Node to add the documentation to
         * @return void
         */
-       protected function addDocumentation($documentation, SimpleXMLElement $docbookSection) {
+       protected function addDocumentation($documentation, \SimpleXMLElement $docbookSection) {
                $splitRegex = '/^\\s*(=[^=]+=)$/m';
                $regex = '/^\\s*(=([^=]+)=)$/m';
                $matches = preg_split($splitRegex, $documentation, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
@@ -153,7 +155,7 @@ class Tx_Fluid_Service_DocbookGenerator extends Tx_Fluid_Service_AbstractGenerat
         * @param string $text
         * @param SimpleXMLElement $parentElement
         */
-       protected function addText($text, SimpleXMLElement $parentElement) {
+       protected function addText($text, \SimpleXMLElement $parentElement) {
                $splitRegex = '/
                (<code(?:.*?)>
                        (?:.*?)
@@ -188,4 +190,5 @@ class Tx_Fluid_Service_DocbookGenerator extends Tx_Fluid_Service_AbstractGenerat
 
 }
 
+
 ?>
\ No newline at end of file
index 9e42d43..6e67da9 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\View;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -13,7 +15,7 @@
  *
  * Contains the fundamental methods which any Fluid based template view needs.
  */
-abstract class Tx_Fluid_View_AbstractTemplateView implements Tx_Extbase_MVC_View_ViewInterface {
+abstract class AbstractTemplateView implements \TYPO3\CMS\Extbase\Mvc\View\ViewInterface {
 
        /**
         * Constants defining possible rendering types
@@ -22,22 +24,22 @@ abstract class Tx_Fluid_View_AbstractTemplateView implements Tx_Extbase_MVC_View
        const RENDERING_PARTIAL = 2;
        const RENDERING_LAYOUT = 3;
        /**
-        * @var Tx_Extbase_MVC_Controller_ControllerContext
+        * @var \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext
         */
        protected $controllerContext;
 
        /**
-        * @var Tx_Extbase_Object_ObjectManagerInterface
+        * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
         */
        protected $objectManager;
 
        /**
-        * @var Tx_Fluid_Core_Parser_TemplateParser
+        * @var \TYPO3\CMS\Fluid\Core\Parser\TemplateParser
         */
        protected $templateParser;
 
        /**
-        * @var Tx_Fluid_Core_Compiler_TemplateCompiler
+        * @var \TYPO3\CMS\Fluid\Core\Compiler\TemplateCompiler
         */
        protected $templateCompiler;
 
@@ -46,7 +48,7 @@ abstract class Tx_Fluid_View_AbstractTemplateView implements Tx_Extbase_MVC_View
         * Due to the rendering stack, another rendering context might be active
         * at certain points while rendering the template.
         *
-        * @var Tx_Fluid_Core_Rendering_RenderingContextInterface
+        * @var \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface
         */
        protected $baseRenderingContext;
 
@@ -70,28 +72,28 @@ abstract class Tx_Fluid_View_AbstractTemplateView implements Tx_Extbase_MVC_View
        /**
         * Injects the Object Manager
         *
-        * @param Tx_Extbase_Object_ObjectManagerInterface $objectManager
+        * @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
         * @return void
         */
-       public function injectObjectManager(Tx_Extbase_Object_ObjectManagerInterface $objectManager) {
+       public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager) {
                $this->objectManager = $objectManager;
        }
 
        /**
         * Inject the Template Parser
         *
-        * @param Tx_Fluid_Core_Parser_TemplateParser $templateParser The template parser
+        * @param \TYPO3\CMS\Fluid\Core\Parser\TemplateParser $templateParser The template parser
         * @return void
         */
-       public function injectTemplateParser(Tx_Fluid_Core_Parser_TemplateParser $templateParser) {
+       public function injectTemplateParser(\TYPO3\CMS\Fluid\Core\Parser\TemplateParser $templateParser) {
                $this->templateParser = $templateParser;
        }
 
        /**
-        * @param Tx_Fluid_Core_Compiler_TemplateCompiler $templateCompiler
+        * @param \TYPO3\CMS\Fluid\Core\Compiler\TemplateCompiler $templateCompiler
         * @return void
         */
-       public function injectTemplateCompiler(Tx_Fluid_Core_Compiler_TemplateCompiler $templateCompiler) {
+       public function injectTemplateCompiler(\TYPO3\CMS\Fluid\Core\Compiler\TemplateCompiler $templateCompiler) {
                $this->templateCompiler = $templateCompiler;
                $this->templateCompiler->setTemplateCache($GLOBALS['typo3CacheManager']->getCache('fluid_template'));
        }
@@ -99,10 +101,10 @@ abstract class Tx_Fluid_View_AbstractTemplateView implements Tx_Extbase_MVC_View
        /**
         * Injects a fresh rendering context
         *
-        * @param Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext
+        * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
         * @return void
         */
-       public function setRenderingContext(Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext) {
+       public function setRenderingContext(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext) {
                $this->baseRenderingContext = $renderingContext;
                $this->baseRenderingContext->getViewHelperVariableContainer()->setView($this);
                $this->controllerContext = $renderingContext->getControllerContext();
@@ -111,11 +113,11 @@ abstract class Tx_Fluid_View_AbstractTemplateView implements Tx_Extbase_MVC_View
        /**
         * Sets the current controller context
         *
-        * @param Tx_Extbase_MVC_Controller_ControllerContext $controllerContext Controller context which is available inside the view
+        * @param \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext Controller context which is available inside the view
         * @return void
         * @api
         */
-       public function setControllerContext(Tx_Extbase_MVC_Controller_ControllerContext $controllerContext) {
+       public function setControllerContext(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext) {
                $this->controllerContext = $controllerContext;
        }
 
@@ -129,7 +131,7 @@ abstract class Tx_Fluid_View_AbstractTemplateView implements Tx_Extbase_MVC_View
         *
         * @param string $key The key of a view variable to set
         * @param mixed $value The value of the view variable
-        * @return Tx_Fluid_View_AbstractTemplateView the instance of this view to allow chaining
+        * @return \TYPO3\CMS\Fluid\View\AbstractTemplateView the instance of this view to allow chaining
         * @api
         */
        public function assign($key, $value) {
@@ -146,7 +148,7 @@ abstract class Tx_Fluid_View_AbstractTemplateView implements Tx_Extbase_MVC_View
         * However, only the key "value" is accepted.
         *
         * @param array $values Keys and values - only a value with key "value" is considered
-        * @return Tx_Fluid_View_AbstractTemplateView the instance of this view to allow chaining
+        * @return \TYPO3\CMS\Fluid\View\AbstractTemplateView the instance of this view to allow chaining
         * @api
         */
        public function assignMultiple(array $values) {
@@ -209,7 +211,7 @@ abstract class Tx_Fluid_View_AbstractTemplateView implements Tx_Extbase_MVC_View
         * @param array $variables The variables to use
         * @param boolean $ignoreUnknown Ignore an unknown section and just return an empty string
         * @return string rendered template for the section
-        * @throws Tx_Fluid_View_Exception_InvalidSectionException
+        * @throws \TYPO3\CMS\Fluid\View\Exception\InvalidSectionException
         */
        public function renderSection($sectionName, array $variables, $ignoreUnknown = FALSE) {
                $renderingContext = $this->getCurrentRenderingContext();
@@ -217,7 +219,7 @@ abstract class Tx_Fluid_View_AbstractTemplateView implements Tx_Extbase_MVC_View
                        // in case we render a layout right now, we will render a section inside a TEMPLATE.
                        $renderingTypeOnNextLevel = self::RENDERING_TEMPLATE;
                } else {
-                       $variableContainer = $this->objectManager->create('Tx_Fluid_Core_ViewHelper_TemplateVariableContainer', $variables);
+                       $variableContainer = $this->objectManager->create('TYPO3\\CMS\\Fluid\\Core\\ViewHelper\\TemplateVariableContainer', $variables);
                        $renderingContext = clone $renderingContext;
                        $renderingContext->injectTemplateVariableContainer($variableContainer);
                        $renderingTypeOnNextLevel = $this->getCurrentRenderingType();
@@ -238,11 +240,11 @@ abstract class Tx_Fluid_View_AbstractTemplateView implements Tx_Extbase_MVC_View
                                if ($ignoreUnknown) {
                                        return '';
                                } else {
-                                       throw new Tx_Fluid_View_Exception_InvalidSectionException(sprintf('Could not render unknown section "%s" in %s used by %s.', $sectionName, get_class($this), $controllerObjectName), 1227108982);
+                                       throw new \TYPO3\CMS\Fluid\View\Exception\InvalidSectionException(sprintf('Could not render unknown section "%s" in %s used by %s.', $sectionName, get_class($this), $controllerObjectName), 1227108982);
                                }
                        }
                        $section = $sections[$sectionName];
-                       $renderingContext->getViewHelperVariableContainer()->add('Tx_Fluid_ViewHelpers_SectionViewHelper', 'isCurrentlyRenderingSection', 'TRUE');
+                       $renderingContext->getViewHelperVariableContainer()->add('TYPO3\\CMS\\Fluid\\ViewHelpers\\SectionViewHelper', 'isCurrentlyRenderingSection', 'TRUE');
                        $this->startRendering($renderingTypeOnNextLevel, $parsedTemplate, $renderingContext);
                        $output = $section->evaluate($renderingContext);
                        $this->stopRendering();
@@ -256,7 +258,7 @@ abstract class Tx_Fluid_View_AbstractTemplateView implements Tx_Extbase_MVC_View
         * @param string $partialName
         * @param string $sectionName
         * @param array $variables
-        * @param Tx_Fluid_Core_ViewHelper_ViewHelperVariableContainer $viewHelperVariableContainer the View Helper Variable container to use.
+        * @param \TYPO3\CMS\Fluid\Core\ViewHelper\ViewHelperVariableContainer $viewHelperVariableContainer the View Helper Variable container to use.
         * @return string
         */
        public function renderPartial($partialName, $sectionName, array $variables) {
@@ -272,7 +274,7 @@ abstract class Tx_Fluid_View_AbstractTemplateView implements Tx_Extbase_MVC_View
                                $this->templateCompiler->store($partialIdentifier, $parsedPartial);
                        }
                }
-               $variableContainer = $this->objectManager->create('Tx_Fluid_Core_ViewHelper_TemplateVariableContainer', $variables);
+               $variableContainer = $this->objectManager->create('TYPO3\\CMS\\Fluid\\Core\\ViewHelper\\TemplateVariableContainer', $variables);
                $renderingContext = clone $this->getCurrentRenderingContext();
                $renderingContext->injectTemplateVariableContainer($variableContainer);
                $this->startRendering(self::RENDERING_PARTIAL, $parsedPartial, $renderingContext);
@@ -300,7 +302,7 @@ abstract class Tx_Fluid_View_AbstractTemplateView implements Tx_Extbase_MVC_View
         *
         * @param string $actionName Name of the action. If NULL, will be taken from request.
         * @return string Full path to template
-        * @throws Tx_Fluid_View_Exception_InvalidTemplateResourceException in case the template was not found
+        * @throws \TYPO3\CMS\Fluid\View\Exception\InvalidTemplateResourceException in case the template was not found
         */
        abstract protected function getTemplateSource($actionName = NULL);
 
@@ -323,7 +325,7 @@ abstract class Tx_Fluid_View_AbstractTemplateView implements Tx_Extbase_MVC_View
         *
         * @param string $layoutName Name of the layout to use. If none given, use "Default
         * @return string Path and filename of layout file
-        * @throws Tx_Fluid_View_Exception_InvalidTemplateResourceException
+        * @throws \TYPO3\CMS\Fluid\View\Exception\InvalidTemplateResourceException
         */
        abstract protected function getLayoutSource($layoutName = 'Default');
 
@@ -341,19 +343,19 @@ abstract class Tx_Fluid_View_AbstractTemplateView implements Tx_Extbase_MVC_View
         *
         * @param string $partialName The name of the partial
         * @return string the full path which should be used. The path definitely exists.
-        * @throws Tx_Fluid_View_Exception_InvalidTemplateResourceException
+        * @throws \TYPO3\CMS\Fluid\View\Exception\InvalidTemplateResourceException
         */
        abstract protected function getPartialSource($partialName);
 
        /**
         * Build parser configuration
         *
-        * @return Tx_Fluid_Core_Parser_Configuration
+        * @return \TYPO3\CMS\Fluid\Core\Parser\Configuration
         */
        protected function buildParserConfiguration() {
-               $parserConfiguration = $this->objectManager->create('Tx_Fluid_Core_Parser_Configuration');
+               $parserConfiguration = $this->objectManager->create('TYPO3\\CMS\\Fluid\\Core\\Parser\\Configuration');
                if ($this->controllerContext->getRequest()->getFormat() === 'html') {
-                       $parserConfiguration->addInterceptor($this->objectManager->get('Tx_Fluid_Core_Parser_Interceptor_Escape'));
+                       $parserConfiguration->addInterceptor($this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Parser\\Interceptor\\Escape'));
                }
                return $parserConfiguration;
        }
@@ -362,11 +364,11 @@ abstract class Tx_Fluid_View_AbstractTemplateView implements Tx_Extbase_MVC_View
         * Start a new nested rendering. Pushes the given information onto the $renderingStack.
         *
         * @param int $type one of the RENDERING_* constants
-        * @param Tx_Fluid_Core_Parser_ParsedTemplateInterface $parsedTemplate
-        * @param Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext
+        * @param \TYPO3\CMS\Fluid\Core\Parser\ParsedTemplateInterface $parsedTemplate
+        * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
         * @return void
         */
-       protected function startRendering($type, Tx_Fluid_Core_Parser_ParsedTemplateInterface $parsedTemplate, Tx_Fluid_Core_Rendering_RenderingContextInterface $renderingContext) {
+       protected function startRendering($type, \TYPO3\CMS\Fluid\Core\Parser\ParsedTemplateInterface $parsedTemplate, \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext) {
                array_push($this->renderingStack, array('type' => $type, 'parsedTemplate' => $parsedTemplate, 'renderingContext' => $renderingContext));
        }
 
@@ -393,7 +395,7 @@ abstract class Tx_Fluid_View_AbstractTemplateView implements Tx_Extbase_MVC_View
        /**
         * Get the parsed template which is currently being rendered.
         *
-        * @return Tx_Fluid_Core_Parser_ParsedTemplateInterface
+        * @return \TYPO3\CMS\Fluid\Core\Parser\ParsedTemplateInterface
         */
        protected function getCurrentParsedTemplate() {
                $currentRendering = end($this->renderingStack);
@@ -403,7 +405,7 @@ abstract class Tx_Fluid_View_AbstractTemplateView implements Tx_Extbase_MVC_View
        /**
         * Get the rendering context which is currently used.
         *
-        * @return Tx_Fluid_Core_Rendering_RenderingContextInterface
+        * @return \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface
         */
        protected function getCurrentRenderingContext() {
                $currentRendering = end($this->renderingStack);
@@ -416,14 +418,15 @@ abstract class Tx_Fluid_View_AbstractTemplateView implements Tx_Extbase_MVC_View
         * By default we assume that the view implementation can handle all kinds of
         * contexts. Override this method if that is not the case.
         *
-        * @param Tx_Extbase_MVC_Controller_ControllerContext $controllerContext Controller context which is available inside the view
+        * @param \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext Controller context which is available inside the view
         * @return boolean TRUE if the view has something useful to display, otherwise FALSE
         * @api
         */
-       public function canRender(Tx_Extbase_MVC_Controller_ControllerContext $controllerContext) {
+       public function canRender(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext) {
                return TRUE;
        }
 
 }
 
+
 ?>
\ No newline at end of file
index 6b434e0..25adc9a 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\View;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
  *
  * @api
  */
-class Tx_Fluid_View_Exception extends Tx_Fluid_Exception {
+class Exception extends \TYPO3\CMS\Fluid\Exception {
 
 
 }
 
+
 ?>
\ No newline at end of file
index 5b41aae..0fd3575 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\View\Exception;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
  *
  * @api
  */
-class Tx_Fluid_View_Exception_InvalidSectionException extends Tx_Fluid_View_Exception {
+class InvalidSectionException extends \TYPO3\CMS\Fluid\View\Exception {
 
 
 }
 
+
 ?>
\ No newline at end of file
index 5e9cc82..1deaa90 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\View\Exception;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
  *
  * @api
  */
-class Tx_Fluid_View_Exception_InvalidTemplateResourceException extends Tx_Fluid_View_Exception {
+class InvalidTemplateResourceException extends \TYPO3\CMS\Fluid\View\Exception {
 
 
 }
 
+
 ?>
\ No newline at end of file
index b807d45..9e94069 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+namespace TYPO3\CMS\Fluid\View;
+
 /*                                                                        *
  * This script is backported from the FLOW3 package "TYPO3.Fluid".        *
  *                                                                        *
@@ -24,7 +26,7 @@
  *
  * @api
  */
-class Tx_Fluid_View_StandaloneView extends Tx_Fluid_View_AbstractTemplateView {
+class StandaloneView extends \TYPO3\CMS\Fluid\View\AbstractTemplateView {
 
        /**
         * Source code of the Fluid template
@@ -55,40 +57,40 @@ class Tx_Fluid_View_StandaloneView extends Tx_Fluid_View_AbstractTemplateView {
        protected $partialRootPath = NULL;
 
        /**
-        * @var Tx_Fluid_Core_Compiler_TemplateCompiler
+        * @var \TYPO3\CMS\Fluid\Core\Compiler\TemplateCompiler
         */
        protected $templateCompiler;
 
        /**
         * Constructor
         *
-        * @param tslib_cObj $contentObject The current cObject. If NULL a new instance will be created
+        * @param \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $contentObject The current cObject. If NULL a new instance will be created
         */
-       public function __construct(tslib_cObj $contentObject = NULL) {
-               if (!t3lib_extMgm::isLoaded('extbase')) {
+       public function __construct(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $contentObject = NULL) {
+               if (!\TYPO3\CMS\Core\Extension\ExtensionManager::isLoaded('extbase')) {
                        return 'In the current version you still need to have Extbase installed in order to use the Fluid Standalone view!';
                }
-               $this->objectManager = t3lib_div::makeInstance('Tx_Extbase_Object_ObjectManager');
-               $configurationManager = $this->objectManager->get('Tx_Extbase_Configuration_ConfigurationManagerInterface');
+               $this->objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Object\\ObjectManager');
+               $configurationManager = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Configuration\\ConfigurationManagerInterface');
                if ($contentObject === NULL) {
-                       $contentObject = t3lib_div::makeInstance('tslib_cObj');
+                       $contentObject = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\ContentObject\\ContentObjectRenderer');
                }
                $configurationManager->setContentObject($contentObject);
-               $this->templateParser = $this->objectManager->get('Tx_Fluid_Core_Parser_TemplateParser');
-               $this->setRenderingContext($this->objectManager->create('Tx_Fluid_Core_Rendering_RenderingContext'));
-               $request = $this->objectManager->create('Tx_Extbase_MVC_Web_Request');
-               $request->setRequestURI(t3lib_div::getIndpEnv('TYPO3_REQUEST_URL'));
-               $request->setBaseURI(t3lib_div::getIndpEnv('TYPO3_SITE_URL'));
-               $uriBuilder = $this->objectManager->create('Tx_Extbase_MVC_Web_Routing_UriBuilder');
+               $this->templateParser = $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Parser\\TemplateParser');
+               $this->setRenderingContext($this->objectManager->create('TYPO3\\CMS\\Fluid\\Core\\Rendering\\RenderingContext'));
+               $request = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Request');
+               $request->setRequestURI(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_REQUEST_URL'));
+               $request->setBaseURI(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_URL'));
+               $uriBuilder = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Routing\\UriBuilder');
                $uriBuilder->setRequest($request);
-               $controllerContext = $this->objectManager->create('Tx_Extbase_MVC_Controller_ControllerContext');
+               $controllerContext = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\ControllerContext');
                $controllerContext->setRequest($request);
                $controllerContext->setUriBuilder($uriBuilder);
-               $flashMessageContainer = $this->objectManager->get('Tx_Extbase_MVC_Controller_FlashMessages');
+               $flashMessageContainer = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\FlashMessages');
                // singleton
                $controllerContext->setFlashMessageContainer($flashMessageContainer);
                $this->setControllerContext($controllerContext);
-               $this->templateCompiler = $this->objectManager->get('Tx_Fluid_Core_Compiler_TemplateCompiler');
+               $this->templateCompiler = $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Compiler\\TemplateCompiler');
                // singleton
                $this->templateCompiler->setTemplateCache($GLOBALS['typo3CacheManager']->getCache('fluid_template'));
        }
@@ -117,7 +119,7 @@ class Tx_Fluid_View_StandaloneView extends Tx_Fluid_View_AbstractTemplateView {
        /**
         * Returns the current request object
         *
-        * @return Tx_Extbase_MVC_Web_Request
+        * @return \TYPO3\CMS\Extbase\Mvc\Web\Request
         */
        public function getRequest() {
                return $this->controllerContext->getRequest();
@@ -175,7 +177,7 @@ class Tx_Fluid_View_StandaloneView extends Tx_Fluid_View_AbstractTemplateView {
         */
        public function getLayoutRootPath() {
                if ($this->layoutRootPath === NULL && $this->templatePathAndFilename === NULL) {
-                       throw new Tx_Fluid_View_Exception_InvalidTemplateResourceException('No layout root path has been specified. Use setLayoutRootPath().', 1288091419);
+                       throw new \TYPO3\CMS\Fluid\View\Exception\InvalidTemplateResourceException('No layout root path has been specified. Use setLayoutRootPath().', 1288091419);
                }
                if ($this->layoutRootPath === NULL) {
                        $this->layoutRootPath = dirname($this->templatePathAndFilename) . '/Layouts';
@@ -202,7 +204,7 @@ class Tx_Fluid_View_StandaloneView extends Tx_Fluid_View_AbstractTemplateView {
         */
        public function getPartialRootPath() {
                if ($this->partialRootPath === NULL && $this->templatePathAndFilename === NULL) {
-                       throw new Tx_Fluid_View_Exception_InvalidTemplateResourceException('No partial root path has been specified. Use setPartialRootPath().', 1288094511);
+                       throw new \TYPO3\CMS\Fluid\View\Exception\InvalidTemplateResourceException('No partial root path has been specified. Use setPartialRootPath().', 1288094511);
                }
                if ($this->partialRootPath === NULL) {
                        $this->partialRootPath = dirname($this->templatePathAndFilename) . '/Partials';
@@ -220,7 +222,7 @@ class Tx_Fluid_View_StandaloneView extends Tx_Fluid_View_AbstractTemplateView {
                try {
                        $this->getTemplateSource();
                        return TRUE;
-               } catch (Tx_Fluid_View_Exception_InvalidTemplateResourceException $e) {
+               } catch (\TYPO3\CMS\Fluid\View\Exception\InvalidTemplateResourceException $e) {
                        return FALSE;
                }
        }
@@ -252,15 +254,15 @@ class Tx_Fluid_View_StandaloneView extends Tx_Fluid_View_AbstractTemplateView {
         *
         * @param string $actionName Name of the action. This argument is not used in this view!
         * @return string Fluid template source
-        * @throws Tx_Fluid_View_Exception_InvalidTemplateResourceException
+        * @throws \TYPO3\CMS\Fluid\View\Exception\InvalidTemplateResourceException
         */
        protected function getTemplateSource($actionName = NULL) {
&