@@ -36,18 +36,15 @@ |
||
36 | 36 | |
37 | 37 | if(($array instanceof ArrayObject) || ($array instanceof ArrayIterator)){ |
38 | 38 | $this->array = $array->getArrayCopy(); |
39 | - } |
|
40 | - elseif($array instanceof Traversable){ |
|
39 | + } elseif($array instanceof Traversable){ |
|
41 | 40 | $this->array = iterator_to_array($array); |
42 | 41 | } |
43 | 42 | // yields unexpected results with DotArray |
44 | 43 | elseif(gettype($array) === 'object'){ |
45 | 44 | $this->array = get_object_vars($array); |
46 | - } |
|
47 | - elseif(is_array($array)){ |
|
45 | + } elseif(is_array($array)){ |
|
48 | 46 | $this->array = $array; |
49 | - } |
|
50 | - else{ |
|
47 | + } else{ |
|
51 | 48 | $this->array = []; |
52 | 49 | } |
53 | 50 | } |
@@ -70,8 +70,7 @@ |
||
70 | 70 | |
71 | 71 | if(array_key_exists($var, $_ENV)){ |
72 | 72 | $env = $_ENV[$var]; |
73 | - } |
|
74 | - elseif(function_exists('getenv')){ |
|
73 | + } elseif(function_exists('getenv')){ |
|
75 | 74 | $env = getenv($var); |
76 | 75 | } |
77 | 76 | // @codeCoverageIgnoreStart |
@@ -46,8 +46,7 @@ discard block |
||
46 | 46 | |
47 | 47 | if($this->__isset($property)){ |
48 | 48 | return $this->{$property}; |
49 | - } |
|
50 | - elseif($this->env instanceof DotEnv){ |
|
49 | + } elseif($this->env instanceof DotEnv){ |
|
51 | 50 | return $this->env->get($property); |
52 | 51 | } |
53 | 52 | |
@@ -65,8 +64,7 @@ discard block |
||
65 | 64 | // avoid overwriting private properties |
66 | 65 | if(property_exists($this, $property) && !$this->__isPrivate($property)){ |
67 | 66 | $this->{$property} = $value; |
68 | - } |
|
69 | - elseif($this->env instanceof DotEnv){ |
|
67 | + } elseif($this->env instanceof DotEnv){ |
|
70 | 68 | $this->env->set($property, $value); |
71 | 69 | } |
72 | 70 |
@@ -33,8 +33,7 @@ discard block |
||
33 | 33 | try{ |
34 | 34 | $reflectionClass = new ReflectionClass($class); |
35 | 35 | $reflectionType = new ReflectionClass($type); |
36 | - } |
|
37 | - catch(Exception $e){ |
|
36 | + } catch(Exception $e){ |
|
38 | 37 | throw new TraitException('ClassLoader: '.$e->getMessage()); |
39 | 38 | } |
40 | 39 | |
@@ -55,8 +54,7 @@ discard block |
||
55 | 54 | |
56 | 55 | if($reflectionType->isInterface() && !$reflectionClass->implementsInterface($type)){ |
57 | 56 | throw new TraitException($class.' does not implement '.$type); |
58 | - } |
|
59 | - elseif(!$reflectionClass->isSubclassOf($type)) { |
|
57 | + } elseif(!$reflectionClass->isSubclassOf($type)) { |
|
60 | 58 | throw new TraitException($class.' does not inherit '.$type); |
61 | 59 | } |
62 | 60 | |
@@ -70,8 +68,7 @@ discard block |
||
70 | 68 | } |
71 | 69 | |
72 | 70 | return $object; |
73 | - } |
|
74 | - catch(Exception $e){ |
|
71 | + } catch(Exception $e){ |
|
75 | 72 | throw new TraitException('ClassLoader: '.$e->getMessage()); |
76 | 73 | } |
77 | 74 |