diff --git a/.github/workflows/php-checks.yml b/.github/workflows/php-checks.yml index 3fc04d2..38d5626 100644 --- 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 new file mode 100644 index 0000000..a2c82ce --- /dev/null +++ b/.php-cs-fixer.php @@ -0,0 +1,13 @@ +setRules([ + '@PSR12' => true, + '@PHP82Migration' => true, + ]) + ->setFinder( + PhpCsFixer\Finder::create() + ->in(__DIR__) + ); diff --git a/CHANGELOG.md b/CHANGELOG.md index 403c757..aa0c5af 100644 --- 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 index a19ca26..a74197c 100644 --- 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 index d5b511d..a12bdd7 100644 --- a/src/Naneau/ProjectVersioner/Reader/Composer.php +++ b/src/Naneau/ProjectVersioner/Reader/Composer.php @@ -1,4 +1,5 @@ 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 index d465034..4b9449f 100644 --- a/tests/Naneau/ProjectVersioner/Test/Reader/GitExecTest.php +++ b/tests/Naneau/ProjectVersioner/Test/Reader/GitExecTest.php @@ -1,4 +1,5 @@ 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 index 12e1ce9..bc0e786 100644 --- a/tests/Naneau/ProjectVersioner/Test/Versioner/CombineReadersTest.php +++ b/tests/Naneau/ProjectVersioner/Test/Versioner/CombineReadersTest.php @@ -1,4 +1,5 @@ setReaders( diff --git a/tests/Naneau/ProjectVersioner/Test/VersionerTest.php b/tests/Naneau/ProjectVersioner/Test/VersionerTest.php index 5b2a55f..dc8361a 100644 --- a/tests/Naneau/ProjectVersioner/Test/VersionerTest.php +++ b/tests/Naneau/ProjectVersioner/Test/VersionerTest.php @@ -1,4 +1,5 @@