Skip to content
Merged
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']

steps:
- name: Checkout code
Expand All @@ -25,10 +25,6 @@ jobs:
tools: composer:v2
coverage: none

- name: Emulate PHP 8.3
run: composer config platform.php 8.3.999
if: matrix.php == '8.4'

- name: Install PHP dependencies
run: composer update --prefer-dist --no-interaction --no-progress

Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"symfony/options-resolver": "^2.6 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0"
},
"require-dev": {
"phpspec/phpspec": "^5.1 || ^6.0 || ^7.0",
"nyholm/psr7": "^1.6.1"
"nyholm/psr7": "^1.6.1",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.6"
},
"autoload": {
"psr-4": {
Expand All @@ -28,11 +28,11 @@
},
"autoload-dev": {
"psr-4": {
"spec\\Http\\Client\\Common\\Plugin\\": "spec/"
"Http\\Client\\Common\\Plugin\\Tests\\": "tests/"
}
},
"scripts": {
"test": "vendor/bin/phpspec run",
"test-ci": "vendor/bin/phpspec run -c phpspec.ci.yml"
"test": "vendor/bin/phpunit",
"test-ci": "vendor/bin/phpunit"
}
}
13 changes: 13 additions & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
bootstrap="vendor/autoload.php"
colors="true"
beStrictAboutTestsThatDoNotTestAnything="true"
beStrictAboutTodoAnnotatedTests="true">
<testsuites>
<testsuite name="Cache Plugin Test Suite">
<directory>tests</directory>
</testsuite>
</testsuites>
</phpunit>
42 changes: 0 additions & 42 deletions spec/Cache/Generator/HeaderCacheKeyGeneratorSpec.php

This file was deleted.

46 changes: 0 additions & 46 deletions spec/Cache/Generator/SimpleGeneratorSpec.php

This file was deleted.

Loading