ClassType::from() fixes for ReflectionObject

Author: dg

src/PhpGenerator/ClassType.php

@@ -65,7 +65,7 @@ class ClassType extends Nette\Object
 	 */
 	public static function from($from)
 	{
-		$from = $from instanceof \ReflectionClass ? $from : new \ReflectionClass($from);
+		$from = new \ReflectionClass($from instanceof \ReflectionClass ? $from->getName() : $from);
 		if (PHP_VERSION_ID >= 70000 && $from->isAnonymous()) {
 			$class = new static('anonymous');
 		} else {
@@ -81,12 +81,12 @@ public static function from($from)
 			$class->implements = array_diff($class->implements, $from->getParentClass()->getInterfaceNames());
 		}
 		foreach ($from->getProperties() as $prop) {
-			if ($prop->getDeclaringClass() == $from) { // intentionally ==
+			if ($prop->getDeclaringClass()->getName() === $from->getName()) {
 				$class->properties[$prop->getName()] = Property::from($prop);
 			}
 		}
 		foreach ($from->getMethods() as $method) {
-			if ($method->getDeclaringClass() == $from) { // intentionally ==
+			if ($method->getDeclaringClass()->getName() === $from->getName()) {
 				$class->methods[$method->getName()] = Method::from($method)->setNamespace($class->namespace);
 			}
 		}

tests/PhpGenerator/ClassType.from.expect

@@ -57,4 +57,10 @@ class Class2 extends Class1 implements Interface2
 	{
 	}
 
-}
+}
+
+class Class3
+{
+	public $prop1;
+
+}

tests/PhpGenerator/ClassType.from.phpt

@@ -7,7 +7,6 @@
 namespace Abc;
 
 use Nette\PhpGenerator\ClassType;
-use ReflectionClass;
 use Tester\Assert;
 
 
@@ -62,10 +61,17 @@ class Class2 extends Class1 implements Interface2
 	{}
 }
 
+class Class3
+{
+	public $prop1;
+}
 
 $res[] = ClassType::from('Abc\Interface1');
 $res[] = ClassType::from('Abc\Interface2');
 $res[] = ClassType::from('Abc\Class1');
-$res[] = ClassType::from(new ReflectionClass('Abc\Class2'));
+$res[] = ClassType::from(new \ReflectionClass('Abc\Class2'));
+$obj = new Class3;
+$obj->prop2 = 1;
+$res[] = ClassType::from(new \ReflectionObject($obj));
 
 Assert::matchFile(__DIR__ . '/ClassType.from.expect', implode("\n", $res));