[BUGFIX] Replace GenericObjectStorage in Fluid

Releases: 6.0
Fixes: #42554

Change-Id: I6d584c7ccd72b50f1d4fb89ec355258a93fcac70
Reviewed-on: http://review.typo3.org/16076
Reviewed-by: Alexander Schnitzler
Tested-by: Alexander Schnitzler

diff --git a/typo3/sysext/fluid/Classes/Core/Compiler/AbstractCompiledTemplate.php b/typo3/sysext/fluid/Classes/Core/Compiler/AbstractCompiledTemplate.php
index ad5e4d3..d3503bf 100644 (file)
--- a/typo3/sysext/fluid/Classes/Core/Compiler/AbstractCompiledTemplate.php
+++ b/typo3/sysext/fluid/Classes/Core/Compiler/AbstractCompiledTemplate.php
@@ -60,7 +60,7 @@ abstract class AbstractCompiledTemplate implements \TYPO3\CMS\Fluid\Core\Parser\
                                return $viewHelperInstance;
                        }
                } else {
-                       $this->viewHelpersByPositionAndContext[$uniqueCounter] = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage');
+                       $this->viewHelpersByPositionAndContext[$uniqueCounter] = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage');
                        $viewHelperInstance = self::$objectContainer->getInstance($viewHelperName);
                        if ($viewHelperInstance instanceof \TYPO3\CMS\Core\SingletonInterface) {
                                $viewHelperInstance->resetState();

diff --git a/typo3/sysext/fluid/Classes/Core/Parser/Configuration.php b/typo3/sysext/fluid/Classes/Core/Parser/Configuration.php
index e978f4f..b306279 100644 (file)
--- a/typo3/sysext/fluid/Classes/Core/Parser/Configuration.php
+++ b/typo3/sysext/fluid/Classes/Core/Parser/Configuration.php
@@ -19,7 +19,7 @@ class Configuration {
        /**
         * Generic interceptors registered with the configuration.
         *
-        * @var array<\TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage>
+        * @var array<\TYPO3\CMS\Extbase\Persistence\ObjectStorage>
         */
        protected $interceptors = array();
 
@@ -32,7 +32,7 @@ class Configuration {
        public function addInterceptor(\TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface $interceptor) {
                foreach ($interceptor->getInterceptionPoints() as $interceptionPoint) {
                        if (!isset($this->interceptors[$interceptionPoint])) {
-                               $this->interceptors[$interceptionPoint] = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage');
+                               $this->interceptors[$interceptionPoint] = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage');
                        }
                        if (!$this->interceptors[$interceptionPoint]->contains($interceptor)) {
                                $this->interceptors[$interceptionPoint]->attach($interceptor);
@@ -44,13 +44,13 @@ class Configuration {
         * Returns all interceptors for a given Interception Point.
         *
         * @param integer $interceptionPoint one of the Tx_Fluid_Core_Parser_InterceptorInterface::INTERCEPT_* constants,
-        * @return \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage<Tx_Fluid_Core_Parser_InterceptorInterface>
+        * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<Tx_Fluid_Core_Parser_InterceptorInterface>
         */
        public function getInterceptors($interceptionPoint) {
-               if (isset($this->interceptors[$interceptionPoint]) && $this->interceptors[$interceptionPoint] instanceof \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage) {
+               if (isset($this->interceptors[$interceptionPoint]) && $this->interceptors[$interceptionPoint] instanceof \TYPO3\CMS\Extbase\Persistence\ObjectStorage) {
                        return $this->interceptors[$interceptionPoint];
                }
-               return \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage');
+               return \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage');
        }
 
 }

diff --git a/typo3/sysext/fluid/Classes/Core/Parser/SyntaxTree/ViewHelperNode.php b/typo3/sysext/fluid/Classes/Core/Parser/SyntaxTree/ViewHelperNode.php
index a066cf3..1c53e10 100644 (file)
--- a/typo3/sysext/fluid/Classes/Core/Parser/SyntaxTree/ViewHelperNode.php
+++ b/typo3/sysext/fluid/Classes/Core/Parser/SyntaxTree/ViewHelperNode.php
@@ -40,7 +40,7 @@ class ViewHelperNode extends \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNod
         * A mapping RenderingContext -> ViewHelper to only re-initialize ViewHelpers
         * when a context change occurs.
         *
-        * @var \TYPO3\CMS\Extbase\Persistence\Generic\ObjectStorage
+        * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage
         */
        protected $viewHelpersByContext = NULL;
 
@@ -52,7 +52,7 @@ class ViewHelperNode extends \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNod
         */
        public function __construct(\TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper $viewHelper, array $arguments) {
                $this->uninitializedViewHelper = $viewHelper;
-               $this->viewHelpersByContext = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\ObjectStorage');
+               $this->viewHelpersByContext = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage');
                $this->arguments = $arguments;
                $this->viewHelperClassName = get_class($this->uninitializedViewHelper);
        }