refactor: vendor/bin/rector

kenjis · kenjis · commit 37effab72774 · 2022-12-21T09:21:08.000+09:00
diff --git a/app/Config/Filters.php b/app/Config/Filters.php
@@ -4,6 +4,9 @@
 
 namespace Config;
 
+use App\Filters\Auth;
+use App\Filters\Noauth;
+use App\Filters\UsersCheck;
 use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Filters\CSRF;
 use CodeIgniter\Filters\DebugToolbar;
@@ -25,9 +28,9 @@ class Filters extends BaseConfig
         'honeypot'      => Honeypot::class,
         'invalidchars'  => InvalidChars::class,
         'secureheaders' => SecureHeaders::class,
-        'auth'          => \App\Filters\Auth::class,
-        'noauth'        => \App\Filters\Noauth::class,
-        'userscheck'    => \App\Filters\UsersCheck::class,
+        'auth'          => Auth::class,
+        'noauth'        => Noauth::class,
+        'userscheck'    => UsersCheck::class,
     ];
 
     /**
diff --git a/app/Config/Validation.php b/app/Config/Validation.php
@@ -4,6 +4,7 @@
 
 namespace Config;
 
+use App\Validation\UserRules;
 use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Validation\CreditCardRules;
 use CodeIgniter\Validation\FileRules;
@@ -27,7 +28,7 @@ class Validation extends BaseConfig
         FormatRules::class,
         FileRules::class,
         CreditCardRules::class,
-        \App\Validation\UserRules::class,
+        UserRules::class,
     ];
 
     /**
diff --git a/app/Database/Migrations/20121031100537_add_users.php b/app/Database/Migrations/20121031100537_add_users.php
@@ -4,7 +4,9 @@
 
 namespace App\Database\Migrations;
 
-class AddUsers extends \CodeIgniter\Database\Migration
+use CodeIgniter\Database\Migration;
+
+class AddUsers extends Migration
 {
     public function up(): void
     {
diff --git a/app/Filters/UsersCheck.php b/app/Filters/UsersCheck.php
@@ -17,11 +17,7 @@ public function before(RequestInterface $request, $arguments = null)
         // we have to redirect the request to the second segment
         $uri = service('uri');
         if ($uri->getSegment(1) === 'users') {
-            if ($uri->getSegment(2) === '') {
-                $segment = '/';
-            } else {
-                $segment = '/' . $uri->getSegment(2);
-            }
+            $segment = $uri->getSegment(2) === '' ? '/' : '/' . $uri->getSegment(2);
 
             return redirect()->to($segment);
         }
diff --git a/tests/_support/Autoloader/UnnamespacedClass.php b/tests/_support/Autoloader/UnnamespacedClass.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Tests\Support\Autoloader;
+
 class UnnamespacedClass
 {
 }
diff --git a/tests/_support/Config/Routes.php b/tests/_support/Config/Routes.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Tests\Support\Config;
+
 /**
  * This is a simple file to include for testing the RouteCollection class.
  */
diff --git a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
@@ -4,7 +4,9 @@
 
 namespace Tests\Support\Database\Migrations;
 
-class Migration_Create_test_tables extends \CodeIgniter\Database\Migration
+use CodeIgniter\Database\Migration;
+
+class Migration_Create_test_tables extends Migration
 {
     public function up(): void
     {
diff --git a/tests/_support/Database/Seeds/AnotherSeeder.php b/tests/_support/Database/Seeds/AnotherSeeder.php
@@ -4,7 +4,9 @@
 
 namespace Tests\Support\Database\Seeds;
 
-class AnotherSeeder extends \CodeIgniter\Database\Seeder
+use CodeIgniter\Database\Seeder;
+
+class AnotherSeeder extends Seeder
 {
     public function run(): void
     {
diff --git a/tests/_support/Database/Seeds/CITestSeeder.php b/tests/_support/Database/Seeds/CITestSeeder.php
@@ -4,7 +4,9 @@
 
 namespace Tests\Support\Database\Seeds;
 
-class CITestSeeder extends \CodeIgniter\Database\Seeder
+use CodeIgniter\Database\Seeder;
+
+class CITestSeeder extends Seeder
 {
     public function run(): void
     {
diff --git a/tests/_support/DatabaseTestCase.php b/tests/_support/DatabaseTestCase.php
@@ -4,10 +4,12 @@
 
 namespace Tests\Support;
 
+use CodeIgniter\Test\CIDatabaseTestCase;
+
 /**
  * @internal
  */
-final class DatabaseTestCase extends \CodeIgniter\Test\CIDatabaseTestCase
+final class DatabaseTestCase extends CIDatabaseTestCase
 {
     /**
      * Should the database be refreshed before each test?
diff --git a/tests/_support/Files/able/apple.php b/tests/_support/Files/able/apple.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Tests\Support\Files\able;
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/tests/_support/Files/able/fig_3.php b/tests/_support/Files/able/fig_3.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Tests\Support\Files\able;
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/tests/_support/Files/able/prune_ripe.php b/tests/_support/Files/able/prune_ripe.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Tests\Support\Files\able;
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/tests/_support/Files/baker/banana.php b/tests/_support/Files/baker/banana.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Tests\Support\Files\baker;
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/tests/_support/Language/ab/Allin.php b/tests/_support/Language/ab/Allin.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Tests\Support\Language\ab;
+
 // seven deadly sins
 return [
     'two' => 'gluttony',
diff --git a/tests/_support/Language/en/Allin.php b/tests/_support/Language/en/Allin.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Tests\Support\Language\en;
+
 // 12 days of Christmas
 return [
     'for' => 'four calling birds',
diff --git a/tests/_support/Language/en/Core.php b/tests/_support/Language/en/Core.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Tests\Support\Language\en;
+
 /**
  * Core language strings.
  *
@@ -16,7 +19,6 @@
  *
  * @codeCoverageIgnore
  */
-
 // looking for a system message not likely to be part of unit testing
 return [
     'missingExtension' => '{0} extension could not be found.',
diff --git a/tests/_support/Language/en/More.php b/tests/_support/Language/en/More.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Tests\Support\Language\en;
+
 return [
     'strongForce' => 'These are not the droids you are looking for',
     'notaMoon'    => "That's no moon... it's a space station",
diff --git a/tests/_support/Language/ru/Language.php b/tests/_support/Language/ru/Language.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Tests\Support\Language\ru;
+
 return [
     'languageGetLineInvalidArgumentException' => 'Whatever this would be, translated',
 ];
diff --git a/tests/_support/Libraries/ConfigReader.php b/tests/_support/Libraries/ConfigReader.php
@@ -43,14 +43,16 @@
 
 namespace Tests\Support\Libraries;
 
+use Config\App;
+
 /**
  * Class ConfigReader
  *
  * An extension of BaseConfig that prevents the constructor from
  * loading external values. Used to read actual local values from
  * a config file.
  */
-class ConfigReader extends \Config\App
+class ConfigReader extends App
 {
     public function __construct()
     {
diff --git a/tests/_support/Log/Handlers/TestHandler.php b/tests/_support/Log/Handlers/TestHandler.php
@@ -4,14 +4,18 @@
 
 namespace Tests\Support\Log\Handlers;
 
+use CodeIgniter\Log\Handlers\FileHandler;
+
 /**
  * Class TestHandler
  *
  * A simple LogHandler that stores the logs in memory.
  * Only used for testing purposes.
  */
-class TestHandler extends \CodeIgniter\Log\Handlers\FileHandler
+class TestHandler extends FileHandler
 {
+    public string $destination;
+
     /**
      * Local storage for logs.
      *
@@ -40,6 +44,9 @@ public function __construct(array $config)
      * If the handler returns false, then execution of handlers
      * will stop. Any handlers that have not run, yet, will not
      * be run.
+     *
+     * @param mixed $level
+     * @param mixed $message
      */
     public function handle($level, $message): bool
     {
diff --git a/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php b/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php
@@ -4,7 +4,9 @@
 
 namespace Tests\Support\MigrationTestMigrations\Database\Migrations;
 
-class Migration_some_migration extends \CodeIgniter\Database\Migration
+use CodeIgniter\Database\Migration;
+
+class Migration_some_migration extends Migration
 {
     public function up(): void
     {
diff --git a/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php b/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php
@@ -4,7 +4,9 @@
 
 namespace Tests\Support\MigrationTestMigrations\Database\Migrations;
 
-class Migration_another_migration extends \CodeIgniter\Database\Migration
+use CodeIgniter\Database\Migration;
+
+class Migration_another_migration extends Migration
 {
     public function up(): void
     {
diff --git a/tests/_support/Services.php b/tests/_support/Services.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace CodeIgniter;
+namespace Tests\Support;
 
 use CIUnitTestCase;
 use Config\Services as ConfigServices;
@@ -35,6 +35,8 @@ public static function reset(): void
 
     /**
      * Inject mock object for testing.
+     *
+     * @param mixed $mock
      */
     public static function injectMock(string $name, $mock): void
     {
diff --git a/tests/_support/SessionTestCase.php b/tests/_support/SessionTestCase.php
@@ -7,6 +7,7 @@
 use CodeIgniter\Session\Handlers\ArrayHandler;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockSession;
+use Config\Services;
 
 /**
  * @internal
@@ -34,6 +35,6 @@ protected function mockSession(): void
     {
         $config        = config('App');
         $this->session = new MockSession(new ArrayHandler($config, '0.0.0.0'), $config);
-        \Config\Services::injectMock('session', $this->session);
+        Services::injectMock('session', $this->session);
     }
 }
diff --git a/tests/database/ExampleDatabaseTest.php b/tests/database/ExampleDatabaseTest.php
@@ -1,13 +1,14 @@
 <?php
 
 declare(strict_types=1);
+use Tests\Support\DatabaseTestCase;
 
 use Tests\Support\Models\ExampleModel;
 
 /**
  * @internal
  */
-final class ExampleDatabaseTest extends \Tests\Support\DatabaseTestCase
+final class ExampleDatabaseTest extends DatabaseTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/session/ExampleSessionTest.php b/tests/session/ExampleSessionTest.php
@@ -2,10 +2,12 @@
 
 declare(strict_types=1);
 
+use Tests\Support\SessionTestCase;
+
 /**
  * @internal
  */
-final class ExampleSessionTest extends \Tests\Support\SessionTestCase
+final class ExampleSessionTest extends SessionTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/unit/HealthTest.php b/tests/unit/HealthTest.php
@@ -2,10 +2,13 @@
 
 declare(strict_types=1);
 
+use CodeIgniter\Test\CIUnitTestCase;
+use Tests\Support\Libraries\ConfigReader;
+
 /**
  * @internal
  */
-final class HealthTest extends \CodeIgniter\Test\CIUnitTestCase
+final class HealthTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
@@ -29,7 +32,7 @@ public function testBaseUrlHasBeenSet(): void
         }
 
         // Then check the actual config file
-        $reader = new \Tests\Support\Libraries\ConfigReader();
+        $reader = new ConfigReader();
         $config = ! empty($reader->baseUrl);
 
         $this->assertTrue($env || $config);

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,9 @@`
`4`	`4`
`5`	`5`	`namespace App\Database\Migrations;`
`6`	`6`
`7`		`-class AddUsers extends \CodeIgniter\Database\Migration`
	`7`	`+use CodeIgniter\Database\Migration;`
	`8`	`+`
	`9`	`+class AddUsers extends Migration`
`8`	`10`	`{`
`9`	`11`	`public function up(): void`
`10`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`
`3`	`3`	`declare(strict_types=1);`
`4`	`4`
	`5`	`+namespace Tests\Support\Autoloader;`
	`6`	`+`
`5`	`7`	`class UnnamespacedClass`
`6`	`8`	`{`
`7`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,9 @@`
`4`	`4`
`5`	`5`	`namespace Tests\Support\Database\Migrations;`
`6`	`6`
`7`		`-class Migration_Create_test_tables extends \CodeIgniter\Database\Migration`
	`7`	`+use CodeIgniter\Database\Migration;`
	`8`	`+`
	`9`	`+class Migration_Create_test_tables extends Migration`
`8`	`10`	`{`
`9`	`11`	`public function up(): void`
`10`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,9 @@`
`4`	`4`
`5`	`5`	`namespace Tests\Support\Database\Seeds;`
`6`	`6`
`7`		`-class AnotherSeeder extends \CodeIgniter\Database\Seeder`
	`7`	`+use CodeIgniter\Database\Seeder;`
	`8`	`+`
	`9`	`+class AnotherSeeder extends Seeder`
`8`	`10`	`{`
`9`	`11`	`public function run(): void`
`10`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,9 @@`
`4`	`4`
`5`	`5`	`namespace Tests\Support\Database\Seeds;`
`6`	`6`
`7`		`-class CITestSeeder extends \CodeIgniter\Database\Seeder`
	`7`	`+use CodeIgniter\Database\Seeder;`
	`8`	`+`
	`9`	`+class CITestSeeder extends Seeder`
`8`	`10`	`{`
`9`	`11`	`public function run(): void`
`10`	`12`	`{`