@@ -42,9 +42,9 @@ |
||
42 | 42 | |
43 | 43 | /** |
44 | 44 | * @param array $array1 |
45 | - * @param array $array26 |
|
45 | + * @param array $array2 |
|
46 | 46 | * |
47 | - * @return array |
|
47 | + * @return MergeResult |
|
48 | 48 | */ |
49 | 49 | public function merge(array $array1, array $array2) |
50 | 50 | { |
@@ -53,7 +53,7 @@ |
||
53 | 53 | $this->mergeResult->addBase($key, $value); |
54 | 54 | } |
55 | 55 | |
56 | - foreach($array2 as $key => $value) { |
|
56 | + foreach ($array2 as $key => $value) { |
|
57 | 57 | $this->mergeResult->addCurrent($key, $value); |
58 | 58 | } |
59 | 59 |
@@ -38,7 +38,7 @@ |
||
38 | 38 | */ |
39 | 39 | public function parseFile($filename) |
40 | 40 | { |
41 | - if (! is_readable($filename)) { |
|
41 | + if (!is_readable($filename)) { |
|
42 | 42 | throw new \UnexpectedValueException(sprintf( |
43 | 43 | 'File %s is not readable', |
44 | 44 | basename($filename) |
@@ -47,12 +47,12 @@ |
||
47 | 47 | protected function configure() |
48 | 48 | { |
49 | 49 | $this->setName('compare') |
50 | - ->setDescription('Compare two JUnit log files') |
|
51 | - ->setDefinition(array( |
|
52 | - new InputArgument('input1', InputArgument::REQUIRED, 'First input file'), |
|
53 | - new InputArgument('input2', InputArgument::REQUIRED, 'Second input file') |
|
54 | - )) |
|
55 | - ->setHelp(''); |
|
50 | + ->setDescription('Compare two JUnit log files') |
|
51 | + ->setDefinition(array( |
|
52 | + new InputArgument('input1', InputArgument::REQUIRED, 'First input file'), |
|
53 | + new InputArgument('input2', InputArgument::REQUIRED, 'Second input file') |
|
54 | + )) |
|
55 | + ->setHelp(''); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 |
@@ -47,11 +47,11 @@ |
||
47 | 47 | $mergeResult->sort(); |
48 | 48 | |
49 | 49 | foreach ($mergeResult as $key => $value) { |
50 | - if (! isset($value['base'])) { |
|
50 | + if (!isset($value['base'])) { |
|
51 | 51 | $this->style->text('<bg=green;fg=black>+</> ' . $key); |
52 | 52 | continue; |
53 | 53 | } |
54 | - if (! isset($value['current'])) { |
|
54 | + if (!isset($value['current'])) { |
|
55 | 55 | $this->style->text('<bg=red;fg=yellow>-</> ' . $key); |
56 | 56 | continue; |
57 | 57 | } |