Ignore all config errors if option given

Author: dantleech

lib/Resolver.php

@@ -36,6 +36,11 @@ class Resolver
      */
     private $ignoreErrors;
 
+    /**
+     * @var InvalidMap[]
+     */
+    private $errors;
+
     public function __construct(bool $ignoreErrors = false)
     {
         $this->ignoreErrors = $ignoreErrors;
@@ -99,11 +104,15 @@ public function resolve(array $config): array
         $allowedKeys = $this->resolveAllowedKeys();
 
         if ($diff = array_diff(array_keys($config), $allowedKeys)) {
-            throw new InvalidMap(sprintf(
-                'Key(s) "%s" are not known, known keys: "%s"',
-                implode('", "', ($diff)),
-                implode('", "', $allowedKeys)
-            ));
+            $this->throwOrLogError(
+                new InvalidMap(sprintf(
+                    'Key(s) "%s" are not known, known keys: "%s"',
+                    implode('", "', ($diff)),
+                    implode('", "', $allowedKeys)
+                ))
+            );
+
+            $config = $this->removeKeys($config, $diff);
         }
 
         if ($diff = array_diff(array_keys($this->descriptions), $allowedKeys)) {
@@ -117,10 +126,11 @@ public function resolve(array $config): array
         $config = array_merge($this->defaults, $config);
 
         if ($diff = array_diff($this->required, array_keys($config))) {
-            throw new InvalidMap(sprintf(
+            $this->throwOrLogError(new InvalidMap(sprintf(
                 'Key(s) "%s" are required',
                 implode('", "', $diff)
-            ));
+            )));
+            $config = $this->removeKeys($config, $diff);
         }
 
         foreach ($config as $key => $value) {
@@ -139,12 +149,12 @@ public function resolve(array $config): array
                 }
 
                 if (false === $valid) {
-                    throw new InvalidMap(sprintf(
+                    $this->throwOrLogError(new InvalidMap(sprintf(
                         'Type for "%s" expected to be "%s", got "%s"',
                         $key,
                         $this->types[$key],
                         $type
-                    ));
+                    )));
                 }
             }
         }
@@ -206,4 +216,22 @@ public function definitions(): Definitions
 
         return new Definitions($definitions);
     }
+
+    private function throwOrLogError(InvalidMap $error): void
+    {
+        if (!$this->ignoreErrors) {
+            throw $error;
+        }
+
+        $this->errors[] = $error;
+    }
+
+    private function removeKeys(array $config, array $keys): array
+    {
+        foreach ($keys as $remove) {
+            unset($config[$remove]);
+        }
+
+        return $config;
+    }
 }

tests/Unit/ResolverTest.php

@@ -41,7 +41,7 @@ public function testIgnoresUnknownKey(): void
             'two' => 2,
         ]);
         $result = $resolver->resolve(['three' => 3]);
-        self::assertEquals([
+        self::assertEquals($result, [
             'one' => 1,
             'two' => 2
         ]);