Skip to content

Commit 70988d4

Browse files
ruudkNyholm
andauthored
Fix master (#258)
* Migrate PHPUnit configuration to new format * Replace assertRegExp * Add void * Remove coverage from PHPUnit config It's not expected anymore. * Use `$this->expectException` instead of comment * Ignore some tests * Only PHP >7.4 Co-authored-by: Nyholm <[email protected]>
1 parent e0569cb commit 70988d4

File tree

3 files changed

+16
-24
lines changed

3 files changed

+16
-24
lines changed

Tests/IntegrationPoolTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222

2323
class IntegrationPoolTest extends CachePoolTest
2424
{
25+
protected $skippedTests = [
26+
'testBasicUsageWithLongKey' => 'Long keys are not supported.',
27+
];
28+
2529
/**
2630
* @type Filesystem
2731
*/

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
],
2929
"homepage": "http://www.php-cache.com/en/latest/",
3030
"require": {
31-
"php": "^7.1 || ^8.0",
31+
"php": ">=7.4",
3232
"cache/adapter-common": "^1.1",
3333
"cache/tag-interop": "^1.0",
3434
"defuse/php-encryption": "^2.0",

phpunit.xml.dist

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
3-
<phpunit backupGlobals="false"
4-
backupStaticAttributes="false"
5-
colors="true"
6-
convertErrorsToExceptions="true"
7-
convertNoticesToExceptions="true"
8-
convertWarningsToExceptions="true"
9-
processIsolation="false"
10-
stopOnFailure="false"
11-
bootstrap="vendor/autoload.php"
12-
>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
3+
<coverage>
4+
<include>
5+
<directory>./</directory>
6+
</include>
7+
<exclude>
8+
<directory>./Resources</directory>
9+
<directory>./Tests</directory>
10+
<directory>./vendor</directory>
11+
</exclude>
12+
</coverage>
1313
<testsuites>
1414
<testsuite name="Main Test Suite">
1515
<directory>./Tests/</directory>
1616
</testsuite>
1717
</testsuites>
18-
1918
<groups>
2019
<exclude>
2120
<group>benchmark</group>
2221
</exclude>
2322
</groups>
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>
3523
</phpunit>

0 commit comments

Comments
 (0)