fix for phpdocmentor v6

googleapis · Dec 3, 2024 · c285f93 · c285f93
1 parent 8618423
commit c285f93
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/Core/src/Testing/Reflection/ReflectionHandlerFactory.php b/Core/src/Testing/Reflection/ReflectionHandlerFactory.php
@@ -17,6 +17,8 @@
 
 namespace Google\Cloud\Core\Testing\Reflection;
 
+use phpDocumentor\Reflection\Php\Factory\Argument;
+
 /**
  * Class for determining which verison of phpdocumentor/reflection is being used.
  * @internal
@@ -28,6 +30,8 @@ class ReflectionHandlerFactory
      */
     public static function create()
     {
-        return new ReflectionHandlerV5();
+        return class_exists(Argument::class)
+            ? new ReflectionHandlerV5()
+            : new ReflectionHandlerV6();
     }
 }
diff --git a/Core/src/Testing/Reflection/ReflectionHandlerV5.php b/Core/src/Testing/Reflection/ReflectionHandlerV5.php
@@ -99,14 +99,31 @@ public function classes(array $files)
     }
 
     /**
-     * @return ProjectFactory
+     * Split this into a separate method because ReflectionHandler V6 looks
+     * different
      */
-    public function createProjectFactory()
+    protected function createParser()
     {
-        $parser = (new ParserFactory())->create(
+        return (new ParserFactory())->create(
             ParserFactory::ONLY_PHP7,
             new Lexer\Emulative(['phpVersion' => Lexer\Emulative::PHP_8_0])
         );
+    }
+
+    /**
+     * Split this into a separate method because V6 does not support it
+     */
+    protected function getAdditionalStrategies()
+    {
+        return [new Factory\Argument(new PrettyPrinter())];
+    }
+
+    /**
+     * @return ProjectFactory
+     */
+    public function createProjectFactory()
+    {
+        $parser = $this->createParser();
         $nodeTraverser = new NodeTraverser();
         $nodeTraverser->addVisitor(new NameResolver());
         $nodeTraverser->addVisitor(new ElementNameResolver());
@@ -119,7 +136,6 @@ public function createProjectFactory()
         $strategies = new ProjectFactoryStrategies(
             [
                 new Factory\Namespace_(),
-                new Factory\Argument(new PrettyPrinter()),
                 new Factory\Class_($docblockFactory),
                 new Factory\Enum_($docblockFactory),
                 new Factory\EnumCase($docblockFactory, new PrettyPrinter()),
@@ -134,7 +150,7 @@ public function createProjectFactory()
                 new Factory\Trait_($docblockFactory),
                 new Factory\IfStatement(),
                 new TraitUse(),
-            ]
+            ] + $this->getAdditionalStrategies()
         );
 
         $strategies->addStrategy(