@@ -39,9 +39,9 @@ discard block |
||
39 | 39 | return $sReturn; |
40 | 40 | } |
41 | 41 | |
42 | - protected function mergeArraysIntoFirstSecond($firstArray, $secondArray, $pSequence = ['first', 'second']) |
|
42 | + protected function mergeArraysIntoFirstSecond($firstArray, $secondArray, $pSequence = [ 'first', 'second' ]) |
|
43 | 43 | { |
44 | - $row = []; |
|
44 | + $row = [ ]; |
|
45 | 45 | foreach ($firstArray as $key => $value) { |
46 | 46 | if (is_array($value)) { |
47 | 47 | foreach ($value as $key2 => $value2) { |
@@ -50,25 +50,25 @@ discard block |
||
50 | 50 | if (is_array($value3)) { |
51 | 51 | foreach ($value3 as $key4 => $value4) { |
52 | 52 | $keyCrt = $key . '_' . $key2 . '__' . $key3 . '__' . $key4; |
53 | - $row[$keyCrt][$pSequence[0]] = $value4; |
|
54 | - $toEval = $secondArray[$key][$key2][$key3][$key4]; |
|
55 | - $row[$keyCrt][$pSequence[1]] = $this->decideToReturn($toEval); |
|
53 | + $row[ $keyCrt ][ $pSequence[ 0 ] ] = $value4; |
|
54 | + $toEval = $secondArray[ $key ][ $key2 ][ $key3 ][ $key4 ]; |
|
55 | + $row[ $keyCrt ][ $pSequence[ 1 ] ] = $this->decideToReturn($toEval); |
|
56 | 56 | } |
57 | 57 | } else { |
58 | 58 | $keyCrt = $key . '_' . $key2 . '__' . $key3; |
59 | - $row[$keyCrt][$pSequence[0]] = $value3; |
|
60 | - $row[$keyCrt][$pSequence[1]] = $this->decideToReturn($secondArray[$key][$key2][$key3]); |
|
59 | + $row[ $keyCrt ][ $pSequence[ 0 ] ] = $value3; |
|
60 | + $row[ $keyCrt ][ $pSequence[ 1 ] ] = $this->decideToReturn($secondArray[ $key ][ $key2 ][ $key3 ]); |
|
61 | 61 | } |
62 | 62 | } |
63 | 63 | } else { |
64 | 64 | $keyCrt = $key . '_' . $key2; |
65 | - $row[$keyCrt][$pSequence[0]] = $value2; |
|
66 | - $row[$keyCrt][$pSequence[1]] = $this->decideToReturn($secondArray[$key][$key2]); |
|
65 | + $row[ $keyCrt ][ $pSequence[ 0 ] ] = $value2; |
|
66 | + $row[ $keyCrt ][ $pSequence[ 1 ] ] = $this->decideToReturn($secondArray[ $key ][ $key2 ]); |
|
67 | 67 | } |
68 | 68 | } |
69 | 69 | } else { |
70 | - $row[$key][$pSequence[0]] = $value; |
|
71 | - $row[$key][$pSequence[1]] = $this->decideToReturn($secondArray[$key]); |
|
70 | + $row[ $key ][ $pSequence[ 0 ] ] = $value; |
|
71 | + $row[ $key ][ $pSequence[ 1 ] ] = $this->decideToReturn($secondArray[ $key ]); |
|
72 | 72 | } |
73 | 73 | } |
74 | 74 | return $row; |