diff options
author | Andrey Andreev <narf@devilix.net> | 2022-01-05 16:32:10 +0100 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2022-01-05 16:32:10 +0100 |
commit | 2fa66ba7c6840ac851ae7da2889e7fb654dcda07 (patch) | |
tree | 70573048d629ecc51804507c7868356fad323860 /tests/codeigniter/core/Security_test.php | |
parent | efc96b71e4b1d13d713d8b2be01796b7d30e6f9b (diff) | |
parent | 1d0315b6b3d7003bfb348ccaf7ee30d2533635de (diff) |
Merge branch '3.1-stable' into develop
Diffstat (limited to 'tests/codeigniter/core/Security_test.php')
-rw-r--r-- | tests/codeigniter/core/Security_test.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/codeigniter/core/Security_test.php b/tests/codeigniter/core/Security_test.php index e6a980e7a..5132e5887 100644 --- a/tests/codeigniter/core/Security_test.php +++ b/tests/codeigniter/core/Security_test.php @@ -253,7 +253,10 @@ class Security_test extends CI_TestCase { // Perform hash $this->security->xss_hash(); - $this->assertMatchesRegularExpression('#^[0-9a-f]{32}$#iS', $this->security->xss_hash); + $assertRegExp = class_exists('PHPUnit_Runner_Version') + ? 'assertRegExp' + : 'assertMatchesRegularExpression'; + $this->$assertRegExp('#^[0-9a-f]{32}$#iS', $this->security->xss_hash); } // -------------------------------------------------------------------- |