Fix #5730. php:cli should avoid duplicate class name. (#5733)

drush-ops · Aug 19, 2023 · 0292cd2 · 0292cd2
1 parent 5aee7ef
commit 0292cd2
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/Commands/core/CliCommands.php b/src/Commands/core/CliCommands.php
@@ -309,10 +309,12 @@ public function makeEntitiesAvailableWithShortClassNames(): void
         foreach ($this->entityTypeManager->getDefinitions() as $definition) {
             $class = $definition->getClass();
             $reflectionClass = new \ReflectionClass($class);
-            if ($reflectionClass->isFinal()) {
+            $parts = explode('\\', $class);
+            $end = end($parts);
+            // https://github.com/drush-ops/drush/pull/5729 and https://github.com/drush-ops/drush/issues/5730.
+            if ($reflectionClass->isFinal() || class_exists($end)) {
                 continue;
             }
-            $parts = explode('\\', $class);
             // Make it possible to easily load revisions.
             eval(sprintf('class %s extends \%s {
                 public static function loadRevision($id) {
@@ -321,7 +323,7 @@ public static function loadRevision($id) {
                     $storage = $entity_type_manager->getStorage($entity_type_repository->getEntityTypeFromClass(static::class));
                     return $storage->loadRevision($id);
                 }
-            }', end($parts), $class));
+            }', $end, $class));
         }
     }
 }