Update tools

Author: dantleech

.gitignore

@@ -3,7 +3,7 @@
 /tests/Assets/workspace
 /phpbench.json
 /composer.lock
-/.php_cs.cache
 /stubs
 /.vscode
-.php_cs.cache
+.phpunit.result.cache
+.php-cs-fixer.cache

.php_cs.dist .php-cs-fixer.dist.php.php_cs.dist renamed to .php-cs-fixer.dist.php

@@ -8,7 +8,8 @@
     ])
 ;
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
+    ->setRiskyAllowed(true)
     ->setRules([
         '@PSR2' => true,
         'no_unused_imports' => true,

composer.json

@@ -40,7 +40,7 @@
     "scripts": {
         "integrate": [
             "./vendor/bin/phpunit",
-            "./vendor/bin/phpstan analyze",
+            "./vendor/bin/phpstan analyze --memory-limit=-1",
             "./vendor/bin/php-cs-fixer fix --allow-risky=yes"
         ]
     },

phpstan-baseline.neon

@@ -1,7 +1,2 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Method Phpactor\\\\MapResolver\\\\Resolver\\:\\:resolveDescriptions\\(\\) should return array\\<string, string\\> but returns array\\<int\\|string, string\\|false\\|null\\>\\.$#"
-			count: 1
-			path: lib/Resolver.php
-

tests/Unit/ResolverTest.php

@@ -5,6 +5,7 @@
 use PHPUnit\Framework\TestCase;
 use Phpactor\MapResolver\Definition;
 use Phpactor\MapResolver\InvalidMap;
+use Phpactor\MapResolver\UnknownKeys;
 use Phpactor\MapResolver\Resolver;
 use stdClass;
 
@@ -25,12 +26,18 @@ public function testThrowsExceptionOnUnknownKey(): void
         $this->expectException(InvalidMap::class);
         $this->expectExceptionMessage('Key(s) "three" are not known');
 
+        try {
         $resolver = new Resolver();
         $resolver->setDefaults([
             'one' => 1,
             'two' => 2,
         ]);
         $resolver->resolve(['three' => 3]);
+        } catch (UnknownKeys $e) {
+            self::assertEquals(['three'], $e->additionalKeys());
+            self::assertEquals(['one', 'two'], $e->allowedKeys());
+            throw $e;
+        }
     }
 
     public function testIgnoresUnknownKey(): void