Skip to content

Commit

Permalink
[DEVX-3831] PHP 8.4 Compatibility; removes support for PHP 8.1 and ea…
Browse files Browse the repository at this point in the history
…rlier. (#2655)
  • Loading branch information
greg-1-anderson committed Dec 16, 2024
1 parent c004177 commit c3413b4
Show file tree
Hide file tree
Showing 7 changed files with 839 additions and 876 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/3x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
checkout_build:
runs-on: ubuntu-latest
container:
image: quay.io/pantheon-public/php-ci:v7.4
image: quay.io/pantheon-public/php-ci:v8.2
name: Checkout & build Phar
steps:
- name: Checkout
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
strategy:
matrix:
operating-system: [ 'macos-latest' ]
php-versions: [ '7.4', '8.2', '8.3' ]
php-versions: [ '8.2', '8.4' ]
max-parallel: 1
env:
TERMINUS_TOKEN: ${{ secrets.TERMINUS_TOKEN }}
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
runs-on: ubuntu-latest
name: Release
container:
image: quay.io/pantheon-public/php-ci:v7.4
image: quay.io/pantheon-public/php-ci:v8.2
needs: [ functional ]
if: ${{ startsWith(github.ref, 'refs/tags/') && github.repository == 'pantheon-systems/terminus' }}
steps:
Expand Down
6 changes: 3 additions & 3 deletions bin/terminus
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ if (version_compare(PHP_VERSION, '7.4.0', '<') === true) {
exit(1);
}

if (!getenv('TERMINUS_ALLOW_UNSUPPORTED_NEWER_PHP') && version_compare(PHP_VERSION, '8.4.0', '>=') === true) {
if (!getenv('TERMINUS_ALLOW_UNSUPPORTED_NEWER_PHP') && version_compare(PHP_VERSION, '8.5.0', '>=') === true) {
fwrite(STDERR, "\n");
fwrite(STDERR, 'PHP 8.4+ is not supported by this version of Terminus.' . "\n");
fwrite(STDERR, 'PHP 8.5+ is not supported by this version of Terminus.' . "\n");
fwrite(STDERR, 'Check for new versions at https://github.com/pantheon-systems/terminus/releases' . "\n");
fwrite(STDERR, "\n");
fwrite(STDERR, 'Set environment variable TERMINUS_ALLOW_UNSUPPORTED_NEWER_PHP to try continuing anyway.' . "\n");
Expand All @@ -32,7 +32,7 @@ if (!getenv('TERMINUS_ALLOW_UNSUPPORTED_NEWER_PHP') && version_compare(PHP_VERSI

// This variable is automatically managed via updateDependenciesversion() in /RoboFile.php,
// which is run after every call to composer update.
$terminusPluginsDependenciesVersion = 'a6b56bb299';
$terminusPluginsDependenciesVersion = '51e2c517dd';

// Cannot use $_SERVER superglobal since that's empty during phpunit testing
// getenv('HOME') isn't set on Windows and generates a Notice.
Expand Down
17 changes: 6 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,32 +16,27 @@
"php": ">=7.4",
"ext-json": "*",
"composer/semver": "^3",
"consolidation/comments": "^1.0.2",
"consolidation/comments": "^1.0.2 || ^2",
"consolidation/filter-via-dot-access-data": "^2.0",
"consolidation/output-formatters": "^4",
"consolidation/robo": "^3 || ^5",
"consolidation/self-update": "^2.0.4",
"consolidation/site-alias": "^4.0",
"czproject/git-php": "^4.0",
"guzzlehttp/guzzle": "^7.0",
"justinrainbow/json-schema": "^5.2",
"league/container": "^3",
"league/container": "^4.2",
"monolog/monolog": "^2.2",
"psy/psysh": "^0.11.9",
"psy/psysh": "^0.12.6",
"rogervila/array-diff-multidimensional": "^2.0",
"symfony/console": "^5",
"symfony/finder": "^5",
"symfony/process": "^5",
"symfony/yaml": "^5",
"twig/twig": "^3.3",
"consolidation/robo": "^3.0"
"twig/twig": "^3.3"
},
"require-dev": {
"ext-pcov": "*",
"behat/behat": "^3.2.2",
"erusev/parsedown": "^1.7",
"friendsofphp/php-cs-fixer": "^3.17",
"pcov/clobber": "^2.0",
"php-vcr/php-vcr": "~1.5.2",
"phpunit/php-code-coverage": "^9.2",
"phpunit/phpcov": "^8.2",
"phpunit/phpunit": "^9",
Expand Down Expand Up @@ -168,7 +163,7 @@
"preferred-install": "dist",
"sort-packages": true,
"platform": {
"php": "7.4"
"php": "8.2.26"
},
"allow-plugins": {
"phpstan/extension-installer": true
Expand Down
Loading

0 comments on commit c3413b4

Please sign in to comment.