From 2391d01fe24d6d89eee591c1284e3cb6ffdd1740 Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Fri, 28 Apr 2023 15:32:33 +0200 Subject: [PATCH 1/3] semantic branch naming --- .github/workflows/Build-Test.yml | 7 +++++-- composer.json | 5 ----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/Build-Test.yml b/.github/workflows/Build-Test.yml index e527d1b..9c1a2e6 100644 --- a/.github/workflows/Build-Test.yml +++ b/.github/workflows/Build-Test.yml @@ -3,6 +3,9 @@ name: Tests # Run this workflow every time a new commit pushed to your repository on: push: + branches: + - '*.x' + pull_request: jobs: tests: @@ -13,7 +16,7 @@ jobs: fail-fast: false matrix: operating-system: [ubuntu-20.04] - php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1'] + php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2'] include: - operating-system: ubuntu-16.04 php-versions: '7.1' @@ -29,7 +32,7 @@ jobs: steps: # Checks out a copy of your repository on the ubuntu machine - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup cache environment id: extcache diff --git a/composer.json b/composer.json index 303f785..78b4a46 100644 --- a/composer.json +++ b/composer.json @@ -48,10 +48,5 @@ "scripts": { "test": "vendor/bin/phpunit", "test-ci": "vendor/bin/phpunit --coverage-clover build/coverage.xml" - }, - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - } } } From f724c42c3b3f0016c77c7e0502988a4bfd918d9d Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Fri, 28 Apr 2023 15:39:50 +0200 Subject: [PATCH 2/3] update changelog --- CHANGELOG.md | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06a293b..08dc177 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 2.3.0 - 2023-04-28 + +### Added + +- Test with PHP 8.2 + +### Fixed + +- This client needs a PSR-17 factories implementation. Instead of requiring an implementation, + previous versions only required the interfaces which could lead to a non-functional installation. + Fixed by requiring `psr/http-factory-implementation`. + ## 2.2.1 - 2021-12-10 ### Added @@ -33,12 +45,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Minimal PHP version changed to 7.1. -- `Client::__construct` now expects PSR-17 factories instead of HTTPlug ones. +- `Client::__construct` now expects PSR-17 factories instead of HTTPlug ones. ### Added - #41: Support [PSR-17](https://www.php-fig.org/psr/psr-17/) and - [PSR-18](https://www.php-fig.org/psr/psr-18/). + [PSR-18](https://www.php-fig.org/psr/psr-18/). ## 1.7.1 - 2018-03-26 @@ -58,7 +70,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed -- #29: Request not using CURLOPT_POSTFIELDS have content-length set to +- #29: Request not using CURLOPT_POSTFIELDS have content-length set to ### Changed @@ -94,7 +106,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Request body can be send with any method except GET, HEAD and TRACE. -- #25: Make discovery a hard dependency. +- #25: Make discovery a hard dependency. ## 1.4.2 - 2016-06-14 @@ -126,7 +138,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed -- #13: Remove HeaderParser. +- #13: Remove HeaderParser. ## 1.2 - 2016-03-09 @@ -163,7 +175,7 @@ First stable release. ### Changed - Root namespace changed from `Http\Curl` to `Http\Client\Curl`. -- Main client class name renamed from `CurlHttpClient` to `Client`. +- Main client class name renamed from `CurlHttpClient` to `Client`. - Minimum required [php-http/discovery](https://packagist.org/packages/php-http/discovery) version changed to 0.5. From 14649223ef8ee2ecdf610676bed5a187741aedb5 Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Fri, 28 Apr 2023 15:39:58 +0200 Subject: [PATCH 3/3] upgrade build actions --- .github/workflows/Build-Test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Build-Test.yml b/.github/workflows/Build-Test.yml index 9c1a2e6..756a8fe 100644 --- a/.github/workflows/Build-Test.yml +++ b/.github/workflows/Build-Test.yml @@ -50,13 +50,13 @@ jobs: restore-keys: ${{ steps.extcache.outputs.key }} - name: Cache Composer Dependencies - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: ~/.composer/cache/files key: dependencies-composer-${{ hashFiles('composer.json') }} - name: Setup PHP Action - uses: shivammathur/setup-php@2.8.0 + uses: shivammathur/setup-php@3 with: php-version: ${{ matrix.php-versions }} extensions: ${{ env.extensions }} @@ -68,7 +68,7 @@ jobs: run: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}