Fix unit tests to work correctly with upgraded phpcs.

Author: chrisryan

composer.json

@@ -29,10 +29,12 @@
     },
     "require-dev": {
         "php-coveralls/php-coveralls": "^2.5",
-        "phpunit/phpunit": ">=6.5"
+        "phpunit/phpunit": "^6.5 || ^9"
     },
     "autoload": {
-        "psr-4": { "DWS\\": "src" }
+        "psr-4": {
+            "DWS\\": "src"
+        }
     },
     "scripts": {
         "lint": "vendor/bin/phpcs",

tests/AbstractSniffUnitTest.php

@@ -31,11 +31,9 @@ public final function runTest()
     {
         $config = new \PHP_CodeSniffer\Config();
         $ruleset = new \PHP_CodeSniffer\Ruleset($config);
-        $ruleset->registerSniffs([$this->_getSniffName()], [], []);
+        $ruleset->registerSniffs([dirname(__DIR__) . $this->_getSniffName()], [], []);
         $ruleset->populateTokenListeners();
 
-        //self::$_phpcs->cli->setCommandLineValues(['-s']);
-
         $testFile = dirname(__DIR__) . '/tests/' . str_replace('_', '/', get_class($this)) . '.inc';
         if (!file_exists($testFile)) {
             $this->markTestSkipped();

tests/DWS/Sniffs/Arrays/ArrayDeclarationSniffTest.php

@@ -14,6 +14,6 @@ public function getWarningList()
 
     protected function _getSniffName()
     {
-        return 'DWS.Arrays.ArrayDeclaration';
+        return '/DWS/Sniffs/Arrays/ArrayDeclarationSniff.php';
     }
 }

tests/DWS/Sniffs/Arrays/ArrowSpacingSniffTest.php

@@ -14,6 +14,6 @@ public function getWarningList()
 
     protected function _getSniffName()
     {
-        return 'DWS.Arrays.ArrowSpacing';
+        return '/DWS/Sniffs/Arrays/ArrowSpacingSniff.php';
     }
 }

tests/DWS/Sniffs/Arrays/CommaSpacingSniffTest.php

@@ -14,6 +14,6 @@ public function getWarningList()
 
     protected function _getSniffName()
     {
-        return 'DWS.Arrays.CommaSpacing';
+        return '/DWS/Sniffs/Arrays/CommaSpacingSniff.php';
     }
 }

tests/DWS/Sniffs/Arrays/TrailingCommaSniffTest.php

@@ -14,6 +14,6 @@ public function getWarningList()
 
     protected function _getSniffName()
     {
-        return 'DWS.Arrays.TrailingComma';
+        return '/DWS/Sniffs/Arrays/TrailingCommaSniff.php';
     }
 }

tests/DWS/Sniffs/ControlStructures/ControlSignatureSniffTest.php

@@ -14,6 +14,6 @@ public function getWarningList()
 
     protected function _getSniffName()
     {
-        return 'DWS.ControlStructures.ControlSignature';
+        return '/DWS/Sniffs/ControlStructures/ControlSignatureSniff.php';
     }
 }

tests/DWS/Sniffs/Formatting/MultilineBracketedExpressionIndentSniffTest.php

@@ -14,6 +14,6 @@ public function getWarningList()
 
     protected function _getSniffName()
     {
-        return 'DWS.Formatting.MultilineBracketedExpressionIndent';
+        return '/DWS/Sniffs/Formatting/MultilineBracketedExpressionIndentSniff.php';
     }
 }

tests/DWS/Sniffs/Scope/VariableScopeSniffTest.php

@@ -14,6 +14,6 @@ public function getWarningList()
 
     protected function _getSniffName()
     {
-        return 'DWS.Scope.VariableScope';
+        return '/DWS/Sniffs/Scope/VariableScopeSniff.php';
     }
 }

tests/DWS/Sniffs/Strings/DoubleQuoteUsageSniffTest.php

@@ -14,6 +14,6 @@ public function getWarningList()
 
     protected function _getSniffName()
     {
-        return 'DWS.Strings.DoubleQuoteUsage';
+        return '/DWS/Sniffs/Strings/DoubleQuoteUsageSniff.php';
     }
 }

tests/DWS/Sniffs/Strings/EmbeddedVariablesSniffTest.php

@@ -14,6 +14,6 @@ public function getWarningList()
 
     protected function _getSniffName()
     {
-        return 'DWS.Strings.EmbeddedVariables';
+        return '/DWS/Sniffs/Strings/EmbeddedVariablesSniff.php';
     }
 }

tests/DWS/Sniffs/Strings/UnnecessaryStringConcatSniffTest.php

@@ -14,6 +14,6 @@ public function getWarningList()
 
     protected function _getSniffName()
     {
-        return 'DWS.Strings.UnnecessaryStringConcat';
+        return '/DWS/Sniffs/Strings/UnnecessaryStringConcatSniff.php';
     }
 }

tests/DWS/Sniffs/WhiteSpace/ControlStructureInteriorSpacingSniffTest.php

@@ -35,6 +35,6 @@ public function getWarningList()
 
     protected function _getSniffName()
     {
-        return 'DWS.WhiteSpace.ControlStructureInteriorSpacing';
+        return '/DWS/Sniffs/WhiteSpace/ControlStructureInteriorSpacingSniff.php';
     }
 }

tests/DWS/Sniffs/WhiteSpace/ControlStructureTrailingSpacingSniffTest.php

@@ -14,6 +14,6 @@ public function getWarningList()
 
     protected function _getSniffName()
     {
-        return 'DWS.WhiteSpace.ControlStructureTrailingSpacing';
+        return '/DWS/Sniffs/WhiteSpace/ControlStructureTrailingSpacingSniff.php';
     }
 }

tests/DWS/Sniffs/WhiteSpace/OperatorSpacingSniffTest.php

@@ -31,6 +31,6 @@ public function getWarningList()
 
     protected function _getSniffName()
     {
-        return 'DWS.WhiteSpace.OperatorSpacing';
+        return '/DWS/Sniffs/WhiteSpace/OperatorSpacingSniff.php';
     }
 }

tests/DWS/Sniffs/WhiteSpace/SuperfluousWhitespaceSniffGoodBeginningTest.php

@@ -14,6 +14,6 @@ public function getWarningList()
 
     protected function _getSniffName()
     {
-        return 'DWS.WhiteSpace.SuperfluousWhitespace';
+        return '/DWS/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php';
     }
 }

tests/DWS/Sniffs/WhiteSpace/SuperfluousWhitespaceSniffTest.php

@@ -14,6 +14,6 @@ public function getWarningList()
 
     protected function _getSniffName()
     {
-        return 'DWS.WhiteSpace.SuperfluousWhitespace';
+        return '/DWS/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php';
     }
 }

tests/bootstrap.php

@@ -2,3 +2,5 @@
 
 $loader = require dirname(__DIR__) . '/vendor/autoload.php';
 $loader->add('', __DIR__);
+
+require dirname(__DIR__) . '/vendor/squizlabs/php_codesniffer/tests/bootstrap.php';