Merge pull request #14 from creative-commoners/pulls/1.2/broken-builds

DEP Bump minimum version of phpstan
silverstripe · Dec 19, 2024 · bf0c60f · bf0c60f
2 parents f91a320 + c5fc2ca
commit bf0c60f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "license": "BSD-3-Clause",
     "require": {
         "php": "^8.1",
-        "phpstan/phpstan": "^1.11"
+        "phpstan/phpstan": "^1.12.13"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.6",

diff --git a/tests/PHPStan/KeywordSelfRuleTest.php b/tests/PHPStan/KeywordSelfRuleTest.php
@@ -24,17 +24,20 @@ public function provideRule()
             'interface' => [
                 'filePaths' => [__DIR__ . '/KeywordSelfRuleTest/TestInterface.php'],
                 'errorMessage' => "Can't use keyword 'self'. Use 'TestInterface' instead.",
-                'errorLines' => [13, 18, 18],
+                // Note that 13 only actually has one violation, but does no harm to be counted twice.
+                'errorLines' => [13, 13, 18, 18],
             ],
             'class' => [
                 'filePaths' => [__DIR__ . '/KeywordSelfRuleTest/TestClass.php'],
                 'errorMessage' => "Can't use keyword 'self'. Use 'TestClass' instead.",
-                'errorLines' => [9, 11, 16, 16, 18, 20, 21, 21, 25],
+                // Note that 9 and 21 only actually have one violation, but does no harm to be counted twice.
+                'errorLines' => [9, 9, 11, 16, 16, 18, 20, 21, 21, 21, 25],
             ],
             'enum' => [
                 'filePaths' => [__DIR__ . '/KeywordSelfRuleTest/TestEnum.php'],
                 'errorMessage' => "Can't use keyword 'self'. Use 'TestEnum' instead.",
-                'errorLines' => [9, 14, 14, 16, 17, 18, 20, 24],
+                // Note that 9, 16, and 17 only actually have one violation, but does no harm to be counted twice.
+                'errorLines' => [9, 9, 14, 14, 16, 16, 17, 17, 18, 20, 24],
             ],
             'trait' => [
                 'filePaths' => [