From f38b386c3f7d7044424783ea1b8796163df3c851 Mon Sep 17 00:00:00 2001 From: Jordan Hall Date: Sat, 18 Jul 2026 00:40:43 +0100 Subject: [PATCH 1/3] Support Guzzle 7 and maintained Faker --- .github/workflows/tests.yml | 24 ++++++++++++++++++++++++ composer.json | 9 ++++----- 2 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/tests.yml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 0000000..69dbc79 --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,24 @@ +name: Tests + +on: + push: + pull_request: + +jobs: + tests: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + php: ['7.4', '8.5'] + guzzle: ['^6.0', '^7.0'] + + steps: + - uses: actions/checkout@v4 + - uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + coverage: none + - run: composer require --no-update "guzzlehttp/guzzle:${{ matrix.guzzle }}" + - run: composer update --prefer-dist --no-interaction + - run: vendor/bin/phpunit diff --git a/composer.json b/composer.json index 1c6dd92..e1b8203 100644 --- a/composer.json +++ b/composer.json @@ -7,13 +7,12 @@ "license": "LGPL-3.0-only", "require": { "php": ">=5.5.9", - "guzzlehttp/guzzle": "~6.0", - "fzaninotto/faker": "^1.6" + "guzzlehttp/guzzle": "^6.0 || ^7.0", + "fakerphp/faker": "^1.9.1" }, "require-dev": { - "phpunit/phpunit": "^5.7", - "fzaninotto/faker": "^1.6", - "satooshi/php-coveralls": "^2.0" + "phpunit/phpunit": "^5.7 || ^9.6", + "php-coveralls/php-coveralls": "^2.0" }, "autoload": { "psr-4": { From 2618b78771cbce65ae17d97233fc481af8247e0e Mon Sep 17 00:00:00 2001 From: Jordan Hall Date: Sat, 18 Jul 2026 00:50:37 +0100 Subject: [PATCH 2/3] Remove StyleCI badge --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 1021fdb..3ac1329 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ [![Build Status](https://travis-ci.org/rapidwebltd/php-postcodes.svg?branch=master)](https://travis-ci.org/rapidwebltd/php-postcodes) [![Coverage Status](https://coveralls.io/repos/github/rapidwebltd/php-postcodes/badge.svg?branch=master)](https://coveralls.io/github/rapidwebltd/php-postcodes?branch=master) -[![StyleCI](https://styleci.io/repos/79115768/shield?branch=master)](https://styleci.io/repos/79115768) ![Packagist](https://img.shields.io/packagist/dt/rapidwebltd/php-postcodes.svg) This library handles various UK postcode related tasks. From 909d49e4bcfd211a7a478a7de9958b67bc3fc44b Mon Sep 17 00:00:00 2001 From: Jordan Hall Date: Sat, 18 Jul 2026 00:54:57 +0100 Subject: [PATCH 3/3] Require secure Guzzle versions --- .github/workflows/tests.yml | 3 +-- composer.json | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 69dbc79..79f1e9f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,6 +3,7 @@ name: Tests on: push: pull_request: + workflow_dispatch: jobs: tests: @@ -11,7 +12,6 @@ jobs: fail-fast: false matrix: php: ['7.4', '8.5'] - guzzle: ['^6.0', '^7.0'] steps: - uses: actions/checkout@v4 @@ -19,6 +19,5 @@ jobs: with: php-version: ${{ matrix.php }} coverage: none - - run: composer require --no-update "guzzlehttp/guzzle:${{ matrix.guzzle }}" - run: composer update --prefer-dist --no-interaction - run: vendor/bin/phpunit diff --git a/composer.json b/composer.json index e1b8203..db7c7da 100644 --- a/composer.json +++ b/composer.json @@ -6,8 +6,8 @@ "homepage": "https://github.com/rapidwebltd/php-postcodes", "license": "LGPL-3.0-only", "require": { - "php": ">=5.5.9", - "guzzlehttp/guzzle": "^6.0 || ^7.0", + "php": "^7.4 || ^8.0", + "guzzlehttp/guzzle": "^7.4.5", "fakerphp/faker": "^1.9.1" }, "require-dev": {