Skip to content

Commit 5aba499

Browse files
authored
Merge pull request #482 from php-http/php85
test with php 8.5
2 parents b2aeee3 + 81c05d4 commit 5aba499

File tree

2 files changed

+28
-38
lines changed

2 files changed

+28
-38
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ jobs:
4040
- dependencies: "php-http/guzzle7-adapter"
4141
php-version: "8.4"
4242
symfony-deprecations-helper: "weak"
43+
- dependencies: "php-http/guzzle7-adapter"
44+
php-version: "8.5"
45+
symfony-deprecations-helper: "weak"
4346

4447
# Test with httplug 2.x clients
4548
- dependencies: "php-http/guzzle7-adapter php-http/curl-client:^2.0.0 php-http/vcr-plugin:^1.0@dev php-http/socket-client:^2.0"
@@ -48,11 +51,11 @@ jobs:
4851

4952
# Latest commit to master
5053
- dependencies: "php-http/guzzle7-adapter php-http/vcr-plugin:^1.0@dev"
51-
php-version: "8.2"
54+
php-version: "8.5"
5255
stability: "dev"
5356
symfony-deprecations-helper: "weak"
5457
- dependencies: "php-http/guzzle7-adapter"
55-
php-version: "8.2"
58+
php-version: "8.5"
5659
stability: "dev"
5760
symfony-deprecations-helper: "weak"
5861

@@ -65,9 +68,9 @@ jobs:
6568
symfony-require: "6.4.*"
6669
php-version: "8.2"
6770
symfony-deprecations-helper: "weak"
68-
- dependencies: "php-http/guzzle7-adapter symfony/http-client:^7.3"
69-
symfony-require: "7.3.*"
70-
php-version: "8.2"
71+
- dependencies: "php-http/guzzle7-adapter symfony/http-client:^7.4"
72+
symfony-require: "7.4.*"
73+
php-version: "8.5"
7174
symfony-deprecations-helper: "weak"
7275

7376
steps:
@@ -90,6 +93,7 @@ jobs:
9093

9194
- name: "Add dependencies and enable flex"
9295
run: |
96+
composer config allow-plugins.symfony/flex true
9397
composer require --no-update ${{ matrix.dependencies }}
9498
9599
- name: "Install dependencies with Composer"

phpunit.xml.dist

Lines changed: 19 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
3-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.4/phpunit.xsd"
5-
bootstrap="./vendor/autoload.php"
6-
colors="true"
7-
convertErrorsToExceptions="true"
8-
convertNoticesToExceptions="true"
9-
convertWarningsToExceptions="true">
10-
<php>
11-
<env name="SHELL_VERBOSITY" value="-1" />
12-
<server name="KERNEL_DIR" value="./tests/Resources/app" />
13-
<server name="KERNEL_CLASS" value="AppKernel" />
14-
</php>
15-
16-
<testsuites>
17-
<testsuite name="HttplugBundle unit tests">
18-
<directory suffix="Test.php">./tests/Unit</directory>
19-
</testsuite>
20-
<testsuite name="HttplugBundle functional tests">
21-
<directory suffix="Test.php">./tests/Functional</directory>
22-
</testsuite>
23-
</testsuites>
24-
25-
<filter>
26-
<whitelist>
27-
<directory>./</directory>
28-
<exclude>
29-
<directory>./Resources</directory>
30-
<directory>./tests</directory>
31-
<directory>./vendor</directory>
32-
</exclude>
33-
</whitelist>
34-
</filter>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="./vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true">
3+
<coverage>
4+
<include>
5+
<directory>./src</directory>
6+
</include>
7+
</coverage>
8+
<php>
9+
<env name="SHELL_VERBOSITY" value="-1"/>
10+
<server name="KERNEL_DIR" value="./tests/Resources/app"/>
11+
<server name="KERNEL_CLASS" value="AppKernel"/>
12+
</php>
13+
<testsuites>
14+
<testsuite name="HttplugBundle unit tests">
15+
<directory suffix="Test.php">./tests/Unit</directory>
16+
</testsuite>
17+
<testsuite name="HttplugBundle functional tests">
18+
<directory suffix="Test.php">./tests/Functional</directory>
19+
</testsuite>
20+
</testsuites>
3521
</phpunit>

0 commit comments

Comments
 (0)