Changed some enums that had reserved keys as name

runz0rd · Mar 7, 2017 · e43d89a · e43d89a
1 parent 586146a
commit e43d89a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/Common/ModelReflection/Enum/AnnotationEnum.php b/src/Common/ModelReflection/Enum/AnnotationEnum.php
@@ -9,7 +9,7 @@
 namespace Common\ModelReflection\Enum;
 
 class AnnotationEnum {
-    const VAR = 'var';
+    const VARIABLE = 'var';
     const NAME = 'name';
     const REQUIRED = 'required';
     const RULE = 'rule';

diff --git a/src/Common/ModelReflection/Enum/TypeEnum.php b/src/Common/ModelReflection/Enum/TypeEnum.php
@@ -15,6 +15,6 @@ class TypeEnum {
     const INTEGER = 'integer';
     const DOUBLE = 'double';
     const STRING = 'string';
-    const ARRAY = 'array';
+    const ARR = 'array';
     const OBJECT = 'object';
 }
diff --git a/src/Common/ModelReflection/ModelProperty.php b/src/Common/ModelReflection/ModelProperty.php
@@ -78,8 +78,8 @@ public function __construct(\ReflectionProperty $property, $parent, $parentNS) {
 
 		$propertyType = gettype($this->property->getValue($parent));
 		$annotatedType = TypeEnum::ANY;
-		if($this->docBlock->hasAnnotation(AnnotationEnum::VAR) && !Validation::isEmpty($this->docBlock->getFirstAnnotation(AnnotationEnum::VAR))) {
-			$annotatedType = $this->docBlock->getFirstAnnotation(AnnotationEnum::VAR);
+		if($this->docBlock->hasAnnotation(AnnotationEnum::VARIABLE) && !Validation::isEmpty($this->docBlock->getFirstAnnotation(AnnotationEnum::VARIABLE))) {
+			$annotatedType = $this->docBlock->getFirstAnnotation(AnnotationEnum::VARIABLE);
 		}
 		$this->type = new ModelPropertyType($propertyType, $annotatedType, $parentNS);
 
@@ -91,7 +91,7 @@ public function __construct(\ReflectionProperty $property, $parent, $parentNS) {
 		}
 	}
 
-	/**
+	/**::
 	 * @param mixed $value
 	 */
 	public function setPropertyValue($value) {

diff --git a/src/Common/ModelReflection/ModelPropertyType.php b/src/Common/ModelReflection/ModelPropertyType.php
@@ -54,7 +54,7 @@ public function __construct($propertyType, $annotatedType, $parentNS) {
 			$this->actualType = TypeEnum::OBJECT;
 		}
 		if(strpos($this->annotatedType, '[]') !== false) {
-			$this->actualType = TypeEnum::ARRAY;
+			$this->actualType = TypeEnum::ARR;
 		}
 	}