@@ -52,8 +52,7 @@ discard block |
||
| 52 | 52 | if ($value{0} !== '?') |
| 53 | 53 | { |
| 54 | 54 | $nullable = false; |
| 55 | - } |
|
| 56 | - else |
|
| 55 | + } else |
|
| 57 | 56 | { |
| 58 | 57 | $nullable = true; |
| 59 | 58 | $value = substr($value, 1); |
@@ -62,8 +61,7 @@ discard block |
||
| 62 | 61 | if (substr($value, -2) !== '[]') |
| 63 | 62 | { |
| 64 | 63 | $collection = false; |
| 65 | - } |
|
| 66 | - else |
|
| 64 | + } else |
|
| 67 | 65 | { |
| 68 | 66 | $collection = true; |
| 69 | 67 | $value = substr($value, 0, -2); |
@@ -23,8 +23,7 @@ |
||
| 23 | 23 | if ($this->locked) |
| 24 | 24 | { |
| 25 | 25 | return parent::__set($var, $val); |
| 26 | - } |
|
| 27 | - else |
|
| 26 | + } else |
|
| 28 | 27 | { |
| 29 | 28 | $this->$var = $val; |
| 30 | 29 | } |
@@ -43,7 +43,9 @@ |
||
| 43 | 43 | */ |
| 44 | 44 | public function popMultiple($i = 1) |
| 45 | 45 | { |
| 46 | - if ($i < 1) return NULL; |
|
| 46 | + if ($i < 1) { |
|
| 47 | + return NULL; |
|
| 48 | + } |
|
| 47 | 49 | |
| 48 | 50 | $ret = array_slice($this->data, -1 * $i); |
| 49 | 51 | $this->data = array_slice($this->data, 0, -1 * $i); |
@@ -110,8 +110,7 @@ |
||
| 110 | 110 | $prop->setAccessible(true); |
| 111 | 111 | |
| 112 | 112 | return $prop; |
| 113 | - } |
|
| 114 | - catch (ReflectionException $e) |
|
| 113 | + } catch (ReflectionException $e) |
|
| 115 | 114 | { |
| 116 | 115 | throw new $class |
| 117 | 116 | ( |
@@ -93,8 +93,7 @@ discard block |
||
| 93 | 93 | { |
| 94 | 94 | $as .= $token[1]; |
| 95 | 95 | } |
| 96 | - } |
|
| 97 | - elseif ($matching) |
|
| 96 | + } elseif ($matching) |
|
| 98 | 97 | { |
| 99 | 98 | switch ($token[0]) |
| 100 | 99 | { |
@@ -105,8 +104,7 @@ discard block |
||
| 105 | 104 | case T_AS: |
| 106 | 105 | $matching = T_AS; |
| 107 | 106 | } |
| 108 | - } |
|
| 109 | - else |
|
| 107 | + } else |
|
| 110 | 108 | { |
| 111 | 109 | switch ($token[0]) |
| 112 | 110 | { |
@@ -54,8 +54,7 @@ discard block |
||
| 54 | 54 | if (is_null($value)) |
| 55 | 55 | { |
| 56 | 56 | $this->setNullValue($property->name, $property->type); |
| 57 | - } |
|
| 58 | - else |
|
| 57 | + } else |
|
| 59 | 58 | { |
| 60 | 59 | $this->setNonNullValue |
| 61 | 60 | ( |
@@ -71,8 +70,7 @@ discard block |
||
| 71 | 70 | if ($type->nullable) |
| 72 | 71 | { |
| 73 | 72 | $this->setRawValue($property, null); |
| 74 | - } |
|
| 75 | - else |
|
| 73 | + } else |
|
| 76 | 74 | { |
| 77 | 75 | $this->throwError($property, 'NonNull', null); |
| 78 | 76 | } |
@@ -122,8 +120,7 @@ discard block |
||
| 122 | 120 | if (is_scalar($value)) |
| 123 | 121 | { |
| 124 | 122 | $this->setRawValue($property, $cast($value)); |
| 125 | - } |
|
| 126 | - elseif (is_object($value) && method_exists([$value, $method])) |
|
| 123 | + } elseif (is_object($value) && method_exists([$value, $method])) |
|
| 127 | 124 | { |
| 128 | 125 | $this->setScalarValue |
| 129 | 126 | ( |
@@ -132,8 +129,7 @@ discard block |
||
| 132 | 129 | $method, |
| 133 | 130 | $cast |
| 134 | 131 | ); |
| 135 | - } |
|
| 136 | - else |
|
| 132 | + } else |
|
| 137 | 133 | { |
| 138 | 134 | $this->throwError($property, $name, $value); |
| 139 | 135 | } |
@@ -144,8 +140,7 @@ discard block |
||
| 144 | 140 | if (is_a($value, $type->classname)) |
| 145 | 141 | { |
| 146 | 142 | $this->setRawValue($property, $value); |
| 147 | - } |
|
| 148 | - else |
|
| 143 | + } else |
|
| 149 | 144 | { |
| 150 | 145 | $this->throwError($property, $type->classname, $value); |
| 151 | 146 | } |
@@ -156,8 +151,7 @@ discard block |
||
| 156 | 151 | if (is_a($value, \ArrayAccess::class) || is_array($value)) |
| 157 | 152 | { |
| 158 | 153 | $this->setRawValue($property, $value); |
| 159 | - } |
|
| 160 | - else |
|
| 154 | + } else |
|
| 161 | 155 | { |
| 162 | 156 | $this->throwError($property, 'Collection', $value); |
| 163 | 157 | } |
@@ -32,6 +32,9 @@ discard block |
||
| 32 | 32 | */ |
| 33 | 33 | protected $reflect; |
| 34 | 34 | |
| 35 | + /** |
|
| 36 | + * @param \Spaark\CompositeUtils\Traits\PropertyAccessTrait $object |
|
| 37 | + */ |
|
| 35 | 38 | public function __construct($object, ReflectionComposite $reflect) |
| 36 | 39 | { |
| 37 | 40 | parent::__construct($object); |
@@ -127,6 +130,10 @@ discard block |
||
| 127 | 130 | } |
| 128 | 131 | } |
| 129 | 132 | |
| 133 | + /** |
|
| 134 | + * @param string $name |
|
| 135 | + * @param \Closure $cast |
|
| 136 | + */ |
|
| 130 | 137 | private function setScalarValue($property, $value, $name, $cast) |
| 131 | 138 | { |
| 132 | 139 | $method = '__to' . $name; |
@@ -12,8 +12,7 @@ discard block |
||
| 12 | 12 | if ($property->writable) |
| 13 | 13 | { |
| 14 | 14 | parent::setAnyValue($property, $value); |
| 15 | - } |
|
| 16 | - else |
|
| 15 | + } else |
|
| 17 | 16 | { |
| 18 | 17 | throw new PropertyNotWritableException |
| 19 | 18 | ( |
@@ -32,8 +31,7 @@ discard block |
||
| 32 | 31 | get_class($this->object), |
| 33 | 32 | $property |
| 34 | 33 | ); |
| 35 | - } |
|
| 36 | - elseif (!$this->reflect->properties[$property]->readable) |
|
| 34 | + } elseif (!$this->reflect->properties[$property]->readable) |
|
| 37 | 35 | { |
| 38 | 36 | throw new PropertyNotReadableException |
| 39 | 37 | ( |