Merge pull request #15 from yamadashy/feature/phpstan-v2

Update to PHPStan 2.0

.github/workflows/tests.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3']
     steps:
       - uses: actions/checkout@v4
       - name: Setup PHP
@@ -31,7 +31,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: '8.3'
       - name: Install dependencies
         run: composer update --no-interaction --no-progress --ansi
       - name: Run coding standards check
@@ -45,7 +45,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: '8.3'
       - name: Install dependencies
         run: composer update --no-interaction --no-progress --ansi
       - name: Run static analysis
@@ -67,7 +67,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3']
         dependency-version: [prefer-lowest, prefer-stable]
     steps:
       - uses: actions/checkout@v4

.tool-versions

@@ -1 +1 @@
-php 8.3.11
+php 8.3.13

composer.json

@@ -11,14 +11,13 @@
         }
     ],
     "require": {
-        "php": "^7.2 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "php-parallel-lint/php-console-highlighter": "^0.3 || ^0.4 || ^0.5 || ^1.0",
-        "phpstan/phpstan": "^0.12 || ^1.0"
+        "phpstan/phpstan": "^0.12 || ^1.0 || ^2.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.4.0",
-        "grifart/phpstan-oneline": "^0.4.2",
-        "phpstan/phpstan-phpunit": "^0.12.22 || ^1.0",
+        "phpstan/phpstan-phpunit": "^2.0",
         "phpunit/phpunit": "^8.5.26 || ^10.0.0"
     },
     "minimum-stability": "dev",
@@ -52,7 +51,6 @@
         "analyze": "phpstan analyze -c phpstan.neon.dist --error-format friendly",
         "analyze-raw": "phpstan analyze -c phpstan.neon.dist --error-format raw",
         "analyze-table": "phpstan analyze -c phpstan.neon.dist --error-format table",
-        "analyze-oneline": "phpstan analyze -c phpstan.neon.dist --error-format oneline",
         "cs-fix": "php-cs-fixer fix",
         "cs-fix-dry": "php-cs-fixer fix --dry-run"
     }

phpstan.neon.dist

@@ -1,18 +1,16 @@
 includes:
     - extension.neon
-    - vendor/grifart/phpstan-oneline/config.neon
     - vendor/phpstan/phpstan-phpunit/extension.neon
     - vendor/phpstan/phpstan-phpunit/rules.neon
 
 parameters:
-    level: 9
+    level: 10
     paths:
         - src
         - tests
 
     excludePaths:
         - tests/data/
-        - tests/Abstracts/
 
     checkUninitializedProperties: true
     checkMissingCallableSignature: true

tests/CodeHighlight/CodeHighlighterTest.php

@@ -9,7 +9,7 @@
 /**
  * @internal
  *
- * @coversDefaultClass \Yamadashy\PhpStanFriendlyFormatter\CodeHighlighter
+ * @coversDefaultClass \Yamadashy\PhpStanFriendlyFormatter\CodeHighlight\CodeHighlighter
  */
 final class CodeHighlighterTest extends TestCase
 {