Release v4.2.12

Author: actions-user

LICENSE

@@ -1,7 +1,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2014-2019 British Columbia Institute of Technology
-Copyright (c) 2019-2022 CodeIgniter Foundation
+Copyright (c) 2019-2023 CodeIgniter Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

app/Config/Cache.php

@@ -134,7 +134,7 @@ class Cache extends BaseConfig
      *
      * @see https://codeigniter.com/user_guide/libraries/caching.html#memcached
      *
-     * @var array<string, boolean|int|string>
+     * @var array<string, bool|int|string>
      */
     public $memcached = [
         'host'   => '127.0.0.1',

app/Config/Migrations.php

@@ -42,9 +42,12 @@ class Migrations extends BaseConfig
      *
      * This is the format that will be used when creating new migrations
      * using the CLI command:
-     *   > php spark migrate:create
+     *   > php spark make:migration
      *
-     * Typical formats:
+     * Note: if you set an unsupported format, migration runner will not find
+     *       your migration files.
+     *
+     * Supported formats:
      * - YmdHis_
      * - Y-m-d-His_
      * - Y_m_d_His_

app/Controllers/BaseController.php

@@ -37,6 +37,12 @@ abstract class BaseController extends Controller
      */
     protected $helpers = [];
 
+    /**
+     * Be sure to declare properties for any property fetch you initialized.
+     * The creation of dynamic property is deprecated in PHP 8.2.
+     */
+    // protected $session;
+
     /**
      * Constructor.
      */

system/CLI/CLI.php

@@ -161,9 +161,10 @@ public static function init()
             static::parseCommandLine();
 
             static::$initialized = true;
-        } else {
+        } elseif (! defined('STDOUT')) {
             // If the command is being called from a controller
             // we need to define STDOUT ourselves
+            // For "! defined('STDOUT')" see: https://github.com/codeigniter4/CodeIgniter4/issues/7047
             define('STDOUT', 'php://output'); // @codeCoverageIgnore
         }
     }

system/Cache/CacheInterface.php

@@ -26,16 +26,16 @@ public function initialize();
      *
      * @param string $key Cache item name
      *
-     * @return mixed
+     * @return array|bool|float|int|object|string|null
      */
     public function get(string $key);
 
     /**
      * Saves an item to the cache store.
      *
-     * @param string $key   Cache item name
-     * @param mixed  $value The data to save
-     * @param int    $ttl   Time To Live, in seconds (default 60)
+     * @param string                                  $key   Cache item name
+     * @param array|bool|float|int|object|string|null $value The data to save
+     * @param int                                     $ttl   Time To Live, in seconds (default 60)
      *
      * @return bool Success or failure
      */
@@ -56,7 +56,7 @@ public function delete(string $key);
      * @param string $key    Cache ID
      * @param int    $offset Step/value to increase by
      *
-     * @return mixed
+     * @return bool|int
      */
     public function increment(string $key, int $offset = 1);
 
@@ -66,7 +66,7 @@ public function increment(string $key, int $offset = 1);
      * @param string $key    Cache ID
      * @param int    $offset Step/value to increase by
      *
-     * @return mixed
+     * @return bool|int
      */
     public function decrement(string $key, int $offset = 1);
 
@@ -83,7 +83,7 @@ public function clean();
      * The information returned and the structure of the data
      * varies depending on the handler.
      *
-     * @return mixed
+     * @return array|false|object|null
      */
     public function getCacheInfo();
 

system/Cache/Handlers/BaseHandler.php

@@ -77,7 +77,7 @@ public static function validateKey($key, $prefix = ''): string
      * @param int     $ttl      Time to live
      * @param Closure $callback Callback return value
      *
-     * @return mixed
+     * @return array|bool|float|int|object|string|null
      */
     public function remember(string $key, int $ttl, Closure $callback)
     {

system/CodeIgniter.php

@@ -47,7 +47,7 @@ class CodeIgniter
     /**
      * The current version of CodeIgniter Framework
      */
-    public const CI_VERSION = '4.2.11';
+    public const CI_VERSION = '4.2.12';
 
     /**
      * App startup time.

system/Database/MigrationRunner.php

@@ -67,7 +67,7 @@ class MigrationRunner
      *
      * @var string
      */
-    protected $regex = '/^\d{4}[_-]?\d{2}[_-]?\d{2}[_-]?\d{6}_(\w+)$/';
+    protected $regex = '/\A(\d{4}[_-]?\d{2}[_-]?\d{2}[_-]?\d{6})_(\w+)\z/';
 
     /**
      * The main database connection. Used to store
@@ -448,6 +448,8 @@ public function findNamespaceMigrations(string $namespace): array
     /**
      * Create a migration object from a file path.
      *
+     * @param string $path Full path to a valid migration file.
+     *
      * @return false|object Returns the migration object, or false on failure
      */
     protected function migrationFromFile(string $path, string $namespace)
@@ -456,18 +458,18 @@ protected function migrationFromFile(string $path, string $namespace)
             return false;
         }
 
-        $name = basename($path, '.php');
+        $filename = basename($path, '.php');
 
-        if (! preg_match($this->regex, $name)) {
+        if (! preg_match($this->regex, $filename)) {
             return false;
         }
 
         $locator = Services::locator(true);
 
         $migration = new stdClass();
 
-        $migration->version   = $this->getMigrationNumber($name);
-        $migration->name      = $this->getMigrationName($name);
+        $migration->version   = $this->getMigrationNumber($filename);
+        $migration->name      = $this->getMigrationName($filename);
         $migration->path      = $path;
         $migration->class     = $locator->getClassname($path);
         $migration->namespace = $namespace;
@@ -525,23 +527,29 @@ public function setSilent(bool $silent)
 
     /**
      * Extracts the migration number from a filename
+     *
+     * @param string $migration A migration filename w/o path.
      */
     protected function getMigrationNumber(string $migration): string
     {
-        preg_match('/^\d{4}[_-]?\d{2}[_-]?\d{2}[_-]?\d{6}/', $migration, $matches);
+        preg_match($this->regex, $migration, $matches);
 
-        return count($matches) ? $matches[0] : '0';
+        return count($matches) ? $matches[1] : '0';
     }
 
     /**
-     * Extracts the migration class name from a filename
+     * Extracts the migration name from a filename
+     *
+     * Note: The migration name should be the classname, but maybe they are
+     *       different.
+     *
+     * @param string $migration A migration filename w/o path.
      */
     protected function getMigrationName(string $migration): string
     {
-        $parts = explode('_', $migration);
-        array_shift($parts);
+        preg_match($this->regex, $migration, $matches);
 
-        return implode('_', $parts);
+        return count($matches) ? $matches[2] : '';
     }
 
     /**

system/Debug/Toolbar/Views/toolbar.css

@@ -427,26 +427,26 @@
     -webkit-box-shadow: 0 0 4px #DFDFDF;
   }
   #debug-icon a:active,
-#debug-icon a:link,
-#debug-icon a:visited {
+  #debug-icon a:link,
+  #debug-icon a:visited {
     color: #DD8615;
   }
   #debug-bar {
     background-color: #252525;
     color: #DFDFDF;
   }
   #debug-bar h1,
-#debug-bar h2,
-#debug-bar h3,
-#debug-bar p,
-#debug-bar a,
-#debug-bar button,
-#debug-bar table,
-#debug-bar thead,
-#debug-bar tr,
-#debug-bar td,
-#debug-bar button,
-#debug-bar .toolbar {
+  #debug-bar h2,
+  #debug-bar h3,
+  #debug-bar p,
+  #debug-bar a,
+  #debug-bar button,
+  #debug-bar table,
+  #debug-bar thead,
+  #debug-bar tr,
+  #debug-bar td,
+  #debug-bar button,
+  #debug-bar .toolbar {
     background-color: transparent;
     color: #DFDFDF;
   }
@@ -498,7 +498,7 @@
     color: #DFDFDF;
   }
   #debug-bar #toolbar-position,
-#debug-bar #toolbar-theme {
+  #debug-bar #toolbar-theme {
     filter: brightness(0) invert(0.6);
   }
   #debug-bar .ci-label.active {
@@ -518,7 +518,7 @@
     -webkit-box-shadow: 0 -1px 4px #434343;
   }
   #debug-bar .timeline th,
-#debug-bar .timeline td {
+  #debug-bar .timeline td {
     border-color: #434343;
   }
   #debug-bar .timeline .timer {