@@ -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 | ( |
@@ -29,7 +29,6 @@ discard block |
||
29 | 29 | |
30 | 30 | /** |
31 | 31 | * @param object $object The object to access |
32 | - * @param ReflectionModel|null $reflect A reflection entity |
|
33 | 32 | */ |
34 | 33 | public function __construct($object) |
35 | 34 | { |
@@ -61,7 +60,7 @@ discard block |
||
61 | 60 | * permissions |
62 | 61 | * |
63 | 62 | * @param string $key The property to read |
64 | - * @return mixed The property's value |
|
63 | + * @return \Reflector The property's value |
|
65 | 64 | * @throws CannotReadPropertyException In the event the property |
66 | 65 | * does not exist |
67 | 66 | */ |
@@ -80,7 +79,7 @@ discard block |
||
80 | 79 | * Adds a value to a property, irrespective of access permissions |
81 | 80 | * |
82 | 81 | * @param string $key The property to write to |
83 | - * @param mixed $value The value to add |
|
82 | + * @param \Spaark\CompositeUtils\Model\Reflection\Reflector $value The value to add |
|
84 | 83 | * @throws CannotWritePropertyException In the event the property |
85 | 84 | * does not exist |
86 | 85 | */ |
@@ -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 | { |
@@ -103,6 +103,10 @@ |
||
103 | 103 | } |
104 | 104 | } |
105 | 105 | |
106 | + /** |
|
107 | + * @param string $name |
|
108 | + * @param \Closure $cast |
|
109 | + */ |
|
106 | 110 | private function setScalarValue($property, $value, $name, $cast) |
107 | 111 | { |
108 | 112 | $method = '__to' . $name; |
@@ -47,8 +47,7 @@ discard block |
||
47 | 47 | if (is_null($value)) |
48 | 48 | { |
49 | 49 | $this->setNullValue($property, $type); |
50 | - } |
|
51 | - else |
|
50 | + } else |
|
52 | 51 | { |
53 | 52 | $this->setNonNullValue($property, $value, $type); |
54 | 53 | } |
@@ -59,8 +58,7 @@ discard block |
||
59 | 58 | if ($type->nullable) |
60 | 59 | { |
61 | 60 | $this->setRawValue($property, null); |
62 | - } |
|
63 | - else |
|
61 | + } else |
|
64 | 62 | { |
65 | 63 | $this->throwError($property, 'NonNull', null); |
66 | 64 | } |
@@ -110,8 +108,7 @@ discard block |
||
110 | 108 | if (is_scalar($value)) |
111 | 109 | { |
112 | 110 | $this->setRawValue($property, $cast($value)); |
113 | - } |
|
114 | - elseif (is_object($value) && method_exists([$value, $method])) |
|
111 | + } elseif (is_object($value) && method_exists([$value, $method])) |
|
115 | 112 | { |
116 | 113 | $this->setScalarValue |
117 | 114 | ( |
@@ -120,8 +117,7 @@ discard block |
||
120 | 117 | $method, |
121 | 118 | $cast |
122 | 119 | ); |
123 | - } |
|
124 | - else |
|
120 | + } else |
|
125 | 121 | { |
126 | 122 | $this->throwError($property, $name, $value); |
127 | 123 | } |
@@ -132,8 +128,7 @@ discard block |
||
132 | 128 | if (is_a($value, $type->classname)) |
133 | 129 | { |
134 | 130 | $this->setRawValue($property, $value); |
135 | - } |
|
136 | - else |
|
131 | + } else |
|
137 | 132 | { |
138 | 133 | $this->throwError($property, $type->classname, $value); |
139 | 134 | } |
@@ -144,8 +139,7 @@ discard block |
||
144 | 139 | if (is_a($value, \ArrayAccess::class) || is_array($value)) |
145 | 140 | { |
146 | 141 | $this->setRawValue($property, $value); |
147 | - } |
|
148 | - else |
|
142 | + } else |
|
149 | 143 | { |
150 | 144 | $this->throwError($property, 'Collection', $value); |
151 | 145 | } |