>> Refactor

pmaselkowski · pmaselkowski · commit fe042a59f8b6 · 2014-12-03T16:07:34.000+01:00
diff --git a/Maslosoft/Addendum/Builder/Builder.php b/Maslosoft/Addendum/Builder/Builder.php
@@ -60,10 +60,10 @@ public function instantiateAnnotation($class, $parameters, $targetReflection = f
 			Addendum::ignore($class);
 			return false;
 		}
-		$class = Addendum::resolveClassName($class);
-		if(is_subclass_of($class, Annotation::class) || $class == Annotation::class)
+		$resolvedClass = Addendum::resolveClassName($class);
+		if(is_subclass_of($resolvedClass, Annotation::class) || $resolvedClass == Annotation::class)
 		{
-			$annotationReflection = new ReflectionClass($class);
+			$annotationReflection = new ReflectionClass($resolvedClass);
 			return $annotationReflection->newInstance($parameters, $targetReflection);
 		}
 		return false;

Original file line number	Diff line number	Diff line change
`@@ -60,10 +60,10 @@ public function instantiateAnnotation($class, $parameters, $targetReflection = f`
`60`	`60`	`Addendum::ignore($class);`
`61`	`61`	`return false;`
`62`	`62`	`}`
`63`		`- $class = Addendum::resolveClassName($class);`
`64`		`- if(is_subclass_of($class, Annotation::class) \|\| $class == Annotation::class)`
	`63`	`+ $resolvedClass = Addendum::resolveClassName($class);`
	`64`	`+ if(is_subclass_of($resolvedClass, Annotation::class) \|\| $resolvedClass == Annotation::class)`
`65`	`65`	`{`
`66`		`- $annotationReflection = new ReflectionClass($class);`
	`66`	`+ $annotationReflection = new ReflectionClass($resolvedClass);`
`67`	`67`	`return $annotationReflection->newInstance($parameters, $targetReflection);`
`68`	`68`	`}`
`69`	`69`	`return false;`