From 8f11416077b507fe44285962ec24a788586e3405 Mon Sep 17 00:00:00 2001 From: chris Date: Wed, 7 Feb 2024 19:57:37 +0100 Subject: [PATCH 1/4] Feature/add support symfony 7 (#264) * feat: add support for "symfony/http-foundation" 7 * feat: add support for "symfony/http-foundation" 7 * feat: add support for "symfony/http-foundation" 7 * feat: add support for "symfony/http-foundation" 7 * feat: add support for "symfony/http-foundation" 7 --------- Co-authored-by: Christopher Georg --- .github/workflows/phpunit.yml | 5 ++++- composer.json | 14 ++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 115301f..d79de23 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - "master" + - "master" jobs: phpunit: @@ -22,6 +22,9 @@ jobs: - "7.3" - "7.4" - "8.0" + - "8.1" + - "8.2" + - "8.3" operating-system: - "ubuntu-latest" diff --git a/composer.json b/composer.json index 793c66e..be27a33 100644 --- a/composer.json +++ b/composer.json @@ -47,14 +47,15 @@ "php-http/message": "^1.5", "php-http/message-factory": "^1.1", "php-http/discovery": "^1.14", - "symfony/http-foundation": "^2.1|^3|^4|^5|^6", + "symfony/http-foundation": "^2.1|^3|^4|^5|^6|^7", "moneyphp/money": "^3.1|^4.0.3" }, "require-dev": { "omnipay/tests": "^4.1", - "php-http/mock-client": "^1", + "php-http/mock-client": "^1.6", "php-http/guzzle7-adapter": "^1", - "squizlabs/php_codesniffer": "^3.5" + "squizlabs/php_codesniffer": "^3.8.1", + "http-interop/http-factory-guzzle": "^1.1" }, "extra": { "branch-alias": { @@ -70,5 +71,10 @@ "fix-style": "phpcbf -p --standard=PSR2 src/" }, "minimum-stability": "dev", - "prefer-stable": true + "prefer-stable": true, + "config": { + "allow-plugins": { + "php-http/discovery": true + } + } } From 4c0c8644271d64993ba275291a60467aa48eaa1d Mon Sep 17 00:00:00 2001 From: chris Date: Wed, 7 Feb 2024 22:29:04 +0100 Subject: [PATCH 2/4] chore: add ci testruns for PHP > 8.0 (#263) fix deprecation of github action versions Co-authored-by: Christopher Georg --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index d79de23..a9f5686 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -30,7 +30,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v2" + uses: "actions/checkout@v4" - name: "Install PHP" uses: "shivammathur/setup-php@v2" From 563643012066a63eb91b70d15de3f84972038989 Mon Sep 17 00:00:00 2001 From: chris Date: Fri, 8 Mar 2024 12:56:16 +0100 Subject: [PATCH 3/4] ci: run --prefer-lowest run only for lowest supported PHP version (#266) * ci: run --prefer-lowest run only for lowest supported PHP version * ci: run --prefer-lowest run only for lowest supported PHP version --------- Co-authored-by: Christopher Georg --- .github/workflows/phpunit.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index a9f5686..a306550 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -10,12 +10,11 @@ jobs: phpunit: name: "PHPUnit tests" - runs-on: ${{ matrix.operating-system }} + runs-on: "ubuntu-latest" strategy: matrix: dependencies: - - "lowest" - "highest" php-version: - "7.2" @@ -25,8 +24,10 @@ jobs: - "8.1" - "8.2" - "8.3" - operating-system: - - "ubuntu-latest" + + include: + - php-version: '7.2' + dependencies: "lowest" steps: - name: "Checkout" @@ -42,11 +43,11 @@ jobs: - name: "Install lowest dependencies" if: ${{ matrix.dependencies == 'lowest' }} - run: "composer update --prefer-lowest --no-interaction --no-progress --no-suggest" + run: "composer update --prefer-lowest --no-interaction --no-progress" - name: "Install highest dependencies" if: ${{ matrix.dependencies == 'highest' }} - run: "composer update --no-interaction --no-progress --no-suggest" + run: "composer update --no-interaction --no-progress" - name: "Tests" run: "vendor/bin/phpunit" From 2eca3823e9069e2c36b6007a090577d5584f9518 Mon Sep 17 00:00:00 2001 From: chris Date: Fri, 8 Mar 2024 12:56:40 +0100 Subject: [PATCH 4/4] docs: improve README.md (#265) Co-authored-by: Christopher Georg --- README.md | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 9261e92..130d776 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![PHPUnit tests](https://github.com/thephpleague/omnipay-common/actions/workflows/phpunit.yml/badge.svg)](https://github.com/thephpleague/omnipay-common/actions/workflows/phpunit.yml) [![Latest Version on Packagist][ico-version]][link-packagist] -[![Software License][ico-license]](LICENSE.md) +[![Software License][ico-license]](LICENSE) [![Total Downloads][ico-downloads]][link-downloads] [Omnipay](https://github.com/thephpleague/omnipay) is a framework agnostic, multi-gateway payment @@ -21,10 +21,10 @@ Please see [UPGRADE](UPGRADE.md) for more information on how to upgrade to the l ## Support If you are having general issues with Omnipay, we suggest posting on -[Stack Overflow](http://stackoverflow.com/). Be sure to add the -[omnipay tag](http://stackoverflow.com/questions/tagged/omnipay) so it can be easily found. +[Stack Overflow](https://stackoverflow.com/). Be sure to add the +[omnipay tag](https://stackoverflow.com/questions/tagged/omnipay) so it can be easily found. -If you want to keep up to date with release anouncements, discuss ideas for the project, +If you want to keep up to date with release announcements, discuss ideas for the project, or ask more detailed questions, there is also a [mailing list](https://groups.google.com/forum/#!forum/omnipay) which you can subscribe to. @@ -39,14 +39,11 @@ If you discover any security related issues, please email barryvdh@gmail.com ins ## License -The MIT License (MIT). Please see [License File](LICENSE.md) for more information. +The MIT License (MIT). Please see [License File](LICENSE) for more information. [ico-version]: https://img.shields.io/packagist/v/omnipay/common.svg?style=flat [ico-license]: https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat -[ico-build]: https://img.shields.io/travis/thephpleague/omnipay-common/master.svg?style=flat [ico-downloads]: https://img.shields.io/packagist/dt/omnipay/common.svg?style=flat [link-packagist]: https://packagist.org/packages/omnipay/common -[link-travis]: https://travis-ci.org/thephpleague/omnipay-common [link-downloads]: https://packagist.org/packages/omnipay/common -[link-contributors]: ../../contributors