Merge branch 'main' into custom-transport

consolidation · Mar 4, 2022 · 1f29422 · 1f29422
2 parents cc07d0f + 59f391e
commit 1f29422
Show file tree

Hide file tree

Showing 10 changed files with 1,020 additions and 643 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.0
           coverage: none
 
       - name: Install dependencies
@@ -63,7 +63,8 @@ jobs:
           composer --working-dir=tools require roave/backward-compatibility-check:^5
 
       - name: Run roave/backward-compatibility-check
-        run: ./tools/vendor/bin/roave-backward-compatibility-check --from=4.1.2
+        if: false
+        run: ./tools/vendor/bin/roave-backward-compatibility-check --from=5.0.0
 
   tests:
     name: Tests
@@ -80,28 +81,15 @@ jobs:
           - windows-latest
 
         php-version:
-          - "7.4"
+          - "8.0"
 
         php-ini-values:
-          - assert.exception=1, zend.assertions=1
+          - assert.exception=1, zend.assertions=1, opcache.enable=1, opcache.enable_cli=1, opcache.optimization_level=-1, opcache.jit_buffer_size=4096M, opcache.jit=1205
 
         dependencies:
           - locked
 
         include:
-          - os: ubuntu-latest
-            php-version: "7.1"
-            dependencies: lowest
-
-          - os: ubuntu-latest
-            php-version: "7.4"
-            dependencies: highest
-
-          - os: ubuntu-latest
-            php-version: "8.0"
-            dependencies: highest
-            php-ini-values: assert.exception=1, zend.assertions=1, opcache.enable=1, opcache.enable_cli=1, opcache.optimization_level=-1, opcache.jit_buffer_size=4096M, opcache.jit=1205
-
           - os: ubuntu-latest
             php-version: "8.1"
             dependencies: highest

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,14 @@
 
 * Adds a new option to site aliases which lets users specify any command to wrap invoked processes (#61).
 
+### 5.0.0 - 2022/Feb/18
+
+* Support symfony/process ^6
+
+### 4.2.0 - 2022/Feb/18
+
+* Support kubectl transport (#60)
+
 ### 4.1.3 / 4.1.2 - 2022/Jan/18
 
 * Support symfony/process ^5 via illicit access to a private member (#58)

diff --git a/composer.json b/composer.json
@@ -23,16 +23,15 @@
         }
     },
     "require": {
-        "php": ">=7.1.3",
-        "consolidation/config": "^1.2.1|^2",
+        "php": ">=8.0.14",
+        "consolidation/config": "^2",
         "consolidation/site-alias": "^3",
-        "symfony/process": "^4.3.4|^5",
-        "symfony/console": "^2.8.52|^3|^4.4|^5"
+        "symfony/process": "^6",
+        "symfony/console": "^5.4 || ^6"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^3",
-        "phpunit/phpunit": "^7.5.20|^8.5.14",
-        "yoast/phpunit-polyfills": "^0.2.0"
+        "phpunit/phpunit": "^9"
     },
     "scripts": {
         "cs": "phpcs --standard=PSR2 -n src",
@@ -52,12 +51,12 @@
         "optimize-autoloader": true,
         "sort-packages": true,
         "platform": {
-            "php": "7.2.28"
+            "php": "8.0.14"
         }
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "4.x-dev"
+            "dev-main": "5.x-dev"
         }
     }
 }