Merge pull request #136 from Roave/refactor-source-locators

Internal refactoring of source locators

src/Reflection/ReflectionClass.php

@@ -10,11 +10,7 @@
 use BetterReflection\Reflection\Exception\NotAString;
 use BetterReflection\Reflector\ClassReflector;
 use BetterReflection\Reflector\Reflector;
-use BetterReflection\SourceLocator\AggregateSourceLocator;
-use BetterReflection\SourceLocator\AutoloadSourceLocator;
-use BetterReflection\SourceLocator\EvaledCodeSourceLocator;
-use BetterReflection\SourceLocator\LocatedSource;
-use BetterReflection\SourceLocator\PhpInternalSourceLocator;
+use BetterReflection\SourceLocator\Located\LocatedSource;
 use BetterReflection\TypesFinder\FindTypeFromAst;
 use phpDocumentor\Reflection\Types\Object_;
 use PhpParser\Node;

src/Reflection/ReflectionFunction.php

@@ -4,8 +4,8 @@
 
 use BetterReflection\Reflector\FunctionReflector;
 use BetterReflection\Reflector\Reflector;
-use BetterReflection\SourceLocator\AutoloadSourceLocator;
-use BetterReflection\SourceLocator\LocatedSource;
+use BetterReflection\SourceLocator\Type\AutoloadSourceLocator;
+use BetterReflection\SourceLocator\Located\LocatedSource;
 use PhpParser\Node\Stmt\Function_ as FunctionNode;
 use PhpParser\Node\Stmt\Namespace_ as NamespaceNode;
 

src/Reflection/ReflectionFunctionAbstract.php

@@ -3,7 +3,7 @@
 namespace BetterReflection\Reflection;
 
 use BetterReflection\Reflector\Reflector;
-use BetterReflection\SourceLocator\LocatedSource;
+use BetterReflection\SourceLocator\Located\LocatedSource;
 use BetterReflection\TypesFinder\FindReturnType;
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Namespace_ as NamespaceNode;

src/Reflection/ReflectionObject.php

@@ -4,12 +4,11 @@
 
 use BetterReflection\Reflector\ClassReflector;
 use BetterReflection\Reflector\Reflector;
-use BetterReflection\SourceLocator\EvaledCodeSourceLocator;
 use PhpParser\Node\Stmt\Property as PropertyNode;
 use PhpParser\Builder\Property as PropertyNodeBuilder;
 use PhpParser\Node\Stmt\ClassLike as ClassLikeNode;
 use PhpParser\Node\Stmt\Namespace_ as NamespaceNode;
-use BetterReflection\SourceLocator\LocatedSource;
+use BetterReflection\SourceLocator\Located\LocatedSource;
 
 class ReflectionObject extends ReflectionClass
 {

src/Reflection/ReflectionProperty.php

@@ -6,7 +6,6 @@
 use BetterReflection\NodeCompiler\CompilerContext;
 use BetterReflection\Reflector\Reflector;
 use BetterReflection\TypesFinder\FindPropertyType;
-use BetterReflection\TypesFinder\FindTypeFromAst;
 use PhpParser\Node\Stmt\Property as PropertyNode;
 use phpDocumentor\Reflection\Type;
 

src/Reflector/ClassReflector.php

@@ -4,26 +4,25 @@
 
 use BetterReflection\Identifier\Identifier;
 use BetterReflection\Identifier\IdentifierType;
-use BetterReflection\Reflector\Generic as GenericReflector;
-use BetterReflection\SourceLocator\AggregateSourceLocator;
-use BetterReflection\SourceLocator\AutoloadSourceLocator;
-use BetterReflection\SourceLocator\EvaledCodeSourceLocator;
-use BetterReflection\SourceLocator\PhpInternalSourceLocator;
-use BetterReflection\SourceLocator\SourceLocator;
+use BetterReflection\SourceLocator\Type\AggregateSourceLocator;
+use BetterReflection\SourceLocator\Type\AutoloadSourceLocator;
+use BetterReflection\SourceLocator\Type\EvaledCodeSourceLocator;
+use BetterReflection\SourceLocator\Type\PhpInternalSourceLocator;
+use BetterReflection\SourceLocator\Type\SourceLocator;
 
 class ClassReflector implements Reflector
 {
     /**
-     * @var GenericReflector
+     * @var SourceLocator
      */
-    private $reflector;
+    private $sourceLocator;
 
     /**
      * @param SourceLocator $sourceLocator
      */
     public function __construct(SourceLocator $sourceLocator)
     {
-        $this->reflector = new GenericReflector($sourceLocator);
+        $this->sourceLocator = $sourceLocator;
     }
 
     /**
@@ -46,7 +45,8 @@ public static function buildDefaultReflector()
      */
     public function reflect($className)
     {
-        return $this->reflector->reflect(
+        return $this->sourceLocator->locateIdentifier(
+            $this,
             new Identifier($className, new IdentifierType(IdentifierType::IDENTIFIER_CLASS))
         );
     }
@@ -58,7 +58,8 @@ public function reflect($className)
      */
     public function getAllClasses()
     {
-        return $this->reflector->getAllByIdentifierType(
+        return $this->sourceLocator->locateIdentifiersByType(
+            $this,
             new IdentifierType(IdentifierType::IDENTIFIER_CLASS)
         );
     }

src/Reflector/FunctionReflector.php

@@ -4,19 +4,18 @@
 
 use BetterReflection\Identifier\Identifier;
 use BetterReflection\Identifier\IdentifierType;
-use BetterReflection\Reflector\Generic as GenericReflector;
-use BetterReflection\SourceLocator\SourceLocator;
+use BetterReflection\SourceLocator\Type\SourceLocator;
 
 class FunctionReflector implements Reflector
 {
     /**
-     * @var GenericReflector
+     * @var SourceLocator
      */
-    private $reflector;
+    private $sourceLocator;
 
     public function __construct(SourceLocator $sourceLocator)
     {
-        $this->reflector = new GenericReflector($sourceLocator);
+        $this->sourceLocator = $sourceLocator;
     }
 
     /**
@@ -27,7 +26,8 @@ public function __construct(SourceLocator $sourceLocator)
      */
     public function reflect($functionName)
     {
-        return $this->reflector->reflect(
+        return $this->sourceLocator->locateIdentifier(
+            $this,
             new Identifier($functionName, new IdentifierType(IdentifierType::IDENTIFIER_FUNCTION))
         );
     }