Merge pull request #13469 from cakephp/4.x-cleanup

4.x cleanup

psalm-baseline.xml

@@ -840,9 +840,6 @@
     </PossiblyNullOperand>
   </file>
   <file src="src/Http/Response.php">
-    <InvalidScalarArgument occurrences="1">
-      <code>$time</code>
-    </InvalidScalarArgument>
     <PossiblyInvalidArgument occurrences="5">
       <code>env('HTTP_ACCEPT_ENCODING')</code>
       <code>env('HTTP_ACCEPT_ENCODING')</code>
@@ -1275,21 +1272,6 @@
       <code>Email::MESSAGE_TEXT</code>
     </DeprecatedConstant>
   </file>
-  <file src="src/TestSuite/Constraint/Email/MailSentFrom.php">
-    <MissingPropertyType occurrences="1">
-      <code>$method</code>
-    </MissingPropertyType>
-  </file>
-  <file src="src/TestSuite/Constraint/Email/MailSentTo.php">
-    <MissingPropertyType occurrences="1">
-      <code>$method</code>
-    </MissingPropertyType>
-  </file>
-  <file src="src/TestSuite/Constraint/Email/MailSentWith.php">
-    <MissingPropertyType occurrences="1">
-      <code>$method</code>
-    </MissingPropertyType>
-  </file>
   <file src="src/TestSuite/Constraint/EventFired.php">
     <InternalClass occurrences="1"/>
     <PossiblyNullReference occurrences="1">
@@ -1417,8 +1399,7 @@
     </PossiblyNullArgument>
   </file>
   <file src="src/Utility/Hash.php">
-    <PossiblyInvalidArgument occurrences="16">
-      <code>$data</code>
+    <PossiblyInvalidArgument occurrences="15">
       <code>$keys</code>
       <code>$keys</code>
       <code>$vals</code>

src/Cache/Engine/RedisEngine.php

@@ -234,7 +234,7 @@ public function delete($key): bool
      */
     public function clear(): bool
     {
-        $this->_Redis->setOption(Redis::OPT_SCAN, Redis::SCAN_RETRY);
+        $this->_Redis->setOption(Redis::OPT_SCAN, (string)Redis::SCAN_RETRY);
 
         $isAllDeleted = true;
         $iterator = null;

src/Console/Exception/MissingHelperException.php

@@ -21,5 +21,8 @@
  */
 class MissingHelperException extends Exception
 {
+    /**
+     * @var string
+     */
     protected $_messageTemplate = 'Helper class %s could not be found.';
 }

src/Console/Exception/MissingShellException.php

@@ -21,6 +21,9 @@
  */
 class MissingShellException extends Exception
 {
+    /**
+     * @var string
+     */
     // phpcs:ignore Generic.Files.LineLength
     protected $_messageTemplate = 'Shell class for "%s" could not be found. If you are trying to use a plugin shell, that was loaded via $this->addPlugin(), you may need to update bin/cake.php to match https://github.com/cakephp/app/tree/master/bin/cake.php';
 }

src/Console/Exception/MissingShellMethodException.php

@@ -21,5 +21,8 @@
  */
 class MissingShellMethodException extends Exception
 {
+    /**
+     * @var string
+     */
     protected $_messageTemplate = "Unknown command %1\$s %2\$s.\nFor usage try `cake %1\$s --help`";
 }

src/Console/Exception/MissingTaskException.php

@@ -21,5 +21,8 @@
  */
 class MissingTaskException extends Exception
 {
+    /**
+     * @var string
+     */
     protected $_messageTemplate = 'Task class %s could not be found.';
 }

src/Datasource/ConnectionManager.php

@@ -50,7 +50,7 @@ class ConnectionManager
     /**
      * An array mapping url schemes to fully qualified driver class names
      *
-     * @return array
+     * @var string[]
      */
     protected static $_dsnClassMap = [
         'mysql' => Mysql::class,

src/Datasource/Exception/MissingDatasourceConfigException.php

@@ -21,5 +21,8 @@
  */
 class MissingDatasourceConfigException extends Exception
 {
+    /**
+     * @var string
+     */
     protected $_messageTemplate = 'The datasource configuration "%s" was not found.';
 }

src/Datasource/Exception/MissingDatasourceException.php

@@ -21,5 +21,8 @@
  */
 class MissingDatasourceException extends Exception
 {
+    /**
+     * @var string
+     */
     protected $_messageTemplate = 'Datasource class %s could not be found. %s';
 }

src/Datasource/Exception/MissingModelException.php

@@ -23,5 +23,8 @@
  */
 class MissingModelException extends Exception
 {
+    /**
+     * @var string
+     */
     protected $_messageTemplate = 'Model class "%s" of type "%s" could not be found.';
 }

src/Filesystem/Folder.php

@@ -94,6 +94,8 @@ class Folder
 
     /**
      * Functions array to be called depending on the sort type chosen.
+     *
+     * @var string[]
      */
     protected $_fsorts = [
         self::SORT_NAME => 'getPathname',

src/ORM/Exception/MissingBehaviorException.php

@@ -21,5 +21,8 @@
  */
 class MissingBehaviorException extends Exception
 {
+    /**
+     * @var string
+     */
     protected $_messageTemplate = 'Behavior class %s could not be found.';
 }

src/ORM/Exception/MissingEntityException.php

@@ -25,5 +25,8 @@
  */
 class MissingEntityException extends Exception
 {
+    /**
+     * @var string
+     */
     protected $_messageTemplate = 'Entity class %s could not be found.';
 }

src/ORM/Exception/MissingTableClassException.php

@@ -23,5 +23,8 @@
  */
 class MissingTableClassException extends Exception
 {
+    /**
+     * @var string
+     */
     protected $_messageTemplate = 'Table class %s could not be found.';
 }

src/ORM/Exception/RolledbackTransactionException.php

@@ -21,6 +21,9 @@
  */
 class RolledbackTransactionException extends Exception
 {
+    /**
+     * @var string
+     */
     // phpcs:ignore Generic.Files.LineLength
     protected $_messageTemplate = 'The afterSave event in "%s" is aborting the transaction before the save process is done.';
 }

src/TestSuite/Constraint/Email/MailConstraintBase.php

@@ -26,6 +26,9 @@
  */
 abstract class MailConstraintBase extends Constraint
 {
+    /**
+     * @var int|null
+     */
     protected $at;
 
     /**

src/TestSuite/Constraint/Email/MailContainsHtml.php

@@ -25,6 +25,9 @@
  */
 class MailContainsHtml extends MailContains
 {
+    /**
+     * @var string
+     */
     protected $type = Email::MESSAGE_HTML;
 
     /**

src/TestSuite/Constraint/Email/MailContainsText.php

@@ -25,6 +25,9 @@
  */
 class MailContainsText extends MailContains
 {
+    /**
+     * @var string
+     */
     protected $type = Email::MESSAGE_TEXT;
 
     /**

src/TestSuite/Constraint/Email/MailSentFrom.php

@@ -23,6 +23,9 @@
  */
 class MailSentFrom extends MailSentWith
 {
+    /**
+     * @var string
+     */
     protected $method = 'from';
 
     /**

src/TestSuite/Constraint/Email/MailSentTo.php

@@ -23,6 +23,9 @@
  */
 class MailSentTo extends MailSentWith
 {
+    /**
+     * @var string
+     */
     protected $method = 'to';
 
     /**

src/TestSuite/Constraint/Email/MailSentWith.php

@@ -23,6 +23,9 @@
  */
 class MailSentWith extends MailConstraintBase
 {
+    /**
+     * @var string
+     */
     protected $method;
 
     /**
@@ -34,9 +37,10 @@ class MailSentWith extends MailConstraintBase
      */
     public function __construct(?int $at = null, ?string $method = null)
     {
-        if ($method) {
+        if ($method !== null) {
             $this->method = $method;
         }
+
         parent::__construct($at);
     }
 

src/TestSuite/Constraint/Response/StatusError.php

@@ -22,6 +22,9 @@
  */
 class StatusError extends StatusCodeBase
 {
+    /**
+     * @var int[]
+     */
     protected $code = [400, 429];
 
     /**

src/TestSuite/Constraint/Response/StatusFailure.php

@@ -22,6 +22,9 @@
  */
 class StatusFailure extends StatusCodeBase
 {
+    /**
+     * @var int[]
+     */
     protected $code = [500, 505];
 
     /**

src/TestSuite/Constraint/Response/StatusOk.php

@@ -22,6 +22,9 @@
  */
 class StatusOk extends StatusCodeBase
 {
+    /**
+     * @var int[]
+     */
     protected $code = [200, 204];
 
     /**

src/TestSuite/Constraint/Response/StatusSuccess.php

@@ -22,6 +22,9 @@
  */
 class StatusSuccess extends StatusCodeBase
 {
+    /**
+     * @var int[]
+     */
     protected $code = [200, 308];
 
     /**

tests/TestCase/Command/PluginUnloadCommandTest.php

@@ -13,7 +13,7 @@
  * @link          https://cakephp.org CakePHP Project
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase\Shell\Task;
+namespace Cake\Test\TestCase\Command;
 
 use Cake\Console\Command;
 use Cake\TestSuite\ConsoleIntegrationTestTrait;

tests/TestCase/Console/ArgumentsTest.php

@@ -14,7 +14,7 @@
  * @since         3.6.0
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestSuite\Console;
+namespace Cake\Test\TestCase\Console;
 
 use Cake\Console\Arguments;
 use Cake\TestSuite\TestCase;

tests/TestCase/Console/CommandCollectionTest.php

@@ -14,7 +14,7 @@
  * @since         3.5.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\Console;
+namespace Cake\Test\TestCase\Console;
 
 use Cake\Command\RoutesCommand;
 use Cake\Command\VersionCommand;

tests/TestCase/Console/CommandRunnerTest.php

@@ -14,7 +14,7 @@
  * @since         3.5.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\Console;
+namespace Cake\Test\TestCase\Console;
 
 use Cake\Console\CommandCollection;
 use Cake\Console\CommandFactoryInterface;

tests/TestCase/Event/Decorator/ConditionDecoratorTest.php

@@ -14,7 +14,7 @@
  * @since         3.3.0
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase\Event;
+namespace Cake\Test\TestCase\Event\Decorator;
 
 use Cake\Event\Decorator\ConditionDecorator;
 use Cake\Event\Event;

tests/TestCase/Event/Decorator/SubjectFilterDecoratorTest.php

@@ -14,7 +14,7 @@
  * @since         3.3.0
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase\Event;
+namespace Cake\Test\TestCase\Event\Decorator;
 
 use Cake\Event\Decorator\SubjectFilterDecorator;
 use Cake\Event\Event;

tests/TestCase/Http/ResponseEmitterTest.php

@@ -14,7 +14,7 @@
  * @since         3.3.5
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase;
+namespace Cake\Test\TestCase\Http;
 
 use Cake\Http\CallbackStream;
 use Cake\Http\Cookie\Cookie;

tests/TestCase/Http/RunnerTest.php

@@ -14,7 +14,7 @@
  * @since         3.3.0
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase;
+namespace Cake\Test\TestCase\Http;
 
 use Cake\Http\MiddlewareQueue;
 use Cake\Http\Response;

tests/TestCase/Http/ServerTest.php

@@ -14,7 +14,7 @@
  * @since         3.3.0
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase;
+namespace Cake\Test\TestCase\Http;
 
 use Cake\Core\HttpApplicationInterface;
 use Cake\Event\EventInterface;

tests/TestCase/Http/SessionTest.php

@@ -14,7 +14,7 @@
  * @since         1.2.0
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase\Network;
+namespace Cake\Test\TestCase\Http;
 
 use Cake\Http\Session;
 use Cake\TestSuite\TestCase;

tests/TestCase/I18n/Formatter/IcuFormatterTest.php

@@ -14,7 +14,7 @@
  * @since         3.0.0
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase\I18n;
+namespace Cake\Test\TestCase\I18n\Formatter;
 
 use Cake\I18n\Formatter\IcuFormatter;
 use Cake\TestSuite\TestCase;

tests/TestCase/I18n/Formatter/SprintfFormatterTest.php

@@ -14,7 +14,7 @@
  * @since         3.0.0
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase\I18n;
+namespace Cake\Test\TestCase\I18n\Formatter;
 
 use Cake\I18n\Formatter\SprintfFormatter;
 use Cake\TestSuite\TestCase;