Release v4.3.5

Author: actions-user

app/Config/App.php

@@ -94,6 +94,8 @@ class App extends BaseConfig
      * by the application in descending order of priority. If no match is
      * found, the first locale will be used.
      *
+     * IncomingRequest::setLocale() also uses this list.
+     *
      * @var string[]
      */
     public array $supportedLocales = ['en'];

app/Config/Generators.php

@@ -27,6 +27,7 @@ class Generators extends BaseConfig
      */
     public array $views = [
         'make:cell'         => 'CodeIgniter\Commands\Generators\Views\cell.tpl.php',
+        'make:cell_view'    => 'CodeIgniter\Commands\Generators\Views\cell_view.tpl.php',
         'make:command'      => 'CodeIgniter\Commands\Generators\Views\command.tpl.php',
         'make:config'       => 'CodeIgniter\Commands\Generators\Views\config.tpl.php',
         'make:controller'   => 'CodeIgniter\Commands\Generators\Views\controller.tpl.php',

system/API/ResponseTrait.php

@@ -13,17 +13,13 @@
 
 use CodeIgniter\Format\FormatterInterface;
 use CodeIgniter\HTTP\IncomingRequest;
-use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;
 
 /**
  * Provides common, more readable, methods to provide
  * consistent HTTP responses under a variety of common
  * situations when working as an API.
- *
- * @property RequestInterface  $request
- * @property ResponseInterface $response
  */
 trait ResponseTrait
 {

system/CLI/GeneratorTrait.php

@@ -235,15 +235,15 @@ protected function qualifyClassName(): string
         $component = singular($this->component);
 
         /**
-         * @see https://regex101.com/r/a5KNCR/1
+         * @see https://regex101.com/r/a5KNCR/2
          */
-        $pattern = sprintf('/([a-z][a-z0-9_\/\\\\]+)(%s)/i', $component);
+        $pattern = sprintf('/([a-z][a-z0-9_\/\\\\]+)(%s)$/i', $component);
 
         if (preg_match($pattern, $class, $matches) === 1) {
             $class = $matches[1] . ucfirst($matches[2]);
         }
 
-        if ($this->enabledSuffixing && $this->getOption('suffix') && ! strripos($class, $component)) {
+        if ($this->enabledSuffixing && $this->getOption('suffix') && preg_match($pattern, $class) !== 1) {
             $class .= ucfirst($component);
         }
 

system/CodeIgniter.php

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

system/Commands/Generators/CellGenerator.php

@@ -65,7 +65,6 @@ class CellGenerator extends BaseCommand
      */
     protected $options = [
         '--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
-        '--suffix'    => 'Append the component title to the class name (e.g. User => UserCell).',
         '--force'     => 'Force overwrite existing file.',
     ];
 
@@ -74,27 +73,26 @@ class CellGenerator extends BaseCommand
      */
     public function run(array $params)
     {
-        // Generate the Class first
-        $this->component     = 'Cell';
-        $this->directory     = 'Cells';
+        $this->component = 'Cell';
+        $this->directory = 'Cells';
+
+        $params = array_merge($params, ['suffix' => null]);
+
         $this->template      = 'cell.tpl.php';
         $this->classNameLang = 'CLI.generator.className.cell';
-
         $this->generateClass($params);
 
-        // Generate the View
+        $this->name          = 'make:cell_view';
+        $this->template      = 'cell_view.tpl.php';
         $this->classNameLang = 'CLI.generator.viewName.cell';
 
-        // Form the view name
-        $segments = explode('\\', $this->qualifyClassName());
-
-        $view       = array_pop($segments);
-        $view       = decamelize($view);
-        $segments[] = $view;
-        $view       = implode('\\', $segments);
+        $className = $this->qualifyClassName();
+        $viewName  = decamelize(class_basename($className));
+        $viewName  = preg_replace('/([a-z][a-z0-9_\/\\\\]+)(_cell)$/i', '$1', $viewName) ?? $viewName;
+        $namespace = substr($className, 0, strrpos($className, '\\') + 1);
 
-        $this->template = 'cell_view.tpl.php';
+        $this->generateView($namespace . $viewName, $params);
 
-        $this->generateView($view, $params);
+        return 0;
     }
 }

system/Database/BaseConnection.php

@@ -46,8 +46,8 @@
  * @property bool       $transFailure
  * @property bool       $transStatus
  *
- * @template TConnection of object|resource
- * @template TResult of object|resource
+ * @template TConnection
+ * @template TResult
  *
  * @implements ConnectionInterface<TConnection, TResult>
  */

system/Database/BasePreparedQuery.php

@@ -18,9 +18,9 @@
 use ErrorException;
 
 /**
- * @template TConnection of object|resource
- * @template TStatement of object|resource
- * @template TResult of object|resource
+ * @template TConnection
+ * @template TStatement
+ * @template TResult
  *
  * @implements PreparedQueryInterface<TConnection, TStatement, TResult>
  */

system/Database/BaseResult.php

@@ -15,8 +15,8 @@
 use stdClass;
 
 /**
- * @template TConnection of object|resource
- * @template TResult of object|resource
+ * @template TConnection
+ * @template TResult
  *
  * @implements ResultInterface<TConnection, TResult>
  */
@@ -499,6 +499,8 @@ abstract public function getFieldData(): array;
 
     /**
      * Frees the current result.
+     *
+     * @return void
      */
     abstract public function freeResult();
 
@@ -525,7 +527,7 @@ abstract protected function fetchAssoc();
      *
      * Overridden by child classes.
      *
-     * @return object
+     * @return Entity|false|object|stdClass
      */
     abstract protected function fetchObject(string $className = 'stdClass');
 }

system/Database/ConnectionInterface.php

@@ -12,8 +12,8 @@
 namespace CodeIgniter\Database;
 
 /**
- * @template TConnection of object|resource
- * @template TResult of object|resource
+ * @template TConnection
+ * @template TResult
  */
 interface ConnectionInterface
 {

system/Database/MySQLi/Result.php

@@ -103,6 +103,8 @@ public function getFieldData(): array
 
     /**
      * Frees the current result.
+     *
+     * @return void
      */
     public function freeResult()
     {

system/Database/OCI8/Result.php

@@ -13,6 +13,7 @@
 
 use CodeIgniter\Database\BaseResult;
 use CodeIgniter\Entity\Entity;
+use stdClass;
 
 /**
  * Result for OCI8

system/Database/Postgre/Connection.php

@@ -128,11 +128,16 @@ public function getVersion(): string
             return $this->dataCache['version'];
         }
 
-        if (! $this->connID || ($pgVersion = pg_version($this->connID)) === false) {
+        if (! $this->connID) {
             $this->initialize();
         }
 
-        return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
+        $pgVersion                  = pg_version($this->connID);
+        $this->dataCache['version'] = isset($pgVersion['server']) ?
+            (preg_match('/^(\d+\.\d+)/', $pgVersion['server'], $matches) ? $matches[1] : '') :
+            '';
+
+        return $this->dataCache['version'];
     }
 
     /**

system/Database/Postgre/Result.php

@@ -69,6 +69,8 @@ public function getFieldData(): array
 
     /**
      * Frees the current result.
+     *
+     * @return void
      */
     public function freeResult()
     {

system/Database/PreparedQueryInterface.php

@@ -14,9 +14,9 @@
 use BadMethodCallException;
 
 /**
- * @template TConnection of object|resource
- * @template TStatement of object|resource
- * @template TResult of object|resource
+ * @template TConnection
+ * @template TStatement
+ * @template TResult
  */
 interface PreparedQueryInterface
 {

system/Database/ResultInterface.php

@@ -14,8 +14,8 @@
 use stdClass;
 
 /**
- * @template TConnection of object|resource
- * @template TResult of object|resource
+ * @template TConnection
+ * @template TResult
  */
 interface ResultInterface
 {

system/Database/SQLSRV/Result.php

@@ -103,6 +103,8 @@ public function getFieldData(): array
 
     /**
      * Frees the current result.
+     *
+     * @return void
      */
     public function freeResult()
     {

system/Database/SQLite3/Result.php

@@ -80,6 +80,8 @@ public function getFieldData(): array
 
     /**
      * Frees the current result.
+     *
+     * @return void
      */
     public function freeResult()
     {