Add PHP 8.4, remove PHP 8.1

stephank · stephank · commit 8e4be524525e · 2024-12-13T11:15:12.000+01:00
diff --git a/.github/workflows/php-checks.yml b/.github/workflows/php-checks.yml
@@ -5,11 +5,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['8.1', '8.2', '8.3']
+        php-versions: ['8.2', '8.3', '8.4']
     name: PHP ${{ matrix.php-versions }} tests
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -19,10 +19,10 @@ jobs:
 
       - name: Get composer cache directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -0,0 +1,13 @@
+<?php
+
+$config = new PhpCsFixer\Config();
+
+return $config
+    ->setRules([
+        '@PSR12' => true,
+        '@PHP82Migration' => true,
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in(__DIR__)
+    );
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 4.0.0
+
+- Dropped support for PHP `8.1` and lower.
+- Added support for PHP `8.4`.
+- Compatible with Symfony 6 and 7.
+
 ## 3.0.0
 
 ### PHP support
diff --git a/composer.json b/composer.json
@@ -40,13 +40,14 @@
   },
   "minimum-stability": "stable",
   "require": {
-    "php": "8.1.* || 8.2.* || 8.3.*",
+    "php": "8.2 - 8.4",
     "ext-json": "*",
-    "symfony/finder": "^6.0.0"
+    "symfony/finder": "6 - 7"
   },
   "require-dev": {
-    "phpstan/phpstan": "1.10.46",
-    "phpunit/phpunit": "10.4.2",
-    "squizlabs/php_codesniffer": "3.7.2"
+    "phpstan/phpstan": "2.0.3",
+    "phpunit/phpunit": "11.5.1",
+    "squizlabs/php_codesniffer": "3.11.2",
+    "friendsofphp/php-cs-fixer": "^3.65"
   }
 }
diff --git a/src/Naneau/ProjectVersioner/Reader/Composer.php b/src/Naneau/ProjectVersioner/Reader/Composer.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Naneau\ProjectVersioner\Reader;
 
 use Naneau\ProjectVersioner\ReaderInterface;
diff --git a/src/Naneau/ProjectVersioner/Reader/ComposerJson.php b/src/Naneau/ProjectVersioner/Reader/ComposerJson.php
@@ -1,9 +1,9 @@
 <?php
+
 namespace Naneau\ProjectVersioner\Reader;
 
 use JsonException;
 use Naneau\ProjectVersioner\ReaderInterface;
-
 use stdClass;
 
 /**
diff --git a/src/Naneau/ProjectVersioner/Reader/ComposerPackage.php b/src/Naneau/ProjectVersioner/Reader/ComposerPackage.php
@@ -1,9 +1,9 @@
 <?php
+
 namespace Naneau\ProjectVersioner\Reader;
 
 use JsonException;
 use Naneau\ProjectVersioner\ReaderInterface;
-
 use stdClass;
 use RuntimeException;
 
diff --git a/src/Naneau/ProjectVersioner/Reader/File.php b/src/Naneau/ProjectVersioner/Reader/File.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Naneau\ProjectVersioner\Reader;
 
 use Naneau\ProjectVersioner\ReaderInterface;
diff --git a/src/Naneau/ProjectVersioner/Reader/Finder/Contents.php b/src/Naneau/ProjectVersioner/Reader/Finder/Contents.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Naneau\ProjectVersioner\Reader\Finder;
 
 /**
diff --git a/src/Naneau/ProjectVersioner/Reader/Finder/Finder.php b/src/Naneau/ProjectVersioner/Reader/Finder/Finder.php
@@ -1,8 +1,8 @@
 <?php
+
 namespace Naneau\ProjectVersioner\Reader\Finder;
 
 use Naneau\ProjectVersioner\ReaderInterface;
-
 use Symfony\Component\Finder\Finder as SfFinder;
 
 /**
@@ -21,7 +21,7 @@ public function __construct(?string $name = null, ?SfFinder $finder = null)
     {
         // Create finder if not given
         if ($finder === null) {
-            $finder = new SfFinder;
+            $finder = new SfFinder();
         }
 
         // Set name if given
diff --git a/src/Naneau/ProjectVersioner/Reader/Finder/MTime.php b/src/Naneau/ProjectVersioner/Reader/Finder/MTime.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Naneau\ProjectVersioner\Reader\Finder;
 
 /**
diff --git a/src/Naneau/ProjectVersioner/Reader/Git/Commit/Exec.php b/src/Naneau/ProjectVersioner/Reader/Git/Commit/Exec.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Naneau\ProjectVersioner\Reader\Git\Commit;
 
 use Naneau\ProjectVersioner\Reader\Git\Exec as GitExec;
diff --git a/src/Naneau/ProjectVersioner/Reader/Git/Describe/Exec.php b/src/Naneau/ProjectVersioner/Reader/Git/Describe/Exec.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Naneau\ProjectVersioner\Reader\Git\Describe;
 
 use Naneau\ProjectVersioner\Reader\Git\Exec as GitExec;
diff --git a/src/Naneau/ProjectVersioner/Reader/Git/Exec.php b/src/Naneau/ProjectVersioner/Reader/Git/Exec.php
@@ -1,8 +1,8 @@
 <?php
+
 namespace Naneau\ProjectVersioner\Reader\Git;
 
 use Naneau\ProjectVersioner\ReaderInterface;
-
 use RuntimeException;
 
 /**
diff --git a/src/Naneau/ProjectVersioner/Reader/Git/Tag/Exec.php b/src/Naneau/ProjectVersioner/Reader/Git/Tag/Exec.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Naneau\ProjectVersioner\Reader\Git\Tag;
 
 use Naneau\ProjectVersioner\Reader\Git\Exec as GitExec;
diff --git a/src/Naneau/ProjectVersioner/ReaderInterface.php b/src/Naneau/ProjectVersioner/ReaderInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Naneau\ProjectVersioner;
 
 /**
diff --git a/src/Naneau/ProjectVersioner/Versioner.php b/src/Naneau/ProjectVersioner/Versioner.php
@@ -1,9 +1,9 @@
 <?php
+
 namespace Naneau\ProjectVersioner;
 
 use Naneau\ProjectVersioner\ReaderInterface as Reader;
-
-use \RuntimeException;
+use RuntimeException;
 
 /**
  * Versioner
diff --git a/tests/Naneau/ProjectVersioner/Test/Reader/ComposerTest.php b/tests/Naneau/ProjectVersioner/Test/Reader/ComposerTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Naneau\ProjectVersioner\Test\Reader;
 
 use Naneau\ProjectVersioner\Versioner;
@@ -12,7 +13,7 @@ public function testRead(): void
     {
         $directory = __DIR__ . '/../../../../projects/composer';
 
-        $readers = [new ComposerReader];
+        $readers = [new ComposerReader()];
 
         $versioner = new Versioner($readers);
 
@@ -34,7 +35,7 @@ public function testComposerJsonRead(): void
     {
         $directory = __DIR__ . '/../../../../projects/composer';
 
-        $readers = [new ComposerJsonReader];
+        $readers = [new ComposerJsonReader()];
 
         $versioner = new Versioner($readers);
 
diff --git a/tests/Naneau/ProjectVersioner/Test/Reader/FileTest.php b/tests/Naneau/ProjectVersioner/Test/Reader/FileTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Naneau\ProjectVersioner\Test\Reader;
 
 use Naneau\ProjectVersioner\Versioner;
diff --git a/tests/Naneau/ProjectVersioner/Test/Reader/FinderTest.php b/tests/Naneau/ProjectVersioner/Test/Reader/FinderTest.php
@@ -1,10 +1,10 @@
 <?php
+
 namespace Naneau\ProjectVersioner\Test\Reader;
 
 use Naneau\ProjectVersioner\Versioner;
 use Naneau\ProjectVersioner\Reader\Finder\MTime as MTimeReader;
 use Naneau\ProjectVersioner\Reader\Finder\Contents as ContentsReader;
-
 use Symfony\Component\Finder\Finder;
 
 class FinderTest extends \PHPUnit\Framework\TestCase
@@ -27,7 +27,7 @@ public function testContents(): void
         $versioner = new Versioner([new ContentsReader('*.php')]);
 
         self::assertEquals(
-            'db9d80',
+            'd35015',
             $versioner->get(
                 __DIR__ . '/../../../../projects/finder'
             )
@@ -56,11 +56,11 @@ public function testEmptyNamesWithFinder(): void
 
         $directory = __DIR__ . '/../../../../projects/finder';
 
-        $finderTxt = new Finder;
+        $finderTxt = new Finder();
         $finderTxt->name('*.txt');
         $versionerTxt = new Versioner([new MTimeReader(null, $finderTxt)]);
 
-        $finderPhp = new Finder;
+        $finderPhp = new Finder();
         $finderPhp->name('*.php');
         $versionerPhp = new Versioner([new MTimeReader(null, $finderPhp)]);
 
@@ -78,7 +78,7 @@ public function testNamesAndFinder(): void
     {
         $directory = __DIR__ . '/../../../../projects/finder';
 
-        $finder = new Finder;
+        $finder = new Finder();
         $finder->name('*.txt');
         $versioner = new Versioner([new MTimeReader('*.php', $finder)]);
 
diff --git a/tests/Naneau/ProjectVersioner/Test/Reader/GitExecTest.php b/tests/Naneau/ProjectVersioner/Test/Reader/GitExecTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Naneau\ProjectVersioner\Test\Reader;
 
 use Naneau\ProjectVersioner\Versioner;
@@ -16,7 +17,7 @@ public function testShortCommitRead(): void
         $versionOutput = self::execInDir(['git rev-parse --short HEAD']);
         $version = $versionOutput[0];
 
-        $versioner = new Versioner([new GitCommitExecReader]);
+        $versioner = new Versioner([new GitCommitExecReader()]);
 
         self::assertEquals($version, $versioner->get(self::getDirectory()));
     }
@@ -42,14 +43,14 @@ public function testDescribeRead(): void
         $versionOutput = self::execInDir(['git describe']);
         $version = $versionOutput[0];
 
-        $versioner = new Versioner([new GitDescribeExecReader]);
+        $versioner = new Versioner([new GitDescribeExecReader()]);
 
         self::assertEquals($version, $versioner->get(self::getDirectory()));
     }
 
     public function testTagRead(): void
     {
-        $versioner = new Versioner([new GitTagExecReader]);
+        $versioner = new Versioner([new GitTagExecReader()]);
         self::assertEquals('0.0.2', $versioner->get(self::getDirectory()));
     }
 
@@ -63,7 +64,7 @@ public function setUp(): void
             'touch testfile',
             'git init',
             'git config user.email "php@unit.test"',
-            'git config user.name "PHPUnit"'
+            'git config user.name "PHPUnit"',
         ]);
 
         // Add commits, with matching tags
@@ -79,7 +80,7 @@ public function setUp(): void
                 // Not in tag
                 sprintf('touch test.%d.notag', $x),
                 sprintf('git add test.%d.notag', $x),
-                sprintf('git commit -m "commit %d no tag"', $x)
+                sprintf('git commit -m "commit %d no tag"', $x),
             ]);
         }
     }
diff --git a/tests/Naneau/ProjectVersioner/Test/Versioner/CombineReadersTest.php b/tests/Naneau/ProjectVersioner/Test/Versioner/CombineReadersTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Naneau\ProjectVersioner\Test\Versioner;
 
 use Naneau\ProjectVersioner\Versioner;
@@ -13,7 +14,7 @@ public function testComposerFirst(): void
         $readers = [
             new ComposerPackageReader('symfony/filesystem'),
             new ComposerReader(),
-            new FileReader('VERSION')
+            new FileReader('VERSION'),
         ];
 
         $versioner = new Versioner($readers);
@@ -31,7 +32,7 @@ public function testFileFirst(): void
         $readers = [
             new FileReader('VERSION'),
             new ComposerPackageReader('symfony/filesystem'),
-            new ComposerReader()
+            new ComposerReader(),
         ];
 
         $versioner = new Versioner($readers);
@@ -49,7 +50,7 @@ public function testComposerFirstWithCombine(): void
         $readers = [
             new ComposerPackageReader('symfony/filesystem'),
             new ComposerReader(),
-            new FileReader('VERSION')
+            new FileReader('VERSION'),
         ];
 
         $versioner = new Versioner($readers);
@@ -68,7 +69,7 @@ public function testFileFirstWithCombine(): void
         $readers = [
             new FileReader('VERSION'),
             new ComposerPackageReader('symfony/filesystem'),
-            new ComposerReader()
+            new ComposerReader(),
         ];
         $versioner = new Versioner($readers);
 
@@ -82,7 +83,7 @@ public function testFileFirstWithCombine(): void
 
     public function testHasAVersion(): void
     {
-        $versioner = new Versioner;
+        $versioner = new Versioner();
 
         // This one should have a version
         $versioner->setReaders(
diff --git a/tests/Naneau/ProjectVersioner/Test/VersionerTest.php b/tests/Naneau/ProjectVersioner/Test/VersionerTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Naneau\ProjectVersioner\Test;
 
 use Naneau\ProjectVersioner\Versioner;
diff --git a/tests/projects/finder/DirectoryOne/FileThree.php b/tests/projects/finder/DirectoryOne/FileThree.php
@@ -1,2 +1,3 @@
 <?php
+
 echo 'FileThree';
diff --git a/tests/projects/finder/DirectoryTwo/FileSix.php b/tests/projects/finder/DirectoryTwo/FileSix.php
@@ -1,2 +1,3 @@
 <?php
+
 echo 'FileSix';
diff --git a/tests/projects/finder/FileTwo.php b/tests/projects/finder/FileTwo.php
@@ -1,2 +1,3 @@
 <?php
+
 echo 'FileTwo';

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<?php`
	`2`	`+`
`2`	`3`	`namespace Naneau\ProjectVersioner\Reader;`
`3`	`4`
`4`	`5`	`use Naneau\ProjectVersioner\ReaderInterface;`