Merge branch 'release/2.0.0-rc6'

php-tuf · Nov 19, 2024 · 5ab70d1 · 5ab70d1
2 parents 9c5aef2 + 5416717
commit 5ab70d1
Show file tree

Hide file tree

Showing 18 changed files with 295 additions and 224 deletions.
diff --git a/.github/workflows/compatability.yml b/.github/workflows/compatability.yml
@@ -0,0 +1,33 @@
+---
+name: Compatability
+
+on:
+    schedule:
+        # Every Monday at 00:00:00 UTC.
+        # @see https://crontab.cronhub.io/
+        -   cron: "0 0 * * 1"
+
+    workflow_dispatch:
+
+jobs:
+    compatability:
+        name: Compatability
+        runs-on: ubuntu-latest
+        steps:
+            -   name: Install rsync
+                uses: GuillaumeFalourd/[email protected] # https://github.com/marketplace/actions/setup-rsync
+
+            -   name: Set up PHP
+                uses: shivammathur/setup-php@v2 # https://github.com/marketplace/actions/setup-php-action
+                with:
+                    php-version: '8.3'
+                    coverage: none
+
+            -   name: Checkout code
+                uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
+
+            -   name: Install dependencies
+                uses: ramsey/composer-install@v3 # https://github.com/marketplace/actions/install-composer-dependencies
+
+            -   name: Run compatability tests
+                run: composer compatability
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -74,8 +74,21 @@ jobs:
 
             -   name: "Debugging info"
                 run: |
-                    rsync --version | head -1
+                    echo "::group::PHP"
+                    which php
                     php -i
+                    echo "::endgroup::"
+
+                    echo "::group::Composer"
+                    composer --version
+                    composer --format=json | jq '.' -C > composer-output.log
+                    head -5 composer-output.log
+                    echo "::endgroup::"
+
+                    echo "::group::rsync"
+                    which rsync
+                    rsync --version
+                    echo "::endgroup::"
 
             -   name: "Checkout code"
                 uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
@@ -85,6 +98,15 @@ jobs:
                 with:
                     dependency-versions: "${{ matrix.dependencies }}est"
 
+            -   name: "Show installed versions"
+                shell: bash
+                env:
+                    NO_COLOR: "1"
+                run: |
+                    output=$(composer show | awk '{print "- "$1" ("$2")"}')
+                    echo "$output"
+                    echo "Total packages: $(echo "$output" | wc -l | tr -d ' ')"
+
             -   name: "Run core tests with coverage"
                 run: "composer test"
                 if: ${{ matrix.os == 'ubuntu' && matrix.dependencies == 'high' && matrix.php == '8.3' }}
@@ -124,28 +146,6 @@ jobs:
             -   name: "Run performance tests"
                 run: "composer phpbench -- --progress=plain --ansi"
 
-    compatability:
-        name: "Compatability"
-        runs-on: ubuntu-latest
-        steps:
-            -   name: "Install rsync"
-                uses: GuillaumeFalourd/[email protected] # https://github.com/marketplace/actions/setup-rsync
-
-            -   name: "Set up PHP"
-                uses: shivammathur/setup-php@v2 # https://github.com/marketplace/actions/setup-php-action
-                with:
-                    php-version: "8.3"
-                    coverage: none
-
-            -   name: "Checkout code"
-                uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
-
-            -   name: "Install dependencies"
-                uses: ramsey/composer-install@v3 # https://github.com/marketplace/actions/install-composer-dependencies
-
-            -   name: "Run compatability tests"
-                run: "composer compatability"
-
     mutation:
         name: "Mutation"
         runs-on: ubuntu-latest

diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
@@ -3,20 +3,20 @@ name: Performance
 
 on:
     schedule:
-        # Every Wednesday at 00:00:00 UTC.
+        # Every Monday at 00:00:00 UTC.
         # @see https://crontab.cronhub.io/
-        -   cron: "0 0 * * 3"
+        -   cron: "0 0 * * 1"
 
     workflow_dispatch:
 
 jobs:
     performance:
-        name: "Bench: ${{ matrix.os }}"
-        runs-on: "${{ matrix.os }}"
+        name: "Performance: ${{ matrix.os }}"
+        runs-on: "${{ matrix.os }}-latest"
         strategy:
             fail-fast: false
             matrix:
-                os: [ ubuntu-latest, macos-latest, windows-latest ]
+                os: [ ubuntu, macos, windows ]
                 php: [ "8.2" ]
         steps:
             -   name: "Install rsync"

diff --git a/.idea/dictionaries/project.xml b/.idea/dictionaries/project.xml
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         "php": ">=8.1.0",
         "ext-json": "*",
         "symfony/filesystem": "^6.2 || ^7.0",
-        "symfony/process": "^6.2 || ^7.0",
+        "symfony/process": "^6.4.14 || ^7.1.7",
         "symfony/translation-contracts": "^3.1"
     },
     "require-dev": {
@@ -42,6 +42,10 @@
         "symfony/yaml": "^6.3",
         "thecodingmachine/phpstan-strict-rules": "^1.0"
     },
+    "conflict": {
+        "symfony/process": ">=6 <6.4.14 || >=7 <7.1.7",
+        "symfony/symfony": ">=6 <6.4.14 || >=7 <7.1.7"
+    },
     "suggest": {
         "symfony/dependency-injection": "For dependency injection",
         "symfony/translation": "For internationalization tools"