Update CI and adjacent packages

jsnmrs · Mar 29, 2024 · ef21dc1 · ef21dc1
1 parent be26b30
commit ef21dc1
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 92 deletions.
diff --git a/app/Config/App.php b/app/Config/App.php
@@ -60,6 +60,30 @@ class App extends BaseConfig
      */
     public string $uriProtocol = 'REQUEST_URI';
 
+    /*
+    |--------------------------------------------------------------------------
+    | Allowed URL Characters
+    |--------------------------------------------------------------------------
+    |
+    | This lets you specify which characters are permitted within your URLs.
+    | When someone tries to submit a URL with disallowed characters they will
+    | get a warning message.
+    |
+    | As a security measure you are STRONGLY encouraged to restrict URLs to
+    | as few characters as possible.
+    |
+    | By default, only these are allowed: `a-z 0-9~%.:_-`
+    |
+    | Set an empty string to allow all characters -- but only if you are insane.
+    |
+    | The configured value is actually a regular expression character group
+    | and it will be used as: '/\A[<permittedURIChars>]+\z/iu'
+    |
+    | DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!
+    |
+    */
+    public string $permittedURIChars = 'a-z 0-9~%.:_\-';
+
     /**
      * --------------------------------------------------------------------------
      * Default Locale

diff --git a/app/Views/errors/html/debug.css b/app/Views/errors/html/debug.css
@@ -19,7 +19,6 @@ body {
 }
 h1 {
     font-weight: lighter;
-    letter-spacing: 0.8;
     font-size: 3rem;
     color: var(--dark-text-color);
     margin: 0;
@@ -44,7 +43,7 @@ p.lead {
     color: var(--dark-text-color);
 }
 .header .container {
-    padding: 1rem 1.75rem 1.75rem 1.75rem;
+    padding: 1rem;
 }
 .header h1 {
     font-size: 2.5rem;
@@ -65,14 +64,11 @@ p.lead {
     display: inline;
 }
 
-.footer {
+.environment {
     background: var(--dark-bg-color);
     color: var(--light-text-color);
-}
-.footer .container {
-    border-top: 1px solid #e7e7e7;
-    margin-top: 1rem;
     text-align: center;
+    padding: 0.2rem;
 }
 
 .source {
@@ -112,7 +108,7 @@ p.lead {
 }
 .tabs a:link,
 .tabs a:visited {
-    padding: 0rem 1rem;
+    padding: 0 1rem;
     line-height: 2.7;
     text-decoration: none;
     color: var(--dark-text-color);
@@ -152,9 +148,6 @@ p.lead {
     border-radius: 5px;
     color: #31708f;
 }
-ul, ol {
-    line-height: 1.8;
-}
 
 table {
     width: 100%;

diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
@@ -1,6 +1,6 @@
 <?php
-use CodeIgniter\CodeIgniter;
 use Config\Services;
+use CodeIgniter\CodeIgniter;
 
 $errorId = uniqid('error', true);
 ?>
@@ -23,6 +23,12 @@
 
     <!-- Header -->
     <div class="header">
+        <div class="environment">
+            Displayed at <?= esc(date('H:i:sa')) ?> &mdash;
+            PHP: <?= esc(PHP_VERSION) ?>  &mdash;
+            CodeIgniter: <?= esc(CodeIgniter::CI_VERSION) ?> --
+            Environment: <?= ENVIRONMENT ?>
+        </div>
         <div class="container">
             <h1><?= esc($title), esc($exception->getCode() ? ' #' . $exception->getCode() : '') ?></h1>
             <p>
@@ -48,9 +54,9 @@
         <?php
         $last = $exception;
 
-while ($prevException = $last->getPrevious()) {
-    $last = $prevException;
-    ?>
+        while ($prevException = $last->getPrevious()) {
+            $last = $prevException;
+            ?>
 
     <pre>
     Caused by:
@@ -63,8 +69,8 @@
     </pre>
 
         <?php
-}
-?>
+        }
+        ?>
     </div>
 
     <?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE) : ?>
@@ -92,12 +98,12 @@
                             <!-- Trace info -->
                             <?php if (isset($row['file']) && is_file($row['file'])) : ?>
                                 <?php
-                        if (isset($row['function']) && in_array($row['function'], ['include', 'include_once', 'require', 'require_once'], true)) {
-                            echo esc($row['function'] . ' ' . clean_path($row['file']));
-                        } else {
-                            echo esc(clean_path($row['file']) . ' : ' . $row['line']);
-                        }
-                    ?>
+                                if (isset($row['function']) && in_array($row['function'], ['include', 'include_once', 'require', 'require_once'], true)) {
+                                    echo esc($row['function'] . ' ' . clean_path($row['file']));
+                                } else {
+                                    echo esc(clean_path($row['file']) . ' : ' . $row['line']);
+                                }
+                                ?>
                             <?php else: ?>
                                 {PHP internal code}
                             <?php endif; ?>
@@ -112,14 +118,14 @@
                                         <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']);
-                                        $params = $mirror->getParameters();
-                                    }
-
-                                    foreach ($row['args'] as $key => $value) : ?>
+                                        $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']);
+                                            $params = $mirror->getParameters();
+                                        }
+
+                                        foreach ($row['args'] as $key => $value) : ?>
                                             <tr>
                                                 <td><code><?= esc(isset($params[$key]) ? '$' . $params[$key]->name : "#{$key}") ?></code></td>
                                                 <td><pre><?= esc(print_r($value, true)) ?></pre></td>
@@ -327,8 +333,8 @@
             <!-- Response -->
             <?php
                 $response = Services::response();
-$response->setStatusCode(http_response_code());
-?>
+                $response->setStatusCode(http_response_code());
+            ?>
             <div class="content" id="response">
                 <table>
                     <tr>
@@ -401,18 +407,5 @@
     </div> <!-- /container -->
     <?php endif; ?>
 
-    <div class="footer">
-        <div class="container">
-
-            <p>
-                Displayed at <?= esc(date('H:i:sa')) ?> &mdash;
-                PHP: <?= esc(PHP_VERSION) ?>  &mdash;
-                CodeIgniter: <?= esc(CodeIgniter::CI_VERSION) ?> --
-                Environment: <?= ENVIRONMENT ?>
-            </p>
-
-        </div>
-    </div>
-
 </body>
 </html>
diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
   "require": {
     "php": "^8.1",
     "codeigniter4/framework": "^4.4",
-    "friendsofphp/php-cs-fixer": "^3.51",
+    "friendsofphp/php-cs-fixer": "^3.52",
     "nexusphp/cs-config": "^3.22",
     "nikic/php-parser": "^5.0",
     "pdepend/pdepend": "^2.16",