DEP Bump minimum version of phpstan

creative-commoners · Dec 18, 2024 · 3da58dc · 3da58dc
1 parent f91a320
commit 3da58dc
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 5 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",
@@ -28,5 +28,11 @@
 		}
 	},
     "minimum-stability": "dev",
-    "prefer-stable": true
+    "prefer-stable": true,
+    "config": {
+        "allow-plugins": {
+            "composer/installers": true,
+            "silverstripe/vendor-plugin": true
+        }
+    }
 }
diff --git a/public/_resources/.htaccess b/public/_resources/.htaccess
@@ -0,0 +1,10 @@
+# Block .method file
+<Files .method>
+    Require all denied
+</Files>
+
+# Prevent file listings
+<IfModule mod_dir.c>
+    DirectoryIndex disabled
+    DirectorySlash On
+</IfModule>
diff --git a/public/_resources/.method b/public/_resources/.method
@@ -0,0 +1 @@
+auto
diff --git a/public/_resources/vendor/silverstripe/framework/client/images b/public/_resources/vendor/silverstripe/framework/client/images
@@ -0,0 +1 @@
+../../../../../../vendor/silverstripe/framework/client/images
diff --git a/public/_resources/vendor/silverstripe/framework/client/styles b/public/_resources/vendor/silverstripe/framework/client/styles
@@ -0,0 +1 @@
+../../../../../../vendor/silverstripe/framework/client/styles
diff --git a/tests/PHPStan/KeywordSelfRuleTest.php b/tests/PHPStan/KeywordSelfRuleTest.php
@@ -24,17 +24,17 @@ public function provideRule()
             'interface' => [
                 'filePaths' => [__DIR__ . '/KeywordSelfRuleTest/TestInterface.php'],
                 'errorMessage' => "Can't use keyword 'self'. Use 'TestInterface' instead.",
-                'errorLines' => [13, 18, 18],
+                '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],
+                '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],
+                'errorLines' => [9, 9, 14, 14, 16, 16, 17, 17, 18, 20, 24],
             ],
             'trait' => [
                 'filePaths' => [
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../../../../vendor/silverstripe/framework/client/images