* Fix if is_sub_class

* Refactor because of https://bugs.php.net/bug.php?id=61384

Author: pmaselkowski

Maslosoft/Addendum/Addendum.php

@@ -231,8 +231,10 @@ private static function getDeclaredAnnotations()
 			self::$_annotations = array();
 			foreach(get_declared_classes() as $class)
 			{
-				if(is_subclass_of($class, 'EAnnotation') || $class == 'EAnnotation')
+				if(is_subclass_of($class, Annotation::class) || $class == Annotation::class)
+				{
 					self::$_annotations[] = $class;
+				}
 			}
 		}
 		return self::$_annotations;

Maslosoft/Addendum/Annotation.php

@@ -45,7 +45,7 @@ abstract class Annotation extends CComponent
 	public function __construct($data = [], $target = false)
 	{
 		$reflection = new ReflectionClass($this);
-		$class = $reflection->getName();
+		$class = $reflection->name;
 		if (isset(self::$_creationStack[$class]))
 		{
 			trigger_error("Circular annotation reference on '$class'", E_USER_ERROR);
@@ -128,15 +128,15 @@ private function createName($target)
 	{
 		if ($target instanceof ReflectionMethod)
 		{
-			return $target->getDeclaringClass()->getName() . '::' . $target->getName();
+			return $target->getDeclaringClass()->name . '::' . $target->name;
 		}
 		elseif ($target instanceof ReflectionProperty)
 		{
-			return $target->getDeclaringClass()->getName() . '::$' . $target->getName();
+			return $target->getDeclaringClass()->name . '::$' . $target->name;
 		}
 		else
 		{
-			return $target->getName();
+			return $target->name;
 		}
 	}
 

Maslosoft/Addendum/Builder/Builder.php

@@ -85,15 +85,15 @@ private function createName($target)
 	{
 		if($target instanceof ReflectionMethod)
 		{
-			return $target->getDeclaringClass()->getName() . '::' . $target->getName();
+			return $target->getDeclaringClass()->name . '::' . $target->name;
 		}
 		elseif($target instanceof ReflectionProperty)
 		{
-			return $target->getDeclaringClass()->getName() . '::$' . $target->getName();
+			return $target->getDeclaringClass()->name . '::$' . $target->name;
 		}
 		else
 		{
-			return $target->getName();
+			return $target->name;
 		}
 	}
 

Maslosoft/Addendum/Reflection/ReflectionAnnotatedClass.php

@@ -92,16 +92,16 @@ protected function createAnnotationBuilder()
 
 	private function createReflectionAnnotatedClass($class)
 	{
-		return ($class !== false) ? new ReflectionAnnotatedClass($class->getName()) : false;
+		return ($class !== false) ? new ReflectionAnnotatedClass($class->name) : false;
 	}
 
 	private function createReflectionAnnotatedMethod($method)
 	{
-		return ($method !== null) ? new ReflectionAnnotatedMethod($this->getName(), $method->getName()) : null;
+		return ($method !== null) ? new ReflectionAnnotatedMethod($this->name, $method->name) : null;
 	}
 
 	private function createReflectionAnnotatedProperty($property)
 	{
-		return ($property !== null) ? new ReflectionAnnotatedProperty($this->getName(), $property->getName()) : null;
+		return ($property !== null) ? new ReflectionAnnotatedProperty($this->name, $property->name) : null;
 	}
 }

Maslosoft/Addendum/Reflection/ReflectionAnnotatedMethod.php

@@ -36,7 +36,7 @@ public function getAllAnnotations($restriction = false)
 	public function getDeclaringClass()
 	{
 		$class = parent::getDeclaringClass();
-		return new ReflectionAnnotatedClass($class->getName());
+		return new ReflectionAnnotatedClass($class->name);
 	}
 
 	protected function createAnnotationBuilder()

Maslosoft/Addendum/Reflection/ReflectionAnnotatedProperty.php

@@ -42,7 +42,7 @@ public function getAllAnnotations($restriction = false)
 	public function getDeclaringClass()
 	{
 		$class = parent::getDeclaringClass();
-		return new ReflectionAnnotatedClass($class->getName());
+		return new ReflectionAnnotatedClass($class->name);
 	}
 
 	/**