Removed roave/better-reflection from other components. (#3654)

Author: limingxinleo

src/TypesFinderManager.php

@@ -265,8 +265,6 @@ protected function getContainer(array $classes = [])
         ApplicationContext::setContainer($container);
         $path = BASE_PATH . '/runtime/scan.cache';
 
-//        BetterReflectionManager::initClassReflector([__DIR__ . '/Stub']);
-
         $pid = pcntl_fork();
         if ($pid == -1) {
             throw new Exception('The process fork failed');

tests/InjectTest.php

@@ -13,15 +13,12 @@
 
 use Hyperf\Di\LazyLoader\InterfaceLazyProxyBuilder;
 use Hyperf\Di\LazyLoader\PublicMethodVisitor;
+use Hyperf\Utils\CodeGen\PhpParser;
 use PhpParser\NodeTraverser;
 use PhpParser\NodeVisitor\NameResolver;
 use PhpParser\ParserFactory;
 use PhpParser\PrettyPrinter\Standard;
 use PHPUnit\Framework\TestCase;
-use Roave\BetterReflection\BetterReflection;
-use Roave\BetterReflection\Reflection\Adapter\ReflectionMethod;
-use Roave\BetterReflection\Reflector\ClassReflector;
-use Roave\BetterReflection\SourceLocator\Type\StringSourceLocator;
 
 /**
  * @internal
@@ -79,7 +76,7 @@ public function works(bool $a, float $b = 1) : int
         $parser = (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
         $ast = $parser->parse($code);
         $traverser = new NodeTraverser();
-        $visitor = new PublicMethodVisitor(...$this->getStmt($code));
+        $visitor = new PublicMethodVisitor(...$this->getStmt($ast));
         $nameResolver = new NameResolver();
         $traverser->addVisitor($nameResolver);
         $traverser->addVisitor($visitor);
@@ -91,16 +88,9 @@ public function works(bool $a, float $b = 1) : int
         $this->assertEquals($expected, $newCode);
     }
 
-    private function getStmt($code)
+    private function getStmt($ast)
     {
-        $astLocator = (new BetterReflection())->astLocator();
-        $reflector = new ClassReflector(new StringSourceLocator($code, $astLocator));
-        $reflectionClass = $reflector->reflect('foo\\foo');
-        $reflectionMethods = $reflectionClass->getMethods(ReflectionMethod::IS_PUBLIC);
-        $stmts = [];
-        foreach ($reflectionMethods as $method) {
-            $stmts[] = $method->getAst();
-        }
+        $stmts = PhpParser::getInstance()->getAllMethodsFromStmts($ast);
         return [$stmts, 'foo\\foo'];
     }
 }

tests/InterfaceLazyProxyBuilderTest.php

@@ -12,14 +12,11 @@
 namespace HyperfTest\Di;
 
 use Hyperf\Di\LazyLoader\PublicMethodVisitor;
+use Hyperf\Utils\CodeGen\PhpParser;
 use PhpParser\NodeTraverser;
 use PhpParser\ParserFactory;
 use PhpParser\PrettyPrinter\Standard;
 use PHPUnit\Framework\TestCase;
-use Roave\BetterReflection\BetterReflection;
-use Roave\BetterReflection\Reflection\Adapter\ReflectionMethod;
-use Roave\BetterReflection\Reflector\ClassReflector;
-use Roave\BetterReflection\SourceLocator\Type\StringSourceLocator;
 
 /**
  * @internal
@@ -48,7 +45,7 @@ public function hope(bool $a) : int
 {
     return $this->__call(__FUNCTION__, func_get_args());
 }
-public function it(\bar\ConfigInterface $a) : void
+public function it(ConfigInterface $a) : void
 {
     $this->__call(__FUNCTION__, func_get_args());
 }
@@ -64,7 +61,7 @@ public function fluent() : \foo\foo
         $parser = (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
         $ast = $parser->parse($code);
         $traverser = new NodeTraverser();
-        $visitor = new PublicMethodVisitor(...$this->getStmt($code));
+        $visitor = new PublicMethodVisitor(...$this->getStmt($ast));
         $traverser->addVisitor($visitor);
         $ast = $traverser->traverse($ast);
         $prettyPrinter = new Standard();
@@ -103,7 +100,7 @@ public function hope(bool $a) : int
 {
     return $this->__call(__FUNCTION__, func_get_args());
 }
-public function it(\bar\ConfigInterface $a) : void
+public function it(ConfigInterface $a) : void
 {
     $this->__call(__FUNCTION__, func_get_args());
 }
@@ -119,7 +116,7 @@ public function fluent() : \foo\foo
         $parser = (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
         $ast = $parser->parse($code);
         $traverser = new NodeTraverser();
-        $visitor = new PublicMethodVisitor(...$this->getStmt($code));
+        $visitor = new PublicMethodVisitor(...$this->getStmt($ast));
         $traverser->addVisitor($visitor);
         $ast = $traverser->traverse($ast);
         $prettyPrinter = new Standard();
@@ -128,16 +125,9 @@ public function fluent() : \foo\foo
         $this->assertEquals(4, count($visitor->nodes));
     }
 
-    private function getStmt($code)
+    private function getStmt($ast)
     {
-        $astLocator = (new BetterReflection())->astLocator();
-        $reflector = new ClassReflector(new StringSourceLocator($code, $astLocator));
-        $reflectionClass = $reflector->reflect('foo\\foo');
-        $reflectionMethods = $reflectionClass->getMethods(ReflectionMethod::IS_PUBLIC);
-        $stmts = [];
-        foreach ($reflectionMethods as $method) {
-            $stmts[] = $method->getAst();
-        }
+        $stmts = PhpParser::getInstance()->getAllMethodsFromStmts($ast);
         return [$stmts, 'foo\\foo'];
     }
 }