Merge pull request #28 from yamadashy/feat/php8.5

feat: Add PHP 8.5 support and require PHP 8.1+

Author: yamadashy

.devcontainer/Dockerfile

@@ -25,14 +25,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   lsb-release \
   && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-# Install PHP 8.4 from Sury repository
+# Install PHP 8.5 from Sury repository
 RUN curl -sSL https://packages.sury.org/php/README.txt | bash -x && \
   apt-get update && apt-get install -y --no-install-recommends \
-  php8.4-cli \
-  php8.4-mbstring \
-  php8.4-xml \
-  php8.4-curl \
-  php8.4-zip \
+  php8.5-cli \
+  php8.5-mbstring \
+  php8.5-xml \
+  php8.5-curl \
+  php8.5-zip \
   && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Install Composer

.github/workflows/tests.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php-version: ['8.1', '8.2', '8.3', '8.4', '8.5']
     steps:
       - uses: actions/checkout@v6
       - name: Setup PHP
@@ -31,7 +31,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version-file: '.tool-versions'
       - 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.4'
+          php-version-file: '.tool-versions'
       - 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.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php-version: ['8.1', '8.2', '8.3', '8.4', '8.5']
         dependency-version: [prefer-lowest, prefer-stable]
     steps:
       - uses: actions/checkout@v6

.tool-versions

@@ -1 +1 @@
-php 8.4.1
+php 8.5.0

CLAUDE.md

@@ -0,0 +1,51 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Project Overview
+
+PHPStan Friendly Formatter is a PHPStan extension that provides enhanced error output with syntax-highlighted code context around errors. It transforms standard PHPStan output into a visually clear format showing actual problematic code with line numbers.
+
+## Commands
+
+```bash
+composer test          # Run PHPUnit tests
+composer cs-fix-dry    # Check code style (dry run)
+composer cs-fix        # Fix code style issues
+composer analyze       # Run PHPStan with friendly formatter
+composer tests         # Run all: cs-fix-dry → analyze → test
+```
+
+## Architecture
+
+```
+src/
+├── FriendlyErrorFormatter.php    # Main entry point, implements PHPStan ErrorFormatter
+├── CodeHighlight/
+│   ├── CodeHighlighter.php       # Syntax highlighting with version fallback
+│   └── FallbackHighlighter.php   # Non-highlighted fallback
+├── Config/
+│   └── FriendlyFormatterConfig.php  # Formatter configuration (lineBefore, lineAfter, editorUrl)
+└── ErrorFormat/
+    ├── ErrorWriter.php           # Formats individual errors with code context
+    └── SummaryWriter.php         # Error identifier summary statistics
+```
+
+**Data Flow:** PHPStan AnalysisResult → FriendlyErrorFormatter → ErrorWriter (with CodeHighlighter) → SummaryWriter → Console output
+
+## Key Configuration Files
+
+- `phpstan.neon.dist` - PHPStan config (level 10, paths, formatter settings)
+- `extension.neon` - PHPStan extension registration and parameter schema
+- `.php-cs-fixer.dist.php` - Code style rules
+- `phpunit.xml` - PHPUnit 10/11 compatible config
+- `.tool-versions` - PHP version for local dev and CI (used by `php-version-file` in GitHub Actions)
+
+## Compatibility
+
+- PHP: ^8.1 (tested on 8.1, 8.2, 8.3, 8.4, 8.5)
+- PHPStan: ^1.0 || ^2.0
+- PHPUnit: ^10.0 || ^11.0 (tests use PHP 8 attributes)
+- php-console-highlighter: ^0.3 || ^0.4 || ^0.5 || ^1.0 (with graceful fallback)
+
+The codebase handles multiple dependency versions through class existence checks and fallback implementations.

composer.json

@@ -11,14 +11,14 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.1",
         "php-parallel-lint/php-console-highlighter": "^0.3 || ^0.4 || ^0.5 || ^1.0",
-        "phpstan/phpstan": "^0.12 || ^1.0 || ^2.0"
+        "phpstan/phpstan": "^1.0 || ^2.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.4.0",
         "phpstan/phpstan-phpunit": "^2.0",
-        "phpunit/phpunit": "^8.5.26 || ^10.0.0"
+        "phpunit/phpunit": "^10.0 || ^11.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

phpunit.xml

@@ -4,22 +4,17 @@
          bootstrap="vendor/autoload.php"
          cacheDirectory=".phpunit.cache"
          executionOrder="depends,defects"
-         requireCoverageMetadata="true"
-         beStrictAboutCoverageMetadata="true"
          beStrictAboutOutputDuringTests="true"
-         displayDetailsOnPhpunitDeprecations="true"
-         failOnPhpunitDeprecation="true"
          failOnRisky="true"
          failOnWarning="true">
     <testsuites>
         <testsuite name="default">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-
-    <source restrictDeprecations="true" restrictNotices="true" restrictWarnings="true">
+    <coverage>
         <include>
             <directory>src</directory>
         </include>
-    </source>
+    </coverage>
 </phpunit>

tests/CodeHighlight/CodeHighlighterTest.php

@@ -2,22 +2,19 @@
 
 namespace Tests\CodeHighlight;
 
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Tests\TestUtils\StringUtil;
 use Yamadashy\PhpStanFriendlyFormatter\CodeHighlight\CodeHighlighter;
 
 /**
  * @internal
- *
- * @coversDefaultClass \Yamadashy\PhpStanFriendlyFormatter\CodeHighlight\CodeHighlighter
  */
+#[CoversClass(CodeHighlighter::class)]
 final class CodeHighlighterTest extends TestCase
 {
-    /**
-     * @dataProvider provideHighlightCases
-     *
-     * @covers ::highlight
-     */
+    #[DataProvider('provideHighlightCases')]
     public function testHighlight(
         string $filePath,
         int $lineNumber,

tests/FriendlyErrorFormatterTest.php

@@ -8,23 +8,21 @@
 use PHPStan\File\NullRelativePathHelper;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\Testing\ErrorFormatterTestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\TestUtils\StringUtil;
 use Yamadashy\PhpStanFriendlyFormatter\FriendlyErrorFormatter;
 
 /**
  * @internal
- *
- * @coversDefaultClass \Yamadashy\PhpStanFriendlyFormatter\FriendlyErrorFormatter
  */
+#[CoversClass(FriendlyErrorFormatter::class)]
 final class FriendlyErrorFormatterTest extends ErrorFormatterTestCase
 {
     /**
-     * @dataProvider provideFormatErrorsCases
-     *
      * @param list<string> $expectedOutputSubstrings
-     *
-     * @covers ::formatErrors
      */
+    #[DataProvider('provideFormatErrorsCases')]
     public function testFormatErrors(
         int $expectedExitCode,
         int $numFileErrors,