Skip to content

Commit

Permalink
Issue #22: Upgrade to PHP 8
Browse files Browse the repository at this point in the history
- Upgrade to PHP 8. Uplift dependencies to latest versions.
- Remove reference to my fork of `guzzle-services`. Guessing I had a patch in there that wasn't at the time merged. Seems like everything is working now.
- PHPUnit nicely migrated the configuration file to its new format.
- Drop PHP 7 from test matrix. Only PHP 8 versions now.
  • Loading branch information
sprak3000 committed Jul 26, 2023
1 parent 1ff64a1 commit 74540c2
Show file tree
Hide file tree
Showing 7 changed files with 1,380 additions and 645 deletions.
11 changes: 1 addition & 10 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,9 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php: ['7.2', '7.3', '7.4']
php: ['8.0', '8.1', '8.2']
coverage: [true]
composer-flags: ['']
include:
- php: '8.0'
coverage: false
composer-flags: '--ignore-platform-req=php'
- php: '7.2'
coverage: false
steps:
- uses: actions/checkout@v2
- uses: shivammathur/setup-php@v2
Expand All @@ -27,8 +21,5 @@ jobs:
extensions: curl, mbstring
coverage: pcov
tools: composer:v2
- name: "Use PHPUnit 9.3+ on PHP 8"
run: composer require --no-update --dev phpunit/phpunit:^9.3
if: "matrix.php == '8.0'"
- run: composer update --no-progress ${{ matrix.composer-flags }}
- run: vendor/bin/phpunit --coverage-text --coverage-clover build/logs/clover.xml
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.idea/
test/phpunit/config.php
vendor
vendor
.phpunit.result.cache
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# CHANGELOG

## 3.0.0
This release moves the library into using PHP 8.

## 2.1.0
Migrating from Travis CI to GitHub actions for automatically running unit tests.

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ When using this client to retrieve data, you must still abide by the ANN API ter
source of the data and link to Anime News Network on every page that incorporates data from the API.

## Requires
* PHP >= 7.2
* PHP ^8.0
* [Composer](https://getcomposer.org/) (to install this library)

## Usage
Expand Down
12 changes: 4 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,13 @@
"email": "[email protected]"
}
],
"repositories": [{
"type": "vcs",
"url": "http://github.com/sprak3000/guzzle-services"
}],
"require": {
"php": ">=7.2",
"guzzlehttp/guzzle": "6.*",
"guzzlehttp/guzzle-services": "1.*"
"php": "^8.0",
"guzzlehttp/guzzle": "7.7.0",
"guzzlehttp/guzzle-services": "1.4.0"
},
"require-dev": {
"phpunit/phpunit": "6.*"
"phpunit/phpunit": "10.2.6"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 74540c2

Please sign in to comment.