Merge pull request #1133 from Slamdunk/php_85

Add PHP 8.5 support

Author: Ocramius

.github/workflows/backwards-compatibility.yml

@@ -35,14 +35,8 @@ jobs:
           key: "php-8.2-bc-break-check-${{ hashFiles('.github/workflows/backwards-compatibility.yml') }}"
           restore-keys: "php-8.2-bc-break-check-"
 
-      # Only necessary until https://github.com/Roave/BackwardCompatibilityCheck/pull/737 gets resolved
-      - name: "Configure custom repository"
-        run: |
-          echo '{"repositories": [{"type":"vcs","url":"[email protected]:lcobucci/BackwardCompatibilityCheck.git"}]}' > ~/.composer/composer.json
-
       - name: "Install dependencies"
-        # run: composer global require roave/backward-compatibility-check
-        run: composer global require "roave/backward-compatibility-check:dev-support-baseline-configuration"
+        run: composer global require roave/backward-compatibility-check
 
       - name: "BC Check"
         run: |

.github/workflows/phpunit.yml

@@ -20,39 +20,6 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
-        operating-system:
-          - "ubuntu-latest"
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/[email protected]"
-
-      - name: "Install PHP"
-        uses: "shivammathur/[email protected]"
-        with:
-          coverage: "none"
-          php-version: "${{ matrix.php-version }}"
-          ini-values: memory_limit=-1
-          tools: composer:v2, cs2pr
-
-      - name: "Install dependencies"
-        uses: "ramsey/[email protected]"
-        with:
-          dependency-versions: "${{ matrix.dependencies }}"
-
-      - name: "Tests"
-        run: "make phpunit"
-
-  phpunit-rc:
-    name: "PHPUnit tests (nightly)"
-
-    runs-on: ${{ matrix.operating-system }}
-
-    strategy:
-      matrix:
-        dependencies:
-          - "locked"
-        php-version:
           - "8.5"
         operating-system:
           - "ubuntu-latest"
@@ -73,7 +40,6 @@ jobs:
         uses: "ramsey/[email protected]"
         with:
           dependency-versions: "${{ matrix.dependencies }}"
-          composer-options: " --ignore-platform-req=php"
 
       - name: "Tests"
         run: "make phpunit"

composer.json

@@ -17,7 +17,7 @@
         }
     ],
     "require": {
-        "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
+        "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
         "ext-openssl": "*",
         "ext-sodium": "*",
         "psr/clock": "^1.0"