chore: fix CQ error

codeigniter4 · May 20, 2023 · 0b113d9 · 0b113d9
1 parent e9a4a8f
commit 0b113d9
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 41 deletions.
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,22 +1,22 @@
-parameters:
-	tmpDir: build/phpstan
-	level: 5
-	paths:
-		- src/
-		- tests/
-	bootstrapFiles:
-		- vendor/codeigniter4/framework/system/Test/bootstrap.php
-	excludePaths:
-		- src/Config/Routes.php
-		- src/Views/*
-	ignoreErrors:
-	universalObjectCratesClasses:
-		- CodeIgniter\Entity
-		- CodeIgniter\Entity\Entity
-		- Faker\Generator
-	scanDirectories:
-		- vendor/codeigniter4/framework/system/Helpers
-	dynamicConstantNames:
-		- APP_NAMESPACE
-		- CI_DEBUG
-		- ENVIRONMENT
+parameters:
+	tmpDir: build/phpstan
+	level: 5
+	paths:
+		- src/
+		- tests/
+	bootstrapFiles:
+		- vendor/codeigniter4/framework/system/Test/bootstrap.php
+	excludePaths:
+		- src/Config/Routes.php
+		- src/Views/*
+	ignoreErrors:
+	universalObjectCratesClasses:
+		- CodeIgniter\Entity
+		- CodeIgniter\Entity\Entity
+		- Faker\Generator
+	scanDirectories:
+		- vendor/codeigniter4/framework/system/Helpers
+	dynamicConstantNames:
+		- APP_NAMESPACE
+		- CI_DEBUG
+		- ENVIRONMENT
diff --git a/src/Config/Commands/SettingsPublisher.php → src/Commands/SettingsPublisher.php b/src/Config/Commands/SettingsPublisher.php → src/Commands/SettingsPublisher.php
diff --git a/tests/Commands/SettingsPublisherTest.php b/tests/Commands/SettingsPublisherTest.php
@@ -4,7 +4,6 @@
 
 namespace Tests\Commands;
 
-use CodeIgniter\CodeIgniter;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
@@ -13,35 +12,23 @@
  */
 final class SettingsPublisherTest extends CIUnitTestCase
 {
-    private $streamFilter;
-
     protected function setUp(): void
     {
         parent::setUp();
 
-        if (version_compare(CodeIgniter::CI_VERSION, '4.3.0', '>=')) {
-            CITestStreamFilter::registration();
-            CITestStreamFilter::addOutputFilter();
-            CITestStreamFilter::addErrorFilter();
-        } else {
-            CITestStreamFilter::$buffer = '';
-
-            $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
-            $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
-        }
+        CITestStreamFilter::registration();
+        CITestStreamFilter::addOutputFilter();
+        CITestStreamFilter::addErrorFilter();
 
     }
 
     protected function tearDown(): void
     {
         parent::tearDown();
 
-        if (version_compare(CodeIgniter::CI_VERSION, '4.3.0', '>=')) {
-            CITestStreamFilter::removeOutputFilter();
-            CITestStreamFilter::removeErrorFilter();
-        } else {
-            stream_filter_remove($this->streamFilter);
-        }
+        CITestStreamFilter::removeOutputFilter();
+        CITestStreamFilter::removeErrorFilter();
+
     }
 
     public function testPublishConfigFile(): void