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

Author: kenjis

app/Config/App.php

@@ -105,6 +105,8 @@ class App extends BaseConfig
      *
      * The default timezone that will be used in your application to display
      * dates with the date helper, and can be retrieved through app_timezone()
+     *
+     * @see https://www.php.net/manual/en/timezones.php for list of timezones supported by PHP.
      */
     public string $appTimezone = 'UTC';
 

system/Commands/Generators/CellGenerator.php

@@ -88,11 +88,8 @@ public function run(array $params)
         // Form the view name
         $segments = explode('\\', $this->qualifyClassName());
 
-        $view = array_pop($segments);
-        $view = str_replace('Cell', '', decamelize($view));
-        if (strpos($view, '_cell') === false) {
-            $view .= '_cell';
-        }
+        $view       = array_pop($segments);
+        $view       = decamelize($view);
         $segments[] = $view;
         $view       = implode('\\', $segments);
 

system/Helpers/text_helper.php

@@ -538,6 +538,8 @@ function reduce_multiples(string $str, string $character = ',', bool $trim = fal
      *
      * @param string $type Type of random string.  basic, alpha, alnum, numeric, nozero, md5, sha1, and crypto
      * @param int    $len  Number of characters
+     *
+     * @deprecated The type 'basic', 'md5', and 'sha1' are deprecated. They are not cryptographically secure.
      */
     function random_string(string $type = 'alnum', int $len = 8): string
     {

system/View/Cells/Cell.php

@@ -73,8 +73,13 @@ final protected function view(?string $view, array $data = []): string
 
         // If no view is specified, we'll try to guess it based on the class name.
         if (empty($view)) {
-            $view = decamelize((new ReflectionClass($this))->getShortName());
-            $view = str_replace('_cell', '', $view);
+            // According to the docs, the name of the view file should be the
+            // snake_cased version of the cell's class name, but for backward
+            // compatibility, the name also accepts '_cell' being omitted.
+            $ref      = new ReflectionClass($this);
+            $view     = decamelize($ref->getShortName());
+            $viewPath = dirname($ref->getFileName()) . DIRECTORY_SEPARATOR . $view . '.php';
+            $view     = is_file($viewPath) ? $viewPath : str_replace('_cell', '', $view);
         }
 
         // Locate our view, preferring the directory of the class.

tests/_support/View/Cells/AwesomeCell.php

@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\View\Cells;
+
+use CodeIgniter\View\Cells\Cell;
+
+class AwesomeCell extends Cell
+{
+    public string $message = 'Found!';
+}

tests/_support/View/Cells/awesome_cell.php

@@ -0,0 +1 @@
+<div><?= $message ?></div>

tests/system/Commands/CellGeneratorTest.php

@@ -73,7 +73,7 @@ public function testGenerateCellSimpleName()
         $this->assertStringContainsString('class Another extends Cell', $contents);
 
         // Check the view was generated
-        $file = APPPATH . 'Cells/another_cell.php';
+        $file = APPPATH . 'Cells/another.php';
         $this->assertStringContainsString('File created: ', $this->getStreamFilterBuffer());
         $this->assertFileExists($file);
     }

tests/system/View/ControlledCellTest.php

@@ -14,6 +14,7 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\View\Exceptions\ViewException;
 use Tests\Support\View\Cells\AdditionCell;
+use Tests\Support\View\Cells\AwesomeCell;
 use Tests\Support\View\Cells\ColorsCell;
 use Tests\Support\View\Cells\GreetingCell;
 use Tests\Support\View\Cells\ListerCell;
@@ -36,6 +37,13 @@ public function testCellRendersDefaultValues()
         $this->assertStringContainsString('Hello World', $result);
     }
 
+    public function testCellRendersViewWithActualClassName()
+    {
+        $result = view_cell(AwesomeCell::class);
+
+        $this->assertStringContainsString('Found!', $result);
+    }
+
     public function testCellWithNamedView()
     {
         $result = view_cell(SimpleNotice::class);

user_guide_src/source/changelogs/v4.3.4.rst

@@ -21,6 +21,9 @@ Changes
 Deprecations
 ************
 
+- **Text Helper:** :php:func:`random_string()`'s type ``basic``, ``md5``, and
+  ``sha1`` are deprecated. They are not cryptographically secure.
+
 Bugs Fixed
 **********
 

user_guide_src/source/helpers/text_helper.rst

@@ -33,17 +33,18 @@ The following functions are available:
     .. warning:: For types: **basic**, **md5**, and **sha1**, generated strings
         are not cryptographically secure. Therefore, these types cannot be used
         for cryptographic purposes or purposes requiring unguessable return values.
+        Since v4.3.3, these types are deprecated.
 
     The first parameter specifies the type of string, the second parameter
     specifies the length. The following choices are available:
 
     - **alpha**: A string with lower and uppercase letters only.
     - **alnum**: Alphanumeric string with lower and uppercase characters.
-    - **basic**: A random number based on ``mt_rand()`` (length ignored).
+    - **basic**: [deprecated] A random number based on ``mt_rand()`` (length ignored).
     - **numeric**: Numeric string.
     - **nozero**: Numeric string with no zeros.
-    - **md5**: An encrypted random number based on ``md5()`` (fixed length of 32).
-    - **sha1**: An encrypted random number based on ``sha1()`` (fixed length of 40).
+    - **md5**: [deprecated] An encrypted random number based on ``md5()`` (fixed length of 32).
+    - **sha1**: [deprecated] An encrypted random number based on ``sha1()`` (fixed length of 40).
     - **crypto**: A random string based on ``random_bytes()``.
 
     .. note:: When you use **crypto**, you must set an even number to the second parameter.