Merge branch 'codeigniter4:develop' into feat-4.5-lang-finder

Author: neznaika0

.github/workflows/deploy-apidocs.yml

@@ -29,12 +29,12 @@ jobs:
           git config --global user.name "${GITHUB_ACTOR}"
 
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: source
 
       - name: Checkout target
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: codeigniter4/api
           token: ${{ secrets.ACCESS_TOKEN }}

.github/workflows/deploy-distributables.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0 # fetch all tags
 
@@ -48,12 +48,12 @@ jobs:
           git config --global user.name "${GITHUB_ACTOR}"
 
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: source
 
       - name: Checkout target
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: codeigniter4/framework
           token: ${{ secrets.ACCESS_TOKEN }}
@@ -98,12 +98,12 @@ jobs:
           git config --global user.name "${GITHUB_ACTOR}"
 
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: source
 
       - name: Checkout target
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: codeigniter4/appstarter
           token: ${{ secrets.ACCESS_TOKEN }}
@@ -148,12 +148,12 @@ jobs:
           git config --global user.name "${GITHUB_ACTOR}"
 
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: source
 
       - name: Checkout target
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: codeigniter4/userguide
           token: ${{ secrets.ACCESS_TOKEN }}

.github/workflows/deploy-userguide-latest.yml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/reusable-coveralls.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/reusable-phpunit-test.yml

@@ -149,7 +149,7 @@ jobs:
           sudo apt-get install --fix-broken
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/reusable-serviceless-phpunit-test.yml

@@ -61,7 +61,7 @@ jobs:
           sudo apt-get install --fix-broken
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/test-autoreview.yml

@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/test-coding-standards.yml

@@ -33,7 +33,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/test-deptrac.yml

@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/test-phpcpd.yml

@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/test-phpstan.yml

@@ -44,7 +44,7 @@ jobs:
       fail-fast: false
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/test-psalm.yml

@@ -28,7 +28,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/test-rector.yml

@@ -53,7 +53,7 @@ jobs:
           - utils
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/test-scss.yml

@@ -33,7 +33,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node
         uses: actions/[email protected]

.github/workflows/test-userguide.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Detect usage of tabs in RST files
         run: php utils/check_tabs_in_rst.php

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [v4.4.1](https://github.com/codeigniter4/CodeIgniter4/tree/v4.4.1) (2023-09-05)
+[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.4.0...v4.4.1)
+
+### Fixed Bugs
+
+* docs: add missing Config updates for Hot Reloading by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7862
+* fix: auto route legacy does not work by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7871
+* fix: Factories may not return shared instance by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7868
+* fix: replace `config(DocTypes::class)` with `new DocTypes()` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7872
+* fix: FeatureTest may cause risky tests by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7867
+* fix: reverse routing causes ErrorException by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7880
+* fix: Email library forces to switch to TLS when setting port 465 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7883
+* fix: [DebugBar] make CSS rotate class less broad by @sanchawebo in https://github.com/codeigniter4/CodeIgniter4/pull/7882
+* fix: FeatureTest fails when forceGlobalSecureRequests is true by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7890
+
 ## [v4.4.0](https://github.com/codeigniter4/CodeIgniter4/tree/v4.4.0) (2023-08-25)
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.3.8...v4.4.0)
 

admin/RELEASE.md

@@ -79,7 +79,7 @@ the existing content.
   * fill in the "All Changes" section, and add it to **upgrading.rst**
     * git diff --name-status origin/master -- . ':!system'
   * Remove the section titles that have no items
-  * Update the "from" version in the title. E.g., `from 4.3.x` → `from 4.3.8`
+  * [Minor version only] Update the "from" version in the title. E.g., `from 4.3.x` → `from 4.3.8`
 * Commit the changes with `Prep for 4.x.x release` and push to origin
 * Create a new PR from `release-4.x.x` to `develop`:
   * Title: `Prep for 4.x.x release`

admin/css/debug-toolbar/toolbar.scss

@@ -202,6 +202,15 @@
         // Give room for OS X scrollbar
         white-space: nowrap;
         z-index: 10000;
+        // Endless rotate
+        .rotate {
+            animation: toolbar-rotate 9s linear infinite;
+        }
+        @keyframes toolbar-rotate {
+            to {
+                transform: rotate(360deg);
+            }
+        }
     }
 
     // Fixed top
@@ -501,13 +510,3 @@
 .debug-bar-noverflow {
     overflow: hidden;
 }
-
-/* ENDLESS ROTATE */
-.rotate {
-    animation: rotate 9s linear infinite;
-}
-@keyframes rotate {
-    to {
-        transform: rotate(360deg);
-    }
-}

app/Config/Email.php

@@ -56,7 +56,11 @@ class Email extends BaseConfig
     public bool $SMTPKeepAlive = false;
 
     /**
-     * SMTP Encryption. Either tls or ssl
+     * SMTP Encryption.
+     *
+     * @var string '', 'tls' or 'ssl'. 'tls' will issue a STARTTLS command
+     *             to the server. 'ssl' means implicit SSL. Connection on port
+     *             465 should set this to ''.
      */
     public string $SMTPCrypto = 'tls';
 

system/CodeIgniter.php

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

system/Debug/Toolbar/Views/toolbar.css

@@ -140,6 +140,14 @@
   white-space: nowrap;
   z-index: 10000;
 }
+#debug-bar .toolbar .rotate {
+  animation: toolbar-rotate 9s linear infinite;
+}
+@keyframes toolbar-rotate {
+  to {
+    transform: rotate(360deg);
+  }
+}
 #debug-bar.fixed-top {
   bottom: auto;
   top: 0;
@@ -796,14 +804,3 @@
 .debug-bar-noverflow {
   overflow: hidden;
 }
-
-/* ENDLESS ROTATE */
-.rotate {
-  animation: rotate 9s linear infinite;
-}
-
-@keyframes rotate {
-  to {
-    transform: rotate(360deg);
-  }
-}

system/Email/Email.php

@@ -113,7 +113,9 @@ class Email
     /**
      * SMTP Encryption
      *
-     * @var string Empty, 'tls' or 'ssl'
+     * @var string '', 'tls' or 'ssl'. 'tls' will issue a STARTTLS command
+     *             to the server. 'ssl' means implicit SSL. Connection on port
+     *             465 should set this to ''.
      */
     public $SMTPCrypto = '';
 
@@ -1868,9 +1870,13 @@ protected function SMTPConnect()
 
         $ssl = '';
 
+        // Connection to port 465 should use implicit TLS (without STARTTLS)
+        // as per RFC 8314.
         if ($this->SMTPPort === 465) {
             $ssl = 'tls://';
-        } elseif ($this->SMTPCrypto === 'ssl') {
+        }
+        // But if $SMTPCrypto is set to `ssl`, SSL can be used.
+        if ($this->SMTPCrypto === 'ssl') {
             $ssl = 'ssl://';
         }