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

Author: paulbalandan

.github/scripts/random-tests-config.txt

@@ -14,7 +14,7 @@ Autoloader
 # Cache
 CLI
 # Commands
-# Config
+Config
 Cookie
 # DataCaster
 # DataConverter
@@ -29,7 +29,7 @@ Files
 Format
 # HTTP
 # Helpers
-# Honeypot
+Honeypot
 HotReloader
 # I18n
 # Images
@@ -42,7 +42,7 @@ RESTful
 # Router
 Security
 # Session
-# Test
+Test
 Throttle
 Typography
 # Validation

.github/workflows/label-pr.yml

@@ -42,6 +42,6 @@ jobs:
             console.log('No changes to workflow file detected, proceeding with label addition.');
 
       - name: Add labels
-        uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b # v6.0.1
+        uses: actions/labeler@f27b608878404679385c85cfa523b85ccb86e213 # v6.1.0
         with:
           sync-labels: true # Remove labels when matching files are reverted

psalm-autoload.php

@@ -24,7 +24,7 @@
     $iterator = new RecursiveIteratorIterator(
         new RecursiveDirectoryIterator(
             $directory,
-            RecursiveDirectoryIterator::UNIX_PATHS | RecursiveDirectoryIterator::CURRENT_AS_FILEINFO,
+            RecursiveDirectoryIterator::UNIX_PATHS | RecursiveDirectoryIterator::CURRENT_AS_FILEINFO | FilesystemIterator::SKIP_DOTS,
         ),
         RecursiveIteratorIterator::CHILD_FIRST,
     );

rector.php

@@ -67,6 +67,7 @@
         __DIR__ . '/tests',
         __DIR__ . '/utils/src',
     ])
+    ->withRootFiles()
     // do you need to include constants, class aliases or custom autoloader? files listed will be executed
     ->withBootstrapFiles([
         __DIR__ . '/phpstan-bootstrap.php',

system/CLI/CLI.php

@@ -754,8 +754,8 @@ public static function generateDimensions()
                 static::$height = (int) $matches[1];
                 static::$width  = (int) $matches[2];
             } else {
-                static::$height = (int) exec('tput lines');
-                static::$width  = (int) exec('tput cols');
+                static::$height = (int) exec('tput lines 2>/dev/null');
+                static::$width  = (int) exec('tput cols 2>/dev/null');
             }
         } catch (Throwable $e) {
             // Reset the dimensions so that the default values will be returned later.

system/Commands/Encryption/GenerateKey.php

@@ -165,36 +165,41 @@ private function writeNewEncryptionKeyToFile(string $oldKey, string $newKey): bo
         }
 
         $oldFileContents = (string) file_get_contents($envFile);
-        $replacementKey  = "\nencryption.key = {$newKey}";
 
-        if (! str_contains($oldFileContents, 'encryption.key')) {
-            return file_put_contents($envFile, $replacementKey, FILE_APPEND) !== false;
+        // Match an active setting line, preserving any leading whitespace and `export` prefix.
+        $activePattern = $this->keyPattern($oldKey);
+
+        if (preg_match($activePattern, $oldFileContents) === 1) {
+            $newFileContents = (string) preg_replace($activePattern, '$1' . $newKey, $oldFileContents, 1);
+
+            return file_put_contents($envFile, $newFileContents) !== false;
         }
 
-        $newFileContents = preg_replace($this->keyPattern($oldKey), $replacementKey, $oldFileContents);
+        // Match a commented-out setting line (e.g., from the shipped `env` template) and
+        // uncomment it. The optional `export` prefix is dropped on uncomment for predictability.
+        $commentedPattern = '/^\h*#\h*(?:export\h+)?encryption\.key\h*=\h*[^\r\n]*$/m';
+
+        if (preg_match($commentedPattern, $oldFileContents) === 1) {
+            $newFileContents = (string) preg_replace($commentedPattern, "encryption.key = {$newKey}", $oldFileContents, 1);
 
-        if ($newFileContents === $oldFileContents) {
-            $newFileContents = preg_replace(
-                '/^[#\s]*encryption.key[=\s]*(?:hex2bin\:[a-f0-9]{64}|base64\:(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?)$/m',
-                $replacementKey,
-                $oldFileContents,
-            );
+            return file_put_contents($envFile, $newFileContents) !== false;
         }
 
-        return file_put_contents($envFile, $newFileContents) !== false;
+        // No setting present (active or commented); append.
+        return file_put_contents($envFile, "\nencryption.key = {$newKey}", FILE_APPEND) !== false;
     }
 
     /**
-     * Get the regex of the current encryption key.
+     * Returns the regex used to locate an active `encryption.key = ...` setting in the `.env`
+     * contents. The single capture group spans everything up to (and including) the `=` and any
+     * separating whitespace, so a `preg_replace` substitution preserves an optional `export`
+     * prefix while rewriting only the value.
+     *
+     * The `$oldKey` parameter is retained for backward compatibility with subclasses that
+     * override this method; it is no longer consulted because the pattern matches any value.
      */
     private function keyPattern(string $oldKey): string
     {
-        $escaped = preg_quote($oldKey, '/');
-
-        if ($escaped !== '') {
-            $escaped = "[{$escaped}]*";
-        }
-
-        return "/^[#\\s]*encryption.key[=\\s]*{$escaped}$/m";
+        return '/^(\h*(?:export\h+)?encryption\.key\h*=\h*)[^\r\n]*$/m';
     }
 }

system/Database/BaseConnection.php

@@ -1843,9 +1843,11 @@ protected function getDriverFunctionPrefix(): string
     public function listTables(bool $constrainByPrefix = false)
     {
         if (isset($this->dataCache['table_names']) && $this->dataCache['table_names']) {
-            return $constrainByPrefix
+            $tables = $constrainByPrefix
                 ? preg_grep("/^{$this->DBPrefix}/", $this->dataCache['table_names'])
                 : $this->dataCache['table_names'];
+
+            return array_values($tables);
         }
 
         $sql = $this->_listTables($constrainByPrefix);

system/Database/BasePreparedQuery.php

@@ -192,7 +192,7 @@ abstract public function _execute(array $data): bool;
     /**
      * Returns the result object for the prepared query.
      *
-     * @return object|resource|null
+     * @return false|object|resource|null
      */
     abstract public function _getResult();
 

system/Database/ConnectionInterface.php

@@ -78,7 +78,7 @@ public function getDatabase(): string;
      * Must return this format: ['code' => string|int, 'message' => string]
      * intval(code) === 0 means "no error".
      *
-     * @return array<string, int|string>
+     * @return array{code: int|string|null, message: string|null}
      */
     public function error(): array;
 

system/Database/MySQLi/Connection.php

@@ -605,7 +605,7 @@ protected function _enableForeignKeyChecks()
      * Must return this format: ['code' => string|int, 'message' => string]
      * intval(code) === 0 means "no error".
      *
-     * @return array<string, int|string>
+     * @return array{code: int|string|null, message: string|null}
      */
     public function error(): array
     {