Simplify rules merging

We first sanitize the merged array and we can later use it without
checking.

Signed-off-by: Michal Čihař <michal@cihar.com>

Author: nijel

src/Utils/Formatter.php

@@ -212,44 +212,39 @@ protected function getDefaultFormats()
     private static function mergeFormats(array $formats, array $newFormats)
     {
         $added = array();
+        $integers = array('flags', 'type');
+        $strings = array('html', 'cli', 'function');
 
+        /* Sanitize the array so that we do not have to care later */
+        foreach ($newFormats as $j => $new) {
+            foreach ($integers as $name) {
+                if (! isset($new[$name])) {
+                    $newFormats[$j][$name] = 0;
+                }
+            }
+            foreach ($strings as $name) {
+                if (! isset($new[$name])) {
+                    $newFormats[$j][$name] = '';
+                }
+            }
+        }
+
+        /* Process changes to existing formats */
         foreach ($formats as $i => $original) {
             foreach ($newFormats as $j => $new) {
-                if (isset($new['type'])
-                    && $new['type'] === $original['type']
-                    && (
-                        (
-                            isset($new['flags'])
-                            && $original['flags'] === $new['flags']
-                        )
-                        || (
-                            !isset($new['flags'])
-                            && $original['flags'] == 0
-                        )
-                    )
+                if ($new['type'] === $original['type']
+                    && $original['flags'] === $new['flags']
                 ) {
-                    $formats[$i] = array(
-                        'type' => $original['type'],
-                        'flags' => isset($new['flags']) ? $new['flags'] : 0,
-                        'html' => isset($new['html']) ? $new['html'] : '',
-                        'cli' => isset($new['cli']) ? $new['cli'] : '',
-                        'function' => isset($new['function']) ? $new['function'] : '',
-                    );
-
+                    $formats[$i] = $new;
                     $added[] = $j;
                 }
             }
         }
 
+        /* Add not already handled formats */
         foreach ($newFormats as $j => $new) {
-            if (!in_array($j, $added) && isset($new['type'])) {
-                $formats[] = array(
-                    'type' => $new['type'],
-                    'flags' => isset($new['flags']) ? $new['flags'] : 0,
-                    'html' => isset($new['html']) ? $new['html'] : '',
-                    'cli' => isset($new['cli']) ? $new['cli'] : '',
-                    'function' => isset($new['function']) ? $new['function'] : '',
-                );
+            if (! in_array($j, $added)) {
+                $formats[] = $new;
             }
         }
 

tests/Utils/FormatterTest.php

@@ -59,6 +59,9 @@ public function mergeFormats()
                     array(
                         'type' => 0,
                         'flags' => 0,
+                        'html' => '',
+                        'cli' => '',
+                        'function' => '',
                     ),
                 ),
                 array( // overriding
@@ -69,6 +72,9 @@ public function mergeFormats()
                     array(
                         'type' => 0,
                         'flags' => 0,
+                        'html' => '',
+                        'cli' => '',
+                        'function' => '',
                     ),
                 ),
             ),