Skip to content

Commit

Permalink
Fix master (#258)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
ruudk and Nyholm authored Jan 12, 2022
1 parent 5af5fbf commit 0f6a84a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 22 deletions.
4 changes: 4 additions & 0 deletions Tests/IntegrationPoolTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,8 @@
class IntegrationPoolTest extends BaseTest
{
use CreatePoolTrait;

protected $skippedTests = [
'testBasicUsageWithLongKey' => 'Long keys are not supported.',
];
}
4 changes: 4 additions & 0 deletions Tests/IntegrationSimpleCacheTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,8 @@
class IntegrationSimpleCacheTest extends BaseTest
{
use CreatePoolTrait;

protected $skippedTests = [
'testBasicUsageWithLongKey' => 'Long keys are not supported.',
];
}
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
],
"homepage": "http://www.php-cache.com/en/latest/",
"require": {
"php": "^7.1 || ^8.0",
"php": ">=7.4",
"cache/adapter-common": "^1.0",
"cache/hierarchical-cache": "^1.0",
"psr/cache": "^1.0 || ^2.0",
Expand Down
22 changes: 1 addition & 21 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit backupGlobals="false"
backupStaticAttributes="false"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
bootstrap="vendor/autoload.php"
>
<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">
<testsuites>
<testsuite name="Main Test Suite">
<directory>./Tests/</directory>
Expand All @@ -20,14 +10,4 @@
<group>benchmark</group>
</exclude>
</groups>

<filter>
<whitelist>
<directory>./</directory>
<exclude>
<directory>./Tests</directory>
<directory>./vendor</directory>
</exclude>
</whitelist>
</filter>
</phpunit>

0 comments on commit 0f6a84a

Please sign in to comment.