Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DEVX-3831] PHP 8.4 Compatibility #2655

Closed
wants to merge 8 commits into from
Closed

[DEVX-3831] PHP 8.4 Compatibility #2655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5777ed7
Test on PHP 8.4
greg-1-anderson Dec 13, 2024
9aa7a68
Try upgrading to Robo ^5
greg-1-anderson Dec 15, 2024
7396072
No longer test on or use PHP 7.4 in CI
greg-1-anderson Dec 15, 2024
b10b6b7
Upgrade league/container and psysh
greg-1-anderson Dec 15, 2024
c154a74
A couple more PHP 8.4 fixes
greg-1-anderson Dec 15, 2024
a1cb17a
Also add minimum PHP version to require section of composer.json
greg-1-anderson Dec 16, 2024
a5668c7
Revert "Also add minimum PHP version to require section of composer.j…
greg-1-anderson Dec 16, 2024
37f6a2c
Leave open the possibility of running on PHP 7.4 (after removing plat…
greg-1-anderson Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/3x.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading