Using native Reflection.

nikolaposa · Jun 11, 2017 · 9fa71c2 · 9fa71c2
1 parent 26acc3f
commit 9fa71c2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -18,8 +18,7 @@
         }
     ],
     "require": {
-        "php": "^7.0",
-        "roave/better-reflection": "^1.2"
+        "php": "^7.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7 || ^6.0",

diff --git a/src/Cascader.php b/src/Cascader.php
@@ -4,13 +4,11 @@
 
 namespace Cascader;
 
-use BetterReflection\Reflection\ReflectionClass;
-use BetterReflection\Reflection\ReflectionParameter;
-use BetterReflection\Reflector\Exception\IdentifierNotFound;
 use Cascader\Exception\InvalidClassException;
 use Cascader\Exception\InvalidOptionsException;
 use Cascader\Exception\OptionNotSetException;
-use phpDocumentor\Reflection\Types\Object_;
+use ReflectionClass;
+use ReflectionParameter;
 
 class Cascader
 {
@@ -33,11 +31,11 @@ public function create(string $className, array $options)
         return new $className(...$arguments);
     }
 
-    protected function getReflectionClass(string $className)
+    protected function getReflectionClass(string $className) : ReflectionClass
     {
         try {
-            $reflectionClass = ReflectionClass::createFromName($className);
-        } catch (IdentifierNotFound $ex) {
+            $reflectionClass = new ReflectionClass($className);
+        } catch (\ReflectionException $ex) {
             throw InvalidClassException::forNonExistingClass($className);
         }
 
@@ -50,13 +48,15 @@ protected function getReflectionClass(string $className)
 
     protected function marshalArguments(ReflectionClass $reflectionClass, Options $options) : array
     {
-        if (! $reflectionClass->hasMethod('__construct')) {
+        $constructor = $reflectionClass->getConstructor();
+
+        if (null === $constructor) {
             return [];
         }
 
         $arguments = [];
 
-        $constructorParameters = $reflectionClass->getConstructor()->getParameters();
+        $constructorParameters = $constructor->getParameters();
 
         foreach ($constructorParameters as $parameter) {
             $arguments[] = $this->resolveArgument($parameter, $options);
@@ -71,10 +71,8 @@ protected function resolveArgument(ReflectionParameter $parameter, Options $opti
             $argument = $options->get($parameter->getName());
 
             if (null !== ($parameterType = $parameter->getType())) {
-                $parameterTypeObject = $parameterType->getTypeObject();
-
-                if (is_array($argument) && $parameterTypeObject instanceof Object_) {
-                    $argument = $this->create((string) $parameterTypeObject->getFqsen(), $argument);
+                if (is_array($argument) && ! $parameterType->isBuiltin()) {
+                    $argument = $this->create((string) $parameterType, $argument);
                 }
             }
 

diff --git a/src/Exception/InvalidOptionsException.php b/src/Exception/InvalidOptionsException.php
@@ -4,8 +4,8 @@
 
 namespace Cascader\Exception;
 
-use BetterReflection\Reflection\ReflectionParameter;
 use InvalidArgumentException;
+use ReflectionParameter;
 
 class InvalidOptionsException extends InvalidArgumentException implements ExceptionInterface
 {