Skip to content

Commit f31d6bc

Browse files
authored
Merge pull request #95 from php-http/php85
test with php 8.5
2 parents c036f8b + 93ff0a5 commit f31d6bc

File tree

9 files changed

+824
-718
lines changed

9 files changed

+824
-718
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
15+
php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
1616

1717
steps:
1818
- name: Checkout code
@@ -25,10 +25,6 @@ jobs:
2525
tools: composer:v2
2626
coverage: none
2727

28-
- name: Emulate PHP 8.3
29-
run: composer config platform.php 8.3.999
30-
if: matrix.php == '8.4'
31-
3228
- name: Install PHP dependencies
3329
run: composer update --prefer-dist --no-interaction --no-progress
3430

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"symfony/options-resolver": "^2.6 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0"
1919
},
2020
"require-dev": {
21-
"phpspec/phpspec": "^5.1 || ^6.0 || ^7.0",
22-
"nyholm/psr7": "^1.6.1"
21+
"nyholm/psr7": "^1.6.1",
22+
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.6"
2323
},
2424
"autoload": {
2525
"psr-4": {
@@ -28,11 +28,11 @@
2828
},
2929
"autoload-dev": {
3030
"psr-4": {
31-
"spec\\Http\\Client\\Common\\Plugin\\": "spec/"
31+
"Http\\Client\\Common\\Plugin\\Tests\\": "tests/"
3232
}
3333
},
3434
"scripts": {
35-
"test": "vendor/bin/phpspec run",
36-
"test-ci": "vendor/bin/phpspec run -c phpspec.ci.yml"
35+
"test": "vendor/bin/phpunit",
36+
"test-ci": "vendor/bin/phpunit"
3737
}
3838
}

phpunit.xml.dist

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
4+
bootstrap="vendor/autoload.php"
5+
colors="true"
6+
beStrictAboutTestsThatDoNotTestAnything="true"
7+
beStrictAboutTodoAnnotatedTests="true">
8+
<testsuites>
9+
<testsuite name="Cache Plugin Test Suite">
10+
<directory>tests</directory>
11+
</testsuite>
12+
</testsuites>
13+
</phpunit>

spec/Cache/Generator/HeaderCacheKeyGeneratorSpec.php

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

spec/Cache/Generator/SimpleGeneratorSpec.php

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

0 commit comments

Comments
 (0)