clean up use statements: remove unused and sort

app/Config/Kint.php

@@ -1,7 +1,7 @@
 <?php namespace Config;
 
-use Kint\Renderer\Renderer;
 use CodeIgniter\Config\BaseConfig;
+use Kint\Renderer\Renderer;
 
 class Kint extends BaseConfig
 {

app/Config/Services.php

@@ -1,7 +1,6 @@
 <?php namespace Config;
 
 use CodeIgniter\Config\Services as CoreServices;
-use CodeIgniter\Config\BaseConfig;
 
 require_once SYSTEMPATH . 'Config/Services.php';
 

system/API/ResponseTrait.php

@@ -39,8 +39,8 @@
 
 namespace CodeIgniter\API;
 
-use Config\Format;
 use CodeIgniter\HTTP\Response;
+use Config\Format;
 
 /**
  * Response trait.

system/CLI/CommandRunner.php

@@ -40,8 +40,8 @@
 
 namespace CodeIgniter\CLI;
 
-use Config\Services;
 use CodeIgniter\Controller;
+use Config\Services;
 
 /**
  * Command runner

system/CodeIgniter.php

@@ -39,20 +39,20 @@
 namespace CodeIgniter;
 
 use Closure;
+use CodeIgniter\Debug\Timer;
+use CodeIgniter\Events\Events;
+use CodeIgniter\Exceptions\PageNotFoundException;
+use CodeIgniter\HTTP\CLIRequest;
 use CodeIgniter\HTTP\DownloadResponse;
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\Request;
-use CodeIgniter\HTTP\ResponseInterface;
-use Config\Services;
-use Config\Cache;
-use CodeIgniter\HTTP\URI;
-use CodeIgniter\Debug\Timer;
-use CodeIgniter\Events\Events;
 use CodeIgniter\HTTP\Response;
-use CodeIgniter\HTTP\CLIRequest;
+use CodeIgniter\HTTP\ResponseInterface;
+use CodeIgniter\HTTP\URI;
 use CodeIgniter\Router\Exceptions\RedirectException;
 use CodeIgniter\Router\RouteCollectionInterface;
-use CodeIgniter\Exceptions\PageNotFoundException;
+use Config\Cache;
+use Config\Services;
 use Exception;
 
 /**

system/Commands/Database/CreateMigration.php

@@ -41,7 +41,6 @@ namespace CodeIgniter\Commands\Database;
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
 use Config\Services;
-use Config\Migrations;
 
 /**
  * Creates a new migration file.

system/Commands/Database/MigrateRefresh.php

@@ -39,8 +39,8 @@
 
 namespace CodeIgniter\Commands\Database;
 
-use CodeIgniter\CLI\CLI;
 use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
 
 /**
  * Does a rollback followed by a latest to refresh the current state

system/Commands/Database/MigrateRollback.php

@@ -42,7 +42,6 @@ namespace CodeIgniter\Commands\Database;
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
 use Config\Services;
-use Config\Autoload;
 
 /**
  * Runs all of the migrations in reverse order, until they have

system/Common.php

@@ -37,20 +37,20 @@
  * @filesource
  */
 
-use Config\App;
-use Config\View;
-use Config\Logger;
-use Config\Database;
-use Config\Services;
-use CodeIgniter\HTTP\URI;
-use Laminas\Escaper\Escaper;
 use CodeIgniter\Config\Config;
-use CodeIgniter\Test\TestLogger;
+use CodeIgniter\Database\ConnectionInterface;
+use CodeIgniter\Files\Exceptions\FileNotFoundException;
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
-use CodeIgniter\Database\ConnectionInterface;
-use CodeIgniter\Files\Exceptions\FileNotFoundException;
+use CodeIgniter\HTTP\URI;
+use CodeIgniter\Test\TestLogger;
+use Config\App;
+use Config\Database;
+use Config\Logger;
+use Config\Services;
+use Config\View;
+use Laminas\Escaper\Escaper;
 
 /**
  * Common Functions

system/Config/Services.php

@@ -39,6 +39,8 @@
 namespace CodeIgniter\Config;
 
 use CodeIgniter\Cache\CacheFactory;
+use CodeIgniter\Database\ConnectionInterface;
+use CodeIgniter\Database\MigrationRunner;
 use CodeIgniter\Debug\Exceptions;
 use CodeIgniter\Debug\Iterator;
 use CodeIgniter\Debug\Timer;
@@ -70,10 +72,8 @@ use CodeIgniter\Typography\Typography;
 use CodeIgniter\Validation\Validation;
 use CodeIgniter\View\Cell;
 use CodeIgniter\View\Parser;
-use Config\App;
-use CodeIgniter\Database\ConnectionInterface;
-use CodeIgniter\Database\MigrationRunner;
 use CodeIgniter\View\RendererInterface;
+use Config\App;
 use Config\Cache;
 use Config\Images;
 use Config\Logger;

system/Controller.php

@@ -39,11 +39,11 @@
 
 namespace CodeIgniter;
 
-use Config\Services;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
-use CodeIgniter\Validation\Validation;
 use CodeIgniter\Validation\Exceptions\ValidationException;
+use CodeIgniter\Validation\Validation;
+use Config\Services;
 use Psr\Log\LoggerInterface;
 
 /**

system/Database/BaseBuilder.php

@@ -39,9 +39,9 @@
 
 namespace CodeIgniter\Database;
 
+use Closure;
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Database\Exceptions\DataException;
-use Closure;
 
 /**
  * Class BaseBuilder

system/Database/BaseConnection.php

@@ -39,8 +39,8 @@
 
 namespace CodeIgniter\Database;
 
-use CodeIgniter\Events\Events;
 use CodeIgniter\Database\Exceptions\DatabaseException;
+use CodeIgniter\Events\Events;
 
 /**
  * Class BaseConnection

system/Database/MigrationRunner.php

@@ -38,10 +38,10 @@
 
 namespace CodeIgniter\Database;
 
-use Config\Services;
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Exceptions\ConfigException;
+use Config\Services;
 
 /**
  * Class MigrationRunner

system/Database/MySQLi/PreparedQuery.php

@@ -39,8 +39,8 @@
 
 namespace CodeIgniter\Database\MySQLi;
 
-use CodeIgniter\Database\PreparedQueryInterface;
 use CodeIgniter\Database\BasePreparedQuery;
+use CodeIgniter\Database\PreparedQueryInterface;
 
 /**
  * Prepared query for MySQLi

system/Database/Postgre/Builder.php

@@ -40,7 +40,6 @@ namespace CodeIgniter\Database\Postgre;
 
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Database\Exceptions\DatabaseException;
-use http\Encoding\Stream\Inflate;
 
 /**
  * Builder for Postgre

system/Database/Postgre/PreparedQuery.php

@@ -39,8 +39,8 @@
 
 namespace CodeIgniter\Database\Postgre;
 
-use CodeIgniter\Database\PreparedQueryInterface;
 use CodeIgniter\Database\BasePreparedQuery;
+use CodeIgniter\Database\PreparedQueryInterface;
 
 /**
  * Prepared query for Postgre

system/Database/SQLite3/PreparedQuery.php

@@ -39,8 +39,8 @@
 
 namespace CodeIgniter\Database\SQLite3;
 
-use CodeIgniter\Database\PreparedQueryInterface;
 use CodeIgniter\Database\BasePreparedQuery;
+use CodeIgniter\Database\PreparedQueryInterface;
 
 /**
  * Prepared query for SQLite3

system/Database/Seeder.php

@@ -41,7 +41,6 @@ namespace CodeIgniter\Database;
 
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\Config\BaseConfig;
-use CodeIgniter\Database\Forge;
 
 /**
  * Class Seeder

system/Debug/Toolbar/Collectors/Config.php

@@ -39,9 +39,9 @@
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
 
+use CodeIgniter\CodeIgniter;
 use Config\App;
 use Config\Services;
-use CodeIgniter\CodeIgniter;
 
 /**
  * Debug toolbar configuration

system/Debug/Toolbar/Collectors/Events.php

@@ -39,8 +39,8 @@
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
 
-use Config\Services;
 use CodeIgniter\View\RendererInterface;
+use Config\Services;
 
 /**
  * Views collector

system/Debug/Toolbar/Collectors/Views.php

@@ -39,8 +39,8 @@
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
 
-use Config\Services;
 use CodeIgniter\View\RendererInterface;
+use Config\Services;
 
 /**
  * Views collector

system/Encryption/Encryption.php

@@ -38,10 +38,8 @@
 
 namespace CodeIgniter\Encryption;
 
-use Config\Encryption as EncryptionConfig;
-use CodeIgniter\Encryption\Exceptions\EncryptionException;
 use CodeIgniter\Config\BaseConfig;
-use Config\Services;
+use CodeIgniter\Encryption\Exceptions\EncryptionException;
 
 /**
  * CodeIgniter Encryption Manager

system/Entity.php

@@ -39,9 +39,8 @@
 
 namespace CodeIgniter;
 
-use CodeIgniter\Exceptions\EntityException;
-use CodeIgniter\I18n\Time;
 use CodeIgniter\Exceptions\CastException;
+use CodeIgniter\I18n\Time;
 
 /**
  * Entity encapsulation, for use with CodeIgniter\Model

system/Files/File.php

@@ -39,9 +39,9 @@
 
 namespace CodeIgniter\Files;
 
-use SplFileInfo;
 use CodeIgniter\Files\Exceptions\FileException;
 use CodeIgniter\Files\Exceptions\FileNotFoundException;
+use SplFileInfo;
 
 /**
  * Wrapper for PHP's built-in SplFileInfo, with goodies.

system/Filters/Filters.php

@@ -39,9 +39,9 @@
 namespace CodeIgniter\Filters;
 
 use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Filters\Exceptions\FilterException;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
-use CodeIgniter\Filters\Exceptions\FilterException;
 
 /**
  * Filters

system/Filters/Honeypot.php

@@ -38,10 +38,10 @@
 
 namespace CodeIgniter\Filters;
 
+use CodeIgniter\Honeypot\Exceptions\HoneypotException;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;
-use CodeIgniter\Honeypot\Exceptions\HoneypotException;
 
 /**
  * Honeypot filter

system/HTTP/Response.php

@@ -40,10 +40,10 @@
 
 namespace CodeIgniter\HTTP;
 
-use Config\App;
-use Config\Format;
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\Pager\PagerInterface;
+use Config\App;
+use Config\Format;
 
 /**
  * Representation of an outgoing, getServer-side response.

system/Honeypot/Honeypot.php

@@ -39,9 +39,9 @@
 namespace CodeIgniter\Honeypot;
 
 use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Honeypot\Exceptions\HoneypotException;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
-use CodeIgniter\Honeypot\Exceptions\HoneypotException;
 
 /**
  * class Honeypot

system/I18n/Time.php

@@ -40,12 +40,12 @@
 namespace CodeIgniter\I18n;
 
 use CodeIgniter\I18n\Exceptions\I18nException;
-use IntlCalendar;
-use Locale;
-use DateTime;
 use DateInterval;
+use DateTime;
 use DateTimeZone;
+use IntlCalendar;
 use IntlDateFormatter;
+use Locale;
 
 /**
  * Class Time

system/Log/Logger.php

@@ -39,8 +39,8 @@
 
 namespace CodeIgniter\Log;
 
-use Psr\Log\LoggerInterface;
 use CodeIgniter\Log\Exceptions\LogException;
+use Psr\Log\LoggerInterface;
 
 /**
  * The CodeIgntier Logger
@@ -467,7 +467,6 @@ class Logger implements LoggerInterface
 		return strtr($message, $replace);
 	}
 
-
 	/**
 	 * Determines the file and line that the logging call
 	 * was made from by analyzing the backtrace.

system/Model.php

@@ -40,16 +40,16 @@
 namespace CodeIgniter;
 
 use Closure;
-use CodeIgniter\Exceptions\ModelException;
-use Config\Database;
-use CodeIgniter\I18n\Time;
-use CodeIgniter\Pager\Pager;
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\Database\ConnectionInterface;
-use CodeIgniter\Validation\ValidationInterface;
-use CodeIgniter\Database\Exceptions\DataException;
 use CodeIgniter\Database\Exceptions\DatabaseException;
+use CodeIgniter\Database\Exceptions\DataException;
+use CodeIgniter\Exceptions\ModelException;
+use CodeIgniter\I18n\Time;
+use CodeIgniter\Pager\Pager;
+use CodeIgniter\Validation\ValidationInterface;
+use Config\Database;
 use ReflectionClass;
 use ReflectionProperty;
 use stdClass;

system/Pager/Pager.php

@@ -40,7 +40,6 @@
 namespace CodeIgniter\Pager;
 
 use CodeIgniter\Pager\Exceptions\PagerException;
-use Config\Services;
 use CodeIgniter\View\RendererInterface;
 
 /**

system/Router/RouteCollection.php

@@ -38,10 +38,10 @@
 
 namespace CodeIgniter\Router;
 
-use CodeIgniter\HTTP\Request;
-use Config\Services;
 use CodeIgniter\Autoloader\FileLocator;
+use CodeIgniter\HTTP\Request;
 use CodeIgniter\Router\Exceptions\RouterException;
+use Config\Services;
 
 /**
  * Class RouteCollection

system/Router/Router.php

@@ -39,8 +39,8 @@
 
 namespace CodeIgniter\Router;
 
-use CodeIgniter\HTTP\Request;
 use CodeIgniter\Exceptions\PageNotFoundException;
+use CodeIgniter\HTTP\Request;
 use CodeIgniter\Router\Exceptions\RedirectException;
 use CodeIgniter\Router\Exceptions\RouterException;
 

system/Session/Handlers/ArrayHandler.php

@@ -39,9 +39,6 @@
 
 namespace CodeIgniter\Session\Handlers;
 
-use CodeIgniter\Session\Exceptions\SessionException;
-use CodeIgniter\Config\BaseConfig;
-use CodeIgniter\Database\BaseConnection;
 use Config\Database;
 
 /**

system/Session/Handlers/DatabaseHandler.php

@@ -39,9 +39,9 @@
 
 namespace CodeIgniter\Session\Handlers;
 
-use CodeIgniter\Session\Exceptions\SessionException;
 use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Session\Exceptions\SessionException;
 use Config\Database;
 
 /**

system/Test/CIDatabaseTestCase.php

@@ -38,14 +38,12 @@
 
 namespace CodeIgniter\Test;
 
-use CodeIgniter\Config\Config;
-use Config\Autoload;
-use Config\Database;
-use Config\Migrations;
-use Config\Services;
 use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\Database\MigrationRunner;
 use CodeIgniter\Exceptions\ConfigException;
+use Config\Database;
+use Config\Migrations;
+use Config\Services;
 
 /**
  * CIDatabaseTestCase

system/Test/CIUnitTestCase.php

@@ -39,10 +39,9 @@
 
 namespace CodeIgniter\Test;
 
-use Config\Paths;
 use CodeIgniter\Events\Events;
+use Config\Paths;
 use PHPUnit\Framework\TestCase;
-use CodeIgniter\Test\TestLogger;
 
 /**
  * PHPunit test case.

system/Test/ControllerTester.php

@@ -41,9 +41,9 @@
 namespace CodeIgniter\Test;
 
 use CodeIgniter\HTTP\IncomingRequest;
-use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\UserAgent;
 use Config\App;
 use Config\Services;
 use InvalidArgumentException;

system/Test/FeatureTestCase.php

@@ -38,11 +38,11 @@
 
 namespace CodeIgniter\Test;
 
-use CodeIgniter\HTTP\URI;
-use CodeIgniter\HTTP\Request;
 use CodeIgniter\Events\Events;
-use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\Request;
+use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\UserAgent;
 use Config\App;
 use Config\Services;
 

system/Test/Mock/MockSecurity.php

@@ -1,7 +1,7 @@
 <?php namespace CodeIgniter\Test\Mock;
 
-use CodeIgniter\Security\Security;
 use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\Security\Security;
 
 class MockSecurity extends Security
 {

system/Test/ReflectionHelper.php

@@ -39,9 +39,9 @@
 
 namespace CodeIgniter\Test;
 
+use ReflectionClass;
 use ReflectionMethod;
 use ReflectionObject;
-use ReflectionClass;
 
 /**
  * Testing helper.

system/View/Cell.php

@@ -40,8 +40,8 @@ namespace CodeIgniter\View;
 
 use CodeIgniter\Cache\CacheInterface;
 use CodeIgniter\View\Exceptions\ViewException;
-use ReflectionMethod;
 use Config\Services;
+use ReflectionMethod;
 
 /**
  * Class Cell

system/View/Parser.php

@@ -39,8 +39,8 @@
 
 namespace CodeIgniter\View;
 
-use Psr\Log\LoggerInterface;
 use CodeIgniter\View\Exceptions\ViewException;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class Parser

tests/_support/Controllers/Popcorn.php

@@ -3,7 +3,6 @@ namespace Tests\Support\Controllers;
 
 use CodeIgniter\API\ResponseTrait;
 use CodeIgniter\Controller;
-use CodeIgniter\HTTP\Exceptions\HTTPException;
 
 /**
  * This is a testing only controller, intended to blow up in multiple

tests/system/API/ResponseTraitTest.php

@@ -1,12 +1,12 @@
 <?php
 namespace CodeIgniter\API;
 
+use CodeIgniter\Format\JSONFormatter;
+use CodeIgniter\Format\XMLFormatter;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\HTTP\UserAgent;
-use CodeIgniter\Test\Mock\MockResponse;
-use CodeIgniter\Format\XMLFormatter;
-use CodeIgniter\Format\JSONFormatter;
 use CodeIgniter\Test\Mock\MockIncomingRequest;
+use CodeIgniter\Test\Mock\MockResponse;
 
 class ResponseTraitTest extends \CodeIgniter\Test\CIUnitTestCase
 {

tests/system/CLI/CommandRunnerTest.php

@@ -2,9 +2,9 @@
 namespace CodeIgniter\CLI;
 
 use CodeIgniter\HTTP\UserAgent;
-use Config\Services;
-use CodeIgniter\Test\Mock\MockCLIConfig;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
+use CodeIgniter\Test\Mock\MockCLIConfig;
+use Config\Services;
 
 class CommandRunnerTest extends \CodeIgniter\Test\CIUnitTestCase
 {

tests/system/CLI/ConsoleTest.php

@@ -1,9 +1,9 @@
 <?php namespace CodeIgniter\CLI;
 
 use CodeIgniter\HTTP\CLIRequest;
-use CodeIgniter\Test\Mock\MockCodeIgniter;
-use CodeIgniter\Test\Mock\MockCLIConfig;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
+use CodeIgniter\Test\Mock\MockCLIConfig;
+use CodeIgniter\Test\Mock\MockCodeIgniter;
 
 class ConsoleTest extends \CodeIgniter\Test\CIUnitTestCase
 {

tests/system/CodeIgniterTest.php

@@ -1,9 +1,9 @@
 <?php namespace CodeIgniter;
 
-use Config\App;
-use CodeIgniter\Test\Mock\MockCodeIgniter;
-use CodeIgniter\Router\RouteCollection;
 use \CodeIgniter\Config\Services;
+use CodeIgniter\Router\RouteCollection;
+use CodeIgniter\Test\Mock\MockCodeIgniter;
+use Config\App;
 
 /**
  * @backupGlobals enabled

tests/system/Commands/CommandClassTest.php

@@ -1,8 +1,8 @@
 <?php
 namespace CodeIgniter\Commands;
 
-use Config\Services;
 use CodeIgniter\CLI\CommandRunner;
+use Config\Services;
 
 class BaseCommandTest extends \CodeIgniter\Test\CIUnitTestCase
 {
@@ -12,8 +12,8 @@ class BaseCommandTest extends \CodeIgniter\Test\CIUnitTestCase
 	protected function setUp(): void
 	{
 		parent::setUp();
-		$this->logger   = Services::logger();
-		$this->runner   = new CommandRunner();
+		$this->logger = Services::logger();
+		$this->runner = new CommandRunner();
 	}
 
 	public function testMagicIssetTrue()

tests/system/Commands/CommandsTest.php

@@ -1,12 +1,12 @@
 <?php
 namespace CodeIgniter\Commands;
 
-use Config\Services;
-use CodeIgniter\Test\Mock\MockAppConfig;
-use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\CLI\CommandRunner;
+use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
+use CodeIgniter\Test\Mock\MockAppConfig;
+use Config\Services;
 
 class CommandsTest extends \CodeIgniter\Test\CIUnitTestCase
 {

tests/system/Commands/SessionsCommandsTest.php

@@ -1,11 +1,11 @@
 <?php namespace CodeIgniter\Commands;
 
-use Config\Services;
-use CodeIgniter\Test\Mock\MockAppConfig;
-use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\CLI\CommandRunner;
+use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
+use CodeIgniter\Test\Mock\MockAppConfig;
+use Config\Services;
 
 class SessionsCommandsTest extends \CodeIgniter\Test\CIUnitTestCase
 {

tests/system/CommonFunctionsTest.php

@@ -1,17 +1,17 @@
 <?php
 
-use CodeIgniter\Session\Handlers\FileHandler;
-use CodeIgniter\HTTP\Response;
-use Config\App;
 use CodeIgniter\Config\Services;
-use CodeIgniter\Router\RouteCollection;
 use CodeIgniter\HTTP\RedirectResponse;
+use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\HTTP\UserAgent;
-use Config\Logger;
+use CodeIgniter\Router\RouteCollection;
+use CodeIgniter\Session\Handlers\FileHandler;
 use CodeIgniter\Test\Mock\MockIncomingRequest;
-use CodeIgniter\Test\TestLogger;
 use CodeIgniter\Test\Mock\MockSession;
+use CodeIgniter\Test\TestLogger;
+use Config\App;
+use Config\Logger;
 use Tests\Support\Models\JobModel;
 
 /**

tests/system/ControllerTest.php

@@ -1,10 +1,9 @@
 <?php namespace CodeIgniter;
 
-use CodeIgniter\Log\Logger;
-use Config\App;
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Test\Mock\MockCodeIgniter;
 use CodeIgniter\Validation\Exceptions\ValidationException;
+use Config\App;
 
 /**
  * Exercise our core Controller class.

tests/system/Database/Builder/UpdateTest.php

@@ -1,8 +1,8 @@
 <?php namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
-use CodeIgniter\Test\Mock\MockQuery;
 use CodeIgniter\Test\Mock\MockConnection;
+use CodeIgniter\Test\Mock\MockQuery;
 
 class UpdateTest extends \CodeIgniter\Test\CIUnitTestCase
 {

tests/system/Database/DatabaseTestCaseTest.php

@@ -1,7 +1,7 @@
 <?php namespace CodeIgniter\Database;
 
-use Config\Services;
 use CodeIgniter\Test\CIDatabaseTestCase;
+use Config\Services;
 
 class DatabaseTestCaseTest extends CIDatabaseTestCase
 {
@@ -23,7 +23,7 @@ class DatabaseTestCaseTest extends CIDatabaseTestCase
 	 */
 	protected $seed = [
 		'Tests\Support\Database\Seeds\CITestSeeder',
-		'Tests\Support\Database\Seeds\AnotherSeeder'
+		'Tests\Support\Database\Seeds\AnotherSeeder',
 	];
 
 	/**

tests/system/Database/Live/SQLite/AlterTableTest.php

@@ -1,7 +1,7 @@
 <?php namespace CodeIgniter\Database\Live\SQLite;
 
-use CodeIgniter\Test\CIDatabaseTestCase;
 use CodeIgniter\Database\SQLite3\Table;
+use CodeIgniter\Test\CIDatabaseTestCase;
 use Config\Database;
 
 /**

tests/system/Database/Migrations/MigrationRunnerTest.php

@@ -1,11 +1,10 @@
 <?php namespace CodeIgniter\Database;
 
 use CodeIgniter\Exceptions\ConfigException;
-use Config\Migrations;
-use org\bovigo\vfs\vfsStream;
 use CodeIgniter\Test\CIDatabaseTestCase;
-use org\bovigo\vfs\visitor\vfsStreamStructureVisitor;
+use Config\Migrations;
 use Config\Services;
+use org\bovigo\vfs\vfsStream;
 
 /**
  * @group DatabaseLive

tests/system/Database/ModelFactoryTest.php

@@ -1,7 +1,7 @@
 <?php namespace CodeIgniter\Database;
 
-use Tests\Support\Models\JobModel;
 use CodeIgniter\Test\CIDatabaseTestCase;
+use Tests\Support\Models\JobModel;
 
 class ModelFactoryTest extends CIDatabaseTestCase
 {

tests/system/Encryption/EncryptionTest.php

@@ -1,9 +1,8 @@
 <?php
 namespace CodeIgniter\Encryption;
 
-use Config\Services;
-use CodeIgniter\Config\BaseConfig;
 use Config\Encryption as EncryptionConfig;
+use Config\Services;
 
 //use CodeIgniter\Encryption\Encryption;
 

tests/system/Encryption/OpenSSLHandlerTest.php

@@ -1,8 +1,6 @@
 <?php
 namespace CodeIgniter\Encrypt;
 
-use CodeIgniter\Config\Services;
-
 class OpenSSLHandlerTest extends \CodeIgniter\Test\CIUnitTestCase
 {
 

tests/system/Events/EventsTest.php

@@ -2,10 +2,7 @@
 namespace CodeIgniter\Events;
 
 use CodeIgniter\Config\Config;
-use Config\Logger;
-use Config\Services;
 use CodeIgniter\Test\Mock\MockEvents;
-use CodeIgniter\Test\TestLogger;
 
 class EventsTest extends \CodeIgniter\Test\CIUnitTestCase
 {

tests/system/Filters/CSRFTest.php

@@ -1,11 +1,7 @@
 <?php
 namespace CodeIgniter\Filters;
 
-use Config\Filters as FilterConfig;
 use CodeIgniter\Config\Services;
-use CodeIgniter\Filters\Exceptions\FilterException;
-use CodeIgniter\Honeypot\Exceptions\HoneypotException;
-use CodeIgniter\HTTP\ResponseInterface;
 
 /**
  * @backupGlobals enabled

tests/system/Filters/DebugToolbarTest.php

@@ -1,10 +1,8 @@
 <?php
 namespace CodeIgniter\Filters;
 
-use Config\Filters as FilterConfig;
 use CodeIgniter\Config\Services;
-use CodeIgniter\Filters\Exceptions\FilterException;
-use CodeIgniter\HTTP\ResponseInterface;
+use Config\Filters as FilterConfig;
 
 /**
  * @backupGlobals enabled

tests/system/Filters/FiltersTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace CodeIgniter\Filters;
 
-use Config\Filters as FilterConfig;
 use CodeIgniter\Config\Services;
 use CodeIgniter\Filters\Exceptions\FilterException;
 use CodeIgniter\HTTP\ResponseInterface;

tests/system/Filters/HoneypotTest.php

@@ -1,11 +1,8 @@
 <?php
 namespace CodeIgniter\Filters;
 
-use Config\Filters as FilterConfig;
 use CodeIgniter\Config\Services;
-use CodeIgniter\Filters\Exceptions\FilterException;
 use CodeIgniter\Honeypot\Exceptions\HoneypotException;
-use CodeIgniter\HTTP\ResponseInterface;
 
 /**
  * @backupGlobals enabled

tests/system/HTTP/CURLRequestTest.php

@@ -3,8 +3,8 @@
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Config\Services;
-use Config\App;
 use CodeIgniter\Test\Mock\MockCURLRequest;
+use Config\App;
 
 class CURLRequestTest extends \CodeIgniter\Test\CIUnitTestCase
 {

tests/system/HTTP/DownloadResponseTest.php

@@ -1,10 +1,10 @@
 <?php
 namespace CodeIgniter\HTTP;
 
+use CodeIgniter\Exceptions\DownloadException;
 use CodeIgniter\Files\Exceptions\FileNotFoundException;
 use DateTime;
 use DateTimeZone;
-use CodeIgniter\Exceptions\DownloadException;
 
 class DownloadResponseTest extends \CodeIgniter\Test\CIUnitTestCase
 {

tests/system/HTTP/Files/FileMovingTest.php

@@ -1,8 +1,8 @@
 <?php
 namespace CodeIgniter\HTTP\Files;
 
-use org\bovigo\vfs\vfsStream;
 use CodeIgniter\HTTP\Exceptions\HTTPException;
+use org\bovigo\vfs\vfsStream;
 
 class FileMovingTest extends \CodeIgniter\Test\CIUnitTestCase
 {

tests/system/HTTP/IncomingRequestTest.php

@@ -1,8 +1,8 @@
 <?php
 namespace CodeIgniter\HTTP;
 
-use Config\App;
 use CodeIgniter\HTTP\Files\UploadedFile;
+use Config\App;
 
 /**
  * @backupGlobals enabled

tests/system/HTTP/RedirectResponseTest.php

@@ -2,12 +2,12 @@
 
 namespace CodeIgniter\HTTP;
 
-use Config\App;
 use CodeIgniter\Config\Config;
 use CodeIgniter\Config\Services;
-use CodeIgniter\Validation\Validation;
 use CodeIgniter\Router\RouteCollection;
 use CodeIgniter\Test\Mock\MockIncomingRequest;
+use CodeIgniter\Validation\Validation;
+use Config\App;
 
 class RedirectResponseTest extends \CodeIgniter\Test\CIUnitTestCase
 {

tests/system/HTTP/ResponseTest.php

@@ -1,13 +1,13 @@
 <?php
 namespace CodeIgniter\HTTP;
 
+use CodeIgniter\Config\Config;
 use CodeIgniter\HTTP\Exceptions\HTTPException;
+use CodeIgniter\Test\Mock\MockResponse;
 use Config\App;
 use Config\Format;
 use DateTime;
 use DateTimeZone;
-use CodeIgniter\Config\Config;
-use CodeIgniter\Test\Mock\MockResponse;
 
 class ResponseTest extends \CodeIgniter\Test\CIUnitTestCase
 {

tests/system/HTTP/URITest.php

@@ -1,9 +1,9 @@
 <?php
 namespace CodeIgniter\HTTP;
 
-use Config\App;
 use CodeIgniter\Config\Services;
 use CodeIgniter\HTTP\Exceptions\HTTPException;
+use Config\App;
 
 class URITest extends \CodeIgniter\Test\CIUnitTestCase
 {

tests/system/Helpers/CookieHelperTest.php

@@ -1,12 +1,12 @@
 <?php
 namespace CodeIgniter\Helpers;
 
-use Config\App;
 use CodeIgniter\Config\Services;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Test\Mock\MockResponse;
+use Config\App;
 
 final class CookieHelperTest extends \CodeIgniter\Test\CIUnitTestCase
 {

tests/system/Helpers/FormHelperTest.php

@@ -3,8 +3,8 @@
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\HTTP\URI;
-use Config\App;
 use CodeIgniter\Services;
+use Config\App;
 use Config\Filters;
 
 class FormHelperTest extends \CodeIgniter\Test\CIUnitTestCase

tests/system/Helpers/URLHelperTest.php

@@ -1,9 +1,9 @@
 <?php
 namespace CodeIgniter\Helpers;
 
-use Config\App;
-use CodeIgniter\HTTP\URI;
 use CodeIgniter\Config\Services;
+use CodeIgniter\HTTP\URI;
+use Config\App;
 
 /**
  * @backupGlobals enabled

tests/system/Images/GDHandlerTest.php

@@ -1,7 +1,7 @@
 <?php namespace CodeIgniter\Images;
 
-use CodeIgniter\Images\Exceptions\ImageException;
 use CodeIgniter\Config\Services;
+use CodeIgniter\Images\Exceptions\ImageException;
 use org\bovigo\vfs\vfsStream;
 
 /**

tests/system/Language/LanguageTest.php

@@ -1,8 +1,8 @@
 <?php
 namespace CodeIgniter\Language;
 
-use Config\Services;
 use CodeIgniter\Test\Mock\MockLanguage;
+use Config\Services;
 use Tests\Support\Language\SecondMockLanguage;
 
 class LanguageTest extends \CodeIgniter\Test\CIUnitTestCase

tests/system/Log/ChromeLoggerHandlerTest.php

@@ -1,9 +1,9 @@
 <?php namespace CodeIgniter\Log\Handlers;
 
-use Config\App;
+use CodeIgniter\Services;
 use CodeIgniter\Test\Mock\MockLogger as LoggerConfig;
 use CodeIgniter\Test\Mock\MockResponse;
-use CodeIgniter\Services;
+use Config\App;
 
 class ChromeLoggerHandlerTest extends \CodeIgniter\Test\CIUnitTestCase
 {
@@ -55,7 +55,6 @@ class ChromeLoggerHandlerTest extends \CodeIgniter\Test\CIUnitTestCase
 		$this->assertObjectHasAttribute('dateFormat', $logger);
 	}
 
-
 	public function testChromeLoggerHeaderSent()
 	{
 		Services::injectMock('response', new MockResponse(new App()));

tests/system/Log/FileHandlerTest.php

@@ -1,8 +1,8 @@
 <?php
 namespace CodeIgniter\Log\Handlers;
 
-use CodeIgniter\Test\Mock\MockLogger as LoggerConfig;
 use CodeIgniter\Test\Mock\MockFileLogger;
+use CodeIgniter\Test\Mock\MockLogger as LoggerConfig;
 use org\bovigo\vfs\vfsStream;
 
 class FileHandlerTest extends \CodeIgniter\Test\CIUnitTestCase

tests/system/Log/LoggerTest.php

@@ -1,8 +1,8 @@
 <?php
 
-use CodeIgniter\Log\Logger;
 use CodeIgniter\Exceptions\FrameworkException;
 use CodeIgniter\Log\Exceptions\LogException;
+use CodeIgniter\Log\Logger;
 use CodeIgniter\Test\Mock\MockLogger as LoggerConfig;
 use Tests\Support\Log\Handlers\TestHandler;
 

tests/system/RESTful/ResourceControllerTest.php

@@ -2,8 +2,8 @@
 namespace CodeIgniter\RESTful;
 
 use CodeIgniter\Config\Services;
-use Config\App;
 use CodeIgniter\Test\Mock\MockCodeIgniter;
+use Config\App;
 
 /**
  * Exercise our ResourceController class.

tests/system/RESTful/ResourcePresenterTest.php

@@ -2,8 +2,8 @@
 namespace CodeIgniter\RESTful;
 
 use CodeIgniter\Config\Services;
-use Config\App;
 use CodeIgniter\Test\Mock\MockCodeIgniter;
+use Config\App;
 
 /**
  * Exercise our core ResourcePresenter class.
@@ -252,7 +252,7 @@ class ResourcePresenterTest extends \CodeIgniter\Test\CIUnitTestCase
 		$this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
 		$this->assertEquals('\Tests\Support\Models\UserModel', $resource->getModelName());
 
-		$model    = new \Tests\Support\Models\EntityModel();
+		$model = new \Tests\Support\Models\EntityModel();
 		$resource->setModel($model);
 		$this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
 		$this->assertEquals('Tests\Support\Models\EntityModel', $resource->getModelName());

tests/system/Security/SecurityTest.php

@@ -1,11 +1,11 @@
 <?php namespace CodeIgniter\Security;
 
-use CodeIgniter\HTTP\URI;
-use CodeIgniter\HTTP\Request;
-use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\HTTP\IncomingRequest;
-use CodeIgniter\Test\Mock\MockAppConfig;
+use CodeIgniter\HTTP\Request;
+use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Security\Exceptions\SecurityException;
+use CodeIgniter\Test\Mock\MockAppConfig;
 use CodeIgniter\Test\Mock\MockSecurity;
 
 //--------------------------------------------------------------------

tests/system/Session/SessionTest.php

@@ -1,9 +1,9 @@
 <?php namespace CodeIgniter\Session;
 
-use Config\Logger;
-use CodeIgniter\Test\TestLogger;
-use CodeIgniter\Test\Mock\MockSession;
 use CodeIgniter\Session\Handlers\FileHandler;
+use CodeIgniter\Test\Mock\MockSession;
+use CodeIgniter\Test\TestLogger;
+use Config\Logger;
 
 /**
  * @runTestsInSeparateProcesses

tests/system/Test/ControllerTesterTest.php

@@ -2,9 +2,9 @@
 namespace CodeIgniter\Test;
 
 use CodeIgniter\Log\Logger;
+use CodeIgniter\Test\Mock\MockLogger as LoggerConfig;
 use Config\App;
 use Config\Services;
-use CodeIgniter\Test\Mock\MockLogger as LoggerConfig;
 
 /**
  * Exercise our Controller class.

tests/system/Test/FeatureResponseTest.php

@@ -1,8 +1,8 @@
 <?php
 
+use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\Response;
 use CodeIgniter\Test\FeatureResponse;
-use CodeIgniter\HTTP\RedirectResponse;
 
 class FeatureResponseTest extends \CodeIgniter\Test\CIUnitTestCase
 {
@@ -251,7 +251,7 @@ class FeatureResponseTest extends \CodeIgniter\Test\CIUnitTestCase
 		$this->response->setBody($tmp);
 
 		// this should be FALSE - invalid JSON - will see if this is working that way ;-)
-		$this->assertFalse($this->response->getBody() == $this->feature->getJSON());
+		$this->assertFalse($this->response->getBody() === $this->feature->getJSON());
 	}
 
 	public function testGetXML()

tests/system/Test/FeatureTestCaseTest.php

@@ -1,8 +1,8 @@
 <?php
 
 use CodeIgniter\Exceptions\PageNotFoundException;
-use CodeIgniter\Test\FeatureTestCase;
 use CodeIgniter\Test\FeatureResponse;
+use CodeIgniter\Test\FeatureTestCase;
 
 /**
  * @group                       DatabaseLive

tests/system/Test/TestCaseTest.php

@@ -2,8 +2,8 @@
 namespace CodeIgniter\Test;
 
 use CodeIgniter\Events\Events;
-use CodeIgniter\Test\Filters\CITestStreamFilter;
 use CodeIgniter\HTTP\Response;
+use CodeIgniter\Test\Filters\CITestStreamFilter;
 use Config\App;
 
 class TestCaseTest extends \CodeIgniter\Test\CIUnitTestCase

tests/system/Validation/RulesTest.php

@@ -2,8 +2,8 @@
 
 namespace CodeIgniter\Validation;
 
-use Config\Database;
 use CodeIgniter\Test\CIDatabaseTestCase;
+use Config\Database;
 
 class RulesTest extends CIDatabaseTestCase
 {

tests/system/Validation/UniqueRulesTest.php

@@ -1,7 +1,7 @@
 <?php namespace CodeIgniter\Validation;
 
-use Config\Database;
 use CodeIgniter\Test\CIDatabaseTestCase;
+use Config\Database;
 
 class UniqueRulesTest extends CIDatabaseTestCase
 {

tests/system/Validation/ValidationTest.php

@@ -1,11 +1,11 @@
 <?php namespace CodeIgniter\Validation;
 
-use CodeIgniter\Validation\Exceptions\ValidationException;
-use Config\Services;
-use Config\App;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\HTTP\UserAgent;
+use CodeIgniter\Validation\Exceptions\ValidationException;
+use Config\App;
+use Config\Services;
 
 class ValidationTest extends \CodeIgniter\Test\CIUnitTestCase
 {

tests/system/View/CellTest.php

@@ -1,8 +1,8 @@
 <?php
 
+use CodeIgniter\Test\Mock\MockCache;
 use CodeIgniter\View\Cell;
 use CodeIgniter\View\Exceptions\ViewException;
-use CodeIgniter\Test\Mock\MockCache;
 
 class CellTest extends \CodeIgniter\Test\CIUnitTestCase
 {

tests/system/View/ParserTest.php

@@ -1,7 +1,7 @@
 <?php
 
-use CodeIgniter\View\Parser;
 use CodeIgniter\View\Exceptions\ViewException;
+use CodeIgniter\View\Parser;
 
 class ParserTest extends \CodeIgniter\Test\CIUnitTestCase
 {