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

Author: paulbalandan

admin/starter/tests/unit/HealthTest.php

@@ -11,7 +11,7 @@ final class HealthTest extends CIUnitTestCase
 {
     public function testIsDefinedAppPath(): void
     {
-        $this->assertTrue(defined('APPPATH'));
+        $this->assertDirectoryExists(APPPATH);
     }
 
     public function testBaseUrlHasBeenSet(): void

composer.json

@@ -29,7 +29,7 @@
         "phpunit/phpcov": "^9.0.2 || ^10.0",
         "phpunit/phpunit": "^10.5.16 || ^11.2",
         "predis/predis": "^3.0",
-        "rector/rector": "2.5.8",
+        "rector/rector": "2.6.1",
         "shipmonk/phpstan-baseline-per-identifier": "^2.0"
     },
     "replace": {

phpstan.dist.neon

@@ -18,7 +18,6 @@ parameters:
             - app/Views/errors/html/*
             - system/Commands/Generators/Views/*
             - system/Debug/Toolbar/Views/toolbar.tpl.php
-            - system/Images/Handlers/GDHandler.php
             - system/Test/Mock/MockCommon.php
             - system/ThirdParty/*
             - system/Validation/Views/single.php

psalm.xml

@@ -30,6 +30,19 @@
     </projectFiles>
 
     <issueHandlers>
+        <!-- Psalm does not bring class-level template params into scope for static methods. -->
+        <NoValue>
+            <errorLevel type="suppress">
+                <directory name="system/DataCaster/Cast" />
+                <directory name="system/Entity/Cast" />
+            </errorLevel>
+        </NoValue>
+        <UndefinedDocblockClass>
+            <errorLevel type="suppress">
+                <directory name="system/DataCaster/Cast" />
+                <directory name="system/Entity/Cast" />
+            </errorLevel>
+        </UndefinedDocblockClass>
         <UndefinedGlobalVariable>
             <errorLevel type="suppress">
                 <directory name="tests/_support/View/Cells" />

rector.php

@@ -19,7 +19,6 @@
 use Rector\CodeQuality\Rector\Isset_\IssetOnPropertyObjectToPropertyExistsRector;
 use Rector\CodingStyle\Rector\ClassMethod\FuncGetArgsToVariadicParamRector;
 use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector;
-use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
 use Rector\CodingStyle\Rector\FuncCall\VersionCompareFuncCallToConstantRector;
 use Rector\Config\RectorConfig;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedConstructorParamRector;
@@ -33,8 +32,6 @@
 use Rector\Php70\Rector\FuncCall\RandomFunctionRector;
 use Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector;
 use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
-use Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector;
-use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
 use Rector\PHPUnit\CodeQuality\Rector\Class_\YieldDataProviderRector;
 use Rector\PHPUnit\CodeQuality\Rector\StmtsAwareInterface\DeclareStrictTypesTestsRector;
 use Rector\Privatization\Rector\Class_\FinalizeTestCaseClassRector;
@@ -106,13 +103,6 @@
         // Keep property defaults for backward compatibility.
         RemoveDefaultValueFromAssignedPropertyRector::class,
 
-        ReadOnlyPropertyRector::class => [
-            __DIR__ . '/system/Cache/ResponseCache.php',
-            __DIR__ . '/system/HotReloader/IteratorFilter.php',
-            __DIR__ . '/system/Router/RouteCollection.php',
-            __DIR__ . '/system/Security/Security.php',
-        ],
-
         // Exclude test file because `is_cli()` is mocked and Rector might remove needed parameters.
         RemoveExtraParametersRector::class => [
             __DIR__ . '/tests/system/Debug/ToolbarTest.php',
@@ -166,9 +156,6 @@
             __DIR__ . '/system/HTTP/SiteURI.php',
         ],
 
-        // Unnecessary (string) is inserted
-        NullToStrictStringFuncCallArgRector::class,
-
         CompactToVariablesRector::class,
 
         // possibly isset() on purpose, on updated Config classes property across versions
@@ -197,7 +184,6 @@
         SimplifyUselessVariableRector::class,
         RemoveAlwaysElseRector::class,
         PassStrictParameterToFunctionParameterRector::class,
-        CountArrayToEmptyArrayComparisonRector::class,
         ChangeNestedForeachIfsToEarlyContinueRector::class,
         ChangeIfElseValueAssignToEarlyReturnRector::class,
         PreparedValueToEarlyReturnRector::class,

system/CLI/CLI.php

@@ -713,7 +713,7 @@ public static function getWidth(int $default = 80): int
             static::generateDimensions();
         }
 
-        return static::$width ?: $default;
+        return (static::$width === null || static::$width === 0) ? $default : static::$width;
     }
 
     /**
@@ -725,7 +725,7 @@ public static function getHeight(int $default = 32): int
             static::generateDimensions();
         }
 
-        return static::$height ?: $default;
+        return (static::$height === null || static::$height === 0) ? $default : static::$height;
     }
 
     /**

system/Commands/Utilities/Namespaces.php

@@ -147,7 +147,8 @@ private function outputCINamespaces(array $params): array
                     $pathOutput = $this->truncate(clean_path($path), $maxLength);
                 }
 
-                $path = realpath($path) ?: $path;
+                $realPath = realpath($path);
+                $path     = $realPath === false ? $path : $realPath;
 
                 $tbody[] = [
                     $ns,

system/Common.php

@@ -97,7 +97,8 @@ function clean_path(string $path): string
     {
         // Resolve relative paths
         try {
-            $path = realpath($path) ?: $path;
+            $realPath = realpath($path);
+            $path     = $realPath === false ? $path : $realPath;
         } catch (ErrorException|ValueError) {
             $path = 'error file path: ' . urlencode($path);
         }
@@ -1342,7 +1343,11 @@ function class_uses_recursive($class)
      */
     function trait_uses_recursive($trait)
     {
-        $traits = class_uses($trait) ?: [];
+        $traits = class_uses($trait);
+
+        if ($traits === false) {
+            return [];
+        }
 
         foreach ($traits as $trait) {
             $traits += trait_uses_recursive($trait);

system/Config/BaseService.php

@@ -273,7 +273,7 @@ protected static function getSharedInstance(string $key, ...$params)
     public static function autoloader(bool $getShared = true)
     {
         if ($getShared) {
-            if (empty(static::$instances['autoloader'])) {
+            if (! isset(static::$instances['autoloader'])) {
                 static::$instances['autoloader'] = new Autoloader();
             }
 
@@ -293,7 +293,7 @@ public static function autoloader(bool $getShared = true)
     public static function locator(bool $getShared = true)
     {
         if ($getShared) {
-            if (empty(static::$instances['locator'])) {
+            if (! isset(static::$instances['locator'])) {
                 $cacheEnabled = class_exists(Optimize::class)
                     && (new Optimize())->locatorCacheEnabled;
 

system/Config/DotEnv.php

@@ -59,15 +59,24 @@ public function parse(): ?array
             return null;
         }
 
-        // Ensure the file is readable
-        if (! is_readable($this->path)) {
-            throw new InvalidArgumentException("The .env file is not readable: {$this->path}");
+        $lines = @file($this->path, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+
+        // The .env file may have been removed or replaced by a concurrent
+        // process between the is_file() check above and this read attempt
+        // (e.g. another test process renaming `.env`). A vanished file is
+        // treated as absent, so re-check with a fresh stat cache.
+        if ($lines === false) {
+            clearstatcache(true, $this->path);
+
+            if (is_file($this->path)) {
+                throw new InvalidArgumentException("The .env file is not readable: {$this->path}");
+            }
+
+            return null;
         }
 
         $vars = [];
 
-        $lines = file($this->path, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-
         foreach ($lines as $line) {
             // Is it a comment?
             if (str_starts_with(trim($line), '#')) {
@@ -98,11 +107,11 @@ protected function setVariable(string $name, string $value = '')
             putenv("{$name}={$value}");
         }
 
-        if (empty($_ENV[$name])) {
+        if (! isset($_ENV[$name]) || in_array($_ENV[$name], ['', '0'], true)) {
             $_ENV[$name] = $value;
         }
 
-        if (empty($_SERVER[$name])) {
+        if (! isset($_SERVER[$name]) || in_array($_SERVER[$name], ['', '0'], true)) {
             $_SERVER[$name] = $value;
         }
     }