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

Conflicts: user_guide_src/source/changelogs/index.rst user_guide_src/source/installation/upgrading.rst
2025-02-20 11:44:28 +08:00 · 2023-12-29 17:58:07 +09:00 · 2023-12-29 17:58:07 +09:00 · 32a37dd259
commit 32a37dd259
parent aba1c97d88 e424098552
11 changed files with 144 additions and 28 deletions
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@ -67,6 +67,31 @@ $overrides = [
            'use',
        ],
    ],
+    'fully_qualified_strict_types' => [
+        'import_symbols'                        => false,
+        'leading_backslash_in_global_namespace' => false,
+        'phpdoc_tags'                           => [
+            'param',
+            'phpstan-param',
+            'phpstan-property',
+            'phpstan-property-read',
+            'phpstan-property-write',
+            'phpstan-return',
+            'phpstan-var',
+            'property',
+            'property-read',
+            'property-write',
+            'psalm-param',
+            'psalm-property',
+            'psalm-property-read',
+            'psalm-property-write',
+            'psalm-return',
+            'psalm-var',
+            'return',
+            'throws',
+            'var',
+        ],
+    ],
 ];

 $options = [
--- a/admin/framework/composer.json
+++ b/admin/framework/composer.json
@ -19,7 +19,7 @@
    "require-dev": {
        "codeigniter/coding-standard": "^1.5",
        "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "~3.41.0",
+        "friendsofphp/php-cs-fixer": "^3.43",
        "kint-php/kint": "^5.0.4",
        "mikey179/vfsstream": "^1.6",
        "nexusphp/cs-config": "^3.6",
--- a/composer.json
+++ b/composer.json
@ -21,7 +21,7 @@
        "codeigniter/phpstan-codeigniter": "^1.4",
        "ergebnis/composer-normalize": "^2.28",
        "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "~3.41.0",
+        "friendsofphp/php-cs-fixer": "^3.43",
        "kint-php/kint": "^5.0.4",
        "mikey179/vfsstream": "^1.6",
        "nexusphp/cs-config": "^3.6",
--- a/system/Debug/Toolbar/Views/toolbar.tpl.php
+++ b/system/Debug/Toolbar/Views/toolbar.tpl.php
@ -1,21 +1,21 @@
 <?php declare(strict_types=1);
 /**
- * @var \CodeIgniter\Debug\Toolbar $this
- * @var int                        $totalTime
- * @var int                        $totalMemory
- * @var string                     $url
- * @var string                     $method
- * @var bool                       $isAJAX
- * @var int                        $startTime
- * @var int                        $totalTime
- * @var int                        $totalMemory
- * @var float                      $segmentDuration
- * @var int                        $segmentCount
- * @var string                     $CI_VERSION
- * @var array                      $collectors
- * @var array                      $vars
- * @var array                      $styles
- * @var \CodeIgniter\View\Parser   $parser
+ * @var CodeIgniter\Debug\Toolbar $this
+ * @var int                       $totalTime
+ * @var int                       $totalMemory
+ * @var string                    $url
+ * @var string                    $method
+ * @var bool                      $isAJAX
+ * @var int                       $startTime
+ * @var int                       $totalTime
+ * @var int                       $totalMemory
+ * @var float                     $segmentDuration
+ * @var int                       $segmentCount
+ * @var string                    $CI_VERSION
+ * @var array                     $collectors
+ * @var array                     $vars
+ * @var array                     $styles
+ * @var CodeIgniter\View\Parser   $parser
 */
 ?>
 <style>
--- a/system/Exceptions/FrameworkException.php
+++ b/system/Exceptions/FrameworkException.php
@ -68,7 +68,7 @@ class FrameworkException extends RuntimeException implements ExceptionInterface
                'The framework needs the following extension(s) installed and loaded: %s.',
                $extension
            );
-        // @codeCoverageIgnoreEnd
+            // @codeCoverageIgnoreEnd
        } else {
            $message = lang('Core.missingExtension', [$extension]);
        }
--- a/tests/system/Router/AutoRouterImprovedTest.php
+++ b/tests/system/Router/AutoRouterImprovedTest.php
@ -180,7 +180,7 @@ final class AutoRouterImprovedTest extends CIUnitTestCase
            = $router->getRoute('subfolder/mycontroller/somemethod', Method::GET);

        $this->assertSame('Subfolder/', $directory);
-        $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Mycontroller::class, $controller);
+        $this->assertSame('\\' . Controllers\Subfolder\Mycontroller::class, $controller);
        $this->assertSame('getSomemethod', $method);
        $this->assertSame([], $params);
        $this->assertSame([
@ -198,7 +198,7 @@ final class AutoRouterImprovedTest extends CIUnitTestCase
            = $router->getRoute('subfolder/sub/mycontroller/somemethod', Method::GET);

        $this->assertSame('Subfolder/Sub/', $directory);
-        $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Sub\Mycontroller::class, $controller);
+        $this->assertSame('\\' . Controllers\Subfolder\Sub\Mycontroller::class, $controller);
        $this->assertSame('getSomemethod', $method);
        $this->assertSame([], $params);
    }
@ -212,7 +212,7 @@ final class AutoRouterImprovedTest extends CIUnitTestCase

        $this->assertSame('Dash_folder/', $directory);
        $this->assertSame(
-            '\\' . \CodeIgniter\Router\Controllers\Dash_folder\Mycontroller::class,
+            '\\' . Controllers\Dash_folder\Mycontroller::class,
            $controller
        );
        $this->assertSame('getSomemethod', $method);
@ -284,7 +284,7 @@ final class AutoRouterImprovedTest extends CIUnitTestCase
            = $router->getRoute('subfolder/15', Method::GET);

        $this->assertSame('Subfolder/', $directory);
-        $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Home::class, $controller);
+        $this->assertSame('\\' . Controllers\Subfolder\Home::class, $controller);
        $this->assertSame('getIndex', $method);
        $this->assertSame(['15'], $params);
        $this->assertSame([
@ -302,7 +302,7 @@ final class AutoRouterImprovedTest extends CIUnitTestCase
            = $router->getRoute('subfolder/15/20', Method::GET);

        $this->assertSame('Subfolder/', $directory);
-        $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Home::class, $controller);
+        $this->assertSame('\\' . Controllers\Subfolder\Home::class, $controller);
        $this->assertSame('getIndex', $method);
        $this->assertSame(['15', '20'], $params);
        $this->assertSame([
@ -320,7 +320,7 @@ final class AutoRouterImprovedTest extends CIUnitTestCase
            = $router->getRoute('subfolder', Method::GET);

        $this->assertSame('Subfolder/', $directory);
-        $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Home::class, $controller);
+        $this->assertSame('\\' . Controllers\Subfolder\Home::class, $controller);
        $this->assertSame('getIndex', $method);
        $this->assertSame([], $params);
        $this->assertSame([
@ -514,7 +514,7 @@ final class AutoRouterImprovedTest extends CIUnitTestCase
            'subfolder-controller-and-method-wz-dash' => [
                'subfolder/sub/blog-controller/some-method',
                'Subfolder/Sub/',
-                '\\' . \CodeIgniter\Router\Controllers\Subfolder\Sub\BlogController::class,
+                '\\' . Controllers\Subfolder\Sub\BlogController::class,
                'getSomeMethod',
                2,
                3,
@ -523,7 +523,7 @@ final class AutoRouterImprovedTest extends CIUnitTestCase
            'subfolder-wz-dash-controller-and-method-wz-dash' => [
                'sub-dir/blog-controller/some-method',
                'SubDir/',
-                '\\' . \CodeIgniter\Router\Controllers\SubDir\BlogController::class,
+                '\\' . Controllers\SubDir\BlogController::class,
                'getSomeMethod',
                1,
                2,
--- a/user_guide_src/source/changelogs/index.rst
+++ b/user_guide_src/source/changelogs/index.rst
@ -13,6 +13,7 @@ See all the changes.
    :titlesonly:

    v4.5.0
+    v4.4.5
    v4.4.4
    v4.4.3
    v4.4.2
--- a/user_guide_src/source/changelogs/v4.4.5.rst
+++ b/user_guide_src/source/changelogs/v4.4.5.rst
@ -0,0 +1,35 @@
+#############
+Version 4.4.5
+#############
+
+Release Date: Unreleased
+
+**4.4.5 release of CodeIgniter4**
+
+.. contents::
+    :local:
+    :depth: 3
+
+********
+BREAKING
+********
+
+***************
+Message Changes
+***************
+
+*******
+Changes
+*******
+
+************
+Deprecations
+************
+
+**********
+Bugs Fixed
+**********
+
+See the repo's
+`CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
+for a complete list of bugs fixed.
--- a/user_guide_src/source/installation/upgrade_445.rst
+++ b/user_guide_src/source/installation/upgrade_445.rst
@ -0,0 +1,54 @@
+#############################
+Upgrading from 4.4.4 to 4.4.5
+#############################
+
+Please refer to the upgrade instructions corresponding to your installation method.
+
+- :ref:`Composer Installation App Starter Upgrading <app-starter-upgrading>`
+- :ref:`Composer Installation Adding CodeIgniter4 to an Existing Project Upgrading <adding-codeigniter4-upgrading>`
+- :ref:`Manual Installation Upgrading <installing-manual-upgrading>`
+
+.. contents::
+    :local:
+    :depth: 2
+
+**********************
+Mandatory File Changes
+**********************
+
+****************
+Breaking Changes
+****************
+
+*********************
+Breaking Enhancements
+*********************
+
+*************
+Project Files
+*************
+
+Some files in the **project space** (root, app, public, writable) received updates. Due to
+these files being outside of the **system** scope they will not be changed without your intervention.
+
+There are some third-party CodeIgniter modules available to assist with merging changes to
+the project space: `Explore on Packagist <https://packagist.org/explore/?query=codeigniter4%20updates>`_.
+
+Content Changes
+===============
+
+The following files received significant changes (including deprecations or visual adjustments)
+and it is recommended that you merge the updated versions with your application:
+
+Config
+------
+
+- @TODO
+
+All Changes
+===========
+
+This is a list of all files in the **project space** that received changes;
+many will be simple comments or formatting that have no effect on the runtime:
+
+- @TODO
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@ -17,6 +17,7 @@ See also :doc:`./backward_compatibility_notes`.
    backward_compatibility_notes

    upgrade_450
+    upgrade_445
    upgrade_444
    upgrade_443
    upgrade_442
--- a/user_guide_src/source/models/entities/018.php
+++ b/user_guide_src/source/models/entities/018.php
@ -13,7 +13,7 @@ class MyEntity extends Entity

    // Bind the type to the handler
    protected $castHandlers = [
-        'base64' => \App\Entities\Cast\CastBase64::class,
+        'base64' => Cast\CastBase64::class,
    ];
 }