DX: little code grooming

PHP-CS-Fixer · Dec 6, 2020 · 6d89350 · 6d89350
1 parent 6f4e62f
commit 6d89350
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/sca.yml b/.github/workflows/sca.yml
@@ -70,7 +70,7 @@ jobs:
           ./dev-tools/check_file_permissions.sh
           ./dev-tools/check_trailing_spaces.sh
           ./dev-tools/vendor/bin/phpstan analyse
-          ./dev-tools/vendor/bin/composer-require-checker check composer.json --config-file $(realpath .composer-require-checker.json)
+          ./dev-tools/vendor/bin/composer-require-checker check composer.json --config-file .composer-require-checker.json
           composer normalize --dry-run --working-dir=./dev-tools ../composer.json
           ./dev-tools/check_shell_scripts.sh
 

diff --git a/dev-tools/composer.json b/dev-tools/composer.json
@@ -3,14 +3,14 @@
         "php": "^7.1"
     },
     "require-dev": {
-        "ergebnis/composer-normalize": "^2.5.1",
+        "ergebnis/composer-normalize": "^2.11",
         "humbug/box": "^3.8",
         "jangregor/phpstan-prophecy": "^0.6",
         "maglnet/composer-require-checker": "2.0.0",
         "mi-schi/phpmd-extension": "^4.3",
-        "phpmd/phpmd": "^2.6",
+        "phpmd/phpmd": "^2.9",
         "phpstan/phpstan": "0.12.18",
-        "phpstan/phpstan-phpunit": "^0.12"
+        "phpstan/phpstan-phpunit": "^0.12.8"
     },
     "config": {
         "optimize-autoloader": true,

diff --git a/src/Tokenizer/AbstractTransformer.php b/src/Tokenizer/AbstractTransformer.php
@@ -45,7 +45,7 @@ public function getPriority()
      */
     public function getCustomTokens()
     {
-        @trigger_error('PhpCsFixer\Tokenizer\TransformerInterface::getCustomTokens is deprecated and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error(sprintf('%s is deprecated and will be removed in 3.0.', __METHOD__), E_USER_DEPRECATED);
 
         return $this->getDeprecatedCustomTokens();
     }

diff --git a/src/Tokenizer/Transformers.php b/src/Tokenizer/Transformers.php
@@ -40,7 +40,7 @@ private function __construct()
         $this->registerBuiltInTransformers();
 
         usort($this->items, static function (TransformerInterface $a, TransformerInterface $b) {
-            return Utils::cmpInt($b->getPriority(), $a->getPriority()); // TODO spaceship
+            return Utils::cmpInt($b->getPriority(), $a->getPriority()); // TODO: update to use spaceship operator (PHP 7.0 required)
         });
     }
 

diff --git a/tests/Test/AbstractTransformerTestCase.php b/tests/Test/AbstractTransformerTestCase.php
@@ -66,7 +66,7 @@ public function testGetName()
 
     /**
      * @group legacy
-     * @expectedDeprecation PhpCsFixer\Tokenizer\TransformerInterface::getCustomTokens is deprecated and will be removed in 3.0.
+     * @expectedDeprecation PhpCsFixer\Tokenizer\AbstractTransformer::getCustomTokens is deprecated and will be removed in 3.0.
      */
     public function testGetCustomTokens()
     {

diff --git a/tests/Tokenizer/AbstractTransformerTest.php b/tests/Tokenizer/AbstractTransformerTest.php
@@ -34,7 +34,7 @@ public function testNameAndPriorityDefault()
 
     /**
      * @group legacy
-     * @expectedDeprecation PhpCsFixer\Tokenizer\TransformerInterface::getCustomTokens is deprecated and will be removed in 3.0.
+     * @expectedDeprecation PhpCsFixer\Tokenizer\AbstractTransformer::getCustomTokens is deprecated and will be removed in 3.0.
      */
     public function testCustomTokens()
     {