Skip to content

WIP #284

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

Open
wants to merge 14 commits into
base: 4.1
Choose a base branch
from
Open

WIP #284

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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ on: ["pull_request"]
jobs:
coding-standards:
name: "Coding Standards"
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-latest"

strategy:
matrix:
php-version:
- "7.4"
- "8.3"

steps:
- name: "Checkout"
uses: "actions/checkout@v2"
uses: "actions/checkout@v3"
with:
fetch-depth: 10

Expand All @@ -26,7 +26,7 @@ jobs:
tools: "cs2pr"

- name: "Cache dependencies installed with Composer"
uses: "actions/cache@v2"
uses: "actions/cache@v3"
with:
path: "~/.composer/cache"
key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
Expand Down
60 changes: 37 additions & 23 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,66 +8,80 @@ env:
jobs:
phpunit:
name: "PHPUnit"
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-latest"

strategy:
matrix:
php-version:
- "7.4"
- "8.0"
- "8.1"
- "8.3"
- "8.4"
deps:
- "normal"
symfony-require:
- ""
symfony-deprecations-helper:
- ""
include:
- php-version: "7.4"
# PHP 8.3 test matrix
- php-version: "8.3"
deps: "normal"

- php-version: "7.4"
- php-version: "8.3"
deps: "low"

- php-version: "7.4"
- php-version: "8.3"
deps: "dev"

- php-version: "8.0"

# Test Symfony 7 with PHP 8.3
- php-version: "8.3"
deps: "normal"

- php-version: "8.0"
deps: "low"

- php-version: "8.0"
deps: "dev"

- php-version: "8.1"
symfony-require: "7.0.*"

# PHP 8.4 test matrix
- php-version: "8.4"
deps: "normal"

- php-version: "8.1"
- php-version: "8.4"
deps: "low"

- php-version: "8.1"
- php-version: "8.4"
deps: "dev"

# Test latest Symfony with PHP 8.4
- php-version: "8.4"
deps: "normal"
symfony-require: "7.*"

steps:
- name: "Checkout"
uses: "actions/checkout@v2"
uses: "actions/checkout@v3"
with:
fetch-depth: 2

- name: "Install PHP with PCOV"
uses: "shivammathur/setup-php@v2"
with:
php-version: "${{ matrix.php-version }}"
extensions: "json"
tools: "composer:2"
coverage: "pcov"
ini-values: "memory_limit=-1"

- name: "Cache dependencies installed with composer"
uses: "actions/cache@v2"
uses: "actions/cache@v3"
with:
path: "~/.composer/cache"
key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
restore-keys: "php-${{ matrix.php-version }}-composer-locked-"

- name: "Require specific Symfony version"
run: "composer global require --no-progress --no-scripts --no-plugins 'symfony/flex:^2.3'"
if: "${{ matrix.symfony-require != '' }}"

- name: "Set Symfony version constraint"
run: "composer config extra.symfony.require ${{ matrix.symfony-require }}"
if: "${{ matrix.symfony-require != '' }}"

- name: "Install stable dependencies with composer"
run: "composer update --no-interaction --prefer-dist --prefer-stable"
if: "${{ matrix.deps == 'normal' }}"
Expand All @@ -86,9 +100,9 @@ jobs:
- name: "Upload coverage file"
uses: "actions/upload-artifact@v4"
with:
name: "phpunit-${{ matrix.php-version }}-${{ matrix.deps }}-${{ hashFiles('composer.lock') }}.coverage"
name: "phpunit-${{ matrix.php-version }}-${{ matrix.deps }}-${{ matrix.symfony-require }}-${{ hashFiles('composer.lock') }}.coverage"
path: "coverage.xml"

- uses: codecov/codecov-action@v1
- uses: codecov/codecov-action@v3
with:
verbose: true
5 changes: 2 additions & 3 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ jobs:
strategy:
matrix:
php-version:
- "7.4"
- "8.0"
- "8.1"
- "8.3"
- "8.4"

steps:
- name: "Checkout code"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[![Build Status](https://img.shields.io/github/actions/workflow/status/php-tmdb/api/continuous-integration.yml?label=phpunit)](https://github.com/php-tmdb/api/actions/workflows/continuous-integration.yml)
[![Build Status](https://img.shields.io/github/actions/workflow/status/php-tmdb/api/coding-standards.yml?label=phpcs)](https://github.com/php-tmdb/api/actions/workflows/coding-standards.yml)
[![codecov](https://img.shields.io/codecov/c/github/php-tmdb/api?token=gTM9AiO5vH)](https://codecov.io/gh/php-tmdb/api)
[![PHP](https://img.shields.io/badge/php->=7.3,%20>=7.4,%20>=8.0-8892BF.svg)](https://packagist.org/packages/php-tmdb/api)
[![PHP](https://img.shields.io/badge/php->=8.2-8892BF.svg)](https://packagist.org/packages/php-tmdb/api)
[![Total Downloads](https://poser.pugx.org/php-tmdb/api/downloads.svg)](https://packagist.org/packages/php-tmdb/api)

Tests run with minimal, normal and development dependencies.
Expand Down
9 changes: 9 additions & 0 deletions UPGRADE-CURRENT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# UPGRADE-CURRENT.md

## Changes in this version

- Removed `rtheunissen/guzzle-log-middleware` dependency due to compatibility issues with Guzzle 7.0. This middleware is temporarily removed and may be reintroduced in a future release once compatibility is resolved.
- Added support for Symfony 7 components. Note that Symfony 7 requires PHP 8.1 or higher. If you're using PHP < 8.1, Composer will automatically select a compatible Symfony version (4, 5, or 6).
- Dropped support for PHP 7.4 and 8.0 as they have reached End-of-Life (EOL).
- Dropped support for PHP 8.1 and updated minimum PHP version to 8.2 to accommodate PHPUnit 12.
- Upgraded PHPUnit from 9.x to 12.x.
22 changes: 11 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,36 +31,36 @@
"license": "MIT",
"name": "php-tmdb/api",
"require": {
"php": "^7.3 || ^8.0",
"php": "^8.3",
"ext-json": "*",
"symfony/options-resolver": "^4.4 || ^5 || ^6",
"psr/cache": "^1 || ^2 || ^3",
"psr/simple-cache": "^1 || ^2 || ^3",
"psr/event-dispatcher": "^1",
"psr/event-dispatcher-implementation": "^1",
"psr/log": "^1 || ^2 || ^3",
"php-http/discovery": "^1.11",
"php-http/discovery": "^1.11 || ^2.0",
"psr/http-client": "^1",
"psr/http-client-implementation": "^1",
"psr/http-factory": "^1",
"psr/http-factory-implementation": "^1",
"psr/http-message": "^1"
"psr/http-message": "^1 || ^2",
"phpunit/phpunit": "^12.1"
},
"require-dev": {
"nyholm/psr7": "^1.2",
"php-http/mock-client": "^1.2",
"php-http/mock-client": "^1.2 || ^2.0",
"slevomat/coding-standard": "^8.8",
"squizlabs/php_codesniffer": "^3.5.8",
"symfony/cache": "^4.4 || ^5 || ^6",
"symfony/event-dispatcher": "^4.4 || ^5 || ^6",
"symfony/cache": "^7.0",
"symfony/event-dispatcher": "^7.0",
"phpstan/phpstan": "^1.8.1",
"phpstan/phpstan-deprecation-rules": "^1.1",
"spaze/phpstan-disallowed-calls": "^2.11",
"phpunit/phpunit": "^9.6.3",
"php-http/guzzle7-adapter": "^1.0",
"monolog/monolog": "^2.9.1 || ^3.0",
"php-http/cache-plugin": "^1.7",
"jeroen/psr-log-test-doubles": "^2.1 || ^3"
"php-http/cache-plugin": "^1.7 || ^2.0",
"jeroen/psr-log-test-doubles": "^2.1 || ^3",
"symfony/options-resolver": "^7.0"
},
"scripts": {
"test": "vendor/bin/phpunit",
Expand All @@ -81,7 +81,7 @@
"config": {
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
"php-http/discovery": false
"php-http/discovery": true
}
}
}
Loading
Loading