Merge 324a5c2 into 11805ef

config/bootstrap.php

@@ -12,6 +12,7 @@
  * @since         0.2.9
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
+
 use Cake\Routing\Router;
 
 define('TIME_START', microtime(true));

config/config.php

@@ -15,6 +15,7 @@
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 $versionFile = file(CORE_PATH . 'VERSION.txt');
+
 return [
-    'Cake.version' => trim(array_pop($versionFile))
+    'Cake.version' => trim(array_pop($versionFile)),
 ];

phpcs.xml.dist

@@ -3,4 +3,21 @@
     <config name="installed_paths" value="../../cakephp/cakephp-codesniffer" />
 
     <rule ref="CakePHP" />
+
+    <!-- https://github.com/squizlabs/PHP_CodeSniffer/issues/2619 -->
+    <rule ref="PSR12.Files.FileHeader">
+        <exclude-pattern>*/test_app/config/bootstrap.php</exclude-pattern>
+        <exclude-pattern>*/test_app/config/empty.php</exclude-pattern>
+        <severity>0</severity>
+    </rule>
+
+    <rule ref="PSR2.ControlStructures.ControlStructureSpacing.SpacingAfterOpenBrace">
+        <severity>0</severity>
+    </rule>
+    <rule ref="Squiz.ControlStructures.ForLoopDeclaration.SpacingAfterSecond">
+        <severity>0</severity>
+    </rule>
+    <rule ref="Squiz.ControlStructures.ForLoopDeclaration.SpacingAfterFirst">
+        <severity>0</severity>
+    </rule>
 </ruleset>

src/Cache/Engine/FileEngine.php

@@ -378,7 +378,8 @@ protected function _setKey(string $key, bool $createKey = false): bool
         if (!$createKey && !$path->isFile()) {
             return false;
         }
-        if (empty($this->_File) ||
+        if (
+            empty($this->_File) ||
             $this->_File->getBasename() !== $key ||
             $this->_File->valid() === false
         ) {

src/Cache/Engine/MemcachedEngine.php

@@ -203,7 +203,8 @@ protected function _setOptions(): void
             );
         }
 
-        if ($serializer !== 'php' &&
+        if (
+            $serializer !== 'php' &&
             !constant('Memcached::HAVE_' . strtoupper($serializer))
         ) {
             throw new InvalidArgumentException(
@@ -217,7 +218,8 @@ protected function _setOptions(): void
         );
 
         // Check for Amazon ElastiCache instance
-        if (defined('Memcached::OPT_CLIENT_MODE') &&
+        if (
+            defined('Memcached::OPT_CLIENT_MODE') &&
             defined('Memcached::DYNAMIC_CLIENT_MODE')
         ) {
             $this->_Memcached->setOption(

src/Collection/CollectionTrait.php

@@ -898,8 +898,10 @@ public function isEmpty(): bool
     public function unwrap(): Traversable
     {
         $iterator = $this;
-        while (get_class($iterator) === Collection::class
-            && $iterator instanceof OuterIterator) {
+        while (
+            get_class($iterator) === Collection::class
+            && $iterator instanceof OuterIterator
+        ) {
             $iterator = $iterator->getInnerIterator();
         }
 
@@ -956,10 +958,12 @@ public function cartesianProduct(?callable $operation = null, ?callable $filter
             $currentIndexes[$lastIndex]++;
 
             // phpcs:ignore Squiz.ControlStructures.ForLoopDeclaration.SpacingAfterFirst
-            for ($changeIndex = $lastIndex;
+            for (
+                $changeIndex = $lastIndex;
                 // phpcs:ignore Squiz.ControlStructures.ForLoopDeclaration.SpacingAfterSecond
                 $currentIndexes[$changeIndex] === $collectionArraysCounts[$changeIndex] && $changeIndex > 0;
-                $changeIndex--) {
+                $changeIndex--
+            ) {
                 $currentIndexes[$changeIndex] = 0;
                 $currentIndexes[$changeIndex - 1]++;
             }

src/Collection/ExtractTrait.php

@@ -73,8 +73,13 @@ protected function _extract($data, array $path)
                 continue;
             }
 
-            if ($collectionTransform &&
-                !($data instanceof Traversable || is_array($data))) {
+            if (
+                $collectionTransform &&
+                !(
+                    $data instanceof Traversable ||
+                    is_array($data)
+                )
+            ) {
                 return null;
             }
 

src/Command/CompletionCommand.php

@@ -205,7 +205,8 @@ protected function shellSubcommands(Shell $shell): array
             $coreShellReflection = new ReflectionClass(Shell::class);
             $reflection = new ReflectionClass($shell);
             foreach ($reflection->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
-                if ($shell->hasMethod($method->getName())
+                if (
+                    $shell->hasMethod($method->getName())
                     && !$coreShellReflection->hasMethod($method->getName())
                 ) {
                     $output[] = $method->getName();

src/Command/I18nExtractCommand.php

@@ -636,7 +636,8 @@ protected function _writeFiles(Arguments $args, ConsoleIo $io): void
 
             $filename = str_replace('/', '_', $domain) . '.pot';
             $response = '';
-            while ($overwriteAll === false
+            while (
+                $overwriteAll === false
                 && file_exists($this->_output . $filename)
                 && strtoupper($response) !== 'Y'
             ) {
@@ -698,7 +699,8 @@ protected function _getStrings(int &$position, int $target): array
     {
         $strings = [];
         $count = count($strings);
-        while ($count < $target
+        while (
+            $count < $target
             && ($this->_tokens[$position] === ','
                 || $this->_tokens[$position][0] === T_CONSTANT_ENCAPSED_STRING
                 || $this->_tokens[$position][0] === T_LNUMBER
@@ -707,7 +709,8 @@ protected function _getStrings(int &$position, int $target): array
             $count = count($strings);
             if ($this->_tokens[$position][0] === T_CONSTANT_ENCAPSED_STRING && $this->_tokens[$position + 1] === '.') {
                 $string = '';
-                while ($this->_tokens[$position][0] === T_CONSTANT_ENCAPSED_STRING
+                while (
+                    $this->_tokens[$position][0] === T_CONSTANT_ENCAPSED_STRING
                     || $this->_tokens[$position] === '.'
                 ) {
                     if ($this->_tokens[$position][0] === T_CONSTANT_ENCAPSED_STRING) {

src/Command/PluginAssetsTrait.php

@@ -106,7 +106,8 @@ protected function _process(array $plugins, bool $copy = false, bool $overwrite
             $this->io->out('For plugin: ' . $plugin);
             $this->io->hr();
 
-            if ($config['namespaced'] &&
+            if (
+                $config['namespaced'] &&
                 !is_dir($config['destDir']) &&
                 !$this->_createDirectory($config['destDir'])
             ) {

src/Console/CommandScanner.php

@@ -130,7 +130,8 @@ protected function scanDir(string $path, string $namespace, string $prefix, arra
 
             $class = $namespace . $fileInfo->getBasename('.php');
             /** @psalm-suppress DeprecatedClass */
-            if (!is_subclass_of($class, Shell::class)
+            if (
+                !is_subclass_of($class, Shell::class)
                 && !is_subclass_of($class, Command::class)
             ) {
                 continue;

src/Console/ConsoleOutput.php

@@ -166,8 +166,16 @@ public function __construct(string $stream = 'php://stdout')
     {
         $this->_output = fopen($stream, 'wb');
 
-        if ((DIRECTORY_SEPARATOR === '\\' && !(bool)env('ANSICON') && env('ConEmuANSI') !== 'ON') ||
-            (function_exists('posix_isatty') && !posix_isatty($this->_output))
+        if (
+            (
+                DIRECTORY_SEPARATOR === '\\' &&
+                !(bool)env('ANSICON') &&
+                env('ConEmuANSI') !== 'ON'
+            ) ||
+            (
+                function_exists('posix_isatty') &&
+                !posix_isatty($this->_output)
+            )
         ) {
             $this->_outputAs = self::PLAIN;
         }

src/Controller/Component/AuthComponent.php

@@ -290,7 +290,8 @@ public function authCheck(EventInterface $event): ?Response
             return $result;
         }
 
-        if ($isLoginAction ||
+        if (
+            $isLoginAction ||
             empty($this->_config['authorize']) ||
             $this->isAuthorized($this->user())
         ) {
@@ -748,7 +749,8 @@ public function redirectUrl($url = null): string
         if ($url !== null) {
             $redirectUrl = $url;
         } elseif ($redirectUrl) {
-            if ($this->_config['loginAction']
+            if (
+                $this->_config['loginAction']
                 && Router::normalize($redirectUrl) === Router::normalize($this->_config['loginAction'])
             ) {
                 $redirectUrl = $this->_config['loginRedirect'];

src/Controller/Component/RequestHandlerComponent.php

@@ -265,7 +265,8 @@ public function beforeRender(EventInterface $event): void
             $response = $response->withCharset(Configure::read('App.encoding'));
         }
 
-        if ($this->_config['checkHttpCache'] &&
+        if (
+            $this->_config['checkHttpCache'] &&
             $response->checkNotModified($request)
         ) {
             $controller->setResponse($response);
@@ -344,7 +345,8 @@ public function requestedWith($type = null)
         $request = $controller->getRequest();
         $response = $controller->getResponse();
 
-        if (!$request->is('post') &&
+        if (
+            !$request->is('post') &&
             !$request->is('put') &&
             !$request->is('patch') &&
             !$request->is('delete')

src/Controller/Component/SecurityComponent.php

@@ -109,7 +109,8 @@ public function startup(EventInterface $event): ?Response
                 ));
             }
 
-            if (!in_array($this->_action, (array)$this->_config['unlockedActions'], true) &&
+            if (
+                !in_array($this->_action, (array)$this->_config['unlockedActions'], true) &&
                 $hasData &&
                 $this->_config['validatePost']
             ) {
@@ -215,7 +216,8 @@ protected function _requireMethod(string $method, array $actions = []): void
      */
     protected function _secureRequired(Controller $controller): void
     {
-        if (is_array($this->_config['requireSecure']) &&
+        if (
+            is_array($this->_config['requireSecure']) &&
             !empty($this->_config['requireSecure'])
         ) {
             $requireSecure = $this->_config['requireSecure'];

src/Controller/ErrorController.php

@@ -46,7 +46,8 @@ public function beforeRender(EventInterface $event)
         $builder = $this->viewBuilder();
         $templatePath = 'Error';
 
-        if ($this->request->getParam('prefix') &&
+        if (
+            $this->request->getParam('prefix') &&
             in_array($builder->getTemplate(), ['error400', 'error500'], true)
         ) {
             $parts = explode(DIRECTORY_SEPARATOR, (string)$builder->getTemplatePath(), -1);

src/Database/Dialect/SqlserverDialectTrait.php

@@ -119,7 +119,8 @@ protected function _pagingSubquery(Query $original, ?int $limit, ?int $offset):
                 ->clause('order')
                 ->iterateParts(function ($direction, $orderBy) use ($select, $order) {
                     $key = $orderBy;
-                    if (isset($select[$orderBy]) &&
+                    if (
+                        isset($select[$orderBy]) &&
                         $select[$orderBy] instanceof ExpressionInterface
                     ) {
                         $key = $select[$orderBy]->sql(new ValueBinder());

src/Database/Driver.php

@@ -293,9 +293,17 @@ public function schemaValue($value): string
             return str_replace(',', '.', (string)$value);
         }
         /** @psalm-suppress InvalidArgument */
-        if ((is_int($value) || $value === '0') || (
-            is_numeric($value) && strpos($value, ',') === false &&
-            substr($value, 0, 1) !== '0' && strpos($value, 'e') === false)
+        if (
+            (
+                is_int($value) ||
+                $value === '0'
+            ) ||
+            (
+                is_numeric($value) &&
+                strpos($value, ',') === false &&
+                substr($value, 0, 1) !== '0' &&
+                strpos($value, 'e') === false
+            )
         ) {
             return (string)$value;
         }

src/Database/Expression/OrderByExpression.php

@@ -69,7 +69,8 @@ public function sql(ValueBinder $generator): string
     protected function _addConditions(array $orders, array $types): void
     {
         foreach ($orders as $key => $val) {
-            if (is_string($key) &&
+            if (
+                is_string($key) &&
                 is_string($val) &&
                 !in_array(strtoupper($val), ['ASC', 'DESC'], true)
             ) {

src/Database/Expression/QueryExpression.php

@@ -694,6 +694,7 @@ protected function _addConditions(array $conditions, array $types): void
 
             if ($numericKey && $isArray || $isOperator) {
                 /** @var \Cake\Database\Expression\QueryExpression $this->_conditions[] */
+                // phpcs:ignore
                 $this->_conditions[] = new static($c, $typeMap, $numericKey ? 'AND' : $k);
                 continue;
             }

src/Database/Expression/ValuesExpression.php

@@ -86,8 +86,15 @@ public function __construct(array $columns, TypeMap $typeMap)
      */
     public function add($data): void
     {
-        if ((count($this->_values) && $data instanceof Query) ||
-            ($this->_query && is_array($data))
+        if (
+            (
+                count($this->_values) &&
+                $data instanceof Query
+            ) ||
+            (
+                $this->_query &&
+                is_array($data)
+            )
         ) {
             throw new Exception(
                 'You cannot mix subqueries and array data in inserts.'

src/Database/QueryCompiler.php

@@ -128,8 +128,15 @@ public function compile(Query $query, ValueBinder $generator): string
     protected function _sqlCompiler(string &$sql, Query $query, ValueBinder $generator): Closure
     {
         return function ($parts, $name) use (&$sql, $query, $generator): ?string {
-            if (!isset($parts) ||
-                ((is_array($parts) || $parts instanceof Countable) && !count($parts))
+            if (
+                !isset($parts) ||
+                (
+                    (
+                        is_array($parts) ||
+                        $parts instanceof Countable
+                    ) &&
+                    !count($parts)
+                )
             ) {
                 return null;
             }

src/Database/Schema/MysqlSchema.php

@@ -391,8 +391,12 @@ public function columnSql(TableSchema $schema, string $name): string
         }
 
         $hasPrecision = [TableSchema::TYPE_FLOAT, TableSchema::TYPE_DECIMAL];
-        if (in_array($data['type'], $hasPrecision, true) &&
-            (isset($data['length']) || isset($data['precision']))
+        if (
+            in_array($data['type'], $hasPrecision, true) &&
+            (
+                isset($data['length']) ||
+                isset($data['precision'])
+            )
         ) {
             $out .= '(' . (int)$data['length'] . ',' . (int)$data['precision'] . ')';
         }
@@ -405,8 +409,10 @@ public function columnSql(TableSchema $schema, string $name): string
             TableSchema::TYPE_FLOAT,
             TableSchema::TYPE_DECIMAL,
         ];
-        if (in_array($data['type'], $hasUnsigned, true) &&
-            isset($data['unsigned']) && $data['unsigned'] === true
+        if (
+            in_array($data['type'], $hasUnsigned, true) &&
+            isset($data['unsigned']) &&
+            $data['unsigned'] === true
         ) {
             $out .= ' UNSIGNED';
         }
@@ -427,16 +433,21 @@ public function columnSql(TableSchema $schema, string $name): string
             !$schema->hasAutoincrement() &&
             !isset($data['autoIncrement'])
         );
-        if (in_array($data['type'], [TableSchema::TYPE_INTEGER, TableSchema::TYPE_BIGINTEGER]) &&
-            ($data['autoIncrement'] === true || $addAutoIncrement)
+        if (
+            in_array($data['type'], [TableSchema::TYPE_INTEGER, TableSchema::TYPE_BIGINTEGER]) &&
+            (
+                $data['autoIncrement'] === true ||
+                $addAutoIncrement
+            )
         ) {
             $out .= ' AUTO_INCREMENT';
         }
         if (isset($data['null']) && $data['null'] === true && $data['type'] === TableSchema::TYPE_TIMESTAMP) {
             $out .= ' NULL';
             unset($data['default']);
         }
-        if (isset($data['default']) &&
+        if (
+            isset($data['default']) &&
             in_array($data['type'], [TableSchema::TYPE_TIMESTAMP, TableSchema::TYPE_DATETIME]) &&
             in_array(strtolower($data['default']), ['current_timestamp', 'current_timestamp()'])
         ) {