マスタデータのEntityを拡張すると、マスタデータ管理ページでテーブルを選択できなくなる問題の対策

EC-CUBE · Jun 20, 2022 · 53fd424 · 53fd424
1 parent 6c466ad
commit 53fd424
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/Eccube/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/src/Eccube/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
@@ -76,9 +76,17 @@ public function getAllClassNames()
                     $sourceFile = str_replace('\\', '/', $sourceFile);
                     $projectDir = str_replace('\\', '/', $projectDir);
                 }
-                // Replace /path/to/ec-cube to proxies path
-                $proxyFile = str_replace($projectDir, $this->trait_proxies_directory, $path).'/'.basename($sourceFile);
-                if (file_exists($proxyFile)) {
+
+                $entityPath = $projectDir . '/src/Eccube/Entity/';
+                $proxyFile = null;
+                if (strpos($sourceFile, $entityPath) === 0) {
+                    // Entity class
+                    $entityClass = substr($sourceFile, strlen($entityPath));
+                    // Replace /path/to/ec-cube to proxies path
+                    $proxyFile = str_replace($projectDir, $this->trait_proxies_directory, $path).'/'.$entityClass;
+                }
+
+                if ($proxyFile !== null && file_exists($proxyFile)) {
                     require_once $proxyFile;
 
                     $sourceFile = $proxyFile;