Merge branch 'develop' of github.com:bcit-ci/CodeIgniter4 into develop

Author: lonnieezell

system/Debug/Toolbar.php

@@ -230,6 +230,13 @@ protected static function format(string $data, string $format = 'html')
 
 		for ($i = 0; $i < $total; $i++)
 		{
+                        // Oldest files will be deleted
+			if ($app->toolbarMaxHistory >= 0 && $i+1 > $app->toolbarMaxHistory)
+			{
+				unlink($filenames[$i]);
+				continue;
+                        }
+
 			// Get the contents of this specific history request
 			ob_start();
 			include($filenames[$i]);
@@ -239,7 +246,7 @@ protected static function format(string $data, string $format = 'html')
 			$file = json_decode($contents, true);
 
 			// Debugbar files shown in History Collector
-			$files[$i] = [
+			$files[] = [
 				'time'        => (int)$time = substr($filenames[$i], -10),
 				'datetime'    => date('Y-m-d H:i:s', $time),
 				'active'      => (int)($time == $current),
@@ -249,13 +256,6 @@ protected static function format(string $data, string $format = 'html')
 				'isAJAX'      => $file['isAJAX'] ? 'Yes' : 'No',
 				'contentType' => $file['vars']['response']['contentType'],
 			];
-
-			// Oldest files will be deleted
-			if ($app->toolbarMaxHistory >= 0 && $i >= $app->toolbarMaxHistory)
-			{
-				unlink($filenames[$i]);
-				continue;
-			}
 		}
 
 		// Set the History here. Class is not necessary

system/Helpers/form_helper.php

@@ -58,12 +58,10 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s
 		// If no action is provided then set to the current url
 		if ( ! $action)
 		{
-			helper('url');
 			$action = current_url(true);
 		} // If an action is not a full URL then turn it into one
 		elseif (strpos($action, '://') === false)
 		{
-			helper('url');
 			$action = site_url($action);
 		}
 

system/View/Parser.php

@@ -297,25 +297,6 @@ protected function parse(string $template, array $data = [], array $options = nu
 	}
 
 	//--------------------------------------------------------------------
-//FIXME the following method does not appear to be used anywhere, so commented out
-//	protected function is_assoc($arr)
-//	{
-//		return array_keys($arr) !== range(0, count($arr) - 1);
-//	}
-	//--------------------------------------------------------------------
-//FIXME the following method does not appear to be used anywhere, so commented out
-//	function strpos_all($haystack, $needle)
-//	{
-//		$offset = 0;
-//		$allpos = [];
-//		while (($pos = strpos($haystack, $needle, $offset)) !== FALSE)
-//		{
-//			$offset = $pos + 1;
-//			$allpos[] = $pos;
-//		}
-//		return $allpos;
-//	}
-	//--------------------------------------------------------------------
 
 	/**
 	 * Parse a single key/value, extracting it

system/View/Plugins.php

@@ -45,12 +45,6 @@ class Plugins
 	 */
 	public static function currentURL(array $params = [])
 	{
-		if ( ! function_exists('current_url'))
-			// can't unit test this since it is loaded in CIUnitTestCase setup
-			// @codeCoverageIgnoreStart
-			helper('url');
-			// @codeCoverageIgnoreEnd
-
 		return current_url();
 	}
 
@@ -63,12 +57,6 @@ public static function currentURL(array $params = [])
 	 */
 	public static function previousURL(array $params = [])
 	{
-		if ( ! function_exists('previous_url'))
-			// can't unit test this since it is loaded in CIUnitTestCase setup
-			// @codeCoverageIgnoreStart
-			helper('url');
-			// @codeCoverageIgnoreEnd
-
 		return previous_url();
 	}
 
@@ -81,12 +69,6 @@ public static function previousURL(array $params = [])
 	 */
 	public static function mailto(array $params = [])
 	{
-		if ( ! function_exists('mailto'))
-			// can't unit test this since it is loaded in CIUnitTestCase setup
-			// @codeCoverageIgnoreStart
-			helper('url');
-			// @codeCoverageIgnoreEnd
-
 		$email = $params['email'] ?? '';
 		$title = $params['title'] ?? '';
 		$attrs = $params['attributes'] ?? '';
@@ -103,12 +85,6 @@ public static function mailto(array $params = [])
 	 */
 	public static function safeMailto(array $params = [])
 	{
-		if ( ! function_exists('safe_mailto'))
-			// can't unit test this since it is loaded in CIUnitTestCase setup
-			// @codeCoverageIgnoreStart
-			helper('url');
-			// @codeCoverageIgnoreEnd
-
 		$email = $params['email'] ?? '';
 		$title = $params['title'] ?? '';
 		$attrs = $params['attributes'] ?? '';