Skip to content

Commit

Permalink
Allow Symfony 7 (4.x) (#308)
Browse files Browse the repository at this point in the history
* Allow Symfony 7 (4.x)

* Comply with parent return type

* Rename method so it doesnt override parent

* Set the platform PHP version to something that is acceptable to Symfony 7

* Add -n to the global-options-only test, so that it does not hang if the alias is not found (Symfony will prompt for which command you might want to run instead in this instance).

* Revert https://github.com/consolidation/annotated-command/pull/306/files

* Annotated commands that extend the AnnotatedCommand class (should be very rare?) should override "execute". Not sure why it worked any other way in the past.

* Update versions used in test matrix

---------

Co-authored-by: Greg Anderson <[email protected]>
  • Loading branch information
weitzman and Greg Anderson authored Apr 5, 2024
1 parent b5255dc commit f5e90aa
Show file tree
Hide file tree
Showing 7 changed files with 253 additions and 314 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Install PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.1
php-version: 8.2
coverage: none

- name: Install dependencies
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
- name: Install PHP with extensions
uses: shivammathur/setup-php@v2
with:
php-version: 8.0
php-version: 8.2
coverage: none
extensions: intl

Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
- windows-latest

php-version:
- "8.1"
- "8.2"

php-ini-values:
- assert.exception=1, zend.assertions=1
Expand All @@ -110,7 +110,7 @@ jobs:
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.2"
php-version: "8.3"
dependencies: highest
codecov: true
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
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
"php": ">=7.1.3",
"consolidation/output-formatters": "^4.3.1",
"psr/log": "^1 || ^2 || ^3",
"symfony/console": "^4.4.8 || ^5 || ^6",
"symfony/event-dispatcher": "^4.4.8 || ^5 || ^6",
"symfony/finder": "^4.4.8 || ^5 || ^6"
"symfony/console": "^4.4.8 || ^5 || ^6 || ^7",
"symfony/event-dispatcher": "^4.4.8 || ^5 || ^6 || ^7",
"symfony/finder": "^4.4.8 || ^5 || ^6 || ^7"
},
"require-dev": {
"composer-runtime-api": "^2.0",
Expand All @@ -36,7 +36,7 @@
"optimize-autoloader": true,
"sort-packages": true,
"platform": {
"php": "8.1.14"
"php": "8.2.17"
}
},
"scripts": {
Expand Down
Loading

0 comments on commit f5e90aa

Please sign in to comment.