Skip to content

Commit 5b1fa94

Browse files
veeweeveewee
authored
Merge pull request #44 from veewee/php-85-upgrade
feat: Upgrade to PHP 8.5, remove PHP 8.2 support
2 parents 4371d07 + 9ed5fa9 commit 5b1fa94

55 files changed

Lines changed: 163 additions & 118630 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/grumphp.yaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
matrix:
99
operating-system: [ubuntu-latest]
10-
php-versions: ['8.2', '8.3']
10+
php-versions: ['8.3', '8.4', '8.5']
1111
composer-options: ['', '--prefer-lowest']
1212
fail-fast: false
1313
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }} with ${{ matrix.composer-options }}
@@ -36,12 +36,15 @@ jobs:
3636
restore-keys: ${{ runner.os }}-composer-
3737
- name: Install dependencies
3838
run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }}
39+
env:
40+
COMPOSER_IGNORE_PLATFORM_REQ: php+
3941
- name: Set git variables
4042
run: |
4143
git config --global user.email "you@example.com"
4244
git config --global user.name "Your Name"
4345
- name: Run the tests
44-
run: php vendor/bin/grumphp run --no-interaction
46+
run: ./vendor/bin/grumphp run --no-interaction
47+
continue-on-error: ${{ matrix.php-versions == '8.5' }}
4548
env:
4649
PHP_CS_FIXER_IGNORE_ENV: 1
4750
BOX_REQUIREMENT_CHECKER: 0

‎composer.json‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
}
1616
],
1717
"require": {
18-
"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
18+
"php": "~8.3.0 || ~8.4.0 || ~8.5.0",
1919
"ext-json": "*",
20-
"azjezz/psl": "^3.1",
20+
"azjezz/psl": "^3.1 || ^4.0",
2121
"cardinalby/content-disposition": "^1.1",
2222
"league/uri": "^7.3",
2323
"php-http/client-common": "^2.7",
@@ -36,15 +36,18 @@
3636
"require-dev": {
3737
"guzzlehttp/guzzle": "^7.8",
3838
"nyholm/psr7": "^1.8",
39+
"php-cs-fixer/shim": "~3.88",
3940
"php-http/message-factory": "1.1.0",
4041
"php-http/mock-client": "^1.6",
4142
"php-http/vcr-plugin": "^1.2",
42-
"phpro/grumphp-shim": "^2.1",
43+
"phpro/grumphp-shim": "^2.17",
44+
"phpunit/phpunit": "~12.4",
4345
"symfony/http-client": "^5.4.26 || ^6.0 || ^7.0",
4446
"symfony/mime": "^6.0 || ^7.0",
45-
"symfony/property-access": "^5.4 || ^6.0 || ^7.0",
4647
"symfony/options-resolver": "^5.4 || ^6.0 || ^7.0",
47-
"symfony/serializer": "^5.4 || ^6.0 || ^7.0"
48+
"symfony/property-access": "^5.4 || ^6.0 || ^7.0",
49+
"symfony/serializer": "^5.4 || ^6.0 || ^7.0",
50+
"vimeo/psalm": "~6.13"
4851
},
4952
"suggest": {
5053
"symfony/http-client": "If you want to use the built-in symfony/http-client tools.",

‎phive.xml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎phpunit.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd"
3+
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
44
bootstrap="tests/bootstrap.php"
55
executionOrder="depends,defects"
66
beStrictAboutOutputDuringTests="true"
7+
displayDetailsOnTestsThatTriggerWarnings="true"
78
failOnRisky="true"
89
failOnWarning="true"
10+
failOnPhpunitWarning="true"
911
>
1012
<testsuites>
1113
<testsuite name="default">
@@ -19,7 +21,7 @@
1921
</include>
2022
</source>
2123

22-
<coverage>
24+
<coverage includeUncoveredFiles="true">
2325
<report>
2426
<clover outputFile="coverage/clover.xml" />
2527
<html outputDirectory="coverage/report" lowUpperBound="99" highLowerBound="99" />

‎psalm.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
88
findUnusedBaselineEntry="true"
99
findUnusedCode="false"
10+
ensureOverrideAttribute="false"
1011
>
1112
<projectFiles>
1213
<directory name="src" />

‎src/Test/UseMockClient.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ trait UseMockClient
1717
private function mockClient(?callable $configurator = null): Client
1818
{
1919
MockClientDependency::guard();
20-
$configurator ??= fn (Client $client) => $client;
20+
$configurator ??= fn (Client $client): Client => $client;
2121

2222
return $configurator(new Client());
2323
}

‎tests/Functional/Client/Factory/FactoriesTest.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
use Phpro\HttpTools\Client\Factory\SymfonyClientFactory;
1313
use Phpro\HttpTools\Test\UseVcrClient;
1414
use Phpro\HttpTools\Tests\Helper\Vcr\FactoryAwareNamingStrategy;
15+
use PHPUnit\Framework\Attributes\DataProvider;
16+
use PHPUnit\Framework\Attributes\Test;
1517
use PHPUnit\Framework\TestCase;
1618
use Psl\Json;
1719
use Psr\Http\Message\RequestInterface;
@@ -20,11 +22,8 @@ final class FactoriesTest extends TestCase
2022
{
2123
use UseVcrClient;
2224

23-
/**
24-
* @test
25-
*
26-
* @dataProvider provideFactories
27-
*/
25+
#[DataProvider('provideFactories')]
26+
#[Test]
2827
public function it_can_use_http_factories(string $factoryName, callable $factory): void
2928
{
3029
$client = PluginsConfigurator::configure($factory(), [

‎tests/Unit/Client/Factory/LazyClientLoaderTest.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
use Phpro\HttpTools\Client\Factory\AutoDiscoveredClientFactory;
99
use Phpro\HttpTools\Client\Factory\FactoryInterface;
1010
use Phpro\HttpTools\Client\Factory\LazyClientLoader;
11+
use PHPUnit\Framework\Attributes\Test;
1112
use PHPUnit\Framework\TestCase;
1213
use stdClass;
1314

1415
final class LazyClientLoaderTest extends TestCase
1516
{
16-
/** @test */
17+
#[Test]
1718
public function it_can_not_load_invalid_class(): void
1819
{
1920
$this->expectException(InvalidArgumentException::class);
@@ -23,7 +24,7 @@ public function it_can_not_load_invalid_class(): void
2324
$loader->load();
2425
}
2526

26-
/** @test */
27+
#[Test]
2728
public function it_only_loads_the_client_once(): void
2829
{
2930
$loader = new LazyClientLoader(AutoDiscoveredClientFactory::class, [], []);

‎tests/Unit/Encoding/Binary/BinaryFileDecoderTest.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,17 @@
77
use Phpro\HttpTools\Encoding\Binary\BinaryFile;
88
use Phpro\HttpTools\Encoding\Binary\BinaryFileDecoder;
99
use Phpro\HttpTools\Test\UseHttpFactories;
10+
use PHPUnit\Framework\Attributes\DataProvider;
11+
use PHPUnit\Framework\Attributes\Test;
1012
use PHPUnit\Framework\TestCase;
1113
use Psr\Http\Message\ResponseInterface;
1214

1315
final class BinaryFileDecoderTest extends TestCase
1416
{
1517
use UseHttpFactories;
1618

17-
/**
18-
* @test
19-
*
20-
* @dataProvider provideCases
21-
*/
19+
#[DataProvider('provideCases')]
20+
#[Test]
2221
public function it_can_decode_binary_files(
2322
BinaryFileDecoder $decoder,
2423
ResponseInterface $response,

‎tests/Unit/Encoding/Binary/BinaryFileTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66

77
use Phpro\HttpTools\Encoding\Binary\BinaryFile;
88
use Phpro\HttpTools\Test\UseHttpFactories;
9+
use PHPUnit\Framework\Attributes\Test;
910
use PHPUnit\Framework\TestCase;
1011

1112
final class BinaryFileTest extends TestCase
1213
{
1314
use UseHttpFactories;
1415

15-
/** @test */
16+
#[Test]
1617
public function it_is_a_dto(): void
1718
{
1819
$dto = new BinaryFile(

0 commit comments

Comments
 (0)