TASK: Fix errors from 9.0 downmerge

Flow 8.x only works correctly with typo3fluid 2.7.x - see: neos/flow-development-collection#3038, neos/flow-development-collection#3041 and neos/flow-development-collection#3358
neos · Jun 14, 2024 · 58326ea · 58326ea
1 parent 5d2a01e
commit 58326ea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/Classes/Aop/Builder/ProxyClassBuilder.php b/Classes/Aop/Builder/ProxyClassBuilder.php
@@ -18,7 +18,6 @@
 use Neos\Flow\Aop\AspectContainer;
 use Neos\Flow\Aop\Exception;
 use Neos\Flow\Aop\Exception\InvalidPointcutExpressionException;
-use Neos\Flow\Aop\Exception\InvalidTargetClassException;
 use Neos\Flow\Aop\Exception\VoidImplementationException;
 use Neos\Flow\Aop\Pointcut\Pointcut;
 use Neos\Flow\Aop\Pointcut\PointcutExpressionParser;

diff --git a/Classes/Cache/CacheFactory.php b/Classes/Cache/CacheFactory.php
@@ -48,22 +48,11 @@ class CacheFactory extends \Neos\Cache\CacheFactory
      */
     protected $environmentConfiguration;
 
-    /**
-     * @param CacheManager $cacheManager
-     *
-     * @Flow\Autowiring (enabled=false)
-     */
-    public function injectCacheManager(CacheManager $cacheManager): void
-    {
-        $this->cacheManager = $cacheManager;
-    }
-
     /**
      * @param EnvironmentConfiguration $environmentConfiguration
-     *
-     * @Flow\Autowiring (enabled=false)
+     * @Flow\Autowiring(enabled=false)
      */
-    public function injectEnvironmentConfiguration(EnvironmentConfiguration $environmentConfiguration): void
+    public function injectEnvironmentConfiguration(EnvironmentConfiguration $environmentConfiguration)
     {
         $this->environmentConfiguration = $environmentConfiguration;
     }