refactor: run rector and fix types

kenjis · kenjis · commit e49c0bd41fbf · 2022-06-28T09:11:12.000+09:00
diff --git a/tests/system/CLI/ConsoleTest.php b/tests/system/CLI/ConsoleTest.php
@@ -24,11 +24,7 @@
  */
 final class ConsoleTest extends CIUnitTestCase
 {
-    /**
-     * @var DotEnv
-     */
-    private $env;
-
+    private DotEnv $env;
     private $stream_filter;
 
     protected function setUp(): void
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter;
 
 use CodeIgniter\Config\BaseService;
+use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\URI;
@@ -43,12 +44,8 @@
  */
 final class CommonFunctionsTest extends CIUnitTestCase
 {
-    /**
-     * @var App
-     */
-    private $config;
-
-    public MockIncomingRequest $request;
+    private ?App $config = null;
+    private IncomingRequest $request;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Config/DotEnvTest.php b/tests/system/Config/DotEnvTest.php
@@ -24,12 +24,8 @@
  */
 final class DotEnvTest extends CIUnitTestCase
 {
-    /**
-     * @var vfsStreamDirectory|null
-     */
-    private $root;
-
-    public string $path;
+    private ?vfsStreamDirectory $root;
+    private string $path;
     private $fixturesFolder;
 
     protected function setUp(): void
diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
@@ -33,10 +33,7 @@
  */
 final class ControllerTest extends CIUnitTestCase
 {
-    /**
-     * @var App
-     */
-    private $config;
+    private App $config;
 
     /**
      * @var Controller
diff --git a/tests/system/Database/Live/MetadataTest.php b/tests/system/Database/Live/MetadataTest.php
@@ -26,13 +26,9 @@ final class MetadataTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
-    /**
-     * @var Forge
-     */
-    private $forge;
-
-    protected $refresh = true;
-    protected $seed    = CITestSeeder::class;
+    private ?Forge $forge = null;
+    protected $refresh    = true;
+    protected $seed       = CITestSeeder::class;
 
     /**
      * Array of expected tables.
diff --git a/tests/system/Events/EventsTest.php b/tests/system/Events/EventsTest.php
@@ -25,7 +25,7 @@ final class EventsTest extends CIUnitTestCase
     /**
      * Accessible event manager instance
      */
-    private MockEvents $manager;
+    private Events $manager;
 
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
@@ -25,7 +25,7 @@
  */
 final class CURLRequestDoNotShareOptionsTest extends CIUnitTestCase
 {
-    private MockCURLRequest $request;
+    private CURLRequest $request;
 
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
@@ -25,7 +25,7 @@
  */
 final class CURLRequestTest extends CIUnitTestCase
 {
-    private MockCURLRequest $request;
+    private CURLRequest $request;
 
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php
@@ -27,15 +27,8 @@
  */
 final class ContentSecurityPolicyTest extends CIUnitTestCase
 {
-    /**
-     * @var Response
-     */
-    private $response;
-
-    /**
-     * @var \CodeIgniter\HTTP\ContentSecurityPolicy
-     */
-    private $csp;
+    private ?Response $response         = null;
+    private ?ContentSecurityPolicy $csp = null;
 
     // Having this method as setUp() doesn't work - can't find Config\App !?
     protected function prepare(bool $CSPEnabled = true)
diff --git a/tests/system/HTTP/Files/FileMovingTest.php b/tests/system/HTTP/Files/FileMovingTest.php
@@ -21,22 +21,10 @@
  */
 final class FileMovingTest extends CIUnitTestCase
 {
-    /**
-     * @var vfsStreamDirectory|null
-     */
-    private $root;
-
-    public string $path;
-
-    /**
-     * @var string
-     */
-    private $start;
-
-    /**
-     * @var string
-     */
-    private $destination;
+    private ?vfsStreamDirectory $root;
+    private string $path;
+    private string $start;
+    private string $destination;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Helpers/CookieHelperTest.php b/tests/system/Helpers/CookieHelperTest.php
@@ -28,7 +28,7 @@
  */
 final class CookieHelperTest extends CIUnitTestCase
 {
-    public IncomingRequest $request;
+    private IncomingRequest $request;
     private $name;
     private string $value;
     private int $expire;
diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php
@@ -23,7 +23,7 @@ final class FilesystemHelperTest extends CIUnitTestCase
     /**
      * @var array<string, array<string, mixed[]>>|array<string, array<string, string>>|array<string, mixed>|array<string, mixed[]>|array<string, string>|mixed
      */
-    private $structure;
+    private array $structure;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Images/BaseHandlerTest.php b/tests/system/Images/BaseHandlerTest.php
@@ -31,25 +31,10 @@
  */
 final class BaseHandlerTest extends CIUnitTestCase
 {
-    /**
-     * @var vfsStreamDirectory
-     */
-    private $root;
-
-    /**
-     * @var string
-     */
-    private $origin;
-
-    /**
-     * @var string
-     */
-    private $start;
-
-    /**
-     * @var string
-     */
-    private $path;
+    private vfsStreamDirectory $root;
+    private string $origin;
+    private string $start;
+    private string $path;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Images/GDHandlerTest.php b/tests/system/Images/GDHandlerTest.php
@@ -31,30 +31,11 @@
  */
 final class GDHandlerTest extends CIUnitTestCase
 {
-    /**
-     * @var vfsStreamDirectory
-     */
-    private $root;
-
-    /**
-     * @var string
-     */
-    private $origin;
-
-    /**
-     * @var string
-     */
-    private $start;
-
-    /**
-     * @var string
-     */
-    private $path;
-
-    /**
-     * @var BaseHandler
-     */
-    private $handler;
+    private vfsStreamDirectory $root;
+    private string $origin;
+    private string $start;
+    private string $path;
+    private BaseHandler $handler;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Images/ImageMagickHandlerTest.php b/tests/system/Images/ImageMagickHandlerTest.php
@@ -31,25 +31,10 @@
  */
 final class ImageMagickHandlerTest extends CIUnitTestCase
 {
-    /**
-     * @var string
-     */
-    private $root;
-
-    /**
-     * @var string
-     */
-    private $origin;
-
-    /**
-     * @var string
-     */
-    private $path;
-
-    /**
-     * @var BaseHandler
-     */
-    private $handler;
+    private string $root;
+    private string $origin;
+    private string $path;
+    private BaseHandler $handler;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Images/ImageTest.php b/tests/system/Images/ImageTest.php
@@ -21,22 +21,10 @@
  */
 final class ImageTest extends CIUnitTestCase
 {
-    /**
-     * @var vfsStreamDirectory
-     */
-    private $root;
-
-    public string $origin;
-
-    /**
-     * @var string
-     */
-    private $start;
-
-    /**
-     * @var Image
-     */
-    private $image;
+    private vfsStreamDirectory $root;
+    private string $origin;
+    private string $start;
+    private Image $image;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Log/Handlers/FileHandlerTest.php b/tests/system/Log/Handlers/FileHandlerTest.php
@@ -23,15 +23,8 @@
  */
 final class FileHandlerTest extends CIUnitTestCase
 {
-    /**
-     * @var vfsStreamDirectory
-     */
-    private $root;
-
-    /**
-     * @var string
-     */
-    private $start;
+    private vfsStreamDirectory $root;
+    private string $start;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Pager/PagerRendererTest.php b/tests/system/Pager/PagerRendererTest.php
@@ -19,11 +19,7 @@
  */
 final class PagerRendererTest extends CIUnitTestCase
 {
-    /**
-     * @var string
-     */
-    private $expect;
-
+    private string $expect;
     private URI $uri;
 
     protected function setUp(): void
diff --git a/tests/system/Throttle/ThrottleTest.php b/tests/system/Throttle/ThrottleTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Throttle;
 
+use CodeIgniter\Cache\CacheInterface;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockCache;
 
@@ -19,10 +20,7 @@
  */
 final class ThrottleTest extends CIUnitTestCase
 {
-    /**
-     * @var Cache
-     */
-    private $cache;
+    private CacheInterface $cache;
 
     protected function setUp(): void
     {
diff --git a/tests/system/View/TableTest.php b/tests/system/View/TableTest.php
@@ -21,10 +21,7 @@
  */
 final class TableTest extends CIUnitTestCase
 {
-    /**
-     * @var Table
-     */
-    private $table;
+    private Table $table;
 
     protected function setUp(): void
     {

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ final class EventsTest extends CIUnitTestCase`
`25`	`25`	`/**`
`26`	`26`	`* Accessible event manager instance`
`27`	`27`	`*/`
`28`		`- private MockEvents $manager;`
	`28`	`+ private Events $manager;`
`29`	`29`
`30`	`30`	`protected function setUp(): void`
`31`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`*/`
`26`	`26`	`final class CURLRequestDoNotShareOptionsTest extends CIUnitTestCase`
`27`	`27`	`{`
`28`		`- private MockCURLRequest $request;`
	`28`	`+ private CURLRequest $request;`
`29`	`29`
`30`	`30`	`protected function setUp(): void`
`31`	`31`	`{`