Update composer json and github workflow

Author: nyamsprod

.github/workflows/build.yml

@@ -1,21 +1,23 @@
----
 name: build
 on:
   push: ~
   pull_request: ~
-
 jobs:
   linux_tests:
-    name: PHP on ${{ matrix.php }} - ${{ matrix.stability }} - ${{ matrix.composer-flags }}
+    name: PHP ${{ matrix.php }} - ${{ matrix.stability }} - ${{ matrix.flags }}
     runs-on: ubuntu-22.04
+
     strategy:
       matrix:
-        php: ['8.1', '8.2', '8.3', '8.4']
+        php: ['8.1', '8.2', '8.3', '8.4', '8.5']
         stability: [prefer-lowest, prefer-stable]
+
         include:
-          -   php: '8.5'
-              flags: "--ignore-platform-req=php"
-              stability: prefer-stable
+          - php: '8.6'
+            stability: prefer-stable
+            flags: "--ignore-platform-req=php"
+      fail-fast: false
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -26,39 +28,53 @@ jobs:
           php-version: ${{ matrix.php }}
           coverage: xdebug
           tools: composer:v2
-      - name: Check PHP Version
-        run: php -v
 
       - name: Validate composer files
         run: composer validate --strict
 
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: |
-          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v3
+      # Cache "vendor" so stable builds skip installation entirely
+      - name: Cache vendor
+        uses: actions/cache@v3
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ matrix.stability }}-${{ matrix.flags }}-${{ hashFiles('**/composer.lock') }}
+          path: ~/.composer/cache
+          key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            ${{ runner.os }}-composer-${{ matrix.stability }}-${{ matrix.flags }}-
-            ${{ runner.os }}-composer-
+            ${{ runner.os }}-vendor-
+
+      - name: Clean vendor
+        run: rm -rf vendor
+
+      # INSTALL logic
+      # 1. STABLE php + STABLE deps → composer install (NO updates)
+      - name: Install dependencies (install)
+        if: ${{ matrix.stability == 'prefer-stable' && matrix.php != '8.6' }}
+        run: composer install --prefer-dist --no-interaction --no-progress
+
+      # 2. prefer-lowest → must use composer update
+      - name: Install dependencies (prefer-lowest)
+        if: ${{ matrix.stability == 'prefer-lowest' }}
+        run: composer update --prefer-lowest --prefer-dist --no-interaction --no-progress
 
-      - name: Install dependencies
-        run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress ${{ matrix.flags }}
+      # 3. PHP 8.6 dev → always update
+      - name: Install dependencies (nightly)
+        if: ${{ matrix.php == '8.6' }}
+        run: composer update --prefer-stable --prefer-dist --no-interaction --no-progress ${{ matrix.flags }}
 
       - name: Run Unit tests with coverage
-        run: composer phpunit -- ${{ matrix.phpunit-flags }}
-        if: ${{ matrix.php != '8.5' }}
+        if: ${{ matrix.php != '8.5' && matrix.php != '8.6' }}
+        run: composer phpunit
 
-      - name: Run Unit tests without coverage
-        run: vendor/bin/phpunit --no-coverage
-        if: ${{ matrix.php == '8.5' }}
+      - name: Run Unit tests without coverage (nightly)
+        if: ${{ matrix.php == '8.6' }}
+        run: composer phpunit:no-coverage
+        continue-on-error: true
 
+      # STATIC ANALYSIS (only once)
       - name: Run static analysis
+        if: ${{ matrix.php == '8.5' && matrix.stability == 'prefer-stable' }}
         run: composer phpstan-build
-        if: ${{ matrix.php == '8.4' && matrix.stability == 'prefer-stable'}}
 
+      # CODING STYLE (only once)
       - name: Run Coding style rules
+        if: ${{ matrix.php == '8.5' && matrix.stability == 'prefer-stable' }}
         run: composer phpcs:fix
-        if: ${{ matrix.php == '8.4' && matrix.stability == 'prefer-stable'}}

composer.json

@@ -46,13 +46,13 @@
         "php" : "^8.1"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.65.0",
-        "phpstan/phpstan": "^1.12.12",
+        "friendsofphp/php-cs-fixer": "^3.95.1",
+        "phpstan/phpstan": "^1.12.33",
         "phpstan/phpstan-deprecation-rules": "^1.2.1",
-        "phpstan/phpstan-phpunit": "^1.4.1",
-        "phpstan/phpstan-strict-rules": "^1.6.1",
-        "phpunit/phpunit": "^10.5.15 || ^11.5.0",
-        "symfony/var-dumper": "^6.4.15"
+        "phpstan/phpstan-phpunit": "^1.4.2",
+        "phpstan/phpstan-strict-rules": "^1.6.2",
+        "phpunit/phpunit": "^10.5.63 || ^11.5.55 || ^12.5.23 || ^13.1.7",
+        "symfony/var-dumper": "^6.4.15 || ^v7.4.8 || ^v8.0.8"
     },
     "autoload": {
         "psr-4": {
@@ -65,10 +65,10 @@
     "scripts": {
         "phpcs": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --dry-run --diff -vvv --allow-risky=yes --ansi",
         "phpcs:fix": "php-cs-fixer fix -vvv --allow-risky=yes --ansi",
-        "phpstan": "phpstan analyse -c phpstan.neon --ansi --memory-limit 192M",
-        "phpstan-build": "phpstan analyse -c phpstan-build.neon --ansi --memory-limit 192M",
+        "phpstan": "phpstan analyse -c phpstan.neon --ansi --memory-limit=256M",
+        "phpstan-build": "phpstan analyse -c phpstan-build.neon --ansi --memory-limit=256M",
         "phpunit": "XDEBUG_MODE=coverage phpunit --coverage-text",
-        "phpunit:min": "phpunit --no-coverage",
+        "phpunit:no-coverage": "phpunit --no-coverage",
         "test": [
             "@phpunit",
             "@phpstan",
@@ -78,6 +78,7 @@
     "scripts-descriptions": {
         "phpstan": "Runs complete codebase static analysis",
         "phpunit": "Runs unit and functional testing",
+        "phpunit:no-coverage": "Runs unit and functional testing without code-coverage",
         "phpcs": "Runs coding style testing",
         "phpcs:fix": "Fix coding style issues",
         "test": "Runs all tests"

src/PeriodRelationTest.php

@@ -27,6 +27,7 @@
 use DateTimeImmutable;
 use DateTimeInterface;
 use PHPUnit\Framework\Attributes\DataProvider;
+use function count;
 
 final class PeriodRelationTest extends PeriodTestCase
 {
@@ -1081,9 +1082,7 @@ public function testSubtractWithEqualPeriodObjec(): void
         self::assertEquals($diff, $periodA->subtract($periodA));
     }
 
-    /**
-     * @dataProvider meetsProvider
-     */
+    #[DataProvider('meetsProvider')]
     public function testMeets(Period $period1, Period $period2, bool $meets, bool $meetsOnStart, bool $meetsOnEnd): void
     {
         self::assertSame($meets, $period1->meets($period2));