BUGFIX: #3303 Flush reflection cache for removed php classes

Neos.Flow/Classes/Cache/CacheManager.php

@@ -20,6 +20,8 @@
 use Neos\Cache\Frontend\VariableFrontend;
 use Neos\Flow\Configuration\ConfigurationManager;
 use Neos\Flow\Log\Utility\LogEnvironment;
+use Neos\Flow\Monitor\ChangeDetectionStrategy\ChangeDetectionStrategyInterface;
+use Neos\Flow\Package\PackageManager;
 use Neos\Flow\Utility\Environment;
 use Neos\Utility\Files;
 use Neos\Flow\Utility\PhpAnalyzer;
@@ -47,6 +49,11 @@
      */
     protected $configurationManager;
 
+    /**
+     * @var PackageManager
+     */
+    protected $packageManager;
+
     /**
      * @var LoggerInterface
      */
@@ -118,6 +125,11 @@
         $this->configurationManager = $configurationManager;
     }
 
+    public function injectPackageManager(PackageManager $packageManager): void
+    {
+        $this->packageManager = $packageManager;
+    }
+
     /**
      * @param Environment $environment
      * @return void
@@ -352,15 +364,35 @@
         $modifiedAspectClassNamesWithUnderscores = [];
         $modifiedClassNamesWithUnderscores = [];
         foreach ($changedFiles as $pathAndFilename => $status) {
-            if (!file_exists($pathAndFilename)) {
-                continue;
+            $classNameWithUnderscores = null;
+            if ($status !== ChangeDetectionStrategyInterface::STATUS_DELETED) {
+                $fileContents = file_get_contents($pathAndFilename);
+                $className = (new PhpAnalyzer($fileContents))->extractFullyQualifiedClassName();
+                if ($className === null) {
+                    continue;
+                }
+                $classNameWithUnderscores = str_replace('\\', '_', $className);
+            } else {
+                // file was deleted
+                foreach ($this->packageManager->getFlowPackages() as $flowPackage) {
+                    if (!str_starts_with($pathAndFilename, $flowPackage->getPackagePath())) {
+                        continue;
+                    }
+                    foreach ($flowPackage->getFlattenedAutoloadConfiguration() as $autoloadConfiguration) {
+                        if (!str_starts_with($pathAndFilename, $autoloadConfiguration['classPath'])) {
+                            continue;
+                        }
+                        $relativePath = substr($pathAndFilename, strlen($autoloadConfiguration['classPath']), -strlen('.php'));
+                        $classNameWithUnderscores = str_replace('\\', '_', rtrim($autoloadConfiguration['namespace'], '\\')) . '_' . str_replace('/', '_', ltrim($relativePath, '/'));
+                        break 2;
+                    }
+                }
             }
-            $fileContents = file_get_contents($pathAndFilename);
-            $className = (new PhpAnalyzer($fileContents))->extractFullyQualifiedClassName();
-            if ($className === null) {
+
+            if ($classNameWithUnderscores === null) {
                 continue;
             }
-            $classNameWithUnderscores = str_replace('\\', '_', $className);
+
             $modifiedClassNamesWithUnderscores[$classNameWithUnderscores] = true;
 
             // If an aspect was modified, the whole code cache needs to be flushed, so keep track of them:

Neos.Flow/Classes/Core/Booting/Scripts.php

@@ -377,6 +377,7 @@ public static function initializeCacheManagement(Bootstrap $bootstrap)
         $cacheManager = new CacheManager();
         $cacheManager->setCacheConfigurations($configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_CACHES));
         $cacheManager->injectConfigurationManager($configurationManager);
+        $cacheManager->injectPackageManager($bootstrap->getEarlyInstance(PackageManager::class));
         $cacheManager->injectLogger($bootstrap->getEarlyInstance(PsrLoggerFactoryInterface::class)->get('systemLogger'));
         $cacheManager->injectEnvironment($environment);
         $cacheManager->injectCacheFactory($cacheFactory);

Neos.Flow/Classes/Reflection/ReflectionService.php

@@ -174,6 +174,11 @@ class ReflectionService
      */
     protected array $updatedReflectionData = [];
 
+    /**
+     * Array with removed reflection information (e.g. in Development context after classes were deleted)
+     */
+    protected array $removedReflectionDataClasses = [];
+
     protected bool $initialized = false;
 
     /**
@@ -1795,18 +1800,17 @@ protected function forgetClass($className): void
         $this->classesCurrentlyBeingForgotten[$className] = true;
 
         if (class_exists($className)) {
+            // optimisation to flush only precisely the affected interfaces
             $interfaceNames = class_implements($className);
             foreach ($interfaceNames as $interfaceName) {
                 if (isset($this->classReflectionData[$interfaceName][self::DATA_INTERFACE_IMPLEMENTATIONS][$className])) {
                     unset($this->classReflectionData[$interfaceName][self::DATA_INTERFACE_IMPLEMENTATIONS][$className]);
                 }
             }
         } else {
-            foreach ($this->availableClassNames as $interfaceNames) {
-                foreach ($interfaceNames as $interfaceName) {
-                    if (isset($this->classReflectionData[$interfaceName][self::DATA_INTERFACE_IMPLEMENTATIONS][$className])) {
-                        unset($this->classReflectionData[$interfaceName][self::DATA_INTERFACE_IMPLEMENTATIONS][$className]);
-                    }
+            foreach ($this->classReflectionData as &$possibleInterfaceReflectionData) {
+                if (isset($possibleInterfaceReflectionData[self::DATA_INTERFACE_IMPLEMENTATIONS][$className])) {
+                    unset($possibleInterfaceReflectionData[self::DATA_INTERFACE_IMPLEMENTATIONS][$className]);
                 }
             }
         }
@@ -1833,6 +1837,8 @@ protected function forgetClass($className): void
 
         unset($this->classReflectionData[$className]);
         unset($this->classesCurrentlyBeingForgotten[$className]);
+
+        $this->removedReflectionDataClasses[$className] = true;
     }
 
     /**
@@ -2024,7 +2030,7 @@ public function saveToCache(): void
             $this->reflectionDataRuntimeCache->set('__availableClassNames', $this->availableClassNames);
         }
 
-        if ($this->updatedReflectionData !== []) {
+        if ($this->updatedReflectionData !== [] || $this->removedReflectionDataClasses !== []) {
             $this->updateReflectionData();
         }
 
@@ -2092,7 +2098,7 @@ protected function saveProductionData(): void
      */
     protected function updateReflectionData(): void
     {
-        $this->log(sprintf('Found %s classes whose reflection data was not cached previously.', count($this->updatedReflectionData)), LogLevel::DEBUG);
+        $this->log(sprintf('Found %s classes whose reflection data was not cached previously and %s classes which were deleted.', count($this->updatedReflectionData), count($this->removedReflectionDataClasses)), LogLevel::DEBUG);
 
         foreach (array_keys($this->updatedReflectionData) as $className) {
             $this->statusCache->set($this->produceCacheIdentifierFromClassName($className), '');