Fix #1408

infection · Nov 2, 2020 · de3d6de · de3d6de
1 parent a158689
commit de3d6de
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/src/Mutator/MutatorResolver.php b/src/Mutator/MutatorResolver.php
@@ -132,14 +132,14 @@ private static function resolveSettings($settings, array $globalSettings)
             return false;
         }
 
-        if (count($globalSettings) === 0) {
-            return (array) $settings;
-        }
-
         if ($settings === true) {
             return $globalSettings;
         }
 
+        if (count($globalSettings) === 0) {
+            return (array) $settings;
+        }
+
         return array_merge_recursive($globalSettings, (array) $settings);
     }
 
@@ -219,8 +219,16 @@ private static function registerFromClass(
     ): void {
         if ($settings === false) {
             unset($mutators[$mutatorClassName]);
-        } else {
-            $mutators[$mutatorClassName] = (array) $settings;
+
+            return;
+        }
+
+        if ($settings === true || $settings === []) {
+            $mutators[$mutatorClassName] = $mutators[$mutatorClassName] ?? [];
+
+            return;
         }
+
+        $mutators[$mutatorClassName] = $settings;
     }
 }
diff --git a/tests/phpunit/Mutator/MutatorResolverTest.php b/tests/phpunit/Mutator/MutatorResolverTest.php
@@ -353,13 +353,10 @@ public function test_it_works_wrong(): void
                     ],
                 ],
                 IncrementInteger::class => [
-                    true,
                 ],
                 OneZeroFloat::class => [
-                    true,
                 ],
                 OneZeroInteger::class => [
-                    true,
                 ],
             ],
             $resolvedMutators
@@ -385,13 +382,10 @@ public function test_it_works_right(): void
                     ],
                 ],
                 IncrementInteger::class => [
-                    true,
                 ],
                 OneZeroFloat::class => [
-                    true,
                 ],
                 OneZeroInteger::class => [
-                    true,
                 ],
             ],
             $resolvedMutators