@@ -62,7 +62,7 @@ |
||
| 62 | 62 | */ |
| 63 | 63 | public function getPropertyValue($key) { |
| 64 | 64 | $methodName = 'get' . $this->getMethodName($key); |
| 65 | - if(method_exists($this, $methodName)) { |
|
| 65 | + if (method_exists($this, $methodName)) { |
|
| 66 | 66 | return $this->{$methodName}(); |
| 67 | 67 | } |
| 68 | 68 | return false; |
@@ -60,7 +60,8 @@ |
||
| 60 | 60 | * @param $key |
| 61 | 61 | * @return mixed |
| 62 | 62 | */ |
| 63 | - public function getPropertyValue($key) { |
|
| 63 | + public function getPropertyValue($key) |
|
| 64 | + { |
|
| 64 | 65 | $methodName = 'get' . $this->getMethodName($key); |
| 65 | 66 | if(method_exists($this, $methodName)) { |
| 66 | 67 | return $this->{$methodName}(); |
@@ -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 | - return ($reflectionClass->getNamespaceName()) ? sprintf('\%s\%s', $reflectionClass->getNamespaceName(), $matches[1]) : sprintf('\%s', $matches[1]); |
|
| 39 | + return ($reflectionClass->getNamespaceName()) ? sprintf('\%s\%s', $reflectionClass->getNamespaceName(), $matches[1]) : sprintf('\%s', $matches[1]); |
|
| 40 | 40 | } |
| 41 | 41 | return $matches[1]; |
| 42 | 42 | } |
@@ -121,9 +121,7 @@ |
||
| 121 | 121 | { |
| 122 | 122 | $propertyName = lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', $key)))); |
| 123 | 123 | |
| 124 | - return (property_exists($this, $propertyName)) ? $propertyName : |
|
| 125 | - (property_exists($this, lcfirst($propertyName)) ? lcfirst($propertyName) : |
|
| 126 | - preg_replace_callback('/([A-Z])/', function($match) { |
|
| 124 | + return (property_exists($this, $propertyName)) ? $propertyName : (property_exists($this, lcfirst($propertyName)) ? lcfirst($propertyName) : preg_replace_callback('/([A-Z])/', function ($match) { |
|
| 127 | 125 | return strtolower('_' . $match[1]); |
| 128 | 126 | }, lcfirst($propertyName)) |
| 129 | 127 | ); |
@@ -69,7 +69,8 @@ discard block |
||
| 69 | 69 | // Convert key to a propertyname in $this |
| 70 | 70 | try { |
| 71 | 71 | $this->hydrateProperty($itemKey, $itemValue, $reflection); |
| 72 | - } catch (\Exception $e) { |
|
| 72 | + } |
|
| 73 | + catch (\Exception $e) { |
|
| 73 | 74 | if ($failOnError) { |
| 74 | 75 | throw $e; |
| 75 | 76 | } |
@@ -113,7 +114,8 @@ discard block |
||
| 113 | 114 | } |
| 114 | 115 | |
| 115 | 116 | $this->setPropertyValue($propertyName, $value, true); |
| 116 | - } catch (\Exception $e) { |
|
| 117 | + } |
|
| 118 | + catch (\Exception $e) { |
|
| 117 | 119 | throw $e; |
| 118 | 120 | } |
| 119 | 121 | } |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | * @param object|array $class class |
| 55 | 55 | * @param boolean $failOnError Throw Exception if any error(s) occur |
| 56 | 56 | * |
| 57 | - * @return object |
|
| 57 | + * @return HydratableTrait |
|
| 58 | 58 | * |
| 59 | 59 | * @throws \Exception if hydration failes AND $failOnError is true |
| 60 | 60 | */ |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | * |
| 122 | 122 | * @param $key |
| 123 | 123 | * |
| 124 | - * @return mixed|string |
|
| 124 | + * @return string |
|
| 125 | 125 | */ |
| 126 | 126 | private function resolvePropertyName($key) |
| 127 | 127 | { |