@@ -13,11 +13,11 @@ discard block |
||
13 | 13 | { |
14 | 14 | public function getClassFromClassProperty($class, $property) |
15 | 15 | { |
16 | - if(!class_exists($class)) { |
|
17 | - throw new \Exception($class. ' not found or does not exist'); |
|
16 | + if (!class_exists($class)) { |
|
17 | + throw new \Exception($class . ' not found or does not exist'); |
|
18 | 18 | } |
19 | 19 | |
20 | - if(!property_exists($class, $property)) { |
|
20 | + if (!property_exists($class, $property)) { |
|
21 | 21 | throw new \Exception($class . ' has no property with the name ' . $property); |
22 | 22 | } |
23 | 23 | } |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | if (preg_match('~\@var[\s]+([A-Za-z0-9\\\\]+)~', $comment, $matches)) { |
37 | 37 | if ($includeNamespaces) { |
38 | 38 | if ($reflectionClass instanceof \ReflectionClass && !in_array($matches[1], HydratableTrait::$nonObjectTypes)) { |
39 | - if($reflectionClass->getNamespaceName()) { |
|
39 | + if ($reflectionClass->getNamespaceName()) { |
|
40 | 40 | return sprintf('\%s\%s', $reflectionClass->getNamespaceName(), $matches[1]); |
41 | 41 | } else { |
42 | 42 | return sprintf('\%s', $matches[1]); |
@@ -11,8 +11,7 @@ discard block |
||
11 | 11 | */ |
12 | 12 | trait ReflectionTrait |
13 | 13 | { |
14 | - public function getClassFromClassProperty($class, $property) |
|
15 | - { |
|
14 | + public function getClassFromClassProperty($class, $property) { |
|
16 | 15 | if(!class_exists($class)) { |
17 | 16 | throw new \Exception($class. ' not found or does not exist'); |
18 | 17 | } |
@@ -31,8 +30,7 @@ discard block |
||
31 | 30 | * |
32 | 31 | * @return bool|string |
33 | 32 | */ |
34 | - public static function getClassFromDocComment($comment, $includeNamespaces = true, $reflectionClass = null) |
|
35 | - { |
|
33 | + public static function getClassFromDocComment($comment, $includeNamespaces = true, $reflectionClass = null) { |
|
36 | 34 | if (preg_match('~\@var[\s]+([A-Za-z0-9\\\\]+)~', $comment, $matches)) { |
37 | 35 | if ($includeNamespaces) { |
38 | 36 | if ($reflectionClass instanceof \ReflectionClass && !in_array($matches[1], HydratableTrait::$nonObjectTypes)) { |
@@ -64,9 +64,7 @@ discard block |
||
64 | 64 | |
65 | 65 | // Convert key to a propertyname in $this |
66 | 66 | $propertyName = lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', $itemKey)))); |
67 | - $propertyName = (property_exists($this, $propertyName)) ? $propertyName : |
|
68 | - (property_exists($this, lcfirst($propertyName)) ? lcfirst($propertyName) : |
|
69 | - preg_replace_callback('/([A-Z])/', function ($match) { |
|
67 | + $propertyName = (property_exists($this, $propertyName)) ? $propertyName : (property_exists($this, lcfirst($propertyName)) ? lcfirst($propertyName) : preg_replace_callback('/([A-Z])/', function ($match) { |
|
70 | 68 | return strtolower('_' . $match[1]); |
71 | 69 | }, lcfirst($propertyName)) |
72 | 70 | ); |
@@ -87,7 +85,7 @@ discard block |
||
87 | 85 | |
88 | 86 | if (in_array($propertyClassName, self::$nonObjectTypes)) { |
89 | 87 | $this->setPropertyValue($propertyName, $itemValue, true); |
90 | - } elseif(interface_exists($propertyClassName)) { |
|
88 | + } elseif (interface_exists($propertyClassName)) { |
|
91 | 89 | // We cannot instantiate an interface, so we skip it |
92 | 90 | continue; |
93 | 91 | } else { |
@@ -54,8 +54,7 @@ discard block |
||
54 | 54 | * @param object|array $class class |
55 | 55 | * @return object |
56 | 56 | */ |
57 | - public function hydrateClass($class) |
|
58 | - { |
|
57 | + public function hydrateClass($class) { |
|
59 | 58 | $reflection = new \ReflectionClass($this); |
60 | 59 | |
61 | 60 | // Iterate over $class for properties |
@@ -123,8 +122,7 @@ discard block |
||
123 | 122 | * @param bool $fix Fix errors |
124 | 123 | * @return void |
125 | 124 | */ |
126 | - private function checkObjectForErrors(&$object, $fix = false) |
|
127 | - { |
|
125 | + private function checkObjectForErrors(&$object, $fix = false) { |
|
128 | 126 | if ($object instanceof \DateTime) { |
129 | 127 | // The constructor (passed from the API) is NULL, indicating an empty value |
130 | 128 | // PHP DateTime's default value is now() |