@@ -14,21 +14,24 @@ discard block |
||
14 | 14 | return $array[$key]; |
15 | 15 | } |
16 | 16 | $values=array_values($array); |
17 | - if ($pos < sizeof($values)) |
|
18 | - return $values[$pos]; |
|
17 | + if ($pos < sizeof($values)) { |
|
18 | + return $values[$pos]; |
|
19 | + } |
|
19 | 20 | } |
20 | 21 | |
21 | 22 | public static function getConditionalValue($array, $key, $condition) { |
22 | 23 | $result=NULL; |
23 | 24 | if (array_key_exists($key, $array)) { |
24 | 25 | $result=$array[$key]; |
25 | - if ($condition($result) === true) |
|
26 | - return $result; |
|
26 | + if ($condition($result) === true) { |
|
27 | + return $result; |
|
28 | + } |
|
27 | 29 | } |
28 | 30 | $values=array_values($array); |
29 | 31 | foreach ( $values as $val ) { |
30 | - if ($condition($val) === true) |
|
31 | - return $val; |
|
32 | + if ($condition($val) === true) { |
|
33 | + return $val; |
|
34 | + } |
|
32 | 35 | } |
33 | 36 | return $result; |
34 | 37 | } |
@@ -36,8 +39,9 @@ discard block |
||
36 | 39 | public static function getDefaultValue($array, $key, $default=NULL) { |
37 | 40 | if (array_key_exists($key, $array)) { |
38 | 41 | return $array[$key]; |
39 | - } else |
|
40 | - return $default; |
|
42 | + } else { |
|
43 | + return $default; |
|
44 | + } |
|
41 | 45 | } |
42 | 46 | |
43 | 47 | public static function implode($glue, $pieces) { |
@@ -84,7 +88,7 @@ discard block |
||
84 | 88 | foreach ($objects as $object){ |
85 | 89 | $result[]=self::callFunction($object, $modelFunction); |
86 | 90 | } |
87 | - }else{ |
|
91 | + } else{ |
|
88 | 92 | foreach ($objects as $object){ |
89 | 93 | $result[self::callFunction($object, $identifierFunction)]=self::callFunction($object, $modelFunction); |
90 | 94 | } |
@@ -93,9 +97,9 @@ discard block |
||
93 | 97 | } |
94 | 98 | |
95 | 99 | private static function callFunction($object,$callback){ |
96 | - if(\is_string($callback)) |
|
97 | - return \call_user_func(array($object, $callback),[]); |
|
98 | - else if (\is_callable($callback)){ |
|
100 | + if(\is_string($callback)) { |
|
101 | + return \call_user_func(array($object, $callback),[]); |
|
102 | + } else if (\is_callable($callback)){ |
|
99 | 103 | return $callback($object); |
100 | 104 | } |
101 | 105 | } |