Fix CS errors.

src/Console/ConsoleErrorHandler.php

@@ -17,7 +17,6 @@ namespace Cake\Console;
 
 use Cake\Error\BaseErrorHandler;
 use Cake\Error\FatalErrorException;
-use Exception;
 use Throwable;
 
 /**

src/Console/ConsoleInputArgument.php

@@ -180,7 +180,7 @@ class ConsoleInputArgument
      * @param \SimpleXMLElement $parent The parent element.
      * @return \SimpleXMLElement The parent with this argument appended.
      */
-    public function xml(SimpleXMLElement $parent): SimpleXmlElement
+    public function xml(SimpleXMLElement $parent): SimpleXMLElement
     {
         $option = $parent->addChild('argument');
         $option->addAttribute('name', $this->_name);

src/Console/ConsoleInputOption.php

@@ -242,7 +242,7 @@ class ConsoleInputOption
      * @param \SimpleXMLElement $parent The parent element.
      * @return \SimpleXMLElement The parent with this option appended.
      */
-    public function xml(SimpleXMLElement $parent): SimpleXmlElement
+    public function xml(SimpleXMLElement $parent): SimpleXMLElement
     {
         $option = $parent->addChild('option');
         $option->addAttribute('name', '--' . $this->_name);

src/Console/ConsoleInputSubcommand.php

@@ -128,7 +128,7 @@ class ConsoleInputSubcommand
      * @param \SimpleXMLElement $parent The parent element.
      * @return \SimpleXMLElement The parent with this subcommand appended.
      */
-    public function xml(SimpleXMLElement $parent): SimpleXmlElement
+    public function xml(SimpleXMLElement $parent): SimpleXMLElement
     {
         $command = $parent->addChild('command');
         $command->addAttribute('name', $this->_name);

src/Console/HelpFormatter.php

@@ -15,7 +15,6 @@ declare(strict_types=1);
  */
 namespace Cake\Console;
 
-use Cake\Console\Exception\ConsoleException;
 use Cake\Utility\Text;
 use SimpleXMLElement;
 

src/Controller/ComponentRegistry.php

@@ -15,7 +15,6 @@ declare(strict_types = 1);
  */
 namespace Cake\Controller;
 
-use Cake\Controller\Component;
 use Cake\Controller\Exception\MissingComponentException;
 use Cake\Core\App;
 use Cake\Core\ObjectRegistry;

src/Core/Configure.php

@@ -429,7 +429,7 @@ class Configure
      * @param array|null $data Either an array of data to store, or leave empty to store all values.
      * @return bool Success
      */
-    public static function store(string $name, string $cacheConfig = 'default', array $data = null): bool
+    public static function store(string $name, string $cacheConfig = 'default', ?array $data = null): bool
     {
         if ($data === null) {
             $data = static::$_values;

src/Error/BaseErrorHandler.php

@@ -19,8 +19,6 @@ use Cake\Core\Configure;
 use Cake\Core\Exception\Exception as CoreException;
 use Cake\Log\Log;
 use Cake\Routing\Router;
-use Error;
-use Exception;
 use Throwable;
 
 /**

src/Error/Middleware/ErrorHandlerMiddleware.php

@@ -22,7 +22,6 @@ use Cake\Core\InstanceConfigTrait;
 use Cake\Error\ExceptionRenderer;
 use Cake\Error\ExceptionRendererInterface;
 use Cake\Log\Log;
-use Error;
 use Exception;
 use Psr\Http\Message\ServerRequestInterface;
 use Throwable;

src/Http/BaseApplication.php

@@ -14,7 +14,6 @@
  */
 namespace Cake\Http;
 
-use Cake\Core\App;
 use Cake\Core\BasePlugin;
 use Cake\Core\ConsoleApplicationInterface;
 use Cake\Core\HttpApplicationInterface;

src/Http/Client.php

@@ -16,9 +16,9 @@ namespace Cake\Http;
 use Cake\Core\App;
 use Cake\Core\Exception\Exception;
 use Cake\Core\InstanceConfigTrait;
-use Cake\Http\Client\AdapterInterface;
 use Cake\Http\Client\Adapter\Curl;
 use Cake\Http\Client\Adapter\Stream;
+use Cake\Http\Client\AdapterInterface;
 use Cake\Http\Client\Request;
 use Cake\Http\Cookie\CookieCollection;
 use Cake\Http\Cookie\CookieInterface;

src/Http/Client/Adapter/Curl.php

@@ -75,7 +75,7 @@ class Curl implements AdapterInterface
             CURLOPT_HTTP_VERSION => $request->getProtocolVersion(),
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_HEADER => true,
-            CURLOPT_HTTPHEADER => $headers
+            CURLOPT_HTTPHEADER => $headers,
         ];
         switch ($request->getMethod()) {
             case Request::METHOD_GET:

src/Http/Client/AdapterInterface.php

@@ -13,8 +13,6 @@
  */
 namespace Cake\Http\Client;
 
-use Cake\Http\Client\Request;
-
 interface AdapterInterface
 {
     /**

tests/TestCase/Console/ConsoleOptionParserTest.php

@@ -765,9 +765,9 @@ TEXT;
     {
         $parser = new ConsoleOptionParser('mycommand', false);
         $parser->addSubcommand('build', [
-            'help' => 'Build things.'
+            'help' => 'Build things.',
         ])->addSubcommand('destroy', [
-            'help' => 'Destroy things.'
+            'help' => 'Destroy things.',
         ])->addOption('connection', [
             'help' => 'Db connection.',
             'short' => 'c',
@@ -852,7 +852,7 @@ TEXT;
         $parser = new ConsoleOptionParser('mycommand', false);
         $parser->addSubcommand('method', [
                 'help' => 'This is another command',
-                'parser' => $subParser
+                'parser' => $subParser,
             ])
             ->addOption('test', ['help' => 'A test option.']);
 

tests/TestCase/Controller/Component/SecurityComponentTest.php

@@ -96,7 +96,7 @@ class SecurityTestController extends Controller
      * @param int $status
      * @return \Cake\Http\Response|null
      */
-    public function redirect($url, int $status = null): ?Response
+    public function redirect($url, ?int $status = null): ?Response
     {
         return $status;
     }

tests/TestCase/Error/ErrorHandlerTest.php

@@ -25,7 +25,6 @@ use Cake\Log\Log;
 use Cake\Routing\Exception\MissingControllerException;
 use Cake\Routing\Router;
 use Cake\TestSuite\TestCase;
-use ParseError;
 
 /**
  * Testing stub.

tests/TestCase/ExceptionsTest.php

@@ -20,7 +20,6 @@ use Cake\Error\FatalErrorException;
 use Cake\ORM\Entity;
 use Cake\ORM\Exception\PersistenceFailedException;
 use Cake\TestSuite\TestCase;
-use Error;
 use Exception;
 
 class ExceptionsTest extends TestCase

tests/TestCase/Http/Client/Adapter/CurlTest.php

@@ -23,7 +23,6 @@ use Cake\TestSuite\TestCase;
  */
 class CurlTest extends TestCase
 {
-
     public function setUp()
     {
         parent::setUp();
@@ -42,7 +41,7 @@ class CurlTest extends TestCase
     {
         $request = new Request('http://localhost', 'GET', [
             'User-Agent' => 'CakePHP TestSuite',
-            'Cookie' => 'testing=value'
+            'Cookie' => 'testing=value',
         ]);
         try {
             $responses = $this->curl->send($request, []);
@@ -89,7 +88,7 @@ class CurlTest extends TestCase
     public function testBuildOptionsGet()
     {
         $options = [
-            'timeout' => 5
+            'timeout' => 5,
         ];
         $request = new Request(
             'http://localhost/things',
@@ -254,8 +253,8 @@ class CurlTest extends TestCase
     {
         $options = [
             'proxy' => [
-                'proxy' => '127.0.0.1:8080'
-            ]
+                'proxy' => '127.0.0.1:8080',
+            ],
         ];
         $request = new Request('http://localhost/things', 'GET');
         $result = $this->curl->buildOptions($request, $options);
@@ -284,8 +283,8 @@ class CurlTest extends TestCase
     {
         $options = [
             'curl' => [
-                CURLOPT_USERAGENT => 'Super-secret'
-            ]
+                CURLOPT_USERAGENT => 'Super-secret',
+            ],
         ];
         $request = new Request('http://localhost/things', 'GET');
         $result = $this->curl->buildOptions($request, $options);
@@ -300,7 +299,7 @@ class CurlTest extends TestCase
             ],
             CURLOPT_HTTPGET => true,
             CURLOPT_CAINFO => $this->caFile,
-            CURLOPT_USERAGENT => 'Super-secret'
+            CURLOPT_USERAGENT => 'Super-secret',
         ];
         $this->assertSame($expected, $result);
     }

tests/TestCase/Http/Cookie/CookieCollectionTest.php

@@ -271,7 +271,7 @@ class CookieCollectionTest extends TestCase
     {
         $collection = new CookieCollection();
         $request = new ServerRequest([
-            'url' => '/app'
+            'url' => '/app',
         ]);
         $response = (new Response())
             ->withAddedHeader('Set-Cookie', '');
@@ -330,7 +330,7 @@ class CookieCollectionTest extends TestCase
     {
         $collection = new CookieCollection();
         $request = new ServerRequest([
-            'url' => '/app'
+            'url' => '/app',
         ]);
         $response = (new Response())
             ->withAddedHeader('Set-Cookie', 'test=value')

tests/TestCase/Mailer/EmailTest.php

@@ -903,7 +903,7 @@ class EmailTest extends TestCase
         $expected = [
             'cake.icon.gif' => [
                 'data' => base64_encode('test') . "\r\n",
-                'mimetype' => 'application/octet-stream'
+                'mimetype' => 'application/octet-stream',
             ],
         ];
         $this->assertSame($expected, $this->Email->getAttachments());

tests/TestCase/ORM/Behavior/TimestampBehaviorTest.php

@@ -490,7 +490,7 @@ class TimestampBehaviorTest extends TestCase
 
         return new Table([
             'alias' => 'Articles',
-            'schema' => $schema
+            'schema' => $schema,
         ]);
     }
 }

tests/TestCase/ORM/EntityTest.php

@@ -1196,7 +1196,7 @@ class EntityTest extends TestCase
         $entity->setError('indexes', $indexedErrors);
 
         $expectedIndexed = [
-            'indexes' => ['2' => ['foo' => 'bar']]
+            'indexes' => ['2' => ['foo' => 'bar']],
         ];
         $result = $entity->getErrors();
         $this->assertEquals($expectedIndexed, $result);

tests/TestCase/Routing/Route/RouteTest.php

@@ -1046,7 +1046,7 @@ class RouteTest extends TestCase
         $result = $route->match([
             'controller' => 'Articles',
             'action' => 'view',
-            'id' => "\xC4\x81"
+            'id' => "\xC4\x81",
         ]);
         $this->assertEquals("/articles/view/\xC4\x81", $result);
     }

tests/TestCase/View/Form/EntityContextTest.php

@@ -752,7 +752,7 @@ class EntityContextTest extends TestCase
             ->junction();
         $joinTable->getSchema()->addColumn('column', [
             'default' => 'default join table column value',
-            'type' => 'text'
+            'type' => 'text',
         ]);
         $row = $table->newEntity();
 

tests/bootstrap.php

@@ -13,9 +13,6 @@
 
 use Cake\Cache\Cache;
 use Cake\Chronos\Chronos;
-use Cake\Chronos\Date;
-use Cake\Chronos\MutableDate;
-use Cake\Chronos\MutableDateTime;
 use Cake\Core\Configure;
 use Cake\Datasource\ConnectionManager;
 use Cake\Log\Log;