Skip to content

Commit c61c52f

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 357108a commit c61c52f

File tree

4 files changed

+27
-45
lines changed

4 files changed

+27
-45
lines changed

Tests/IntegrationPoolTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ class IntegrationPoolTest extends BaseTest
4444
'testSaveDeferredWhenChangingValues' => 'Void adapter does not save,',
4545
'testSavingObject' => 'Void adapter does not save,',
4646
'testSaveDeferredOverwrite' => 'Void adapter does not save,',
47+
'testBasicUsageWithLongKey' => 'Void adapter does not save.',
4748
];
4849

4950
public function createCachePool()

Tests/IntegrationSimpleCacheTest.php

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,30 @@
1717
class IntegrationSimpleCacheTest extends BaseTest
1818
{
1919
protected $skippedTests = [
20-
'testSet' => 'Void adapter does not save,',
21-
'testSetTtl' => 'Void adapter does not save,',
22-
'testGet' => 'Void adapter does not save,',
23-
'testSetMultiple' => 'Void adapter does not save,',
24-
'testSetMultipleTtl' => 'Void adapter does not save,',
25-
'testSetMultipleWithGenerator' => 'Void adapter does not save,',
26-
'testGetMultiple' => 'Void adapter does not save,',
27-
'testGetMultipleWithGenerator' => 'Void adapter does not save,',
28-
'testHas' => 'Void adapter does not save,',
29-
'testBinaryData' => 'Void adapter does not save,',
30-
'testDataTypeString' => 'Void adapter does not save,',
31-
'testDataTypeInteger' => 'Void adapter does not save,',
32-
'testDataTypeFloat' => 'Void adapter does not save,',
33-
'testDataTypeBoolean' => 'Void adapter does not save,',
34-
'testDataTypeArray' => 'Void adapter does not save,',
35-
'testDataTypeObject' => 'Void adapter does not save,',
36-
'testSetValidKeys' => 'Void adapter does not save,',
37-
'testSetMultipleValidKeys' => 'Void adapter does not save,',
38-
'testSetMultipleInvalidKeys' => 'Void adapter does not save,',
39-
'testSetValidData' => 'Void adapter does not save,',
40-
'testSetMultipleValidData' => 'Void adapter does not save,',
41-
'testObjectDoesNotChangeInCache' => 'Void adapter does not save,',
20+
'testSet' => 'Void adapter does not save,',
21+
'testSetTtl' => 'Void adapter does not save,',
22+
'testGet' => 'Void adapter does not save,',
23+
'testSetMultiple' => 'Void adapter does not save,',
24+
'testSetMultipleTtl' => 'Void adapter does not save,',
25+
'testSetMultipleWithGenerator' => 'Void adapter does not save,',
26+
'testGetMultiple' => 'Void adapter does not save,',
27+
'testGetMultipleWithGenerator' => 'Void adapter does not save,',
28+
'testHas' => 'Void adapter does not save,',
29+
'testBinaryData' => 'Void adapter does not save,',
30+
'testDataTypeString' => 'Void adapter does not save,',
31+
'testDataTypeInteger' => 'Void adapter does not save,',
32+
'testDataTypeFloat' => 'Void adapter does not save,',
33+
'testDataTypeBoolean' => 'Void adapter does not save,',
34+
'testDataTypeArray' => 'Void adapter does not save,',
35+
'testDataTypeObject' => 'Void adapter does not save,',
36+
'testSetValidKeys' => 'Void adapter does not save,',
37+
'testSetMultipleValidKeys' => 'Void adapter does not save,',
38+
'testSetMultipleInvalidKeys' => 'Void adapter does not save,',
39+
'testSetValidData' => 'Void adapter does not save,',
40+
'testSetMultipleValidData' => 'Void adapter does not save,',
41+
'testObjectDoesNotChangeInCache' => 'Void adapter does not save,',
42+
'testBasicUsageWithLongKey' => 'Void adapter does not save.',
43+
'testSetMultipleWithIntegerArrayKey' => 'Void adapter does not save.',
4244
];
4345

4446
public function createSimpleCache()

composer.json

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,13 @@
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>
166
</testsuite>
177
</testsuites>
18-
198
<groups>
209
<exclude>
2110
<group>benchmark</group>
2211
</exclude>
2312
</groups>
24-
25-
<filter>
26-
<whitelist>
27-
<directory>./</directory>
28-
<exclude>
29-
<directory>./Tests</directory>
30-
<directory>./vendor</directory>
31-
</exclude>
32-
</whitelist>
33-
</filter>
3413
</phpunit>

0 commit comments

Comments
 (0)