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

 Conflicts:
	user_guide_src/source/general/errors/010.php
	user_guide_src/source/general/errors/011.php

Author: kenjis

admin/pre-commit

@@ -20,22 +20,6 @@ if [ "$STAGED_PHP_FILES" != "" ]; then
     done
 fi
 
-if [ "$FILES" != "" ]; then
-    echo "Running PHPStan..."
-
-    # Run on whole codebase
-    if [ -d /proc/cygdrive ]; then
-        XDEBUG_MODE=off ./vendor/bin/phpstan analyse
-    else
-        XDEBUG_MODE=off php ./vendor/bin/phpstan analyse
-    fi
-
-    if [ $? != 0 ]; then
-        echo "Fix the phpstan error(s) before commit."
-        exit 1
-    fi
-fi
-
 if [ "$FILES" != "" ]; then
     echo "Running PHP CS Fixer..."
 

system/ThirdParty/Kint/Parser/Parser.php

@@ -374,7 +374,11 @@ private function parseArray(array &$var, Value $o): Value
             }
 
             $stash = $val;
-            $copy[$i] = $refmarker;
+            try {
+                $copy[$i] = $refmarker;
+            } catch (TypeError $e) {
+                $child->reference = true;
+            }
             if ($val === $refmarker) {
                 $child->reference = true;
                 $val = $stash;

user_guide_src/source/general/errors.rst

@@ -109,7 +109,7 @@ forcing a redirect to a specific route or URL:
 
 .. literalinclude:: errors/010.php
 
-``$route`` may be a named route, relative URI, or a complete URL. You can also supply a
+``$uri`` may be a URI path relative to baseURL, or a complete URL. You can also supply a
 redirect code to use instead of the default (``302``, "temporary redirect"):
 
 .. literalinclude:: errors/011.php

user_guide_src/source/general/errors/010.php

@@ -1,3 +1,3 @@
 <?php
 
-throw new \CodeIgniter\HTTP\Exceptions\RedirectException($route);
+throw new \CodeIgniter\HTTP\Exceptions\RedirectException($uri);

user_guide_src/source/general/errors/011.php

@@ -1,3 +1,3 @@
 <?php
 
-throw new \CodeIgniter\HTTP\Exceptions\RedirectException($route, 301);
+throw new \CodeIgniter\HTTP\Exceptions\RedirectException($uri, 301);