Skip to content

Commit 5e79f1b

Browse files
committed
Fix broken tests in develop
1 parent 2fa66ba commit 5e79f1b

File tree

4 files changed

+2
-10
lines changed

4 files changed

+2
-10
lines changed

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
},
3131
"require-dev": {
3232
"mikey179/vfsstream": "1.6.*",
33-
"phpunit/phpunit": "5.* || 9.*"
33+
"phpunit/phpunit": "4.* || 5.* || 9.*"
3434
}
3535
}

tests/codeigniter/core/Input_test.php

-8
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,6 @@ public function tear_down()
2626

2727
// --------------------------------------------------------------------
2828

29-
public function tear_down()
30-
{
31-
$_POST = [];
32-
$_GET = [];
33-
}
34-
35-
// --------------------------------------------------------------------
36-
3729
public function test_get_not_exists()
3830
{
3931
$this->assertSame(array(), $this->input->get());

tests/codeigniter/core/Utf8_test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function test_clean_string()
5959
elseif (ICONV_ENABLED)
6060
{
6161
// This is a known issue, iconv doesn't always work with //IGNORE
62-
$this->assertContains($this->utf8->clean_string($illegal_utf8), array('тест', ''));
62+
$this->assertContains($utf8->clean_string($illegal_utf8), array('тест', ''));
6363
}
6464
else
6565
{

tests/mocks/database/ci_test.sqlite

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)