@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | |
15 | 15 | use ArrayIterator, ArrayObject, RecursiveArrayIterator, RecursiveIteratorIterator, Traversable; |
16 | 16 | |
17 | -trait SearchableArray{ |
|
17 | +trait SearchableArray { |
|
18 | 18 | use DotArray; |
19 | 19 | |
20 | 20 | /** |
@@ -27,19 +27,19 @@ discard block |
||
27 | 27 | * |
28 | 28 | * @param array|object|\Traversable|\ArrayIterator|\ArrayObject|null $array |
29 | 29 | */ |
30 | - public function __construct($array = null){ |
|
30 | + public function __construct($array = null) { |
|
31 | 31 | |
32 | - if(($array instanceof ArrayObject) || ($array instanceof ArrayIterator)){ |
|
32 | + if (($array instanceof ArrayObject) || ($array instanceof ArrayIterator)) { |
|
33 | 33 | $this->array = $array->getArrayCopy(); |
34 | 34 | } |
35 | - elseif($array instanceof Traversable){ |
|
35 | + elseif ($array instanceof Traversable) { |
|
36 | 36 | $this->array = iterator_to_array($array); |
37 | 37 | } |
38 | 38 | // yields unexpected results with DotArray |
39 | - elseif(gettype($array) === 'object'){ |
|
39 | + elseif (gettype($array) === 'object') { |
|
40 | 40 | $this->array = get_object_vars($array); |
41 | 41 | } |
42 | - elseif(is_array($array)){ |
|
42 | + elseif (is_array($array)) { |
|
43 | 43 | $this->array = $array; |
44 | 44 | } |
45 | 45 | |
@@ -54,11 +54,11 @@ discard block |
||
54 | 54 | * |
55 | 55 | * @return mixed |
56 | 56 | */ |
57 | - public function searchByKey(string $dotKey){ |
|
57 | + public function searchByKey(string $dotKey) { |
|
58 | 58 | |
59 | - foreach($this->iterator as $v){ |
|
59 | + foreach ($this->iterator as $v) { |
|
60 | 60 | |
61 | - if($this->getPath() === $dotKey){ |
|
61 | + if ($this->getPath() === $dotKey) { |
|
62 | 62 | return $v; |
63 | 63 | } |
64 | 64 | |
@@ -71,9 +71,9 @@ discard block |
||
71 | 71 | |
72 | 72 | $matches = []; |
73 | 73 | |
74 | - foreach($this->iterator as $v){ |
|
74 | + foreach ($this->iterator as $v) { |
|
75 | 75 | |
76 | - if($v === $value){ |
|
76 | + if ($v === $value) { |
|
77 | 77 | $matches[$this->getPath()] = $value; |
78 | 78 | } |
79 | 79 | |
@@ -89,9 +89,9 @@ discard block |
||
89 | 89 | */ |
90 | 90 | public function isset(string $dotKey):bool{ |
91 | 91 | |
92 | - foreach($this->iterator as $v){ |
|
92 | + foreach ($this->iterator as $v) { |
|
93 | 93 | |
94 | - if($this->getPath() === $dotKey){ |
|
94 | + if ($this->getPath() === $dotKey) { |
|
95 | 95 | return true; |
96 | 96 | } |
97 | 97 |
@@ -31,15 +31,13 @@ |
||
31 | 31 | |
32 | 32 | if(($array instanceof ArrayObject) || ($array instanceof ArrayIterator)){ |
33 | 33 | $this->array = $array->getArrayCopy(); |
34 | - } |
|
35 | - elseif($array instanceof Traversable){ |
|
34 | + } elseif($array instanceof Traversable){ |
|
36 | 35 | $this->array = iterator_to_array($array); |
37 | 36 | } |
38 | 37 | // yields unexpected results with DotArray |
39 | 38 | elseif(gettype($array) === 'object'){ |
40 | 39 | $this->array = get_object_vars($array); |
41 | - } |
|
42 | - elseif(is_array($array)){ |
|
40 | + } elseif(is_array($array)){ |
|
43 | 41 | $this->array = $array; |
44 | 42 | } |
45 | 43 |
@@ -94,7 +94,7 @@ |
||
94 | 94 | */ |
95 | 95 | public function __isset(string $property):bool{ |
96 | 96 | return (isset($this->{$property}) && !$this->__isPrivate($property)) |
97 | - || (property_exists($this, 'env') && $this->env instanceof DotEnv && $this->env->get($property)); |
|
97 | + || (property_exists($this, 'env') && $this->env instanceof DotEnv && $this->env->get($property)); |
|
98 | 98 | } |
99 | 99 | |
100 | 100 | /** |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | /** |
18 | 18 | * a generic container with magic getter and setter |
19 | 19 | */ |
20 | -trait Container{ |
|
20 | +trait Container { |
|
21 | 21 | |
22 | 22 | /** |
23 | 23 | * @var \chillerlan\Traits\DotEnv|null |
@@ -28,10 +28,10 @@ discard block |
||
28 | 28 | * @param iterable $properties |
29 | 29 | * @param \chillerlan\Traits\DotEnv|null $env |
30 | 30 | */ |
31 | - public function __construct(array $properties = null, DotEnv $env = null){ |
|
31 | + public function __construct(array $properties = null, DotEnv $env = null) { |
|
32 | 32 | $this->env = $env; |
33 | 33 | |
34 | - if(!empty($properties)){ |
|
34 | + if (!empty($properties)) { |
|
35 | 35 | $this->__fromIterable($properties); |
36 | 36 | } |
37 | 37 | |
@@ -42,18 +42,18 @@ discard block |
||
42 | 42 | * |
43 | 43 | * @return mixed |
44 | 44 | */ |
45 | - public function __get(string $property){ |
|
45 | + public function __get(string $property) { |
|
46 | 46 | |
47 | 47 | |
48 | 48 | # if(method_exists($this, 'get_'.$property) && $this->__isset($property)){ |
49 | 49 | # return call_user_func([$this, 'get_'.$property]); |
50 | 50 | # } |
51 | 51 | |
52 | - if($this->__isset($property)){ |
|
52 | + if ($this->__isset($property)) { |
|
53 | 53 | return $this->{$property}; |
54 | 54 | } |
55 | 55 | |
56 | - if(property_exists($this, 'env') && $this->env instanceof DotEnv){ |
|
56 | + if (property_exists($this, 'env') && $this->env instanceof DotEnv) { |
|
57 | 57 | return $this->env->get($property); |
58 | 58 | } |
59 | 59 | |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | * |
67 | 67 | * @return void |
68 | 68 | */ |
69 | - public function __set(string $property, $value){ |
|
69 | + public function __set(string $property, $value) { |
|
70 | 70 | |
71 | 71 | # if(method_exists($this, 'set_'.$property) && !$this->__isPrivate($property)){ |
72 | 72 | # call_user_func_array([$this, 'set_'.$property], [$value]); |
@@ -74,12 +74,12 @@ discard block |
||
74 | 74 | # } |
75 | 75 | |
76 | 76 | // avoid overwriting private properties |
77 | - if(property_exists($this, $property) && !$this->__isPrivate($property)){ |
|
77 | + if (property_exists($this, $property) && !$this->__isPrivate($property)) { |
|
78 | 78 | $this->{$property} = $value; |
79 | 79 | return; |
80 | 80 | } |
81 | 81 | |
82 | - if(property_exists($this, 'env') && $this->env instanceof DotEnv){ |
|
82 | + if (property_exists($this, 'env') && $this->env instanceof DotEnv) { |
|
83 | 83 | $this->env->set($property, $value); |
84 | 84 | return; |
85 | 85 | } |
@@ -111,10 +111,10 @@ discard block |
||
111 | 111 | * |
112 | 112 | * @return void |
113 | 113 | */ |
114 | - public function __unset(string $property){ |
|
114 | + public function __unset(string $property) { |
|
115 | 115 | |
116 | 116 | // avoid unsetting private properties |
117 | - if($this->__isset($property)){ |
|
117 | + if ($this->__isset($property)) { |
|
118 | 118 | unset($this->{$property}); |
119 | 119 | } |
120 | 120 | |
@@ -133,10 +133,10 @@ discard block |
||
133 | 133 | public function __toArray():array{ |
134 | 134 | $data = []; |
135 | 135 | |
136 | - foreach($this as $property => $value){ |
|
136 | + foreach ($this as $property => $value) { |
|
137 | 137 | |
138 | 138 | // exclude private properties |
139 | - if($this->__isset($property)){ |
|
139 | + if ($this->__isset($property)) { |
|
140 | 140 | $data[$property] = $value; |
141 | 141 | } |
142 | 142 | |
@@ -150,9 +150,9 @@ discard block |
||
150 | 150 | * |
151 | 151 | * @return $this |
152 | 152 | */ |
153 | - public function __fromIterable(array $properties){ |
|
153 | + public function __fromIterable(array $properties) { |
|
154 | 154 | |
155 | - foreach($properties as $key => $value){ |
|
155 | + foreach ($properties as $key => $value) { |
|
156 | 156 | $this->__set($key, $value); |
157 | 157 | } |
158 | 158 | |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | * |
174 | 174 | * @return $this |
175 | 175 | */ |
176 | - public function __fromJSON(string $json){ |
|
176 | + public function __fromJSON(string $json) { |
|
177 | 177 | return $this->__fromIterable(json_decode($json, true)); |
178 | 178 | } |
179 | 179 |