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.

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

Update Symfony client compatibility in composer.json, minimum compatibility for PHP is no 7.4 #49

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 6 additions & 15 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,14 @@ jobs:
- name: PHP CS Fixer
run: ./vendor/bin/php-cs-fixer fix --dry-run

- name: Run ergebnis/composer-normalize
run: composer normalize --dry-run --no-check-lock

tests-common:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down Expand Up @@ -52,7 +55,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down Expand Up @@ -81,19 +84,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
symfony-http-client-versions: ['5.4', '6.0', '6.1', '6.2', '6.3', '6.4']
exclude:
- php-versions: '7.2'
symfony-http-client-versions: '6.0'
- php-versions: '7.3'
symfony-http-client-versions: '6.0'
- php-versions: '7.4'
symfony-http-client-versions: '6.0'
- php-versions: '7.2'
symfony-http-client-versions: '6.1'
- php-versions: '7.3'
symfony-http-client-versions: '6.1'
- php-versions: '7.4'
symfony-http-client-versions: '6.1'
- php-versions: '8.0'
Expand All @@ -114,10 +109,6 @@ jobs:
symfony-http-client-versions: '6.3'
- php-versions: '8.0'
symfony-http-client-versions: '6.3'
- php-versions: '7.2'
symfony-http-client-versions: '6.4'
- php-versions: '7.3'
symfony-http-client-versions: '6.4'
- php-versions: '7.4'
symfony-http-client-versions: '6.4'
- php-versions: '8.0'
Expand Down
26 changes: 16 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "prestashop/circuit-breaker",
"description": "A circuit breaker implementation for PHP",
"type": "library",
"license": "MIT",
"type": "library",
"authors": [
{
"name": "PrestaShop SA",
Expand All @@ -14,23 +14,24 @@
}
],
"require": {
"php": ">=7.2.5",
"symfony/http-client": "^5.4"
"php": ">=7.4",
"ergebnis/composer-normalize": "^2.44",
"symfony/http-client": "^5.4 || ^6"
},
"require-dev": {
"doctrine/cache": "^1.10.2",
"guzzlehttp/guzzle": "^7.3",
"phpunit/phpunit": "^8",
"doctrine/cache": "^1.10.2",
"symfony/cache": "^4.4",
"symfony/event-dispatcher": "^4.4",
"prestashop/php-dev-tools": "^4.1",
"psr/simple-cache": "^1.0",
"prestashop/php-dev-tools": "^4.1"
"symfony/cache": "^4.4",
"symfony/event-dispatcher": "^4.4"
},
"suggest": {
"symfony/cache": "Allows use of Symfony Cache adapters to store transactions",
"doctrine/cache": "Allows use of Doctrine Cache adapters to store transactions",
"ext-apcu": "Allows use of APCu adapter (performant) to store transactions",
"guzzlehttp/guzzle": "Allows use of Guzzle to perform HTTP requests instead of Symfony HttpClient"
"doctrine/cache": "Allows use of Doctrine Cache adapters to store transactions",
"guzzlehttp/guzzle": "Allows use of Guzzle to perform HTTP requests instead of Symfony HttpClient",
"symfony/cache": "Allows use of Symfony Cache adapters to store transactions"
},
"autoload": {
"psr-4": {
Expand All @@ -42,6 +43,11 @@
"Tests\\PrestaShop\\CircuitBreaker\\": "tests/"
}
},
"config": {
"allow-plugins": {
"ergebnis/composer-normalize": true
}
},
"scripts": {
"cs-fix": "@php ./vendor/bin/php-cs-fixer fix",
"test": "@php ./vendor/bin/phpunit",
Expand Down
Loading