summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sturgeon <me@philsturgeon.com>2021-11-17 18:33:37 +0100
committerPhil Sturgeon <me@philsturgeon.com>2021-11-17 18:34:33 +0100
commit298b06e5d823370a49dd49661cc8cc08f9a51ead (patch)
treeea41060d3f5f4ae6972ca53470b7ad8c40bd5057
parent47c6b45f524f826e56aff8e77bf289bcbfa1b51d (diff)
chore: update to phpunit 9
-rw-r--r--composer.json2
-rw-r--r--tests/codeigniter/core/Security_test.php2
-rw-r--r--tests/travis/sqlite.phpunit.xml35
3 files changed, 20 insertions, 19 deletions
diff --git a/composer.json b/composer.json
index a20d0f336..722c9b7d9 100644
--- a/composer.json
+++ b/composer.json
@@ -18,6 +18,6 @@
},
"require-dev": {
"mikey179/vfsstream": "1.6.*",
- "phpunit/phpunit": "4.* || 5.* || 8.*"
+ "phpunit/phpunit": "4.* || 5.* || 9.*"
}
}
diff --git a/tests/codeigniter/core/Security_test.php b/tests/codeigniter/core/Security_test.php
index 64efdf9c8..e6a980e7a 100644
--- a/tests/codeigniter/core/Security_test.php
+++ b/tests/codeigniter/core/Security_test.php
@@ -253,7 +253,7 @@ class Security_test extends CI_TestCase {
// Perform hash
$this->security->xss_hash();
- $this->assertRegExp('#^[0-9a-f]{32}$#iS', $this->security->xss_hash);
+ $this->assertMatchesRegularExpression('#^[0-9a-f]{32}$#iS', $this->security->xss_hash);
}
// --------------------------------------------------------------------
diff --git a/tests/travis/sqlite.phpunit.xml b/tests/travis/sqlite.phpunit.xml
index 0c4da0d1b..4eaafc19f 100644
--- a/tests/travis/sqlite.phpunit.xml
+++ b/tests/travis/sqlite.phpunit.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
bootstrap="../Bootstrap.php"
colors="true"
convertNoticesToExceptions="true"
@@ -9,18 +8,20 @@
stopOnFailure="false"
stopOnIncomplete="false"
stopOnSkipped="false"
- beStrictAboutTestsThatDoNotTestAnything="false">
- <php>
- <const name="DB_DRIVER" value="sqlite"/>
- </php>
- <testsuites>
- <testsuite name="CodeIgniter Core Test Suite">
- <directory suffix="test.php">../codeigniter</directory>
- </testsuite>
- </testsuites>
- <filter>
- <whitelist addUncoveredFilesFromWhitelist="false">
- <directory suffix=".php">../../system</directory>
- </whitelist>
- </filter>
-</phpunit> \ No newline at end of file
+ beStrictAboutTestsThatDoNotTestAnything="false"
+ xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+>
+ <coverage includeUncoveredFiles="false">
+ <include>
+ <directory suffix=".php">../../system</directory>
+ </include>
+ </coverage>
+ <php>
+ <const name="DB_DRIVER" value="sqlite"/>
+ </php>
+ <testsuites>
+ <testsuite name="CodeIgniter Core Test Suite">
+ <directory suffix="test.php">../codeigniter</directory>
+ </testsuite>
+ </testsuites>
+</phpunit>