Skip to content

Commit 0f6a84a

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 5af5fbf commit 0f6a84a

File tree

4 files changed

+10
-22
lines changed

4 files changed

+10
-22
lines changed

Tests/IntegrationPoolTest.php

+4
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,8 @@
1616
class IntegrationPoolTest extends BaseTest
1717
{
1818
use CreatePoolTrait;
19+
20+
protected $skippedTests = [
21+
'testBasicUsageWithLongKey' => 'Long keys are not supported.',
22+
];
1923
}

Tests/IntegrationSimpleCacheTest.php

+4
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,8 @@
1616
class IntegrationSimpleCacheTest extends BaseTest
1717
{
1818
use CreatePoolTrait;
19+
20+
protected $skippedTests = [
21+
'testBasicUsageWithLongKey' => 'Long keys are not supported.',
22+
];
1923
}

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
],
2424
"homepage": "http://www.php-cache.com/en/latest/",
2525
"require": {
26-
"php": "^7.1 || ^8.0",
26+
"php": ">=7.4",
2727
"cache/adapter-common": "^1.0",
2828
"cache/hierarchical-cache": "^1.0",
2929
"psr/cache": "^1.0 || ^2.0",

phpunit.xml.dist

+1-21
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
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">
133
<testsuites>
144
<testsuite name="Main Test Suite">
155
<directory>./Tests/</directory>
@@ -20,14 +10,4 @@
2010
<group>benchmark</group>
2111
</exclude>
2212
</groups>
23-
24-
<filter>
25-
<whitelist>
26-
<directory>./</directory>
27-
<exclude>
28-
<directory>./Tests</directory>
29-
<directory>./vendor</directory>
30-
</exclude>
31-
</whitelist>
32-
</filter>
3313
</phpunit>

0 commit comments

Comments
 (0)