Skip to content

Commit 4c381f4

Browse files
committed
refactor: remove code for 4.2.x or before
1 parent 4a25453 commit 4c381f4

File tree

4 files changed

+25
-73
lines changed

4 files changed

+25
-73
lines changed

src/Test/MockInputOutput.php

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
namespace CodeIgniter\Shield\Test;
66

77
use CodeIgniter\CLI\CLI;
8-
use CodeIgniter\CodeIgniter;
98
use CodeIgniter\Shield\Commands\Utils\InputOutput;
109
use CodeIgniter\Shield\Exceptions\LogicException;
1110
use CodeIgniter\Test\Filters\CITestStreamFilter;
@@ -52,23 +51,21 @@ public function prompt(string $field, $options = null, $validation = null): stri
5251
{
5352
$input = array_shift($this->inputs);
5453

55-
if (version_compare(CodeIgniter::CI_VERSION, '4.3.0', '>=')) {
56-
CITestStreamFilter::registration();
57-
CITestStreamFilter::addOutputFilter();
54+
CITestStreamFilter::registration();
55+
CITestStreamFilter::addOutputFilter();
5856

59-
PhpStreamWrapper::register();
60-
PhpStreamWrapper::setContent($input);
57+
PhpStreamWrapper::register();
58+
PhpStreamWrapper::setContent($input);
6159

62-
$userInput = CLI::prompt($field, $options, $validation);
60+
$userInput = CLI::prompt($field, $options, $validation);
6361

64-
PhpStreamWrapper::restore();
62+
PhpStreamWrapper::restore();
6563

66-
CITestStreamFilter::removeOutputFilter();
67-
CITestStreamFilter::removeErrorFilter();
64+
CITestStreamFilter::removeOutputFilter();
65+
CITestStreamFilter::removeErrorFilter();
6866

69-
if ($input !== $userInput) {
70-
throw new LogicException($input . '!==' . $userInput);
71-
}
67+
if ($input !== $userInput) {
68+
throw new LogicException($input . '!==' . $userInput);
7269
}
7370

7471
return $input;
@@ -79,23 +76,13 @@ public function write(
7976
?string $foreground = null,
8077
?string $background = null
8178
): void {
82-
if (version_compare(CodeIgniter::CI_VERSION, '4.3.0', '>=')) {
83-
CITestStreamFilter::registration();
84-
CITestStreamFilter::addOutputFilter();
85-
} else {
86-
CITestStreamFilter::$buffer = '';
87-
88-
$streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
89-
}
79+
CITestStreamFilter::registration();
80+
CITestStreamFilter::addOutputFilter();
9081

9182
CLI::write($text, $foreground, $background);
9283
$this->outputs[] = CITestStreamFilter::$buffer;
9384

94-
if (version_compare(CodeIgniter::CI_VERSION, '4.3.0', '>=')) {
95-
CITestStreamFilter::removeOutputFilter();
96-
CITestStreamFilter::removeErrorFilter();
97-
} else {
98-
stream_filter_remove($streamFilter);
99-
}
85+
CITestStreamFilter::removeOutputFilter();
86+
CITestStreamFilter::removeErrorFilter();
10087
}
10188
}

tests/Commands/SetupTest.php

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace Tests\Commands;
66

7-
use CodeIgniter\CodeIgniter;
87
use CodeIgniter\Shield\Commands\Setup;
98
use CodeIgniter\Test\Filters\CITestStreamFilter;
109
use Config\Services;
@@ -16,31 +15,20 @@
1615
*/
1716
final class SetupTest extends TestCase
1817
{
19-
private $streamFilter;
20-
2118
protected function setUp(): void
2219
{
2320
parent::setUp();
2421

25-
if (version_compare(CodeIgniter::CI_VERSION, '4.3.0', '>=')) {
26-
CITestStreamFilter::registration();
27-
CITestStreamFilter::addOutputFilter();
28-
} else {
29-
CITestStreamFilter::$buffer = '';
30-
$this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
31-
}
22+
CITestStreamFilter::registration();
23+
CITestStreamFilter::addOutputFilter();
3224
}
3325

3426
protected function tearDown(): void
3527
{
3628
parent::tearDown();
3729

38-
if (version_compare(CodeIgniter::CI_VERSION, '4.3.0', '>=')) {
39-
CITestStreamFilter::removeOutputFilter();
40-
CITestStreamFilter::removeErrorFilter();
41-
} else {
42-
stream_filter_remove($this->streamFilter);
43-
}
30+
CITestStreamFilter::removeOutputFilter();
31+
CITestStreamFilter::removeErrorFilter();
4432
}
4533

4634
public function testRun(): void

tests/Commands/UserModelGeneratorTest.php

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace Tests\Commands;
66

7-
use CodeIgniter\CodeIgniter;
87
use CodeIgniter\Test\CIUnitTestCase;
98
use CodeIgniter\Test\Filters\CITestStreamFilter;
109

@@ -13,22 +12,13 @@
1312
*/
1413
final class UserModelGeneratorTest extends CIUnitTestCase
1514
{
16-
private $streamFilter;
17-
1815
protected function setUp(): void
1916
{
2017
parent::setUp();
2118

22-
if (version_compare(CodeIgniter::CI_VERSION, '4.3.0', '>=')) {
23-
CITestStreamFilter::registration();
24-
CITestStreamFilter::addOutputFilter();
25-
CITestStreamFilter::addErrorFilter();
26-
} else {
27-
CITestStreamFilter::$buffer = '';
28-
29-
$this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
30-
$this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
31-
}
19+
CITestStreamFilter::registration();
20+
CITestStreamFilter::addOutputFilter();
21+
CITestStreamFilter::addErrorFilter();
3222

3323
if (is_file(HOMEPATH . 'src/Models/UserModel.php')) {
3424
copy(HOMEPATH . 'src/Models/UserModel.php', HOMEPATH . 'src/Models/UserModel.php.bak');
@@ -41,12 +31,8 @@ protected function tearDown(): void
4131
{
4232
parent::tearDown();
4333

44-
if (version_compare(CodeIgniter::CI_VERSION, '4.3.0', '>=')) {
45-
CITestStreamFilter::removeOutputFilter();
46-
CITestStreamFilter::removeErrorFilter();
47-
} else {
48-
stream_filter_remove($this->streamFilter);
49-
}
34+
CITestStreamFilter::removeOutputFilter();
35+
CITestStreamFilter::removeErrorFilter();
5036

5137
$this->deleteTestFiles();
5238

tests/Controllers/LoginTest.php

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace Tests\Controllers;
66

7-
use CodeIgniter\CodeIgniter;
87
use CodeIgniter\Config\Factories;
98
use CodeIgniter\I18n\Time;
109
use CodeIgniter\Shield\Authentication\Actions\Email2FA;
@@ -110,11 +109,7 @@ public function testLoginTooLongPasswordArgon2id(): void
110109

111110
public function testLoginActionEmailSuccess(): void
112111
{
113-
if (version_compare(CodeIgniter::CI_VERSION, '4.3.0', '>=')) {
114-
Time::setTestNow('March 10, 2017', 'UTC');
115-
} else {
116-
Time::setTestNow('March 10, 2017', 'America/Chicago');
117-
}
112+
Time::setTestNow('March 10, 2017', 'UTC');
118113

119114
$this->user->createEmailIdentity([
120115
'email' => 'foo@example.com',
@@ -166,11 +161,7 @@ public function testAfterLoggedInNotDisplayLoginPage(): void
166161

167162
public function testLoginActionUsernameSuccess(): void
168163
{
169-
if (version_compare(CodeIgniter::CI_VERSION, '4.3.0', '>=')) {
170-
Time::setTestNow('March 10, 2017', 'UTC');
171-
} else {
172-
Time::setTestNow('March 10, 2017', 'America/Chicago');
173-
}
164+
Time::setTestNow('March 10, 2017', 'UTC');
174165

175166
// Add 'username' to $validFields
176167
$authConfig = config('Auth');

0 commit comments

Comments
 (0)