Merge branch '0.3'

Author: thewilkybarkid

composer.json

@@ -15,7 +15,7 @@
     },
     "require": {
         "php": "^7.2",
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.4",
+        "dealerdirect/phpcodesniffer-composer-installer": "^0.4 || ^0.5",
         "slevomat/coding-standard": "^4.8",
         "squizlabs/php_codesniffer": "^3.3.2"
     },

tests/RulesetTests.php

@@ -13,6 +13,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Finder\Finder;
 use function array_combine;
+use function array_diff;
 use function array_filter;
 use function array_map;
 use function explode;
@@ -53,11 +54,12 @@ public function it_finds_and_fixes_violations(
         string $contents,
         string $fixed,
         array $messages,
+        array $ignoreMessages,
         ?string $description,
         ?string $fixedEncoding
     ) : void {
         $file = $this->createFile($filename, $contents);
-        $actual = flatten($this->getMessages($file));
+        $actual = array_diff(flatten($this->getMessages($file)), $ignoreMessages);
 
         sort($actual);
         sort($messages);
@@ -84,6 +86,10 @@ public function cases() : iterable
                 $parts['messages'] = array_filter(explode("\n", $parts['messages']));
             }
 
+            if (isset($parts['ignore-messages'])) {
+                $parts['ignore-messages'] = array_filter(explode("\n", $parts['ignore-messages']));
+            }
+
             $keys = ['fixed', 'fixed-encoding', 'fixed-line-endings', 'messages'];
             if (empty($parts['contents'])) {
                 throw new LogicException("Couldn't find contents in {$file->getRelativePathname()}");
@@ -134,6 +140,7 @@ public function cases() : iterable
                 $parts['contents'],
                 $parts['fixed'],
                 $parts['messages'] ?? [],
+                $parts['ignore-messages'] ?? [],
                 $parts['description'] ?? null,
                 $parts['fixed-encoding'] ?? null,
             ];

tests/cases/classes/one-per-file

@@ -19,5 +19,6 @@ class Bar
 
 ---MESSAGES---
 11:1 PSR1.Classes.ClassDeclaration.MultipleClasses
+---IGNORE-MESSAGES---
 11:1 Squiz.Classes.ClassFileName.NoMatch
 ---

tests/cases/classes/property-visibility

@@ -16,5 +16,6 @@ class Foo
 
 ---MESSAGES---
 9:9 PSR2.Classes.PropertyDeclaration.ScopeMissing
+---IGNORE-MESSAGES---
 9:9 PSR2.Classes.PropertyDeclaration.VarUsed
 ---

tests/cases/interfaces/one-per-file

@@ -19,5 +19,6 @@ interface Bar
 
 ---MESSAGES---
 11:1 PSR1.Classes.ClassDeclaration.MultipleClasses
+---IGNORE-MESSAGES---
 11:1 Squiz.Classes.ClassFileName.NoMatch
 ---

tests/cases/trait/one-per-file

@@ -19,4 +19,6 @@ trait Bar
 
 ---MESSAGES---
 11:1 PSR1.Classes.ClassDeclaration.MultipleClasses
+---IGNORE-MESSAGES---
+11:1 Squiz.Classes.ClassFileName.NoMatch
 ---

tests/cases/trait/property-visibility

@@ -16,5 +16,6 @@ trait Foo
 
 ---MESSAGES---
 9:9 PSR2.Classes.PropertyDeclaration.ScopeMissing
+---IGNORE-MESSAGES---
 9:9 PSR2.Classes.PropertyDeclaration.VarUsed
 ---