Merge remote-tracking branch 'upstream/develop' into 4.5

Author: kenjis

app/.htaccess

@@ -1,6 +1,6 @@
 <IfModule authz_core_module>
-    Require all denied
+	Require all denied
 </IfModule>
 <IfModule !authz_core_module>
-    Deny from all
+	Deny from all
 </IfModule>

phpstan-baseline.php

@@ -45,5 +45,5 @@ Options -Indexes
 </IfModule>
 
 # Disable server signature start
-	ServerSignature Off
+ServerSignature Off
 # Disable server signature end

public/.htaccess

@@ -23,6 +23,7 @@
 use Rector\CodeQuality\Rector\FuncCall\SingleInArrayToCompareRector;
 use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector;
 use Rector\CodeQuality\Rector\If_\CombineIfRector;
+use Rector\CodeQuality\Rector\If_\ExplicitBoolCompareRector;
 use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
 use Rector\CodeQuality\Rector\If_\SimplifyIfElseToTernaryRector;
 use Rector\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector;
@@ -198,6 +199,7 @@
     $rectorConfig->rule(BooleanInIfConditionRuleFixerRector::class);
     $rectorConfig->rule(SingleInArrayToCompareRector::class);
     $rectorConfig->rule(VersionCompareFuncCallToConstantRector::class);
+    $rectorConfig->rule(ExplicitBoolCompareRector::class);
 
     $rectorConfig
         ->ruleWithConfiguration(StringClassNameToClassConstantRector::class, [

rector.php

@@ -278,84 +278,84 @@ abstract class BaseModel
     /**
      * Callbacks for beforeInsert
      *
-     * @var array
+     * @var list<string>
      */
     protected $beforeInsert = [];
 
     /**
      * Callbacks for afterInsert
      *
-     * @var array
+     * @var list<string>
      */
     protected $afterInsert = [];
 
     /**
      * Callbacks for beforeUpdate
      *
-     * @var array
+     * @var list<string>
      */
     protected $beforeUpdate = [];
 
     /**
      * Callbacks for afterUpdate
      *
-     * @var array
+     * @var list<string>
      */
     protected $afterUpdate = [];
 
     /**
      * Callbacks for beforeInsertBatch
      *
-     * @var array
+     * @var list<string>
      */
     protected $beforeInsertBatch = [];
 
     /**
      * Callbacks for afterInsertBatch
      *
-     * @var array
+     * @var list<string>
      */
     protected $afterInsertBatch = [];
 
     /**
      * Callbacks for beforeUpdateBatch
      *
-     * @var array
+     * @var list<string>
      */
     protected $beforeUpdateBatch = [];
 
     /**
      * Callbacks for afterUpdateBatch
      *
-     * @var array
+     * @var list<string>
      */
     protected $afterUpdateBatch = [];
 
     /**
      * Callbacks for beforeFind
      *
-     * @var array
+     * @var list<string>
      */
     protected $beforeFind = [];
 
     /**
      * Callbacks for afterFind
      *
-     * @var array
+     * @var list<string>
      */
     protected $afterFind = [];
 
     /**
      * Callbacks for beforeDelete
      *
-     * @var array
+     * @var list<string>
      */
     protected $beforeDelete = [];
 
     /**
      * Callbacks for afterDelete
      *
-     * @var array
+     * @var list<string>
      */
     protected $afterDelete = [];
 

system/BaseModel.php

@@ -255,7 +255,7 @@ public static function prompt(string $field, $options = null, $validation = null
             $default = $options[0];
         }
 
-        static::fwrite(STDOUT, $field . (trim($field) ? ' ' : '') . $extraOutput . ': ');
+        static::fwrite(STDOUT, $field . (trim($field) !== '' ? ' ' : '') . $extraOutput . ': ');
 
         // Read the input from keyboard.
         $input = trim(static::$io->input()) ?: (string) $default;
@@ -377,7 +377,7 @@ public static function promptByMultipleKeys(string $text, array $options): array
      */
     private static function isZeroOptions(array $options): void
     {
-        if (! $options) {
+        if ($options === []) {
             throw new InvalidArgumentException('No options to select from were provided');
         }
     }

system/CLI/CLI.php

@@ -145,7 +145,7 @@ public function run(array $params)
             }
         }
 
-        if (! $status) {
+        if ($status === []) {
             // @codeCoverageIgnoreStart
             CLI::error(lang('Migrations.noneFound'), 'light_gray', 'red');
             CLI::newLine();

system/Commands/Database/MigrateStatus.php

@@ -142,7 +142,7 @@ public function normaliseVariable(string $name, string $value = ''): array
      */
     protected function sanitizeValue(string $value): string
     {
-        if (! $value) {
+        if ($value === '') {
             return $value;
         }
 

system/Config/DotEnv.php

@@ -170,7 +170,7 @@ private function setValidator($rules, array $messages): void
             }
 
             // If no error message is defined, use the error message in the Config\Validation file
-            if (! $messages) {
+            if ($messages === []) {
                 $errorName = $rules . '_errors';
                 $messages  = $validation->{$errorName} ?? [];
             }

system/Controller.php

@@ -1576,7 +1576,7 @@ public function getFieldData(string $table)
     /**
      * Returns an object with key data
      *
-     * @return array
+     * @return array<string, stdClass>
      */
     public function getIndexData(string $table)
     {
@@ -1596,7 +1596,9 @@ public function getForeignKeyData(string $table)
     /**
      * Converts array of arrays generated by _foreignKeyData() to array of objects
      *
-     * @return array[
+     * @return array<string, stdClass>
+     *
+     * array[
      *    {constraint_name} =>
      *        stdClass[
      *            'constraint_name'     => string,
@@ -1753,13 +1755,17 @@ abstract protected function _fieldData(string $table): array;
      * Platform-specific index data.
      *
      * @see    getIndexData()
+     *
+     * @return array<string, stdClass>
      */
     abstract protected function _indexData(string $table): array;
 
     /**
      * Platform-specific foreign keys data.
      *
      * @see    getForeignKeyData()
+     *
+     * @return array<string, stdClass>
      */
     abstract protected function _foreignKeyData(string $table): array;