@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | * |
32 | 32 | * @return bool|string |
33 | 33 | */ |
34 | - public static function getClassFromDocComment($comment, $includeNamespaces = true, $reflectionClass = null) |
|
34 | + public static function getClassFromDocComment($comment, $includeNamespaces = TRUE, $reflectionClass = NULL) |
|
35 | 35 | { |
36 | 36 | if (preg_match('~\@var[\s]+([A-Za-z0-9\\\\]+)~', $comment, $matches)) { |
37 | 37 | if ($includeNamespaces) { |
@@ -49,6 +49,6 @@ discard block |
||
49 | 49 | } |
50 | 50 | } |
51 | 51 | |
52 | - return false; |
|
52 | + return FALSE; |
|
53 | 53 | } |
54 | 54 | } |
55 | 55 | \ No newline at end of file |
@@ -77,16 +77,16 @@ discard block |
||
77 | 77 | && $reflectionProperty = $reflection->getProperty($propertyName) |
78 | 78 | ) { |
79 | 79 | // Get the expected property class from the property's DocBlock |
80 | - if ($propertyClassName = ReflectionTrait::getClassFromDocComment($reflectionProperty->getDocComment(), true, |
|
80 | + if ($propertyClassName = ReflectionTrait::getClassFromDocComment($reflectionProperty->getDocComment(), TRUE, |
|
81 | 81 | $reflection) |
82 | 82 | ) { |
83 | 83 | |
84 | 84 | // Set argument for constructor (if any), in case we're dealing with an object (IE: DateTime) |
85 | 85 | $this->objectConstructorArguments = (in_array($propertyClassName, $this->giveDataInConstructor)) |
86 | - ? $itemValue : null; |
|
86 | + ? $itemValue : NULL; |
|
87 | 87 | |
88 | 88 | if (in_array($propertyClassName, self::$nonObjectTypes)) { |
89 | - $this->setPropertyValue($propertyName, $itemValue, true); |
|
89 | + $this->setPropertyValue($propertyName, $itemValue, TRUE); |
|
90 | 90 | } elseif(interface_exists($propertyClassName)) { |
91 | 91 | // We cannot instantiate an interface, so we skip it |
92 | 92 | continue; |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | |
96 | 96 | // Check if $object has valid values |
97 | 97 | // IE: DateTime with a negative timestamp will cause a SQL Error |
98 | - $this->checkObjectForErrors($object, true); |
|
98 | + $this->checkObjectForErrors($object, TRUE); |
|
99 | 99 | |
100 | 100 | if ($object) { |
101 | 101 | if ( |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | $object->fromClass($itemValue); |
106 | 106 | } |
107 | 107 | // We're done. Assign the result to the propery of $this |
108 | - $this->setPropertyValue($propertyName, $object, true); |
|
108 | + $this->setPropertyValue($propertyName, $object, TRUE); |
|
109 | 109 | } |
110 | 110 | } |
111 | 111 | unset($object); |
@@ -123,13 +123,13 @@ discard block |
||
123 | 123 | * @param bool $fix Fix errors |
124 | 124 | * @return void |
125 | 125 | */ |
126 | - private function checkObjectForErrors(&$object, $fix = false) |
|
126 | + private function checkObjectForErrors(&$object, $fix = FALSE) |
|
127 | 127 | { |
128 | 128 | if ($object instanceof \DateTime) { |
129 | 129 | // The constructor (passed from the API) is NULL, indicating an empty value |
130 | 130 | // PHP DateTime's default value is now() |
131 | - if ($this->objectConstructorArguments == null) { |
|
132 | - $object = null; |
|
131 | + if ($this->objectConstructorArguments == NULL) { |
|
132 | + $object = NULL; |
|
133 | 133 | } else { |
134 | 134 | if (!$object->getTimestamp()) { |
135 | 135 | // DateTime has a negative or false value |