Merge pull request #7271 from codeigniter4/develop

4.3.2 Ready code
codeigniter4 · Feb 18, 2023 · ba75eed · ba75eed
2 parents cc14fdd + 586a0a2
commit ba75eed
Show file tree

Hide file tree

Showing 183 changed files with 2,792 additions and 1,341 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/admin/framework/.github/workflows/close-pull-request.yml b/admin/framework/.github/workflows/close-pull-request.yml
@@ -2,17 +2,23 @@ name: Close Pull Request
 
 on:
   pull_request_target:
-    types: [opened]
+    types: [opened, reopened]
+
+permissions:
+  pull-requests: write
 
 jobs:
   main:
     runs-on: ubuntu-latest
     steps:
       - name: Close PR with nice message
-        uses: superbrothers/close-pull-request@v3
-        with:
-          comment: >
+        run: gh pr close ${{ env.ISSUE }} -c "${{ env.COMMENT }}"
+        working-directory: ${{ github.workspace }}
+        env:
+          COMMENT: >
             Thank you for your pull request. However, you have submitted your PR on a read-only
-            split of `codeigniter4/CodeIgniter4`. This repository, unfortunately, does
+            split of <code>codeigniter4/CodeIgniter4</code>. This repository, unfortunately, does
             not accept PRs. Please submit your PR at https://github.com/codeigniter4/CodeIgniter4
             repository.<br/><br/>Thank you.
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ISSUE: ${{ github.event.pull_request.html_url }}
diff --git a/admin/framework/composer.json b/admin/framework/composer.json
@@ -13,7 +13,7 @@
         "psr/log": "^1.1"
     },
     "require-dev": {
-        "kint-php/kint": "^5.0.1",
+        "kint-php/kint": "^5.0.3",
         "codeigniter/coding-standard": "^1.5",
         "fakerphp/faker": "^1.9",
         "friendsofphp/php-cs-fixer": "3.13.0",
@@ -42,6 +42,11 @@
         "ext-fileinfo": "Improves mime type detection for files",
         "ext-readline": "Improves CLI::input() usability"
     },
+    "config": {
+        "optimize-autoloader": true,
+        "preferred-install": "dist",
+        "sort-packages": true
+    },
     "autoload": {
         "psr-4": {
             "CodeIgniter\\": "system/"
@@ -51,9 +56,6 @@
         ]
     },
     "scripts": {
-        "post-update-cmd": [
-            "CodeIgniter\\ComposerScripts::postUpdate"
-        ],
         "test": "phpunit"
     },
     "support": {

diff --git a/admin/starter/.github/workflows/close-pull-request.yml b/admin/starter/.github/workflows/close-pull-request.yml
@@ -2,17 +2,23 @@ name: Close Pull Request
 
 on:
   pull_request_target:
-    types: [opened]
+    types: [opened, reopened]
+
+permissions:
+  pull-requests: write
 
 jobs:
   main:
     runs-on: ubuntu-latest
     steps:
       - name: Close PR with nice message
-        uses: superbrothers/close-pull-request@v3
-        with:
-          comment: >
+        run: gh pr close ${{ env.ISSUE }} -c "${{ env.COMMENT }}"
+        working-directory: ${{ github.workspace }}
+        env:
+          COMMENT: >
             Thank you for your pull request. However, you have submitted your PR on a read-only
-            split of `codeigniter4/CodeIgniter4`. This repository, unfortunately, does
+            split of <code>codeigniter4/CodeIgniter4</code>. This repository, unfortunately, does
             not accept PRs. Please submit your PR at https://github.com/codeigniter4/CodeIgniter4
             repository.<br/><br/>Thank you.
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ISSUE: ${{ github.event.pull_request.html_url }}
diff --git a/admin/starter/composer.json b/admin/starter/composer.json
@@ -13,8 +13,10 @@
         "mikey179/vfsstream": "^1.6",
         "phpunit/phpunit": "^9.1"
     },
-    "suggest": {
-        "ext-fileinfo": "Improves mime type detection for files"
+    "config": {
+        "optimize-autoloader": true,
+        "preferred-install": "dist",
+        "sort-packages": true
     },
     "autoload": {
         "exclude-from-classmap": [

diff --git a/admin/userguide/.github/workflows/close-pull-request.yml b/admin/userguide/.github/workflows/close-pull-request.yml
@@ -2,17 +2,23 @@ name: Close Pull Request
 
 on:
   pull_request_target:
-    types: [opened]
+    types: [opened, reopened]
+
+permissions:
+  pull-requests: write
 
 jobs:
   main:
     runs-on: ubuntu-latest
     steps:
       - name: Close PR with nice message
-        uses: superbrothers/close-pull-request@v3
-        with:
-          comment: >
+        run: gh pr close ${{ env.ISSUE }} -c "${{ env.COMMENT }}"
+        working-directory: ${{ github.workspace }}
+        env:
+          COMMENT: >
             Thank you for your pull request. However, you have submitted your PR on a read-only
-            split of `codeigniter4/CodeIgniter4`. This repository, unfortunately, does
+            split of <code>codeigniter4/CodeIgniter4</code>. This repository, unfortunately, does
             not accept PRs. Please submit your PR at https://github.com/codeigniter4/CodeIgniter4
             repository.<br/><br/>Thank you.
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ISSUE: ${{ github.event.pull_request.html_url }}
diff --git a/app/Config/App.php b/app/Config/App.php
@@ -12,15 +12,10 @@ class App extends BaseConfig
      * Base Site URL
      * --------------------------------------------------------------------------
      *
-     * URL to your CodeIgniter root. Typically this will be your base URL,
+     * URL to your CodeIgniter root. Typically, this will be your base URL,
      * WITH a trailing slash:
      *
      *    http://example.com/
-     *
-     * If this is not set then CodeIgniter will try guess the protocol, domain
-     * and path to your installation. However, you should always configure this
-     * explicitly and never rely on auto-guessing, especially in production
-     * environments.
      */
     public string $baseURL = 'http://localhost:8080/';
 

diff --git a/app/Config/Mimes.php b/app/Config/Mimes.php
@@ -53,6 +53,8 @@ class Mimes
         'lzh' => 'application/octet-stream',
         'exe' => [
             'application/octet-stream',
+            'application/vnd.microsoft.portable-executable',
+            'application/x-dosexec',
             'application/x-msdownload',
         ],
         'class' => 'application/octet-stream',

diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
@@ -1,4 +1,9 @@
-<?php $error_id = uniqid('error', true); ?>
+<?php
+use Config\Services;
+use CodeIgniter\CodeIgniter;
+
+$errorId = uniqid('error', true);
+?>
 <!doctype html>
 <html>
 <head>
@@ -77,16 +82,16 @@
                             <?php if (isset($row['class'])) : ?>
                                 &nbsp;&nbsp;&mdash;&nbsp;&nbsp;<?= esc($row['class'] . $row['type'] . $row['function']) ?>
                                 <?php if (! empty($row['args'])) : ?>
-                                    <?php $args_id = $error_id . 'args' . $index ?>
-                                    ( <a href="#" onclick="return toggle('<?= esc($args_id, 'attr') ?>');">arguments</a> )
-                                    <div class="args" id="<?= esc($args_id, 'attr') ?>">
+                                    <?php $argsId = $errorId . 'args' . $index ?>
+                                    ( <a href="#" onclick="return toggle('<?= esc($argsId, 'attr') ?>');">arguments</a> )
+                                    <div class="args" id="<?= esc($argsId, 'attr') ?>">
                                         <table cellspacing="0">
 
                                         <?php
                                         $params = null;
                                         // Reflection by name is not available for closure function
                                         if (substr($row['function'], -1) !== '}') {
-                                            $mirror = isset($row['class']) ? new \ReflectionMethod($row['class'], $row['function']) : new \ReflectionFunction($row['function']);
+                                            $mirror = isset($row['class']) ? new ReflectionMethod($row['class'], $row['function']) : new ReflectionFunction($row['function']);
                                             $params = $mirror->getParameters();
                                         }
 
@@ -189,7 +194,7 @@
 
             <!-- Request -->
             <div class="content" id="request">
-                <?php $request = \Config\Services::request(); ?>
+                <?php $request = Services::request(); ?>
 
                 <table>
                     <tbody>
@@ -283,21 +288,11 @@
                             </tr>
                         </thead>
                         <tbody>
-                        <?php foreach ($headers as $value) : ?>
-                            <?php
-                            if (empty($value)) {
-                                continue;
-                            }
-
-                            if (! is_array($value)) {
-                                $value = [$value];
-                            } ?>
-                            <?php foreach ($value as $h) : ?>
-                                <tr>
-                                    <td><?= esc($h->getName(), 'html') ?></td>
-                                    <td><?= esc($h->getValueLine(), 'html') ?></td>
-                                </tr>
-                            <?php endforeach; ?>
+                        <?php foreach ($headers as $header) : ?>
+                            <tr>
+                                <td><?= esc($header->getName(), 'html') ?></td>
+                                <td><?= esc($header->getValueLine(), 'html') ?></td>
+                            </tr>
                         <?php endforeach; ?>
                         </tbody>
                     </table>
@@ -307,7 +302,7 @@
 
             <!-- Response -->
             <?php
-                $response = \Config\Services::response();
+                $response = Services::response();
                 $response->setStatusCode(http_response_code());
             ?>
             <div class="content" id="response">
@@ -332,7 +327,7 @@
                             </tr>
                         </thead>
                         <tbody>
-                        <?php foreach ($headers as $name => $value) : ?>
+                        <?php foreach (array_keys($headers) as $name) : ?>
                             <tr>
                                 <td><?= esc($name, 'html') ?></td>
                                 <td><?= esc($response->getHeaderLine($name), 'html') ?></td>
@@ -387,7 +382,7 @@
             <p>
                 Displayed at <?= esc(date('H:i:sa')) ?> &mdash;
                 PHP: <?= esc(PHP_VERSION) ?>  &mdash;
-                CodeIgniter: <?= esc(\CodeIgniter\CodeIgniter::CI_VERSION) ?>
+                CodeIgniter: <?= esc(CodeIgniter::CI_VERSION) ?>
             </p>
 
         </div>

diff --git a/changelogs/CHANGELOG_4.0.md b/changelogs/CHANGELOG_4.0.md
@@ -1,4 +1,4 @@
-# Changelog
+# Changelog 4.0
 
 ## [v4.0.5](https://github.com/codeigniter4/CodeIgniter4/tree/v4.0.5) (2021-01-31)
 

diff --git a/changelogs/CHANGELOG_4.1.md b/changelogs/CHANGELOG_4.1.md
@@ -1,4 +1,4 @@
-# Changelog
+# Changelog 4.1
 
 ## [v4.1.9](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.9) (2022-02-25)