From dd8551e3c4b415a3ac4031f4d2aa0e57b8721028 Mon Sep 17 00:00:00 2001
From: Natan Felles <natanfelles@gmail.com>
Date: Sun, 24 Dec 2017 05:32:01 -0200
Subject: [PATCH 01/69] Escape Forge attributes

---
 system/Database/Forge.php        | 2 +-
 system/Database/MySQLi/Forge.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index d7b7eb5a87ee..f3cdc1cbacc0 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -528,7 +528,7 @@ protected function _createTableAttributes($attributes)
 		{
 			if (is_string($key))
 			{
-				$sql .= ' ' . strtoupper($key) . ' ' . $attributes[$key];
+				$sql .= ' ' . strtoupper($key) . ' ' . $this->db->escape($attributes[$key]);
 			}
 		}
 
diff --git a/system/Database/MySQLi/Forge.php b/system/Database/MySQLi/Forge.php
index 79093694aefa..562ae19b24be 100644
--- a/system/Database/MySQLi/Forge.php
+++ b/system/Database/MySQLi/Forge.php
@@ -55,7 +55,7 @@ class Forge extends \CodeIgniter\Database\Forge
 	 * @var    string
 	 */
 	protected $dropConstraintStr = 'ALTER TABLE %s DROP FOREIGN KEY %s';
-        
+
 	/**
 	 * CREATE TABLE keys flag
 	 *
@@ -109,18 +109,18 @@ protected function _createTableAttributes($attributes)
 		{
 			if (is_string($key))
 			{
-				$sql .= ' ' . strtoupper($key) . ' = ' . $attributes[$key];
+				$sql .= ' ' . strtoupper($key) . ' = ' . $this->db->escape($attributes[$key]);
 			}
 		}
 
 		if ( ! empty($this->db->charset) && ! strpos($sql, 'CHARACTER SET') && ! strpos($sql, 'CHARSET'))
 		{
-			$sql .= ' DEFAULT CHARACTER SET = ' . $this->db->charset;
+			$sql .= ' DEFAULT CHARACTER SET = ' . $this->db->escape($this->db->charset);
 		}
 
 		if ( ! empty($this->db->DBCollat) && ! strpos($sql, 'COLLATE'))
 		{
-			$sql .= ' COLLATE = ' . $this->db->DBCollat;
+			$sql .= ' COLLATE = ' . $this->db->escape($this->db->DBCollat);
 		}
 
 		return $sql;

From 2a181d1e66e9c596f0dac9a9e7ff43d4a5b62c52 Mon Sep 17 00:00:00 2001
From: Natan Felles <natanfelles@gmail.com>
Date: Sun, 24 Dec 2017 07:48:23 -0200
Subject: [PATCH 02/69] Test Forge createTable with attributes

---
 system/Database/Postgre/Forge.php        | 13 +++++++++++++
 tests/system/Database/Live/ForgeTest.php | 18 ++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/system/Database/Postgre/Forge.php b/system/Database/Postgre/Forge.php
index ebfbe14a31d6..e5a0ac4fa0f0 100644
--- a/system/Database/Postgre/Forge.php
+++ b/system/Database/Postgre/Forge.php
@@ -76,6 +76,19 @@ class Forge extends \CodeIgniter\Database\Forge
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * CREATE TABLE attributes
+	 *
+	 * @param	array	$attributes	Associative array of table attributes
+	 * @return	string
+	 */
+	protected function _createTableAttributes($attributes)
+	{
+		return '';
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * ALTER TABLE
 	 *
diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 143683ac5664..411e90d0c90e 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -37,6 +37,24 @@ public function testCreateTable()
 		$this->assertTrue($exist);
 	}
 
+	public function testCreateTableWithAttributes()
+	{
+		$this->forge->dropTable('forge_test_attributes', true);
+
+		$this->forge->addField('id');
+
+		$attributes = [
+			'comment' => "Forge's Test"
+		];
+
+		$this->forge->createTable('forge_test_attributes', false, $attributes);
+
+		$exist = $this->db->tableExists('forge_test_attributes');
+		$this->forge->dropTable('forge_test_attributes', true, true);
+
+		$this->assertTrue($exist);
+	}
+
 	public function testAddFields()
 	{
 

From 684cfbb028806fdfb1ccb3f9b65ab447fcb6f635 Mon Sep 17 00:00:00 2001
From: Natan Felles <natanfelles@gmail.com>
Date: Wed, 25 Apr 2018 22:09:34 -0300
Subject: [PATCH 03/69] Add default namespace in the migration example doc

---
 user_guide_src/source/database/migration.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/database/migration.rst b/user_guide_src/source/database/migration.rst
index 0557ea6aa54f..3a4626fe3c3e 100644
--- a/user_guide_src/source/database/migration.rst
+++ b/user_guide_src/source/database/migration.rst
@@ -54,7 +54,7 @@ migrations go in the **application/Database/Migrations/** directory and have nam
 as *20121031100537_Add_blog.php*.
 ::
 
-	<?php
+	<?php namespace App\Database\Migrations;
 
 	class Migration_Add_blog extends \CodeIgniter\Database\Migration {
 

From a58570266f6045fa42bfff6db3cef7fa8a1f9d66 Mon Sep 17 00:00:00 2001
From: vibbow <vibbow@hotmail.com>
Date: Mon, 25 Jun 2018 19:45:03 +0800
Subject: [PATCH 04/69] Update Logger to cache log handler.

---
 system/Log/Logger.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/system/Log/Logger.php b/system/Log/Logger.php
index 4de39d1bc869..36cfec803399 100644
--- a/system/Log/Logger.php
+++ b/system/Log/Logger.php
@@ -364,10 +364,14 @@ public function log($level, $message, array $context = []): bool
 
 		foreach ($this->handlerConfig as $className => $config)
 		{
+			if ( ! array_key_exists($className, $this->handlers)) {
+				$this->handlers[$className] = new $className($config);
+			}
+			
 			/**
 			 * @var \CodeIgniter\Log\Handlers\HandlerInterface
 			 */
-			$handler = new $className($config);
+			$handler = $this->handlers[$className];
 
 			if ( ! $handler->canHandle($level))
 			{

From e55cae1e145bcd8853742478eaafe336ea9f9153 Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Wed, 27 Jun 2018 08:28:09 -0700
Subject: [PATCH 05/69] Form helper testing

---
 system/Helpers/form_helper.php          |   2 +-
 tests/system/Helpers/FormHelperTest.php | 913 +++++++++++++-----------
 2 files changed, 496 insertions(+), 419 deletions(-)

diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
index dcb7ab750d7e..8705082f2452 100644
--- a/system/Helpers/form_helper.php
+++ b/system/Helpers/form_helper.php
@@ -82,7 +82,7 @@ function form_open(string $action = '', array $attributes = [], array $hidden =
 		$form = '<form action="' . $action . '"' . $attributes . ">\n";
 
 		// Add CSRF field if enabled, but leave it out for GET requests and requests to external websites
-		$before = (new \Config\Filters())->globals['before'];
+		$before = Services::filters()->getFilters()['before'];
 
 		if ((in_array('csrf', $before) || array_key_exists('csrf', $before)) && strpos($action, base_url()) !== false && ! stripos($form, 'method="get"')
 		)
diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php
index 955ee82850db..560b1d8e3b87 100644
--- a/tests/system/Helpers/FormHelperTest.php
+++ b/tests/system/Helpers/FormHelperTest.php
@@ -1,4 +1,6 @@
-<?php namespace CodeIgniter\Helpers;
+<?php
+
+namespace CodeIgniter\Helpers;
 
 use CodeIgniter\HTTP\URI;
 use Config\App;
@@ -7,25 +9,27 @@
 
 class FormHelperTest extends \CIUnitTestCase
 {
-    public function setUp()
-    {
-	    parent::setUp();
-
-        helper('form');
-    }
-    // ------------------------------------------------------------------------
-    public function testFormOpenBasic()
-    {
-        $config = new App();
-        $config->baseURL = '';
-        $config->indexPage = 'index.php';
-        $request = Services::request($config);
-        $request->uri = new URI('http://example.com/');
-
-        Services::injectMock('request', $request);
+
+	public function setUp()
+	{
+		parent::setUp();
+
+		helper('form');
+	}
+
+	// ------------------------------------------------------------------------
+	public function testFormOpenBasic()
+	{
+		$config = new App();
+		$config->baseURL = '';
+		$config->indexPage = 'index.php';
+		$request = Services::request($config);
+		$request->uri = new URI('http://example.com/');
+
+		Services::injectMock('request', $request);
 
 		$before = (new Filters())->globals['before'];
-		if (in_array('csrf', $before) || array_key_exists('csrf', $before ))
+		if (in_array('csrf', $before) || array_key_exists('csrf', $before))
 		{
 			$Value = csrf_hash();
 			$Name = csrf_token();
@@ -43,26 +47,27 @@ public function testFormOpenBasic()
 EOH;
 		}
 
-        $attributes = [
-            'name'   => 'form',
-            'id'     => 'form',
-            'method' => 'POST'
-        ];
-        $this->assertEquals($expected, form_open('foo/bar', $attributes));
-    }
-    // ------------------------------------------------------------------------
-    public function testFormOpenWithoutAction()
-    {
-        $config = new App();
-        $config->baseURL = '';
-        $config->indexPage = 'index.php';
-        $request = Services::request($config);
-        $request->uri = new URI('http://example.com/');
-
-        Services::injectMock('request', $request);
+		$attributes = [
+			'name' => 'form',
+			'id' => 'form',
+			'method' => 'POST'
+		];
+		$this->assertEquals($expected, form_open('foo/bar', $attributes));
+	}
+
+	// ------------------------------------------------------------------------
+	public function testFormOpenWithoutAction()
+	{
+		$config = new App();
+		$config->baseURL = '';
+		$config->indexPage = 'index.php';
+		$request = Services::request($config);
+		$request->uri = new URI('http://example.com/');
+
+		Services::injectMock('request', $request);
 
 		$before = (new Filters())->globals['before'];
-		if (in_array('csrf', $before) || array_key_exists('csrf', $before ))
+		if (in_array('csrf', $before) || array_key_exists('csrf', $before))
 		{
 			$Value = csrf_hash();
 			$Name = csrf_token();
@@ -79,26 +84,27 @@ public function testFormOpenWithoutAction()
 
 EOH;
 		}
-        $attributes = [
-            'name'   => 'form',
-            'id'     => 'form',
-            'method' => 'POST'
-        ];
-        $this->assertEquals($expected, form_open('', $attributes));
-    }
-    // ------------------------------------------------------------------------
-    public function testFormOpenWithoutMethod()
-    {
-        $config = new App();
-        $config->baseURL = '';
-        $config->indexPage = 'index.php';
-        $request = Services::request($config);
-        $request->uri = new URI('http://example.com/');
-
-        Services::injectMock('request', $request);
+		$attributes = [
+			'name' => 'form',
+			'id' => 'form',
+			'method' => 'POST'
+		];
+		$this->assertEquals($expected, form_open('', $attributes));
+	}
+
+	// ------------------------------------------------------------------------
+	public function testFormOpenWithoutMethod()
+	{
+		$config = new App();
+		$config->baseURL = '';
+		$config->indexPage = 'index.php';
+		$request = Services::request($config);
+		$request->uri = new URI('http://example.com/');
+
+		Services::injectMock('request', $request);
 
 		$before = (new Filters())->globals['before'];
-		if (in_array('csrf', $before) || array_key_exists('csrf', $before ))
+		if (in_array('csrf', $before) || array_key_exists('csrf', $before))
 		{
 			$Value = csrf_hash();
 			$Name = csrf_token();
@@ -116,25 +122,26 @@ public function testFormOpenWithoutMethod()
 EOH;
 		}
 
-        $attributes = [
-            'name'   => 'form',
-            'id'     => 'form'
-        ];
-        $this->assertEquals($expected, form_open('foo/bar', $attributes));
-    }
-    // ------------------------------------------------------------------------
-    public function testFormOpenWithHidden()
-    {
-        $config = new App();
-        $config->baseURL = '';
-        $config->indexPage = 'index.php';
-        $request = Services::request($config);
-        $request->uri = new URI('http://example.com/');
-
-        Services::injectMock('request', $request);
+		$attributes = [
+			'name' => 'form',
+			'id' => 'form'
+		];
+		$this->assertEquals($expected, form_open('foo/bar', $attributes));
+	}
+
+	// ------------------------------------------------------------------------
+	public function testFormOpenWithHidden()
+	{
+		$config = new App();
+		$config->baseURL = '';
+		$config->indexPage = 'index.php';
+		$request = Services::request($config);
+		$request->uri = new URI('http://example.com/');
+
+		Services::injectMock('request', $request);
 
 		$before = (new Filters())->globals['before'];
-		if (in_array('csrf', $before) || array_key_exists('csrf', $before ))
+		if (in_array('csrf', $before) || array_key_exists('csrf', $before))
 		{
 			$Value = csrf_hash();
 			$Name = csrf_token();
@@ -154,29 +161,65 @@ public function testFormOpenWithHidden()
 EOH;
 		}
 
-        $attributes = [
-            'name'   => 'form',
-            'id'     => 'form',
-            'method' => 'POST'
-        ];
-        $hidden = [
-            'foo' => 'bar'
-        ];
-        $this->assertEquals($expected, form_open('foo/bar', $attributes, $hidden));
-    }
-    // ------------------------------------------------------------------------
-    public function testFormOpenMultipart()
-    {
-        $config = new App();
-        $config->baseURL = '';
-        $config->indexPage = 'index.php';
-        $request = Services::request($config);
-        $request->uri = new URI('http://example.com/');
-
-        Services::injectMock('request', $request);
+		$attributes = [
+			'name' => 'form',
+			'id' => 'form',
+			'method' => 'POST'
+		];
+		$hidden = [
+			'foo' => 'bar'
+		];
+		$this->assertEquals($expected, form_open('foo/bar', $attributes, $hidden));
+	}
+
+// ------------------------------------------------------------------------
+	public function testFormOpenWithCSRF()
+	{
+		$config = new App();
+		$config->baseURL = '';
+		$config->indexPage = 'index.php';
+		$request = Services::request($config);
+		$request->uri = new URI('http://example.com/');
+
+		Services::injectMock('request', $request);
+
+		$filters = Services::filters();
+		$filters->globals['before'][] = 'csrf'; // force CSRF
+		$before = $filters->globals['before'];
+
+		$Value = csrf_hash();
+		$Name = csrf_token();
+		$expected = <<<EOH
+<form action="http://example.com/index.php/foo/bar" name="form" id="form" method="POST" accept-charset="utf-8">
+<input type="hidden" name="foo" value="bar" style="display: none;" />
+<input type="hidden" name="$Name" value="$Value" style="display: none;" />
+
+EOH;
+
+		$attributes = [
+			'name' => 'form',
+			'id' => 'form',
+			'method' => 'POST'
+		];
+		$hidden = [
+			'foo' => 'bar'
+		];
+		$this->assertEquals($expected, form_open('foo/bar', $attributes, $hidden));
+	}
+
+	// ------------------------------------------------------------------------
+	public function testFormOpenMultipart()
+	{
+		$config = new App();
+		$config->baseURL = '';
+		$config->indexPage = 'index.php';
+		$request = Services::request($config);
+		$request->uri = new URI('http://example.com/');
+
+		Services::injectMock('request', $request);
 
 		$before = (new Filters())->globals['before'];
-		if (in_array('csrf', $before) || array_key_exists('csrf', $before ))
+		if (in_array('csrf', $before) || array_key_exists('csrf', $before))
 		{
 			$Value = csrf_hash();
 			$Name = csrf_token();
@@ -193,105 +236,114 @@ public function testFormOpenMultipart()
 
 EOH;
 		}
-        $attributes = [
-            'name'   => 'form',
-            'id'     => 'form',
-            'method' => 'POST'
-        ];
-        $this->assertEquals($expected, form_open_multipart('foo/bar', $attributes));
-    }
-    // ------------------------------------------------------------------------
-    public function testFormHidden()
-    {
-        $expected = <<<EOH
+		$attributes = [
+			'name' => 'form',
+			'id' => 'form',
+			'method' => 'POST'
+		];
+		$this->assertEquals($expected, form_open_multipart('foo/bar', $attributes));
+	}
+
+	// ------------------------------------------------------------------------
+	public function testFormHidden()
+	{
+		$expected = <<<EOH
 
 <input type="hidden" name="username" value="johndoe" />\n
 EOH;
-        $this->assertEquals($expected, form_hidden('username', 'johndoe'));
-    }
-    // ------------------------------------------------------------------------
-    public function testFormHiddenArrayInput()
-    {
-        $data = [
-            'foo' => 'bar'
-        ];
-        $expected = <<<EOH
+		$this->assertEquals($expected, form_hidden('username', 'johndoe'));
+	}
+
+	// ------------------------------------------------------------------------
+	public function testFormHiddenArrayInput()
+	{
+		$data = [
+			'foo' => 'bar'
+		];
+		$expected = <<<EOH
 
 <input type="hidden" name="foo" value="bar" />
 
 EOH;
-        $this->assertEquals($expected, form_hidden($data, null));
-    }
-    // ------------------------------------------------------------------------
-    public function testFormHiddenArrayValues()
-    {
-        $data = [
-            'foo' => 'bar'
-        ];
-        $expected = <<<EOH
+		$this->assertEquals($expected, form_hidden($data, null));
+	}
+
+	// ------------------------------------------------------------------------
+	public function testFormHiddenArrayValues()
+	{
+		$data = [
+			'foo' => 'bar'
+		];
+		$expected = <<<EOH
 
 <input type="hidden" name="name[foo]" value="bar" />
 
 EOH;
-        $this->assertEquals($expected, form_hidden('name', $data));
-    }
-    // ------------------------------------------------------------------------
-    public function testFormInput()
-    {
-        $expected = <<<EOH
+		$this->assertEquals($expected, form_hidden('name', $data));
+	}
+
+	// ------------------------------------------------------------------------
+	public function testFormInput()
+	{
+		$expected = <<<EOH
 <input type="text" name="username" value="johndoe" id="username" maxlength="100" size="50" style="width:50%"  />\n
 EOH;
-        $data = [
-            'name'        => 'username',
-            'id'          => 'username',
-            'value'       => 'johndoe',
-            'maxlength'   => '100',
-            'size'        => '50',
-            'style'       => 'width:50%',
-        ];
-        $this->assertEquals($expected, form_input($data));
-    }
-    // ------------------------------------------------------------------------
-    public function test_form_password()
-    {
-        $expected = <<<EOH
+		$data = [
+			'name' => 'username',
+			'id' => 'username',
+			'value' => 'johndoe',
+			'maxlength' => '100',
+			'size' => '50',
+			'style' => 'width:50%',
+		];
+		$this->assertEquals($expected, form_input($data));
+	}
+
+	// ------------------------------------------------------------------------
+	public function test_form_password()
+	{
+		$expected = <<<EOH
 <input type="password" name="password" value=""  />\n
 EOH;
-        $this->assertEquals($expected, form_password('password'));
-    }
-    // ------------------------------------------------------------------------
-    public function test_form_upload()
-    {
-        $expected = <<<EOH
+		$this->assertEquals($expected, form_password('password'));
+	}
+
+	// ------------------------------------------------------------------------
+	public function test_form_upload()
+	{
+		$expected = <<<EOH
 <input type="file" name="attachment"  />\n
 EOH;
-        $this->assertEquals($expected, form_upload('attachment'));
-    }
-    // ------------------------------------------------------------------------
-    public function test_form_textarea()
-    {
-        $expected = <<<EOH
+		$this->assertEquals($expected, form_upload('attachment'));
+	}
+
+	// ------------------------------------------------------------------------
+	public function test_form_textarea()
+	{
+		$expected = <<<EOH
 <textarea name="notes" cols="40" rows="10" >Notes</textarea>\n
 EOH;
-        $this->assertEquals($expected, form_textarea('notes', 'Notes'));
-    }
-    // ------------------------------------------------------------------------
-    public function testFormTextareaWithValueAttribute()
-    {
-        $data = [
-            'name' => 'foo',
-            'value' => 'bar'
-        ];
-        $expected = <<<EOH
+		$this->assertEquals($expected, form_textarea('notes', 'Notes'));
+	}
+
+	// ------------------------------------------------------------------------
+	public function testFormTextareaWithValueAttribute()
+	{
+		$data = [
+			'name' => 'foo',
+			'value' => 'bar'
+		];
+		$expected = <<<EOH
 <textarea name="foo" cols="40" rows="10" >bar</textarea>
 
 EOH;
-        $this->assertEquals($expected, form_textarea($data));
-    }
-    // ------------------------------------------------------------------------
-    public function test_form_dropdown()
-    {
-        $expected = <<<EOH
+		$this->assertEquals($expected, form_textarea($data));
+	}
+
+	// ------------------------------------------------------------------------
+	public function test_form_dropdown()
+	{
+		$expected = <<<EOH
 <select name="shirts">
 <option value="small">Small Shirt</option>
 <option value="med">Medium Shirt</option>
@@ -299,14 +351,14 @@ public function test_form_dropdown()
 <option value="xlarge">Extra Large Shirt</option>
 </select>\n
 EOH;
-        $options = [
-            'small'		=> 'Small Shirt',
-            'med'		=> 'Medium Shirt',
-            'large'		=> 'Large Shirt',
-            'xlarge'	=> 'Extra Large Shirt',
-        ];
-        $this->assertEquals($expected, form_dropdown('shirts', $options, 'large'));
-        $expected = <<<EOH
+		$options = [
+			'small' => 'Small Shirt',
+			'med' => 'Medium Shirt',
+			'large' => 'Large Shirt',
+			'xlarge' => 'Extra Large Shirt',
+		];
+		$this->assertEquals($expected, form_dropdown('shirts', $options, 'large'));
+		$expected = <<<EOH
 <select name="shirts" multiple="multiple">
 <option value="small" selected="selected">Small Shirt</option>
 <option value="med">Medium Shirt</option>
@@ -314,19 +366,19 @@ public function test_form_dropdown()
 <option value="xlarge">Extra Large Shirt</option>
 </select>\n
 EOH;
-        $shirts_on_sale = ['small', 'large'];
-        $this->assertEquals($expected, form_dropdown('shirts', $options, $shirts_on_sale));
-        $options = [
-            'Swedish Cars' => [
-                'volvo'	=> 'Volvo',
-                'saab'	=> 'Saab'
-            ],
-            'German Cars' => [
-                'mercedes'	=> 'Mercedes',
-                'audi'		=> 'Audi'
-            ]
-        ];
-        $expected = <<<EOH
+		$shirts_on_sale = ['small', 'large'];
+		$this->assertEquals($expected, form_dropdown('shirts', $options, $shirts_on_sale));
+		$options = [
+			'Swedish Cars' => [
+				'volvo' => 'Volvo',
+				'saab' => 'Saab'
+			],
+			'German Cars' => [
+				'mercedes' => 'Mercedes',
+				'audi' => 'Audi'
+			]
+		];
+		$expected = <<<EOH
 <select name="cars" multiple="multiple">
 <optgroup label="Swedish Cars">
 <option value="volvo" selected="selected">Volvo</option>
@@ -338,60 +390,64 @@ public function test_form_dropdown()
 </optgroup>
 </select>\n
 EOH;
-        $this->assertEquals($expected, form_dropdown('cars', $options, ['volvo', 'audi']));
-    }
-    // ------------------------------------------------------------------------
-    public function testFormDropdownWithSelectedAttribute()
-    {
-        $expected = <<<EOH
+		$this->assertEquals($expected, form_dropdown('cars', $options, ['volvo', 'audi']));
+	}
+
+	// ------------------------------------------------------------------------
+	public function testFormDropdownWithSelectedAttribute()
+	{
+		$expected = <<<EOH
 <select name="foo">
 <option value="bar" selected="selected">Bar</option>
 </select>
 
 EOH;
-        $data = [
-            'name'     => 'foo',
-            'selected' => 'bar'
-        ];
-        $options = [
-            'bar' => 'Bar'
-        ];
-        $this->assertEquals($expected, form_dropdown($data, $options));
-    }
-    // ------------------------------------------------------------------------
-    public function testFormDropdownWithOptionsAttribute()
-    {
-        $expected = <<<EOH
+		$data = [
+			'name' => 'foo',
+			'selected' => 'bar'
+		];
+		$options = [
+			'bar' => 'Bar'
+		];
+		$this->assertEquals($expected, form_dropdown($data, $options));
+	}
+
+	// ------------------------------------------------------------------------
+	public function testFormDropdownWithOptionsAttribute()
+	{
+		$expected = <<<EOH
 <select name="foo">
 <option value="bar">Bar</option>
 </select>
 
 EOH;
-        $data = [
-            'name'     => 'foo',
-            'options' => [
-                'bar' => 'Bar'
-            ]
-        ];
-        $this->assertEquals($expected, form_dropdown($data));
-    }
-    // ------------------------------------------------------------------------
-    public function testFormDropdownWithEmptyArrayOptionValue()
-    {
-        $expected = <<<EOH
+		$data = [
+			'name' => 'foo',
+			'options' => [
+				'bar' => 'Bar'
+			]
+		];
+		$this->assertEquals($expected, form_dropdown($data));
+	}
+
+	// ------------------------------------------------------------------------
+	public function testFormDropdownWithEmptyArrayOptionValue()
+	{
+		$expected = <<<EOH
 <select name="foo">
 </select>
 
 EOH;
-        $options = [
-            'bar' => []
-        ];
-        $this->assertEquals($expected, form_dropdown('foo', $options));
-    }
-    // ------------------------------------------------------------------------
-    public function test_form_multiselect()
-    {
-        $expected = <<<EOH
+		$options = [
+			'bar' => []
+		];
+		$this->assertEquals($expected, form_dropdown('foo', $options));
+	}
+
+	// ------------------------------------------------------------------------
+	public function test_form_multiselect()
+	{
+		$expected = <<<EOH
 <select name="shirts[]"  multiple="multiple">
 <option value="small">Small Shirt</option>
 <option value="med" selected="selected">Medium Shirt</option>
@@ -399,169 +455,185 @@ public function test_form_multiselect()
 <option value="xlarge">Extra Large Shirt</option>
 </select>\n
 EOH;
-        $options = [
-            'small'		=> 'Small Shirt',
-            'med'		=> 'Medium Shirt',
-            'large'		=> 'Large Shirt',
-            'xlarge'	=> 'Extra Large Shirt',
-        ];
-        $this->assertEquals($expected, form_multiselect('shirts[]', $options, ['med', 'large']));
-    }
-    // ------------------------------------------------------------------------
-    public function test_form_fieldset()
-    {
-        $expected = <<<EOH
+		$options = [
+			'small' => 'Small Shirt',
+			'med' => 'Medium Shirt',
+			'large' => 'Large Shirt',
+			'xlarge' => 'Extra Large Shirt',
+		];
+		$this->assertEquals($expected, form_multiselect('shirts[]', $options, ['med', 'large']));
+	}
+
+	// ------------------------------------------------------------------------
+	public function test_form_fieldset()
+	{
+		$expected = <<<EOH
 <fieldset>
 <legend>Address Information</legend>\n
 EOH;
-        $this->assertEquals($expected, form_fieldset('Address Information'));
-    }
-    // ------------------------------------------------------------------------
-    public function testFormFieldsetWithNoLegent()
-    {
-        $expected = <<<EOH
+		$this->assertEquals($expected, form_fieldset('Address Information'));
+	}
+
+	// ------------------------------------------------------------------------
+	public function testFormFieldsetWithNoLegent()
+	{
+		$expected = <<<EOH
 <fieldset>
 
 EOH;
-        $this->assertEquals($expected, form_fieldset());
-    }
-    // ------------------------------------------------------------------------
-    public function testFormFieldsetWithAttributes()
-    {
-        $attributes = [
-            'name' => 'bar'
-        ];
-        $expected = <<<EOH
+		$this->assertEquals($expected, form_fieldset());
+	}
+
+	// ------------------------------------------------------------------------
+	public function testFormFieldsetWithAttributes()
+	{
+		$attributes = [
+			'name' => 'bar'
+		];
+		$expected = <<<EOH
 <fieldset name="bar">
 <legend>Foo</legend>
 
 EOH;
-        $this->assertEquals($expected, form_fieldset('Foo', $attributes));
-    }
-    // ------------------------------------------------------------------------
-    public function test_form_fieldset_close()
-    {
-        $expected = <<<EOH
+		$this->assertEquals($expected, form_fieldset('Foo', $attributes));
+	}
+
+	// ------------------------------------------------------------------------
+	public function test_form_fieldset_close()
+	{
+		$expected = <<<EOH
 </fieldset></div></div>
 EOH;
-        $this->assertEquals($expected, form_fieldset_close('</div></div>'));
-    }
-    // ------------------------------------------------------------------------
-    public function test_form_checkbox()
-    {
-        $expected = <<<EOH
+		$this->assertEquals($expected, form_fieldset_close('</div></div>'));
+	}
+
+	// ------------------------------------------------------------------------
+	public function test_form_checkbox()
+	{
+		$expected = <<<EOH
 <input type="checkbox" name="newsletter" value="accept" checked="checked"  />\n
 EOH;
-        $this->assertEquals($expected, form_checkbox('newsletter', 'accept', TRUE));
-    }
-    // ------------------------------------------------------------------------
-    public function testFormCheckboxArrayData()
-    {
-        $data = [
-            'name'  => 'foo',
-            'value' => 'bar',
-            'checked' => true
-        ];
-        $expected = <<<EOH
+		$this->assertEquals($expected, form_checkbox('newsletter', 'accept', TRUE));
+	}
+
+	// ------------------------------------------------------------------------
+	public function testFormCheckboxArrayData()
+	{
+		$data = [
+			'name' => 'foo',
+			'value' => 'bar',
+			'checked' => true
+		];
+		$expected = <<<EOH
 <input type="checkbox" name="foo" value="bar" checked="checked"  />
 
 EOH;
-        $this->assertEquals($expected, form_checkbox($data));
-    }
-    // ------------------------------------------------------------------------
-    public function testFormCheckboxArrayDataWithCheckedFalse()
-    {
-        $data = [
-            'name'  => 'foo',
-            'value' => 'bar',
-            'checked' => false
-        ];
-        $expected = <<<EOH
+		$this->assertEquals($expected, form_checkbox($data));
+	}
+
+	// ------------------------------------------------------------------------
+	public function testFormCheckboxArrayDataWithCheckedFalse()
+	{
+		$data = [
+			'name' => 'foo',
+			'value' => 'bar',
+			'checked' => false
+		];
+		$expected = <<<EOH
 <input type="checkbox" name="foo" value="bar"  />
 
 EOH;
-        $this->assertEquals($expected, form_checkbox($data));
-    }
-    // ------------------------------------------------------------------------
-    public function test_form_radio()
-    {
-        $expected = <<<EOH
+		$this->assertEquals($expected, form_checkbox($data));
+	}
+
+	// ------------------------------------------------------------------------
+	public function test_form_radio()
+	{
+		$expected = <<<EOH
 <input type="radio" name="newsletter" value="accept" checked="checked"  />\n
 EOH;
-        $this->assertEquals($expected, form_radio('newsletter', 'accept', TRUE));
-    }
-    // ------------------------------------------------------------------------
-    public function test_form_submit()
-    {
-        $expected = <<<EOH
+		$this->assertEquals($expected, form_radio('newsletter', 'accept', TRUE));
+	}
+
+	// ------------------------------------------------------------------------
+	public function test_form_submit()
+	{
+		$expected = <<<EOH
 <input type="submit" name="mysubmit" value="Submit Post!"  />\n
 EOH;
-        $this->assertEquals($expected, form_submit('mysubmit', 'Submit Post!'));
-    }
-    // ------------------------------------------------------------------------
-    public function test_form_label()
-    {
-        $expected = <<<EOH
+		$this->assertEquals($expected, form_submit('mysubmit', 'Submit Post!'));
+	}
+
+	// ------------------------------------------------------------------------
+	public function test_form_label()
+	{
+		$expected = <<<EOH
 <label for="username">What is your Name</label>
 EOH;
-        $this->assertEquals($expected, form_label('What is your Name', 'username'));
-    }
-    // ------------------------------------------------------------------------
-    public function testFormLabelWithAttributes()
-    {
-        $attributes = [
-            'id' => 'label1'
-        ];
-        $expected = <<<EOH
+		$this->assertEquals($expected, form_label('What is your Name', 'username'));
+	}
+
+	// ------------------------------------------------------------------------
+	public function testFormLabelWithAttributes()
+	{
+		$attributes = [
+			'id' => 'label1'
+		];
+		$expected = <<<EOH
 <label for="foo" id="label1">bar</label>
 EOH;
-        $this->assertEquals($expected, form_label('bar', 'foo', $attributes));
-    }
-    // ------------------------------------------------------------------------
-    public function test_form_reset()
-    {
-        $expected = <<<EOH
+		$this->assertEquals($expected, form_label('bar', 'foo', $attributes));
+	}
+
+	// ------------------------------------------------------------------------
+	public function test_form_reset()
+	{
+		$expected = <<<EOH
 <input type="reset" name="myreset" value="Reset"  />\n
 EOH;
-        $this->assertEquals($expected, form_reset('myreset', 'Reset'));
-    }
-    // ------------------------------------------------------------------------
-    public function test_form_button()
-    {
-        $expected = <<<EOH
+		$this->assertEquals($expected, form_reset('myreset', 'Reset'));
+	}
+
+	// ------------------------------------------------------------------------
+	public function test_form_button()
+	{
+		$expected = <<<EOH
 <button name="name" type="button" >content</button>\n
 EOH;
-        $this->assertEquals($expected, form_button('name', 'content'));
-    }
-    // ------------------------------------------------------------------------
-    public function testFormButtonWithDataArray()
-    {
-        $data = [
-            'name'    => 'foo',
-            'content' => 'bar'
-        ];
-        $expected = <<<EOH
+		$this->assertEquals($expected, form_button('name', 'content'));
+	}
+
+	// ------------------------------------------------------------------------
+	public function testFormButtonWithDataArray()
+	{
+		$data = [
+			'name' => 'foo',
+			'content' => 'bar'
+		];
+		$expected = <<<EOH
 <button name="foo" type="button" >bar</button>
 
 EOH;
-        $this->assertEquals($expected, form_button($data));
-    }
-    // ------------------------------------------------------------------------
-    public function test_form_close()
-    {
-        $expected = <<<EOH
+		$this->assertEquals($expected, form_button($data));
+	}
+
+	// ------------------------------------------------------------------------
+	public function test_form_close()
+	{
+		$expected = <<<EOH
 </form></div></div>
 EOH;
-        $this->assertEquals($expected, form_close('</div></div>'));
-    }
-    // ------------------------------------------------------------------------
-    public function testFormDatalist()
-    {
-        $options = [
-            'foo1',
-            'bar1'
-        ];
-        $expected = <<<EOH
+		$this->assertEquals($expected, form_close('</div></div>'));
+	}
+
+	// ------------------------------------------------------------------------
+	public function testFormDatalist()
+	{
+		$options = [
+			'foo1',
+			'bar1'
+		];
+		$expected = <<<EOH
 <input type="text" name="foo" value="bar" list="foo_list"  />
 
 <datalist id='foo_list'><option value='foo1'>
@@ -569,68 +641,73 @@ public function testFormDatalist()
 </datalist>
 
 EOH;
-        $this->assertEquals($expected, form_datalist('foo', 'bar', $options));
-    }
-    // ------------------------------------------------------------------------
-    public function test_set_value()
-    {
-    	$_SESSION['_ci_old_input']['post']['foo'] = '<bar';
-    	$this->assertEquals('&lt;bar', set_value('foo'));
-
-    	unset($_SESSION['_ci_old_input']['post']['foo']);
-    	$this->assertEquals('baz', set_value('foo', 'baz'));
-    }
-    // ------------------------------------------------------------------------
-    public function test_set_select()
-    {
-    	$_SESSION['_ci_old_input']['post']['foo'] = 'bar';
-    	$this->assertEquals(' selected="selected"', set_select('foo', 'bar'));
-
-    	$_SESSION['_ci_old_input']['post']['foo'] = ['foo' => 'bar'];
-    	$this->assertEquals(' selected="selected"', set_select('foo', 'bar'));
-    	$this->assertEquals('', set_select('foo', 'baz'));
-
-    	unset($_SESSION['_ci_old_input']['post']['foo']);
-    	$this->assertEquals(' selected="selected"', set_select('foo', 'baz', true));
-    }
-    // ------------------------------------------------------------------------
-    public function test_set_checkbox()
-    {
-	    $_SESSION = [
-	    	'_ci_old_input' => [
-	    		'post' => [
-	    			'foo' => 'bar'
-			    ]
-		    ]
-	    ];
-
-    	$this->assertEquals(' checked="checked"', set_checkbox('foo', 'bar'));
-
-    	$_SESSION = [
-    		'_ci_old_input' => [
-    			'post' => [
-    				'foo' => ['foo' => 'bar']
-	            ]
-	        ]
-	    ];
-    	$this->assertEquals(' checked="checked"', set_checkbox('foo', 'bar'));
-    	$this->assertEquals('', set_checkbox('foo', 'baz'));
+		$this->assertEquals($expected, form_datalist('foo', 'bar', $options));
+	}
+
+	// ------------------------------------------------------------------------
+	public function test_set_value()
+	{
+		$_SESSION['_ci_old_input']['post']['foo'] = '<bar';
+		$this->assertEquals('&lt;bar', set_value('foo'));
+
+		unset($_SESSION['_ci_old_input']['post']['foo']);
+		$this->assertEquals('baz', set_value('foo', 'baz'));
+	}
+
+	// ------------------------------------------------------------------------
+	public function test_set_select()
+	{
+		$_SESSION['_ci_old_input']['post']['foo'] = 'bar';
+		$this->assertEquals(' selected="selected"', set_select('foo', 'bar'));
+
+		$_SESSION['_ci_old_input']['post']['foo'] = ['foo' => 'bar'];
+		$this->assertEquals(' selected="selected"', set_select('foo', 'bar'));
+		$this->assertEquals('', set_select('foo', 'baz'));
+
+		unset($_SESSION['_ci_old_input']['post']['foo']);
+		$this->assertEquals(' selected="selected"', set_select('foo', 'baz', true));
+	}
+
+	// ------------------------------------------------------------------------
+	public function test_set_checkbox()
+	{
+		$_SESSION = [
+			'_ci_old_input' => [
+				'post' => [
+					'foo' => 'bar'
+				]
+			]
+		];
+
+		$this->assertEquals(' checked="checked"', set_checkbox('foo', 'bar'));
+
+		$_SESSION = [
+			'_ci_old_input' => [
+				'post' => [
+					'foo' => ['foo' => 'bar']
+				]
+			]
+		];
+		$this->assertEquals(' checked="checked"', set_checkbox('foo', 'bar'));
+		$this->assertEquals('', set_checkbox('foo', 'baz'));
 
 		$_SESSION = [];
-    	$this->assertEquals('', set_checkbox('foo', 'bar'));
-    }
-    // ------------------------------------------------------------------------
-    public function test_set_radio()
-    {
-	    $_SESSION = [
-		    '_ci_old_input' => [
-			    'post' => [
-				    'foo' => 'bar'
-			    ]
-		    ]
-	    ];
-
-    	$this->assertEquals(' checked="checked"', set_radio('foo', 'bar'));
-    	$this->assertEquals('', set_radio('foo', 'baz'));
-    }
+		$this->assertEquals('', set_checkbox('foo', 'bar'));
+	}
+
+	// ------------------------------------------------------------------------
+	public function test_set_radio()
+	{
+		$_SESSION = [
+			'_ci_old_input' => [
+				'post' => [
+					'foo' => 'bar'
+				]
+			]
+		];
+
+		$this->assertEquals(' checked="checked"', set_radio('foo', 'bar'));
+		$this->assertEquals('', set_radio('foo', 'baz'));
+	}
+
 }

From c305411281119ec5c53ed5e7e44cc28041494d39 Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Thu, 28 Jun 2018 09:08:09 -0700
Subject: [PATCH 06/69] FormHelperTestexcept for FormOpenWithCSRF

---
 system/Helpers/form_helper.php                |  58 +++---
 tests/system/Helpers/FormHelperTest.php       | 191 +++++++++++++-----
 user_guide_src/source/helpers/form_helper.rst |  13 +-
 3 files changed, 176 insertions(+), 86 deletions(-)

diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
index 8705082f2452..2b847d174ca3 100644
--- a/system/Helpers/form_helper.php
+++ b/system/Helpers/form_helper.php
@@ -48,12 +48,12 @@
 	 * Creates the opening portion of the form.
 	 *
 	 * @param    string $action     the URI segments of the form destination
-	 * @param    array  $attributes a key/value pair of attributes
+	 * @param    array|string  $attributes a key/value pair of attributes, or string representation
 	 * @param    array  $hidden     a key/value pair hidden data
 	 *
 	 * @return    string
 	 */
-	function form_open(string $action = '', array $attributes = [], array $hidden = []): string
+	function form_open(string $action = '', $attributes = [], array $hidden = []): string
 	{
 		// If no action is provided then set to the current url
 		if ( ! $action)
@@ -114,16 +114,16 @@ function form_open(string $action = '', array $attributes = [], array $hidden =
 	 * Creates the opening portion of the form, but with "multipart/form-data".
 	 *
 	 * @param    string $action     The URI segments of the form destination
-	 * @param    array  $attributes A key/value pair of attributes
+	 * @param    array|string  $attributes A key/value pair of attributes, or the same as a string
 	 * @param    array  $hidden     A key/value pair hidden data
 	 *
 	 * @return    string
 	 */
-	function form_open_multipart(string $action = '', array $attributes = [], array $hidden = []): string
+	function form_open_multipart(string $action = '', $attributes = [], array $hidden = []): string
 	{
 		if (is_string($attributes))
 		{
-			$attributes .= ' enctype="multipart/form-data"';
+			$attributes .= ' enctype="' . esc('multipart/form-data', 'attr') . '"';
 		}
 		else
 		{
@@ -208,9 +208,9 @@ function form_hidden($name, $value, bool $recursing = false): string
 	function form_input($data = '', string $value = '', $extra = '', string $type = 'text'): string
 	{
 		$defaults = [
-			'type'	 => $type,
-			'name'	 => is_array($data) ? '' : $data,
-			'value'	 => $value,
+			'type' => $type,
+			'name' => is_array($data) ? '' : $data,
+			'value' => $value,
 		];
 
 		return '<input ' . parse_form_attributes($data, $defaults) . stringify_attributes($extra) . " />\n";
@@ -288,9 +288,9 @@ function form_upload($data = '', string $value = '', $extra = ''): string
 	function form_textarea($data = '', string $value = '', $extra = ''): string
 	{
 		$defaults = [
-			'name'	 => is_array($data) ? '' : $data,
-			'cols'	 => '40',
-			'rows'	 => '10',
+			'name' => is_array($data) ? '' : $data,
+			'cols' => '40',
+			'rows' => '10',
 		];
 		if ( ! is_array($data) || ! isset($data['value']))
 		{
@@ -515,9 +515,9 @@ function form_radio($data = '', string $value = '', bool $checked = false, $extr
 	function form_submit($data = '', string $value = '', $extra = ''): string
 	{
 		$defaults = [
-			'type'	 => 'submit',
-			'name'	 => is_array($data) ? '' : $data,
-			'value'	 => $value,
+			'type' => 'submit',
+			'name' => is_array($data) ? '' : $data,
+			'value' => $value,
 		];
 
 		return '<input ' . parse_form_attributes($data, $defaults) . stringify_attributes($extra) . " />\n";
@@ -542,9 +542,9 @@ function form_submit($data = '', string $value = '', $extra = ''): string
 	function form_reset($data = '', string $value = '', $extra = ''): string
 	{
 		$defaults = [
-			'type'	 => 'reset',
-			'name'	 => is_array($data) ? '' : $data,
-			'value'	 => $value,
+			'type' => 'reset',
+			'name' => is_array($data) ? '' : $data,
+			'value' => $value,
 		];
 
 		return '<input ' . parse_form_attributes($data, $defaults) . stringify_attributes($extra) . " />\n";
@@ -569,8 +569,8 @@ function form_reset($data = '', string $value = '', $extra = ''): string
 	function form_button($data = '', string $content = '', $extra = ''): string
 	{
 		$defaults = [
-			'name'	 => is_array($data) ? '' : $data,
-			'type'	 => 'button',
+			'name' => is_array($data) ? '' : $data,
+			'type' => 'button',
 		];
 
 		if (is_array($data) && isset($data['content']))
@@ -643,10 +643,10 @@ function form_label(string $label_text = '', string $id = '', array $attributes
 	function form_datalist($name, $value, $options)
 	{
 		$data = [
-			'type'	 => 'text',
-			'name'	 => $name,
-			'list'	 => $name . '_list',
-			'value'	 => $value,
+			'type' => 'text',
+			'name' => $name,
+			'list' => $name . '_list',
+			'value' => $value,
 		];
 
 		$out = form_input($data) . "\n";
@@ -868,7 +868,7 @@ function set_checkbox(string $field, string $value = '', bool $default = false):
 		}
 
 		// Unchecked checkbox and radio inputs are not even submitted by browsers ...
-		if (! empty($request->getPost()) || ! empty(old($field)))
+		if ( ! empty($request->getPost()) || ! empty(old($field)))
 		{
 			return ($input === $value) ? ' checked="checked"' : '';
 		}
@@ -904,7 +904,6 @@ function set_radio(string $field, string $value = '', bool $default = false): st
 
 		// Try any old input data we may have first
 		$input = $request->getOldInput($field);
-
 		if ($input === null)
 		{
 			$input = $request->getPost($field) ?? $default;
@@ -925,12 +924,15 @@ function set_radio(string $field, string $value = '', bool $default = false): st
 		}
 
 		// Unchecked checkbox and radio inputs are not even submitted by browsers ...
+		$result = '';
 		if ($request->getPost())
 		{
-			return ($input === $value) ? ' checked="checked"' : '';
+			$result = ($input === $value) ? ' checked="checked"' : '';
 		}
 
-		return ($default === true) ? ' checked="checked"' : '';
+		if (empty($result))
+			$result = ($default === true) ? ' checked="checked"' : '';
+		return $result;
 	}
 
 }
@@ -962,7 +964,7 @@ function parse_form_attributes($attributes, $default): string
 					unset($attributes[$key]);
 				}
 			}
-			if (! empty($attributes))
+			if ( ! empty($attributes))
 			{
 				$default = array_merge($default, $attributes);
 			}
diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php
index 560b1d8e3b87..daf865189497 100644
--- a/tests/system/Helpers/FormHelperTest.php
+++ b/tests/system/Helpers/FormHelperTest.php
@@ -173,40 +173,40 @@ public function testFormOpenWithHidden()
 	}
 
 // ------------------------------------------------------------------------
-	public function testFormOpenWithCSRF()
-	{
-		$config = new App();
-		$config->baseURL = '';
-		$config->indexPage = 'index.php';
-		$request = Services::request($config);
-		$request->uri = new URI('http://example.com/');
-
-		Services::injectMock('request', $request);
-
-		$filters = Services::filters();
-		$filters->globals['before'][] = 'csrf'; // force CSRF
-		$before = $filters->globals['before'];
-
-		$Value = csrf_hash();
-		$Name = csrf_token();
-		$expected = <<<EOH
-<form action="http://example.com/index.php/foo/bar" name="form" id="form" method="POST" accept-charset="utf-8">
-<input type="hidden" name="foo" value="bar" style="display: none;" />
-<input type="hidden" name="$Name" value="$Value" style="display: none;" />
-
-EOH;
-
-		$attributes = [
-			'name' => 'form',
-			'id' => 'form',
-			'method' => 'POST'
-		];
-		$hidden = [
-			'foo' => 'bar'
-		];
-		$this->assertEquals($expected, form_open('foo/bar', $attributes, $hidden));
-	}
-
+//FIXME This needs dynamic filters to complete
+//	public function testFormOpenWithCSRF()
+//	{
+//		$config = new App();
+//		$config->baseURL = '';
+//		$config->indexPage = 'index.php';
+//		$request = Services::request($config);
+//		$request->uri = new URI('http://example.com/');
+//
+//		Services::injectMock('request', $request);
+//
+//		$filters = Services::filters();
+//		$filters->globals['before'][] = 'csrf'; // force CSRF
+//		$before = $filters->globals['before'];
+//
+//		$Value = csrf_hash();
+//		$Name = csrf_token();
+//		$expected = <<<EOH
+//<form action="http://example.com/index.php/foo/bar" name="form" id="form" method="POST" accept-charset="utf-8">
+//<input type="hidden" name="foo" value="bar" style="display: none;" />
+//<input type="hidden" name="$Name" value="$Value" style="display: none;" />
+//
+//EOH;
+//
+//		$attributes = [
+//			'name' => 'form',
+//			'id' => 'form',
+//			'method' => 'POST'
+//		];
+//		$hidden = [
+//			'foo' => 'bar'
+//		];
+//		$this->assertEquals($expected, form_open('foo/bar', $attributes, $hidden));
+//	}
 	// ------------------------------------------------------------------------
 	public function testFormOpenMultipart()
 	{
@@ -242,6 +242,10 @@ public function testFormOpenMultipart()
 			'method' => 'POST'
 		];
 		$this->assertEquals($expected, form_open_multipart('foo/bar', $attributes));
+
+		// make sure it works with attributes as a string too
+		$attributesString = 'name="form" id="form" method="POST"';
+		$this->assertEquals($expected, form_open_multipart('foo/bar', $attributesString));
 	}
 
 	// ------------------------------------------------------------------------
@@ -300,7 +304,7 @@ public function testFormInput()
 	}
 
 	// ------------------------------------------------------------------------
-	public function test_form_password()
+	public function testFormPassword()
 	{
 		$expected = <<<EOH
 <input type="password" name="password" value=""  />\n
@@ -309,7 +313,7 @@ public function test_form_password()
 	}
 
 	// ------------------------------------------------------------------------
-	public function test_form_upload()
+	public function testFormUpload()
 	{
 		$expected = <<<EOH
 <input type="file" name="attachment"  />\n
@@ -318,7 +322,7 @@ public function test_form_upload()
 	}
 
 	// ------------------------------------------------------------------------
-	public function test_form_textarea()
+	public function testFormTextarea()
 	{
 		$expected = <<<EOH
 <textarea name="notes" cols="40" rows="10" >Notes</textarea>\n
@@ -341,7 +345,7 @@ public function testFormTextareaWithValueAttribute()
 	}
 
 	// ------------------------------------------------------------------------
-	public function test_form_dropdown()
+	public function testFormDropdown()
 	{
 		$expected = <<<EOH
 <select name="shirts">
@@ -393,6 +397,62 @@ public function test_form_dropdown()
 		$this->assertEquals($expected, form_dropdown('cars', $options, ['volvo', 'audi']));
 	}
 
+	public function testFormDropdownUnselected()
+	{
+		$options = [
+			'Swedish Cars' => [
+				'volvo' => 'Volvo',
+				'saab' => 'Saab'
+			],
+			'German Cars' => [
+				'mercedes' => 'Mercedes',
+				'audi' => 'Audi'
+			]
+		];
+		$expected = <<<EOH
+<select name="cars">
+<optgroup label="Swedish Cars">
+<option value="volvo">Volvo</option>
+<option value="saab">Saab</option>
+</optgroup>
+<optgroup label="German Cars">
+<option value="mercedes">Mercedes</option>
+<option value="audi">Audi</option>
+</optgroup>
+</select>\n
+EOH;
+		$this->assertEquals($expected, form_dropdown('cars', $options, []));
+	}
+
+	public function testFormDropdownInferred()
+	{
+		$options = [
+			'Swedish Cars' => [
+				'volvo' => 'Volvo',
+				'saab' => 'Saab'
+			],
+			'German Cars' => [
+				'mercedes' => 'Mercedes',
+				'audi' => 'Audi'
+			]
+		];
+		$expected = <<<EOH
+<select name="cars">
+<optgroup label="Swedish Cars">
+<option value="volvo">Volvo</option>
+<option value="saab">Saab</option>
+</optgroup>
+<optgroup label="German Cars">
+<option value="mercedes">Mercedes</option>
+<option value="audi" selected="selected">Audi</option>
+</optgroup>
+</select>\n
+EOH;
+		$_POST['cars'] = 'audi';
+		$this->assertEquals($expected, form_dropdown('cars', $options, []));
+		unset($_POST['cars']);
+	}
+
 	// ------------------------------------------------------------------------
 	public function testFormDropdownWithSelectedAttribute()
 	{
@@ -445,7 +505,7 @@ public function testFormDropdownWithEmptyArrayOptionValue()
 	}
 
 	// ------------------------------------------------------------------------
-	public function test_form_multiselect()
+	public function testFormMultiselect()
 	{
 		$expected = <<<EOH
 <select name="shirts[]"  multiple="multiple">
@@ -465,7 +525,7 @@ public function test_form_multiselect()
 	}
 
 	// ------------------------------------------------------------------------
-	public function test_form_fieldset()
+	public function testFormFieldset()
 	{
 		$expected = <<<EOH
 <fieldset>
@@ -499,7 +559,7 @@ public function testFormFieldsetWithAttributes()
 	}
 
 	// ------------------------------------------------------------------------
-	public function test_form_fieldset_close()
+	public function testFormFieldsetClose()
 	{
 		$expected = <<<EOH
 </fieldset></div></div>
@@ -508,7 +568,7 @@ public function test_form_fieldset_close()
 	}
 
 	// ------------------------------------------------------------------------
-	public function test_form_checkbox()
+	public function testFormCheckbox()
 	{
 		$expected = <<<EOH
 <input type="checkbox" name="newsletter" value="accept" checked="checked"  />\n
@@ -547,7 +607,7 @@ public function testFormCheckboxArrayDataWithCheckedFalse()
 	}
 
 	// ------------------------------------------------------------------------
-	public function test_form_radio()
+	public function testFormRadio()
 	{
 		$expected = <<<EOH
 <input type="radio" name="newsletter" value="accept" checked="checked"  />\n
@@ -556,7 +616,7 @@ public function test_form_radio()
 	}
 
 	// ------------------------------------------------------------------------
-	public function test_form_submit()
+	public function testFormSubmit()
 	{
 		$expected = <<<EOH
 <input type="submit" name="mysubmit" value="Submit Post!"  />\n
@@ -565,7 +625,7 @@ public function test_form_submit()
 	}
 
 	// ------------------------------------------------------------------------
-	public function test_form_label()
+	public function testFormLabel()
 	{
 		$expected = <<<EOH
 <label for="username">What is your Name</label>
@@ -586,7 +646,7 @@ public function testFormLabelWithAttributes()
 	}
 
 	// ------------------------------------------------------------------------
-	public function test_form_reset()
+	public function testFormReset()
 	{
 		$expected = <<<EOH
 <input type="reset" name="myreset" value="Reset"  />\n
@@ -595,7 +655,7 @@ public function test_form_reset()
 	}
 
 	// ------------------------------------------------------------------------
-	public function test_form_button()
+	public function testFormButton()
 	{
 		$expected = <<<EOH
 <button name="name" type="button" >content</button>\n
@@ -618,7 +678,7 @@ public function testFormButtonWithDataArray()
 	}
 
 	// ------------------------------------------------------------------------
-	public function test_form_close()
+	public function testFormClose()
 	{
 		$expected = <<<EOH
 </form></div></div>
@@ -645,7 +705,7 @@ public function testFormDatalist()
 	}
 
 	// ------------------------------------------------------------------------
-	public function test_set_value()
+	public function testSetValue()
 	{
 		$_SESSION['_ci_old_input']['post']['foo'] = '<bar';
 		$this->assertEquals('&lt;bar', set_value('foo'));
@@ -655,7 +715,7 @@ public function test_set_value()
 	}
 
 	// ------------------------------------------------------------------------
-	public function test_set_select()
+	public function testSetSelect()
 	{
 		$_SESSION['_ci_old_input']['post']['foo'] = 'bar';
 		$this->assertEquals(' selected="selected"', set_select('foo', 'bar'));
@@ -669,7 +729,7 @@ public function test_set_select()
 	}
 
 	// ------------------------------------------------------------------------
-	public function test_set_checkbox()
+	public function testSetCheckbox()
 	{
 		$_SESSION = [
 			'_ci_old_input' => [
@@ -696,7 +756,7 @@ public function test_set_checkbox()
 	}
 
 	// ------------------------------------------------------------------------
-	public function test_set_radio()
+	public function testSetRadio()
 	{
 		$_SESSION = [
 			'_ci_old_input' => [
@@ -708,6 +768,33 @@ public function test_set_radio()
 
 		$this->assertEquals(' checked="checked"', set_radio('foo', 'bar'));
 		$this->assertEquals('', set_radio('foo', 'baz'));
+		unset($_SESSION['_ci_old_input']);
+	}
+
+	public function testSetRadioFromPost()
+	{
+		$_POST['bar'] = 'baz';
+		$this->assertEquals(' checked="checked"', set_radio('bar', 'baz'));
+		$this->assertEquals('', set_radio('bar', 'boop'));
+	}
+
+	public function testSetRadioFromPostArray()
+	{
+		$_SESSION = [
+			'_ci_old_input' => [
+				'post' => [
+					'bar' => ['boop', 'fuzzy']
+				]
+			]
+		];
+		$this->assertEquals(' checked="checked"', set_radio('bar', 'boop'));
+		$this->assertEquals('', set_radio('bar', 'baz'));
+	}
+
+	public function testSetRadioDefault()
+	{
+		$this->assertEquals(' checked="checked"', set_radio('code', 'alpha', true));
+		$this->assertEquals('', set_radio('code', 'beta', false));
 	}
 
 }
diff --git a/user_guide_src/source/helpers/form_helper.rst b/user_guide_src/source/helpers/form_helper.rst
index 4c3b6bf38e46..09ecc72810c2 100644
--- a/user_guide_src/source/helpers/form_helper.rst
+++ b/user_guide_src/source/helpers/form_helper.rst
@@ -40,9 +40,10 @@ characters so that it can be used safely::
 	<input type="text" name="myfield" value="<?= esc($string); ?>" />
 
 .. note:: If you use any of the form helper functions listed on this page,
+        and you pass values as an associative array,
 	the form values will be automatically escaped, so there is no need
 	to call this function. Use it only if you are creating your own
-	form elements.
+	form elements, which you would pass as strings.
 
 Available Functions
 ===================
@@ -52,7 +53,7 @@ The following functions are available:
 .. php:function:: form_open([$action = ''[, $attributes = ''[, $hidden = array()]]])
 
 	:param	string	$action: Form action/target URI string
-    	:param	array	$attributes: HTML attributes
+    	:param	mixed	$attributes: HTML attributes, as an array or escaped string
     	:param	array	$hidden: An array of hidden fields' definitions
     	:returns:	An HTML form opening tag
     	:rtype:	string
@@ -106,15 +107,15 @@ The following functions are available:
 				<input type="hidden" name="username" value="Joe" />
 				<input type="hidden" name="member_id" value="234" />
 
-.. php:function:: form_open_multipart([$action = ''[, $attributes = array()[, $hidden = array()]]])
+.. php:function:: form_open_multipart([$action = ''[, $attributes = ''[, $hidden = array()]]])
 
 	:param	string	$action: Form action/target URI string
-    	:param	array	$attributes: HTML attributes
+    	:param	mixed	$attributes: HTML attributes, as an array or escaped string
     	:param	array	$hidden: An array of hidden fields' definitions
     	:returns:	An HTML multipart form opening tag
     	:rtype:	string
 
-    	This function is absolutely identical to :php:func:`form_open()` above,
+    	This function is identical to :php:func:`form_open()` above,
 	except that it adds a *multipart* attribute, which is necessary if you
 	would like to use the form to upload files with.
 
@@ -289,7 +290,7 @@ The following functions are available:
     	contain the name of the field, the second parameter will contain an
     	associative array of options, and the third parameter will contain the
     	value you wish to be selected. You can also pass an array of multiple
-    	items through the third parameter, and CodeIgniter will create a
+    	items through the third parameter, and the helper will create a
     	multiple select for you.
 
     	Example::

From 97bc23d8306a6b3e57f7c923f6b19bc433846763 Mon Sep 17 00:00:00 2001
From: Christoph Potas <christoph286@googlemail.com>
Date: Fri, 29 Jun 2018 08:55:18 +0200
Subject: [PATCH 07/69] ~ remove lower case access

Signed-off-by: Christoph Potas <christoph286@googlemail.com>
---
 system/Config/Config.php           | 2 +-
 tests/system/Config/ConfigTest.php | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/system/Config/Config.php b/system/Config/Config.php
index 0cf79dd3e744..0a3c0c204f2b 100644
--- a/system/Config/Config.php
+++ b/system/Config/Config.php
@@ -70,7 +70,7 @@ public static function get(string $name, bool $getShared = true)
 			$class = substr($name, $pos + 1);
 		}
 
-		$class = strtolower($class);
+		//$class = strtolower($class);
 
 		if (! $getShared)
 		{
diff --git a/tests/system/Config/ConfigTest.php b/tests/system/Config/ConfigTest.php
index b1e8397fffe4..ea08b26e981f 100644
--- a/tests/system/Config/ConfigTest.php
+++ b/tests/system/Config/ConfigTest.php
@@ -7,12 +7,10 @@ class ConfigTest extends \CIUnitTestCase
 
 	public function testCreateSingleInstance()
 	{
-		$Config = Config::get('email', false);
-		$UpperConfig = Config::get('Email', false);
+		$Config = Config::get('Email', false);
 		$NamespaceConfig = Config::get('Config\\Email', false);
 
 		$this->assertInstanceOf(Email::class, $Config);
-		$this->assertInstanceOf(Email::class, $UpperConfig);
 		$this->assertInstanceOf(Email::class, $NamespaceConfig);
 	}
 
@@ -25,7 +23,7 @@ public function testCreateInvalidInstance()
 
 	public function testCreateSharedInstance()
 	{
-		$Config = Config::get('email' );
+		$Config = Config::get('Email' );
 		$Config2 = Config::get('Config\\Email');
 
 		$this->assertTrue($Config === $Config2);
@@ -33,7 +31,7 @@ public function testCreateSharedInstance()
 
 	public function testCreateNonConfig()
 	{
-		$Config = Config::get('constants', false);
+		$Config = Config::get('Constants', false);
 
 		$this->assertNull($Config);
 	}

From 7a07b531e538df439a8130412dd5802c44be1876 Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Fri, 29 Jun 2018 12:59:46 -0700
Subject: [PATCH 08/69] Flesh out html_helper testing

---
 application/Config/DocTypes.php               |   2 +-
 system/Helpers/html_helper.php                | 266 +++++---------
 tests/system/Helpers/HTMLHelperTest.php       | 347 +++++++++++++-----
 user_guide_src/source/helpers/html_helper.rst |  22 +-
 4 files changed, 355 insertions(+), 282 deletions(-)

diff --git a/application/Config/DocTypes.php b/application/Config/DocTypes.php
index 37830984c31f..38ceaedfc905 100755
--- a/application/Config/DocTypes.php
+++ b/application/Config/DocTypes.php
@@ -8,7 +8,7 @@
 
 class DocTypes
 {
-	static $list = 
+	public $list = 
 	[
 		'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
 		'xhtml1-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php
index ac8d624c9abc..aa8ae6c9434a 100755
--- a/system/Helpers/html_helper.php
+++ b/system/Helpers/html_helper.php
@@ -97,22 +97,13 @@ function ol(array $list, string $attributes = ''): string
 	 * Generates an HTML ordered list from an single or multi-dimensional array.
 	 *
 	 * @param   string   $type
-	 * @param   array    $list
+	 * @param   mixed    $list
 	 * @param   string   $attributes
 	 * @param   int      $depth
 	 * @return  string
 	 */
-	function _list
-	(
-	string $type = 'ul', array $list = [], string $attributes = '', int $depth = 0
-	): string
+	function _list(string $type = 'ul', $list = [], string $attributes = '', int $depth = 0): string
 	{
-		// If an array wasn't submitted there's nothing to do...
-		if ( ! is_array($list))
-		{
-			return $list;
-		}
-
 		// Set the indentation based on the depth
 		$out = str_repeat(' ', $depth)
 				// Write the opening list tag
@@ -162,20 +153,16 @@ function _list
 	 *
 	 * @param   mixed   $src
 	 * @param   bool    $indexPage
-	 * @param   string  $attributes
+	 * @param   mixed  $attributes
 	 * @return  string
 	 */
-	function img
-	(
-	$src = '', bool $indexPage = false, string $attributes = ''
-	): string
+	function img($src = '', bool $indexPage = false, $attributes = ''): string
 	{
 		if ( ! is_array($src))
 		{
 			$src = ['src' => $src];
 		}
 
-
 		//If there is no alt attribute defined, set it to an empty string.
 		if ( ! isset($src['alt']))
 		{
@@ -223,20 +210,13 @@ function img
 	 * xhtml-frame, html4-strict, html4-trans, and html4-frame.
 	 * All values are saved in the doctypes config file.
 	 *
-	 * @param   mixed  $type    The doctype to be generated
+	 * @param   string  $type    The doctype to be generated
 	 * @return  string
 	 */
-	function doctype($type = 'html5'): string
+	function doctype(string $type = 'html5'): string
 	{
-		$doctypes = null;
-		$env = ENVIRONMENT;
-		$doctypes = Config\DocTypes::$list;
-		$customDocTypesPath = APPPATH . "Config/{$env}/DocTypes.php";
-		if (file_exists($customDocTypesPath))
-		{
-			$customDocTypesNs = "Config\{$env}\DocTypes";
-			$doctypes = $customDocTypesNs::$list;
-		}
+		$config = new \Config\DocTypes();
+		$doctypes = $config->list;
 		return $doctypes[$type] ?? false;
 	}
 
@@ -256,47 +236,30 @@ function doctype($type = 'html5'): string
 	 * @param   bool    $indexPage  Should indexPage be added to the JS path
 	 * @return  string
 	 */
-	function script_tag
-	(
-	$src = '', bool $indexPage = false
-	): string
+	function script_tag($src = '', bool $indexPage = false): string
 	{
 		$script = '<script ';
+		if ( ! is_array($src))
+		{
+			$src = ['src' => $src];
+		}
 
-		if (is_array($src))
+		foreach ($src as $k => $v)
 		{
-			foreach ($src as $k => $v)
+			if ($k === 'src' && ! preg_match('#^([a-z]+:)?//#i', $v))
 			{
-				if ($k === 'src' && ! preg_match('#^([a-z]+:)?//#i', $v))
+				if ($indexPage === true)
 				{
-					if ($indexPage === true)
-					{
-						$script .= 'src="' . site_url($v) . '" ';
-					}
-					else
-					{
-						$script .= 'src="' . slash_item('baseURL') . $v . '" ';
-					}
+					$script .= 'src="' . site_url($v) . '" ';
 				}
 				else
 				{
-					$script .= $k . '="' . $v . '" ';
+					$script .= 'src="' . slash_item('baseURL') . $v . '" ';
 				}
 			}
-		}
-		else
-		{
-			if (preg_match('#^([a-z]+:)?//#i', $src))
-			{
-				$script .= 'src="' . $src . '" ';
-			}
-			elseif ($indexPage === true)
-			{
-				$script .= 'src="' . site_url($src) . '" ';
-			}
 			else
 			{
-				$script .= 'src="' . slash_item('baseURL') . $src . '" ';
+				$script .= $k . '="' . $v . '" ';
 			}
 		}
 
@@ -315,7 +278,7 @@ function script_tag
 	 *
 	 * Generates link to a CSS file
 	 *
-	 * @param   mixed   $href       Stylesheet hrefs or an array
+	 * @param   mixed   $href       Stylesheet href or an array
 	 * @param   string  $rel
 	 * @param   string  $type
 	 * @param   string  $title
@@ -323,41 +286,24 @@ function script_tag
 	 * @param   bool    $indexPage  should indexPage be added to the CSS path.
 	 * @return  string
 	 */
-	function link_tag
-	(
-	$href = '', string $rel = 'stylesheet', string $type = 'text/css', string $title = '', string $media = '', bool $indexPage = false
-	): string
+	function link_tag($href = '', string $rel = 'stylesheet', string $type = 'text/css', string $title = '', string $media = '', bool $indexPage = false): string
 	{
 		$link = '<link ';
 
+		// extract fields if needed
 		if (is_array($href))
 		{
-			foreach ($href as $k => $v)
-			{
-				if ($k === 'href' && ! preg_match('#^([a-z]+:)?//#i', $v))
-				{
-					if ($indexPage === true)
-					{
-						$link .= 'href="' . site_url($v) . '" ';
-					}
-					else
-					{
-						$link .= 'href="' . slash_item('baseURL') . $v . '" ';
-					}
-				}
-				else
-				{
-					$link .= $k . '="' . $v . '" ';
-				}
-			}
+			$rel = $href['rel'] ?? $rel;
+			$type = $href['type'] ?? $type;
+			$title = $href['title'] ?? $title;
+			$media = $href['media'] ?? $media;
+			$indexPage = $href['indexPage'] ?? $indexPage;
+			$href = $href['href'] ?? '';
 		}
-		else
+
+		if ( ! preg_match('#^([a-z]+:)?//#i', $href))
 		{
-			if (preg_match('#^([a-z]+:)?//#i', $href))
-			{
-				$link .= 'href="' . $href . '" ';
-			}
-			elseif ($indexPage === true)
+			if ($indexPage === true)
 			{
 				$link .= 'href="' . site_url($href) . '" ';
 			}
@@ -365,18 +311,20 @@ function link_tag
 			{
 				$link .= 'href="' . slash_item('baseURL') . $href . '" ';
 			}
+		}
+		else
+			$link .= 'href="' . $href . '" ';
 
-			$link .= 'rel="' . $rel . '" type="' . $type . '" ';
+		$link .= 'rel="' . $rel . '" type="' . $type . '" ';
 
-			if ($media !== '')
-			{
-				$link .= 'media="' . $media . '" ';
-			}
+		if ($media !== '')
+		{
+			$link .= 'media="' . $media . '" ';
+		}
 
-			if ($title !== '')
-			{
-				$link .= 'title="' . $title . '" ';
-			}
+		if ($title !== '')
+		{
+			$link .= 'title="' . $title . '" ';
 		}
 
 		return $link . "/>";
@@ -393,27 +341,20 @@ function link_tag
 		 * Geneartes a video element to embed videos. The video element can
 		 * contain one or more video sources
 		 *
-		 * @param  mixed  $src                   Either a source string or
-		 * an array of sources
+		 * @param  mixed  $src     Either a source string or an array of sources
 		 * @param  string $unsupportedMessage    The message to display
-		 * if the media tag is not supported by the browser
+		 * 		if the media tag is not supported by the browser
 		 * @param  string $attributes            HTML attributes
 		 * @param  array  $tracks
 		 * @param  bool   $indexPage
 		 * @return string
 		 *
 		 */
-		function video
-		(
-		$src, string $unsupportedMessage = '', string $attributes = '', array $tracks = [], bool $indexPage = false
-		): string
+		function video($src, string $unsupportedMessage = '', string $attributes = '', array $tracks = [], bool $indexPage = false): string
 		{
 			if (is_array($src))
 			{
-				return _media
-						(
-						'video', $src, $unsupportedMessage, $attributes, $tracks
-				);
+				return _media('video', $src, $unsupportedMessage, $attributes, $tracks);
 			}
 
 			$video = '<video';
@@ -478,17 +419,11 @@ function video
 		 *
 		 * @return string
 		 */
-		function audio
-		(
-		$src, string $unsupportedMessage = '', string $attributes = '', array $tracks = [], bool $indexPage = false
-		): string
+		function audio($src, string $unsupportedMessage = '', string $attributes = '', array $tracks = [], bool $indexPage = false): string
 		{
 			if (is_array($src))
 			{
-				return _media
-						(
-						'audio', $src, $unsupportedMessage, $attributes, $tracks
-				);
+				return _media('audio', $src, $unsupportedMessage, $attributes, $tracks);
 			}
 
 			$audio = '<audio';
@@ -517,15 +452,13 @@ function audio
 			{
 				foreach ($tracks as $track)
 				{
-					$audio .= $track;
+					$audio .= "\n" . _space_indent() . $track;
 				}
 			}
 
 			if ( ! empty($unsupportedMessage))
 			{
-				$video .= _space_indent()
-						. $unsupportedMessage
-						. "\n";
+				$audio .= "\n" . _space_indent() . $unsupportedMessage . "\n";
 			}
 
 			$audio .= "</audio>\n";
@@ -540,10 +473,7 @@ function audio
 	if ( ! function_exists('_media'))
 	{
 
-		function _media
-		(
-		string $name, array $types, string $unsupportedMessage = '', string $attributes = '', array $tracks = []
-		): string
+		function _media(string $name, array $types = [], string $unsupportedMessage = '', string $attributes = '', array $tracks = []): string
 		{
 			$media = '<' . $name;
 
@@ -563,11 +493,7 @@ function _media
 				$media .= _space_indent() . $option . "\n";
 			}
 
-			if (empty($tracks))
-			{
-				$media .= "/>";
-			}
-			else
+			if ( ! empty($tracks))
 			{
 				foreach ($tracks as $track)
 				{
@@ -605,23 +531,17 @@ function _media
 		 * @param  bool $indexPage
 		 * @return string
 		 */
-		function source
-		(
-		string $src, string $type, string $attributes = '', bool $indexPage = false
-		): string
+		function source(string $src, string $type = 'unknown', string $attributes = '', bool $indexPage = false): string
 		{
-			if (_has_protocol($src))
-			{
-				//Do nothing.
-			}
-			elseif ($indexPage === true)
-			{
-				$src = site_url($src);
-			}
-			else
-			{
-				$src = slash_item('baseURL') . $src;
-			}
+			if ( ! _has_protocol($src))
+				if ($indexPage === true)
+				{
+					$src = site_url($src);
+				}
+				else
+				{
+					$src = slash_item('baseURL') . $src;
+				}
 
 			$source = '<source src="' . $src
 					. '" type="' . $type . '"';
@@ -655,10 +575,7 @@ function source
 		 * @param  string $label
 		 * @return string
 		 */
-		function track
-		(
-		string $src, string $kind, string $srcLanguage, string $label
-		): string
+		function track(string $src, string $kind, string $srcLanguage, string $label): string
 		{
 			return '<track src="' . $src
 					. '" kind="' . $kind
@@ -689,23 +606,17 @@ function track
 		 *
 		 * @return string
 		 */
-		function object
-		(
-		string $data, string $type, string $attributes = '', array $params = [], bool $indexPage = false
-		): string
+		function object(string $data, string $type = 'unknown', string $attributes = '', array $params = [], bool $indexPage = false): string
 		{
-			if (_has_protocol($data))
-			{
-				//Do nothing.
-			}
-			elseif ($indexPage === true)
-			{
-				$data = site_url($data);
-			}
-			else
-			{
-				$data = slash_item('baseURL') . $data;
-			}
+			if ( ! _has_protocol($data))
+				if ($indexPage === true)
+				{
+					$data = site_url($data);
+				}
+				else
+				{
+					$data = slash_item('baseURL') . $data;
+				}
 
 			$object = '<object data="' . $data . '" '
 					. $attributes . '>';
@@ -744,10 +655,7 @@ function object
 		 * @param  string $attributes  HTML attributes
 		 * @return string
 		 */
-		function param
-		(
-		string $name, string $value, string $type = 'ref', string $attributes = ''
-		): string
+		function param(string $name, string $value, string $type = 'ref', string $attributes = ''): string
 		{
 			return '<param name="' . $name
 					. '" type="' . $type
@@ -773,23 +681,17 @@ function param
 		 * @param  bool   $indexPage
 		 * @return string
 		 */
-		function embed
-		(
-		string $src, string $type, string $attributes = '', bool $indexPage = false
-		): string
+		function embed(string $src, string $type='unknown', string $attributes = '', bool $indexPage = false): string
 		{
-			if (_has_protocol($src))
-			{
-				//Do nothing.
-			}
-			elseif ($indexPage === true)
-			{
-				$src = site_url($src);
-			}
-			else
-			{
-				$src = slash_item('baseURL') . $src;
-			}
+			if ( ! _has_protocol($src))
+				if ($indexPage === true)
+				{
+					$src = site_url($src);
+				}
+				else
+				{
+					$src = slash_item('baseURL') . $src;
+				}
 
 			return '<embed src="' . $src
 					. '" type="' . $type . '" '
diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php
index 7e41046f755f..671406c9dbf7 100755
--- a/tests/system/Helpers/HTMLHelperTest.php
+++ b/tests/system/Helpers/HTMLHelperTest.php
@@ -13,9 +13,8 @@ public function setUp()
 		helper('url');
 		helper('html');
 
-		$this->tracks =
-		[
-			track('subtitles_no.vtt',  'subtitles', 'no',  'Norwegian No'),
+		$this->tracks = [
+			track('subtitles_no.vtt', 'subtitles', 'no', 'Norwegian No'),
 			track('subtitles_yes.vtt', 'subtitles', 'yes', 'Norwegian Yes')
 		];
 	}
@@ -33,7 +32,7 @@ public function testBasicUL()
 EOH;
 
 		$expected = ltrim($expected);
-		$list     = ['foo', 'bar'];
+		$list = ['foo', 'bar'];
 
 		$this->assertEquals(ltrim($expected), ul($list));
 	}
@@ -49,7 +48,7 @@ public function testULWithClass()
 EOH;
 
 		$expected = ltrim($expected);
-		$list     = ['foo', 'bar'];
+		$list = ['foo', 'bar'];
 
 		$this->assertEquals($expected, ul($list, 'class="test"'));
 	}
@@ -71,7 +70,7 @@ public function testMultiLevelUL()
 EOH;
 
 		$expected = ltrim($expected);
-		$list     = ['foo', 'bar', ['foo', 'bar']];
+		$list = ['foo', 'bar', ['foo', 'bar']];
 
 		$this->assertEquals(ltrim($expected), ul($list));
 	}
@@ -89,7 +88,7 @@ public function testBasicOL()
 EOH;
 
 		$expected = ltrim($expected);
-		$list     = ['foo', 'bar'];
+		$list = ['foo', 'bar'];
 
 		$this->assertEquals(ltrim($expected), ol($list));
 	}
@@ -105,7 +104,7 @@ public function testOLWithClass()
 EOH;
 
 		$expected = ltrim($expected);
-		$list     = ['foo', 'bar'];
+		$list = ['foo', 'bar'];
 
 		$this->assertEquals($expected, ol($list, 'class="test"'));
 	}
@@ -127,7 +126,7 @@ public function testMultiLevelOL()
 EOH;
 
 		$expected = ltrim($expected);
-		$list     = ['foo', 'bar', ['foo', 'bar']];
+		$list = ['foo', 'bar', ['foo', 'bar']];
 
 		$this->assertEquals(ltrim($expected), ol($list));
 	}
@@ -136,45 +135,93 @@ public function testMultiLevelOL()
 
 	public function testIMG()
 	{
-		//TODO: Mock baseURL and siteURL.
-		$this->assertEquals
-		(
-			'<img src="http://site.com/images/picture.jpg" alt="" />',
-			img('http://site.com/images/picture.jpg')
-		);
+		$target = 'http://site.com/images/picture.jpg';
+		$expected = '<img src="http://site.com/images/picture.jpg" alt="" />';
+		$this->assertEquals($expected, img($target));
+	}
+
+	public function testIMGWithoutProtocol()
+	{
+		$target = 'assets/mugshot.jpg';
+		$expected = '<img src="http://example.com/assets/mugshot.jpg" alt="" />';
+		$this->assertEquals($expected, img($target));
+	}
+
+	public function testIMGWithIndexpage()
+	{
+		$target = 'assets/mugshot.jpg';
+		$expected = '<img src="http://example.com/index.php/assets/mugshot.jpg" alt="" />';
+		$this->assertEquals($expected, img($target, true));
 	}
 
 	// ------------------------------------------------------------------------
 
 	public function testScriptTag()
 	{
-		$this->assertEquals
-		(
-			'<script src="http://site.com/js/mystyles.js" type="text/javascript"></script>',
-			script_tag('http://site.com/js/mystyles.js')
-		);
+		$target = 'http://site.com/js/mystyles.js';
+		$expected = '<script src="http://site.com/js/mystyles.js" type="text/javascript"></script>';
+		$this->assertEquals($expected, script_tag($target));
+	}
+
+	public function testScriptTagWithoutProtocol()
+	{
+		$target = 'js/mystyles.js';
+		$expected = '<script src="http://example.com/js/mystyles.js" type="text/javascript"></script>';
+		$this->assertEquals($expected, script_tag($target));
+	}
+
+	public function testScriptTagWithIndexpage()
+	{
+		$target = 'js/mystyles.js';
+		$expected = '<script src="http://example.com/index.php/js/mystyles.js" type="text/javascript"></script>';
+		$this->assertEquals($expected, script_tag($target, true));
 	}
 
 	// ------------------------------------------------------------------------
 
 	public function testLinkTag()
 	{
-		$this->assertEquals
-		(
-			'<link href="http://site.com/css/mystyles.css" rel="stylesheet" type="text/css" />',
-			link_tag('http://site.com/css/mystyles.css')
-		);
+		$target = 'css/mystyles.css';
+		$expected = '<link href="http://example.com/css/mystyles.css" rel="stylesheet" type="text/css" />';
+		$this->assertEquals($expected, link_tag($target));
+	}
+
+	public function testLinkTagComplete()
+	{
+		$target = 'https://styles.com/css/mystyles.css';
+		$expected = '<link href="https://styles.com/css/mystyles.css" rel="banana" type="fruit" media="VHS" title="Go away" />';
+		$this->assertEquals($expected, link_tag($target, 'banana', 'fruit', 'Go away', 'VHS'));
+	}
+
+	public function testLinkTagArray()
+	{
+		$parms = [
+			'href' => 'css/mystyles.css',
+			'indexPage' => true,
+		];
+		$expected = '<link href="http://example.com/index.php/css/mystyles.css" rel="stylesheet" type="text/css" />';
+		$this->assertEquals($expected, link_tag($parms));
 	}
 
 	// ------------------------------------------------------------------------
 
 	public function testDocType()
 	{
-		$this->assertEquals
-		(
-			'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
-			doctype('html4-strict')
-		);
+		$target = 'html4-strict';
+		$expected = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">';
+		$this->assertEquals($expected, doctype($target));
+	}
+
+	public function testDocTypeDefault()
+	{
+		$expected = '<!DOCTYPE html>';
+		$this->assertEquals($expected, doctype());
+	}
+
+	public function testDocTypeInvalid()
+	{
+		$target = 'good-guess';
+		$this->assertEquals(false, doctype($target));
 	}
 
 	// ------------------------------------------------------------------------
@@ -182,23 +229,39 @@ public function testDocType()
 	public function testVideo()
 	{
 		$expected = <<<EOH
-<video src="http://example.com/test.mp4" controls>
+<video src="http://www.codeigniter.com/test.mp4" controls>
   Your browser does not support the video tag.
 </video>
 
 EOH;
 
-		$video = video
-		(
-			'test.mp4',
-			'Your browser does not support the video tag.',
-			'controls'
-		);
+		$target = 'http://www.codeigniter.com/test.mp4';
+		$message = 'Your browser does not support the video tag.';
+		$video = video($target, $message, 'controls');
+		$this->assertEquals($expected, $video);
+	}
 
+	public function testVideoWithTracks()
+	{
+		$expected = <<<EOH
+<video src="http://example.com/test.mp4" controls>
+  <track src="subtitles_no.vtt" kind="subtitles" srclang="no" label="Norwegian No" />
+  <track src="subtitles_yes.vtt" kind="subtitles" srclang="yes" label="Norwegian Yes" />
+  Your browser does not support the video tag.
+</video>
+
+EOH;
+
+		$target = 'test.mp4';
+		$message = 'Your browser does not support the video tag.';
+		$video = video($target, $message, 'controls', $this->tracks);
 		$this->assertEquals($expected, $video);
+	}
 
+	public function testVideoWithTracksAndIndex()
+	{
 		$expected = <<<EOH
-<video src="http://www.codeigniter.com/test.mp4" controls>
+<video src="http://example.com/index.php/test.mp4" controls>
   <track src="subtitles_no.vtt" kind="subtitles" srclang="no" label="Norwegian No" />
   <track src="subtitles_yes.vtt" kind="subtitles" srclang="yes" label="Norwegian Yes" />
   Your browser does not support the video tag.
@@ -206,15 +269,14 @@ public function testVideo()
 
 EOH;
 
-		$video = video
-		(
-			'http://www.codeigniter.com/test.mp4',
-			'Your browser does not support the video tag.',
-			'controls',
-			$this->tracks
-		);
+		$target = 'test.mp4';
+		$message = 'Your browser does not support the video tag.';
+		$video = video($target, $message, 'controls', $this->tracks, true);
 		$this->assertEquals($expected, $video);
+	}
 
+	public function testVideoMultipleSources()
+	{
 		$expected = <<<EOH
 <video class="test" controls>
   <source src="http://example.com/movie.mp4" type="video/mp4" class="test" />
@@ -228,20 +290,16 @@ public function testVideo()
 
 EOH;
 
-		$video = video
-		(
-			[
-			  source('movie.mp4', 'video/mp4', 'class="test"'),
-			  source('movie.ogg', 'video/ogg'),
-			  source('movie.mov', 'video/quicktime'),
-			  source('movie.ogv', 'video/ogv; codecs=dirac, speex')
-			],
-			'Your browser does not support the video tag.',
-			'class="test" controls',
-			$this->tracks
-		 );
+		$sources = [
+			source('movie.mp4', 'video/mp4', 'class="test"'),
+			source('movie.ogg', 'video/ogg'),
+			source('movie.mov', 'video/quicktime'),
+			source('movie.ogv', 'video/ogv; codecs=dirac, speex')
+		];
+		$message = 'Your browser does not support the video tag.';
+		$video = video($sources, $message, 'class="test" controls', $this->tracks);
 
-		 $this->assertEquals($expected, $video);
+		$this->assertEquals($expected, $video);
 	}
 
 	// ------------------------------------------------------------------------
@@ -259,22 +317,118 @@ public function testAudio()
 
 EOH;
 
-		$audio = audio
-		(
-			[
-				source('sound.ogg', 'audio/ogg'),
-				source('sound.mpeg', 'audio/mpeg')
-			],
-			'Your browser does not support the audio tag.',
-			'id="test" controls',
-			$this->tracks
-		 );
+		$sources = [
+			source('sound.ogg', 'audio/ogg'),
+			source('sound.mpeg', 'audio/mpeg')
+		];
+		$message = 'Your browser does not support the audio tag.';
+		$audio = audio($sources, $message, 'id="test" controls', $this->tracks);
+
+		$this->assertEquals($expected, $audio);
+	}
+
+	public function testAudioSimple()
+	{
+		$expected = <<<EOH
+<audio src="http://example.com/sound.mpeg" type="audio/mpeg" id="test" controls>
+  Your browser does not support the audio tag.
+</audio>
+
+EOH;
+
+		$source = 'sound.mpeg';
+		$message = 'Your browser does not support the audio tag.';
+		$audio = audio($source, $message, 'type="audio/mpeg" id="test" controls');
+
+		$this->assertEquals($expected, $audio);
+	}
+
+	public function testAudioWithSource()
+	{
+		$expected = <<<EOH
+<audio src="http://codeigniter.com/sound.mpeg" type="audio/mpeg" id="test" controls>
+  Your browser does not support the audio tag.
+</audio>
+
+EOH;
+
+		$source = 'http://codeigniter.com/sound.mpeg';
+		$message = 'Your browser does not support the audio tag.';
+		$audio = audio($source, $message, 'type="audio/mpeg" id="test" controls');
+
+		$this->assertEquals($expected, $audio);
+	}
+
+	public function testAudioWithIndex()
+	{
+		$expected = <<<EOH
+<audio src="http://example.com/index.php/sound.mpeg" type="audio/mpeg" id="test" controls>
+  Your browser does not support the audio tag.
+</audio>
+
+EOH;
+
+		$source = 'sound.mpeg';
+		$message = 'Your browser does not support the audio tag.';
+		$audio = audio($source, $message, 'type="audio/mpeg" id="test" controls', [], true);
+
+		$this->assertEquals($expected, $audio);
+	}
+
+	public function testAudioWithTracks()
+	{
+		$expected = <<<EOH
+<audio src="http://example.com/sound.mpeg" type="audio/mpeg" id="test" controls>
+  <track src="subtitles_no.vtt" kind="subtitles" srclang="no" label="Norwegian No" />
+  <track src="subtitles_yes.vtt" kind="subtitles" srclang="yes" label="Norwegian Yes" />
+  Your browser does not support the audio tag.
+</audio>
+
+EOH;
+
+		$source = 'sound.mpeg';
+		$message = 'Your browser does not support the audio tag.';
+		$audio = audio($source, $message, 'type="audio/mpeg" id="test" controls', $this->tracks);
 
 		$this->assertEquals($expected, $audio);
 	}
 
 	// ------------------------------------------------------------------------
 
+	public function testMediaNameOnly()
+	{
+		$expected = <<<EOH
+<av>
+</av>
+
+EOH;
+		$this->assertEquals($expected, _media('av'));
+	}
+
+	public function testMediaWithSources()
+	{
+		$expected = <<<EOH
+<av>
+  <source src="http://example.com/sound.ogg" type="audio/ogg" />
+  <source src="http://example.com/sound.mpeg" type="audio/mpeg" />
+</av>
+
+EOH;
+		$sources = [
+			source('sound.ogg', 'audio/ogg'),
+			source('sound.mpeg', 'audio/mpeg')
+		];
+		$this->assertEquals($expected, _media('av', $sources));
+	}
+
+	public function testSource()
+	{
+		$expected = '<source src="http://example.com/index.php/sound.mpeg" type="audio/mpeg" />';
+		$this->assertEquals($expected, source('sound.mpeg', 'audio/mpeg', '', true));
+	}
+
+	// ------------------------------------------------------------------------
+
 	public function testEmbed()
 	{
 		$expected = <<<EOH
@@ -282,10 +436,23 @@ public function testEmbed()
 
 EOH;
 
-		$embed = embed('movie.mov', 'video/quicktime', 'class="test"');
+		$type = 'video/quicktime';
+		$embed = embed('movie.mov', $type, 'class="test"');
 		$this->assertEquals($expected, $embed);
 	}
 
+	public function testEmbedIndexed()
+	{
+		$expected = <<<EOH
+<embed src="http://example.com/index.php/movie.mov" type="video/quicktime" class="test" />
+
+EOH;
+
+		$type = 'video/quicktime';
+		$embed = embed('movie.mov', $type, 'class="test"', true);
+		$this->assertEquals($expected, $embed, '');
+	}
+
 	public function testObject()
 	{
 		$expected = <<<EOH
@@ -293,14 +460,14 @@ public function testObject()
 
 EOH;
 
-		$object = object
-		 (
-			'movie.swf',
-			'application/x-shockwave-flash',
-			'class="test"'
-		);
+		$type = 'application/x-shockwave-flash';
+		$object = object('movie.swf', $type, 'class="test"');
 
 		$this->assertEquals($expected, $object);
+	}
+
+	public function testObjectWithParams()
+	{
 
 		$expected = <<<EOH
 <object data="http://example.com/movie.swf" class="test">
@@ -310,19 +477,27 @@ public function testObject()
 
 EOH;
 
-		$object = object
-		(
-			'movie.swf',
-			'application/x-shockwave-flash',
-			'class="test"',
-			[
-				param('foo', 'bar', 'ref', 'class="test"'),
-				param('hello', 'world', 'ref', 'class="test"')
-			]
-		);
+		$type = 'application/x-shockwave-flash';
+		$parms = [
+			param('foo', 'bar', 'ref', 'class="test"'),
+			param('hello', 'world', 'ref', 'class="test"')
+		];
+		$object = object('movie.swf', $type, 'class="test"', $parms);
 		$this->assertEquals($expected, $object);
 	}
 
-	// ------------------------------------------------------------------------
+	public function testObjectIndexed()
+	{
+		$expected = <<<EOH
+<object data="http://example.com/index.php/movie.swf" class="test"></object>
+
+EOH;
+
+		$type = 'application/x-shockwave-flash';
+		$object = object('movie.swf', $type, 'class="test"', [], true);
 
+		$this->assertEquals($expected, $object);
+	}
+
+	// ------------------------------------------------------------------------
 }
diff --git a/user_guide_src/source/helpers/html_helper.rst b/user_guide_src/source/helpers/html_helper.rst
index 4bf6e0bf6d3c..d5ad51f6f23a 100755
--- a/user_guide_src/source/helpers/html_helper.rst
+++ b/user_guide_src/source/helpers/html_helper.rst
@@ -26,9 +26,9 @@ The following functions are available:
 
 .. php:function:: img([$src = ''[, $indexPage = false[, $attributes = '']]])
 
-    :param  string  $src:        Image source data
+    :param  mixed  $src:        Image source data
     :param  bool    $indexPage:  Whether to treat $src as a routed URI string
-    :param  array   $attributes: HTML attributes
+    :param  mixed   $attributes: HTML attributes
     :returns:   HTML image tag
     :rtype: string
 
@@ -46,7 +46,7 @@ The following functions are available:
         echo img('images/picture.jpg', true);
         // <img src="http://site.com/index.php/images/picture.jpg" alt="" />
 
-    Additionally, an associative array can be passed to the ``img()`` function
+    Additionally, an associative array can be passed as the first parameter,
     for complete control over all attributes and values. If an *alt* attribute
     is not provided, CodeIgniter will generate an empty string.
 
@@ -96,7 +96,7 @@ The following functions are available:
         echo link_tag('feed', 'alternate', 'application/rss+xml', 'My RSS Feed');
         // <link href="http://site.com/feed" rel="alternate" type="application/rss+xml" title="My RSS Feed" />
 
-    Additionally, an associative array can be passed to the ``link()`` function
+    Alternately, an associative array can be passed to the ``link_tag()`` function
     for complete control over all attributes and values::
 
         $link = array(
@@ -111,7 +111,7 @@ The following functions are available:
 
 .. php:function:: script_tag([$src = ''[, $indexPage = false]])
 
-    :param  string  $src: The source of JavaScript file
+    :param  mixed  $src: The source name of a JavaScript file
     :param  bool    $indexPage: Whether to treat $src as a routed URI string
     :returns:   HTML script tag
     :rtype: string
@@ -126,11 +126,7 @@ The following functions are available:
         echo script_tag('js/mystyles.js');
         // <script src="http://site.com/js/mystyles.js" type="text/javascript"></script>
 
-    Further examples::
-
-        // to be done
-
-    Additionally, an associative array can be passed to the ``script_tag()`` function
+    Alternately, an associative array can be passed to the ``script_tag()`` function
     for complete control over all attributes and values::
 
         $script = array('src'  => 'js/printer.js');
@@ -341,7 +337,7 @@ The following functions are available:
     :param  string  $attributes:
     :param  array   $tracks:             Use the track function inside an array. See :php:func:`track()` function
     :param  bool    $indexPage:
-    :returns:                            HTML-formatted video element
+    :returns:                            HTML-formatted audio element
     :rtype: string
 
     Identical to :php:func:`video()`, only it produces the <audio> tag instead of <video>.
@@ -456,8 +452,8 @@ The following functions are available:
         echo doctype('html4-trans');
         // <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
-    The following is a list of doctype choices. These are configurable, and
-    pulled from application/config/doctypes.php
+    The following is a list of the pre-defined doctype choices. These are configurable, 
+    pulled from `application/Config/DocTypes.php`, or they could be over-ridden in your `.env` configuration.
 
     =============================== =================== ==================================================================================================================================================
     Document type                   Option              Result

From c9c1182c45ff3b1b367983d6d52646fdae311226 Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Fri, 29 Jun 2018 14:09:12 -0700
Subject: [PATCH 09/69] Flesh out number_helper tests

---
 system/Helpers/number_helper.php              |  75 +++----
 tests/system/Helpers/NumberHelperTest.php     | 201 ++++++++++--------
 .../source/helpers/number_helper.rst          |  14 +-
 user_guide_src/source/libraries/files.rst     |   4 +-
 4 files changed, 167 insertions(+), 127 deletions(-)

diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php
index 356d1989a60b..2d041726008d 100644
--- a/system/Helpers/number_helper.php
+++ b/system/Helpers/number_helper.php
@@ -49,20 +49,21 @@
 	 */
 	function number_to_size($num, int $precision = 1, string $locale = null)
 	{
-		// Strip any formatting
-		$num = 0 + str_replace(',', '', $num);
-
-		// Can't work with non-numbers...
-		if ( ! is_numeric($num))
+		// Strip any formatting & ensure numeric input
+		try
+		{
+			$num = 0 + str_replace(',', '', $num);
+		}
+		catch (\ErrorException $ee)
 		{
 			return false;
 		}
 
 		// ignore sub part
 		$genralLocale = $locale;
-		if( ! empty($locale) && ( $underscorePos = strpos( $locale, '_' )))
+		if ( ! empty($locale) && ( $underscorePos = strpos($locale, '_')))
 		{
-			$genralLocale = substr( $locale, 0, $underscorePos );
+			$genralLocale = substr($locale, 0, $underscorePos);
 		}
 
 		if ($num >= 1000000000000)
@@ -119,22 +120,24 @@ function number_to_size($num, int $precision = 1, string $locale = null)
 	 */
 	function number_to_amount($num, int $precision = 0, string $locale = null)
 	{
-		// Strip any formatting
-		$num = 0 + str_replace(',', '', $num);
-
-		// Can't work with non-numbers...
-		if ( ! is_numeric($num))
+		// Strip any formatting & ensure numeric input
+		try
+		{
+			$num = 0 + str_replace(',', '', $num);
+		}
+		catch (\ErrorException $ee)
 		{
 			return false;
 		}
 
+
 		$suffix = '';
 
 		// ignore sub part
 		$genralLocale = $locale;
-		if( ! empty($locale) && ( $underscorePos = strpos( $locale, '_' )))
+		if ( ! empty($locale) && ( $underscorePos = strpos($locale, '_')))
 		{
-			$genralLocale = substr( $locale, 0, $underscorePos );
+			$genralLocale = substr($locale, 0, $underscorePos);
 		}
 
 		if ($num > 1000000000000000)
@@ -172,6 +175,7 @@ function number_to_amount($num, int $precision = 0, string $locale = null)
 
 if ( ! function_exists('number_to_currency'))
 {
+
 	/**
 	 * @param float  $num
 	 * @param string $currency
@@ -182,8 +186,8 @@ function number_to_amount($num, int $precision = 0, string $locale = null)
 	function number_to_currency($num, string $currency, string $locale = null)
 	{
 		return format_number($num, 1, $locale, [
-			'type'		 => NumberFormatter::CURRENCY,
-			'currency'	 => $currency
+			'type' => NumberFormatter::CURRENCY,
+			'currency' => $currency
 		]);
 	}
 
@@ -258,49 +262,48 @@ function format_number($num, int $precision = 1, string $locale = null, array $o
 
 if ( ! function_exists('number_to_roman'))
 {
+
 	/**
-	* Convert a number to a roman numeral.
-	*
-	* @param int $num it will convert to int
-	*
-	* @return string
-	*/
+	 * Convert a number to a roman numeral.
+	 *
+	 * @param int $num it will convert to int
+	 *
+	 * @return string
+	 */
 	function number_to_roman($num)
 	{
 		$num = (int) $num;
 		if ($num < 1 || $num > 3999)
 		{
-				return;
+			return;
 		}
 
 		$_number_to_roman = function($num, $th) use ( &$_number_to_roman ) {
 			$return = '';
 			$key1 = NULL;
 			$key2 = NULL;
-			switch ($th)
-			{
+			switch ($th) {
 				case 1:
-					$key1  = 'I';
-					$key2  = 'V';
+					$key1 = 'I';
+					$key2 = 'V';
 					$key_f = 'X';
 					break;
 				case 2:
-					$key1  = 'X';
-					$key2  = 'L';
+					$key1 = 'X';
+					$key2 = 'L';
 					$key_f = 'C';
 					break;
 				case 3:
-					$key1  = 'C';
-					$key2  = 'D';
+					$key1 = 'C';
+					$key2 = 'D';
 					$key_f = 'M';
 					break;
 				case 4:
-					$key1  = 'M';
+					$key1 = 'M';
 					break;
 			}
 			$n = $num % 10;
-			switch ($n)
-			{
+			switch ($n) {
 				case 1:
 				case 2:
 				case 3:
@@ -321,8 +324,7 @@ function number_to_roman($num)
 					$return = $key1 . $key_f;
 					break;
 			}
-			switch ($num)
-			{
+			switch ($num) {
 				case 10:
 					$return = $key_f;
 					break;
@@ -335,4 +337,5 @@ function number_to_roman($num)
 		};
 		return $_number_to_roman($num, 1);
 	}
+
 }
diff --git a/tests/system/Helpers/NumberHelperTest.php b/tests/system/Helpers/NumberHelperTest.php
index 36a4b9da205e..4c5b437a4d8a 100755
--- a/tests/system/Helpers/NumberHelperTest.php
+++ b/tests/system/Helpers/NumberHelperTest.php
@@ -2,98 +2,123 @@
 
 class numberHelperTest extends \CIUnitTestCase
 {
+
 	public function setUp()
 	{
 		parent::setUp();
 
 		helper('number');
-    }
-
-    public function test_roman_number()
-    {
-        $this->assertEquals('XCVI', number_to_roman(96));
-        $this->assertEquals('MMDCCCXCV', number_to_roman(2895));
-        $this->assertEquals('CCCXXIX', number_to_roman(329));
-    }
-
-    public function test_format_number()
-    {
-        $this->assertEquals('123,456', format_number(123456, 0, 'en_US'));
-    }
-
-    public function test_format_number_with_precision()
-    {
-        $this->assertEquals('123,456.8', format_number(123456.789, 1, 'en_US'));
-        $this->assertEquals('123,456.79', format_number(123456.789, 2, 'en_US'));
-    }
-
-    public function test_number_to_size()
-    {
-        $this->assertEquals('456 Bytes', number_to_size(456, 1, 'en_US'));
-    }
-
-    public function test_kb_format()
-    {
-        $this->assertEquals('4.5 KB', number_to_size(4567, 1, 'en_US'));
-    }
-
-    public function test_kb_format_medium()
-    {
-        $this->assertEquals('44.6 KB', number_to_size(45678, 1, 'en_US'));
-    }
-
-    public function test_kb_format_large()
-    {
-        $this->assertEquals('446.1 KB', number_to_size(456789, 1, 'en_US'));
-    }
-
-    public function test_mb_format()
-    {
-        $this->assertEquals('3.3 MB', number_to_size(3456789, 1, 'en_US'));
-    }
-
-    public function test_gb_format()
-    {
-        $this->assertEquals('1.8 GB', number_to_size(1932735283.2, 1, 'en_US'));
-    }
-
-    public function test_tb_format()
-    {
-        $this->assertEquals('112,283.3 TB', number_to_size(123456789123456789, 1, 'en_US'));
-    }
-
-    public function test_thousands()
-    {
-        $this->assertEquals('123 thousand', number_to_amount('123,000', 0, 'en_US'));
-    }
-
-    public function test_millions()
-    {
-        $this->assertEquals('123.4 million', number_to_amount('123,400,000', 1, 'en_US'));
-    }
-
-    public function test_billions()
-    {
-        $this->assertEquals('123.46 billion', number_to_amount('123,456,000,000', 2, 'en_US'));
-    }
-
-    public function test_trillions()
-    {
-        $this->assertEquals('123.457 trillion', number_to_amount('123,456,700,000,000', 3, 'en_US'));
-    }
-
-    public function test_quadrillions()
-    {
-        $this->assertEquals('123.5 quadrillion', number_to_amount('123,456,700,000,000,000', 1, 'en_US'));
-    }
-
-    /**
-     * @group single
-     */
-    public function test_currency_current_locale()
-    {
-        $this->assertEquals('$1,234.56', number_to_currency(1234.56, 'USD', 'en_US'));
-        $this->assertEquals('£1,234.56', number_to_currency(1234.56, 'GBP', 'en_GB'));
-    }
+	}
+
+	public function test_roman_number()
+	{
+		$this->assertEquals('XCVI', number_to_roman(96));
+		$this->assertEquals('MMDCCCXCV', number_to_roman(2895));
+		$this->assertEquals('CCCXXIX', number_to_roman(329));
+		$this->assertEquals('IV', number_to_roman(4));
+		$this->assertEquals('X', number_to_roman(10));
+	}
+
+	public function testRomanNumberRange()
+	{
+		$this->assertEquals(null, number_to_roman(-1));
+		$this->assertEquals(null, number_to_roman(0));
+		$this->assertEquals(null, number_to_roman(4000));
+	}
+
+	public function test_format_number()
+	{
+		$this->assertEquals('123,456', format_number(123456, 0, 'en_US'));
+	}
+
+	public function test_format_number_with_precision()
+	{
+		$this->assertEquals('123,456.8', format_number(123456.789, 1, 'en_US'));
+		$this->assertEquals('123,456.79', format_number(123456.789, 2, 'en_US'));
+	}
+
+	public function testFormattingOptions()
+	{
+		$options = [
+			'before' => '<<',
+			'after' => '>>',
+		];
+		$this->assertEquals('<<123,456.79>>', format_number(123456.789, 2, 'en_US', $options));
+	}
+
+	public function test_number_to_size()
+	{
+		$this->assertEquals('456 Bytes', number_to_size(456, 1, 'en_US'));
+	}
+
+	public function test_kb_format()
+	{
+		$this->assertEquals('4.5 KB', number_to_size(4567, 1, 'en_US'));
+	}
+
+	public function test_kb_format_medium()
+	{
+		$this->assertEquals('44.6 KB', number_to_size(45678, 1, 'en_US'));
+	}
+
+	public function test_kb_format_large()
+	{
+		$this->assertEquals('446.1 KB', number_to_size(456789, 1, 'en_US'));
+	}
+
+	public function test_mb_format()
+	{
+		$this->assertEquals('3.3 MB', number_to_size(3456789, 1, 'en_US'));
+	}
+
+	public function test_gb_format()
+	{
+		$this->assertEquals('1.8 GB', number_to_size(1932735283.2, 1, 'en_US'));
+	}
+
+	public function test_tb_format()
+	{
+		$this->assertEquals('112,283.3 TB', number_to_size(123456789123456789, 1, 'en_US'));
+	}
+
+	public function test_thousands()
+	{
+		$this->assertEquals('123 thousand', number_to_amount('123,000', 0, 'en_US'));
+	}
+
+	public function test_millions()
+	{
+		$this->assertEquals('123.4 million', number_to_amount('123,400,000', 1, 'en_US'));
+	}
+
+	public function test_billions()
+	{
+		$this->assertEquals('123.46 billion', number_to_amount('123,456,000,000', 2, 'en_US'));
+	}
+
+	public function test_trillions()
+	{
+		$this->assertEquals('123.457 trillion', number_to_amount('123,456,700,000,000', 3, 'en_US'));
+	}
+
+	public function test_quadrillions()
+	{
+		$this->assertEquals('123.5 quadrillion', number_to_amount('123,456,700,000,000,000', 1, 'en_US'));
+	}
+
+	/**
+	 * @group single
+	 */
+	public function test_currency_current_locale()
+	{
+		$this->assertEquals('$1,234.56', number_to_currency(1234.56, 'USD', 'en_US'));
+		$this->assertEquals('£1,234.56', number_to_currency(1234.56, 'GBP', 'en_GB'));
+	}
+
+	public function testNumbersThatArent()
+	{
+		$this->assertFalse(number_to_size('1232x'));
+		$this->assertFalse(number_to_amount('1232x'));
+	}
 
 }
diff --git a/user_guide_src/source/helpers/number_helper.rst b/user_guide_src/source/helpers/number_helper.rst
index 58ab341b39f0..77842e525e74 100644
--- a/user_guide_src/source/helpers/number_helper.rst
+++ b/user_guide_src/source/helpers/number_helper.rst
@@ -19,6 +19,13 @@ This helper is loaded using the following code::
 
 	helper('number');
 
+When Things Go Wrong
+====================
+
+If PHP's internationalization and localization logic cannot handle
+a value provided, for the given locale and options, then a
+``BadFunctionCallException()`` will be thrown.
+
 Available Functions
 ===================
 
@@ -28,7 +35,7 @@ The following functions are available:
 
     :param	mixed	$num: Number of bytes
     :param	int	$precision: Floating point precision
-    :returns:	Formatted data size string
+    :returns:	Formatted data size string, or false if the provided value is not numeric
     :rtype:	string
 
     Formats numbers as bytes, based on size, and adds the appropriate
@@ -64,7 +71,7 @@ The following functions are available:
     :param	mixed	$num: Number to format
     :param	int	$precision: Floating point precision
     :param  string $locale: The locale to use for formatting
-    :returns:	A human-readable version of the string
+    :returns:	A human-readable version of the string, or false if the provided value is not numeric
     :rtype:	string
 
     Converts a number into a human-readable version, like **123.4 trillion**
@@ -109,3 +116,6 @@ The following functions are available:
         echo number_to_roman(23);  // Returns XXIII
         echo number_to_roman(324);  // Returns CCCXXIV
         echo number_to_roman(2534);  // Returns MMDXXXIV
+
+    This function only handles numbers in the range 1 through 3999.
+    It will return null for any value outside that range .
\ No newline at end of file
diff --git a/user_guide_src/source/libraries/files.rst b/user_guide_src/source/libraries/files.rst
index cef75d658ad6..f681801a2c1d 100644
--- a/user_guide_src/source/libraries/files.rst
+++ b/user_guide_src/source/libraries/files.rst
@@ -12,7 +12,9 @@ and :doc:`images </libraries/images>`.
 Getting a File instance
 =======================
 
-You create a new File instance by passing in the path to the file in the constructor. By default the file does not need to exist. However, you can pass an additional argument of "true" to check that the file exist and throw ``FileNotFoundException()`` when it does not.
+You create a new File instance by passing in the path to the file in the constructor. 
+By default the file does not need to exist. However, you can pass an additional argument of "true" 
+to check that the file exist and throw ``FileNotFoundException()`` if it does not.
 
 ::
 

From cb90a1fcde1c28f43ef505db9da305259b97ff87 Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Sun, 1 Jul 2018 00:04:24 -0700
Subject: [PATCH 10/69] Beef up url_helper testing

---
 system/Helpers/url_helper.php          | 34 +++++++++-----------------
 tests/system/Helpers/URLHelperTest.php | 10 ++------
 2 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
index e45fbe8b8fc5..caf3cc893fcd 100644
--- a/system/Helpers/url_helper.php
+++ b/system/Helpers/url_helper.php
@@ -102,21 +102,11 @@ function base_url($path = '', string $scheme = null): string
 			$path = implode('/', $path);
 		}
 
-		// We should be using the set baseURL the user set
-		// otherwise get rid of the path because we have
+		// We should be using the configured baseURL that the user set;
+		// otherwise get rid of the path, because we have
 		// no way of knowing the intent...
 		$config = \CodeIgniter\Config\Services::request()->config;
-
-		if ( ! empty($config->baseURL))
-		{
-			$url = new \CodeIgniter\HTTP\URI($config->baseURL);
-		}
-		else
-		{
-			$url = \CodeIgniter\Config\Services::request($config, false)->uri;
-			$url->setPath('/');
-		}
-
+		$url = new \CodeIgniter\HTTP\URI($config->baseURL);
 		unset($config);
 
 		// Merge in the path set by the user, if any
@@ -402,7 +392,7 @@ function safe_mailto($email, $title = '', $attributes = ''): string
 
 		$x = str_split('<a href="mailto:', 1);
 
-		for ($i = 0, $l = strlen($email); $i < $l; $i ++)
+		for ($i = 0, $l = strlen($email); $i < $l; $i ++ )
 		{
 			$x[] = '|' . ord($email[$i]);
 		}
@@ -416,7 +406,7 @@ function safe_mailto($email, $title = '', $attributes = ''): string
 				foreach ($attributes as $key => $val)
 				{
 					$x[] = ' ' . $key . '="';
-					for ($i = 0, $l = strlen($val); $i < $l; $i ++)
+					for ($i = 0, $l = strlen($val); $i < $l; $i ++ )
 					{
 						$x[] = '|' . ord($val[$i]);
 					}
@@ -425,7 +415,7 @@ function safe_mailto($email, $title = '', $attributes = ''): string
 			}
 			else
 			{
-				for ($i = 0, $l = strlen($attributes); $i < $l; $i ++)
+				for ($i = 0, $l = strlen($attributes); $i < $l; $i ++ )
 				{
 					$x[] = $attributes[$i];
 				}
@@ -435,7 +425,7 @@ function safe_mailto($email, $title = '', $attributes = ''): string
 		$x[] = '>';
 
 		$temp = [];
-		for ($i = 0, $l = strlen($title); $i < $l; $i ++)
+		for ($i = 0, $l = strlen($title); $i < $l; $i ++ )
 		{
 			$ordinal = ord($title[$i]);
 
@@ -473,7 +463,7 @@ function safe_mailto($email, $title = '', $attributes = ''): string
 				. "//<![CDATA["
 				. "var l=new Array();";
 
-		for ($i = 0, $c = count($x); $i < $c; $i ++)
+		for ($i = 0, $c = count($x); $i < $c; $i ++ )
 		{
 			$output .= "l[" . $i . "] = '" . $x[$i] . "';";
 		}
@@ -605,10 +595,10 @@ function url_title($str, $separator = '-', $lowercase = false): string
 		$q_separator = preg_quote($separator, '#');
 
 		$trans = [
-			'&.+?;'					 => '',
-			'[^\w\d _-]'			 => '',
-			'\s+'					 => $separator,
-			'(' . $q_separator . ')+'	 => $separator
+			'&.+?;' => '',
+			'[^\w\d _-]' => '',
+			'\s+' => $separator,
+			'(' . $q_separator . ')+' => $separator
 		];
 
 		$str = strip_tags($str);
diff --git a/tests/system/Helpers/URLHelperTest.php b/tests/system/Helpers/URLHelperTest.php
index 57488de49aba..e1ecc4803602 100644
--- a/tests/system/Helpers/URLHelperTest.php
+++ b/tests/system/Helpers/URLHelperTest.php
@@ -187,8 +187,6 @@ public function testSiteURLWithSegments()
 		$this->assertEquals('http://example.com/index.php/', site_url());
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * @see https://github.com/bcit-ci/CodeIgniter4/issues/240
 	 */
@@ -209,8 +207,6 @@ public function testSiteURLWithSegmentsAgain()
 		$this->assertEquals('http://example.com/index.php/profile', site_url('profile'));
 	}
 
-	//--------------------------------------------------------------------
-
 	//--------------------------------------------------------------------
 	// Test base_url
 
@@ -289,8 +285,6 @@ public function testBaseURLWithSegments()
 		$this->assertEquals('http://example.com/', base_url());
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * @see https://github.com/bcit-ci/CodeIgniter4/issues/867
 	 */
@@ -323,8 +317,6 @@ public function testBaseURLWithSegmentsAgain()
 		$this->assertEquals('http://example.com/profile', base_url('profile'));
 	}
 
-	//--------------------------------------------------------------------
-
 	//--------------------------------------------------------------------
 	// Test current_url
 
@@ -856,6 +848,8 @@ public function testPrepUrl()
 	{
 		$this->assertEquals('http://codeigniter.com', prep_url('codeigniter.com'));
 		$this->assertEquals('http://www.codeigniter.com', prep_url('www.codeigniter.com'));
+		$this->assertEquals('', prep_url());
+		$this->assertEquals('http://www.codeigniter.com', prep_url('http://www.codeigniter.com'));
 	}
 
 	//--------------------------------------------------------------------

From c7ed960b8bf9f248beee400768cbc9619b95b657 Mon Sep 17 00:00:00 2001
From: puschie286 <puschie286@users.noreply.github.com>
Date: Mon, 2 Jul 2018 08:58:53 +0200
Subject: [PATCH 11/69] Update Config.php

- remove comment
---
 system/Config/Config.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/system/Config/Config.php b/system/Config/Config.php
index 0a3c0c204f2b..8cef1942d5be 100644
--- a/system/Config/Config.php
+++ b/system/Config/Config.php
@@ -70,8 +70,6 @@ public static function get(string $name, bool $getShared = true)
 			$class = substr($name, $pos + 1);
 		}
 
-		//$class = strtolower($class);
-
 		if (! $getShared)
 		{
 			return self::createClass($name);

From b3a66256d03033503b1c5b1e9dc72cfc3dfc13b9 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 2 Jul 2018 19:24:37 +0700
Subject: [PATCH 12/69] change substr with strpos/stripos when possible

---
 system/CLI/CLI.php                            | 12 ++++++------
 system/Common.php                             |  2 +-
 system/Entity.php                             |  2 +-
 system/HTTP/CLIRequest.php                    |  4 ++--
 system/HTTP/CURLRequest.php                   |  2 +-
 system/HTTP/URI.php                           |  4 ++--
 system/Images/Handlers/ImageMagickHandler.php |  8 ++++----
 system/Validation/CreditCardRules.php         |  4 ++--
 system/Validation/FormatRules.php             |  2 +-
 system/View/Parser.php                        |  6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index 0178acff59b6..74093724fd8b 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -50,14 +50,14 @@
  * Some of the code in this class is Windows-specific, and not
  * possible to test using travis-ci. It has been phpunit-annotated
  * to prevent messing up code coverage.
- * 
+ *
  * Some of the methods require keyboard input, and are not unit-testable
  * as a result: input() and prompt().
  * validate() is internal, and not testable if prompt() isn't.
  * The wait() method is mostly testable, as long as you don't give it
- * an argument of "0". 
+ * an argument of "0".
  * These have been flagged to ignore for code coverage purposes.
- * 
+ *
  * @package CodeIgniter\HTTP
  */
 class CLI
@@ -165,7 +165,7 @@ public static function init()
 	 *
 	 * @param    string $prefix
 	 * @return    string
-	 * 
+	 *
 	 * @codeCoverageIgnore
 	 */
 	public static function input(string $prefix = null): string
@@ -379,7 +379,7 @@ public static function wait(int $seconds, bool $countdown = false)
 	 */
 	public static function isWindows()
 	{
-		return 'win' === strtolower(substr(php_uname("s"), 0, 3));
+               return 0 === stripos(PHP_OS, 'win');
 	}
 
 	//--------------------------------------------------------------------
@@ -652,7 +652,7 @@ protected static function parseCommandLine()
 			$value = null;
 
 			// if there is a following segment, and it doesn't start with a dash, it's a value.
-			if (isset($_SERVER['argv'][$i + 1]) && mb_substr($_SERVER['argv'][$i + 1], 0, 1) != '-')
+			if (isset($_SERVER['argv'][$i + 1]) && 0 !== mb_strpos($_SERVER['argv'][$i + 1], '-'))
 			{
 				$value = $_SERVER['argv'][$i + 1];
 				$i ++;
diff --git a/system/Common.php b/system/Common.php
index 72cbe76ed969..062549ae630d 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -762,7 +762,7 @@ function old(string $key, $default = null, $escape = 'html')
 		}
 
 		// If the result was serialized array or string, then unserialize it for use...
-		if (substr($value, 0, 2) == 'a:' || substr($value, 0, 2) == 's:')
+		if (0 === strpos($value, 'a:') || 0 === strpos($value, 's:'))
 		{
 			$value = unserialize($value);
 		}
diff --git a/system/Entity.php b/system/Entity.php
index 709021159321..8050f59bef49 100644
--- a/system/Entity.php
+++ b/system/Entity.php
@@ -348,7 +348,7 @@ protected function castAs($value, string $type)
 				$value = (object)$value;
 				break;
 			case 'array':
-				if (is_string($value) && (substr($value, 0, 2) === 'a:' || substr($value, 0, 2) === 's:'))
+				if (is_string($value) && (0 === strpos($value,'a:') || 0 === strpos($value, 's:')))
 				{
 					$value = unserialize($value);
 				}
diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php
index 746ebeaca0ac..9a6dc2718414 100644
--- a/system/HTTP/CLIRequest.php
+++ b/system/HTTP/CLIRequest.php
@@ -213,7 +213,7 @@ protected function parseCommand()
 
 			$options_found = true;
 
-			if (substr($argv[$i], 0, 1) != '-')
+			if (0 !== strpos($argv[$i], '-'))
 			{
 				continue;
 			}
@@ -222,7 +222,7 @@ protected function parseCommand()
 			$value = null;
 
 			// If the next item starts with a dash it's a value
-			if (isset($argv[$i + 1]) && substr($argv[$i + 1], 0, 1) != '-')
+			if (isset($argv[$i + 1]) && 0 !== strpos($argv[$i + 1], '-'))
 			{
 				$value = filter_var($argv[$i + 1], FILTER_SANITIZE_STRING);
 				$i ++;
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 8569d79d4739..a6ff2986033a 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -516,7 +516,7 @@ protected function setResponseHeaders(array $headers = [])
 
 				$this->response->setHeader($title, $value);
 			}
-			else if (substr($header, 0, 4) == 'HTTP')
+			else if (0 === strpos($header, 'HTTP'))
 			{
 				preg_match('#^HTTP\/([12]\.[01]) ([0-9]+) (.+)#', $header, $matches);
 
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index 56ac99f02edf..77998d66a0c7 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -998,7 +998,7 @@ public function resolveRelativeURI(string $uri)
 			}
 			else
 			{
-				if (substr($relative->getPath(), 0, 1) == '/')
+				if (0 === strpos($relative->getPath(), '/'))
 				{
 					$transformed->setPath($relative->getPath());
 				}
@@ -1107,7 +1107,7 @@ public function removeDotSegments(string $path): string
 		if ($output != '/')
 		{
 			// Add leading slash if necessary
-			if (substr($path, 0, 1) == '/')
+			if (0 === strpos($path, '/'))
 			{
 				$output = '/' . $output;
 			}
diff --git a/system/Images/Handlers/ImageMagickHandler.php b/system/Images/Handlers/ImageMagickHandler.php
index a72073090974..68571b7951f7 100644
--- a/system/Images/Handlers/ImageMagickHandler.php
+++ b/system/Images/Handlers/ImageMagickHandler.php
@@ -44,9 +44,9 @@
  * To make this library as compatible as possible with the broadest
  * number of installations, we do not use the Imagick extension,
  * but simply use the command line version.
- * 
+ *
  * hmm - the width & height accessors at the end use the imagick extension.
- * 
+ *
  * FIXME - This needs conversion & unit testing, to use the imagick extension
  *
  * @package CodeIgniter\Images\Handlers
@@ -87,7 +87,7 @@ public function _resize(bool $maintainRatio = false)
 		//todo FIX THIS HANDLER PROPERLY
 
 		$escape = "\\";
-		if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')
+		if (0 === stripos(PHP_OS, 'WIN'))
 		{
 			$escape = "";
 		}
@@ -421,7 +421,7 @@ protected function _text(string $text, array $options = [])
 	}
 
 	//--------------------------------------------------------------------
-	
+
 		//--------------------------------------------------------------------
 
 	public function _getWidth()
diff --git a/system/Validation/CreditCardRules.php b/system/Validation/CreditCardRules.php
index 23177c7797f6..434c2f952b62 100644
--- a/system/Validation/CreditCardRules.php
+++ b/system/Validation/CreditCardRules.php
@@ -74,7 +74,7 @@ class CreditCardRules
 		'UATP'					 => ['name' => 'uatp', 'length' => '15', 'prefixes' => '1', 'checkdigit' => true],
 		'Verve'					 => ['name' => 'verve', 'length' => '16,19', 'prefixes' => '506,650', 'checkdigit' => true],
 		'Visa'					 => ['name' => 'visa', 'length' => '13,16,19', 'prefixes' => '4', 'checkdigit' => true],
-		// Canadian Cards	
+		// Canadian Cards
 		'BMO ABM Card'				 => ['name' => 'bmoabm', 'length' => '16', 'prefixes' => '500', 'checkdigit' => false],
 		'CIBC Convenience Card'			 => ['name' => 'cibc', 'length' => '16', 'prefixes' => '4506', 'checkdigit' => false],
 		'HSBC Canada Card'			 => ['name' => 'hsbc', 'length' => '16', 'prefixes' => '56', 'checkdigit' => false],
@@ -151,7 +151,7 @@ public function valid_cc_number(string $ccNumber = null, string $type, array $da
 
 		foreach ($prefixes as $prefix)
 		{
-			if ($prefix == mb_substr($ccNumber, 0, mb_strlen($prefix)))
+			if (0 === mb_strpos($ccNumber, $prefix))
 			{
 				$validPrefix = true;
 			}
diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
index 4b5fea2dce12..1779deda389c 100644
--- a/system/Validation/FormatRules.php
+++ b/system/Validation/FormatRules.php
@@ -198,7 +198,7 @@ public function numeric(string $str = null): bool
 	 */
 	public function regex_match(string $str = null, string $pattern, array $data): bool
 	{
-		if (substr($pattern, 0, 1) != '/')
+		if (0 !== strpos($pattern, '/'))
 		{
 			$pattern = "/{$pattern}/";
 		}
diff --git a/system/View/Parser.php b/system/View/Parser.php
index 069ca1733d21..56e57f160cd8 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -297,13 +297,13 @@ protected function parse(string $template, array $data = [], array $options = nu
 	}
 
 	//--------------------------------------------------------------------
-//FIXME the following method does not appear to be used anywhere, so commented out	
+//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	
+//FIXME the following method does not appear to be used anywhere, so commented out
 //	function strpos_all($haystack, $needle)
 //	{
 //		$offset = 0;
@@ -571,7 +571,7 @@ protected function replaceSingle($pattern, $content, $template, bool $escape = f
 		$template = preg_replace_callback($pattern, function ($matches) use ($content, $escape) {
 
 			// Check for {! !} syntax to not-escape this one.
-			if (substr($matches[0], 0, 2) == '{!' && substr($matches[0], -2) == '!}')
+			if (0 === strpos($matches[0], '{!') && substr($matches[0], -2) == '!}')
 			{
 				$escape = false;
 			}

From ef54f2fa7405e5c257bc8fdae37e727fdbaeff21 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 3 Jul 2018 00:16:21 +0700
Subject: [PATCH 13/69] donot use yoda condition

---
 system/CLI/CLI.php                            | 4 ++--
 system/Common.php                             | 2 +-
 system/Entity.php                             | 2 +-
 system/HTTP/CLIRequest.php                    | 4 ++--
 system/HTTP/CURLRequest.php                   | 2 +-
 system/HTTP/URI.php                           | 4 ++--
 system/Images/Handlers/ImageMagickHandler.php | 2 +-
 system/Validation/CreditCardRules.php         | 2 +-
 system/Validation/FormatRules.php             | 2 +-
 system/View/Parser.php                        | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index 74093724fd8b..26960344242e 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -379,7 +379,7 @@ public static function wait(int $seconds, bool $countdown = false)
 	 */
 	public static function isWindows()
 	{
-               return 0 === stripos(PHP_OS, 'win');
+               return stripos(PHP_OS, 'WIN') === 0;
 	}
 
 	//--------------------------------------------------------------------
@@ -652,7 +652,7 @@ protected static function parseCommandLine()
 			$value = null;
 
 			// if there is a following segment, and it doesn't start with a dash, it's a value.
-			if (isset($_SERVER['argv'][$i + 1]) && 0 !== mb_strpos($_SERVER['argv'][$i + 1], '-'))
+			if (isset($_SERVER['argv'][$i + 1]) && mb_strpos($_SERVER['argv'][$i + 1], '-') !== 0)
 			{
 				$value = $_SERVER['argv'][$i + 1];
 				$i ++;
diff --git a/system/Common.php b/system/Common.php
index 062549ae630d..1c39579e66fb 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -762,7 +762,7 @@ function old(string $key, $default = null, $escape = 'html')
 		}
 
 		// If the result was serialized array or string, then unserialize it for use...
-		if (0 === strpos($value, 'a:') || 0 === strpos($value, 's:'))
+		if (strpos($value, 'a:') === 0 || strpos($value, 's:') === 0)
 		{
 			$value = unserialize($value);
 		}
diff --git a/system/Entity.php b/system/Entity.php
index 8050f59bef49..d34bfe3ac96a 100644
--- a/system/Entity.php
+++ b/system/Entity.php
@@ -348,7 +348,7 @@ protected function castAs($value, string $type)
 				$value = (object)$value;
 				break;
 			case 'array':
-				if (is_string($value) && (0 === strpos($value,'a:') || 0 === strpos($value, 's:')))
+				if (is_string($value) && (strpos($value,'a:') === 0 || strpos($value, 's:') === 0))
 				{
 					$value = unserialize($value);
 				}
diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php
index 9a6dc2718414..34cc40fed060 100644
--- a/system/HTTP/CLIRequest.php
+++ b/system/HTTP/CLIRequest.php
@@ -213,7 +213,7 @@ protected function parseCommand()
 
 			$options_found = true;
 
-			if (0 !== strpos($argv[$i], '-'))
+			if (strpos($argv[$i], '-') !== 0)
 			{
 				continue;
 			}
@@ -222,7 +222,7 @@ protected function parseCommand()
 			$value = null;
 
 			// If the next item starts with a dash it's a value
-			if (isset($argv[$i + 1]) && 0 !== strpos($argv[$i + 1], '-'))
+			if (isset($argv[$i + 1]) && strpos($argv[$i + 1], '-') !== 0)
 			{
 				$value = filter_var($argv[$i + 1], FILTER_SANITIZE_STRING);
 				$i ++;
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index a6ff2986033a..3eb725c69dfe 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -516,7 +516,7 @@ protected function setResponseHeaders(array $headers = [])
 
 				$this->response->setHeader($title, $value);
 			}
-			else if (0 === strpos($header, 'HTTP'))
+			else if (strpos($header, 'HTTP') === 0)
 			{
 				preg_match('#^HTTP\/([12]\.[01]) ([0-9]+) (.+)#', $header, $matches);
 
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index 77998d66a0c7..39f14f8978e4 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -998,7 +998,7 @@ public function resolveRelativeURI(string $uri)
 			}
 			else
 			{
-				if (0 === strpos($relative->getPath(), '/'))
+				if (strpos($relative->getPath(), '/') === 0)
 				{
 					$transformed->setPath($relative->getPath());
 				}
@@ -1107,7 +1107,7 @@ public function removeDotSegments(string $path): string
 		if ($output != '/')
 		{
 			// Add leading slash if necessary
-			if (0 === strpos($path, '/'))
+			if (strpos($path, '/') === 0)
 			{
 				$output = '/' . $output;
 			}
diff --git a/system/Images/Handlers/ImageMagickHandler.php b/system/Images/Handlers/ImageMagickHandler.php
index 68571b7951f7..ebf83aafd8fe 100644
--- a/system/Images/Handlers/ImageMagickHandler.php
+++ b/system/Images/Handlers/ImageMagickHandler.php
@@ -87,7 +87,7 @@ public function _resize(bool $maintainRatio = false)
 		//todo FIX THIS HANDLER PROPERLY
 
 		$escape = "\\";
-		if (0 === stripos(PHP_OS, 'WIN'))
+		if (stripos(PHP_OS, 'WIN') === 0)
 		{
 			$escape = "";
 		}
diff --git a/system/Validation/CreditCardRules.php b/system/Validation/CreditCardRules.php
index 434c2f952b62..0cfb82e39789 100644
--- a/system/Validation/CreditCardRules.php
+++ b/system/Validation/CreditCardRules.php
@@ -151,7 +151,7 @@ public function valid_cc_number(string $ccNumber = null, string $type, array $da
 
 		foreach ($prefixes as $prefix)
 		{
-			if (0 === mb_strpos($ccNumber, $prefix))
+			if (mb_strpos($ccNumber, $prefix) === 0)
 			{
 				$validPrefix = true;
 			}
diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
index 1779deda389c..94beb66cc9b3 100644
--- a/system/Validation/FormatRules.php
+++ b/system/Validation/FormatRules.php
@@ -198,7 +198,7 @@ public function numeric(string $str = null): bool
 	 */
 	public function regex_match(string $str = null, string $pattern, array $data): bool
 	{
-		if (0 !== strpos($pattern, '/'))
+		if (strpos($pattern, '/') !== 0)
 		{
 			$pattern = "/{$pattern}/";
 		}
diff --git a/system/View/Parser.php b/system/View/Parser.php
index 56e57f160cd8..13ae9139e6fd 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -571,7 +571,7 @@ protected function replaceSingle($pattern, $content, $template, bool $escape = f
 		$template = preg_replace_callback($pattern, function ($matches) use ($content, $escape) {
 
 			// Check for {! !} syntax to not-escape this one.
-			if (0 === strpos($matches[0], '{!') && substr($matches[0], -2) == '!}')
+			if (strpos($matches[0], '{!') === 0 && substr($matches[0], -2) == '!}')
 			{
 				$escape = false;
 			}

From 357d0abc981ea20351e5ff68d32ed5cc16d98170 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 3 Jul 2018 00:34:53 +0700
Subject: [PATCH 14/69] count optimization : using truthy check instead when
 possible

---
 system/CLI/CLI.php                           | 10 +++++-----
 system/Config/BaseService.php                |  2 +-
 system/Database/BaseConnection.php           |  2 +-
 system/Database/Postgre/Builder.php          |  2 +-
 system/Debug/Toolbar/Collectors/Database.php |  4 ++--
 system/Email/Email.php                       |  2 +-
 system/Filters/Filters.php                   |  2 +-
 system/HTTP/Files/FileCollection.php         |  3 +--
 system/HTTP/UserAgent.php                    |  8 ++++----
 system/Helpers/array_helper.php              |  4 ++--
 system/Helpers/form_helper.php               |  2 +-
 system/Language/Language.php                 |  2 +-
 system/Log/Logger.php                        |  4 ++--
 system/Router/RouteCollection.php            |  2 +-
 system/Test/FeatureTestCase.php              |  2 +-
 15 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index 0178acff59b6..e11820ee5a50 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -50,14 +50,14 @@
  * Some of the code in this class is Windows-specific, and not
  * possible to test using travis-ci. It has been phpunit-annotated
  * to prevent messing up code coverage.
- * 
+ *
  * Some of the methods require keyboard input, and are not unit-testable
  * as a result: input() and prompt().
  * validate() is internal, and not testable if prompt() isn't.
  * The wait() method is mostly testable, as long as you don't give it
- * an argument of "0". 
+ * an argument of "0".
  * These have been flagged to ignore for code coverage purposes.
- * 
+ *
  * @package CodeIgniter\HTTP
  */
 class CLI
@@ -165,7 +165,7 @@ public static function init()
 	 *
 	 * @param    string $prefix
 	 * @return    string
-	 * 
+	 *
 	 * @codeCoverageIgnore
 	 */
 	public static function input(string $prefix = null): string
@@ -217,7 +217,7 @@ public static function prompt($field, $options = null, $validation = null): stri
 			$default = $options;
 		}
 
-		if (is_array($options) && count($options))
+		if (is_array($options) && $options)
 		{
 			$opts = $options;
 			$extra_output_default = static::color($opts[0], 'white');
diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php
index b8ffa3b27c07..6fda4d33e6ab 100644
--- a/system/Config/BaseService.php
+++ b/system/Config/BaseService.php
@@ -202,7 +202,7 @@ protected static function discoverServices(string $name, array $arguments)
 			}
 		}
 
-		if (! count(static::$services))
+		if (! static::$services)
 		{
 			return;
 		}
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index b0dfab8a4c2a..555d06b76a10 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -1495,7 +1495,7 @@ public function callFunction(string $functionName, ...$params)
 	public function listTables($constrain_by_prefix = FALSE)
 	{
 		// Is there a cached result?
-		if (isset($this->dataCache['table_names']) && count($this->dataCache['table_names']))
+		if (isset($this->dataCache['table_names']) && $this->dataCache['table_names'])
 		{
 			return $this->dataCache['table_names'];
 		}
diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index 8c347b8c1346..55e777ded06b 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -148,7 +148,7 @@ public function replace($set = null, $returnSQL = false)
 			$this->set($set);
 		}
 
-		if (count($this->QBSet) === 0)
+		if (! $this->QBSet)
 		{
 			if (CI_DEBUG)
 			{
diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index 21a81962eca5..84097fae519f 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -204,8 +204,8 @@ public function getBadgeValue()
 	 */
 	public function getTitleDetails(): string
 	{
-		return '(' . count(static::$queries) . ' Queries across ' . count($this->connections) . ' Connection' .
-				(count($this->connections) > 1 ? 's' : '') . ')';
+		return '(' . count(static::$queries) . ' Queries across ' . ($countConnection = count($this->connections)) . ' Connection' .
+				($countConnection > 1 ? 's' : '') . ')';
 	}
 
 	//--------------------------------------------------------------------
diff --git a/system/Email/Email.php b/system/Email/Email.php
index 4a8750ee84b9..018b522ad65a 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -1224,7 +1224,7 @@ public function wordWrap($str, $charlim = null)
 		}
 
 		// Put our markers back
-		if (count($unwrap) > 0)
+		if ($unwrap)
 		{
 			foreach ($unwrap as $key => $val)
 			{
diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
index e5571fafa51b..939907d931e1 100644
--- a/system/Filters/Filters.php
+++ b/system/Filters/Filters.php
@@ -322,7 +322,7 @@ protected function processMethods()
 
 	protected function processFilters(string $uri = null)
 	{
-		if ( ! isset($this->config->filters) || ! count($this->config->filters))
+		if ( ! isset($this->config->filters) || ! $this->config->filters)
 		{
 			return;
 		}
diff --git a/system/HTTP/Files/FileCollection.php b/system/HTTP/Files/FileCollection.php
index e0249e921823..b29faa7a5429 100644
--- a/system/HTTP/Files/FileCollection.php
+++ b/system/HTTP/Files/FileCollection.php
@@ -289,8 +289,7 @@ protected function getValueDotNotationSyntax($index, $value)
 		{
 			$current_index = array_shift($index);
 		}
-		if (is_array($index) && count($index) && is_array($value[$current_index]) && count($value[$current_index])
-		)
+		if (is_array($index) && $index && is_array($value[$current_index]) && $value[$current_index])
 		{
 			return $this->getValueDotNotationSyntax($index, $value[$current_index]);
 		}
diff --git a/system/HTTP/UserAgent.php b/system/HTTP/UserAgent.php
index 94684cce96f6..91ab2609e9b9 100644
--- a/system/HTTP/UserAgent.php
+++ b/system/HTTP/UserAgent.php
@@ -349,7 +349,7 @@ protected function compileData()
 	 */
 	protected function setPlatform()
 	{
-		if (is_array($this->config->platforms) && count($this->config->platforms) > 0)
+		if (is_array($this->config->platforms) && $this->config->platforms)
 		{
 			foreach ($this->config->platforms as $key => $val)
 			{
@@ -376,7 +376,7 @@ protected function setPlatform()
 	 */
 	protected function setBrowser()
 	{
-		if (is_array($this->config->browsers) && count($this->config->browsers) > 0)
+		if (is_array($this->config->browsers) && $this->config->browsers)
 		{
 			foreach ($this->config->browsers as $key => $val)
 			{
@@ -404,7 +404,7 @@ protected function setBrowser()
 	 */
 	protected function setRobot()
 	{
-		if (is_array($this->config->robots) && count($this->config->robots) > 0)
+		if (is_array($this->config->robots) && $this->config->robots)
 		{
 			foreach ($this->config->robots as $key => $val)
 			{
@@ -431,7 +431,7 @@ protected function setRobot()
 	 */
 	protected function setMobile()
 	{
-		if (is_array($this->config->mobiles) && count($this->config->mobiles) > 0)
+		if (is_array($this->config->mobiles) && $this->config->mobiles)
 		{
 			foreach ($this->config->mobiles as $key => $val)
 			{
diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php
index 76093f52cebe..45ae7e1bb1a4 100644
--- a/system/Helpers/array_helper.php
+++ b/system/Helpers/array_helper.php
@@ -33,7 +33,7 @@ function dot_array_search(string $index, array $array)
 	function _array_search_dot(array $indexes, array $array)
 	{
 		// Grab the current index
-		$currentIndex = count($indexes)
+		$currentIndex = $indexes
 			? array_shift($indexes)
 			: null;
 
@@ -71,7 +71,7 @@ function _array_search_dot(array $indexes, array $array)
 		}
 
 		// Do we need to recursively search this value?
-		if (is_array($array[$currentIndex]) && count($array[$currentIndex]))
+		if (is_array($array[$currentIndex]) && $array[$currentIndex])
 		{
 			return _array_search_dot($indexes, $array[$currentIndex]);
 		}
diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
index dcb7ab750d7e..d3ca8d23152f 100644
--- a/system/Helpers/form_helper.php
+++ b/system/Helpers/form_helper.php
@@ -609,7 +609,7 @@ function form_label(string $label_text = '', string $id = '', array $attributes
 			$label .= ' for="' . $id . '"';
 		}
 
-		if (is_array($attributes) && count($attributes) > 0)
+		if (is_array($attributes) && $attributes)
 		{
 			foreach ($attributes as $key => $val)
 			{
diff --git a/system/Language/Language.php b/system/Language/Language.php
index 96cbdf73e37d..b43d44bc1a5c 100644
--- a/system/Language/Language.php
+++ b/system/Language/Language.php
@@ -174,7 +174,7 @@ protected function parseLine(string $line): array
 	 */
 	protected function formatMessage($message, array $args = [])
 	{
-		if ( ! $this->intlSupport || ! count($args))
+		if ( ! $this->intlSupport || ! $args)
 		{
 			return $message;
 		}
diff --git a/system/Log/Logger.php b/system/Log/Logger.php
index 4de39d1bc869..d18dec965dca 100644
--- a/system/Log/Logger.php
+++ b/system/Log/Logger.php
@@ -155,7 +155,7 @@ public function __construct($config, bool $debug = CI_DEBUG)
 
 		// Now convert loggable levels to strings.
 		// We only use numbers to make the threshold setting convenient for users.
-		if (count($this->loggableLevels))
+		if ($this->loggableLevels)
 		{
 			$temp = [];
 			foreach ($this->loggableLevels as $level)
@@ -444,7 +444,7 @@ protected function interpolate($message, array $context = [])
 		{
 			preg_match('/env:[^}]+/', $message, $matches);
 
-			if (count($matches))
+			if ($matches)
 			{
 				foreach ($matches as $str)
 				{
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 4327124e6bd1..517b236ae5e2 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -718,7 +718,7 @@ public function group($name, ...$params)
 
 		$callback = array_pop($params);
 
-		if (count($params) && is_array($params[0]))
+		if ($params && is_array($params[0]))
 		{
 			$this->currentOptions = array_shift($params);
 		}
diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
index 714375b4056f..f18d5974409d 100644
--- a/system/Test/FeatureTestCase.php
+++ b/system/Test/FeatureTestCase.php
@@ -42,7 +42,7 @@ protected function withRoutes(array $routes = null)
 	{
 		$collection = \Config\Services::routes();
 
-		if (count($routes))
+		if ($routes)
 		{
 			foreach ($routes as $route)
 			{

From edcab3d97ccc73ccbd82fdcb5ce5d0041f4b6f2b Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Mon, 2 Jul 2018 22:31:45 -0500
Subject: [PATCH 15/69] Fixing some hardcoded info in FilesystemHelperTest

---
 tests/system/Helpers/FilesystemHelperTest.php | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php
index 5df5deca00a7..40cc791958da 100644
--- a/tests/system/Helpers/FilesystemHelperTest.php
+++ b/tests/system/Helpers/FilesystemHelperTest.php
@@ -222,13 +222,16 @@ public function testGetFilenamesFailure()
 
 	public function testGetDirFileInfo()
 	{
+		$file = SUPPORTPATH.'Files/baker/banana.php';
+		$info = get_file_info($file);
+
 		$expected = [
 			'banana.php' => [
 				'name' => 'banana.php',
-				'server_path' => '/pub7/htdocs/CodeIgniter4/tests/_support/Files/baker/banana.php',
-				'size' => 193,
-				'date' => 1529305930,
-				'relative_path' => '/pub7/htdocs/CodeIgniter4/tests/_support/Files/baker',
+				'server_path' => $file,
+				'size' => $info['size'],
+				'date' => $info['date'],
+				'relative_path' => realpath(__DIR__ .'/../../_support/Files/baker'),
 			]
 		];
 
@@ -255,11 +258,14 @@ public function testGetDirFileInfoFailure()
 
 	public function testGetFileInfo()
 	{
+		$file = SUPPORTPATH.'Files/baker/banana.php';
+		$info = get_file_info($file);
+
 		$expected = [
 			'name' => 'banana.php',
-			'server_path' => '/pub7/htdocs/CodeIgniter4/tests/_support/Files/baker/banana.php',
-			'size' => 193,
-			'date' => 1529305930,
+			'server_path' => $file,
+			'size' => $info['size'],
+			'date' => $info['date'],
 		];
 
 
@@ -279,9 +285,12 @@ public function testGetFileInfoCustom()
 
 	public function testGetFileInfoPerms()
 	{
+		$file = SUPPORTPATH.'Files/baker/banana.php';
 		$expected = 0664;
+		chmod($file, $expected);
+
+		$stuff = get_file_info($file, 'fileperms');
 
-		$stuff = get_file_info(SUPPORTPATH . 'Files/baker/banana.php', 'fileperms');
 		$this->assertEquals($expected, $stuff['fileperms'] & 0777);
 	}
 

From fc04aee927ddc90c33806662818a4335ef0871fc Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Mon, 2 Jul 2018 22:36:39 -0500
Subject: [PATCH 16/69] Remove invalid IICP data from logo.png so it doesn't
 throw warnings with libpng 1.6+

---
 tests/_support/Images/ci-logo.png | Bin 7760 -> 4537 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/_support/Images/ci-logo.png b/tests/_support/Images/ci-logo.png
index a61f163022b70ae20a247aaebe0ef4aa0cb533f1..34fb010828935f2a5f814213b18aea620e79c995 100644
GIT binary patch
delta 4493
zcmV;85pwR(Jh>x~85jfr0032TTV4PF00d`2O+f$vv5yP<VFi<s3N8!)0%A)?L;(MX
zkIcW3As2rTzez+vRCwC$oq2p!)wRdJ_a-p}0tf^`7!wnQ76kej6jabB5K9?8DwATw
zSA~jLtRjdXho@C5_E}47>rhd^QfzT}%5!{AELBiZC?cW^g3M$hK};YMIq#24a;J0e
zJ^P%q_deJ6e)|vLa_%~7|Lz{wUVAO@8m?kA>AHWF2*NNe-a{T=Fqiha)o4Pp&<4-a
z$enb?r&|$7CfdeeP{VKN?giqKhqlh_z@U-G=z?FjGRZ?5{0#$xIu_7Lw<_keY5z4%
zu>*iK?&lisOb(&&CT(SB{><QRCeTi|I>~~|X=v^bdnu%)K2?&blh%ifx_R77Uov#7
z6b^rH(iV;p%p==dntDo^W^^Vs?BCZgnGU*@3WYamJ3HdvDg2xt(OS1!L3oq4f~Ze=
zFpn;z=~k=>UZgFR?k1m(Vf_CuMdG0cdrW8jU0g^j)ygE#0wkY2)6aV`gZ8B8Ru8<{
zNr%R?d`xDL`u3JA*bt*<7#O@nAGPf*SuB4bKcprOZPiRuySY!6v8^cXNkU5|bGH74
zh}URqLt%m^M$uR2);<8Q(RLYw5<Jn7pU_6Px!h~C&9XqqD001K5z&i_IUQ#@2$oyO
zR;7~nrvyLqE$VYIZ8=M~x?aH~>MgZ3gEB_aR*h0#Z*3Xe6JceGjSdXfJGyy?wwZqn
zw*0J*!KCY+O}&7glvwPbfwGD7)Hv99xs&?%rQktwF5PLNPhoG+HkoS$ztMplo$g#-
zpshQ<w(+f=w9q%Y>8CA)CFI)pULP{`ZRz#Xb_-Y7`d&6IEH7BTcNjyp&<q+Z2N+Hp
z`3ib*Ce7nX+eV;{oTcwvK__i(SV@1rgYRoRjL}D1CQmWK!S~bX@qckjxPz;-z1uN#
z(YBDgbywX9^w2hg2Xt558FZ|Cu4cIl@2%$m^%}GXbhNf<Jmb=jby~UZ%~0LiuHbo>
z%-Lns=_5{UYa7lVT{{CPrj`b!+J`_TZR7Y)I=d$A5U2EwZR$Gdbe6elSloY0_4mKE
zO=qdg*4P8o=yUy1)7qx7!sT<#V;rGYiSDLQ(b}f6)b+#QZ#Y1W0^MUkK5a#;B-3@N
zyD8N-A;_og4xW`@r)cC0YH5_LyEZJcX}L{Qsu-{8R*ZTl)P<5rGuX-iRj$u!jpBap
zWU;imd_<Mb2|*Upc|uxCGiZNg79CYp#asm$>oy;cGfQGk4s%%NnoSN`@QlQkW?=9Z
zKUB9VR5P~u_#HP$uE|c0>)VY6;4W>gc$(RgHLhlp{x0e+ZFfi=(*iibF6yMeMIjc_
zD0x&fFnEtXDqXZ>k8KNBti*9@Gd22Kn_INq&LfJv&314~^6th0+@XK1h+iurt(tP3
zmX9X5LE99bROZ*XpX2(ws2kSZOIe}tjzAez--p&VLMdrbPL<AM<t8|zEsxc7RjO|}
z)yYm<PhM0^nrC32wzfPjaNXy72K%%<#sm%e%C<;bgk9Pm;-^~lO(Vq%SJdp$Hj_n~
z^vxnuP-mZv3%hn`yOe+5Yja-BrnTS!qQR9cW2o+nE4h5Fz|Ik?6jLZ1$89(bl<<(P
zD@rlc5JfugYb4E}k=eqrcssHM1B1<6E$$!S25l)kt(7zbgXQE2ZV6L)@631Wd5-?-
zX`5p?2!On@kMjlFOlP)-e199)iga`5v|Ydn?W7qra*v=-=4F2oR_D_!rJvPhj8ob=
z^H1%R1<FQ-3N0#rXCh-0KelFCcSf6^724?vmWSzLdC}X0Z%t*Ca=Vp~X3l7vtDUOQ
zQqCmH;Zq)sDW#DoIVTbQPG}oKnRcqe%Rd-sX+E78H;A6W+ngW&f~9@hGWbM0P0?i)
z`3YD4msp4{@)>`H@tm>k)Apdm%CC1YJHNnyxOz{e+>)FFTpjxkwO!g|E<4t8qwTx$
z1_qx}6r;ieg<Qo-xG9!*raju)uu&RmJGp?FA(;{El#~1qv&nCc36e@{M(`BHf^w?3
z&3s-pe>~B!I-g;dI<h!U@E{*C(BX~u3`R4W3bs?iVX}YdL_czDSmavq00t|Y^MW|S
z5Jz1oetDE`z*S28My!<++#20g#XD&lf0w4>2Kti@6nbEn8!RWI^SO!B_A_bfeMiw5
z^*VZDpBpSCk;Wxa+HyE3O}XboR_E)rQx#s0G9lDLV*XI<1>-`xxiLJNppw;8H2-9O
zmh=|8=*)k8X9f@(7!YFv>_&No{E+j2?(Eav!XnF?^l#EothL=GE$mV~ukdY%`^!O=
zOL~)i{Fs}_5nmdOaJUGKS3Y4_#2zr4z1rJXWI4s$z+%Mwzs-=rTM`v|++@t0W-+?6
z%CetAGDT<`Pn|Sns<_@{6XR!@cABEg+w>vbDs6wM5*N7!`xtI|fRe?h+G&a|57G^v
zHQFwes>u8Fjxo8P%K_~)MV2xqkZJZGkuzxuw~EdmLfA_~47a{*%%V!_yTy^k9D4Xn
zj(Z|$J1=2&3}>j|bj-`z?{JOhh%01tRBAk;X`3PWR`5~k<J@t7jq9jX&rKZoxq*CN
zi|BukL(!e-lGSJ+zWLx~F5{qba^m4!CXwZfXkOv}l%MH1vAfhK6tZ41HSuvR=S0r_
zq1DJ_hIAD=k(Q9Uub9Xx<>bUh4p-8~7iKXIt-_`Bk*-2JOHQPfT*s|cD<>!xCekPT
zsK+1jw@C`FQlCSrr7dzjOBl^&<ph}{m+^me2yJgc+Hx4LM1c;Lok%}s41dHEp5ctA
zduV$L(l$y-kce!dOSF~T%tUr6q$d^%7)je;dkfMgd+8BCCjA60r>`^C6Bgi!oE_~R
z)|FC4`@9VdwqbIf%6`rJ(<+K+7r7@LN0y>rZ4kX|1SVU}D3&SG&>XF}D7Xx1qHTYa
zvb!ZMnLryGbM`)d$_&0yq@@`yqDS~8&>VIuZ0_ZZvz-&I8&7Dn1UGUW9YZ^5KYA(r
z)jBYl_BLDhA#UOdzEr4f5I%;`%9jF7ophw)>tB-?;vfg#YmDRxEmyxUrcGcvYobjp
z+H*bG4z7?LV=j|5jB{P-8KkWp1C@U(FqX?{=SadDE@Y+R_>^t=QINKO(U7a%$Im#|
zVGiXZ6fujVO0_NsobmdB5n6Jp<g$Qs97ij9jxoHeQ0qLhd}jq{>#Oj!p%}{yvK&uF
z+xZE<QnummMORvYpB5UUE6ibx3t4UJxQi*2DABkRZAk+^Jt<J~LNm1GE(U+Ok|q9S
z{*{juXzUAQs`S&&;f&@C1>8%4E4SIdWE{^b&^VtKzLXS(P^92xv608wY~q9qqf-rQ
zFt}Lq()}>&_||Xl2Dz)4!VP4*6awIv+$eefkWCtXztY{PIa0ZW39bzlf8uI)ZWqKr
zC(=mqtIE$F7cIG+ey&Un055+rol<GKwkL%Yzs7kq6a`#EN7qiy-jmqk4ASxWb*8Hf
z!<F=RF&)KPrb%jXX>=x4W^1eFb%CebGhR3_N<93X*;2w9`$z%5j0ivgl<*6|1?UKR
zx*B=#HRed!bQ$26w3|D~&siZDs-!=?UADz6<9;c%lN2!Nb7r%KdU}5g>e8E*E-zLe
z;sqHMltJ58Zebm@WC^F9D<H#VKa>XMvEAkR`DM_yg<tR?H9$+@Svr>t*T>p&uIIRm
z@)|jb;WllDSj46?0foB>k5p+=_LCcV*hOg#l+fTVZ6(ZSg9Eo^S;odCyziQ<dK%sB
zq&3{f+7M^HgTjt|vLb)_)iIxAF3BpU-p$r#@HlJ2{JhIJB`D(*jgng2CZ2LhQaSaU
z_H)=Jac{Al(y#-#8g>ZE_?lDF0<Hgs-LA+fp_bErDqIn^i$~cXmDpyDpp+dFQ?*v|
zD_7(kpq2)AT3a1U*k&@4y)88Lm$QxUT&bElUUJ13cpo)};dg)K#OFocF>ST`g>ELl
z&sS2t!>e2v->Rsf9{lWcENUOiC^2;_FnE-mmK9n}ndIp7FF79H_EJoZJG8A}J11lO
z-(eP5wC(?i4_#f&o8dTraVX(1Wr6yfpCB+?qOyg-3CulH`7WW9RrFDkU@qTbxR&42
z)xZGq`Noll;Ua$v8}_MG#Fes)-ioZueqMG^+Zt{lD?nQY>l_H$%uq{-&j;{oj8^?+
zQw#(}_%{c^sP;1~aGM!$6yx+Bax5!6mM6k4c2}^5dGt_789+Y^ffr+y7bzgEiME?<
zi#fn>LHmCP&Se~vxSSDmRhKR^1U^2nUEeum2mX=@Y@mO}Qb&u%e^U~34mHOyj<HPx
zSwR?l%!RhTxu2a)>q<Ycl_R#qoMb)6y^se;5O$47>p2igTO%86iP^!I9=h{s9b0Yv
z)U|v-rE$hS6EGaTW9#+XDfL2PIAK)STH^2Gli+|9plzd#qyGjrdLehC4b<9l&3~2B
zU{dw~ZTo-tP*_Yg+w>>%wS{^cu^$fc4^9}(jU+%@1Fs8v_<u!3lF|mng3lYQW~UKi
z)M_${zaea{+)thEeA~)U!dku!{h*1qqe5;j0DCx<w6uwK(!cUW_?jVj1oNDrsKeAH
z<%9qT+K`X(DwRgqAQq%;vrw#;+OYVN$p$fp*QI~#jy(Gf(sq((1g3?$xFMdrjxGYv
zZsBz*jEH^}dQSQZUt1PdLw(YAQ4!ShBzugS$d5y5t73^|amP53v=f3zYkQHkoQVE7
z{8augY_%xPuRE2X1Eg7wU%i`WDK<>T@bJo?;1P@4+$>sav6i`k42vPK>RH0)hN)pJ
zvdw?I#yU$P&mz?e=~Zo^lf^rY%Xu?a?7~RePO{L_mZ>Efo^j0=g|&PmAMg}MV)eb~
z5$c~jW<jXmQHTJ&IM2c}hj@ftVrH>6d~Ct4zLfl=Y;UP-N?5m(+}IRu()<B)Tx22D
z$OihmdW%36hESQHW_8?4cGKe`w87m8X{&$a60?Z3p2wnuHG7(#!G0u0TPxm9ApA79
z2|Lj1M=L&0P_I9eAG)*>qYb*TC&3F|ATQ|_y@d(t^iD7@hdtV0Sb|aDOh$pE!hglB
z(OL#Yt`Ed%gXz@9?WT7MxH5PF!{Vkpdym1<fn@B^2DiqYQ$KYn9EBRB@k*S!tfqgT
z*>=$$ZLlzId%H<E%ey`l#tE3Wl3wPUMZ2`Y{5T19)-y0kb_<zojZueFET(I$9kzYi
zU_nfuuo`Yw77WxG?vGJ}a&C(kao7oMFhAxP_ZdTzV0;@JBQ4Mlro_Kc=ZrQeikWBa
z5A^W(`mHlNOf`RlVTm+%N*j!fkv4zsI5RxG%}OzyL96%=E1sOrX@fqzYbs@HRHig9
z;rFIP%T#MaiyO2-YaTP59#)a-Q8UtgQTo>N2Yz7n>+aA7a3#B=<TP+UT|8(ee;`WJ
zPnjlitJ*!<AlJmZ{5xiOZiKrpLdRn~LY|liH)#Wy#<mDqB@}sxxO9FS@w0#al?%jA
z+uWuNI`Z#Sg-I*sT2}+^*he<2!ZdrAsrGEq?$ZX)i|4~`RFzUBEg`IR3<)_esAU~j
z*}rEahc<vqSQRo`6*Et3w96FcHsA0%&AZHW7NJfaZ2-er#j)n!cd@phw0)beqE)b(
zan4)5T-pHo^DtjDZ(D{cU&nv7X5pE3wuQwEbZ5gSpEiITCi4czF(~0?g`KqpQ`n9{
zF)Ntjrp;LmZ2@#=9&b^~TE;7|j<jSZ>)6A~%y8dGZ%&)cb^QR&r!QagCP$>*mPzL#
z29w2Sd?+V>f_cmOUx^G^Hg4ha)&KwiC3HntbYx+4WjbSWWnpw>05VxHF*q$SHZ3qT
zR5CL<H8VOhH!UzVIxsNiysJ9^001R)MObuXVRU6WZEs|0W_bWIFflkSFg7hPG*mJ(
fIyEyoGdC?TH99abm*EqK00000NkvXXu0mjfQMQc#

literal 7760
zcmV-W9<SkvP)<h;3K|Lk000e1NJLTq005f+0077c1^@s6|9g|w00009a7bBm000XU
z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z000wvNkl<Zc-ripd7NBTmB+tT-A%eXodnVioyCMi2;c+(B`gWM42fct4-gWVBxDxR
zi69O-Y@ZQF+|U_B)KL(TO^pr#N0<?1h9E*12PB3?Fa&|DkS2S`(p&n?ALkTZ>8|Bf
z)m!d;@BTiY`vF3y>(+h0ckbCw28VLE2-pZb0d%?J*cYDXxkCsL6M;VhmjWZ*aSSG#
z-{s&BKLq-KYk^Tf#vO?xTUa;?@PJO>8^Ab6I7hayFbY_qgzE!t0>%JYM>a>cF!1k6
zHV^0qt^^KpWb;q9tmBYxtjPQK2H<*No--Q!!;#HDHV*jjCg5|xM}Py|@i+vDbAjHx
zt2DP>17-lt?izL1Xi(@;at*{p;Pb!{D(xKHH5w|W0ha^q?o1uof^vV<m-zqlfLTDR
zJ1R%ETCsnb|6d1u3V0td%pI2_TP--$$Ipz{>vRm_9&vDFs~Gi2h{_Mn0%qdeAr4hy
zJn$-m-5$l(O5kK*XwnbHxjur&A&85^FD3zVk?2C5J3e=fR)XWGJj-Jia7-Gcn<HDW
zIH!ug(*`U6Mmy=|;1_>^<gs~GtX;qy5*(~|I$N-q4-BdD?>6goy1#RUxNEc=h9g1t
zT5uW?H*I!gb0~!ms*+y|4g@}|#LYOeITXVs0TJXhU;-)63UOpBj?;k;1oXQm1Mes0
zF;hpj;^*?&fY0Z2U<9zAJ6?x;oI`)IWKe4(aH<k6F>tPr+Ry}CN9o+PYS0QCn`XVu
zk!>&*C@F$QMt|=RT!FI#a4^sj@b#I$o&ipvdMB~FMiYVz@I}HcJf48$#WlKXG~Jj5
zTpaRev?77|A&zY6#W>(!BD|^_)2O#OvPt^S&3eT}fy03oQW%(bWP?uw=SBE=?JC*o
z9of=_vw$x}{F$RvXLDpr5hen+5Pj;;fk?=z&XFx07!LdxDP)ODPjuF33eW=FiuC7*
z0}V)NpfeCsfUA*q^A3(|q2el}fuDmTTd0^DgXQUvhqRdAe+ArS$oK65*62T-WJ?(4
z06#G7#oFs6Tk>!oa1UmsVsAuR+oz6jNtSF=f$w5o&i@8v;99RETQYDq@E=HM$TX}2
z_M}l~OX4+pA#f+=CMdp!^Z;>^EdfNk9kVlG*U;an#z{7dt<JkKyDoDx@CGRzlA9FC
zHd`f{=>@>A=Sen4HVZKy$>3<QV6U$LZ>7;VNCMfeMy4FwkU`OhjQ{S^e@`83*4eHB
zZm?*-dw}N=hpvM~xQg%!iNjjY0Y{OrhR#VYQqBU`0$;Q6x%>{;nO5V#wrg|<@J(Q$
zjRF8z2E0v5gYY(yEdzW9=>%yb*6Zpb#jxQTZ3J$!m}saKx(e9s$Y!=g`xfvq%g^~`
zU>hlnhuT86p}_Znk6V7myO35{slGx@C)?GQU!6JZK&JF{JF=OHBvnDJ0Jb}_nMt-Q
z5kFc|T1qWLd~1$uhVADcfv=OS-eoJ0P?hJ%W)9{f4f&Epv|Yd^QkvyqD%mbTItnGN
z8{=xk<>7+wm=QrZ6Unem;(UOONIcX@HUlKvv;-3ky+U`A;&`YjWSa=w3ye+h`EF9Z
z&5<oevK<U8PB_sV3?SPGB!lBvcl?fQVdEy?BPluGT$Zjw3}pKX@V6;C-v*?At{aRN
zG1(R%MJj1R8&YBz<~e7uWMFPoWIGf1HtB1t+K!Cs4ztwI1I|bKn;b{VXIo4F{)~Oq
zP(iE>zzo8l4L=o0%<NEAWkO_1X$93)VPgpJcuI-pA;riaC)}};AcH)X=Y8%nq_t~H
zTF6$1WZHTuUw0u6>@Y)v^}wS8KDP(B12{4bWLv0TIPGLx1)LbNlo<uQSmg6xK<20p
zODfq;Leil<x99_|Bit^SAJoq&wuik)m#4`=yJ6xc+bG}<j%53+r_@pm%SG`m{LiTW
z5CKkdj+1OzB#XllZ1B1P7!!hncRW(#;CCNyAsNvlZ718Mj#Ne0Cg2<-HXI~wtnzBV
z1$cL@<d2JNQ;=jqN37!Ox4_W>TBaYRzdvs^>(^?$)Y(L~Cg5pDCSPk2GUv2bPyZR}
z#I1Ed&#L3O(H63O+0qBUG$yP0r%121YB5`{<)HSnMxDUTrjyN9H^&m-?~zQ}I6nXP
zNJUvC5BO-{dm-(o1NbD+YAV@=t66Uw(O%Y<WP!#M<J!k=;D0ovb%<VNnE{c3VMwjU
ztr}|$b3Z$Q&s1WmRzkK~71hrI$72_E=(Ybll@xK#Yi|PnQr8xZ0(2m~+}bpzIvE&E
zG&ylYk(sO>(t&-WDGzN*j8{-C>qg*R`W-GR<9Sc(+5ueQ=Sq#@8f^f6W8on_se$R7
z2YrT%-<G`MFD-YaMnSeuSa^7Et3sZCcn7)|Zds$DWU5lwWE%~vweaBXDdI6->PS^`
zy@?bk4Xc%G)i@Tf%F}sl!B(UodJBWAoqmKvxx|Vu3{XEJ!BG_keN9<ESJy(JT7Yp#
z&Y6>9rPo7BxQ3`C+drvq%_j6H*|t--!OL1Co7SN;KBP|H(NVaIrp4?4t#&=FzQ9tk
zzjkE8v6En>*B-S{Tf>xWO-QzBorQ1YQ^-KsQe%8NkTFGlPJop}qw4Has3OhXFWJu2
zWgB)OSq*-MT`X3M)uA-TtHXC}7zRVVr4HO&vB}g5-oiE{K<=*0^6Sg$mB<8njh+ac
zZs}XN2ARw5xAWsBq!-CrC%}9;_TNVZBQ493txiRzt$0n1no64Sy?_k+*y;FG_7+$O
zjL&2;`vpO^6Oj0!t=OVOt5orS7?|e>R~9pnjFtU^AlqE*p8Wf!UZK@knGXPejYJ<D
ziu31Vz#*ATrm+^XjRP*U{4jEU!D?|oQUL69xZ-#(QZ?3=$z-zCl5HLV)fUG5=GBU)
z^}1N<cvTb^BS{V|)jW(Ay+UorK}amGR?__mDVtm5cvTRiksfiwGnq`LQnH;19G-wf
zIDp{VjBZsO?h3?N?65CBs+?)Aglt*8gX<G;0PoiC5mcD12e?@+uw{;4`(Oev6KE|a
z-LgeQ;>-jcKr6ww8T~)tEa1B}8X!r-Of@W<{gUl8BwacQXjjo5M$+F_;4-~FRyv*m
za42vpFrtujD@3*n6ZGX<kW#oXGfe*rn2yW%&DY)br$BqKfn*zt#6pvVlaN+bVG?e&
zn*Vc<cx;;SUSxVtb2+k|jl{f?gkyk7M9|C_sdG3DX%nAT3<XXp<OazW(ASbSjiec=
z4jLYjg}n;N9GMHeo>Ib{g5<q56(iedq!nipF#~uH(Z+cfsj_?v>B|5<94RmwT8wOy
z^}0zST7g+e_$^Awy$&f7IS+U#MP$n$spCU4nM_?FvYkq@2YQ{O2QVUr&wfD9_j{yg
zg!k#Hx(q2swj^UD@OOysEsnurn~}<-St-%w#v((E2a)Xnq<vJ<F&#Kpzi(W45I7lW
zNtI+>ZUmAxK8S4Z$L=J_N_2@&AikjH829l8(&Xk6B*8POXMHGn^}0E-O(Wbfg(hJF
za3vC?9}@Fk?m%L!k0kW0Cn8Ce`{k4Eh?JS;(-A*dn*m1Ai@=A0uadl={v_4i8gpc8
z)IUfY7OGSkVZdIxkv=LHAl3Ov!9jYy4LPzMtaoeLFhU>jF){0J`M4kW0MhR_DSF%J
zoVt=#%j^Ksi9><U>pxAIv;GniqyAw+&iD|ZF_X#E)gg|~`J@*Uk(8Kc=x=!%H#!j)
ziHA5xZFaV=2Oa~qXNhp0xWTvpsef!In2M~R@I_=Wh|N)lcGcOkS&|zMtpxSJr;+Rs
z(^QJvkS59-Ej`;@g<D<L5Npf?G$V63CmUoi<ZvI7LH(A6=Q<K8II7F0)DkUaFw8@0
zFifj1d(=`1=czTC$zo?W$uMy~(x|w_z`ZR&QqOIYa1BVu@p@Y&+b*QgBrLH%lOlcp
z4Zv@Z!D?NWJgZDjpk*<~zvLGkz&{YK<8vC~>~1pj3?4utAhv|Jyd2qVipQ-5J_X#Z
zS6x^*5;zRAGhyxouD3}_WG&k3^Ll+ei1?ij3;A3QQ>)Zuhw4|5smzXS0pdBt5B8Yq
zDs8HChHaTPVRp}xUf^;hbHsR_*+91Cs-yic{j&_3Be0?;DA`QcX*VJ1?%NFAUmr3W
zz%!j}>ws&JxMg?VpT8>teX0R_Vv<h*HyA8^JAhu3$<~341%Hxw8Y$bB$apjGxPkk6
zr>C*0Wa~u64lbc^<Gr<n-;ghB8QHq^<=kx8zBVY~jFfC1@Ex@}i*@SWhz#ut6MN{N
zA8!ku0d6%=r|bdtW|4d&lkh8KB;#8YFLmn#R)oBdKP%z7Et7EH0A4Xn9qP)FZHqx0
zTM68Vw4mxO^Ro|zyq6VvRrgv(wyj9<j44>7Wa~9avURJH`+`q>?AIZh`<rwhZ(}F!
z!<?SKtAI|=^SmtPRP!uG#`yS^w5thk0`lWXJ9=BYg6}j$ciXAYvnOY9tuloDcPjDy
zwj}WM%6&P61G-m@kiFQ8`wY<CUQ=td(<HLpjf7lwSNQkVBh~Fe=IGysL@TyoH?{#k
ziFps}^`(91`JAZCi)%>ga-;`qE$KY7RlllrFN=^yc1f540a8Y{BgSX@O<-(pxNUAj
zugA2RJ|r9!L{NRU>Ic>C<xV8iBT1RdS)}kej%VA6RIIh-ldTEKrif!h%aGQpjR76*
zQNS-Ml+-UFebZV=CjN$g=X8{7HE=x8l25jr&J+jPu0zW6gT{2E%j23NpSwl<beAKI
zhLeoRYIsHcY!@SGS`7oqc3BLYSp!TZ++6=wq!-)SNSo7hk(BST3DV2TAp<-S!}DDT
zwC9NCdEPq*{-j<#jS(Kgf9o5!JH*e}tm_5R3lEvKb#jECxmsOPy9O$dAepdlM7WvV
z$gtRLmiw}7LDZ>7OZDa|NVYzeZc$-{D&}r(XEb;&!k4;BukEc~zM{syIa?1$_~l<j
zvO2mQ4<f-9qI2G_L`I$OF64*F;VGgi?eEpk+Jl?b85O#St{wg_RFHI*BHJn?OcOSC
zslwjnI1m|nknHBLu@3kxuw&pAI*@F=NK1pTd-MNE#kwO~wAc`V)q5}SvgdgPQ?mx9
zh5wT9lPOoLuGZ_Gf1=QV)QoH|_5%aS_9o#qY{}tO)z=)^qD9!(=+A&ZmhvzZDtNgg
z<V~$t$>xlMXc1=C@tbNGZ1p^^uM)B?L!5G9Sw-7P&ty825N7+<+mS@glJ&iX$hI5!
zK}d!|H+e;?4v}I^NWXWvs$N?PS)k>}2JmyFlr3m<D%so>nhf+HlcHbsJg>9d4;Lfb
zPNdQ)XlzC@N1bty49T`wEzli)ez;Uc{7;aWT9C+MUt5DDpaE&d6C_?irqFEgJg=u#
zvh4uAPOt&oHY9(o-aY?F(S+1i1bKbl3_S07p6?W~a#H32BxO7(?59M_xaS`!4kFme
zi+2GJQM?yRRb<-@Tt#r9rDlE0Ts!<|aeRQk>j|U)`i)9&JwN)>AAp+z)Y;mxuS2=*
zI3b|lvrbj3m4uicHXKPU4k9=GcBFjJNw;WFkF?UN^||dvhPI8&|K<5L2IW>IIE8*6
zSuN{Hr1g7~<3S{tqPkTr&#W7n%i2Ehmxo0*fX@X$wynS!$c#^i@NrE5&+Pli5R$qm
z$u<;eRaMKz_X3|G{MPag^1Pm}@p=77)t-XxsxZk0;v9Un#xL+wWP-7C@P>;SH9n_@
zRpn_Y_5op&EoVyCq6e(jgJ^Ml2o?WX!!ud}98=D75Cz#lhOKthaFt$5IIR~P`US$S
zDxc4zNN1^ravu^E*#NGn!9xALzB$c~7lESz$=s>tx!jBN2k{kBjFN015r%4|+b5Aw
zibL?a+TJRj$&Z0aR1i*#nrtA$9(t?za!Y}uaS??e(Sl^_RPr450AEAmrxnGm;~*PI
zyU|MffOR4rl-e9e0>kwcK7&o_iaM~G4~vUzISE&(4)-k55YXvvwPQN{#YBGA3g7~2
z7&;dx*#PDvMJ<&O?%$B6e9rGyJw_>c{GRzQ)ncvb%;P2-z^O<(2ftr@8!#6a!m1W^
z6<D7;fqx~Sj+-Ws4J0%4kqQX+oW5y|jyo0O+ZCuRvx8JwOd%Uc3iwSG7!He&3C1q{
z$UnZ|<9vHmRe4X)A8r!aayTC;kSIsCUbUvi;8Mr^;7j;(p3fnq$<rp14V74ax{|*Q
zT;lXMUlOg<Ic`R>YA1%d2~)|I!yKePTd9NUP^;DvZZL)*lT%8)tUm)zB7!P5)5!+n
zK>TO5jEWuF2H;}CZC!60+EuSDc4m*L0T5Xhv<+m-VG?i;#ph1Fr4nwq;~7&ZTuab}
zlv`dz3{z@sB3lk;=o{NtM8aK8xLtTm_n}?N;JI9TRgx_LM#Qx_8_AZ#R3+W!0&j0F
zP@E<l!Qeq>TaYxMvrUlrHj^!fBY_)`PKE<REXR?2Kin`Rbt_+*E!P+BXbcMLC4p=?
zj0R>Y$+qQLs+T47T5UuE<1gl^5O?dJ8JX3bB(mjWoa%1BQo~^hFq33ti!`h5^%zo2
zbUzX+Ha=~>60+Iqr9TRp0DT0~wD2LM_k?W|V}>Bb-^U_3ea|AZC|<Ya3sfSp{(k^(
W_rR^&3L=gG0000<MNUMnLSTZMB9XKJ


From fbf6ae63425cb1dce02c2cfd68ae629256188f45 Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Wed, 4 Jul 2018 00:55:45 -0700
Subject: [PATCH 17/69] Beefed up text helper testing

---
 system/Helpers/text_helper.php                | 1356 +++++++++--------
 tests/system/Helpers/TextHelperTest.php       |  620 ++++----
 user_guide_src/source/helpers/text_helper.rst |    4 +-
 3 files changed, 1025 insertions(+), 955 deletions(-)

diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php
index 4133fe708d3f..d50950d17386 100755
--- a/system/Helpers/text_helper.php
+++ b/system/Helpers/text_helper.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * CodeIgniter
  *
@@ -49,33 +50,33 @@
 if ( ! function_exists('word_limiter'))
 {
 
-	/**
-	 * Word Limiter
-	 *
-	 * Limits a string to X number of words.
-	 *
-	 * @param    string $str
-	 * @param    int    $limit
-	 * @param    string $end_char the end character. Usually an ellipsis
-	 *
-	 * @return    string
-	 */
-	function word_limiter(string $str, int $limit = 100, string $end_char = '&#8230;'): string
-	{
-		if (trim($str) === '')
-		{
-			return $str;
-		}
-
-		preg_match('/^\s*+(?:\S++\s*+){1,' . (int) $limit . '}/', $str, $matches);
-
-		if (strlen($str) === strlen($matches[0]))
-		{
-			$end_char = '';
-		}
-
-		return rtrim($matches[0]) . $end_char;
-	}
+    /**
+     * Word Limiter
+     *
+     * Limits a string to X number of words.
+     *
+     * @param    string $str
+     * @param    int    $limit
+     * @param    string $end_char the end character. Usually an ellipsis
+     *
+     * @return    string
+     */
+    function word_limiter(string $str, int $limit = 100, string $end_char = '&#8230;'): string
+    {
+        if (trim($str) === '')
+        {
+            return $str;
+        }
+
+        preg_match('/^\s*+(?:\S++\s*+){1,' . (int) $limit . '}/', $str, $matches);
+
+        if (strlen($str) === strlen($matches[0]))
+        {
+            $end_char = '';
+        }
+
+        return rtrim($matches[0]) . $end_char;
+    }
 
 }
 
@@ -84,46 +85,46 @@ function word_limiter(string $str, int $limit = 100, string $end_char = '&#8230;
 if ( ! function_exists('character_limiter'))
 {
 
-	/**
-	 * Character Limiter
-	 *
-	 * Limits the string based on the character count.  Preserves complete words
-	 * so the character count may not be exactly as specified.
-	 *
-	 * @param    string $str
-	 * @param    int    $n
-	 * @param    string $end_char the end character. Usually an ellipsis
-	 *
-	 * @return    string
-	 */
-	function character_limiter(string $str, int $n = 500, string $end_char = '&#8230;'): string
-	{
-		if (mb_strlen($str) < $n)
-		{
-			return $str;
-		}
-
-		// a bit complicated, but faster than preg_replace with \s+
-		$str = preg_replace('/ {2,}/', ' ', str_replace(["\r", "\n", "\t", "\x0B", "\x0C"], ' ', $str));
-
-		if (mb_strlen($str) <= $n)
-		{
-			return $str;
-		}
-
-		$out = '';
-
-		foreach (explode(' ', trim($str)) as $val)
-		{
-			$out .= $val . ' ';
-			if (mb_strlen($out) >= $n)
-			{
-				$out = trim($out);
-
-				return (mb_strlen($out) === mb_strlen($str)) ? $out : $out . $end_char;
-			}
-		}
-	}
+    /**
+     * Character Limiter
+     *
+     * Limits the string based on the character count.  Preserves complete words
+     * so the character count may not be exactly as specified.
+     *
+     * @param    string $str
+     * @param    int    $n
+     * @param    string $end_char the end character. Usually an ellipsis
+     *
+     * @return    string
+     */
+    function character_limiter(string $str, int $n = 500, string $end_char = '&#8230;'): string
+    {
+        if (mb_strlen($str) < $n)
+        {
+            return $str;
+        }
+
+        // a bit complicated, but faster than preg_replace with \s+
+        $str = preg_replace('/ {2,}/', ' ', str_replace(["\r", "\n", "\t", "\x0B", "\x0C"], ' ', $str));
+
+        if (mb_strlen($str) <= $n)
+        {
+            return $str;
+        }
+
+        $out = '';
+
+        foreach (explode(' ', trim($str)) as $val)
+        {
+            $out .= $val . ' ';
+            if (mb_strlen($out) >= $n)
+            {
+                $out = trim($out);
+                break;
+            }
+        }
+        return (mb_strlen($out) === mb_strlen($str)) ? $out : $out . $end_char;
+    }
 
 }
 
@@ -132,63 +133,63 @@ function character_limiter(string $str, int $n = 500, string $end_char = '&#8230
 if ( ! function_exists('ascii_to_entities'))
 {
 
-	/**
-	 * High ASCII to Entities
-	 *
-	 * Converts high ASCII text and MS Word special characters to character entities
-	 *
-	 * @param    string $str
-	 *
-	 * @return    string
-	 */
-	function ascii_to_entities(string $str): string
-	{
-		$out = '';
-
-		for ($i = 0, $s = strlen($str) - 1, $count = 1, $temp = []; $i <= $s; $i ++ )
-		{
-			$ordinal = ord($str[$i]);
-
-			if ($ordinal < 128)
-			{
-				/*
-				  If the $temp array has a value but we have moved on, then it seems only
-				  fair that we output that entity and restart $temp before continuing. -Paul
-				 */
-				if (count($temp) === 1)
-				{
-					$out .= '&#' . array_shift($temp) . ';';
-					$count = 1;
-				}
-
-				$out .= $str[$i];
-			}
-			else
-			{
-				if (empty($temp))
-				{
-					$count = ($ordinal < 224) ? 2 : 3;
-				}
-
-				$temp[] = $ordinal;
-
-				if (count($temp) === $count)
-				{
-					$number = ($count === 3) ? (($temp[0] % 16) * 4096) + (($temp[1] % 64) * 64) + ($temp[2] % 64) : (($temp[0] % 32) * 64) + ($temp[1] % 64);
-					$out .= '&#' . $number . ';';
-					$count = 1;
-					$temp = [];
-				}
-				// If this is the last iteration, just output whatever we have
-				elseif ($i === $s)
-				{
-					$out .= '&#' . implode(';', $temp) . ';';
-				}
-			}
-		}
-
-		return $out;
-	}
+    /**
+     * High ASCII to Entities
+     *
+     * Converts high ASCII text and MS Word special characters to character entities
+     *
+     * @param    string $str
+     *
+     * @return    string
+     */
+    function ascii_to_entities(string $str): string
+    {
+        $out = '';
+
+        for ($i = 0, $s = strlen($str) - 1, $count = 1, $temp = []; $i <= $s; $i ++)
+        {
+            $ordinal = ord($str[$i]);
+
+            if ($ordinal < 128)
+            {
+                /*
+                  If the $temp array has a value but we have moved on, then it seems only
+                  fair that we output that entity and restart $temp before continuing. -Paul
+                 */
+                if (count($temp) === 1)
+                {
+                    $out .= '&#' . array_shift($temp) . ';';
+                    $count = 1;
+                }
+
+                $out .= $str[$i];
+            }
+            else
+            {
+                if (empty($temp))
+                {
+                    $count = ($ordinal < 224) ? 2 : 3;
+                }
+
+                $temp[] = $ordinal;
+
+                if (count($temp) === $count)
+                {
+                    $number = ($count === 3) ? (($temp[0] % 16) * 4096) + (($temp[1] % 64) * 64) + ($temp[2] % 64) : (($temp[0] % 32) * 64) + ($temp[1] % 64);
+                    $out .= '&#' . $number . ';';
+                    $count = 1;
+                    $temp = [];
+                }
+                // If this is the last iteration, just output whatever we have
+                elseif ($i === $s)
+                {
+                    $out .= '&#' . implode(';', $temp) . ';';
+                }
+            }
+        }
+
+        return $out;
+    }
 
 }
 
@@ -197,51 +198,51 @@ function ascii_to_entities(string $str): string
 if ( ! function_exists('entities_to_ascii'))
 {
 
-	/**
-	 * Entities to ASCII
-	 *
-	 * Converts character entities back to ASCII
-	 *
-	 * @param    string $str
-	 * @param    bool   $all
-	 *
-	 * @return    string
-	 */
-	function entities_to_ascii(string $str, bool $all = true): string
-	{
-		if (preg_match_all('/\&#(\d+)\;/', $str, $matches))
-		{
-			for ($i = 0, $s = count($matches[0]); $i < $s; $i ++ )
-			{
-				$digits = $matches[1][$i];
-				$out = '';
-				if ($digits < 128)
-				{
-					$out .= chr($digits);
-				}
-				elseif ($digits < 2048)
-				{
-					$out .= chr(192 + (($digits - ($digits % 64)) / 64)) . chr(128 + ($digits % 64));
-				}
-				else
-				{
-					$out .= chr(224 + (($digits - ($digits % 4096)) / 4096))
-							. chr(128 + ((($digits % 4096) - ($digits % 64)) / 64))
-							. chr(128 + ($digits % 64));
-				}
-				$str = str_replace($matches[0][$i], $out, $str);
-			}
-		}
-
-		if ($all)
-		{
-			return str_replace(
-					['&amp;', '&lt;', '&gt;', '&quot;', '&apos;', '&#45;'], ['&', '<', '>', '"', "'", '-'], $str
-			);
-		}
-
-		return $str;
-	}
+    /**
+     * Entities to ASCII
+     *
+     * Converts character entities back to ASCII
+     *
+     * @param    string $str
+     * @param    bool   $all
+     *
+     * @return    string
+     */
+    function entities_to_ascii(string $str, bool $all = true): string
+    {
+        if (preg_match_all('/\&#(\d+)\;/', $str, $matches))
+        {
+            for ($i = 0, $s = count($matches[0]); $i < $s; $i ++)
+            {
+                $digits = $matches[1][$i];
+                $out = '';
+                if ($digits < 128)
+                {
+                    $out .= chr($digits);
+                }
+                elseif ($digits < 2048)
+                {
+                    $out .= chr(192 + (($digits - ($digits % 64)) / 64)) . chr(128 + ($digits % 64));
+                }
+                else
+                {
+                    $out .= chr(224 + (($digits - ($digits % 4096)) / 4096))
+                            . chr(128 + ((($digits % 4096) - ($digits % 64)) / 64))
+                            . chr(128 + ($digits % 64));
+                }
+                $str = str_replace($matches[0][$i], $out, $str);
+            }
+        }
+
+        if ($all)
+        {
+            return str_replace(
+                    ['&amp;', '&lt;', '&gt;', '&quot;', '&apos;', '&#45;'], ['&', '<', '>', '"', "'", '-'], $str
+            );
+        }
+
+        return $str;
+    }
 
 }
 
@@ -250,60 +251,60 @@ function entities_to_ascii(string $str, bool $all = true): string
 if ( ! function_exists('word_censor'))
 {
 
-	/**
-	 * Word Censoring Function
-	 *
-	 * Supply a string and an array of disallowed words and any
-	 * matched words will be converted to #### or to the replacement
-	 * word you've submitted.
-	 *
-	 * @param    string $str         the text string
-	 * @param    string $censored    the array of censored words
-	 * @param    string $replacement the optional replacement value
-	 *
-	 * @return    string
-	 */
-	function word_censor(string $str, $censored, string $replacement = ''): string
-	{
-		if ( ! is_array($censored))
-		{
-			return $str;
-		}
-
-		$str = ' ' . $str . ' ';
-
-		// \w, \b and a few others do not match on a unicode character
-		// set for performance reasons. As a result words like über
-		// will not match on a word boundary. Instead, we'll assume that
-		// a bad word will be bookeneded by any of these characters.
-		$delim = '[-_\'\"`(){}<>\[\]|!?@#%&,.:;^~*+=\/ 0-9\n\r\t]';
-
-		foreach ($censored as $badword)
-		{
-			$badword = str_replace('\*', '\w*?', preg_quote($badword, '/'));
-
-			if ($replacement !== '')
-			{
-				$str = preg_replace(
-						"/({$delim})(" . $badword . ")({$delim})/i", "\\1{$replacement}\\3", $str
-				);
-			}
-			elseif (preg_match_all("/{$delim}(" . $badword . "){$delim}/i", $str, $matches, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE))
-			{
-				$matches = $matches[1];
-
-				for ($i = count($matches) - 1; $i >= 0; $i -- )
-				{
-					$length = strlen($matches[$i][0]);
-					$str = substr_replace(
-							$str, str_repeat('#', $length), $matches[$i][1], $length
-					);
-				}
-			}
-		}
-
-		return trim($str);
-	}
+    /**
+     * Word Censoring Function
+     *
+     * Supply a string and an array of disallowed words and any
+     * matched words will be converted to #### or to the replacement
+     * word you've submitted.
+     *
+     * @param    string $str         the text string
+     * @param    string $censored    the array of censored words
+     * @param    string $replacement the optional replacement value
+     *
+     * @return    string
+     */
+    function word_censor(string $str, $censored, string $replacement = ''): string
+    {
+        if ( ! is_array($censored))
+        {
+            return $str;
+        }
+
+        $str = ' ' . $str . ' ';
+
+        // \w, \b and a few others do not match on a unicode character
+        // set for performance reasons. As a result words like über
+        // will not match on a word boundary. Instead, we'll assume that
+        // a bad word will be bookeneded by any of these characters.
+        $delim = '[-_\'\"`(){}<>\[\]|!?@#%&,.:;^~*+=\/ 0-9\n\r\t]';
+
+        foreach ($censored as $badword)
+        {
+            $badword = str_replace('\*', '\w*?', preg_quote($badword, '/'));
+
+            if ($replacement !== '')
+            {
+                $str = preg_replace(
+                        "/({$delim})(" . $badword . ")({$delim})/i", "\\1{$replacement}\\3", $str
+                );
+            }
+            elseif (preg_match_all("/{$delim}(" . $badword . "){$delim}/i", $str, $matches, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE))
+            {
+                $matches = $matches[1];
+
+                for ($i = count($matches) - 1; $i >= 0; $i --)
+                {
+                    $length = strlen($matches[$i][0]);
+                    $str = substr_replace(
+                            $str, str_repeat('#', $length), $matches[$i][1], $length
+                    );
+                }
+            }
+        }
+
+        return trim($str);
+    }
 
 }
 
@@ -312,50 +313,50 @@ function word_censor(string $str, $censored, string $replacement = ''): string
 if ( ! function_exists('highlight_code'))
 {
 
-	/**
-	 * Code Highlighter
-	 *
-	 * Colorizes code strings
-	 *
-	 * @param    string $str the text string
-	 *
-	 * @return    string
-	 */
-	function highlight_code(string $str): string
-	{
-		/* The highlight string function encodes and highlights
-		 * brackets so we need them to start raw.
-		 *
-		 * Also replace any existing PHP tags to temporary markers
-		 * so they don't accidentally break the string out of PHP,
-		 * and thus, thwart the highlighting.
-		 */
-		$str = str_replace(
-				['&lt;', '&gt;', '<?', '?>', '<%', '%>', '\\', '</script>'], ['<', '>', 'phptagopen', 'phptagclose', 'asptagopen', 'asptagclose', 'backslashtmp', 'scriptclose'], $str
-		);
-
-		// The highlight_string function requires that the text be surrounded
-		// by PHP tags, which we will remove later
-		$str = highlight_string('<?php ' . $str . ' ?>', true);
-
-		// Remove our artificially added PHP, and the syntax highlighting that came with it
-		$str = preg_replace(
-				[
-			'/<span style="color: #([A-Z0-9]+)">&lt;\?php(&nbsp;| )/i',
-			'/(<span style="color: #[A-Z0-9]+">.*?)\?&gt;<\/span>\n<\/span>\n<\/code>/is',
-			'/<span style="color: #[A-Z0-9]+"\><\/span>/i',
-				], [
-			'<span style="color: #$1">',
-			"$1</span>\n</span>\n</code>",
-			'',
-				], $str
-		);
-
-		// Replace our markers back to PHP tags.
-		return str_replace(
-				['phptagopen', 'phptagclose', 'asptagopen', 'asptagclose', 'backslashtmp', 'scriptclose'], ['&lt;?', '?&gt;', '&lt;%', '%&gt;', '\\', '&lt;/script&gt;'], $str
-		);
-	}
+    /**
+     * Code Highlighter
+     *
+     * Colorizes code strings
+     *
+     * @param    string $str the text string
+     *
+     * @return    string
+     */
+    function highlight_code(string $str): string
+    {
+        /* The highlight string function encodes and highlights
+         * brackets so we need them to start raw.
+         *
+         * Also replace any existing PHP tags to temporary markers
+         * so they don't accidentally break the string out of PHP,
+         * and thus, thwart the highlighting.
+         */
+        $str = str_replace(
+                ['&lt;', '&gt;', '<?', '?>', '<%', '%>', '\\', '</script>'], ['<', '>', 'phptagopen', 'phptagclose', 'asptagopen', 'asptagclose', 'backslashtmp', 'scriptclose'], $str
+        );
+
+        // The highlight_string function requires that the text be surrounded
+        // by PHP tags, which we will remove later
+        $str = highlight_string('<?php ' . $str . ' ?>', true);
+
+        // Remove our artificially added PHP, and the syntax highlighting that came with it
+        $str = preg_replace(
+                [
+            '/<span style="color: #([A-Z0-9]+)">&lt;\?php(&nbsp;| )/i',
+            '/(<span style="color: #[A-Z0-9]+">.*?)\?&gt;<\/span>\n<\/span>\n<\/code>/is',
+            '/<span style="color: #[A-Z0-9]+"\><\/span>/i',
+                ], [
+            '<span style="color: #$1">',
+            "$1</span>\n</span>\n</code>",
+            '',
+                ], $str
+        );
+
+        // Replace our markers back to PHP tags.
+        return str_replace(
+                ['phptagopen', 'phptagclose', 'asptagopen', 'asptagclose', 'backslashtmp', 'scriptclose'], ['&lt;?', '?&gt;', '&lt;%', '%&gt;', '\\', '&lt;/script&gt;'], $str
+        );
+    }
 
 }
 
@@ -364,22 +365,22 @@ function highlight_code(string $str): string
 if ( ! function_exists('highlight_phrase'))
 {
 
-	/**
-	 * Phrase Highlighter
-	 *
-	 * Highlights a phrase within a text string
-	 *
-	 * @param    string $str       the text string
-	 * @param    string $phrase    the phrase you'd like to highlight
-	 * @param    string $tag_open  the openging tag to precede the phrase with
-	 * @param    string $tag_close the closing tag to end the phrase with
-	 *
-	 * @return    string
-	 */
-	function highlight_phrase(string $str, string $phrase, string $tag_open = '<mark>', string $tag_close = '</mark>'): string
-	{
-		return ($str !== '' && $phrase !== '') ? preg_replace('/(' . preg_quote($phrase, '/') . ')/i', $tag_open . '\\1' . $tag_close, $str) : $str;
-	}
+    /**
+     * Phrase Highlighter
+     *
+     * Highlights a phrase within a text string
+     *
+     * @param    string $str       the text string
+     * @param    string $phrase    the phrase you'd like to highlight
+     * @param    string $tag_open  the openging tag to precede the phrase with
+     * @param    string $tag_close the closing tag to end the phrase with
+     *
+     * @return    string
+     */
+    function highlight_phrase(string $str, string $phrase, string $tag_open = '<mark>', string $tag_close = '</mark>'): string
+    {
+        return ($str !== '' && $phrase !== '') ? preg_replace('/(' . preg_quote($phrase, '/') . ')/i', $tag_open . '\\1' . $tag_close, $str) : $str;
+    }
 
 }
 
@@ -388,36 +389,36 @@ function highlight_phrase(string $str, string $phrase, string $tag_open = '<mark
 if ( ! function_exists('convert_accented_characters'))
 {
 
-	/**
-	 * Convert Accented Foreign Characters to ASCII
-	 *
-	 * @param    string $str Input string
-	 *
-	 * @return    string
-	 */
-	function convert_accented_characters(string $str): string
-	{
-		static $array_from, $array_to;
-
-		if ( ! is_array($array_from))
-		{
-			$config = new Config\ForeignCharacters();
-
-			if (empty($config->characterList) || ! is_array($config->characterList))
-			{
-				$array_from = [];
-				$array_to = [];
-
-				return $str;
-			}
-			$array_from = array_keys($config->characterList);
-			$array_to = array_values($config->characterList);
-
-			unset($config);
-		}
-
-		return preg_replace($array_from, $array_to, $str);
-	}
+    /**
+     * Convert Accented Foreign Characters to ASCII
+     *
+     * @param    string $str Input string
+     *
+     * @return    string
+     */
+    function convert_accented_characters(string $str): string
+    {
+        static $array_from, $array_to;
+
+        if ( ! is_array($array_from))
+        {
+            $config = new Config\ForeignCharacters();
+
+            if (empty($config->characterList) || ! is_array($config->characterList))
+            {
+                $array_from = [];
+                $array_to = [];
+
+                return $str;
+            }
+            $array_from = array_keys($config->characterList);
+            $array_to = array_values($config->characterList);
+
+            unset($config);
+        }
+
+        return preg_replace($array_from, $array_to, $str);
+    }
 
 }
 
@@ -426,100 +427,103 @@ function convert_accented_characters(string $str): string
 if ( ! function_exists('word_wrap'))
 {
 
-	/**
-	 * Word Wrap
-	 *
-	 * Wraps text at the specified character. Maintains the integrity of words.
-	 * Anything placed between {unwrap}{/unwrap} will not be word wrapped, nor
-	 * will URLs.
-	 *
-	 * @param    string $str     the text string
-	 * @param    int    $charlim = 76    the number of characters to wrap at
-	 *
-	 * @return    string
-	 */
-	function word_wrap(string $str, int $charlim = 76): string
-	{
-		// Set the character limit
-		is_numeric($charlim) || $charlim = 76;
-
-		// Reduce multiple spaces
-		$str = preg_replace('| +|', ' ', $str);
-
-		// Standardize newlines
-		if (strpos($str, "\r") !== false)
-		{
-			$str = str_replace(["\r\n", "\r"], "\n", $str);
-		}
-
-		// If the current word is surrounded by {unwrap} tags we'll
-		// strip the entire chunk and replace it with a marker.
-		$unwrap = [];
-
-		if (preg_match_all('|\{unwrap\}(.+?)\{/unwrap\}|s', $str, $matches))
-		{
-			for ($i = 0, $c = count($matches[0]); $i < $c; $i ++ )
-			{
-				$unwrap[] = $matches[1][$i];
-				$str = str_replace($matches[0][$i], '{{unwrapped' . $i . '}}', $str);
-			}
-		}
-
-		// Use PHP's native function to do the initial wordwrap.
-		// We set the cut flag to FALSE so that any individual words that are
-		// too long get left alone. In the next step we'll deal with them.
-		$str = wordwrap($str, $charlim, "\n", false);
-
-		// Split the string into individual lines of text and cycle through them
-		$output = '';
-
-		foreach (explode("\n", $str) as $line)
-		{
-			// Is the line within the allowed character count?
-			// If so we'll join it to the output and continue
-			if (mb_strlen($line) <= $charlim)
-			{
-				$output .= $line . "\n";
-				continue;
-			}
-
-			$temp = '';
-
-			while (mb_strlen($line) > $charlim)
-			{
-				// If the over-length word is a URL we won't wrap it
-				if (preg_match('!\[url.+\]|://|www\.!', $line))
-				{
-					break;
-				}
-				// Trim the word down
-				$temp .= mb_substr($line, 0, $charlim - 1);
-				$line = mb_substr($line, $charlim - 1);
-			}
-
-			// If $temp contains data it means we had to split up an over-length
-			// word into smaller chunks so we'll add it back to our current line
-			if ($temp !== '')
-			{
-				$output .= $temp . "\n" . $line . "\n";
-			}
-			else
-			{
-				$output .= $line . "\n";
-			}
-		}
-
-		// Put our markers back
-		if (! empty($unwrap))
-		{
-			foreach ($unwrap as $key => $val)
-			{
-				$output = str_replace('{{unwrapped' . $key . '}}', $val, $output);
-			}
-		}
-
-		return $output;
-	}
+    /**
+     * Word Wrap
+     *
+     * Wraps text at the specified character. Maintains the integrity of words.
+     * Anything placed between {unwrap}{/unwrap} will not be word wrapped, nor
+     * will URLs.
+     *
+     * @param    string $str     the text string
+     * @param    int    $charlim = 76    the number of characters to wrap at
+     *
+     * @return    string
+     */
+    function word_wrap(string $str, int $charlim = 76): string
+    {
+        // Set the character limit
+        is_numeric($charlim) || $charlim = 76;
+
+        // Reduce multiple spaces
+        $str = preg_replace('| +|', ' ', $str);
+
+        // Standardize newlines
+        if (strpos($str, "\r") !== false)
+        {
+            $str = str_replace(["\r\n", "\r"], "\n", $str);
+        }
+
+        // If the current word is surrounded by {unwrap} tags we'll
+        // strip the entire chunk and replace it with a marker.
+        $unwrap = [];
+
+        if (preg_match_all('|\{unwrap\}(.+?)\{/unwrap\}|s', $str, $matches))
+        {
+            for ($i = 0, $c = count($matches[0]); $i < $c; $i ++)
+            {
+                $unwrap[] = $matches[1][$i];
+                $str = str_replace($matches[0][$i], '{{unwrapped' . $i . '}}', $str);
+            }
+        }
+
+        // Use PHP's native function to do the initial wordwrap.
+        // We set the cut flag to FALSE so that any individual words that are
+        // too long get left alone. In the next step we'll deal with them.
+        $str = wordwrap($str, $charlim, "\n", false);
+
+        // Split the string into individual lines of text and cycle through them
+        $output = '';
+
+        foreach (explode("\n", $str) as $line)
+        {
+            // Is the line within the allowed character count?
+            // If so we'll join it to the output and continue
+            if (mb_strlen($line) <= $charlim)
+            {
+                $output .= $line . "\n";
+                continue;
+            }
+
+            $temp = '';
+
+            while (mb_strlen($line) > $charlim)
+            {
+                // If the over-length word is a URL we won't wrap it
+                if (preg_match('!\[url.+\]|://|www\.!', $line))
+                {
+                    break;
+                }
+                // Trim the word down
+                $temp .= mb_substr($line, 0, $charlim - 1);
+                $line = mb_substr($line, $charlim - 1);
+            }
+
+            // If $temp contains data it means we had to split up an over-length
+            // word into smaller chunks so we'll add it back to our current line
+            if ($temp !== '')
+            {
+                $output .= $temp . "\n" . $line . "\n";
+            }
+            else
+            {
+                $output .= $line . "\n";
+            }
+        }
+
+        // Put our markers back
+        if ( ! empty($unwrap))
+        {
+            foreach ($unwrap as $key => $val)
+            {
+                $output = str_replace('{{unwrapped' . $key . '}}', $val, $output);
+            }
+        }
+
+        // remove any trailing newline
+        $output = rtrim($output);
+
+        return $output;
+    }
 
 }
 
@@ -528,43 +532,43 @@ function word_wrap(string $str, int $charlim = 76): string
 if ( ! function_exists('ellipsize'))
 {
 
-	/**
-	 * Ellipsize String
-	 *
-	 * This function will strip tags from a string, split it at its max_length and ellipsize
-	 *
-	 * @param    string $str        String to ellipsize
-	 * @param    int    $max_length Max length of string
-	 * @param    mixed  $position   int (1|0) or float, .5, .2, etc for position to split
-	 * @param    string $ellipsis   ellipsis ; Default '...'
-	 *
-	 * @return    string    Ellipsized string
-	 */
-	function ellipsize(string $str, int $max_length, $position = 1, string $ellipsis = '&hellip;'): string
-	{
-		// Strip tags
-		$str = trim(strip_tags($str));
-
-		// Is the string long enough to ellipsize?
-		if (mb_strlen($str) <= $max_length)
-		{
-			return $str;
-		}
-
-		$beg = mb_substr($str, 0, floor($max_length * $position));
-		$position = ($position > 1) ? 1 : $position;
-
-		if ($position === 1)
-		{
-			$end = mb_substr($str, 0, -($max_length - mb_strlen($beg)));
-		}
-		else
-		{
-			$end = mb_substr($str, -($max_length - mb_strlen($beg)));
-		}
-
-		return $beg . $ellipsis . $end;
-	}
+    /**
+     * Ellipsize String
+     *
+     * This function will strip tags from a string, split it at its max_length and ellipsize
+     *
+     * @param    string $str        String to ellipsize
+     * @param    int    $max_length Max length of string
+     * @param    mixed  $position   int (1|0) or float, .5, .2, etc for position to split
+     * @param    string $ellipsis   ellipsis ; Default '...'
+     *
+     * @return    string    Ellipsized string
+     */
+    function ellipsize(string $str, int $max_length, $position = 1, string $ellipsis = '&hellip;'): string
+    {
+        // Strip tags
+        $str = trim(strip_tags($str));
+
+        // Is the string long enough to ellipsize?
+        if (mb_strlen($str) <= $max_length)
+        {
+            return $str;
+        }
+
+        $beg = mb_substr($str, 0, floor($max_length * $position));
+        $position = ($position > 1) ? 1 : $position;
+
+        if ($position === 1)
+        {
+            $end = mb_substr($str, 0, -($max_length - mb_strlen($beg)));
+        }
+        else
+        {
+            $end = mb_substr($str, -($max_length - mb_strlen($beg)));
+        }
+
+        return $beg . $ellipsis . $end;
+    }
 
 }
 
@@ -573,28 +577,28 @@ function ellipsize(string $str, int $max_length, $position = 1, string $ellipsis
 if ( ! function_exists('strip_slashes'))
 {
 
-	/**
-	 * Strip Slashes
-	 *
-	 * Removes slashes contained in a string or in an array
-	 *
-	 * @param    mixed    string or array
-	 *
-	 * @return    mixed    string or array
-	 */
-	function strip_slashes($str)
-	{
-		if ( ! is_array($str))
-		{
-			return stripslashes($str);
-		}
-		foreach ($str as $key => $val)
-		{
-			$str[$key] = strip_slashes($val);
-		}
-
-		return $str;
-	}
+    /**
+     * Strip Slashes
+     *
+     * Removes slashes contained in a string or in an array
+     *
+     * @param    mixed    string or array
+     *
+     * @return    mixed    string or array
+     */
+    function strip_slashes($str)
+    {
+        if ( ! is_array($str))
+        {
+            return stripslashes($str);
+        }
+        foreach ($str as $key => $val)
+        {
+            $str[$key] = strip_slashes($val);
+        }
+
+        return $str;
+    }
 
 }
 
@@ -603,19 +607,19 @@ function strip_slashes($str)
 if ( ! function_exists('strip_quotes'))
 {
 
-	/**
-	 * Strip Quotes
-	 *
-	 * Removes single and double quotes from a string
-	 *
-	 * @param    string
-	 *
-	 * @return    string
-	 */
-	function strip_quotes(string $str): string
-	{
-		return str_replace(['"', "'"], '', $str);
-	}
+    /**
+     * Strip Quotes
+     *
+     * Removes single and double quotes from a string
+     *
+     * @param    string
+     *
+     * @return    string
+     */
+    function strip_quotes(string $str): string
+    {
+        return str_replace(['"', "'"], '', $str);
+    }
 
 }
 
@@ -624,19 +628,19 @@ function strip_quotes(string $str): string
 if ( ! function_exists('quotes_to_entities'))
 {
 
-	/**
-	 * Quotes to Entities
-	 *
-	 * Converts single and double quotes to entities
-	 *
-	 * @param    string
-	 *
-	 * @return    string
-	 */
-	function quotes_to_entities(string $str): string
-	{
-		return str_replace(["\'", "\"", "'", '"'], ["&#39;", "&quot;", "&#39;", "&quot;"], $str);
-	}
+    /**
+     * Quotes to Entities
+     *
+     * Converts single and double quotes to entities
+     *
+     * @param    string
+     *
+     * @return    string
+     */
+    function quotes_to_entities(string $str): string
+    {
+        return str_replace(["\'", "\"", "'", '"'], ["&#39;", "&quot;", "&#39;", "&quot;"], $str);
+    }
 
 }
 
@@ -645,26 +649,26 @@ function quotes_to_entities(string $str): string
 if ( ! function_exists('reduce_double_slashes'))
 {
 
-	/**
-	 * Reduce Double Slashes
-	 *
-	 * Converts double slashes in a string to a single slash,
-	 * except those found in http://
-	 *
-	 * http://www.some-site.com//index.php
-	 *
-	 * becomes:
-	 *
-	 * http://www.some-site.com/index.php
-	 *
-	 * @param    string
-	 *
-	 * @return    string
-	 */
-	function reduce_double_slashes(string $str): string
-	{
-		return preg_replace('#(^|[^:])//+#', '\\1/', $str);
-	}
+    /**
+     * Reduce Double Slashes
+     *
+     * Converts double slashes in a string to a single slash,
+     * except those found in http://
+     *
+     * http://www.some-site.com//index.php
+     *
+     * becomes:
+     *
+     * http://www.some-site.com/index.php
+     *
+     * @param    string
+     *
+     * @return    string
+     */
+    function reduce_double_slashes(string $str): string
+    {
+        return preg_replace('#(^|[^:])//+#', '\\1/', $str);
+    }
 
 }
 
@@ -673,29 +677,29 @@ function reduce_double_slashes(string $str): string
 if ( ! function_exists('reduce_multiples'))
 {
 
-	/**
-	 * Reduce Multiples
-	 *
-	 * Reduces multiple instances of a particular character.  Example:
-	 *
-	 * Fred, Bill,, Joe, Jimmy
-	 *
-	 * becomes:
-	 *
-	 * Fred, Bill, Joe, Jimmy
-	 *
-	 * @param    string $str
-	 * @param    string $character the character you wish to reduce
-	 * @param    bool   $trim      TRUE/FALSE - whether to trim the character from the beginning/end
-	 *
-	 * @return    string
-	 */
-	function reduce_multiples(string $str, string $character = ',', bool $trim = false): string
-	{
-		$str = preg_replace('#' . preg_quote($character, '#') . '{2,}#', $character, $str);
-
-		return ($trim === true) ? trim($str, $character) : $str;
-	}
+    /**
+     * Reduce Multiples
+     *
+     * Reduces multiple instances of a particular character.  Example:
+     *
+     * Fred, Bill,, Joe, Jimmy
+     *
+     * becomes:
+     *
+     * Fred, Bill, Joe, Jimmy
+     *
+     * @param    string $str
+     * @param    string $character the character you wish to reduce
+     * @param    bool   $trim      TRUE/FALSE - whether to trim the character from the beginning/end
+     *
+     * @return    string
+     */
+    function reduce_multiples(string $str, string $character = ',', bool $trim = false): string
+    {
+        $str = preg_replace('#' . preg_quote($character, '#') . '{2,}#', $character, $str);
+
+        return ($trim === true) ? trim($str, $character) : $str;
+    }
 
 }
 
@@ -704,51 +708,51 @@ function reduce_multiples(string $str, string $character = ',', bool $trim = fal
 if ( ! function_exists('random_string'))
 {
 
-	/**
-	 * Create a Random String
-	 *
-	 * Useful for generating passwords or hashes.
-	 *
-	 * @param    string $type Type of random string.  basic, alpha, alnum, numeric, nozero, unique, md5, sha1, and crypto
-	 * @param    int    $len  Number of characters
-	 *
-	 * @return    string
-	 */
-	function random_string(string $type = 'alnum', int $len = 8): string
-	{
-		switch ($type)
-		{
-			case 'basic':
-				return mt_rand();
-			case 'alnum':
-			case 'numeric':
-			case 'nozero':
-			case 'alpha':
-				switch ($type)
-				{
-					case 'alpha':
-						$pool = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-						break;
-					case 'alnum':
-						$pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-						break;
-					case 'numeric':
-						$pool = '0123456789';
-						break;
-					case 'nozero':
-						$pool = '123456789';
-						break;
-				}
-
-				return substr(str_shuffle(str_repeat($pool, ceil($len / strlen($pool)))), 0, $len);
-			case 'md5':
-				return md5(uniqid(mt_rand(), true));
-			case 'sha1':
-				return sha1(uniqid(mt_rand(), true));
-			case 'crypto':
-				return bin2hex(random_bytes($len/2));
-		}
-	}
+    /**
+     * Create a Random String
+     *
+     * Useful for generating passwords or hashes.
+     *
+     * @param    string $type Type of random string.  basic, alpha, alnum, numeric, nozero, md5, sha1, and crypto
+     * @param    int    $len  Number of characters
+     *
+     * @return    string
+     */
+    function random_string(string $type = 'alnum', int $len = 8): string
+    {
+        switch ($type)
+        {
+            case 'alnum':
+            case 'numeric':
+            case 'nozero':
+            case 'alpha':
+                switch ($type)
+                {
+                    case 'alpha':
+                        $pool = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+                        break;
+                    case 'alnum':
+                        $pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+                        break;
+                    case 'numeric':
+                        $pool = '0123456789';
+                        break;
+                    case 'nozero':
+                        $pool = '123456789';
+                        break;
+                }
+
+                return substr(str_shuffle(str_repeat($pool, ceil($len / strlen($pool)))), 0, $len);
+            case 'md5':
+                return md5(uniqid(mt_rand(), true));
+            case 'sha1':
+                return sha1(uniqid(mt_rand(), true));
+            case 'crypto':
+                return bin2hex(random_bytes($len / 2));
+        }
+        // 'basic' type treated as default
+        return (string) mt_rand();
+    }
 
 }
 
@@ -757,21 +761,21 @@ function random_string(string $type = 'alnum', int $len = 8): string
 if ( ! function_exists('increment_string'))
 {
 
-	/**
-	 * Add's _1 to a string or increment the ending number to allow _2, _3, etc
-	 *
-	 * @param    string $str       Required
-	 * @param    string $separator What should the duplicate number be appended with
-	 * @param    int    $first     Which number should be used for the first dupe increment
-	 *
-	 * @return    string
-	 */
-	function increment_string(string $str, string $separator = '_', int $first = 1): string
-	{
-		preg_match('/(.+)' . preg_quote($separator, '/') . '([0-9]+)$/', $str, $match);
-
-		return isset($match[2]) ? $match[1] . $separator . ($match[2] + 1) : $str . $separator . $first;
-	}
+    /**
+     * Add's _1 to a string or increment the ending number to allow _2, _3, etc
+     *
+     * @param    string $str       Required
+     * @param    string $separator What should the duplicate number be appended with
+     * @param    int    $first     Which number should be used for the first dupe increment
+     *
+     * @return    string
+     */
+    function increment_string(string $str, string $separator = '_', int $first = 1): string
+    {
+        preg_match('/(.+)' . preg_quote($separator, '/') . '([0-9]+)$/', $str, $match);
+
+        return isset($match[2]) ? $match[1] . $separator . ($match[2] + 1) : $str . $separator . $first;
+    }
 
 }
 
@@ -780,30 +784,30 @@ function increment_string(string $str, string $separator = '_', int $first = 1):
 if ( ! function_exists('alternator'))
 {
 
-	/**
-	 * Alternator
-	 *
-	 * Allows strings to be alternated. See docs...
-	 *
-	 * @param    string (as many parameters as needed)
-	 *
-	 * @return    string
-	 */
-	function alternator(): string
-	{
-		static $i;
+    /**
+     * Alternator
+     *
+     * Allows strings to be alternated. See docs...
+     *
+     * @param    string (as many parameters as needed)
+     *
+     * @return    string
+     */
+    function alternator(): string
+    {
+        static $i;
 
-		if (func_num_args() === 0)
-		{
-			$i = 0;
+        if (func_num_args() === 0)
+        {
+            $i = 0;
 
-			return '';
-		}
+            return '';
+        }
 
-		$args = func_get_args();
+        $args = func_get_args();
 
-		return $args[($i ++ % count($args))];
-	}
+        return $args[($i ++ % count($args))];
+    }
 
 }
 
@@ -812,65 +816,65 @@ function alternator(): string
 if ( ! function_exists('excerpt'))
 {
 
-	/**
-	 * Excerpt.
-	 *
-	 * Allows to extract a piece of text surrounding a word or phrase.
-	 *
-	 * @param   string $text     String to search the phrase
-	 * @param   string $phrase   Phrase that will be searched for.
-	 * @param   int    $radius   The amount of characters returned arround the phrase.
-	 * @param   string $ellipsis Ending that will be appended
-	 *
-	 * @return  string
-	 *
-	 * If no $phrase is passed, will generate an excerpt of $radius characters
-	 * from the begining of $text.
-	 */
-	function excerpt(string $text, string $phrase = null, int $radius = 100, string $ellipsis = '...'): string
-	{
-		if (isset($phrase))
-		{
-			$phrasePos = strpos(strtolower($text), strtolower($phrase));
-			$phraseLen = strlen($phrase);
-		}
-		elseif ( ! isset($phrase))
-		{
-			$phrasePos = $radius / 2;
-			$phraseLen = 1;
-		}
-
-		$pre = explode(' ', substr($text, 0, $phrasePos));
-		$pos = explode(' ', substr($text, $phrasePos + $phraseLen));
-
-		$prev = ' ';
-		$post = ' ';
-		$count = 0;
-
-		foreach (array_reverse($pre) as $pr => $e)
-		{
-			if ((strlen($e) + $count + 1) < $radius)
-			{
-				$prev = ' ' . $e . $prev;
-			}
-			$count = ++ $count + strlen($e);
-		}
-
-		$count = 0;
-
-		foreach ($pos as $po => $s)
-		{
-			if ((strlen($s) + $count + 1) < $radius)
-			{
-				$post .= $s . ' ';
-			}
-			$count = ++ $count + strlen($s);
-		}
-
-		$ellPre = $phrase ? $ellipsis : '';
-
-		return str_replace('  ', ' ', $ellPre . $prev . $phrase . $post . $ellipsis);
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * Excerpt.
+     *
+     * Allows to extract a piece of text surrounding a word or phrase.
+     *
+     * @param   string $text     String to search the phrase
+     * @param   string $phrase   Phrase that will be searched for.
+     * @param   int    $radius   The amount of characters returned arround the phrase.
+     * @param   string $ellipsis Ending that will be appended
+     *
+     * @return  string
+     *
+     * If no $phrase is passed, will generate an excerpt of $radius characters
+     * from the begining of $text.
+     */
+    function excerpt(string $text, string $phrase = null, int $radius = 100, string $ellipsis = '...'): string
+    {
+        if (isset($phrase))
+        {
+            $phrasePos = strpos(strtolower($text), strtolower($phrase));
+            $phraseLen = strlen($phrase);
+        }
+        elseif ( ! isset($phrase))
+        {
+            $phrasePos = $radius / 2;
+            $phraseLen = 1;
+        }
+
+        $pre = explode(' ', substr($text, 0, $phrasePos));
+        $pos = explode(' ', substr($text, $phrasePos + $phraseLen));
+
+        $prev = ' ';
+        $post = ' ';
+        $count = 0;
+
+        foreach (array_reverse($pre) as $pr => $e)
+        {
+            if ((strlen($e) + $count + 1) < $radius)
+            {
+                $prev = ' ' . $e . $prev;
+            }
+            $count = ++ $count + strlen($e);
+        }
+
+        $count = 0;
+
+        foreach ($pos as $po => $s)
+        {
+            if ((strlen($s) + $count + 1) < $radius)
+            {
+                $post .= $s . ' ';
+            }
+            $count = ++ $count + strlen($s);
+        }
+
+        $ellPre = $phrase ? $ellipsis : '';
+
+        return str_replace('  ', ' ', $ellPre . $prev . $phrase . $post . $ellipsis);
+    }
+
+    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Helpers/TextHelperTest.php b/tests/system/Helpers/TextHelperTest.php
index 7abf7032382a..e1f0d3c04354 100755
--- a/tests/system/Helpers/TextHelperTest.php
+++ b/tests/system/Helpers/TextHelperTest.php
@@ -1,12 +1,15 @@
-<?php namespace CodeIgniter\Helpers;
+<?php
+
+namespace CodeIgniter\Helpers;
 
 class TextHelperTest extends \CIUnitTestCase
 {
+
     private $_long_string = 'Once upon a time, a framework had no tests. It sad. So some nice people began to write tests. The more time that went on, the happier it became. Everyone was happy.';
 
     public function setUp()
     {
-	    parent::setUp();
+        parent::setUp();
 
         helper('text');
     }
@@ -14,280 +17,341 @@ public function setUp()
     // --------------------------------------------------------------------
 
     public function test_strip_slashes()
-	{
-		$expected = [
-			"Is your name O'reilly?",
-			"No, my name is O'connor."
-		];
-		$str = [
-			"Is your name O\'reilly?",
-			"No, my name is O\'connor."
-		];
-		$this->assertEquals($expected, strip_slashes($str));
-	}
-
-	// --------------------------------------------------------------------
-	public function test_strip_quotes()
-	{
-		$strs = [
-			'"me oh my!"'	 => 'me oh my!',
-			"it's a winner!" => 'its a winner!',
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, strip_quotes($str));
-		}
-	}
-
-	// --------------------------------------------------------------------
-	public function test_quotes_to_entities()
-	{
-		$strs = [
-			'"me oh my!"'	 => '&quot;me oh my!&quot;',
-			"it's a winner!" => 'it&#39;s a winner!',
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, quotes_to_entities($str));
-		}
-	}
-
-	// --------------------------------------------------------------------
-	public function test_reduce_double_slashes()
-	{
-		$strs = [
-			'http://codeigniter.com'		 => 'http://codeigniter.com',
-			'//var/www/html/example.com/'	 => '/var/www/html/example.com/',
-			'/var/www/html//index.php'		 => '/var/www/html/index.php'
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, reduce_double_slashes($str));
-		}
-	}
-
-	// --------------------------------------------------------------------
-	public function test_reduce_multiples()
-	{
-		$strs = [
-			'Fred, Bill,, Joe, Jimmy'	 => 'Fred, Bill, Joe, Jimmy',
-			'Ringo, John, Paul,,'		 => 'Ringo, John, Paul,'
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, reduce_multiples($str));
-		}
-		$strs = [
-			'Fred, Bill,, Joe, Jimmy'	 => 'Fred, Bill, Joe, Jimmy',
-			'Ringo, John, Paul,,'		 => 'Ringo, John, Paul'
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, reduce_multiples($str, ',', TRUE));
-		}
-	}
-
-	// --------------------------------------------------------------------
-	public function test_random_string()
-	{
-		$this->assertEquals(16, strlen(random_string('alnum', 16)));
-		$this->assertInternalType('string', random_string('numeric', 16));
-		$this->assertEquals(16, strlen($random = random_string('crypto', 16)));
-		$this->assertInternalType('string', $random);
-	}
-
-	// --------------------------------------------------------------------
-	public function test_increment_string()
-	{
-		$this->assertEquals('my-test_1', increment_string('my-test'));
-		$this->assertEquals('my-test-1', increment_string('my-test', '-'));
-		$this->assertEquals('file_5', increment_string('file_4'));
-		$this->assertEquals('file-5', increment_string('file-4', '-'));
-		$this->assertEquals('file-5', increment_string('file-4', '-'));
-		$this->assertEquals('file-1', increment_string('file', '-', '1'));
-		$this->assertEquals(124, increment_string('123', ''));
-	}
-
-	// -------------------------------------------------------------------
-	// Functions from text_helper_test.php
-	// -------------------------------------------------------------------
-
-	public function test_word_limiter()
-	{
-		$this->assertEquals('Once upon a time,&#8230;', word_limiter($this->_long_string, 4));
-		$this->assertEquals('Once upon a time,&hellip;', word_limiter($this->_long_string, 4, '&hellip;'));
-		$this->assertEquals('', word_limiter('', 4));
-	}
-
-	// ------------------------------------------------------------------------
-	public function test_character_limiter()
-	{
-		$this->assertEquals('Once upon a time, a&#8230;', character_limiter($this->_long_string, 20));
-		$this->assertEquals('Once upon a time, a&hellip;', character_limiter($this->_long_string, 20, '&hellip;'));
-		$this->assertEquals('Short', character_limiter('Short', 20));
-		$this->assertEquals('Short', character_limiter('Short', 5));
-	}
-
-	// ------------------------------------------------------------------------
-	public function test_ascii_to_entities()
-	{
-		$strs = [
-			'“‘ “test”'		 => '&#8220;&#8216; &#8220;test&#8221;',
-			'†¥¨ˆøåß∂ƒ©˙∆˚¬' => '&#8224;&#165;&#168;&#710;&#248;&#229;&#223;&#8706;&#402;&#169;&#729;&#8710;&#730;&#172;'
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, ascii_to_entities($str));
-		}
-	}
-
-	// ------------------------------------------------------------------------
-	public function test_entities_to_ascii()
-	{
-		$strs = [
-			'&#8220;&#8216; &#8220;test&#8221;'															 => '“‘ “test”',
-			'&#8224;&#165;&#168;&#710;&#248;&#229;&#223;&#8706;&#402;&#169;&#729;&#8710;&#730;&#172;'	 => '†¥¨ˆøåß∂ƒ©˙∆˚¬'
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, entities_to_ascii($str));
-		}
-	}
-
-	// ------------------------------------------------------------------------
-	public function test_convert_accented_characters()
-	{
-		//$this->ci_vfs_clone('application/Config/ForeignChars.php');
-		$this->assertEquals('AAAeEEEIIOOEUUUeY', convert_accented_characters('ÀÂÄÈÊËÎÏÔŒÙÛÜŸ'));
-		$this->assertEquals('a e i o u n ue', convert_accented_characters('á é í ó ú ñ ü'));
-	}
-
-	// ------------------------------------------------------------------------
-	public function test_censored_words()
-	{
-		$censored = ['boob', 'nerd', 'ass', 'fart'];
-		$strs = [
-			'Ted bobbled the ball'			 => 'Ted bobbled the ball',
-			'Jake is a nerdo'				 => 'Jake is a nerdo',
-			'The borg will assimilate you'	 => 'The borg will assimilate you',
-			'Did Mary Fart?'				 => 'Did Mary $*#?',
-			'Jake is really a boob'			 => 'Jake is really a $*#'
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, word_censor($str, $censored, '$*#'));
-		}
-		// test censored words being sent as a string
-		$this->assertEquals('test', word_censor('test', 'test'));
-	}
-
-	// ------------------------------------------------------------------------
-	public function test_highlight_code()
-	{
-		$expect = "<code><span style=\"color: #000000\">\n<span style=\"color: #0000BB\">&lt;?php&nbsp;var_dump</span><span style=\"color: #007700\">(</span><span style=\"color: #0000BB\">\$this</span><span style=\"color: #007700\">);&nbsp;</span><span style=\"color: #0000BB\">?&gt;&nbsp;</span>\n</span>\n</code>";
-		$this->assertEquals($expect, highlight_code('<?php var_dump($this); ?>'));
-	}
-
-	// ------------------------------------------------------------------------
-	public function test_highlight_phrase()
-	{
-		$strs = [
-			'this is a phrase'			 => '<mark>this is</mark> a phrase',
-			'this is another'			 => '<mark>this is</mark> another',
-			'Gimme a test, Sally'		 => 'Gimme a test, Sally',
-			'Or tell me what this is'	 => 'Or tell me what <mark>this is</mark>',
-			''							 => ''
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, highlight_phrase($str, 'this is'));
-		}
-		$this->assertEquals('<strong>this is</strong> a strong test', highlight_phrase('this is a strong test', 'this is', '<strong>', '</strong>'));
-	}
-
-	// ------------------------------------------------------------------------
-	public function test_ellipsize()
-	{
-		$strs = [
-			'0'	 => [
-				'this is my string'				 => '&hellip; my string',
-				"here's another one"			 => '&hellip;nother one',
-				'this one is just a bit longer'	 => '&hellip;bit longer',
-				'short'							 => 'short'
-			],
-			'.5' => [
-				'this is my string'				 => 'this &hellip;tring',
-				"here's another one"			 => "here'&hellip;r one",
-				'this one is just a bit longer'	 => 'this &hellip;onger',
-				'short'							 => 'short'
-			],
-			'1'	 => [
-				'this is my string'				 => 'this is my&hellip;',
-				"here's another one"			 => "here's ano&hellip;",
-				'this one is just a bit longer'	 => 'this one i&hellip;',
-				'short'							 => 'short'
-			],
-		];
-		foreach ($strs as $pos => $s)
-		{
-			foreach ($s as $str => $expect)
-			{
-				$this->assertEquals($expect, ellipsize($str, 10, $pos));
-			}
-		}
-	}
-
-	// ------------------------------------------------------------------------
-	public function test_word_wrap()
-	{
-		$string = 'Here is a simple string of text that will help us demonstrate this function.';
-		$this->assertEquals(substr_count(word_wrap($string, 25), "\n"), 4);
-	}
-
-	// ------------------------------------------------------------------------
-	public function test_default_word_wrap_charlim()
-	{
-		$string = "Here is a longer string of text that will help us demonstrate the default charlim of this function.";
-		$this->assertEquals(strpos(word_wrap($string), "\n"), 73);
-	}
-
-	// -----------------------------------------------------------------------
-
-	public function test_excerpt()
-	{
-		$string = $this->_long_string;
-		$result = ' Once upon a time, a framework had no tests. It sad  So some nice people began to write tests. The more time that went on, the happier it became. ...';
-		$this->assertEquals(excerpt($string), $result);
-	}
-
-	// -----------------------------------------------------------------------
-
-	public function test_excerpt_radius()
-	{
-		$string = $this->_long_string;
-		$phrase = 'began';
-		$result = '... people began to ...';
-		$this->assertEquals(excerpt($string, $phrase, 10), $result);
-	}
-
-	// -----------------------------------------------------------------------
-
-	public function test_alternator()
-	{
-		$phrase = ' scream! ';
-		$result = '';
-		alternator();
-		for ($i = 0; $i < 4; $i ++ )
-			$result .= alternator('I', 'you', 'we') . $phrase;
-		$this->assertEquals('I scream! you scream! we scream! I scream! ', $result);
-	}
-
-	public function test_empty_alternator()
-	{
-		$phrase = ' scream! ';
-		$result = '';
-		for ($i = 0; $i < 4; $i ++ )
-			$result .= alternator() . $phrase;
-		$this->assertEquals(' scream!  scream!  scream!  scream! ', $result);
-	}
+    {
+        $expected = [
+            "Is your name O'reilly?",
+            "No, my name is O'connor."
+        ];
+        $str = [
+            "Is your name O\'reilly?",
+            "No, my name is O\'connor."
+        ];
+        $this->assertEquals($expected, strip_slashes($str));
+    }
+
+    // --------------------------------------------------------------------
+    public function test_strip_quotes()
+    {
+        $strs = [
+            '"me oh my!"'    => 'me oh my!',
+            "it's a winner!" => 'its a winner!',
+        ];
+        foreach ($strs as $str => $expect)
+        {
+            $this->assertEquals($expect, strip_quotes($str));
+        }
+    }
+
+    // --------------------------------------------------------------------
+    public function test_quotes_to_entities()
+    {
+        $strs = [
+            '"me oh my!"'    => '&quot;me oh my!&quot;',
+            "it's a winner!" => 'it&#39;s a winner!',
+        ];
+        foreach ($strs as $str => $expect)
+        {
+            $this->assertEquals($expect, quotes_to_entities($str));
+        }
+    }
+
+    // --------------------------------------------------------------------
+    public function test_reduce_double_slashes()
+    {
+        $strs = [
+            'http://codeigniter.com'      => 'http://codeigniter.com',
+            '//var/www/html/example.com/' => '/var/www/html/example.com/',
+            '/var/www/html//index.php'    => '/var/www/html/index.php'
+        ];
+        foreach ($strs as $str => $expect)
+        {
+            $this->assertEquals($expect, reduce_double_slashes($str));
+        }
+    }
+
+    // --------------------------------------------------------------------
+    public function test_reduce_multiples()
+    {
+        $strs = [
+            'Fred, Bill,, Joe, Jimmy' => 'Fred, Bill, Joe, Jimmy',
+            'Ringo, John, Paul,,'     => 'Ringo, John, Paul,'
+        ];
+        foreach ($strs as $str => $expect)
+        {
+            $this->assertEquals($expect, reduce_multiples($str));
+        }
+        $strs = [
+            'Fred, Bill,, Joe, Jimmy' => 'Fred, Bill, Joe, Jimmy',
+            'Ringo, John, Paul,,'     => 'Ringo, John, Paul'
+        ];
+        foreach ($strs as $str => $expect)
+        {
+            $this->assertEquals($expect, reduce_multiples($str, ',', TRUE));
+        }
+    }
+
+    // --------------------------------------------------------------------
+    public function test_random_string()
+    {
+        $this->assertEquals(16, strlen(random_string('alnum', 16)));
+        $this->assertEquals(16, strlen(random_string('alpha', 16)));
+        $this->assertEquals(16, strlen(random_string('nozero', 16)));
+        $this->assertEquals(16, strlen(random_string('numeric', 16)));
+        $this->assertEquals(8, strlen(random_string('numeric')));
+
+        $this->assertInternalType('string', random_string('basic'));
+        $this->assertEquals(16, strlen($random = random_string('crypto', 16)));
+        $this->assertInternalType('string', $random);
+
+        $this->assertEquals(32, strlen($random = random_string('md5')));
+        $this->assertEquals(40, strlen($random = random_string('sha1')));
+    }
+
+    // --------------------------------------------------------------------
+    public function test_increment_string()
+    {
+        $this->assertEquals('my-test_1', increment_string('my-test'));
+        $this->assertEquals('my-test-1', increment_string('my-test', '-'));
+        $this->assertEquals('file_5', increment_string('file_4'));
+        $this->assertEquals('file-5', increment_string('file-4', '-'));
+        $this->assertEquals('file-5', increment_string('file-4', '-'));
+        $this->assertEquals('file-1', increment_string('file', '-', '1'));
+        $this->assertEquals(124, increment_string('123', ''));
+    }
+
+    // -------------------------------------------------------------------
+    // Functions from text_helper_test.php
+    // -------------------------------------------------------------------
+
+    public function test_word_limiter()
+    {
+        $this->assertEquals('Once upon a time,&#8230;', word_limiter($this->_long_string, 4));
+        $this->assertEquals('Once upon a time,&hellip;', word_limiter($this->_long_string, 4, '&hellip;'));
+        $this->assertEquals('', word_limiter('', 4));
+        $this->assertEquals('Once upon a&hellip;', word_limiter($this->_long_string, 3, '&hellip;'));
+        $this->assertEquals('Once upon a time', word_limiter('Once upon a time', 4, '&hellip;'));
+    }
+
+    // ------------------------------------------------------------------------
+    public function test_character_limiter()
+    {
+        $this->assertEquals('Once upon a time, a&#8230;', character_limiter($this->_long_string, 20));
+        $this->assertEquals('Once upon a time, a&hellip;', character_limiter($this->_long_string, 20, '&hellip;'));
+        $this->assertEquals('Short', character_limiter('Short', 20));
+        $this->assertEquals('Short', character_limiter('Short', 5));
+    }
+
+    // ------------------------------------------------------------------------
+    public function test_ascii_to_entities()
+    {
+        $strs = [
+            '“‘ “test” '     => '&#8220;&#8216; &#8220;test&#8221; ',
+            '†¥¨ˆøåß∂ƒ©˙∆˚¬' => '&#8224;&#165;&#168;&#710;&#248;&#229;&#223;&#8706;&#402;&#169;&#729;&#8710;&#730;&#172;'
+        ];
+        foreach ($strs as $str => $expect)
+        {
+            $this->assertEquals($expect, ascii_to_entities($str));
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    public function test_entities_to_ascii()
+    {
+        $strs = [
+            '&#8220;&#8216; &#8220;test&#8221; '                                                      => '“‘ “test” ',
+            '&#8224;&#165;&#168;&#710;&#248;&#229;&#223;&#8706;&#402;&#169;&#729;&#8710;&#730;&#172;' => '†¥¨ˆøåß∂ƒ©˙∆˚¬'
+        ];
+        foreach ($strs as $str => $expect)
+        {
+            $this->assertEquals($expect, entities_to_ascii($str));
+        }
+    }
+
+    public function testEntitiesToAsciiUnsafe()
+    {
+        $str = '&lt;&gt;';
+        $this->assertEquals('<>', entities_to_ascii($str, true));
+        $this->assertEquals('&lt;&gt;', entities_to_ascii($str, false));
+    }
+
+    public function testEntitiesToAsciiSmallOrdinals()
+    {
+        $str = '&#07;';
+        $this->assertEquals(pack('c', 7), entities_to_ascii($str));
+    }
+
+    // ------------------------------------------------------------------------
+    public function test_convert_accented_characters()
+    {
+        //$this->ci_vfs_clone('application/Config/ForeignChars.php');
+        $this->assertEquals('AAAeEEEIIOOEUUUeY', convert_accented_characters('ÀÂÄÈÊËÎÏÔŒÙÛÜŸ'));
+        $this->assertEquals('a e i o u n ue', convert_accented_characters('á é í ó ú ñ ü'));
+    }
+
+    // ------------------------------------------------------------------------
+    public function test_censored_words()
+    {
+        $censored = ['boob', 'nerd', 'ass', 'fart'];
+        $strs = [
+            'Ted bobbled the ball'         => 'Ted bobbled the ball',
+            'Jake is a nerdo'              => 'Jake is a nerdo',
+            'The borg will assimilate you' => 'The borg will assimilate you',
+            'Did Mary Fart?'               => 'Did Mary $*#?',
+            'Jake is really a boob'        => 'Jake is really a $*#',
+            'Jake is really a (boob)'      => 'Jake is really a ($*#)'
+        ];
+        foreach ($strs as $str => $expect)
+        {
+            $this->assertEquals($expect, word_censor($str, $censored, '$*#'));
+        }
+        // test censored words being sent as a string
+        $this->assertEquals('this is a test', word_censor('this is a test', 'test'));
+    }
+
+    // ------------------------------------------------------------------------
+    public function test_highlight_code()
+    {
+        $expect = "<code><span style=\"color: #000000\">\n<span style=\"color: #0000BB\">&lt;?php&nbsp;var_dump</span><span style=\"color: #007700\">(</span><span style=\"color: #0000BB\">\$this</span><span style=\"color: #007700\">);&nbsp;</span><span style=\"color: #0000BB\">?&gt;&nbsp;</span>\n</span>\n</code>";
+        $this->assertEquals($expect, highlight_code('<?php var_dump($this); ?>'));
+    }
+
+    // ------------------------------------------------------------------------
+    public function test_highlight_phrase()
+    {
+        $strs = [
+            'this is a phrase'        => '<mark>this is</mark> a phrase',
+            'this is another'         => '<mark>this is</mark> another',
+            'Gimme a test, Sally'     => 'Gimme a test, Sally',
+            'Or tell me what this is' => 'Or tell me what <mark>this is</mark>',
+            ''                        => ''
+        ];
+        foreach ($strs as $str => $expect)
+        {
+            $this->assertEquals($expect, highlight_phrase($str, 'this is'));
+        }
+        $this->assertEquals('<strong>this is</strong> a strong test', highlight_phrase('this is a strong test', 'this is', '<strong>', '</strong>'));
+    }
+
+    // ------------------------------------------------------------------------
+    public function test_ellipsize()
+    {
+        $strs = [
+            '0'  => [
+                'this is my string'             => '&hellip; my string',
+                "here's another one"            => '&hellip;nother one',
+                'this one is just a bit longer' => '&hellip;bit longer',
+                'short'                         => 'short'
+            ],
+            '.5' => [
+                'this is my string'             => 'this &hellip;tring',
+                "here's another one"            => "here'&hellip;r one",
+                'this one is just a bit longer' => 'this &hellip;onger',
+                'short'                         => 'short'
+            ],
+            '1'  => [
+                'this is my string'             => 'this is my&hellip;',
+                "here's another one"            => "here's ano&hellip;",
+                'this one is just a bit longer' => 'this one i&hellip;',
+                'short'                         => 'short'
+            ],
+        ];
+        foreach ($strs as $pos => $s)
+        {
+            foreach ($s as $str => $expect)
+            {
+                $this->assertEquals($expect, ellipsize($str, 10, $pos));
+            }
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    public function testWordWrap()
+    {
+        $string = 'Here is a simple string of text that will help us demonstrate this function.';
+        $expected = "Here is a simple string\nof text that will help us\ndemonstrate this\nfunction.";
+        $this->assertEquals(substr_count(word_wrap($string, 25), "\n"), 3);
+        $this->assertEquals($expected, word_wrap($string, 25));
+
+        $string2 = "Here is a\nbroken up sentence\rspanning lines\r\nwoohoo!";
+        $expected2 = "Here is a\nbroken up sentence\nspanning lines\nwoohoo!";
+        $this->assertEquals(substr_count(word_wrap($string2, 25), "\n"), 3);
+        $this->assertEquals($expected2, word_wrap($string2, 25));
+
+        $string3 = "Here is another slightly longer\nbroken up sentence\rspanning lines\r\nwoohoo!";
+        $expected3 = "Here is another slightly\nlonger\nbroken up sentence\nspanning lines\nwoohoo!";
+        $this->assertEquals(substr_count(word_wrap($string3, 25), "\n"), 4);
+        $this->assertEquals($expected3, word_wrap($string3, 25));
+    }
+
+    public function testWordWrapUnwrap()
+    {
+        $string = 'Here is a {unwrap}simple string of text{/unwrap} that will help us demonstrate this function.';
+        $expected = "Here is a simple string of text\nthat will help us\ndemonstrate this\nfunction.";
+        $this->assertEquals(substr_count(word_wrap($string, 25), "\n"), 3);
+        $this->assertEquals($expected, word_wrap($string, 25));
+    }
+
+    public function testWordWrapLongWords()
+    {
+        // the really really long word will be split
+        $string = 'Here is an unbelievable super-complicated and reallyreallyquiteextraordinarily sophisticated sentence.';
+        $expected = "Here is an unbelievable\nsuper-complicated and\nreallyreallyquiteextraor\ndinarily\nsophisticated sentence.";
+        $this->assertEquals($expected, word_wrap($string, 25));
+    }
+
+    public function testWordWrapURL()
+    {
+        // the really really long word will be split
+        $string = 'Here is an unbelievable super-complicated and http://www.reallyreallyquiteextraordinarily.com sophisticated sentence.';
+        $expected = "Here is an unbelievable\nsuper-complicated and\nhttp://www.reallyreallyquiteextraordinarily.com\nsophisticated sentence.";
+        $this->assertEquals($expected, word_wrap($string, 25));
+    }
+
+    // ------------------------------------------------------------------------
+    public function test_default_word_wrap_charlim()
+    {
+        $string = "Here is a longer string of text that will help us demonstrate the default charlim of this function.";
+        $this->assertEquals(strpos(word_wrap($string), "\n"), 73);
+    }
+
+    // -----------------------------------------------------------------------
+
+    public function test_excerpt()
+    {
+        $string = $this->_long_string;
+        $result = ' Once upon a time, a framework had no tests. It sad  So some nice people began to write tests. The more time that went on, the happier it became. ...';
+        $this->assertEquals(excerpt($string), $result);
+    }
+
+    // -----------------------------------------------------------------------
+
+    public function test_excerpt_radius()
+    {
+        $string = $this->_long_string;
+        $phrase = 'began';
+        $result = '... people began to ...';
+        $this->assertEquals(excerpt($string, $phrase, 10), $result);
+    }
+
+    // -----------------------------------------------------------------------
+
+    public function test_alternator()
+    {
+        $phrase = ' scream! ';
+        $result = '';
+        alternator();
+        for ($i = 0; $i < 4; $i ++ )
+            $result .= alternator('I', 'you', 'we') . $phrase;
+        $this->assertEquals('I scream! you scream! we scream! I scream! ', $result);
+    }
+
+    public function test_empty_alternator()
+    {
+        $phrase = ' scream! ';
+        $result = '';
+        for ($i = 0; $i < 4; $i ++ )
+            $result .= alternator() . $phrase;
+        $this->assertEquals(' scream!  scream!  scream!  scream! ', $result);
+    }
+
 }
diff --git a/user_guide_src/source/helpers/text_helper.rst b/user_guide_src/source/helpers/text_helper.rst
index ea6b2b2053d5..aba2361db392 100755
--- a/user_guide_src/source/helpers/text_helper.rst
+++ b/user_guide_src/source/helpers/text_helper.rst
@@ -38,7 +38,7 @@ The following functions are available:
 
 	-  **alpha**: A string with lower and uppercase letters only.
 	-  **alnum**: Alpha-numeric string with lower and uppercase characters.
-	-  **basic**: A random number based on ``mt_rand()``.
+	-  **basic**: A random number based on ``mt_rand()`` (length ignored).
 	-  **numeric**: Numeric string.
 	-  **nozero**: Numeric string with no zeros.
 	-  **md5**: An encrypted random number based on ``md5()`` (fixed length of 32).
@@ -352,6 +352,8 @@ The following functions are available:
 		// demonstrate this
 		// function.
 
+        Excessively long words will be split, but URLs will not be.
+
 .. php:function:: ellipsize($str, $max_length[, $position = 1[, $ellipsis = '&hellip;']])
 
 	:param	string	$str: Input string

From 83e9b8d11667470d4c18f2359ae43e5cf00d8dea Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Thu, 5 Jul 2018 10:19:53 -0700
Subject: [PATCH 18/69] Looking for travis exit problem

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b724db7167e4..1c3e268e59ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ services:
   - redis-server
 
 script:
-  - php vendor/bin/phpunit -v
+  - php -d display_errors=On vendor/bin/phpunit -v
 
 before_install:
   - mysql -e "CREATE DATABASE IF NOT EXISTS test;" -uroot;

From 4419d689eb5b39193014c15bdbf046b901f979dd Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Thu, 5 Jul 2018 10:29:04 -0700
Subject: [PATCH 19/69] Looking for travis exit problem

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1c3e268e59ee..b73306668495 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ services:
   - redis-server
 
 script:
-  - php -d display_errors=On vendor/bin/phpunit -v
+  - php --debug vendor/bin/phpunit -v
 
 before_install:
   - mysql -e "CREATE DATABASE IF NOT EXISTS test;" -uroot;

From 5c66230eb7b360518fc2c54d0878f30d2edd1453 Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Thu, 5 Jul 2018 10:35:34 -0700
Subject: [PATCH 20/69] Looking for travis exit problem

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b73306668495..38fea11168de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ services:
   - redis-server
 
 script:
-  - php --debug vendor/bin/phpunit -v
+  - php vendor/bin/phpunit --debug -v
 
 before_install:
   - mysql -e "CREATE DATABASE IF NOT EXISTS test;" -uroot;

From 8eae514bee335b69ef614c59232c76c16b7a0860 Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Thu, 5 Jul 2018 10:48:34 -0700
Subject: [PATCH 21/69] Looking for travis exit problem

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 38fea11168de..1b2a88140e5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ services:
   - redis-server
 
 script:
-  - php vendor/bin/phpunit --debug -v
+  - php vendor/bin/phpunit --debug -v  -d memory_limit=512M
 
 before_install:
   - mysql -e "CREATE DATABASE IF NOT EXISTS test;" -uroot;

From 18fdb2669ac587beb671380ee31b711a5e669a8a Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Thu, 5 Jul 2018 10:55:38 -0700
Subject: [PATCH 22/69] Looking for travis exit problem

---
 tests/system/Test/FeatureTestCaseTest.php | 26 +++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/system/Test/FeatureTestCaseTest.php b/tests/system/Test/FeatureTestCaseTest.php
index 89f4395f6dce..a2c318ef0de6 100644
--- a/tests/system/Test/FeatureTestCaseTest.php
+++ b/tests/system/Test/FeatureTestCaseTest.php
@@ -16,33 +16,33 @@ public function setUp()
 		$this->skipEvents();
 	}
 
-	public function testCallSimpleGet()
+	public function testCallGet()
 	{
 		$this->withRoutes([
-			['add', 'home', function() {
+			['get', 'home', function() {
 					return 'Hello World';
 				}]
 		]);
-		$response = $this->call('get', 'home');
+		$response = $this->get('home');
 
-		$this->assertInstanceOf(FeatureResponse::class, $response);
-		$this->assertInstanceOf(\CodeIgniter\HTTP\Response::class, $response->response);
-		$this->assertTrue($response->isOK());
-		$this->assertEquals('Hello World', $response->response->getBody());
-		$this->assertEquals(200, $response->response->getStatusCode());
+		$response->assertSee('Hello World');
+		$response->assertDontSee('Again');
 	}
 
-	public function testCallGet()
+	public function testCallSimpleGet()
 	{
 		$this->withRoutes([
-			['get', 'home', function() {
+			['add', 'home', function() {
 					return 'Hello World';
 				}]
 		]);
-		$response = $this->get('home');
+		$response = $this->call('get', 'home');
 
-		$response->assertSee('Hello World');
-		$response->assertDontSee('Again');
+		$this->assertInstanceOf(FeatureResponse::class, $response);
+		$this->assertInstanceOf(\CodeIgniter\HTTP\Response::class, $response->response);
+		$this->assertTrue($response->isOK());
+		$this->assertEquals('Hello World', $response->response->getBody());
+		$this->assertEquals(200, $response->response->getStatusCode());
 	}
 
 	public function testCallPost()

From d08101b0299381ba0b460c76867786aee897609a Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Thu, 5 Jul 2018 11:02:02 -0700
Subject: [PATCH 23/69] Looking for travis exit problem

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1b2a88140e5b..79a6acd01870 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ services:
   - redis-server
 
 script:
-  - php vendor/bin/phpunit --debug -v  -d memory_limit=512M
+  - php vendor/bin/phpunit --debug -v  -d memory_limit=1024M
 
 before_install:
   - mysql -e "CREATE DATABASE IF NOT EXISTS test;" -uroot;

From f601a6d56b0ba3161c020d024e67e18578bf8b6a Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Thu, 5 Jul 2018 11:16:36 -0700
Subject: [PATCH 24/69] Looking for travis exit problem

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 79a6acd01870..f605aa248532 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ services:
   - redis-server
 
 script:
-  - php vendor/bin/phpunit --debug -v  -d memory_limit=1024M
+  - php -d memory_limit=1024M vendor/bin/phpunit -v
 
 before_install:
   - mysql -e "CREATE DATABASE IF NOT EXISTS test;" -uroot;

From 274fcb533e503cf526b485e48da72888196d92d8 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Thu, 5 Jul 2018 23:11:26 -0500
Subject: [PATCH 25/69] CodeIgniter class should not exit directly when doing
 full page cache, without checking returnREsponse flag.

---
 phpunit.xml.dist                          |  9 +++++----
 system/CodeIgniter.php                    | 19 ++++++++++++++++---
 tests/system/Test/FeatureTestCaseTest.php | 13 -------------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 34d737b5a7b0..2064217155e5 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -24,14 +24,14 @@
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">./system</directory>
             <exclude>
-                <directory>./system/Debug/Toolbar/Views</directory>
-                <directory>./system/Pager/Views</directory>
-                <directory>./system/ThirdParty</directory>
-                <directory>./system/Validation/Views</directory>
                 <file>./system/bootstrap.php</file>
                 <file>./system/Commands/Sessions/Views/migration.tpl.php</file>
                 <file>./system/ComposerScripts.php</file>
                 <file>./system/Config/Routes.php</file>
+                <directory>./system/Debug/Toolbar/Views</directory>
+                <directory>./system/Pager/Views</directory>
+                <directory>./system/ThirdParty</directory>
+                <directory>./system/Validation/Views</directory>
             </exclude>
         </whitelist>
     </filter>
@@ -40,3 +40,4 @@
         <log type="coverage-clover" target="build/logs/clover.xml"/>
     </logging>
 </phpunit>
+z
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 412fa7447d7a..bff25324a389 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -37,6 +37,7 @@
  */
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\Request;
+use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;
 use Config\Cache;
 use CodeIgniter\HTTP\URI;
@@ -202,7 +203,17 @@ public function run(RouteCollectionInterface $routes = null, bool $returnRespons
 		// Check for a cached page. Execution will stop
 		// if the page has been cached.
 		$cacheConfig = new Cache();
-		$this->displayCache($cacheConfig);
+		$response = $this->displayCache($cacheConfig);
+		if ($response instanceof ResponseInterface)
+		{
+			if ($returnResponse)
+			{
+				return $response;
+			}
+
+			$this->response->send();
+			$this->callExit(EXIT_SUCCESS);
+		}
 
 		try
 		{
@@ -232,6 +243,7 @@ public function run(RouteCollectionInterface $routes = null, bool $returnRespons
 	 * @param                                              $cacheConfig
 	 * @param bool                                         $returnResponse
 	 *
+	 * @return \CodeIgniter\HTTP\RequestInterface|\CodeIgniter\HTTP\Response|\CodeIgniter\HTTP\ResponseInterface|mixed
 	 * @throws \CodeIgniter\Filters\Exceptions\FilterException
 	 */
 	protected function handleRequest(RouteCollectionInterface $routes = null, $cacheConfig, bool $returnResponse = false)
@@ -495,8 +507,9 @@ public function displayCache($config)
 			}
 
 			$output = $this->displayPerformanceMetrics($output);
-			$this->response->setBody($output)->send();
-			$this->callExit(EXIT_SUCCESS);
+			$this->response->setBody($output);
+
+			return $this->response;
 		};
 	}
 
diff --git a/tests/system/Test/FeatureTestCaseTest.php b/tests/system/Test/FeatureTestCaseTest.php
index 89f4395f6dce..c83ff177e71f 100644
--- a/tests/system/Test/FeatureTestCaseTest.php
+++ b/tests/system/Test/FeatureTestCaseTest.php
@@ -32,19 +32,6 @@ public function testCallSimpleGet()
 		$this->assertEquals(200, $response->response->getStatusCode());
 	}
 
-	public function testCallGet()
-	{
-		$this->withRoutes([
-			['get', 'home', function() {
-					return 'Hello World';
-				}]
-		]);
-		$response = $this->get('home');
-
-		$response->assertSee('Hello World');
-		$response->assertDontSee('Again');
-	}
-
 	public function testCallPost()
 	{
 		$this->withRoutes([

From 03f39e60f40bbaafabaa07255e2f0e9170aa4bb2 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Thu, 5 Jul 2018 23:14:49 -0500
Subject: [PATCH 26/69] Oops. Extraneous letter in phpunit.xml.dist

---
 phpunit.xml.dist | 1 -
 1 file changed, 1 deletion(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 2064217155e5..643e74b4c3d1 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -40,4 +40,3 @@
         <log type="coverage-clover" target="build/logs/clover.xml"/>
     </logging>
 </phpunit>
-z

From a282574e6e1f07952962996ee02dba919a0ea0a4 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Thu, 5 Jul 2018 23:39:41 -0500
Subject: [PATCH 27/69] Correcting config value on RedisHandlerTest.

---
 tests/system/Cache/Handlers/RedisHandlerTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php
index fcdc9baf27e0..88c39bf57cf6 100644
--- a/tests/system/Cache/Handlers/RedisHandlerTest.php
+++ b/tests/system/Cache/Handlers/RedisHandlerTest.php
@@ -79,7 +79,7 @@ public function testNew()
 
 	public function testDestruct()
 	{
-		$this->redisHandler = new RedisHandler($this->config->redis);
+		$this->redisHandler = new RedisHandler($this->config);
 		$this->redisHandler->initialize();
 
 		$this->assertInstanceOf(RedisHandler::class, $this->redisHandler);

From 828d9ac7ba45615280173c635cffb7b3ead0bfc8 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Thu, 5 Jul 2018 23:50:16 -0500
Subject: [PATCH 28/69] Putting method back.

---
 phpunit.xml.dist                          |  8 ++++----
 tests/system/Test/FeatureTestCaseTest.php | 13 +++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 643e74b4c3d1..34d737b5a7b0 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -24,14 +24,14 @@
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">./system</directory>
             <exclude>
-                <file>./system/bootstrap.php</file>
-                <file>./system/Commands/Sessions/Views/migration.tpl.php</file>
-                <file>./system/ComposerScripts.php</file>
-                <file>./system/Config/Routes.php</file>
                 <directory>./system/Debug/Toolbar/Views</directory>
                 <directory>./system/Pager/Views</directory>
                 <directory>./system/ThirdParty</directory>
                 <directory>./system/Validation/Views</directory>
+                <file>./system/bootstrap.php</file>
+                <file>./system/Commands/Sessions/Views/migration.tpl.php</file>
+                <file>./system/ComposerScripts.php</file>
+                <file>./system/Config/Routes.php</file>
             </exclude>
         </whitelist>
     </filter>
diff --git a/tests/system/Test/FeatureTestCaseTest.php b/tests/system/Test/FeatureTestCaseTest.php
index c83ff177e71f..89f4395f6dce 100644
--- a/tests/system/Test/FeatureTestCaseTest.php
+++ b/tests/system/Test/FeatureTestCaseTest.php
@@ -32,6 +32,19 @@ public function testCallSimpleGet()
 		$this->assertEquals(200, $response->response->getStatusCode());
 	}
 
+	public function testCallGet()
+	{
+		$this->withRoutes([
+			['get', 'home', function() {
+					return 'Hello World';
+				}]
+		]);
+		$response = $this->get('home');
+
+		$response->assertSee('Hello World');
+		$response->assertDontSee('Again');
+	}
+
 	public function testCallPost()
 	{
 		$this->withRoutes([

From 982345e127b6d9055c3bd7f6f327e3579b7be757 Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Fri, 6 Jul 2018 00:50:31 -0700
Subject: [PATCH 29/69] Revert travis.yml to original

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f605aa248532..b724db7167e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ services:
   - redis-server
 
 script:
-  - php -d memory_limit=1024M vendor/bin/phpunit -v
+  - php vendor/bin/phpunit -v
 
 before_install:
   - mysql -e "CREATE DATABASE IF NOT EXISTS test;" -uroot;

From dd40aba3f3aea2de769d9015ee4c59eb5ac44f17 Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Fri, 6 Jul 2018 10:29:30 -0700
Subject: [PATCH 30/69] Change array defaults in
 FeatureResponseTest:getFeatureResponse

---
 tests/system/Test/FeatureResponseTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/system/Test/FeatureResponseTest.php b/tests/system/Test/FeatureResponseTest.php
index 49ce991424e1..9ea02369d258 100644
--- a/tests/system/Test/FeatureResponseTest.php
+++ b/tests/system/Test/FeatureResponseTest.php
@@ -142,7 +142,7 @@ public function testAssertSessionMissing()
 
 	public function testAssertHeader()
 	{
-		$this->getFeatureResponse('<h1>Hello World</h1>', null, ['foo' => 'bar']);
+		$this->getFeatureResponse('<h1>Hello World</h1>', [], ['foo' => 'bar']);
 
 		$this->feature->assertHeader('foo');
 		$this->feature->assertHeader('foo', 'bar');
@@ -237,7 +237,7 @@ public function testJsonExactString()
 	}
 
 
-	protected function getFeatureResponse($body=null, array $responseOptions = null, array $headers = null)
+	protected function getFeatureResponse($body=null, array $responseOptions = [], array $headers = [])
 	{
 		$this->response = new Response(new \Config\App());
 		$this->response->setBody($body);

From a856e3674dee6e5d9d7810b9985a7ae28d37a306 Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Fri, 6 Jul 2018 10:58:20 -0700
Subject: [PATCH 31/69] Add test data in RulesTest to avoid ErrorException in
 Postgres

---
 tests/system/Validation/RulesTest.php | 1632 +++++++++++++------------
 1 file changed, 817 insertions(+), 815 deletions(-)

diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php
index 414249867f76..62f871cee216 100644
--- a/tests/system/Validation/RulesTest.php
+++ b/tests/system/Validation/RulesTest.php
@@ -1,856 +1,858 @@
-<?php namespace CodeIgniter\Validation;
+<?php
+
+namespace CodeIgniter\Validation;
 
 use Config\Database;
 
 class RulesTest extends \CIUnitTestCase
 {
 
+    /**
+     * @var Validation
+     */
+    protected $validation;
+    protected $config = [
+        'ruleSets'      => [
+            \CodeIgniter\Validation\Rules::class,
+            \CodeIgniter\Validation\FormatRules::class,
+            \CodeIgniter\Validation\FileRules::class,
+            \CodeIgniter\Validation\CreditCardRules::class,
+            \Tests\Support\Validation\TestRules::class,
+        ],
+        'groupA'        => [
+            'foo' => 'required|min_length[5]',
+        ],
+        'groupA_errors' => [
+            'foo' => [
+                'min_length' => 'Shame, shame. Too short.',
+            ],
+        ],
+    ];
+
+    //--------------------------------------------------------------------
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->validation = new Validation((object) $this->config, \Config\Services::renderer());
+        $this->validation->reset();
+
+        $_FILES = [];
+    }
+
+    //--------------------------------------------------------------------
+    // Rules Tests
+    //--------------------------------------------------------------------
+
+    public function testRequiredNull()
+    {
+        $data = [
+            'foo' => null,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'required',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function testRequiredTrueString()
+    {
+        $data = [
+            'foo' => 123,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'required',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function testRequiredFalseString()
+    {
+        $data = [
+            'bar' => 123,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'required',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function testRequiredTrueArray()
+    {
+        $data = [
+            'foo' => [123],
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'required',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function testRequiredFalseArray()
+    {
+        $data = [
+            'foo' => [],
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'required',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function testRequiredObject()
+    {
+        $data = [
+            'foo' => new \stdClass(),
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'required',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    /**
+     * @dataProvider ifExistProvider
+     *
+     * @param $rules
+     * @param $data
+     * @param $expected
+     */
+    public function testIfExist($rules, $data, $expected)
+    {
+        $this->validation->setRules($rules);
+
+        $this->assertEquals($expected, $this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function ifExistProvider()
+    {
+        return [
+            [['foo' => 'required'], ['foo' => ''], false],
+            [['foo' => 'required'], [], false],
+            [['foo' => 'if_exist|required'], ['foo' => ''], false],
+            // Input data does not exist then the other rules will be ignored
+            [['foo' => 'if_exist|required'], [], true],
+        ];
+    }
+
+    //--------------------------------------------------------------------
+
+    /**
+     * @dataProvider emptysProvider
+     *
+     * @param $rules
+     * @param $data
+     * @param $expected
+     */
+    public function testEmptys($rules, $data, $expected)
+    {
+        $this->validation->setRules($rules);
+
+        $this->assertEquals($expected, $this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function emptysProvider()
+    {
+        return [
+            [['foo' => 'permit_empty'], ['foo' => ''], true],
+            [['foo' => 'permit_empty'], ['foo' => '0'], true],
+            [['foo' => 'permit_empty'], ['foo' => 0], true],
+            [['foo' => 'permit_empty'], ['foo' => 0.0], true],
+            [['foo' => 'permit_empty'], ['foo' => null], true],
+            [['foo' => 'permit_empty'], ['foo' => false], true],
+            [['foo' => 'permit_empty|valid_email'], ['foo' => ''], true],
+            [['foo' => 'permit_empty|valid_email'], ['foo' => 'user@domain.tld'], true],
+            [['foo' => 'permit_empty|valid_email'], ['foo' => 'invalid'], false],
+            // Required has more priority
+            [['foo' => 'permit_empty|required|valid_email'], ['foo' => ''], false],
+            [['foo' => 'permit_empty|required'], ['foo' => ''], false],
+            [['foo' => 'permit_empty|required'], ['foo' => null], false],
+            [['foo' => 'permit_empty|required'], ['foo' => false], false],
+            // This tests will return true because the input data is trimmed
+            [['foo' => 'permit_empty|required'], ['foo' => '0'], true],
+            [['foo' => 'permit_empty|required'], ['foo' => 0], true],
+            [['foo' => 'permit_empty|required'], ['foo' => 0.0], true],
+        ];
+    }
+
+    //--------------------------------------------------------------------
+
+    public function testMatchesNull()
+    {
+        $data = [
+            'foo' => null,
+            'bar' => null,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'matches[bar]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function testMatchesTrue()
+    {
+        $data = [
+            'foo' => 'match',
+            'bar' => 'match',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'matches[bar]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function testMatchesFalse()
+    {
+        $data = [
+            'foo' => 'match',
+            'bar' => 'nope',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'matches[bar]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function testDiffersNull()
+    {
+        $data = [
+            'foo' => null,
+            'bar' => null,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'differs[bar]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function testDiffersTrue()
+    {
+        $data = [
+            'foo' => 'match',
+            'bar' => 'nope',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'differs[bar]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function testDiffersFalse()
+    {
+        $data = [
+            'foo' => 'match',
+            'bar' => 'match',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'differs[bar]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    /**
+     * @group DatabaseLive
+     */
+    public function testIsUniqueFalse()
+    {
+        $db = Database::connect();
+        $db->table('user')->insert([
+            'name'    => 'Derek Travis',
+            'email'   => 'derek@world.com',
+            'country' => 'Elbonia',
+        ]);
+
+        $data = [
+            'email' => 'derek@world.com',
+        ];
+
+        $this->validation->setRules([
+            'email' => 'is_unique[user.email]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    /**
+     * @group DatabaseLive
+     */
+    public function testIsUniqueTrue()
+    {
+        $data = [
+            'email' => 'derek@world.co.uk',
+        ];
+
+        $this->validation->setRules([
+            'email' => 'is_unique[user.email]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    /**
+     * @group DatabaseLive
+     */
+    public function testIsUniqueIgnoresParams()
+    {
+        $db = Database::connect();
+        $user = $db->table('user')
+                ->insert([
+            'name'    => 'Developer A',
+            'email'   => 'deva@example.com',
+            'country' => 'Elbonia',
+        ]);
+        $row = $db->table('user')
+                ->limit(1)
+                ->get()
+                ->getRow();
+
+        $data = [
+            'email' => 'derek@world.co.uk',
+        ];
+
+        $this->validation->setRules([
+            'email' => "is_unique[user.email,id,{$row->id}]",
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function testMinLengthNull()
+    {
+        $data = [
+            'foo' => null,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'min_length[3]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function testMinLengthReturnsFalseWithNonNumericVal()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'min_length[bar]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function testMinLengthReturnsTrueWithSuccess()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
 
-	/**
-	 * @var Validation
-	 */
-	protected $validation;
-	protected $config = [
-		'ruleSets'		 => [
-			\CodeIgniter\Validation\Rules::class,
-			\CodeIgniter\Validation\FormatRules::class,
-			\CodeIgniter\Validation\FileRules::class,
-			\CodeIgniter\Validation\CreditCardRules::class,
-			\Tests\Support\Validation\TestRules::class,
-		],
-		'groupA'		 => [
-			'foo' => 'required|min_length[5]',
-		],
-		'groupA_errors'	 => [
-			'foo' => [
-				'min_length' => 'Shame, shame. Too short.',
-			],
-		],
-	];
-
-	//--------------------------------------------------------------------
-
-	public function setUp()
-	{
-		parent::setUp();
-
-		$this->validation = new Validation((object)$this->config, \Config\Services::renderer());
-		$this->validation->reset();
-
-		$_FILES = [];
-	}
-
-	//--------------------------------------------------------------------
-	// Rules Tests
-	//--------------------------------------------------------------------
-
-	public function testRequiredNull()
-	{
-		$data = [
-			'foo' => null,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'required',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRequiredTrueString()
-	{
-		$data = [
-			'foo' => 123,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'required',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRequiredFalseString()
-	{
-		$data = [
-			'bar' => 123,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'required',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRequiredTrueArray()
-	{
-		$data = [
-			'foo' => [123],
-		];
-
-		$this->validation->setRules([
-			'foo' => 'required',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRequiredFalseArray()
-	{
-		$data = [
-			'foo' => [],
-		];
-
-		$this->validation->setRules([
-			'foo' => 'required',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRequiredObject()
-	{
-		$data = [
-			'foo' => new \stdClass(),
-		];
-
-		$this->validation->setRules([
-			'foo' => 'required',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @dataProvider ifExistProvider
-	 *
-	 * @param $rules
-	 * @param $data
-	 * @param $expected
-	 */
-	public function testIfExist($rules, $data, $expected)
-	{
-		$this->validation->setRules($rules);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function ifExistProvider()
-	{
-		return [
-			[['foo' => 'required'], ['foo' => ''], false],
-			[['foo' => 'required'], [], false],
-			[['foo' => 'if_exist|required'], ['foo' => ''], false],
-			// Input data does not exist then the other rules will be ignored
-			[['foo' => 'if_exist|required'], [], true],
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @dataProvider emptysProvider
-	 *
-	 * @param $rules
-	 * @param $data
-	 * @param $expected
-	 */
-	public function testEmptys($rules, $data, $expected)
-	{
-		$this->validation->setRules($rules);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function emptysProvider()
-	{
-		return [
-			[['foo' => 'permit_empty'], ['foo' => ''], true],
-			[['foo' => 'permit_empty'], ['foo' => '0'], true],
-			[['foo' => 'permit_empty'], ['foo' => 0], true],
-			[['foo' => 'permit_empty'], ['foo' => 0.0], true],
-			[['foo' => 'permit_empty'], ['foo' => null], true],
-			[['foo' => 'permit_empty'], ['foo' => false], true],
-			[['foo' => 'permit_empty|valid_email'], ['foo' => ''], true],
-			[['foo' => 'permit_empty|valid_email'], ['foo' => 'user@domain.tld'], true],
-			[['foo' => 'permit_empty|valid_email'], ['foo' => 'invalid'], false],
-			// Required has more priority
-			[['foo' => 'permit_empty|required|valid_email'], ['foo' => ''], false],
-			[['foo' => 'permit_empty|required'], ['foo' => ''], false],
-			[['foo' => 'permit_empty|required'], ['foo' => null], false],
-			[['foo' => 'permit_empty|required'], ['foo' => false], false],
-			// This tests will return true because the input data is trimmed
-			[['foo' => 'permit_empty|required'], ['foo' => '0'], true],
-			[['foo' => 'permit_empty|required'], ['foo' => 0], true],
-			[['foo' => 'permit_empty|required'], ['foo' => 0.0], true],
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMatchesNull()
-	{
-		$data = [
-			'foo'	 => null,
-			'bar'	 => null,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'matches[bar]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMatchesTrue()
-	{
-		$data = [
-			'foo'	 => 'match',
-			'bar'	 => 'match',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'matches[bar]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMatchesFalse()
-	{
-		$data = [
-			'foo'	 => 'match',
-			'bar'	 => 'nope',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'matches[bar]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testDiffersNull()
-	{
-		$data = [
-			'foo'	 => null,
-			'bar'	 => null,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'differs[bar]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testDiffersTrue()
-	{
-		$data = [
-			'foo'	 => 'match',
-			'bar'	 => 'nope',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'differs[bar]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testDiffersFalse()
-	{
-		$data = [
-			'foo'	 => 'match',
-			'bar'	 => 'match',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'differs[bar]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group DatabaseLive
-	 */
-	public function testIsUniqueFalse()
-	{
-		$db  = Database::connect();
-		$db->table('user')->insert([
-			'name' => 'Derek Travis',
-			'email' => 'derek@world.com'
-		]);
-
-		$data = [
-			'email' => 'derek@world.com',
-		];
-
-		$this->validation->setRules([
-			'email' => 'is_unique[user.email]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group DatabaseLive
-	 */
-	public function testIsUniqueTrue()
-	{
-		$data = [
-			'email' => 'derek@world.co.uk',
-		];
-
-		$this->validation->setRules([
-			'email' => 'is_unique[user.email]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group DatabaseLive
-	 */
-	public function testIsUniqueIgnoresParams()
-	{
-		$db  = Database::connect();
-		$user = $db->table('user')
-			->insert([
-				'name' => 'Developer A',
-				'email' => 'deva@example.com',
-			]);
-		$row = $db->table('user')
-				->limit(1)
-				->get()
-				->getRow();
-
-		$data = [
-			'email' => 'derek@world.co.uk',
-		];
-
-		$this->validation->setRules([
-			'email' => "is_unique[user.email,id,{$row->id}]",
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMinLengthNull()
-	{
-		$data = [
-			'foo' => null,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'min_length[3]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMinLengthReturnsFalseWithNonNumericVal()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'min_length[bar]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMinLengthReturnsTrueWithSuccess()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'min_length[2]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
+        $this->validation->setRules([
+            'foo' => 'min_length[2]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
 
-	public function testMinLengthReturnsTrueWithExactLength()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
+    //--------------------------------------------------------------------
 
-		$this->validation->setRules([
-			'foo' => 'min_length[3]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
+    public function testMinLengthReturnsTrueWithExactLength()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
 
-	//--------------------------------------------------------------------
+        $this->validation->setRules([
+            'foo' => 'min_length[3]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
 
-	public function testMinLengthReturnsFalseWhenWrong()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
+    //--------------------------------------------------------------------
 
-		$this->validation->setRules([
-			'foo' => 'min_length[4]',
-		]);
+    public function testMinLengthReturnsFalseWhenWrong()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
 
-		$this->assertFalse($this->validation->run($data));
-	}
+        $this->validation->setRules([
+            'foo' => 'min_length[4]',
+        ]);
 
-	//--------------------------------------------------------------------
+        $this->assertFalse($this->validation->run($data));
+    }
 
-	public function testMaxLengthNull()
-	{
-		$data = [
-			'foo' => null,
-		];
+    //--------------------------------------------------------------------
 
-		$this->validation->setRules([
-			'foo' => 'max_length[1]',
-		]);
+    public function testMaxLengthNull()
+    {
+        $data = [
+            'foo' => null,
+        ];
 
-		$this->assertTrue($this->validation->run($data));
-	}
+        $this->validation->setRules([
+            'foo' => 'max_length[1]',
+        ]);
 
-	//--------------------------------------------------------------------
+        $this->assertTrue($this->validation->run($data));
+    }
 
-	public function testMaxLengthReturnsFalseWithNonNumericVal()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
+    //--------------------------------------------------------------------
 
-		$this->validation->setRules([
-			'foo' => 'max_length[bar]',
-		]);
+    public function testMaxLengthReturnsFalseWithNonNumericVal()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
 
-		$this->assertFalse($this->validation->run($data));
-	}
+        $this->validation->setRules([
+            'foo' => 'max_length[bar]',
+        ]);
 
-	//--------------------------------------------------------------------
+        $this->assertFalse($this->validation->run($data));
+    }
 
-	public function testMaxLengthReturnsTrueWithSuccess()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
+    //--------------------------------------------------------------------
 
-		$this->validation->setRules([
-			'foo' => 'max_length[4]',
-		]);
+    public function testMaxLengthReturnsTrueWithSuccess()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
 
-		$this->assertTrue($this->validation->run($data));
-	}
+        $this->validation->setRules([
+            'foo' => 'max_length[4]',
+        ]);
 
-	//--------------------------------------------------------------------
+        $this->assertTrue($this->validation->run($data));
+    }
 
-	public function testMaxLengthReturnsTrueWithExactLength()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
+    //--------------------------------------------------------------------
 
-		$this->validation->setRules([
-			'foo' => 'max_length[3]',
-		]);
+    public function testMaxLengthReturnsTrueWithExactLength()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
 
-		$this->assertTrue($this->validation->run($data));
-	}
+        $this->validation->setRules([
+            'foo' => 'max_length[3]',
+        ]);
 
-	//--------------------------------------------------------------------
+        $this->assertTrue($this->validation->run($data));
+    }
 
-	public function testMaxLengthReturnsFalseWhenWrong()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
+    //--------------------------------------------------------------------
 
-		$this->validation->setRules([
-			'foo' => 'max_length[2]',
-		]);
+    public function testMaxLengthReturnsFalseWhenWrong()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
 
-		$this->assertFalse($this->validation->run($data));
-	}
+        $this->validation->setRules([
+            'foo' => 'max_length[2]',
+        ]);
 
-	//--------------------------------------------------------------------
+        $this->assertFalse($this->validation->run($data));
+    }
 
-	public function testExactLengthNull()
-	{
-		$data = [
-			'foo' => null,
-		];
+    //--------------------------------------------------------------------
 
-		$this->validation->setRules([
-			'foo' => 'exact_length[3]',
-		]);
+    public function testExactLengthNull()
+    {
+        $data = [
+            'foo' => null,
+        ];
 
-		$this->assertFalse($this->validation->run($data));
-	}
+        $this->validation->setRules([
+            'foo' => 'exact_length[3]',
+        ]);
 
-	//--------------------------------------------------------------------
+        $this->assertFalse($this->validation->run($data));
+    }
 
-	public function testExactLengthReturnsTrueOnSuccess()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'exact_length[3]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testExactLengthDetectsBadLength()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'exact_length[abc]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testExactLengthReturnsFalseWhenShort()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'exact_length[2]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testExactLengthReturnsFalseWhenLong()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'exact_length[4]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//-------------------------------------------------------------------
-
-	/**
-	 * @dataProvider greaterThanProvider
-	 *
-	 * @param $str
-	 * @param $expected
-	 */
-	public function testGreaterThan($first, $second, $expected)
-	{
-		$data = [
-			'foo' => $first,
-		];
-
-		$this->validation->setRules([
-			'foo' => "greater_than[{$second}]",
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function greaterThanProvider()
-	{
-		return [
-			['-10', '-11', true],
-			['10', '9', true],
-			['10', '10', false],
-			['10', 'a', false],
-			['10a', '10', false],
-			[null, null, false]
-		];
-	}
-
-	//-------------------------------------------------------------------
-
-	/**
-	 * @dataProvider greaterThanEqualProvider
-	 *
-	 * @param $str
-	 * @param $expected
-	 */
-	public function testGreaterThanEqual($first, $second, $expected)
-	{
-		$data = [
-			'foo' => $first,
-		];
-
-		$this->validation->setRules([
-			'foo' => "greater_than_equal_to[{$second}]",
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function greaterThanEqualProvider()
-	{
-		return [
-			['0', '0', true],
-			['1', '0', true],
-			['-1', '0', false],
-			['10a', '0', false],
-			[null, null, false],
-			[1, null, true],
-			[null, 1, false]
-		];
-	}
-
-	//-------------------------------------------------------------------
-
-	/**
-	 * @dataProvider lessThanProvider
-	 *
-	 * @param $str
-	 * @param $expected
-	 */
-	public function testLessThan($first, $second, $expected)
-	{
-		$data = [
-			'foo' => $first,
-		];
-
-		$this->validation->setRules([
-			'foo' => "less_than[{$second}]",
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function lessThanProvider()
-	{
-		return [
-			['4', '5', true],
-			['-1', '0', true],
-			['4', '4', false],
-			['10a', '5', false],
-			[null, null, false],
-			[1, null, false],
-			[null, 1, false]
-		];
-	}
-
-	//-------------------------------------------------------------------
-
-	/**
-	 * @dataProvider lessThanEqualProvider
-	 *
-	 * @param $str
-	 * @param $expected
-	 */
-	public function testLessEqualThan($first, $second, $expected)
-	{
-		$data = [
-			'foo' => $first,
-		];
-
-		$this->validation->setRules([
-			'foo' => "less_than_equal_to[{$second}]",
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function lessThanEqualProvider()
-	{
-		return [
-			['-1', '0', true],
-			['-1', '-1', true],
-			['4', '4', true],
-			['0', '-1', false],
-			['10a', '0', false],
-			[null, null, false],
-			[null, 1, false],
-			[1, null, false]
-		];
-	}
-
-	//-------------------------------------------------------------------
-
-	/**
-	 * @dataProvider inListProvider
-	 *
-	 * @param $str
-	 * @param $expected
-	 */
-	public function testInList($first, $second, $expected)
-	{
-		$data = [
-			'foo' => $first,
-		];
-
-		$this->validation->setRules([
-			'foo' => "in_list[{$second}]",
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function inListProvider()
-	{
-		return [
-			['red', 'red,Blue,123', true],
-			['Blue', 'red, Blue,123', true],
-			['Blue', 'red,Blue,123', true],
-			['123', 'red,Blue,123', true],
-			['Red', 'red,Blue,123', false],
-			[' red', 'red,Blue,123', false],
-			['1234', 'red,Blue,123', false],
-			[null, 'red,Blue,123', false],
-			['red', null, false],
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @dataProvider requiredWithProvider
-	 *
-	 * @param $check
-	 * @param $expected
-	 */
-	public function testRequiredWith($field, $check, $expected = false)
-	{
-		$data = [
-			'foo'	 => 'bar',
-			'bar'	 => 'something',
-			'baz'	 => null,
-			'ar'	 => []			 // Was running into issues with array values
-		];
-
-		$this->validation->setRules([
-			$field => "required_with[{$check}]",
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function requiredWithProvider()
-	{
-		return [
-			['nope', 'bar', false],
-			['foo', 'bar', true],
-			['nope', 'baz', true],
-			[null, null, true],
-			[null, 'foo', false],
-			['foo', null, true]
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @dataProvider requiredWithoutProvider
-	 *
-	 * @param $check
-	 * @param $expected
-	 */
-	public function testRequiredWithout($field, $check, $expected = false)
-	{
-		$data = [
-			'foo'	 => 'bar',
-			'bar'	 => 'something',
-			'baz'	 => null,
-		];
-
-		$this->validation->setRules([
-			$field => "required_without[{$check}]",
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function requiredWithoutProvider()
-	{
-		return [
-			['nope', 'bars', false],
-			['foo', 'nope', true],
-			[null, null, false],
-			[null, 'foo', true],
-			['foo', null, true]
-		];
-	}
-
-	//--------------------------------------------------------------------
+    //--------------------------------------------------------------------
 
+    public function testExactLengthReturnsTrueOnSuccess()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'exact_length[3]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function testExactLengthDetectsBadLength()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'exact_length[abc]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function testExactLengthReturnsFalseWhenShort()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'exact_length[2]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function testExactLengthReturnsFalseWhenLong()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'exact_length[4]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    //-------------------------------------------------------------------
+
+    /**
+     * @dataProvider greaterThanProvider
+     *
+     * @param $str
+     * @param $expected
+     */
+    public function testGreaterThan($first, $second, $expected)
+    {
+        $data = [
+            'foo' => $first,
+        ];
+
+        $this->validation->setRules([
+            'foo' => "greater_than[{$second}]",
+        ]);
+
+        $this->assertEquals($expected, $this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function greaterThanProvider()
+    {
+        return [
+            ['-10', '-11', true],
+            ['10', '9', true],
+            ['10', '10', false],
+            ['10', 'a', false],
+            ['10a', '10', false],
+            [null, null, false]
+        ];
+    }
+
+    //-------------------------------------------------------------------
+
+    /**
+     * @dataProvider greaterThanEqualProvider
+     *
+     * @param $str
+     * @param $expected
+     */
+    public function testGreaterThanEqual($first, $second, $expected)
+    {
+        $data = [
+            'foo' => $first,
+        ];
+
+        $this->validation->setRules([
+            'foo' => "greater_than_equal_to[{$second}]",
+        ]);
+
+        $this->assertEquals($expected, $this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function greaterThanEqualProvider()
+    {
+        return [
+            ['0', '0', true],
+            ['1', '0', true],
+            ['-1', '0', false],
+            ['10a', '0', false],
+            [null, null, false],
+            [1, null, true],
+            [null, 1, false]
+        ];
+    }
+
+    //-------------------------------------------------------------------
+
+    /**
+     * @dataProvider lessThanProvider
+     *
+     * @param $str
+     * @param $expected
+     */
+    public function testLessThan($first, $second, $expected)
+    {
+        $data = [
+            'foo' => $first,
+        ];
+
+        $this->validation->setRules([
+            'foo' => "less_than[{$second}]",
+        ]);
+
+        $this->assertEquals($expected, $this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function lessThanProvider()
+    {
+        return [
+            ['4', '5', true],
+            ['-1', '0', true],
+            ['4', '4', false],
+            ['10a', '5', false],
+            [null, null, false],
+            [1, null, false],
+            [null, 1, false]
+        ];
+    }
+
+    //-------------------------------------------------------------------
+
+    /**
+     * @dataProvider lessThanEqualProvider
+     *
+     * @param $str
+     * @param $expected
+     */
+    public function testLessEqualThan($first, $second, $expected)
+    {
+        $data = [
+            'foo' => $first,
+        ];
+
+        $this->validation->setRules([
+            'foo' => "less_than_equal_to[{$second}]",
+        ]);
+
+        $this->assertEquals($expected, $this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function lessThanEqualProvider()
+    {
+        return [
+            ['-1', '0', true],
+            ['-1', '-1', true],
+            ['4', '4', true],
+            ['0', '-1', false],
+            ['10a', '0', false],
+            [null, null, false],
+            [null, 1, false],
+            [1, null, false]
+        ];
+    }
+
+    //-------------------------------------------------------------------
+
+    /**
+     * @dataProvider inListProvider
+     *
+     * @param $str
+     * @param $expected
+     */
+    public function testInList($first, $second, $expected)
+    {
+        $data = [
+            'foo' => $first,
+        ];
+
+        $this->validation->setRules([
+            'foo' => "in_list[{$second}]",
+        ]);
+
+        $this->assertEquals($expected, $this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function inListProvider()
+    {
+        return [
+            ['red', 'red,Blue,123', true],
+            ['Blue', 'red, Blue,123', true],
+            ['Blue', 'red,Blue,123', true],
+            ['123', 'red,Blue,123', true],
+            ['Red', 'red,Blue,123', false],
+            [' red', 'red,Blue,123', false],
+            ['1234', 'red,Blue,123', false],
+            [null, 'red,Blue,123', false],
+            ['red', null, false],
+        ];
+    }
+
+    //--------------------------------------------------------------------
+
+    /**
+     * @dataProvider requiredWithProvider
+     *
+     * @param $check
+     * @param $expected
+     */
+    public function testRequiredWith($field, $check, $expected = false)
+    {
+        $data = [
+            'foo' => 'bar',
+            'bar' => 'something',
+            'baz' => null,
+            'ar'  => []    // Was running into issues with array values
+        ];
+
+        $this->validation->setRules([
+            $field => "required_with[{$check}]",
+        ]);
+
+        $this->assertEquals($expected, $this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function requiredWithProvider()
+    {
+        return [
+            ['nope', 'bar', false],
+            ['foo', 'bar', true],
+            ['nope', 'baz', true],
+            [null, null, true],
+            [null, 'foo', false],
+            ['foo', null, true]
+        ];
+    }
+
+    //--------------------------------------------------------------------
+
+    /**
+     * @dataProvider requiredWithoutProvider
+     *
+     * @param $check
+     * @param $expected
+     */
+    public function testRequiredWithout($field, $check, $expected = false)
+    {
+        $data = [
+            'foo' => 'bar',
+            'bar' => 'something',
+            'baz' => null,
+        ];
+
+        $this->validation->setRules([
+            $field => "required_without[{$check}]",
+        ]);
+
+        $this->assertEquals($expected, $this->validation->run($data));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function requiredWithoutProvider()
+    {
+        return [
+            ['nope', 'bars', false],
+            ['foo', 'nope', true],
+            [null, null, false],
+            [null, 'foo', true],
+            ['foo', null, true]
+        ];
+    }
+
+    //--------------------------------------------------------------------
 }

From c9a0413ee31551ebd6bbe69a3f7f9863d3685fba Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Fri, 6 Jul 2018 13:31:56 -0700
Subject: [PATCH 32/69] Fix MemcachedHandler and ModelTest for PHP7.2
 compatibility

---
 system/Cache/Handlers/MemcachedHandler.php |  3 ++-
 tests/system/Database/Live/ModelTest.php   | 12 +++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/system/Cache/Handlers/MemcachedHandler.php b/system/Cache/Handlers/MemcachedHandler.php
index cd2405489fb1..36513248f6fe 100644
--- a/system/Cache/Handlers/MemcachedHandler.php
+++ b/system/Cache/Handlers/MemcachedHandler.php
@@ -287,7 +287,8 @@ public function getMetaData(string $key)
 
 		$stored = $this->memcached->get($key);
 
-		if (count($stored) !== 3)
+        // if not an array, don't try to count for PHP7.2
+		if (! is_array($stored) || count($stored) !== 3)
 		{
 			return FALSE;
 		}
diff --git a/tests/system/Database/Live/ModelTest.php b/tests/system/Database/Live/ModelTest.php
index a42cd49781e3..63b2879a31f1 100644
--- a/tests/system/Database/Live/ModelTest.php
+++ b/tests/system/Database/Live/ModelTest.php
@@ -88,7 +88,9 @@ public function testFindRespectsSoftDeletes()
 
 		$user = $model->withDeleted()->find(4);
 
-		$this->assertEquals(1, count($user));
+        // fix for PHP7.2
+        $count = is_array($user) ? count($user) : 1;
+		$this->assertEquals(1, $count);
 	}
 
 	//--------------------------------------------------------------------
@@ -193,7 +195,9 @@ public function testFirst()
 
 		$user = $model->where('id >', 2)->first();
 
-		$this->assertEquals(1, count($user));
+        // fix for PHP7.2
+        $count = is_array($user) ? count($user) : 1;
+		$this->assertEquals(1, $count);
 		$this->assertEquals(3, $user->id);
 	}
 
@@ -207,7 +211,9 @@ public function testFirstRespectsSoftDeletes()
 
 		$user = $model->first();
 
-		$this->assertEquals(1, count($user));
+        // fix for PHP7.2
+        $count = is_array($user) ? count($user) : 1;
+		$this->assertEquals(1, $count);
 		$this->assertEquals(2, $user->id);
 
 		$user = $model->withDeleted()->first();

From 8ab9b697aaf543541988977901bfc7931073b8c2 Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Fri, 6 Jul 2018 13:38:49 -0700
Subject: [PATCH 33/69] Rename inflector_helper's is_countable to
 is_pluralizable to avoid PHP7.3 conflict

---
 system/Helpers/inflector_helper.php                | 8 ++++----
 tests/system/Helpers/InflectorHelperTest.php       | 4 ++--
 user_guide_src/source/helpers/inflector_helper.rst | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/system/Helpers/inflector_helper.php b/system/Helpers/inflector_helper.php
index 16bbf75e7b96..dad58ad8641b 100755
--- a/system/Helpers/inflector_helper.php
+++ b/system/Helpers/inflector_helper.php
@@ -60,7 +60,7 @@ function singular(string $string): string
 	{
 		$result = strval($string);
 
-		if ( ! is_countable($result))
+		if ( ! is_pluralizable($result))
 		{
 			return $result;
 		}
@@ -128,7 +128,7 @@ function plural(string $string): string
 	{
 		$result = strval($string);
 
-		if ( ! is_countable($result))
+		if ( ! is_pluralizable($result))
 		{
 			return $result;
 		}
@@ -242,7 +242,7 @@ function humanize(string $string, string $separator = '_'): string
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('is_countable'))
+if ( ! function_exists('is_pluralizable'))
 {
 
 	/**
@@ -251,7 +251,7 @@ function humanize(string $string, string $separator = '_'): string
 	 * @param	string	$word	Word to check
 	 * @return	bool
 	 */
-	function is_countable($word): bool
+	function is_pluralizable($word): bool
 	{
 		$uncountables = in_array
 				(
diff --git a/tests/system/Helpers/InflectorHelperTest.php b/tests/system/Helpers/InflectorHelperTest.php
index 54c7deabd636..410a14a34146 100755
--- a/tests/system/Helpers/InflectorHelperTest.php
+++ b/tests/system/Helpers/InflectorHelperTest.php
@@ -156,8 +156,8 @@ public function testIsCountable()
 
 		foreach ($words as $countable => $unCountable)
 		{
-			$this->assertTrue(is_countable($countable));
-			$this->assertFalse(is_countable($unCountable));
+			$this->assertTrue(is_pluralizable($countable));
+			$this->assertFalse(is_pluralizable($unCountable));
 		}
 	}
 
diff --git a/user_guide_src/source/helpers/inflector_helper.rst b/user_guide_src/source/helpers/inflector_helper.rst
index 3f67c4b505d7..634293778c41 100755
--- a/user_guide_src/source/helpers/inflector_helper.rst
+++ b/user_guide_src/source/helpers/inflector_helper.rst
@@ -84,7 +84,7 @@ The following functions are available:
 
 		echo humanize('my-dog-spot', '-'); // Prints 'My Dog Spot'
 
-.. php:function:: is_countable($word)
+.. php:function:: is_pluralizable($word)
 
 	:param	string	$word: Input string
 	:returns:	TRUE if the word is countable or FALSE if not
@@ -92,7 +92,7 @@ The following functions are available:
 
 	Checks if the given word has a plural version. Example::
 
-		is_countable('equipment'); // Returns FALSE
+		is_pluralizable('equipment'); // Returns FALSE
 
 .. php:function:: dasherize($string)
 

From 57acd4d8703e1b9eeb1b598f7ec93b5ea9650a7d Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Sun, 8 Jul 2018 22:48:21 -0500
Subject: [PATCH 34/69] Prevent double-encoding URI query values. Fixes #954

---
 system/HTTP/URI.php           | 30 +++++++++++++++++++++++++++++-
 tests/system/HTTP/URITest.php | 17 +++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index 39f14f8978e4..1d8797917171 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -704,7 +704,10 @@ public function setQuery(string $query)
 				continue;
 			}
 
-			$parts[$key] = $value;
+			// URL Decode the value to protect
+			// from double-encoding a URL.
+			// Especially useful with the Pager.
+			$parts[$key] = $this->decode($value);
 		}
 
 		$this->query = $parts;
@@ -714,6 +717,31 @@ public function setQuery(string $query)
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Checks the value to see if it has been urlencoded and decodes it if so.
+	 * The urlencode check is not perfect but should catch most cases.
+	 *
+	 * @param string $value
+	 *
+	 * @return string
+	 */
+	protected function decode(string $value)
+	{
+		if (empty($value))
+		{
+			return $value;
+		}
+
+		$decoded = urldecode($value);
+
+		// This won't catch all cases, specifically
+		// changing ' ' to '+' has the same length
+		// but doesn't really matter for our cases here.
+		return strlen($decoded) < strlen($value)
+			? $decoded
+			: $value;
+	}
+
 	/**
 	 * Split a query value into it's key/value elements, if both
 	 * are present.
diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php
index cfd680133f1f..aa76626c0fc3 100644
--- a/tests/system/HTTP/URITest.php
+++ b/tests/system/HTTP/URITest.php
@@ -480,6 +480,23 @@ public function testAddQueryVar()
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * @see https://github.com/bcit-ci/CodeIgniter4/pull/954
+	 */
+	public function testSetQueryDecode()
+	{
+		$base = 'http://example.com/foo';
+
+		$uri = new URI($base);
+		$encoded = urlencode('you+alice+to+the+little');
+
+		$uri->setQuery("q={$encoded}");
+
+		// Should NOT be double-encoded, since http_build_query
+		// will encode the value again.
+		$this->assertEquals("q={$encoded}", $uri->getQuery());
+	}
+
 	public function testAddQueryVarRespectsExistingQueryVars()
 	{
 		$base = 'http://example.com/foo?bar=baz';

From 107753d4152a759e2710fd73ecc9a55cb6337ada Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Mon, 9 Jul 2018 00:04:28 -0500
Subject: [PATCH 35/69] Allow redirecting on CSRF failures. Fixes #1012

---
 application/Config/App.php                   |  2 ++
 application/Filters/CSRF.php                 | 15 ++++++++++++++-
 tests/_support/Config/MockAppConfig.php      |  1 +
 user_guide_src/source/libraries/security.rst |  9 +++++++++
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/application/Config/App.php b/application/Config/App.php
index 94a2bab44abf..6a426faf4e3d 100644
--- a/application/Config/App.php
+++ b/application/Config/App.php
@@ -240,11 +240,13 @@ class App extends BaseConfig
 	| CSRFCookieName  = The cookie name
 	| CSRFExpire      = The number in seconds the token should expire.
 	| CSRFRegenerate  = Regenerate token on every submission
+	| CSRFRedirect    = Redirect to previous page with error on failure
 	*/
 	public $CSRFTokenName   = 'csrf_test_name';
 	public $CSRFCookieName  = 'csrf_cookie_name';
 	public $CSRFExpire      = 7200;
 	public $CSRFRegenerate  = true;
+	public $CSRFRedirect    = true;
 
 	/*
 	|--------------------------------------------------------------------------
diff --git a/application/Filters/CSRF.php b/application/Filters/CSRF.php
index 46f1582300a8..221ae1316497 100644
--- a/application/Filters/CSRF.php
+++ b/application/Filters/CSRF.php
@@ -3,6 +3,7 @@
 use CodeIgniter\Filters\FilterInterface;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
+use CodeIgniter\Security\Exceptions\SecurityException;
 use Config\Services;
 
 class CSRF implements FilterInterface
@@ -30,7 +31,19 @@ public function before(RequestInterface $request)
 
 		$security = Services::security();
 
-		$security->CSRFVerify($request);
+		try
+		{
+			$security->CSRFVerify($request);
+		}
+		catch (SecurityException $e)
+		{
+			if (config('App')->CSRFRedirect && ! $request->isAJAX())
+			{
+				return redirect()->back()->with('error', $e->getMessage());
+			}
+
+			throw $e;
+		}
 	}
 
 	//--------------------------------------------------------------------
diff --git a/tests/_support/Config/MockAppConfig.php b/tests/_support/Config/MockAppConfig.php
index 11672cae2f7f..753eb986d8be 100644
--- a/tests/_support/Config/MockAppConfig.php
+++ b/tests/_support/Config/MockAppConfig.php
@@ -20,6 +20,7 @@ class MockAppConfig
 	public $CSRFExpire      = 7200;
 	public $CSRFRegenerate  = true;
 	public $CSRFExcludeURIs = ['http://example.com'];
+	public $CSRFRedirect    = false;
 
 	public $CSPEnabled = false;
 
diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index f0b8f25502aa..987068dc545b 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -73,6 +73,15 @@ may alter this behavior by editing the following config parameter
 
 	public $CSRFRegenerate  = true;
 
+When a request fails the CSRF validation check, it will redirect to the previous page by default,
+setting an ``error`` flash message that you can display to the end user. This provides a nicer experience
+than simply crashing. This can be turned off by editing the ``$CSRFRedirect`` value in
+**application/Config/App.php**::
+
+	public $CSRFRedirect = false;
+
+Even when the redirect value is **true**, AJAX calls will not redirect, but will throw an error. 
+
 *********************
 Other Helpful Methods
 *********************

From 4e31dfb8b74c3b7a2733141bea1af17079378df5 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Mon, 9 Jul 2018 22:12:59 -0500
Subject: [PATCH 36/69] Updating CSRF docs

---
 user_guide_src/source/libraries/security.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index 987068dc545b..f27ce07a467d 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -80,7 +80,7 @@ than simply crashing. This can be turned off by editing the ``$CSRFRedirect`` va
 
 	public $CSRFRedirect = false;
 
-Even when the redirect value is **true**, AJAX calls will not redirect, but will throw an error. 
+Even when the redirect value is **true**, AJAX calls will not redirect, but will throw an error.
 
 *********************
 Other Helpful Methods

From ca34c680f4fbbcf5d954850fbd3adb3a428e9736 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Mon, 9 Jul 2018 22:35:50 -0500
Subject: [PATCH 37/69] Tweak how memory usage is calculated. Fixes #1049

---
 application/Filters/DebugToolbar.php | 1 -
 system/CodeIgniter.php               | 8 --------
 system/Debug/Toolbar.php             | 5 ++---
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/application/Filters/DebugToolbar.php b/application/Filters/DebugToolbar.php
index 945108013c47..8839b2037eb8 100644
--- a/application/Filters/DebugToolbar.php
+++ b/application/Filters/DebugToolbar.php
@@ -42,7 +42,6 @@ public function after(RequestInterface $request, ResponseInterface $response)
 			$data    = $toolbar->run(
 				$stats['startTime'],
 				$stats['totalTime'],
-				$stats['startMemory'],
 				$request,
 				$response
 			);
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index bff25324a389..b61975d8cf4c 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -67,12 +67,6 @@ class CodeIgniter
 	 */
 	protected $startTime;
 
-	/**
-	 * Amount of memory at app start.
-	 * @var int
-	 */
-	protected $startMemory;
-
 	/**
 	 * Total app execution time
 	 * @var float
@@ -144,7 +138,6 @@ class CodeIgniter
 	public function __construct($config)
 	{
 		$this->startTime = microtime(true);
-		$this->startMemory = memory_get_usage(true);
 		$this->config = $config;
 	}
 
@@ -562,7 +555,6 @@ public function getPerformanceStats()
 		return [
 			'startTime'		 => $this->startTime,
 			'totalTime'		 => $this->totalTime,
-			'startMemory'	 => $this->startMemory
 		];
 	}
 
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 9399626d633d..c099387f4141 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -93,13 +93,12 @@ public function __construct(BaseConfig $config)
 	 *
 	 * @param float                               $startTime   App start time
 	 * @param float                               $totalTime
-	 * @param float                               $startMemory
 	 * @param \CodeIgniter\HTTP\RequestInterface  $request
 	 * @param \CodeIgniter\HTTP\ResponseInterface $response
 	 *
 	 * @return string JSON encoded data
 	 */
-	public function run($startTime, $totalTime, $startMemory, $request, $response): string
+	public function run($startTime, $totalTime, $request, $response): string
 	{
 		// Data items used within the view.
 		$data['url']             = current_url();
@@ -107,7 +106,7 @@ public function run($startTime, $totalTime, $startMemory, $request, $response):
 		$data['isAJAX']          = $request->isAJAX();
 		$data['startTime']       = $startTime;
 		$data['totalTime']       = $totalTime*1000;
-		$data['totalMemory']     = number_format((memory_get_peak_usage()-$startMemory)/1048576, 3);
+		$data['totalMemory']     = number_format((memory_get_peak_usage())/1024/1024, 3);
 		$data['segmentDuration'] = $this->roundTo($data['totalTime']/7, 5);
 		$data['segmentCount']    = (int)ceil($data['totalTime']/$data['segmentDuration']);
 		$data['CI_VERSION']      = \CodeIgniter\CodeIgniter::CI_VERSION;

From fa8c1c725abc4cb76f19fdcd891503322bb06e2c Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Mon, 9 Jul 2018 23:04:07 -0500
Subject: [PATCH 38/69] Convert all usages on Config\App through config
 function for performance gains.

---
 application/Filters/DebugToolbar.php       |  2 +-
 system/Common.php                          |  6 ++---
 system/Config/Services.php                 | 26 +++++++++-------------
 system/Debug/Toolbar.php                   |  5 +++--
 system/Debug/Toolbar/Collectors/Config.php |  4 ++--
 system/HTTP/Response.php                   | 11 +++++----
 system/Helpers/cookie_helper.php           |  2 +-
 system/Helpers/form_helper.php             |  2 +-
 system/Helpers/url_helper.php              |  8 +++----
 system/Model.php                           |  4 +---
 system/Test/FeatureTestCase.php            |  3 ++-
 system/View/View.php                       |  2 +-
 system/bootstrap.php                       |  3 ++-
 13 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/application/Filters/DebugToolbar.php b/application/Filters/DebugToolbar.php
index 8839b2037eb8..878a52387923 100644
--- a/application/Filters/DebugToolbar.php
+++ b/application/Filters/DebugToolbar.php
@@ -37,7 +37,7 @@ public function after(RequestInterface $request, ResponseInterface $response)
 		{
 			global $app;
 
-			$toolbar = Services::toolbar(new App());
+			$toolbar = Services::toolbar(config(App::class));
 			$stats   = $app->getPerformanceStats();
 			$data    = $toolbar->run(
 				$stats['startTime'],
diff --git a/system/Common.php b/system/Common.php
index 1c39579e66fb..17f63349be79 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -605,7 +605,7 @@ function helper($filenames)
 	 */
 	function app_timezone()
 	{
-		$config = new \Config\App();
+		$config = config(\Config\App::class);
 
 		return $config->appTimezone;
 	}
@@ -626,7 +626,7 @@ function app_timezone()
 	 */
 	function csrf_token()
 	{
-		$config = new \Config\App();
+		$config = config(\Config\App::class);
 
 		return $config->CSRFTokenName;
 	}
@@ -919,7 +919,7 @@ function is_really_writable($file)
 	 */
 	function slash_item($item)
 	{
-		$config = new \Config\App();
+		$config = config(\Config\App::class);
 		$configItem = $config->{$item};
 
 		if ( ! isset($configItem) || empty(trim($configItem)))
diff --git a/system/Config/Services.php b/system/Config/Services.php
index 54b7ca9278fe..b6c90a1db97b 100644
--- a/system/Config/Services.php
+++ b/system/Config/Services.php
@@ -35,11 +35,10 @@
  * @since        Version 3.0.0
  * @filesource
  */
+use Config\App;
 use CodeIgniter\Database\ConnectionInterface;
 use CodeIgniter\Database\MigrationRunner;
-use CodeIgniter\HTTP\URI;
 use CodeIgniter\View\RendererInterface;
-use Config\App;
 
 /**
  * Services Configuration file.
@@ -124,7 +123,7 @@ public static function clirequest(\Config\App $config = null, $getShared = true)
 
 		if (! is_object($config))
 		{
-			$config = new \Config\App();
+			$config = config(App::class);
 		}
 
 		return new \CodeIgniter\HTTP\CLIRequest($config);
@@ -143,12 +142,7 @@ public static function clirequest(\Config\App $config = null, $getShared = true)
 	 *
 	 * @return \CodeIgniter\HTTP\CURLRequest
 	 */
-	public static function curlrequest(
-		array $options = [],
-		$response = null,
-		\Config\App $config = null,
-		$getShared = true
-	) {
+	public static function curlrequest(array $options = [], $response = null, \Config\App $config = null, $getShared = true) {
 		if ($getShared === true)
 		{
 			return self::getSharedInstance('curlrequest', $options, $response, $config);
@@ -156,7 +150,7 @@ public static function curlrequest(
 
 		if (! is_object($config))
 		{
-			$config = new \Config\App();
+			$config = config(App::class);
 		}
 
 		if (! is_object($response))
@@ -540,7 +534,7 @@ public static function request(\Config\App $config = null, $getShared = true)
 
 		if (! is_object($config))
 		{
-			$config = new App();
+			$config = config(App::class);
 		}
 
 		return new \CodeIgniter\HTTP\IncomingRequest(
@@ -570,7 +564,7 @@ public static function response(\Config\App $config = null, $getShared = true)
 
 		if (! is_object($config))
 		{
-			$config = new \Config\App();
+			$config = config(App::class);
 		}
 
 		return new \CodeIgniter\HTTP\Response($config);
@@ -595,7 +589,7 @@ public static function redirectResponse(\Config\App $config = null, $getShared =
 
 		if (! is_object($config))
 		{
-			$config = new \Config\App();
+			$config = config(App::class);
 		}
 
 		$response = new \CodeIgniter\HTTP\RedirectResponse($config);
@@ -671,7 +665,7 @@ public static function security(\Config\App $config = null, $getShared = true)
 
 		if (! is_object($config))
 		{
-			$config = new \Config\App();
+			$config = config(App::class);
 		}
 
 		return new \CodeIgniter\Security\Security($config);
@@ -694,7 +688,7 @@ public static function session(\Config\App $config = null, $getShared = true)
 
 		if (! is_object($config))
 		{
-			$config = new \Config\App();
+			$config = config(App::class);
 		}
 
 		$logger = self::logger(true);
@@ -766,7 +760,7 @@ public static function toolbar(\Config\App $config = null, $getShared = true)
 
 		if (! is_object($config))
 		{
-			$config = new \Config\App();
+			$config = config(App::class);
 		}
 
 		return new \CodeIgniter\Debug\Toolbar($config);
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index c099387f4141..ce96b098277d 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -35,8 +35,9 @@
  * @since        Version 3.0.0
  * @filesource
  */
-use CodeIgniter\Config\BaseConfig;
+use Config\App;
 use Config\Services;
+use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Format\XMLFormatter;
 
 /**
@@ -220,7 +221,7 @@ protected static function format(string $data, string $format = 'html')
 		$files = [];
 
 		$current = self::$request->getGet('debugbar_time');
-		$app     = new \Config\App;
+		$app     = config(App::class);
 
 		for ($i = 0; $i < $total; $i++)
 		{
diff --git a/system/Debug/Toolbar/Collectors/Config.php b/system/Debug/Toolbar/Collectors/Config.php
index 9e290100d374..cd23cc747016 100644
--- a/system/Debug/Toolbar/Collectors/Config.php
+++ b/system/Debug/Toolbar/Collectors/Config.php
@@ -1,14 +1,14 @@
 <?php namespace CodeIgniter\Debug\Toolbar\Collectors;
 
-use CodeIgniter\CodeIgniter;
 use Config\App;
 use Config\Services;
+use CodeIgniter\CodeIgniter;
 
 class Config
 {
 	public static function display()
 	{
-		$config = new App();
+		$config = config(App::class);
 
 		return [
 			'ciVersion'   => CodeIgniter::CI_VERSION,
diff --git a/system/HTTP/Response.php b/system/HTTP/Response.php
index 44791bbc45c1..1f4b58330ef6 100644
--- a/system/HTTP/Response.php
+++ b/system/HTTP/Response.php
@@ -35,11 +35,10 @@
  * @since        Version 3.0.0
  * @filesource
  */
-use CodeIgniter\HTTP\Exceptions\HTTPException;
-use CodeIgniter\Services;
 use Config\App;
-use Config\Format;
 use Config\Mimes;
+use Config\Format;
+use CodeIgniter\HTTP\Exceptions\HTTPException;
 
 /**
  * Redirect exception
@@ -438,7 +437,7 @@ public function getJSON()
 
 		if ($this->bodyFormat != 'json')
 		{
-			$config = new Format();
+			$config = config(Format::class);
 			$formatter = $config->getFormatter('application/json');
 
 			$body = $formatter->format($body);
@@ -476,7 +475,7 @@ public function getXML()
 
 		if ($this->bodyFormat != 'xml')
 		{
-			$config = new Format();
+			$config = config(Format::class);
 			$formatter = $config->getFormatter('application/xml');
 
 			$body = $formatter->format($body);
@@ -505,7 +504,7 @@ protected function formatBody($body, string $format)
 		// Nothing much to do for a string...
 		if (! is_string($body))
 		{
-			$config    = new Format();
+			$config    = config(Format::class);
 			$formatter = $config->getFormatter($mime);
 
 			$body = $formatter->format($body);
diff --git a/system/Helpers/cookie_helper.php b/system/Helpers/cookie_helper.php
index 346404b613e8..616ab9a60dbe 100755
--- a/system/Helpers/cookie_helper.php
+++ b/system/Helpers/cookie_helper.php
@@ -95,7 +95,7 @@ function set_cookie($name, string $value = '', string $expire = '', string $doma
 	 */
 	function get_cookie($index, bool $xssClean = false)
 	{
-		$app = new \Config\App();
+		$app = config(\Config\App::class);
 		$appCookiePrefix = $app->cookiePrefix;
 		$prefix = isset($_COOKIE[$index]) ? '' : $appCookiePrefix;
 
diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
index d3e5b4886ac0..a4dca20006cb 100644
--- a/system/Helpers/form_helper.php
+++ b/system/Helpers/form_helper.php
@@ -75,7 +75,7 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s
 		}
 		if (stripos($attributes, 'accept-charset=') === false)
 		{
-			$config = new \Config\App();
+			$config = config(\Config\App::class);
 			$attributes .= ' accept-charset="' . strtolower($config->charset) . '"';
 		}
 
diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
index caf3cc893fcd..dfbc7b24da9b 100644
--- a/system/Helpers/url_helper.php
+++ b/system/Helpers/url_helper.php
@@ -55,7 +55,7 @@ function site_url($path = '', string $scheme = null, \Config\App $altConfig = nu
 		}
 
 		// use alternate config if provided, else default one
-		$config = empty($altConfig) ? new \Config\App() : $altConfig;
+		$config = empty($altConfig) ? config(\Config\App::class) : $altConfig;
 
 		$base = base_url();
 
@@ -218,7 +218,7 @@ function uri_string(): string
 	function index_page(\Config\App $altConfig = null): string
 	{
 		// use alternate config if provided, else default one
-		$config = empty($altConfig) ? new \Config\App() : $altConfig;
+		$config = empty($altConfig) ? config(\Config\App::class) : $altConfig;
 
 		return $config->indexPage;
 	}
@@ -245,7 +245,7 @@ function index_page(\Config\App $altConfig = null): string
 	function anchor($uri = '', $title = '', $attributes = '', \Config\App $altConfig = null): string
 	{
 		// use alternate config if provided, else default one
-		$config = empty($altConfig) ? new \Config\App() : $altConfig;
+		$config = empty($altConfig) ? config(\Config\App::class) : $altConfig;
 
 		$title = (string) $title;
 
@@ -289,7 +289,7 @@ function anchor($uri = '', $title = '', $attributes = '', \Config\App $altConfig
 	function anchor_popup($uri = '', $title = '', $attributes = false, \Config\App $altConfig = null): string
 	{
 		// use alternate config if provided, else default one
-		$config = empty($altConfig) ? new \Config\App() : $altConfig;
+		$config = empty($altConfig) ? config(\Config\App::class) : $altConfig;
 
 		$title = (string) $title;
 		$site_url = preg_match('#^(\w+:)?//#i', $uri) ? $uri : site_url($uri, '', $config);
diff --git a/system/Model.php b/system/Model.php
index 4669891ebe6a..3047742b9fd7 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -35,8 +35,6 @@
  * @since        Version 3.0.0
  * @filesource
  */
-use CodeIgniter\Database\Exceptions\DatabaseException;
-use Config\App;
 use Config\Database;
 use CodeIgniter\I18n\Time;
 use CodeIgniter\Pager\Pager;
@@ -274,7 +272,7 @@ public function __construct(ConnectionInterface &$db = null, BaseConfig $config
 
 		if (is_null($config) || ! isset($config->salt))
 		{
-			$config = new App();
+			$config = config(\Config\App::class);
 		}
 
 		$this->salt = $config->salt ?: '';
diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
index f18d5974409d..1a596a59873b 100644
--- a/system/Test/FeatureTestCase.php
+++ b/system/Test/FeatureTestCase.php
@@ -5,6 +5,7 @@
 use CodeIgniter\Events\Events;
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\HTTP\IncomingRequest;
+use Config\App;
 
 /**
  * Class FeatureTestCase
@@ -212,7 +213,7 @@ public function options(string $path, array $params = null)
 	 */
 	protected function setupRequest(string $method, string $path=null, $params = null)
 	{
-		$config = new \Config\App();
+		$config = config(App::class);
 		$uri    = new URI($config->baseURL .'/'. trim($path, '/ '));
 
 		$request = new IncomingRequest($config, clone($uri), $params, new UserAgent());
diff --git a/system/View/View.php b/system/View/View.php
index 1ec2066bb21a..2552f4324947 100644
--- a/system/View/View.php
+++ b/system/View/View.php
@@ -215,7 +215,7 @@ public function render(string $view, array $options = null, $saveData = null): s
 			$after = (new \Config\Filters())->globals['after'];
 			if (in_array('toolbar', $after) || array_key_exists('toolbar', $after))
 			{
-				$toolbarCollectors =  (new \Config\App())->toolbarCollectors;
+				$toolbarCollectors =  (config(\Config\App::class))->toolbarCollectors;
 				if (in_array('CodeIgniter\Debug\Toolbar\Collectors\Views', $toolbarCollectors) || array_key_exists('CodeIgniter\Debug\Toolbar\Collectors\Views', $toolbarCollectors))
 				{
 					// Clean up our path names to make them a little cleaner
diff --git a/system/bootstrap.php b/system/bootstrap.php
index b5dea81f3cab..b8059ad857fc 100644
--- a/system/bootstrap.php
+++ b/system/bootstrap.php
@@ -151,7 +151,8 @@ class_alias('Config\Services', 'CodeIgniter\Services');
  * the pieces all working together.
  */
 
-$app = new \CodeIgniter\CodeIgniter(new \Config\App());
+$appConfig = config(\Config\App::class);
+$app = new \CodeIgniter\CodeIgniter($appConfig);
 $app->initialize();
 
 return $app;

From f4c373ecee3083b01412101127edbc0883a4ee4c Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Mon, 9 Jul 2018 23:44:28 -0500
Subject: [PATCH 39/69] Refactor controller to not use the constructor.

---
 system/CLI/CommandRunner.php                  |  6 +++-
 system/CodeIgniter.php                        |  6 ++--
 system/Controller.php                         | 25 +++++++++--------
 tests/system/CLI/CommandRunnerTest.php        | 12 +++++++-
 tests/system/Commands/CommandsTest.php        | 15 +++++++++-
 .../system/Commands/SessionsCommandsTest.php  | 14 +++++++++-
 tests/system/ControllerTest.php               | 28 ++++++++++++++-----
 user_guide_src/source/general/controllers.rst | 28 -------------------
 8 files changed, 82 insertions(+), 52 deletions(-)

diff --git a/system/CLI/CommandRunner.php b/system/CLI/CommandRunner.php
index e0b08c558f26..46c2e18f68ff 100644
--- a/system/CLI/CommandRunner.php
+++ b/system/CLI/CommandRunner.php
@@ -39,7 +39,6 @@
 
 class CommandRunner extends Controller
 {
-
 	/**
 	 * Stores the info about found Commands.
 	 *
@@ -47,6 +46,11 @@ class CommandRunner extends Controller
 	 */
 	protected $commands = [];
 
+	/**
+	 * @var \CodeIgniter\Log\Logger
+	 */
+	protected $logger;
+
 	//--------------------------------------------------------------------
 
 	/**
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index b61975d8cf4c..67247c87a4ac 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -211,7 +211,8 @@ public function run(RouteCollectionInterface $routes = null, bool $returnRespons
 		try
 		{
 			return $this->handleRequest($routes, $cacheConfig, $returnResponse);
-		} catch (Router\RedirectException $e)
+		}
+		catch (Router\RedirectException $e)
 		{
 			$logger = Services::logger();
 			$logger->info('REDIRECTED ROUTE at ' . $e->getMessage());
@@ -732,7 +733,8 @@ protected function startController()
 	 */
 	protected function createController()
 	{
-		$class = new $this->controller($this->request, $this->response);
+		$class = new $this->controller();
+		$class->initController($this->request, $this->response, Services::logger());
 
 		$this->benchmark->stop('controller_constructor');
 
diff --git a/system/Controller.php b/system/Controller.php
index e471754e7105..ef1ba0448b33 100644
--- a/system/Controller.php
+++ b/system/Controller.php
@@ -39,6 +39,7 @@
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Log\Logger;
 use CodeIgniter\Validation\Validation;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class Controller
@@ -99,18 +100,17 @@ class Controller
 	/**
 	 * Constructor.
 	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @param Logger $logger
+	 * @param RequestInterface         $request
+	 * @param ResponseInterface        $response
+	 * @param \Psr\Log\LoggerInterface $logger
+	 *
+	 * @throws \CodeIgniter\HTTP\RedirectException
 	 */
-	public function __construct(RequestInterface $request, ResponseInterface $response, Logger $logger = null)
+	public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
 	{
 		$this->request = $request;
-
 		$this->response = $response;
-
-		$this->logger = is_null($logger) ? Services::logger(true) : $logger;
-
+		$this->logger = $logger;
 		$this->logger->info('Controller "' . get_class($this) . '" loaded.');
 
 		if ($this->forceHTTPS > 0)
@@ -132,6 +132,8 @@ public function __construct(RequestInterface $request, ResponseInterface $respon
 	 * @param int $duration The number of seconds this link should be
 	 *                      considered secure for. Only with HSTS header.
 	 *                      Default value is 1 year.
+	 *
+	 * @throws \CodeIgniter\HTTP\RedirectException
 	 */
 	public function forceHTTPS(int $duration = 31536000)
 	{
@@ -182,9 +184,10 @@ public function validate($rules, array $messages = []): bool
 	{
 		$this->validator = Services::validation();
 
-		$success = $this->validator->withRequest($this->request)
-				->setRules($rules, $messages)
-				->run();
+		$success = $this->validator
+			->withRequest($this->request)
+			->setRules($rules, $messages)
+			->run();
 
 		return $success;
 	}
diff --git a/tests/system/CLI/CommandRunnerTest.php b/tests/system/CLI/CommandRunnerTest.php
index 9802507712ab..16f7b82566da 100644
--- a/tests/system/CLI/CommandRunnerTest.php
+++ b/tests/system/CLI/CommandRunnerTest.php
@@ -1,6 +1,7 @@
 <?php namespace CodeIgniter\CLI;
 
 use CodeIgniter\HTTP\UserAgent;
+use Config\Services;
 use Tests\Support\Config\MockCLIConfig;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
@@ -9,6 +10,13 @@ class CommandRunnerTest extends \CIUnitTestCase
 
 	private $stream_filter;
 
+	protected $env;
+	protected $config;
+	protected $request;
+	protected $response;
+	protected $logger;
+	protected $runner;
+
 	public function setUp()
 	{
 		parent::setUp();
@@ -32,7 +40,9 @@ public function setUp()
 		$this->config = new MockCLIConfig();
 		$this->request = new \CodeIgniter\HTTP\IncomingRequest($this->config, new \CodeIgniter\HTTP\URI('https://somwhere.com'), null, new UserAgent());
 		$this->response = new \CodeIgniter\HTTP\Response($this->config);
-		$this->runner = new CommandRunner($this->request, $this->response);
+		$this->logger = Services::logger();
+		$this->runner = new CommandRunner();
+		$this->runner->initController($this->request, $this->response, $this->logger);
 	}
 
 	public function tearDown()
diff --git a/tests/system/Commands/CommandsTest.php b/tests/system/Commands/CommandsTest.php
index 00dd6439d665..e51f77fe52a1 100644
--- a/tests/system/Commands/CommandsTest.php
+++ b/tests/system/Commands/CommandsTest.php
@@ -1,18 +1,29 @@
 <?php namespace CodeIgniter\Commands;
 
+use Config\Services;
 use Tests\Support\Config\MockAppConfig;
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\CLI\CommandRunner;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
+use Tests\Support\Config\MockLogger;
 
 class CommandsTest extends \CIUnitTestCase
 {
 
 	private $stream_filter;
+	protected $env;
+	protected $config;
+	protected $request;
+	protected $response;
+	protected $logger;
+	protected $runner;
+
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		CITestStreamFilter::$buffer = '';
 		$this->stream_filter = stream_filter_append(STDOUT, 'CITestStreamFilter');
 
@@ -32,7 +43,9 @@ public function setUp()
 		$this->config = new MockAppConfig();
 		$this->request = new \CodeIgniter\HTTP\IncomingRequest($this->config, new \CodeIgniter\HTTP\URI('https://somwhere.com'), null, new UserAgent());
 		$this->response = new \CodeIgniter\HTTP\Response($this->config);
-		$this->runner = new CommandRunner($this->request, $this->response);
+		$this->logger = Services::logger();
+		$this->runner = new CommandRunner();
+		$this->runner->initController($this->request, $this->response, $this->logger);
 	}
 
 	public function tearDown()
diff --git a/tests/system/Commands/SessionsCommandsTest.php b/tests/system/Commands/SessionsCommandsTest.php
index 7171f8e8ad17..f4b619566928 100644
--- a/tests/system/Commands/SessionsCommandsTest.php
+++ b/tests/system/Commands/SessionsCommandsTest.php
@@ -1,17 +1,27 @@
 <?php namespace CodeIgniter\Commands;
 
+use Config\Services;
 use Tests\Support\Config\MockAppConfig;
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\CLI\CommandRunner;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
+use Tests\Support\Config\MockLogger;
 
 class SessionsCommandsTest extends \CIUnitTestCase
 {
 	private $stream_filter;
+	protected $env;
+	protected $config;
+	protected $request;
+	protected $response;
+	protected $logger;
+	protected $runner;
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		CITestStreamFilter::$buffer = '';
 		$this->stream_filter = stream_filter_append(STDOUT, 'CITestStreamFilter');
 
@@ -31,7 +41,9 @@ public function setUp()
 		$this->config = new MockAppConfig();
 		$this->request = new \CodeIgniter\HTTP\IncomingRequest($this->config, new \CodeIgniter\HTTP\URI('https://somwhere.com'), null, new UserAgent());
 		$this->response = new \CodeIgniter\HTTP\Response($this->config);
-		$this->runner = new CommandRunner($this->request, $this->response);
+		$this->logger = Services::logger();
+		$this->runner = new CommandRunner();
+		$this->runner->initController($this->request, $this->response, $this->logger);
 	}
 
 	public function tearDown()
diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
index 208298454bd2..39941b3af868 100644
--- a/tests/system/ControllerTest.php
+++ b/tests/system/ControllerTest.php
@@ -1,7 +1,9 @@
 <?php namespace CodeIgniter;
 
+use CodeIgniter\Log\Logger;
 use Config\App;
 use CodeIgniter\HTTP\UserAgent;
+use Tests\Support\Config\MockLogger;
 use Tests\Support\MockCodeIgniter;
 
 /**
@@ -35,6 +37,10 @@ class ControllerTest extends \CIUnitTestCase
 	 * @var \CodeIgniter\HTTP\Response
 	 */
 	protected $response;
+	/**
+	 * @var \Psr\Log\LoggerInterface
+	 */
+	protected $logger;
 
 	//--------------------------------------------------------------------
 
@@ -45,6 +51,7 @@ public function setUp()
 		$this->config = new App();
 		$this->request = new \CodeIgniter\HTTP\IncomingRequest($this->config, new \CodeIgniter\HTTP\URI('https://somwhere.com'), null, new UserAgent());
 		$this->response = new \CodeIgniter\HTTP\Response($this->config);
+		$this->logger = \Config\Services::logger();
 		$this->codeigniter = new MockCodeIgniter($this->config);
 	}
 
@@ -53,7 +60,8 @@ public function setUp()
 	public function testConstructor()
 	{
 		// make sure we can instantiate one
-		$this->controller = new Controller($this->request, $this->response);
+		$this->controller = new Controller();
+		$this->controller->initController($this->request, $this->response, $this->logger);
 		$this->assertInstanceOf(Controller::class, $this->controller);
 	}
 
@@ -62,11 +70,12 @@ public function testConstructorHTTPS()
 		$original = $_SERVER;
 		$_SERVER = ['HTTPS' => 'on'];
 		// make sure we can instantiate one
-		$this->controller = new Class($this->request, $this->response) extends Controller
+		$this->controller = new Class() extends Controller
 		{
-
 			protected $forceHTTPS = 1;
 		};
+		$this->controller->initController($this->request, $this->response, $this->logger);
+
 		$this->assertInstanceOf(Controller::class, $this->controller);
 		$_SERVER = $original; // restore so code coverage doesn't break
 	}
@@ -74,14 +83,18 @@ public function testConstructorHTTPS()
 	//--------------------------------------------------------------------
 	public function testCachePage()
 	{
-		$this->controller = new Controller($this->request, $this->response);
+		$this->controller = new Controller();
+		$this->controller->initController($this->request, $this->response, $this->logger);
+
 		$this->assertNull($this->controller->cachePage(10));
 	}
 
 	public function testValidate()
 	{
 		// make sure we can instantiate one
-		$this->controller = new Controller($this->request, $this->response);
+		$this->controller = new Controller();
+		$this->controller->initController($this->request, $this->response, $this->logger);
+
 		// and that we can attempt validation, with no rules
 		$this->assertFalse($this->controller->validate([]));
 	}
@@ -89,11 +102,12 @@ public function testValidate()
 	//--------------------------------------------------------------------
 	public function testHelpers()
 	{
-		$this->controller = new Class($this->request, $this->response) extends Controller
+		$this->controller = new Class() extends Controller
 		{
-
 			protected $helpers = ['cookie', 'text'];
 		};
+		$this->controller->initController($this->request, $this->response, $this->logger);
+
 		$this->assertInstanceOf(Controller::class, $this->controller);
 	}
 
diff --git a/user_guide_src/source/general/controllers.rst b/user_guide_src/source/general/controllers.rst
index f39dd4ca1fa2..21684d45d5ae 100644
--- a/user_guide_src/source/general/controllers.rst
+++ b/user_guide_src/source/general/controllers.rst
@@ -233,34 +233,6 @@ your *application/Config/Routes.php* file.
 
 CodeIgniter also permits you to remap your URIs using its :doc:`URI Routing <routing>` feature.
 
-Class Constructors
-==================
-
-If you intend to use a constructor in any of your Controllers, you
-**MUST** place the following line of code in it::
-
-	parent::__construct(...$params);
-
-The reason this line is necessary is because your local constructor will
-be overriding the one in the parent controller class so we need to
-manually call it.
-
-Example::
-
-	<?php
-	class Blog extends \CodeIgniter\Controller
-	{
-		public function __construct(...$params)
-		{
-			parent::__construct(...$params);
-
-			// Your own constructor code
-		}
-	}
-
-Constructors are useful if you need to set some default values, or run a
-default process when your class is instantiated. Constructors can't
-return a value, but they can do some default work.
 
 Included Properties
 ===================

From 6166af56cda50bf60bd147b716077502b32897ee Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Tue, 10 Jul 2018 22:52:36 -0500
Subject: [PATCH 40/69] Provide a safeguard against sending headers during
 tests. Inneffective at fixing Session tests.

---
 system/CLI/Console.php           |  9 +++++++--
 system/CodeIgniter.php           | 29 +++++++++++++++++++++++++++--
 system/HTTP/Response.php         |  2 +-
 tests/system/CLI/ConsoleTest.php |  2 +-
 tests/system/CodeIgniterTest.php | 18 +++++++++---------
 5 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/system/CLI/Console.php b/system/CLI/Console.php
index 3a73e05dc911..7daccf9b0137 100644
--- a/system/CLI/Console.php
+++ b/system/CLI/Console.php
@@ -63,15 +63,20 @@ public function __construct(CodeIgniter $app)
 
 	/**
 	 * Runs the current command discovered on the CLI.
+	 *
+	 * @param bool $useSafeOutput
+	 *
+	 * @return \CodeIgniter\HTTP\RequestInterface|\CodeIgniter\HTTP\Response|\CodeIgniter\HTTP\ResponseInterface|mixed
+	 * @throws \CodeIgniter\HTTP\RedirectException
 	 */
-	public function run()
+	public function run(bool $useSafeOutput = false)
 	{
 		$path = CLI::getURI() ?: 'list';
 
 		// Set the path for the application to route to.
 		$this->app->setPath("ci{$path}");
 
-		return $this->app->run();
+		return $this->app->useSafeOutput($useSafeOutput)->run();
 	}
 
 	//--------------------------------------------------------------------
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 67247c87a4ac..04315f7c89e6 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -133,6 +133,13 @@ class CodeIgniter
 	 */
 	protected $path;
 
+	/**
+	 * Should the Response instance "pretend"
+	 * to keep from setting headers/cookies/etc
+	 * @var bool
+	 */
+	protected $useSafeOutput = false;
+
 	//--------------------------------------------------------------------
 
 	public function __construct($config)
@@ -204,7 +211,7 @@ public function run(RouteCollectionInterface $routes = null, bool $returnRespons
 				return $response;
 			}
 
-			$this->response->send();
+			$this->response->pretend($this->useSafeOutput)->send();
 			$this->callExit(EXIT_SUCCESS);
 		}
 
@@ -230,6 +237,24 @@ public function run(RouteCollectionInterface $routes = null, bool $returnRespons
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Set our Response instance to "pretend" mode so that things like
+	 * cookies and headers are not actually sent, allowing PHP 7.2+ to
+	 * not complain when ini_set() function is used.
+	 *
+	 * @param bool $safe
+	 *
+	 * @return $this
+	 */
+	public function useSafeOutput(bool $safe = true)
+	{
+		$this->useSafeOutput = $safe;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Handles the main request logic and fires the controller.
 	 *
@@ -924,7 +949,7 @@ public function spoofRequestMethod()
 	 */
 	protected function sendResponse()
 	{
-		$this->response->send();
+		$this->response->pretend($this->useSafeOutput)->send();
 	}
 
 	//--------------------------------------------------------------------
diff --git a/system/HTTP/Response.php b/system/HTTP/Response.php
index 1f4b58330ef6..5b342df1f26a 100644
--- a/system/HTTP/Response.php
+++ b/system/HTTP/Response.php
@@ -659,7 +659,7 @@ public function send()
 	public function sendHeaders()
 	{
 		// Have the headers already been sent?
-		if (headers_sent())
+		if ($this->pretend || headers_sent())
 		{
 			return $this;
 		}
diff --git a/tests/system/CLI/ConsoleTest.php b/tests/system/CLI/ConsoleTest.php
index c06c6c5b0abd..0a1068706b80 100644
--- a/tests/system/CLI/ConsoleTest.php
+++ b/tests/system/CLI/ConsoleTest.php
@@ -54,7 +54,7 @@ public function testHeader()
 	public function testRun()
 	{
 		$console = new \CodeIgniter\CLI\Console($this->app);
-		$console->run();
+		$console->run(true);
 		$result = CITestStreamFilter::$buffer;
 
 		// make sure the result looks like a command list
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index f098425dd3c2..6579f444ca9d 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -42,7 +42,7 @@ public function testRunDefaultRoute()
 		$_SERVER['argc'] = 2;
 
 		ob_start();
-		$this->codeigniter->run();
+		$this->codeigniter->useSafeOutput(true)->run();
 		$output = ob_get_clean();
 
 		$this->assertContains('<h1>Welcome to CodeIgniter</h1>', $output);
@@ -58,7 +58,7 @@ public function testRunEmptyDefaultRoute()
 		$_SERVER['argc'] = 1;
 
 		ob_start();
-		$this->codeigniter->run();
+		$this->codeigniter->useSafeOutput(true)->run();
 		$output = ob_get_clean();
 
 		$this->assertContains('<h1>Welcome to CodeIgniter</h1>', $output);
@@ -84,7 +84,7 @@ public function testRunClosureRoute()
 		Services::injectMock('router', $router);
 
 		ob_start();
-		$this->codeigniter->run();
+		$this->codeigniter->useSafeOutput(true)->run();
 		$output = ob_get_clean();
 
 		$this->assertContains('You want to see "about" page.', $output);
@@ -108,7 +108,7 @@ public function testRun404Override()
 		Services::injectMock('router', $router);
 
 		ob_start();
-		$this->codeigniter->run();
+		$this->codeigniter->useSafeOutput(true)->run();
 		$output = ob_get_clean();
 
 		$this->assertContains('<h1>Welcome to CodeIgniter</h1>', $output);
@@ -134,7 +134,7 @@ public function testRun404OverrideByClosure()
 		Services::injectMock('router', $router);
 
 		ob_start();
-		$this->codeigniter->run($routes);
+		$this->codeigniter->useSafeOutput(true)->run($routes);
 		$output = ob_get_clean();
 
 		$this->assertContains('404 Override by Closure.', $output);
@@ -160,7 +160,7 @@ public function testControllersCanReturnString()
 		Services::injectMock('router', $router);
 
 		ob_start();
-		$this->codeigniter->run();
+		$this->codeigniter->useSafeOutput(true)->run();
 		$output = ob_get_clean();
 
 		$this->assertContains('You want to see "about" page.', $output);
@@ -188,7 +188,7 @@ public function testControllersCanReturnResponseObject()
 		Services::injectMock('router', $router);
 
 		ob_start();
-		$this->codeigniter->run();
+		$this->codeigniter->useSafeOutput(true)->run();
 		$output = ob_get_clean();
 
 		$this->assertContains("You want to see 'about' page.", $output);
@@ -224,7 +224,7 @@ public function testRoutesIsEmpty()
 		Services::injectMock('router', $router);
 
 		ob_start();
-		$this->codeigniter->run();
+		$this->codeigniter->useSafeOutput(true)->run();
 		$output = ob_get_clean();
 
 		$this->assertContains('<h1>Welcome to CodeIgniter</h1>', $output);
@@ -240,7 +240,7 @@ public function testTransfersCorrectHTTPVersion()
 		$_SERVER['SERVER_PROTOCOL'] = 'HTTP/2';
 
 		ob_start();
-		$this->codeigniter->run();
+		$this->codeigniter->useSafeOutput(true)->run();
 		$output = ob_get_clean();
 
 		$response = $this->getPrivateProperty($this->codeigniter, 'response');

From e78170208b2274ed7c9b7fdb30d7701403723521 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Tue, 10 Jul 2018 23:29:36 -0500
Subject: [PATCH 41/69] Removing BOM

---
 .../source/_themes/sphinx_rtd_theme/static/css/badge_only.css   | 2 +-
 .../source/_themes/sphinx_rtd_theme/static/css/theme.css        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/_themes/sphinx_rtd_theme/static/css/badge_only.css b/user_guide_src/source/_themes/sphinx_rtd_theme/static/css/badge_only.css
index 6362912b151c..19fd5e8a3a84 100644
--- a/user_guide_src/source/_themes/sphinx_rtd_theme/static/css/badge_only.css
+++ b/user_guide_src/source/_themes/sphinx_rtd_theme/static/css/badge_only.css
@@ -1,2 +1,2 @@
-.fa:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-weight:normal;font-style:normal;src:url("../font/fontawesome_webfont.eot");src:url("../font/fontawesome_webfont.eot?#iefix") format("embedded-opentype"),url("../font/fontawesome_webfont.woff") format("woff"),url("../font/fontawesome_webfont.ttf") format("truetype"),url("../font/fontawesome_webfont.svg#FontAwesome") format("svg")}.fa:before{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .fa{display:inline-block;text-decoration:inherit}li .fa{display:inline-block}li .fa-large:before,li .fa-large:before{width:1.875em}ul.fas{list-style-type:none;margin-left:2em;text-indent:-0.8em}ul.fas li .fa{width:0.8em}ul.fas li .fa-large:before,ul.fas li .fa-large:before{vertical-align:baseline}.fa-book:before{content:""}.icon-book:before{content:""}.fa-caret-down:before{content:""}.icon-caret-down:before{content:""}.fa-caret-up:before{content:""}.icon-caret-up:before{content:""}.fa-caret-left:before{content:""}.icon-caret-left:before{content:""}.fa-caret-right:before{content:""}.icon-caret-right:before{content:""}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;border-top:solid 10px #343131;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;z-index:400}.rst-versions a{color:#2980B9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27AE60;*zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .fa{color:#fcfcfc}.rst-versions .rst-current-version .fa-book{float:left}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#E74C3C;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#F1C40F;color:#000}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge .fa-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book{float:left}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}}
+.fa:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-weight:normal;font-style:normal;src:url("../font/fontawesome_webfont.eot");src:url("../font/fontawesome_webfont.eot?#iefix") format("embedded-opentype"),url("../font/fontawesome_webfont.woff") format("woff"),url("../font/fontawesome_webfont.ttf") format("truetype"),url("../font/fontawesome_webfont.svg#FontAwesome") format("svg")}.fa:before{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .fa{display:inline-block;text-decoration:inherit}li .fa{display:inline-block}li .fa-large:before,li .fa-large:before{width:1.875em}ul.fas{list-style-type:none;margin-left:2em;text-indent:-0.8em}ul.fas li .fa{width:0.8em}ul.fas li .fa-large:before,ul.fas li .fa-large:before{vertical-align:baseline}.fa-book:before{content:""}.icon-book:before{content:""}.fa-caret-down:before{content:""}.icon-caret-down:before{content:""}.fa-caret-up:before{content:""}.icon-caret-up:before{content:""}.fa-caret-left:before{content:""}.icon-caret-left:before{content:""}.fa-caret-right:before{content:""}.icon-caret-right:before{content:""}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;border-top:solid 10px #343131;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;z-index:400}.rst-versions a{color:#2980B9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27AE60;*zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .fa{color:#fcfcfc}.rst-versions .rst-current-version .fa-book{float:left}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#E74C3C;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#F1C40F;color:#000}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge .fa-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book{float:left}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}}
 /*# sourceMappingURL=badge_only.css.map */
diff --git a/user_guide_src/source/_themes/sphinx_rtd_theme/static/css/theme.css b/user_guide_src/source/_themes/sphinx_rtd_theme/static/css/theme.css
index 877aa0a0c702..2115c8467996 100644
--- a/user_guide_src/source/_themes/sphinx_rtd_theme/static/css/theme.css
+++ b/user_guide_src/source/_themes/sphinx_rtd_theme/static/css/theme.css
@@ -1,4 +1,4 @@
-* {
+* {
     -webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;
     box-sizing: border-box

From 25274e27dbdc3fec89f38bcd2462cdc5eeee954c Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Thu, 12 Jul 2018 22:49:42 -0500
Subject: [PATCH 42/69] Actually check the response from before filters so we
 can redirect silly. Fixes #1098

---
 system/CodeIgniter.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 04315f7c89e6..5b7524635791 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -273,7 +273,11 @@ protected function handleRequest(RouteCollectionInterface $routes = null, $cache
 		$filters = Services::filters();
 		$uri = $this->request instanceof CLIRequest ? $this->request->getPath() : $this->request->uri->getPath();
 
-		$filters->run($uri, 'before');
+		$possibleRedirect = $filters->run($uri, 'before');
+		if($possibleRedirect instanceof RedirectResponse)
+		{
+			return $possibleRedirect;
+		}
 
 		$returned = $this->startController();
 

From a62391a5fc444ab423ebcd302040931a1e81eda2 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Thu, 12 Jul 2018 23:24:19 -0500
Subject: [PATCH 43/69] Don't check base path on cli

---
 system/HTTP/IncomingRequest.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 81fc864fde0a..5623d4ede5b8 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -587,7 +587,10 @@ protected function detectURI($protocol, $baseURL)
 		}
 		else
 		{
-			throw FrameworkException::forEmptyBaseURL();
+			if(! is_cli())
+			{
+				throw FrameworkException::forEmptyBaseURL();
+			}
 		}
 	}
 

From f89c8698a0a0db555023d29738e82aa5a5ca0a76 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Thu, 12 Jul 2018 23:44:24 -0500
Subject: [PATCH 44/69] Fixes ordering of items in CLI. Fixes #1099

---
 system/Commands/ListCommands.php | 85 ++++++++++++++------------------
 1 file changed, 38 insertions(+), 47 deletions(-)

diff --git a/system/Commands/ListCommands.php b/system/Commands/ListCommands.php
index 121c5a26c8f3..d17c349cfe00 100644
--- a/system/Commands/ListCommands.php
+++ b/system/Commands/ListCommands.php
@@ -125,77 +125,68 @@ public function run(array $params)
 	 */
 	protected function describeCommands(array $commands = [])
 	{
-		arsort($commands);
+		ksort($commands);
 
-		$names = array_keys($commands);
-		$descs = array_column($commands, 'description');
-		$groups = array_column($commands, 'group');
-		$lastGroup = '';
+		// Sort into buckets by group
+		$sorted = [];
+		$maxTitleLength = 0;
 
-		// Pad each item to the same length
-		$names = $this->padArray($names, 2, 2);
-		$countNames = count($names);
-		for ($i = 0; $i < $countNames; $i ++ )
+		foreach ($commands as $title => $command)
 		{
-			$lastGroup = $this->describeGroup($groups[$i], $lastGroup);
-
-			$out = CLI::color($names[$i], 'yellow');
-
-			if (isset($descs[$i]))
+			if (! isset($sorted[$command['group']]))
 			{
-				$out .= CLI::wrap($descs[$i], 125, strlen($names[$i]));
+				$sorted[$command['group']] = [];
 			}
 
-			CLI::write($out);
+			$sorted[$command['group']][$title] = $command;
+
+			$maxTitleLength = max($maxTitleLength, strlen($title));
 		}
-	}
 
-	//--------------------------------------------------------------------
+		ksort($sorted);
 
-	/**
-	 * Outputs the description, if necessary.
-	 *
-	 * @param string $new
-	 * @param string $old
-	 *
-	 * @return string
-	 */
-	protected function describeGroup(string $new, string $old)
-	{
-		if ($new == $old)
+		// Display it all...
+		foreach ($sorted as $group => $items)
 		{
-			return $old;
-		}
+			CLI::newLine();
+			CLI::write($group);
 
-		CLI::newLine();
-		CLI::write($new);
+			foreach ($items as $title => $item)
+			{
+				$title = $this->padTitle($title, $maxTitleLength, 2, 2);
+
+				$out = CLI::color($title, 'yellow');
+
+				if (isset($item['description']))
+				{
+					$out .= CLI::wrap($item['description'], 125, strlen($title));
+				}
 
-		return $new;
+				CLI::write($out);
+			}
+		}
 	}
 
 	//--------------------------------------------------------------------
 
 	/**
-	 * Returns a new array where all of the string elements have
-	 * been padding with trailing spaces to be the same length.
+	 * Pads our string out so that all titles are the same length to nicely line up descriptions.
 	 *
-	 * @param array $array
-	 * @param int   $extra // How many extra spaces to add at the end
-	 * @param int   $indent
+	 * @param string $item
+	 * @param        $max
+	 * @param int    $extra // How many extra spaces to add at the end
+	 * @param int    $indent
 	 *
 	 * @return array
 	 */
-	protected function padArray($array, $extra = 2, $indent = 0)
+	protected function padTitle(string $item, $max, $extra = 2, $indent = 0)
 	{
-		$max = max(array_map('strlen', $array)) + $extra + $indent;
+		$max += $extra + $indent;
 
-		foreach ($array as &$item)
-		{
-			$item = str_repeat(' ', $indent) . $item;
-			$item = str_pad($item, $max);
-		}
+		$item = str_repeat(' ', $indent) . $item;
+		$item = str_pad($item, $max);
 
-		return $array;
+		return $item;
 	}
 
 	//--------------------------------------------------------------------

From 4a0958345976e64dfb16d57402666c4787e9c3f1 Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Sat, 14 Jul 2018 01:32:30 -0700
Subject: [PATCH 45/69] Updated HTTP\Files\UploadedFile tests, exceptions &
 docs

---
 .gitignore                                    |   2 +
 system/HTTP/Exceptions/HTTPException.php      |  35 +-
 system/HTTP/Files/FileCollection.php          |   6 +-
 system/HTTP/Files/UploadedFile.php            |  67 +--
 system/Language/en/HTTP.php                   |   5 +
 .../system/HTTP/Files/FileCollectionTest.php  | 499 ++++++++----------
 tests/system/HTTP/Files/FileMovingTest.php    | 272 ++++++++++
 .../source/libraries/uploaded_files.rst       |   8 +-
 8 files changed, 593 insertions(+), 301 deletions(-)
 create mode 100644 tests/system/HTTP/Files/FileMovingTest.php

diff --git a/.gitignore b/.gitignore
index 32c14d01b59b..148c3a3f4c5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,3 +127,5 @@ nb-configuration.xml
 
 /results/
 /phpunit.xml
+/phpunit-db.xml
+/phpunit-nodb.xml
\ No newline at end of file
diff --git a/system/HTTP/Exceptions/HTTPException.php b/system/HTTP/Exceptions/HTTPException.php
index a8f2ae464255..5810950a14c2 100644
--- a/system/HTTP/Exceptions/HTTPException.php
+++ b/system/HTTP/Exceptions/HTTPException.php
@@ -1,10 +1,12 @@
-<?php namespace CodeIgniter\HTTP\Exceptions;
+<?php
+namespace CodeIgniter\HTTP\Exceptions;
 
 use CodeIgniter\Exceptions\ExceptionInterface;
 use CodeIgniter\Exceptions\FrameworkException;
 
 class HTTPException extends FrameworkException implements ExceptionInterface
 {
+
 	/**
 	 * For CurlRequest
 	 *
@@ -177,4 +179,35 @@ public static function forMalformedQueryString()
 	{
 		return new static(lang('HTTP.malformedQueryString'));
 	}
+
+	/**
+	 * For Uploaded file move
+	 *
+	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 */
+	public static function forAlreadyMoved()
+	{
+		return new static(lang('HTTP.alreadyMoved'));
+	}
+
+	/**
+	 * For Uploaded file move
+	 *
+	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 */
+	public static function forInvalidFile()
+	{
+		return new static(lang('HTTP.invalidFile'));
+	}
+
+	/**
+	 * For Uploaded file move
+	 *
+	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 */
+	public static function forMoveFailed(string $source, string $target, string $error)
+	{
+		return new static(lang('HTTP.moveFailed', [$source, $target, $error]));
+	}
+
 }
diff --git a/system/HTTP/Files/FileCollection.php b/system/HTTP/Files/FileCollection.php
index 0f87d79c6843..c6460752dbc8 100644
--- a/system/HTTP/Files/FileCollection.php
+++ b/system/HTTP/Files/FileCollection.php
@@ -1,4 +1,5 @@
-<?php namespace CodeIgniter\HTTP\Files;
+<?php
+namespace CodeIgniter\HTTP\Files;
 
 /**
  * CodeIgniter
@@ -282,8 +283,7 @@ protected function fixFilesArray(array $data): array
 	 */
 	protected function getValueDotNotationSyntax($index, $value)
 	{
-		if (is_array($index) && ! empty($index)
-		)
+		if (is_array($index) && ! empty($index))
 		{
 			$current_index = array_shift($index);
 		}
diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php
index 7fd3e7e9ed22..ef46d3999926 100644
--- a/system/HTTP/Files/UploadedFile.php
+++ b/system/HTTP/Files/UploadedFile.php
@@ -1,5 +1,7 @@
-<?php namespace CodeIgniter\HTTP\Files;
+<?php
+namespace CodeIgniter\HTTP\Files;
 
+use CodeIgniter\HTTP\Exceptions\HTTPException;
 /**
  * CodeIgniter
  *
@@ -106,12 +108,12 @@ class UploadedFile extends File implements UploadedFileInterface
 	 */
 	public function __construct(string $path, string $originalName, string $mimeType = null, int $size = null, int $error = null)
 	{
-		$this->path = $path;
-		$this->name = $originalName;
-		$this->originalName = $originalName;
-		$this->originalMimeType = $mimeType;
-		$this->size = $size;
-		$this->error = $error;
+		$this->path				 = $path;
+		$this->name				 = $originalName;
+		$this->originalName		 = $originalName;
+		$this->originalMimeType	 = $mimeType;
+		$this->size				 = $size;
+		$this->error			 = $error;
 
 		parent::__construct($path, false);
 	}
@@ -157,30 +159,34 @@ public function move(string $targetPath, string $name = null, bool $overwrite =
 
 		if ($this->hasMoved)
 		{
-			throw new FileException('The file has already been moved.');
+			throw HTTPException::forAlreadyMoved();
 		}
 
 		if ( ! $this->isValid())
 		{
-			throw new FileException('The original file is not a valid file.');
+			throw HTTPException::forInvalidFile();
 		}
 
-		$targetPath = rtrim($targetPath, '/') . '/';
-		$name = is_null($name) ? $this->getName() : $name;
+		$targetPath	 = rtrim($targetPath, '/') . '/';
+		$name		 = is_null($name) ? $this->getName() : $name;
 		$destination = $overwrite ? $targetPath . $name : $this->getDestination($targetPath . $name);
 
-		if ( ! @move_uploaded_file($this->path, $destination))
+		try
+		{
+			@move_uploaded_file($this->path, $destination);
+		}
+		catch (\Exception $e)
 		{
 			$error = error_get_last();
-			throw new \RuntimeException(sprintf('Could not move file %s to %s (%s)', basename($this->path), $targetPath, strip_tags($error['message'])));
+			throw HTTPException::forMoveFailed(basename($this->path), $targetPath, strip_tags($error['message']));
 		}
 
 		@chmod($targetPath, 0777 & ~umask());
 
 		// Success, so store our new information
-		$this->path = $targetPath;
-		$this->name = basename($destination);
-		$this->hasMoved = true;
+		$this->path		 = $targetPath;
+		$this->name		 = basename($destination);
+		$this->hasMoved	 = true;
 
 		return true;
 	}
@@ -193,20 +199,20 @@ public function move(string $targetPath, string $name = null, bool $overwrite =
 	 *
 	 * @return string The path set or created.
 	 */
-   	protected function setPath($path)
-   	{
-     		if (!is_dir($path))
-     		{
-         		mkdir($path, 0777, true);
-         		//create the index.html file
-         		if (!file_exists($path.'index.html'))
-         		{
-            			$file = fopen($path.'index.html', 'x+');
-            			fclose($file);
-         		}
-     		}
-     		return $path;
- 	}
+	protected function setPath($path)
+	{
+		if ( ! is_dir($path))
+		{
+			mkdir($path, 0777, true);
+			//create the index.html file
+			if ( ! file_exists($path . 'index.html'))
+			{
+				$file = fopen($path . 'index.html', 'x+');
+				fclose($file);
+			}
+		}
+		return $path;
+	}
 
 	//--------------------------------------------------------------------
 
@@ -260,6 +266,7 @@ public function getError(): int
 	public function getErrorString()
 	{
 		static $errors = [
+			UPLOAD_ERR_OK			 => 'The file uploaded with success.',
 			UPLOAD_ERR_INI_SIZE		 => 'The file "%s" exceeds your upload_max_filesize ini directive.',
 			UPLOAD_ERR_FORM_SIZE	 => 'The file "%s" exceeds the upload limit defined in your form.',
 			UPLOAD_ERR_PARTIAL		 => 'The file "%s" was only partially uploaded.',
diff --git a/system/Language/en/HTTP.php b/system/Language/en/HTTP.php
index 49bf72fb1b1d..7229de3a6c34 100644
--- a/system/Language/en/HTTP.php
+++ b/system/Language/en/HTTP.php
@@ -51,4 +51,9 @@
 
 	// CSRF
 	'disallowedAction'           => 'The action you requested is not allowed.',
+	
+	// Uploaded file moving
+	'alreadyMoved'				 => 'The uploaded file has already been moved.',
+	'invalidFile'				 => 'The original file is not a valid file.',
+	'moveFailed'				 => 'Could not move file {0} to {1} ({2})',
 ];
diff --git a/tests/system/HTTP/Files/FileCollectionTest.php b/tests/system/HTTP/Files/FileCollectionTest.php
index e8960b23e358..cefe6a68f18a 100644
--- a/tests/system/HTTP/Files/FileCollectionTest.php
+++ b/tests/system/HTTP/Files/FileCollectionTest.php
@@ -1,9 +1,12 @@
-<?php namespace CodeIgniter\HTTP\Files;
+<?php
+namespace CodeIgniter\HTTP\Files;
 
 class FileCollectionTest extends \CIUnitTestCase
 {
+
 	public function setUp()
 	{
+		parent::setUp();
 		$_FILES = [];
 	}
 
@@ -11,7 +14,7 @@ public function setUp()
 
 	public function testAllReturnsArrayWithNoFiles()
 	{
-	    $files = new FileCollection();
+		$files = new FileCollection();
 
 		$this->assertEquals([], $files->all());
 	}
@@ -22,16 +25,16 @@ public function testAllReturnsValidSingleFile()
 	{
 		$_FILES = [
 			'userfile' => [
-				'name' => 'someFile.txt',
-				'type' => 'text/plain',
-				'size' => '124',
-				'tmp_name' => '/tmp/myTempFile.txt',
-				'error' => 0
+				'name'		 => 'someFile.txt',
+				'type'		 => 'text/plain',
+				'size'		 => '124',
+				'tmp_name'	 => '/tmp/myTempFile.txt',
+				'error'		 => 0
 			]
 		];
 
 		$collection = new FileCollection();
-		$files      = $collection->all();
+		$files = $collection->all();
 		$this->assertCount(1, $files);
 
 		$file = array_shift($files);
@@ -47,16 +50,16 @@ public function testAllReturnsValidMultipleFilesSameName()
 	{
 		$_FILES = [
 			'userfile' => [
-				'name' => ['fileA.txt', 'fileB.txt'],
-				'type' => ['text/plain', 'text/csv'],
-				'size' => ['124', '248'],
-				'tmp_name' => ['/tmp/fileA.txt', '/tmp/fileB.txt'],
-				'error' => 0
+				'name'		 => ['fileA.txt', 'fileB.txt'],
+				'type'		 => ['text/plain', 'text/csv'],
+				'size'		 => ['124', '248'],
+				'tmp_name'	 => ['/tmp/fileA.txt', '/tmp/fileB.txt'],
+				'error'		 => 0
 			]
 		];
 
 		$collection = new FileCollection();
-		$files      = $collection->all();
+		$files = $collection->all();
 		$this->assertCount(1, $files);
 		$this->assertEquals('userfile', key($files));
 
@@ -79,24 +82,24 @@ public function testAllReturnsValidMultipleFilesSameName()
 	public function testAllReturnsValidMultipleFilesDifferentName()
 	{
 		$_FILES = [
-			'userfile1' => [
-				'name' => 'fileA.txt',
-				'type' => 'text/plain',
-				'size' => 124,
-				'tmp_name' => '/tmp/fileA.txt',
-				'error' => 0
+			'userfile1'	 => [
+				'name'		 => 'fileA.txt',
+				'type'		 => 'text/plain',
+				'size'		 => 124,
+				'tmp_name'	 => '/tmp/fileA.txt',
+				'error'		 => 0
 			],
-			'userfile2' => [
-				'name' => 'fileB.txt',
-				'type' => 'text/csv',
-				'size' => 248,
-				'tmp_name' => '/tmp/fileB.txt',
-				'error' => 0
+			'userfile2'	 => [
+				'name'		 => 'fileB.txt',
+				'type'		 => 'text/csv',
+				'size'		 => 248,
+				'tmp_name'	 => '/tmp/fileB.txt',
+				'error'		 => 0
 			],
 		];
 
 		$collection = new FileCollection();
-		$files      = $collection->all();
+		$files = $collection->all();
 		$this->assertCount(2, $files);
 		$this->assertEquals('userfile1', key($files));
 
@@ -104,6 +107,7 @@ public function testAllReturnsValidMultipleFilesDifferentName()
 		$this->assertInstanceOf(UploadedFile::class, $file);
 
 		$this->assertEquals('fileA.txt', $file->getName());
+		$this->assertEquals('fileA.txt', $file->getClientName());
 		$this->assertEquals('/tmp/fileA.txt', $file->getTempName());
 		$this->assertEquals('txt', $file->getClientExtension());
 		$this->assertEquals('text/plain', $file->getClientMimeType());
@@ -113,6 +117,7 @@ public function testAllReturnsValidMultipleFilesDifferentName()
 		$this->assertInstanceOf(UploadedFile::class, $file);
 
 		$this->assertEquals('fileB.txt', $file->getName());
+		$this->assertEquals('fileB.txt', $file->getClientName());
 		$this->assertEquals('/tmp/fileB.txt', $file->getTempName());
 		$this->assertEquals('txt', $file->getClientExtension());
 		$this->assertEquals('text/csv', $file->getClientMimeType());
@@ -128,32 +133,32 @@ public function testAllReturnsValidSingleFileNestedName()
 	{
 		$_FILES = [
 			'userfile' => [
-				'name' => [
+				'name'		 => [
 					'foo' => [
 						'bar' => 'fileA.txt'
 					]
 				],
-				'type' => [
+				'type'		 => [
 					'foo' => [
 						'bar' => 'text/plain'
 					]
 				],
-				'size' => [
+				'size'		 => [
 					'foo' => [
 						'bar' => 124
 					]
 				],
-				'tmp_name' => [
+				'tmp_name'	 => [
 					'foo' => [
 						'bar' => '/tmp/fileA.txt'
 					]
 				],
-				'error' => 0
+				'error'		 => 0
 			]
 		];
 
 		$collection = new FileCollection();
-		$files      = $collection->all();
+		$files = $collection->all();
 		$this->assertCount(1, $files);
 		$this->assertEquals('userfile', key($files));
 
@@ -175,11 +180,11 @@ public function testHasFileWithSingleFile()
 	{
 		$_FILES = [
 			'userfile' => [
-				'name' => 'someFile.txt',
-				'type' => 'text/plain',
-				'size' => '124',
-				'tmp_name' => '/tmp/myTempFile.txt',
-				'error' => 0
+				'name'		 => 'someFile.txt',
+				'type'		 => 'text/plain',
+				'size'		 => '124',
+				'tmp_name'	 => '/tmp/myTempFile.txt',
+				'error'		 => 0
 			]
 		];
 
@@ -194,19 +199,19 @@ public function testHasFileWithSingleFile()
 	public function testHasFileWithMultipleFilesWithDifferentNames()
 	{
 		$_FILES = [
-			'userfile1' => [
-				'name' => 'fileA.txt',
-				'type' => 'text/plain',
-				'size' => 124,
-				'tmp_name' => '/tmp/fileA.txt',
-				'error' => 0
+			'userfile1'	 => [
+				'name'		 => 'fileA.txt',
+				'type'		 => 'text/plain',
+				'size'		 => 124,
+				'tmp_name'	 => '/tmp/fileA.txt',
+				'error'		 => 0
 			],
-			'userfile2' => [
-				'name' => 'fileB.txt',
-				'type' => 'text/csv',
-				'size' => 248,
-				'tmp_name' => '/tmp/fileB.txt',
-				'error' => 0
+			'userfile2'	 => [
+				'name'		 => 'fileB.txt',
+				'type'		 => 'text/csv',
+				'size'		 => 248,
+				'tmp_name'	 => '/tmp/fileB.txt',
+				'error'		 => 0
 			],
 		];
 
@@ -225,27 +230,27 @@ public function testHasFileWithSingleFileNestedName()
 	{
 		$_FILES = [
 			'userfile' => [
-				'name' => [
+				'name'		 => [
 					'foo' => [
 						'bar' => 'fileA.txt'
 					]
 				],
-				'type' => [
+				'type'		 => [
 					'foo' => [
 						'bar' => 'text/plain'
 					]
 				],
-				'size' => [
+				'size'		 => [
 					'foo' => [
 						'bar' => 124
 					]
 				],
-				'tmp_name' => [
+				'tmp_name'	 => [
 					'foo' => [
 						'bar' => '/tmp/fileA.txt'
 					]
 				],
-				'error' => 0
+				'error'		 => 0
 			]
 		];
 
@@ -262,11 +267,11 @@ public function testErrorString()
 	{
 		$_FILES = [
 			'userfile' => [
-				'name' => 'someFile.txt',
-				'type' => 'text/plain',
-				'size' => '124',
-				'tmp_name' => '/tmp/myTempFile.txt',
-				'error' => UPLOAD_ERR_INI_SIZE
+				'name'		 => 'someFile.txt',
+				'type'		 => 'text/plain',
+				'size'		 => '124',
+				'tmp_name'	 => '/tmp/myTempFile.txt',
+				'error'		 => UPLOAD_ERR_INI_SIZE
 			]
 		];
 
@@ -278,55 +283,152 @@ public function testErrorString()
 		$this->assertEquals($expected, $file->getErrorString());
 	}
 
-    //--------------------------------------------------------------------
-
-        public function testFileReturnsValidSingleFile() {
-            $_FILES = [
-                        'userfile' => [
-                                'name' => 'someFile.txt',
-                                'type' => 'text/plain',
-                                'size' => '124',
-                                'tmp_name' => '/tmp/myTempFile.txt',
-                                'error' => 0
-                        ]
-                ];
-
-                $collection = new FileCollection();
-                $file = $collection->getFile('userfile');
-                $this->assertInstanceOf(UploadedFile::class, $file);
-
-                $this->assertEquals('someFile.txt', $file->getName());
-                $this->assertEquals(124, $file->getSize());
-        }
-
-    //--------------------------------------------------------------------
-
-        public function testFileNoExistSingleFile() {
-            $_FILES = [
-                        'userfile' => [
-                                'name' => 'someFile.txt',
-                                'type' => 'text/plain',
-                                'size' => '124',
-                                'tmp_name' => '/tmp/myTempFile.txt',
-                                'error' => 0
-                        ]
-                ];
-
-                $collection = new FileCollection();
-                $file = $collection->getFile('fileuser');
-                $this->AssertNull($file);
-        }
-
-    //--------------------------------------------------------------------
-
-        public function testFileReturnValidMultipleFiles() {
-            $_FILES = [
+	public function testErrorStringWithUnknownError()
+	{
+		$_FILES = [
+			'userfile' => [
+				'name'		 => 'someFile.txt',
+				'type'		 => 'text/plain',
+				'size'		 => '124',
+				'tmp_name'	 => '/tmp/myTempFile.txt',
+				'error'		 => 123
+			]
+		];
+
+		$expected = 'The file "someFile.txt" was not uploaded due to an unknown error.';
+
+		$collection = new FileCollection();
+		$file = $collection->getFile('userfile');
+
+		$this->assertEquals($expected, $file->getErrorString());
+	}
+
+	public function testErrorStringWithNoError()
+	{
+		$_FILES = [
 			'userfile' => [
-				'name' => ['fileA.txt', 'fileB.txt'],
-				'type' => ['text/plain', 'text/csv'],
-				'size' => ['124', '248'],
-				'tmp_name' => ['/tmp/fileA.txt', '/tmp/fileB.txt'],
-				'error' => 0
+				'name'		 => 'someFile.txt',
+				'type'		 => 'text/plain',
+				'size'		 => '124',
+				'tmp_name'	 => '/tmp/myTempFile.txt',
+			]
+		];
+
+		$expected = 'The file uploaded with success.';
+
+		$collection = new FileCollection();
+		$file = $collection->getFile('userfile');
+
+		$this->assertEquals($expected, $file->getErrorString());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testError()
+	{
+		$_FILES = [
+			'userfile' => [
+				'name'		 => 'someFile.txt',
+				'type'		 => 'text/plain',
+				'size'		 => '124',
+				'tmp_name'	 => '/tmp/myTempFile.txt',
+				'error'		 => UPLOAD_ERR_INI_SIZE
+			]
+		];
+
+		$collection = new FileCollection();
+		$file = $collection->getFile('userfile');
+
+		$this->assertEquals(UPLOAD_ERR_INI_SIZE, $file->getError());
+	}
+
+	public function testErrorWithUnknownError()
+	{
+		$_FILES = [
+			'userfile' => [
+				'name'		 => 'someFile.txt',
+				'type'		 => 'text/plain',
+				'size'		 => '124',
+				'tmp_name'	 => '/tmp/myTempFile.txt',
+			]
+		];
+
+		$collection = new FileCollection();
+		$file = $collection->getFile('userfile');
+
+		$this->assertEquals(0, $file->getError());
+	}
+
+	public function testErrorWithNoError()
+	{
+		$_FILES = [
+			'userfile' => [
+				'name'		 => 'someFile.txt',
+				'type'		 => 'text/plain',
+				'size'		 => '124',
+				'tmp_name'	 => '/tmp/myTempFile.txt',
+				'error'		 => 0
+			]
+		];
+
+		$collection = new FileCollection();
+		$file = $collection->getFile('userfile');
+
+		$this->assertEquals(UPLOAD_ERR_OK, $file->getError());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testFileReturnsValidSingleFile()
+	{
+		$_FILES = [
+			'userfile' => [
+				'name'		 => 'someFile.txt',
+				'type'		 => 'text/plain',
+				'size'		 => '124',
+				'tmp_name'	 => '/tmp/myTempFile.txt',
+				'error'		 => 0
+			]
+		];
+
+		$collection = new FileCollection();
+		$file = $collection->getFile('userfile');
+		$this->assertInstanceOf(UploadedFile::class, $file);
+
+		$this->assertEquals('someFile.txt', $file->getName());
+		$this->assertEquals(124, $file->getSize());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testFileNoExistSingleFile()
+	{
+		$_FILES = [
+			'userfile' => [
+				'name'		 => 'someFile.txt',
+				'type'		 => 'text/plain',
+				'size'		 => '124',
+				'tmp_name'	 => '/tmp/myTempFile.txt',
+				'error'		 => 0
+			]
+		];
+
+		$collection = new FileCollection();
+		$file = $collection->getFile('fileuser');
+		$this->AssertNull($file);
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testFileReturnValidMultipleFiles()
+	{
+		$_FILES = [
+			'userfile' => [
+				'name'		 => ['fileA.txt', 'fileB.txt'],
+				'type'		 => ['text/plain', 'text/csv'],
+				'size'		 => ['124', '248'],
+				'tmp_name'	 => ['/tmp/fileA.txt', '/tmp/fileB.txt'],
+				'error'		 => 0
 			]
 		];
 
@@ -347,195 +449,60 @@ public function testFileReturnValidMultipleFiles() {
 		$this->assertEquals('txt', $file_2->getClientExtension());
 		$this->assertEquals('text/csv', $file_2->getClientMimeType());
 		$this->assertEquals(248, $file_2->getSize());
-    }
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function testFileWithMultipleFilesNestedName() {
-        $_FILES = [
+	public function testFileWithMultipleFilesNestedName()
+	{
+		$_FILES = [
 			'my-form' => [
-				'name' => [
+				'name'		 => [
 					'details' => [
-						'avatars' => ['fileA.txt','fileB.txt']
+						'avatars' => ['fileA.txt', 'fileB.txt']
 					]
 				],
-				'type' => [
+				'type'		 => [
 					'details' => [
-						'avatars' => ['text/plain','text/plain']
+						'avatars' => ['text/plain', 'text/plain']
 					]
 				],
-				'size' => [
+				'size'		 => [
 					'details' => [
-						'avatars' => [125,243]
+						'avatars' => [125, 243]
 					]
 				],
-				'tmp_name' => [
+				'tmp_name'	 => [
 					'details' => [
-						'avatars' => ['/tmp/fileA.txt','/tmp/fileB.txt']
+						'avatars' => ['/tmp/fileA.txt', '/tmp/fileB.txt']
 					]
 				],
-				'error' => [
+				'error'		 => [
 					'details' => [
-						'avatars' => [0,0]
+						'avatars' => [0, 0]
 					]
 				],
 			]
 		];
 
-        $collection = new FileCollection();
+		$collection = new FileCollection();
 
-        $file_1 = $collection->getFile('my-form.details.avatars.0');
-        $this->assertInstanceOf(UploadedFile::class, $file_1);
-        $this->assertEquals('fileA.txt', $file_1->getName());
+		$file_1 = $collection->getFile('my-form.details.avatars.0');
+		$this->assertInstanceOf(UploadedFile::class, $file_1);
+		$this->assertEquals('fileA.txt', $file_1->getName());
 		$this->assertEquals('/tmp/fileA.txt', $file_1->getTempName());
 		$this->assertEquals('txt', $file_1->getClientExtension());
 		$this->assertEquals('text/plain', $file_1->getClientMimeType());
 		$this->assertEquals(125, $file_1->getSize());
 
-        $file_2 = $collection->getFile('my-form.details.avatars.1');
-        $this->assertInstanceOf(UploadedFile::class, $file_2);
-        $this->assertEquals('fileB.txt', $file_2->getName());
+		$file_2 = $collection->getFile('my-form.details.avatars.1');
+		$this->assertInstanceOf(UploadedFile::class, $file_2);
+		$this->assertEquals('fileB.txt', $file_2->getName());
 		$this->assertEquals('/tmp/fileB.txt', $file_2->getTempName());
 		$this->assertEquals('txt', $file_2->getClientExtension());
 		$this->assertEquals('text/plain', $file_2->getClientMimeType());
 		$this->assertEquals(243, $file_2->getSize());
-    }
-
-    /**
-     * @group move-file
-     */
-    public function testMoveWhereOverwriteIsFalseWithMultipleFilesWithSameName()
-    {
-        $finalFilename = 'fileA';
-
-        $_FILES = [
-            'userfile1' => [
-                'name' => $finalFilename . '.txt',
-                'type' => 'text/plain',
-                'size' => 124,
-                'tmp_name' => '/tmp/fileA.txt',
-                'error' => 0
-            ],
-            'userfile2' => [
-                'name' => 'fileA.txt',
-                'type' => 'text/csv',
-                'size' => 248,
-                'tmp_name' => '/tmp/fileB.txt',
-                'error' => 0
-            ],
-        ];
-
-        $collection = new FileCollection();
-
-        $this->assertTrue($collection->hasFile('userfile1'));
-        $this->assertTrue($collection->hasFile('userfile2'));
-
-        $destination = '/tmp/destination/';
-
-        // Create the destination if not exists
-        is_dir($destination) || mkdir($destination, 0777, true);
-
-        foreach ($collection->all() as $file) {
-            $this->assertInstanceOf(UploadedFile::class, $file);
-            $file->move($destination, $file->getName(), false);
-        }
-
-        $this->assertFileExists($destination . $finalFilename . '.txt');
-        $this->assertFileExists($destination . $finalFilename . '_1.txt');
-
-        // Delete the recently created files for the destination above
-        foreach(glob($destination . "*") as $f) {
-            unlink($f);
-        }
-        // Delete the recently created destination dir
-        rmdir($destination);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * @group move-file
-     */
-    public function testMoveWhereOverwriteIsTrueWithMultipleFilesWithSameName()
-    {
-        $finalFilename = 'file_with_delimiters_underscore';
-
-        $_FILES = [
-            'userfile1' => [
-                'name' => $finalFilename . '.txt',
-                'type' => 'text/plain',
-                'size' => 124,
-                'tmp_name' => '/tmp/fileA.txt',
-                'error' => 0
-            ],
-            'userfile2' => [
-                'name' => $finalFilename . '.txt',
-                'type' => 'text/csv',
-                'size' => 248,
-                'tmp_name' => '/tmp/fileB.txt',
-                'error' => 0
-            ],
-            'userfile3' => [
-                'name' => $finalFilename . '.txt',
-                'type' => 'text/csv',
-                'size' => 248,
-                'tmp_name' => '/tmp/fileC.txt',
-                'error' => 0
-            ],
-        ];
-
-        $collection = new FileCollection();
-
-        $this->assertTrue($collection->hasFile('userfile1'));
-        $this->assertTrue($collection->hasFile('userfile2'));
-        $this->assertTrue($collection->hasFile('userfile3'));
-
-        $destination = '/tmp/destination/';
-
-        // Create the destination if not exists
-        is_dir($destination) || mkdir($destination, 0777, true);
-
-        foreach ($collection->all() as $file) {
-            $this->assertInstanceOf(UploadedFile::class, $file);
-            $file->move($destination, $file->getName(), true);
-        }
-
-        $this->assertFileExists($destination . $finalFilename . '.txt');
-        $this->assertFileNotExists($destination . $finalFilename . '_1.txt');
-        $this->assertFileNotExists($destination . $finalFilename . '_2.txt');
-
-        // Delete the recently created files for the destination above
-        foreach(glob($destination . "*") as $f) {
-            unlink($f);
-        }
-        // Delete the recently created destination dir
-        rmdir($destination);
-    }
+	}
 
 	//--------------------------------------------------------------------
 }
-
-/*
- * Overwrite the function so that it will only check whether the file exists or not.
- * Original function also checks if the file was uploaded with a POST request.
- *
- * This overwrite is for testing the move operation.
- */
-function is_uploaded_file($filename)
-{
-    if (! file_exists($filename))
-    {
-        file_put_contents($filename, 'data');
-    }
-    return file_exists($filename);
-}
-
-/*
- * Overwrite the function so that it just copy without checking the file is an uploaded file.
- *
- * This overwrite is for testing the move operation.
- */
-function move_uploaded_file($filename, $destination)
-{
-    return copy($filename, $destination);
-}
diff --git a/tests/system/HTTP/Files/FileMovingTest.php b/tests/system/HTTP/Files/FileMovingTest.php
new file mode 100644
index 000000000000..be9cb89dcfa9
--- /dev/null
+++ b/tests/system/HTTP/Files/FileMovingTest.php
@@ -0,0 +1,272 @@
+<?php
+namespace CodeIgniter\HTTP\Files;
+
+use org\bovigo\vfs\vfsStream;
+use org\bovigo\vfs\vfsStreamDirectory;
+use CodeIgniter\HTTP\Exceptions\HTTPException;
+
+class FileMovingTest extends \CIUnitTestCase
+{
+
+	public function setUp()
+	{
+		parent::setUp();
+
+		$this->root	 = vfsStream::setup();
+		$this->path	 = '_support/Files/';
+		vfsStream::copyFromFileSystem(TESTPATH . $this->path, $this->root);
+		$this->start = $this->root->url() . '/';
+
+		$_FILES = [];
+	}
+
+	public function tearDown()
+	{
+		parent::tearDown();
+
+		$this->root = null;
+		if (is_dir('/tmp/destination'))
+			rmdir('/tmp/destination');
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testMove()
+	{
+		$finalFilename = 'fileA';
+
+		$_FILES = [
+			'userfile1'	 => [
+				'name'		 => $finalFilename . '.txt',
+				'type'		 => 'text/plain',
+				'size'		 => 124,
+				'tmp_name'	 => '/tmp/fileA.txt',
+				'error'		 => 0
+			],
+			'userfile2'	 => [
+				'name'		 => 'fileA.txt',
+				'type'		 => 'text/csv',
+				'size'		 => 248,
+				'tmp_name'	 => '/tmp/fileB.txt',
+				'error'		 => 0
+			],
+		];
+
+		$collection = new FileCollection();
+
+		$this->assertTrue($collection->hasFile('userfile1'));
+		$this->assertTrue($collection->hasFile('userfile2'));
+
+		$destination = $this->root->url() . '/destination';
+
+		// Create the destination if not exists
+		is_dir($destination) || mkdir($destination, 0777, true);
+
+		foreach ($collection->all() as $file)
+		{
+			$this->assertInstanceOf(UploadedFile::class, $file);
+			$file->move($destination, $file->getName(), false);
+		}
+
+		$this->assertTrue($this->root->hasChild('destination/' . $finalFilename . '.txt'));
+		$this->assertTrue($this->root->hasChild('destination/' . $finalFilename . '_1.txt'));
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testMoveOverwriting()
+	{
+		$finalFilename = 'file_with_delimiters_underscore';
+
+		$_FILES = [
+			'userfile1'	 => [
+				'name'		 => $finalFilename . '.txt',
+				'type'		 => 'text/plain',
+				'size'		 => 124,
+				'tmp_name'	 => '/tmp/fileA.txt',
+				'error'		 => 0
+			],
+			'userfile2'	 => [
+				'name'		 => $finalFilename . '.txt',
+				'type'		 => 'text/csv',
+				'size'		 => 248,
+				'tmp_name'	 => '/tmp/fileB.txt',
+				'error'		 => 0
+			],
+			'userfile3'	 => [
+				'name'		 => $finalFilename . '.txt',
+				'type'		 => 'text/csv',
+				'size'		 => 248,
+				'tmp_name'	 => '/tmp/fileC.txt',
+				'error'		 => 0
+			],
+		];
+
+		$collection = new FileCollection();
+
+		$this->assertTrue($collection->hasFile('userfile1'));
+		$this->assertTrue($collection->hasFile('userfile2'));
+		$this->assertTrue($collection->hasFile('userfile3'));
+
+		$destination = $this->root->url() . '/destination';
+
+		// Create the destination if not exists
+		is_dir($destination) || mkdir($destination, 0777, true);
+
+		foreach ($collection->all() as $file)
+		{
+			$this->assertInstanceOf(UploadedFile::class, $file);
+			$file->move($destination, $file->getName(), true);
+		}
+
+		$this->assertTrue($this->root->hasChild('destination/' . $finalFilename . '.txt'));
+		$this->assertFalse($this->root->hasChild('destination/' . $finalFilename . '_1.txt'));
+		$this->assertFalse($this->root->hasChild('destination/' . $finalFilename . '_2.txt'));
+		$this->assertFileExists($destination . '/' . $finalFilename . '.txt');
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testMoved()
+	{
+		$finalFilename = 'fileA';
+
+		$_FILES = [
+			'userfile1' => [
+				'name'		 => $finalFilename . '.txt',
+				'type'		 => 'text/plain',
+				'size'		 => 124,
+				'tmp_name'	 => '/tmp/fileA.txt',
+				'error'		 => 0
+			],
+		];
+
+		$collection = new FileCollection();
+
+		$this->assertTrue($collection->hasFile('userfile1'));
+
+		$destination = $this->root->url() . '/destination';
+
+		// Create the destination if not exists
+		is_dir($destination) || mkdir($destination, 0777, true);
+
+		$file = $collection->getFile('userfile1');
+
+		$this->assertInstanceOf(UploadedFile::class, $file);
+		$this->assertFalse($file->hasMoved());
+		$file->move($destination, $file->getName(), false);
+		$this->assertTrue($file->hasMoved());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testAlreadyMoved()
+	{
+		$finalFilename = 'fileA';
+
+		$_FILES = [
+			'userfile1' => [
+				'name'		 => $finalFilename . '.txt',
+				'type'		 => 'text/plain',
+				'size'		 => 124,
+				'tmp_name'	 => '/tmp/fileA.txt',
+				'error'		 => 0
+			],
+		];
+
+		$collection = new FileCollection();
+
+		$this->assertTrue($collection->hasFile('userfile1'));
+
+		$destination = $this->root->url() . '/destination';
+
+		// Create the destination if not exists
+		is_dir($destination) || mkdir($destination, 0777, true);
+
+		$this->expectException(HTTPException::class);
+
+		foreach ($collection->all() as $file)
+		{
+			$file->move($destination, $file->getName(), false);
+			$file->move($destination, $file->getName(), false);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testInvalidFile()
+	{
+		$_FILES = [
+			'userfile' => [
+				'name'		 => 'someFile.txt',
+				'type'		 => 'text/plain',
+				'size'		 => '124',
+				'tmp_name'	 => '/tmp/myTempFile.txt',
+				'error'		 => UPLOAD_ERR_INI_SIZE
+			]
+		];
+
+		$destination = $this->root->url() . '/destination';
+		// don't create the folder, so setPath() is invoked.
+
+		$collection	 = new FileCollection();
+		$file		 = $collection->getFile('userfile');
+
+		$this->expectException(HTTPException::class);
+		$file->move($destination, $file->getName(), false);
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testFailedMove()
+	{
+		$_FILES = [
+			'userfile' => [
+				'name'		 => 'someFile.txt',
+				'type'		 => 'text/plain',
+				'size'		 => '124',
+				'tmp_name'	 => '/tmp/myTempFile.txt',
+				'error'		 => 0,
+			]
+		];
+
+		$destination = '/tmp/destination';
+		// Create the destination and make it read only
+		is_dir($destination) || mkdir($destination, 0400, true);
+
+		$collection	 = new FileCollection();
+		$file		 = $collection->getFile('userfile');
+
+		$this->expectException(HTTPException::class);
+		$file->move($destination, $file->getName(), false);
+	}
+
+	//--------------------------------------------------------------------
+}
+
+/*
+ * Overwrite the function so that it will only check whether the file exists or not.
+ * Original function also checks if the file was uploaded with a POST request.
+ *
+ * This overwrite is for testing the move operation.
+ */
+
+function is_uploaded_file($filename)
+{
+	if ( ! file_exists($filename))
+	{
+		file_put_contents($filename, 'data');
+	}
+	return file_exists($filename);
+}
+
+/*
+ * Overwrite the function so that it just copy without checking the file is an uploaded file.
+ *
+ * This overwrite is for testing the move operation.
+ */
+
+function move_uploaded_file($filename, $destination)
+{
+		return copy($filename, $destination);
+}
diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index 34c0532b1121..bc8057862683 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -6,7 +6,7 @@ CodeIgniter makes working with files uploaded through a form much simpler and mo
 array directly. This extends the :doc:`File class </libraries/files>` and thus gains all of the features of that class.
 
 .. note:: This is not the same as the File Uploading class in previous versions of CodeIgniter. This provides a raw
-	interface to the uploaded files with a few small features. An uploader class will be present in the final release.
+	interface to the uploaded files with a few small features. 
 
 .. contents:: Page Contents
   :local:
@@ -228,3 +228,9 @@ the ``hasMoved()`` method, which returns a boolean::
     {
         $file->move($path);
     }
+
+Moving an uploaded file can fail, with an HTTPException, under several circumstances:
+
+- the file has already been moved
+- the file did not upload successfully
+- the file move operation fails (eg. improper permissions)

From ce6e4ed41074c96f6f4b3100d5148a8e17deba39 Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Sun, 15 Jul 2018 01:24:53 -0700
Subject: [PATCH 46/69] Small enhancement to testing for FileCollection

---
 .../system/HTTP/Files/FileCollectionTest.php  | 88 ++++++++++++++-----
 1 file changed, 64 insertions(+), 24 deletions(-)

diff --git a/tests/system/HTTP/Files/FileCollectionTest.php b/tests/system/HTTP/Files/FileCollectionTest.php
index cefe6a68f18a..26ab526316ea 100644
--- a/tests/system/HTTP/Files/FileCollectionTest.php
+++ b/tests/system/HTTP/Files/FileCollectionTest.php
@@ -33,8 +33,8 @@ public function testAllReturnsValidSingleFile()
 			]
 		];
 
-		$collection = new FileCollection();
-		$files = $collection->all();
+		$collection	 = new FileCollection();
+		$files		 = $collection->all();
 		$this->assertCount(1, $files);
 
 		$file = array_shift($files);
@@ -58,8 +58,8 @@ public function testAllReturnsValidMultipleFilesSameName()
 			]
 		];
 
-		$collection = new FileCollection();
-		$files = $collection->all();
+		$collection	 = new FileCollection();
+		$files		 = $collection->all();
 		$this->assertCount(1, $files);
 		$this->assertEquals('userfile', key($files));
 
@@ -98,8 +98,8 @@ public function testAllReturnsValidMultipleFilesDifferentName()
 			],
 		];
 
-		$collection = new FileCollection();
-		$files = $collection->all();
+		$collection	 = new FileCollection();
+		$files		 = $collection->all();
 		$this->assertCount(2, $files);
 		$this->assertEquals('userfile1', key($files));
 
@@ -157,8 +157,8 @@ public function testAllReturnsValidSingleFileNestedName()
 			]
 		];
 
-		$collection = new FileCollection();
-		$files = $collection->all();
+		$collection	 = new FileCollection();
+		$files		 = $collection->all();
 		$this->assertCount(1, $files);
 		$this->assertEquals('userfile', key($files));
 
@@ -277,8 +277,8 @@ public function testErrorString()
 
 		$expected = 'The file "someFile.txt" exceeds your upload_max_filesize ini directive.';
 
-		$collection = new FileCollection();
-		$file = $collection->getFile('userfile');
+		$collection	 = new FileCollection();
+		$file		 = $collection->getFile('userfile');
 
 		$this->assertEquals($expected, $file->getErrorString());
 	}
@@ -297,8 +297,8 @@ public function testErrorStringWithUnknownError()
 
 		$expected = 'The file "someFile.txt" was not uploaded due to an unknown error.';
 
-		$collection = new FileCollection();
-		$file = $collection->getFile('userfile');
+		$collection	 = new FileCollection();
+		$file		 = $collection->getFile('userfile');
 
 		$this->assertEquals($expected, $file->getErrorString());
 	}
@@ -316,8 +316,8 @@ public function testErrorStringWithNoError()
 
 		$expected = 'The file uploaded with success.';
 
-		$collection = new FileCollection();
-		$file = $collection->getFile('userfile');
+		$collection	 = new FileCollection();
+		$file		 = $collection->getFile('userfile');
 
 		$this->assertEquals($expected, $file->getErrorString());
 	}
@@ -336,8 +336,8 @@ public function testError()
 			]
 		];
 
-		$collection = new FileCollection();
-		$file = $collection->getFile('userfile');
+		$collection	 = new FileCollection();
+		$file		 = $collection->getFile('userfile');
 
 		$this->assertEquals(UPLOAD_ERR_INI_SIZE, $file->getError());
 	}
@@ -353,8 +353,8 @@ public function testErrorWithUnknownError()
 			]
 		];
 
-		$collection = new FileCollection();
-		$file = $collection->getFile('userfile');
+		$collection	 = new FileCollection();
+		$file		 = $collection->getFile('userfile');
 
 		$this->assertEquals(0, $file->getError());
 	}
@@ -371,8 +371,8 @@ public function testErrorWithNoError()
 			]
 		];
 
-		$collection = new FileCollection();
-		$file = $collection->getFile('userfile');
+		$collection	 = new FileCollection();
+		$file		 = $collection->getFile('userfile');
 
 		$this->assertEquals(UPLOAD_ERR_OK, $file->getError());
 	}
@@ -391,8 +391,8 @@ public function testFileReturnsValidSingleFile()
 			]
 		];
 
-		$collection = new FileCollection();
-		$file = $collection->getFile('userfile');
+		$collection	 = new FileCollection();
+		$file		 = $collection->getFile('userfile');
 		$this->assertInstanceOf(UploadedFile::class, $file);
 
 		$this->assertEquals('someFile.txt', $file->getName());
@@ -413,8 +413,8 @@ public function testFileNoExistSingleFile()
 			]
 		];
 
-		$collection = new FileCollection();
-		$file = $collection->getFile('fileuser');
+		$collection	 = new FileCollection();
+		$file		 = $collection->getFile('fileuser');
 		$this->AssertNull($file);
 	}
 
@@ -505,4 +505,44 @@ public function testFileWithMultipleFilesNestedName()
 	}
 
 	//--------------------------------------------------------------------
+	
+	public function testDoesntHaveFile()
+	{
+		$_FILES = [
+			'my-form' => [
+				'name'		 => [
+					'details' => [
+						'avatars' => ['fileA.txt', 'fileB.txt']
+					]
+				],
+				'type'		 => [
+					'details' => [
+						'avatars' => ['text/plain', 'text/plain']
+					]
+				],
+				'size'		 => [
+					'details' => [
+						'avatars' => [125, 243]
+					]
+				],
+				'tmp_name'	 => [
+					'details' => [
+						'avatars' => ['/tmp/fileA.txt', '/tmp/fileB.txt']
+					]
+				],
+				'error'		 => [
+					'details' => [
+						'avatars' => [0, 0]
+					]
+				],
+			]
+		];
+
+		$collection = new FileCollection();
+
+		$this->assertFalse($collection->hasFile('my-form.detailz.avatars.0'));
+		$this->assertNull($collection->getFile('my-form.detailz.avatars.0'));
+	}
+
+	//--------------------------------------------------------------------
 }

From 5c581850e330e0ba4b60bd065cc66b26653c3d8b Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 16 Jul 2018 05:49:39 +0700
Subject: [PATCH 47/69] implements @todo Optimize Escaper insteance creation to
 only load a single instance during page request

---
 system/Common.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/system/Common.php b/system/Common.php
index 17f63349be79..19db00d7df6c 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -270,8 +270,11 @@ function esc($data, $context = 'html', $encoding = null)
 				$method = 'escape' . ucfirst($context);
 			}
 
-			// @todo Optimize this to only load a single instance during page request.
-			$escaper = new \Zend\Escaper\Escaper($encoding);
+                       static $escaper;
+                       if (! $escaper)
+                       {
+			        $escaper = new \Zend\Escaper\Escaper($encoding);
+                       }
 
 			$data = $escaper->$method($data);
 		}

From 1075094af1ef9006642f4139a8bf7a7f7905c727 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Sun, 15 Jul 2018 22:35:22 -0500
Subject: [PATCH 48/69] Update insert and update in model to work with set()
 and more like the builder version. #967

---
 system/Database/BaseBuilder.php          | 22 +++++++
 system/Model.php                         | 74 +++++++++++++++++++++---
 tests/system/Database/Live/ModelTest.php | 71 +++++++++++++++++++++++
 3 files changed, 158 insertions(+), 9 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 9de59e8fd0c9..c2c5201e4f99 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1305,6 +1305,28 @@ public function set($key, $value = '', $escape = null)
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Returns the previously set() data, alternatively resetting it
+	 * if needed.
+	 *
+	 * @param bool $clean
+	 *
+	 * @return array
+	 */
+	public function getSetData(bool $clean = false)
+	{
+		$data = $this->QBSet;
+
+		if ($clean)
+		{
+			$this->QBSet = [];
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Get SELECT query string
 	 *
diff --git a/system/Model.php b/system/Model.php
index 3047742b9fd7..c782d788fe93 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -250,6 +250,15 @@ class Model
 	protected $beforeDelete = [];
 	protected $afterDelete = [];
 
+	/**
+	 * Holds information passed in via 'set'
+	 * so that we can capture it (not the builder)
+	 * and ensure it gets validated first.
+	 *
+	 * @var array
+	 */
+	protected $tempData = [];
+
 	//--------------------------------------------------------------------
 
 	/**
@@ -436,6 +445,31 @@ public function first()
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Captures the builder's set() method so that we can validate the
+	 * data here. This allows it to be used with any of the other
+	 * builder methods and still get validated data, like replace.
+	 *
+	 * @param           $key
+	 * @param string    $value
+	 * @param bool|null $escape
+	 *
+	 * @return $this
+	 */
+	public function set($key, $value = '', bool $escape = null)
+	{
+		$data = is_array($key)
+			? $key
+			: [$key => $value];
+
+		$this->tempData['escape'] = $escape;
+		$this->tempData['data'] = array_merge($this->tempData['data'] ?? [], $data);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * A convenience method that will attempt to determine whether the
 	 * data should be inserted or updated. Will work with either
@@ -449,8 +483,6 @@ public function first()
 	 */
 	public function save($data)
 	{
-		$saveData = $data;
-
 		// If $data is using a custom class with public or protected
 		// properties representing the table elements, we need to grab
 		// them as an array.
@@ -538,8 +570,17 @@ public static function classToArray($data, string $dateFormat = 'datetime'): arr
 	 *
 	 * @return int|string|bool
 	 */
-	public function insert($data, bool $returnID = true)
+	public function insert($data = null, bool $returnID = true)
 	{
+		$escape = null;
+
+		if (empty($data))
+		{
+			$data   = $this->tempData['data'] ?? null;
+			$escape = $this->tempData['escape'] ?? null;
+			$this->tempData = [];
+		}
+
 		// If $data is using a custom class with public or protected
 		// properties representing the table elements, we need to grab
 		// them as an array.
@@ -590,7 +631,7 @@ public function insert($data, bool $returnID = true)
 
 		// Must use the set() method to ensure objects get converted to arrays
 		$result = $this->builder()
-				->set($data['data'])
+				->set($data['data'], '', $escape)
 				->insert();
 
 		$this->trigger('afterInsert', ['data' => $originalData, 'result' => $result]);
@@ -616,8 +657,17 @@ public function insert($data, bool $returnID = true)
 	 *
 	 * @return bool
 	 */
-	public function update($id, $data)
+	public function update($id = null, $data = null)
 	{
+		$escape = null;
+
+		if (empty($data))
+		{
+			$data   = $this->tempData['data'] ?? null;
+			$escape = $this->tempData['escape'] ?? null;
+			$this->tempData = [];
+		}
+
 		// If $data is using a custom class with public or protected
 		// properties representing the table elements, we need to grab
 		// them as an array.
@@ -664,10 +714,16 @@ public function update($id, $data)
 			throw DataException::forEmptyDataset('update');
 		}
 
+		$builder = $this->builder();
+
+		if ($id)
+		{
+			$builder = $builder->where($this->primaryKey, $id);
+		}
+
 		// Must use the set() method to ensure objects get converted to arrays
-		$result = $this->builder()
-				->where($this->primaryKey, $id)
-				->set($data['data'])
+		$result = $builder
+				->set($data['data'], '', $escape)
 				->update();
 
 		$this->trigger('afterUpdate', ['id' => $id, 'data' => $originalData, 'result' => $result]);
@@ -1129,7 +1185,7 @@ public function skipValidation(bool $skip = true)
 	 */
 	public function validate($data): bool
 	{
-		if ($this->skipValidation === true || empty($this->validationRules))
+		if ($this->skipValidation === true || empty($this->validationRules) || empty($data))
 		{
 			return true;
 		}
diff --git a/tests/system/Database/Live/ModelTest.php b/tests/system/Database/Live/ModelTest.php
index 63b2879a31f1..60f2ed2cc75a 100644
--- a/tests/system/Database/Live/ModelTest.php
+++ b/tests/system/Database/Live/ModelTest.php
@@ -565,4 +565,75 @@ public function testDeleteEvent()
 
 		$this->assertTrue($model->hasToken('afterDelete'));
 	}
+
+	public function testSetWorksWithInsert()
+	{
+		$model = new EventModel();
+
+		$this->dontSeeInDatabase('user', [
+			'email' => 'foo@example.com'
+		]);
+
+		$model->set([
+			'email' => 'foo@example.com',
+			'name' => 'Foo Bar',
+			'country' => 'US'
+		])->insert();
+
+		$this->seeInDatabase('user', [
+			'email' => 'foo@example.com'
+		]);
+	}
+
+	public function testSetWorksWithUpdate()
+	{
+		$model = new EventModel();
+
+		$this->dontSeeInDatabase('user', [
+			'email' => 'foo@example.com'
+		]);
+
+		$userId = $model->insert([
+			'email' => 'foo@example.com',
+			'name' => 'Foo Bar',
+			'country' => 'US'
+		]);
+
+		$model->set([
+			'name' => 'Fred Flintstone'
+		])->update($userId);
+
+		$this->seeInDatabase('user', [
+			'id' => $userId,
+			'email' => 'foo@example.com',
+			'name' => 'Fred Flintstone'
+		]);
+	}
+
+	public function testSetWorksWithUpdateNoId()
+	{
+		$model = new EventModel();
+
+		$this->dontSeeInDatabase('user', [
+			'email' => 'foo@example.com'
+		]);
+
+		$userId = $model->insert([
+			'email' => 'foo@example.com',
+			'name' => 'Foo Bar',
+			'country' => 'US'
+		]);
+
+		$model
+			->where('id', $userId)
+			->set([
+			'name' => 'Fred Flintstone'
+		])->update();
+
+		$this->seeInDatabase('user', [
+			'id' => $userId,
+			'email' => 'foo@example.com',
+			'name' => 'Fred Flintstone'
+		]);
+	}
 }

From 88fea3d88aaa3be8c397905e1cdc672fe31c1663 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Sun, 15 Jul 2018 22:45:19 -0500
Subject: [PATCH 49/69] Remove findWhere and deleteWhere methods from Model.
 #865

---
 application/Controllers/Checks.php       | 457 -----------------------
 system/Model.php                         |  80 ----
 tests/system/Database/Live/ModelTest.php |  68 ----
 user_guide_src/source/database/model.rst |  44 +--
 4 files changed, 3 insertions(+), 646 deletions(-)
 delete mode 100644 application/Controllers/Checks.php

diff --git a/application/Controllers/Checks.php b/application/Controllers/Checks.php
deleted file mode 100644
index 5fbd34cfb412..000000000000
--- a/application/Controllers/Checks.php
+++ /dev/null
@@ -1,457 +0,0 @@
-<?php namespace App\Controllers;
-
-use CodeIgniter\API\ResponseTrait;
-use CodeIgniter\Config\Services;
-use CodeIgniter\Controller;
-use CodeIgniter\I18n\Time;
-use CodeIgniter\Model;
-use Config\Database;
-
-/**
- * NOTE: This is not a valid file for actual tests.
- * This file came about as a small testbed I was using that
- * accidentally got committed. It will be removed prior to release
- * If you commit any changes to this file, it should be accompanied
- * by actual tests also.
- *
- * @package App\Controllers
- */
-class Checks extends Controller
-{
-	use ResponseTrait;
-
-	public function index()
-	{
-		session()->start();
-	}
-        
-        public function forge()
-        {
-            echo '<h1>MySQL</h1>';
-            
-            log_message('debug', 'MYSQL TEST');
-            
-            $forge_mysql = \Config\Database::forge();
-            
-            $forge_mysql->getConnection()->query('SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;');
-            
-            $forge_mysql->dropTable('users', true);
-            
-            $forge_mysql->getConnection()->query('SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;');
-            
-            $forge_mysql->addField([
-                'id' => [
-                    'type' => 'INTEGER',
-                    'constraint' => 11
-                ],
-                'name' => [
-                    'type' => 'VARCHAR',
-                    'constraint' => 50,
-                ]
-            ]);
-            $forge_mysql->addKey('id', true);
-            $attributes = array('ENGINE' => 'InnoDB');
-            $forge_mysql->createTable('users', true, $attributes);
-            
-            $data_insert = array(
-                'id' => 1,
-                'name' => 'User 1',
-            );
-            $forge_mysql->getConnection()->table('users')->insert($data_insert);
-
-            $drop = $forge_mysql->dropTable('invoices', true);
-            
-            $forge_mysql->addField([
-                'id' => [
-                    'type' => 'INTEGER',
-                    'constraint' => 11,
-                ],
-                'users_id' => [
-                    'type' => 'INTEGER',
-                    'constraint' => 11
-                ],
-                'other_id' => [
-                    'type' => 'INTEGER',
-                    'constraint' => 11
-                ]
-            ]);
-            $forge_mysql->addKey('id', true);
-
-            $forge_mysql->addForeignKey('users_id','users','id','CASCADE','CASCADE');
-            $forge_mysql->addForeignKey('other_id','users','id','CASCADE','CASCADE');
-
-            $attributes = array('ENGINE' => 'InnoDB');
-            $res = $forge_mysql->createTable('invoices', true,$attributes);
-
-            if(!$res){
-                var_dump($forge_mysql->getConnection()->mysqli);
-            }else{
-                echo '<br><br>OK';
-                
-                var_dump($forge_mysql->getConnection()->getForeignKeyData('invoices'));
-            }
-            
-            $res = $forge_mysql->dropForeignKey('invoices','invoices_other_id_foreign');
-            
-            
-            echo '<h1>PostgreSQL</h1>';
-            
-            $forge_pgsql = \Config\Database::forge('pgsql');
-
-            $forge_pgsql->dropTable('users',true, true);
-            
-            $forge_pgsql->addField([
-                'id' => [
-                    'type' => 'INTEGER',
-                    'constraint' => 11,
-                    'auto_increment' => true,
-                ],
-                'name' => [
-                    'type' => 'VARCHAR',
-                    'constraint' => 50,
-                ]
-            ]);
-            $forge_pgsql->addKey('id', true);
-            $forge_pgsql->createTable('users', true);
-            
-            
-            $data_insert = array(
-                'id' => 1,
-                'name' => 'User 1',
-            );
-            $forge_pgsql->getConnection()->table('users')->insert($data_insert);
-            
-            $forge_pgsql->dropTable('invoices',true);
-            $forge_pgsql->addField([
-                'id' => [
-                    'type' => 'INTEGER',
-                    'constraint' => 11,
-                    'auto_increment' => true,
-                ],
-                'users_id' => [
-                    'type' => 'INTEGER',
-                    'constraint' => 11
-                ],
-                'other_id' => [
-                    'type' => 'INTEGER',
-                    'constraint' => 11
-                ],
-                'another_id' => [
-                    'type' => 'INTEGER',
-                    'constraint' => 11
-                ]
-            ]);
-            $forge_pgsql->addKey('id', true);
-
-            $forge_pgsql->addForeignKey('users_id','users','id','CASCADE','CASCADE'); 
-            $forge_pgsql->addForeignKey('other_id','users','id');
-
-            $res = $forge_pgsql->createTable('invoices', true);
-
-            if(!$res){
-                var_dump($forge_pgsql->getConnection()->mysqli);
-            }else{
-                echo '<br><br>OK';
-                var_dump($forge_pgsql->getConnection()->getForeignKeyData('invoices'));
-            }
-            
-            //$res = $forge_pgsql->dropForeignKey('invoices','invoices_other_id_foreign');
-            
-        }
-
-
-	public function escape()
-	{
-		$db = Database::connect();
-		$db->initialize();
-
-		$jobs = $db->table('job')
-						 ->whereNotIn('name', ['Politician', 'Accountant'])
-						 ->get()
-						 ->getResult();
-
-		die(var_dump($jobs));
-	}
-
-	public function password()
-	{
-		$db = Database::connect();
-		$db->initialize();
-
-		$result = $db->table('misc')
-					->insert([
-						'key' => 'password',
-						'value' => '$2y$10$ErQlCj/Mo10il.FthAm0WOjYdf3chZEGPFqaPzjqOX2aj2uYf5Ihq'
-					]);
-
-		die(var_dump($result));
-	}
-
-
-	public function forms()
-	{
-		helper('form');
-
-		var_dump(form_open());
-	}
-
-	public function api()
-	{
-		$data = [
-			"total_users" => 3,
-			"users" => [
-				[
-					"id" => 1,
-					"name" => "Nitya",
-					"address" => [
-						"country" => "India",
-						"city" => "Kolkata",
-						"zip" => 700102,
-					]
-				],
-				[
-					"id" => 2,
-					"name" => "John",
-					"address" => [
-						"country" => "USA",
-						"city" => "Newyork",
-						"zip" => "NY1234",
-					]
-				],
-				[
-					"id" => 3,
-					"name" => "Viktor",
-					"address" => [
-						"country" => "Australia",
-						"city" => "Sydney",
-						"zip" => 123456,
-					]
-				],
-			]
-		];
-
-		return $this->respond($data);
-	}
-
-	public function db()
-	{
-		$db = Database::connect();
-		$db->initialize();
-
-		$query = $db->prepare(function($db){
-			return $db->table('user')->insert([
-				'name' => 'a',
-				'email' => 'b@example.com',
-				'country' => 'x'
-			]);
-		});
-
-		$query->execute('foo', 'foo@example.com', 'US');
-	}
-
-	public function db2()
-	{
-		$db = Database::connect();
-		$db->initialize();
-
-		$db->table('user')->insert([
-				'name' => 'a',
-				'email' => 'b@example.com',
-				'country' => 'x'
-			]);
-	}
-
-	public function format()
-	{
-		echo '<pre>';
-		var_dump($this->response->getHeaderLine('content-type'));
-	}
-
-	public function model()
-	{
-	    $model = new class() extends Model {
-	        protected $table = 'job';
-        };
-
-	    $results = $model->findAll();
-
-	    $developer = $model->findWhere('name', 'Developer');
-
-	    $politician = $model->find(3);
-
-	    dd($politician);
-
-	}
-
-    public function curl()
-    {
-        $client = Services::curlrequest([
-            'debug' => true,
-            'follow_redirects' => true,
-            'json' => ['foo' => 'bar']
-        ]);
-
-        echo '<pre>';
-        $response = $client->request('PUT', 'http://ci4.dev/checks/catch');
-        echo $response->getBody();
-    }
-
-    // Simply echos back what's given in the body.
-    public function catch()
-    {
-        $body = print_r($this->request->getRawInput(), true);
-        echo $body;
-    }
-
-	public function redirect()
-	{
-		return redirect('/checks/model');
-    }
-
-	public function image()
-	{
-		$info = Services::image('imagick')
-			->withFile("/Users/kilishan/Documents/BobHeader.jpg")
-			->getFile()
-			->getProperties(true);
-
-		dd(ENVIRONMENT);
-
-		$images = Services::image('imagick')
-			->getVersion();
-//			->withFile("/Users/kilishan/Documents/BobHeader.jpg")
-//			->resize(500, 100, true)
-//			->crop(200, 75, 20, 0, false)
-//			->rotate(90)
-//			->save('/Users/kilishan/temp.jpg');
-
-//		$images = Services::image('imagick')
-//			->withFile("/Users/kilishan/Documents/BobHeader.jpg")
-//			->fit(500, 100, 'bottom-left')
-//			->text('Bob is Back!', [
-//				'fontPath'  => '/Users/kilishan/Downloads/Calibri.ttf',
-//				'fontSize' => 40,
-//				'padding' => 0,
-//				'opacity'   => 0.5,
-//				'vAlign'    => 'top',
-//				'hAlign'    => 'right',
-//				'withShadow' => true,
-//			])
-//			->save('/Users/kilishan/temp.jpg', 100);
-
-
-		ddd($images);
-	}
-
-	public function time()
-	{
-		$time = new Time();
-
-		echo($time);
-		echo '<br/>';
-		echo Time::now();
-		echo '<br/>';
-		echo Time::parse('First Monday of December');
-		echo '<br/>';
-
-		$time = new Time('Next Monday');
-		die($time);
-	}
-
-	public function csp()
-	{
-//		$this->response->CSP->reportOnly(true);
-		$this->response->CSP->setDefaultSrc(base_url());
-		$this->response->CSP->addStyleSrc('unsafe-inline');
-		$this->response->CSP->addStyleSrc('https://maxcdn.bootstrapcdn.com');
-
-		echo <<<EOF
-<!doctype html>
-<html>
-<head>
-	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-</head>
-<body>
-<style {csp-style-nonce}>
-	body { background: #efefef; }
-</style>
-
-</body>
-</html>
-EOF;
-
-	}
-
-	public function upload()
-	{
-		if  ($this->request->getMethod() == 'post')
-		{
-			$this->validate([
-				'avatar' => 'uploaded[avatar]|ext_in[avatar,png,jpg,jpeg,gif]'
-			]);
-
-			/**
-			 * @var \CodeIgniter\HTTP\Files\UploadedFile
-			 */
-			$file = $this->request->getFile('avatar');
-
-			echo "Name: {$file->getName()}<br/>";
-			echo "Temp Name: {$file->getTempName()}<br/>";
-			echo "Original Name: {$file->getClientName()}<br/>";
-			echo "Random Name: {$file->getRandomName()}<br/>";
-			echo "Extension: {$file->getExtension()}<br/>";
-			echo "Client Extension: {$file->getClientExtension()}<br/>";
-			echo "Guessed Extension: {$file->guessExtension()}<br/>";
-			echo "MimeType: {$file->getMimeType()}<br/>";
-			echo "IsValid: {$file->isValid()}<br/>";
-			echo "Size (b): {$file->getSize()}<br/>";
-			echo "Size (kb): {$file->getSize('kb')}<br/>";
-			echo "Size (mb): {$file->getSize('mb')}<br/>";
-			echo "Size (mb): {$file->getSize('mb')}<br/>";
-			echo "Path: {$file->getPath()}<br/>";
-			echo "RealPath: {$file->getRealPath()}<br/>";
-			echo "Filename: {$file->getFilename()}<br/>";
-			echo "Basename: {$file->getBasename()}<br/>";
-			echo "Pathname: {$file->getPathname()}<br/>";
-			echo "Permissions: {$file->getPerms()}<br/>";
-			echo "Inode: {$file->getInode()}<br/>";
-			echo "Owner: {$file->getOwner()}<br/>";
-			echo "Group: {$file->getGroup()}<br/>";
-			echo "ATime: {$file->getATime()}<br/>";
-			echo "MTime: {$file->getMTime()}<br/>";
-			echo "CTime: {$file->getCTime()}<br/>";
-
-			dd($file);
-		}
-
-		echo <<<EOF
-<!doctype html>
-<html>
-<body>
-
-<form action="" method="post" enctype="multipart/form-data">
-
-	<input type="file" name="avatar">
-
-	<input type="submit" value="Upload">
-
-</form>
-
-</body>
-</html>
-
-EOF;
-;
-	}
-
-	public function parser()
-	{
-		$this->parser = Services::parser();
-	}
-
-	public function error()
-	{
-		throw new \RuntimeException('Oops!', 403);
-	}
-
-}
diff --git a/system/Model.php b/system/Model.php
index c782d788fe93..5adbc3b7812c 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -344,38 +344,6 @@ public function find($id)
 
 	//--------------------------------------------------------------------
 
-	/**
-	 * Extract a subset of data
-	 *
-	 * @param string|array $key
-	 * @param string|null  $value
-	 *
-	 * @return array|null The rows of data.
-	 */
-	public function findWhere($key, $value = null)
-	{
-		$builder = $this->builder();
-
-		if ($this->tempUseSoftDeletes === true)
-		{
-			$builder->where($this->deletedField, 0);
-		}
-
-		$rows = $builder->where($key, $value)
-				->get();
-
-		$rows = $rows->getResult($this->tempReturnType);
-
-		$rows = $this->trigger('afterFind', ['data' => $rows]);
-
-		$this->tempReturnType = $this->returnType;
-		$this->tempUseSoftDeletes = $this->useSoftDeletes;
-
-		return $rows['data'];
-	}
-
-	//--------------------------------------------------------------------
-
 	/**
 	 * Works with the current Query Builder instance to return
 	 * all results, while optionally limiting them.
@@ -774,54 +742,6 @@ public function delete($id, $purge = false)
 
 	//--------------------------------------------------------------------
 
-	/**
-	 * Deletes multiple records from $this->table where the specified
-	 * key/value matches.
-	 *
-	 * @param string|array $key
-	 * @param string|null  $value
-	 * @param bool         $purge Allows overriding the soft deletes setting.
-	 *
-	 * @return mixed
-	 * @throws \CodeIgniter\Database\Exceptions\DataException
-	 */
-	public function deleteWhere($key, $value = null, $purge = false)
-	{
-		// Don't let them shoot themselves in the foot...
-		if (empty($key))
-		{
-			throw DataException::forInvalidArgument('key');
-		}
-
-		$this->trigger('beforeDelete', ['key' => $key, 'value' => $value, 'purge' => $purge]);
-
-		if ($this->useSoftDeletes && ! $purge)
-		{
-            $set[$this->deletedField] = 1;
-
-            if ($this->useTimestamps)
-            {
-                $set[$this->updatedField] = $this->setDate();
-            }
-
-			$result = $this->builder()
-					->where($key, $value)
-					->update($set);
-		}
-		else
-		{
-			$result = $this->builder()
-					->where($key, $value)
-					->delete();
-		}
-
-		$this->trigger('afterDelete', ['key' => $key, 'value' => $value, 'purge' => $purge, 'result' => $result, 'data' => null]);
-
-		return $result;
-	}
-
-	//--------------------------------------------------------------------
-
 	/**
 	 * Permanently deletes all rows that have been marked as deleted
 	 * through soft deletes (deleted = 1)
diff --git a/tests/system/Database/Live/ModelTest.php b/tests/system/Database/Live/ModelTest.php
index 60f2ed2cc75a..af3f89d8ea5b 100644
--- a/tests/system/Database/Live/ModelTest.php
+++ b/tests/system/Database/Live/ModelTest.php
@@ -95,48 +95,6 @@ public function testFindRespectsSoftDeletes()
 
 	//--------------------------------------------------------------------
 
-	public function testFindWhereSimple()
-	{
-	    $model = new JobModel($this->db);
-
-		$jobs = $model->asObject()->findWhere('id >', 2);
-
-		$this->assertCount(2, $jobs);
-		$this->assertEquals('Accountant', $jobs[0]->name);
-		$this->assertEquals('Musician',   $jobs[1]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFindWhereWithArrayWhere()
-	{
-		$model = new JobModel($this->db);
-
-		$jobs = $model->asArray()->findWhere(['id' => 1]);
-
-		$this->assertCount(1, $jobs);
-		$this->assertEquals('Developer', $jobs[0]['name']);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFindWhereRespectsSoftDeletes()
-	{
-		$this->db->table('user')->where('id', 4)->update(['deleted' => 1]);
-
-		$model = new UserModel($this->db);
-
-		$user = $model->findWhere('id >', '2');
-
-		$this->assertCount(1, $user);
-
-		$user = $model->withDeleted()->findWhere('id >', 2);
-
-		$this->assertCount(2, $user);
-	}
-
-	//--------------------------------------------------------------------
-
 	public function testFindAllReturnsAllRecords()
 	{
 	    $model = new UserModel($this->db);
@@ -345,32 +303,6 @@ public function testDeleteWithSoftDeletesPurge()
 
 	//--------------------------------------------------------------------
 
-	public function testDeleteWhereWithSoftDeletes()
-	{
-		$model = new UserModel();
-
-		$this->seeInDatabase('user', ['name' =>'Derek Jones', 'deleted' => 0]);
-
-		$model->deleteWhere('name', 'Derek Jones');
-
-		$this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted' => 1]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testDeleteWhereWithSoftDeletesPurge()
-	{
-		$model = new UserModel();
-
-		$this->seeInDatabase('user', ['name' =>'Derek Jones', 'deleted' => 0]);
-
-		$model->deleteWhere('name', 'Derek Jones', true);
-
-		$this->dontSeeInDatabase('user', ['name' => 'Derek Jones']);
-	}
-
-	//--------------------------------------------------------------------
-
 	public function testPurgeDeleted()
 	{
 	    $model = new UserModel();
diff --git a/user_guide_src/source/database/model.rst b/user_guide_src/source/database/model.rst
index 0cb7703a02cd..74ff150dbf4d 100644
--- a/user_guide_src/source/database/model.rst
+++ b/user_guide_src/source/database/model.rst
@@ -196,20 +196,6 @@ of just one::
 
 	$users = $userModel->find([1,2,3]);
 
-**findWhere()**
-
-Allows you to specify one or more criteria that must be matched against the data. Returns
-all rows that match::
-
-	// Use simple where
-	$users = $userModel->findWhere('role_id >', '10');
-
-	// Use array of where values
-	$users = $userModel->findWhere([
-		'status'  => 'active',
-		'deleted' => 0
-	]);
-
 **findAll()**
 
 Returns all results::
@@ -380,23 +366,6 @@ Takes a primary key value as the first parameter and deletes the matching record
 If the model's $useSoftDeletes value is true, this will update the row to set 'deleted = 1'. You can force
 a permanent delete by setting the second parameter as true.
 
-**deleteWhere()**
-
-Deletes multiple records from the model's table based on the criteria pass into the first two parameters.
-::
-
-	// Simple where
-	$userMdoel->deleteWhere('status', 'inactive');
-
-	// Complex where
-	$userModel->deleteWhere([
-		'status'      => 'inactive',
-		'warn_lvl >=' => 50
-	]);
-
-If the model's $useSoftDeletes value is true, this will update the rows to set 'deleted = 1'. You can force
-a permanent delete by setting the third parameter as true.
-
 **purgeDeleted()**
 
 Cleans out the database table by permanently removing all rows that have 'deleted = 1'. ::
@@ -540,17 +509,17 @@ provides methods that allow you to do just that.
 
 Returns data from the next find*() method as associative arrays::
 
-	$users = $userModel->asArray()->findWhere('status', 'active');
+	$users = $userModel->asArray()->where('status', 'active')->findAll();
 
 **asObject()**
 
 Returns data from the next find*() method as standard objects or custom class intances::
 
 	// Return as standard objects
-	$users = $userModel->asObject()->findWhere('status', 'active');
+	$users = $userModel->asObject()->where('status', 'active')->findAll();
 
 	// Return as custom class instances
-	$users = $userModel->asObject('User')->findWhere('status', 'active');
+	$users = $userModel->asObject('User')->where('status', 'active')->findAll();
 
 Processing Large Amounts of Data
 --------------------------------
@@ -631,7 +600,6 @@ afterUpdate       **id** = the primary key of the row being updated.
 afterFind         Varies by find* method. See the following:
 - find()          **id** = the primary key of the row being searched for.
                   **data** = The resulting row of data, or null if no result found.
-- findWhere()     **data** = the resulting rows of data, or null if no result found.
 - findAll()       **data** = the resulting rows of data, or null if no result found.
                   **limit** = the number of rows to find.
                   **offset** = the number of rows to skip during the search.
@@ -639,15 +607,9 @@ afterFind         Varies by find* method. See the following:
 beforeDelete      Varies by delete* method. See the following:
 - delete()        **id** = primary key of row being deleted.
                   **purge** = boolean whether soft-delete rows should be hard deleted.
-- deleteWhere()   **key**/**value** = the key/value pair used to search for rows to delete.
-                  **purge** = boolean whether soft-delete rows should be hard deleted.
 afterDelete       Varies by delete* method. See the following:
 - delete()        **id** = primary key of row being deleted.
                   **purge** = boolean whether soft-delete rows should be hard deleted.
                   **result** = the result of the delete() call on the Query Builder.
                   **data** = unused.
-- deleteWhere()	  **key**/**value** = the key/value pair used to search for rows to delete.
-                  **purge** boolean whether soft-delete rows should be hard deleted.
-                  **result** = the result of the delete() call on the Query Builder.
-                  **data** = unused.
 ================ =========================================================================================================

From 6565f93c50ed494c459748d399652303ce0edc3b Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Sun, 15 Jul 2018 22:57:38 -0500
Subject: [PATCH 50/69] Update delete method to accept 1 id, an array of ids,
 or work like Builder. #865

---
 system/Model.php                         | 27 +++++++++++++--------
 tests/system/Database/Live/ModelTest.php | 30 ++++++++++++++++++++++++
 user_guide_src/source/database/model.rst |  9 +++++++
 3 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/system/Model.php b/system/Model.php
index 5adbc3b7812c..2a5d1ce0f45b 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -620,7 +620,7 @@ public function insert($data = null, bool $returnID = true)
 	 * Updates a single record in $this->table. If an object is provided,
 	 * it will attempt to convert it into an array.
 	 *
-	 * @param int|string   $id
+	 * @param int|array|string   $id
 	 * @param array|object $data
 	 *
 	 * @return bool
@@ -705,14 +705,25 @@ public function update($id = null, $data = null)
 	 * Deletes a single record from $this->table where $id matches
 	 * the table's primaryKey
 	 *
-	 * @param mixed $id    The rows primary key
-	 * @param bool  $purge Allows overriding the soft deletes setting.
+	 * @param int|array|null $id    The rows primary key(s)
+	 * @param bool           $purge Allows overriding the soft deletes setting.
 	 *
 	 * @return mixed
 	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
 	 */
-	public function delete($id, $purge = false)
+	public function delete($id = null, $purge = false)
 	{
+		if (! empty($id) && is_numeric($id))
+		{
+			$id = [$id];
+		}
+
+		$builder = $this->builder();
+		if (! empty($id))
+		{
+			$builder = $builder->whereIn($this->primaryKey, $id);
+		}
+
 		$this->trigger('beforeDelete', ['id' => $id, 'purge' => $purge]);
 
 		if ($this->useSoftDeletes && ! $purge)
@@ -724,15 +735,11 @@ public function delete($id, $purge = false)
                 $set[$this->updatedField] = $this->setDate();
             }
 
-			$result = $this->builder()
-					->where($this->primaryKey, $id)
-					->update($set);
+			$result = $builder->update($set);
 		}
 		else
 		{
-			$result = $this->builder()
-					->where($this->primaryKey, $id)
-					->delete();
+			$result = $builder->delete();
 		}
 
 		$this->trigger('afterDelete', ['id' => $id, 'purge' => $purge, 'result' => $result, 'data' => null]);
diff --git a/tests/system/Database/Live/ModelTest.php b/tests/system/Database/Live/ModelTest.php
index af3f89d8ea5b..3facfdfa8efd 100644
--- a/tests/system/Database/Live/ModelTest.php
+++ b/tests/system/Database/Live/ModelTest.php
@@ -303,6 +303,36 @@ public function testDeleteWithSoftDeletesPurge()
 
 	//--------------------------------------------------------------------
 
+	public function testDeleteMultiple()
+	{
+		$model = new JobModel();
+
+
+		$this->seeInDatabase('job', ['name' =>'Developer']);
+		$this->seeInDatabase('job', ['name' =>'Politician']);
+
+		$model->delete([1, 2]);
+
+		$this->dontSeeInDatabase('job', ['name' => 'Developer']);
+		$this->dontSeeInDatabase('job', ['name' => 'Politician']);
+		$this->seeInDatabase('job', ['name' =>'Accountant']);
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testDeleteNoParams()
+	{
+		$model = new JobModel();
+
+		$this->seeInDatabase('job', ['name' =>'Developer']);
+
+		$model->where('id', 1)->delete();
+
+		$this->dontSeeInDatabase('job', ['name' => 'Developer']);
+	}
+
+	//--------------------------------------------------------------------
+
 	public function testPurgeDeleted()
 	{
 	    $model = new UserModel();
diff --git a/user_guide_src/source/database/model.rst b/user_guide_src/source/database/model.rst
index 74ff150dbf4d..093f2f237869 100644
--- a/user_guide_src/source/database/model.rst
+++ b/user_guide_src/source/database/model.rst
@@ -366,6 +366,15 @@ Takes a primary key value as the first parameter and deletes the matching record
 If the model's $useSoftDeletes value is true, this will update the row to set 'deleted = 1'. You can force
 a permanent delete by setting the second parameter as true.
 
+An array of primary keys can be passed in as the first parameter to delete multiple records at once::
+
+    $userModel->delete([1,2,3]);
+
+If no parameters are passed in, will act like the Query Builder's delete method, requiring a where call
+previously::
+
+    $userModel->where('id', 12)->delete();
+
 **purgeDeleted()**
 
 Cleans out the database table by permanently removing all rows that have 'deleted = 1'. ::

From 333617e3ee88990ff045a8d2aa3962b5deea15f9 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Sun, 15 Jul 2018 23:06:34 -0500
Subject: [PATCH 51/69] find method in model with no parameters now returns all
 rows in table. #865

---
 system/Model.php                         | 14 ++++++++++----
 tests/system/Database/Live/ModelTest.php | 17 +++++++++++++++++
 user_guide_src/source/database/model.rst |  3 +++
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/system/Model.php b/system/Model.php
index 2a5d1ce0f45b..23f9392e00f8 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -307,11 +307,11 @@ public function __construct(ConnectionInterface &$db = null, BaseConfig $config
 	 * Fetches the row of database from $this->table with a primary key
 	 * matching $id.
 	 *
-	 * @param mixed|array $id One primary key or an array of primary keys
+	 * @param mixed|array|null   $id One primary key or an array of primary keys
 	 *
 	 * @return array|object|null    The resulting row of data, or null.
 	 */
-	public function find($id)
+	public function find($id = null)
 	{
 		$builder = $this->builder();
 
@@ -326,13 +326,19 @@ public function find($id)
 					->get();
 			$row = $row->getResult($this->tempReturnType);
 		}
-		else
+		elseif (is_numeric($id))
 		{
 			$row = $builder->where($this->table.'.'.$this->primaryKey, $id)
 					->get();
 
 			$row = $row->getFirstRow($this->tempReturnType);
 		}
+		else
+		{
+			$row = $builder->get();
+
+			$row = $row->getResult($this->tempReturnType);
+		}
 
 		$row = $this->trigger('afterFind', ['id' => $id, 'data' => $row]);
 
@@ -686,7 +692,7 @@ public function update($id = null, $data = null)
 
 		if ($id)
 		{
-			$builder = $builder->where($this->primaryKey, $id);
+			$builder = $builder->where($this->table.'.'.$this->primaryKey, $id);
 		}
 
 		// Must use the set() method to ensure objects get converted to arrays
diff --git a/tests/system/Database/Live/ModelTest.php b/tests/system/Database/Live/ModelTest.php
index 3facfdfa8efd..08fff83c6b61 100644
--- a/tests/system/Database/Live/ModelTest.php
+++ b/tests/system/Database/Live/ModelTest.php
@@ -54,6 +54,23 @@ public function testFindReturnsMultipleRows()
 
 	//--------------------------------------------------------------------
 
+	public function testFindActsAsGetWithNoParams()
+	{
+		$model = new JobModel($this->db);
+
+		$jobs = $model->asArray()->find();
+
+		$this->assertCount(4, $jobs);
+
+		$names = array_column($jobs, 'name');
+		$this->assertTrue(in_array('Developer', $names));
+		$this->assertTrue(in_array('Politician', $names));
+		$this->assertTrue(in_array('Accountant', $names));
+		$this->assertTrue(in_array('Musician', $names));
+	}
+
+	//--------------------------------------------------------------------
+
 	public function testFindRespectsReturnArray()
 	{
 		$model = new JobModel($this->db);
diff --git a/user_guide_src/source/database/model.rst b/user_guide_src/source/database/model.rst
index 093f2f237869..b1988c22bb5a 100644
--- a/user_guide_src/source/database/model.rst
+++ b/user_guide_src/source/database/model.rst
@@ -196,6 +196,9 @@ of just one::
 
 	$users = $userModel->find([1,2,3]);
 
+If no parameters are passed in, will return all rows in that model's table, effectively acting
+like findAll(), though less explicit.
+
 **findAll()**
 
 Returns all results::

From 12a5f0d2c8a6c766f086a1bf84a8583bf2ba34bb Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Sun, 15 Jul 2018 23:17:59 -0500
Subject: [PATCH 52/69] Update method in database accepts multiple primary keys
 now. Fixes #865

---
 system/Model.php                         |  7 ++++++-
 tests/system/Database/Live/ModelTest.php | 18 ++++++++++++++++++
 user_guide_src/source/database/model.rst | 16 ++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/system/Model.php b/system/Model.php
index 23f9392e00f8..aa00e431c7be 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -635,6 +635,11 @@ public function update($id = null, $data = null)
 	{
 		$escape = null;
 
+		if (is_numeric($id))
+		{
+			$id = [$id];
+		}
+
 		if (empty($data))
 		{
 			$data   = $this->tempData['data'] ?? null;
@@ -692,7 +697,7 @@ public function update($id = null, $data = null)
 
 		if ($id)
 		{
-			$builder = $builder->where($this->table.'.'.$this->primaryKey, $id);
+			$builder = $builder->whereIn($this->table.'.'.$this->primaryKey, $id);
 		}
 
 		// Must use the set() method to ensure objects get converted to arrays
diff --git a/tests/system/Database/Live/ModelTest.php b/tests/system/Database/Live/ModelTest.php
index 08fff83c6b61..5e75a8a9f9f8 100644
--- a/tests/system/Database/Live/ModelTest.php
+++ b/tests/system/Database/Live/ModelTest.php
@@ -615,4 +615,22 @@ public function testSetWorksWithUpdateNoId()
 			'name' => 'Fred Flintstone'
 		]);
 	}
+
+	public function testUpdateArray()
+	{
+		$model = new EventModel();
+
+		$data = [
+			'name'  => 	'Foo',
+			'email' => 'foo@example.com',
+			'country' => 'US',
+			'deleted' => 0
+		];
+
+		$id = $model->insert($data);
+		$model->update([1,2], ['name' => 'Foo Bar']);
+
+		$this->seeInDatabase('user', ['id' => 1, 'name' => 'Foo Bar']);
+		$this->seeInDatabase('user', ['id' => 2, 'name' => 'Foo Bar']);
+	}
 }
diff --git a/user_guide_src/source/database/model.rst b/user_guide_src/source/database/model.rst
index b1988c22bb5a..f24e7036f825 100644
--- a/user_guide_src/source/database/model.rst
+++ b/user_guide_src/source/database/model.rst
@@ -273,6 +273,22 @@ of the columns in $table, while the array's values are the values to save for th
 
 	$userModel->update($id, $data);
 
+Multiple records may be updated with a single call by passing an array of primary keys as the first parameter::
+
+    $data = [
+		'active' => 1
+	];
+
+	$userModel->update([1, 2, 3], $data);
+
+When you need a more flexible solution, you can leaven the parameters empty and it functions like the Query Builder's
+update command, with the added benefit of validation, events, etc::
+
+    $userModel
+        ->whereIn('id', [1,2,3])
+        ->set(['active' => 1]
+        ->update();
+
 **save()**
 
 This is a wrapper around the insert() and update() methods that handles inserting or updating the record

From 2a0e2fb1a43d4b91c8a14578cf7dd88c0af91a0c Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Sun, 15 Jul 2018 23:26:12 -0500
Subject: [PATCH 53/69] Added replace to the Model so it can validate data
 prior to replacing. #967

---
 system/Model.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/system/Model.php b/system/Model.php
index aa00e431c7be..fe78f507a192 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -814,6 +814,31 @@ public function onlyDeleted()
 	}
 
 	//--------------------------------------------------------------------
+
+	/**
+	 * Replace
+	 *
+	 * Compiles an replace into string and runs the query
+	 *
+	 * @param null $data
+	 * @param bool $returnSQL
+	 *
+	 * @return bool TRUE on success, FALSE on failure
+	 */
+	public function replace($data = null, $returnSQL = false)
+	{
+		// Validate data before saving.
+		if (! empty($data) && $this->skipValidation === false)
+		{
+			if ($this->validate($data) === false)
+			{
+				return false;
+			}
+		}
+
+		return $this->builder()->replace($data, $returnSQL);
+	}
+
 	//--------------------------------------------------------------------
 	// Utility
 	//--------------------------------------------------------------------

From cc5e82eefa88c1a1fdba43d48e574f5f278471cd Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Mon, 16 Jul 2018 09:25:24 -0700
Subject: [PATCH 54/69] Beef up HTTP\Request testing, correct docs

---
 .gitignore                                  |   2 +-
 application/Config/App.php                  |   2 +-
 tests/system/HTTP/RequestTest.php           | 290 ++++++++++++++------
 user_guide_src/source/libraries/request.rst |  12 +-
 4 files changed, 219 insertions(+), 87 deletions(-)

diff --git a/.gitignore b/.gitignore
index 32c14d01b59b..f30743491a5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -126,4 +126,4 @@ nb-configuration.xml
 .vscode/
 
 /results/
-/phpunit.xml
+/phpunit*.xml
diff --git a/application/Config/App.php b/application/Config/App.php
index 6a426faf4e3d..9dc72bf4d467 100644
--- a/application/Config/App.php
+++ b/application/Config/App.php
@@ -215,7 +215,7 @@ class App extends BaseConfig
 	| Reverse Proxy IPs
 	|--------------------------------------------------------------------------
 	|
-	| If your getServer is behind a reverse proxy, you must whitelist the proxy
+	| If your server is behind a reverse proxy, you must whitelist the proxy
 	| IP addresses from which CodeIgniter should trust headers such as
 	| HTTP_X_FORWARDED_FOR and HTTP_CLIENT_IP in order to properly identify
 	| the visitor's IP address.
diff --git a/tests/system/HTTP/RequestTest.php b/tests/system/HTTP/RequestTest.php
index 8d189dbb2ab7..dce721fb1bcc 100644
--- a/tests/system/HTTP/RequestTest.php
+++ b/tests/system/HTTP/RequestTest.php
@@ -1,4 +1,5 @@
-<?php namespace CodeIgniter\HTTP;
+<?php
+namespace CodeIgniter\HTTP;
 
 use Config\App;
 
@@ -7,6 +8,7 @@
  */
 class RequestTest extends \CIUnitTestCase
 {
+
 	/**
 	 * @var \CodeIgniter\HTTP\Request
 	 */
@@ -16,15 +18,17 @@ public function setUp()
 	{
 		parent::setUp();
 
-		$this->request = new Request(new App());
-		$_POST = [];
-		$_GET = [];
+		$this->request	 = new Request(new App());
+		$_POST			 = [];
+		$_GET			 = [];
 	}
 
+	//--------------------------------------------------------------------
+
 	public function testFetchGlobalsSingleValue()
 	{
-		$_POST['foo'] = 'bar';
-		$_GET['bar']  = 'baz';
+		$_POST['foo']	 = 'bar';
+		$_GET['bar']	 = 'baz';
 
 		$this->assertEquals('bar', $this->request->fetchGlobal('post', 'foo'));
 		$this->assertEquals('baz', $this->request->fetchGlobal('get', 'bar'));
@@ -38,8 +42,8 @@ public function testFetchGlobalsReturnsNullWhenNotFound()
 	public function testFetchGlobalsFiltersValues()
 	{
 		$this->request->setGlobal('post', [
-			'foo' => 'bar<script>',
-			'bar' => 'baz',
+			'foo'	 => 'bar<script>',
+			'bar'	 => 'baz',
 		]);
 
 		$this->assertEquals('bar%3Cscript%3E', $this->request->fetchGlobal('post', 'foo', FILTER_SANITIZE_ENCODED));
@@ -49,21 +53,21 @@ public function testFetchGlobalsFiltersValues()
 	public function testFetchGlobalsWithFilterFlag()
 	{
 		$this->request->setGlobal('post', [
-			'foo' => '`bar<script>',
-			'bar' => 'baz',
+			'foo'	 => '`bar<script>',
+			'bar'	 => 'baz',
 		]);
 
-		$this->assertEquals('bar%3Cscript%3E', $this->request->fetchGlobal('post','foo', FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
+		$this->assertEquals('bar%3Cscript%3E', $this->request->fetchGlobal('post', 'foo', FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
 		$this->assertEquals('baz', $this->request->fetchGlobal('post', 'bar'));
 	}
 
 	public function testFetchGlobalReturnsAllWhenEmpty()
 	{
 		$post = [
-			'foo' => 'bar',
-			'bar' => 'baz',
-			'xxx' => 'yyy',
-			'yyy' => 'zzz'
+			'foo'	 => 'bar',
+			'bar'	 => 'baz',
+			'xxx'	 => 'yyy',
+			'yyy'	 => 'zzz'
 		];
 		$this->request->setGlobal('post', $post);
 
@@ -72,18 +76,18 @@ public function testFetchGlobalReturnsAllWhenEmpty()
 
 	public function testFetchGlobalFiltersAllValues()
 	{
-		$post = [
-			'foo' => 'bar<script>',
-			'bar' => 'baz<script>',
-			'xxx' => 'yyy<script>',
-			'yyy' => 'zzz<script>'
+		$post		 = [
+			'foo'	 => 'bar<script>',
+			'bar'	 => 'baz<script>',
+			'xxx'	 => 'yyy<script>',
+			'yyy'	 => 'zzz<script>'
 		];
 		$this->request->setGlobal('post', $post);
-		$expected = [
-			'foo' => 'bar%3Cscript%3E',
-			'bar' => 'baz%3Cscript%3E',
-			'xxx' => 'yyy%3Cscript%3E',
-			'yyy' => 'zzz%3Cscript%3E'
+		$expected	 = [
+			'foo'	 => 'bar%3Cscript%3E',
+			'bar'	 => 'baz%3Cscript%3E',
+			'xxx'	 => 'yyy%3Cscript%3E',
+			'yyy'	 => 'zzz%3Cscript%3E'
 		];
 
 		$this->assertEquals($expected, $this->request->fetchGlobal('post', null, FILTER_SANITIZE_ENCODED));
@@ -91,35 +95,35 @@ public function testFetchGlobalFiltersAllValues()
 
 	public function testFetchGlobalFilterWithFlagAllValues()
 	{
-		$post = [
-			'foo' => '`bar<script>',
-			'bar' => '`baz<script>',
-			'xxx' => '`yyy<script>',
-			'yyy' => '`zzz<script>'
+		$post		 = [
+			'foo'	 => '`bar<script>',
+			'bar'	 => '`baz<script>',
+			'xxx'	 => '`yyy<script>',
+			'yyy'	 => '`zzz<script>'
 		];
 		$this->request->setGlobal('post', $post);
-		$expected = [
-			'foo' => 'bar%3Cscript%3E',
-			'bar' => 'baz%3Cscript%3E',
-			'xxx' => 'yyy%3Cscript%3E',
-			'yyy' => 'zzz%3Cscript%3E'
+		$expected	 = [
+			'foo'	 => 'bar%3Cscript%3E',
+			'bar'	 => 'baz%3Cscript%3E',
+			'xxx'	 => 'yyy%3Cscript%3E',
+			'yyy'	 => 'zzz%3Cscript%3E'
 		];
 
-		$this->assertEquals($expected, $this->request->fetchGlobal('post',null, FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
+		$this->assertEquals($expected, $this->request->fetchGlobal('post', null, FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
 	}
 
 	public function testFetchGlobalReturnsSelectedKeys()
 	{
-		$post = [
-			'foo' => 'bar',
-			'bar' => 'baz',
-			'xxx' => 'yyy',
-			'yyy' => 'zzz'
+		$post		 = [
+			'foo'	 => 'bar',
+			'bar'	 => 'baz',
+			'xxx'	 => 'yyy',
+			'yyy'	 => 'zzz'
 		];
 		$this->request->setGlobal('post', $post);
-		$expected = [
-			'foo' => 'bar',
-			'bar' => 'baz',
+		$expected	 = [
+			'foo'	 => 'bar',
+			'bar'	 => 'baz',
 		];
 
 		$this->assertEquals($expected, $this->request->fetchGlobal('post', ['foo', 'bar']));
@@ -127,16 +131,16 @@ public function testFetchGlobalReturnsSelectedKeys()
 
 	public function testFetchGlobalFiltersSelectedValues()
 	{
-		$post = [
-			'foo' => 'bar<script>',
-			'bar' => 'baz<script>',
-			'xxx' => 'yyy<script>',
-			'yyy' => 'zzz<script>'
+		$post		 = [
+			'foo'	 => 'bar<script>',
+			'bar'	 => 'baz<script>',
+			'xxx'	 => 'yyy<script>',
+			'yyy'	 => 'zzz<script>'
 		];
 		$this->request->setGlobal('post', $post);
-		$expected = [
-			'foo' => 'bar%3Cscript%3E',
-			'bar' => 'baz%3Cscript%3E',
+		$expected	 = [
+			'foo'	 => 'bar%3Cscript%3E',
+			'bar'	 => 'baz%3Cscript%3E',
 		];
 
 		$this->assertEquals($expected, $this->request->fetchGlobal('post', ['foo', 'bar'], FILTER_SANITIZE_ENCODED));
@@ -144,16 +148,16 @@ public function testFetchGlobalFiltersSelectedValues()
 
 	public function testFetchGlobalFilterWithFlagSelectedValues()
 	{
-		$post = [
-			'foo' => '`bar<script>',
-			'bar' => '`baz<script>',
-			'xxx' => '`yyy<script>',
-			'yyy' => '`zzz<script>'
+		$post		 = [
+			'foo'	 => '`bar<script>',
+			'bar'	 => '`baz<script>',
+			'xxx'	 => '`yyy<script>',
+			'yyy'	 => '`zzz<script>'
 		];
 		$this->request->setGlobal('post', $post);
-		$expected = [
-			'foo' => 'bar%3Cscript%3E',
-			'bar' => 'baz%3Cscript%3E',
+		$expected	 = [
+			'foo'	 => 'bar%3Cscript%3E',
+			'bar'	 => 'baz%3Cscript%3E',
 		];
 
 		$this->assertEquals($expected, $this->request->fetchGlobal('post', ['foo', 'bar'], FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
@@ -164,19 +168,19 @@ public function testFetchGlobalFilterWithFlagSelectedValues()
 	 */
 	public function testFetchGlobalReturnsArrayValues()
 	{
-		$post = [
-			'ANNOUNCEMENTS' => [
-				1 => [
+		$post	 = [
+			'ANNOUNCEMENTS'	 => [
+				1	 => [
 					'DETAIL' => 'asdf'
 				],
-				2 => [
+				2	 => [
 					'DETAIL' => 'sdfg'
 				]
 			],
-			'submit' => 'SAVE'
+			'submit'		 => 'SAVE'
 		];
 		$this->request->setGlobal('post', $post);
-		$result = $this->request->fetchGlobal('post');
+		$result	 = $this->request->fetchGlobal('post');
 
 		$this->assertEquals($post, $result);
 		$this->assertInternalType('array', $result['ANNOUNCEMENTS']);
@@ -194,7 +198,7 @@ public function testFetchGlobalWithArrayTop()
 		];
 		$this->request->setGlobal('post', $post);
 
-		$this->assertEquals(['address' => ['zipcode' => 90210]], $this->request->fetchGlobal('post','clients'));
+		$this->assertEquals(['address' => ['zipcode' => 90210]], $this->request->fetchGlobal('post', 'clients'));
 	}
 
 	public function testFetchGlobalWithArrayChildNumeric()
@@ -215,7 +219,7 @@ public function testFetchGlobalWithArrayChildNumeric()
 		];
 		$this->request->setGlobal('post', $post);
 
-		$this->assertEquals(['zipcode' => 60610], $this->request->fetchGlobal('post','clients[1][address]'));
+		$this->assertEquals(['zipcode' => 60610], $this->request->fetchGlobal('post', 'clients[1][address]'));
 	}
 
 	public function testFetchGlobalWithArrayChildElement()
@@ -229,7 +233,23 @@ public function testFetchGlobalWithArrayChildElement()
 		];
 		$this->request->setGlobal('post', $post);
 
-		$this->assertEquals(['zipcode' => 90210], $this->request->fetchGlobal('post','clients[address]'));
+		$this->assertEquals(['zipcode' => 90210], $this->request->fetchGlobal('post', 'clients[address]'));
+		$this->assertEquals(null, $this->request->fetchGlobal('post', 'clients[zipcode]'));
+	}
+
+	public function testFetchGlobalWithKeylessArrayChildElement()
+	{
+		$post = [
+			'clients' => [
+				'address'	 => [
+					'zipcode' => 90210
+				],
+				'stuff'		 => [['a']]
+			]
+		];
+		$this->request->setGlobal('post', $post);
+
+		$this->assertEquals([['a']], $this->request->fetchGlobal('post', 'clients[stuff]'));
 	}
 
 	public function testFetchGlobalWithArrayLastElement()
@@ -246,33 +266,145 @@ public function testFetchGlobalWithArrayLastElement()
 		$this->assertEquals(90210, $this->request->fetchGlobal('post', 'clients[address][zipcode]'));
 	}
 
+	public function testFetchGlobalWithEmptyNotation()
+	{
+		$expected	 = [
+			[
+				'address' => [
+					'zipcode' => 90210
+				],
+			],
+			[
+				'address' => [
+					'zipcode' => 60610
+				],
+			],
+		];
+		$post		 = [
+			'clients' => $expected
+		];
+		$this->request->setGlobal('post', $post);
+
+//		echo var_dump($this->request->fetchGlobal('post', 'clients[][zipcode]'));
+		$this->assertEquals($expected, $this->request->fetchGlobal('post', 'clients[]'));
+	}
+
+	//--------------------------------------------------------------------
+
 	public function ipAddressChecks()
 	{
 		return [
-			'empty' => [false, ''],
-			'zero'  => [false , 0],
-			'large_ipv4' => [false, '256.256.256.999', 'ipv4'],
-			'good_ipv4'  => [true, '100.100.100.0', 'ipv4'],
-			'good_default'  => [true, '100.100.100.0'],
-			'zeroed_ipv4' => [true, '0.0.0.0'],
-			'large_ipv6' => [false, 'h123:0000:0000:0000:0000:0000:0000:0000', 'ipv6'],
-			'good_ipv6' => [true, '2001:0db8:85a3:0000:0000:8a2e:0370:7334'],
-			'confused_ipv6' => [false, '255.255.255.255', 'ipv6'],
+			'empty'			 => [false, ''],
+			'zero'			 => [false, 0],
+			'large_ipv4'	 => [false, '256.256.256.999', 'ipv4'],
+			'good_ipv4'		 => [true, '100.100.100.0', 'ipv4'],
+			'good_default'	 => [true, '100.100.100.0'],
+			'zeroed_ipv4'	 => [true, '0.0.0.0'],
+			'large_ipv6'	 => [false, 'h123:0000:0000:0000:0000:0000:0000:0000', 'ipv6'],
+			'good_ipv6'		 => [true, '2001:0db8:85a3:0000:0000:8a2e:0370:7334'],
+			'confused_ipv6'	 => [false, '255.255.255.255', 'ipv6'],
 		];
 	}
 
 	/**
 	 * @dataProvider ipAddressChecks
 	 */
-	public function testValidIPAddress($expected, $address, $type=null)
+	public function testValidIPAddress($expected, $address, $type = null)
 	{
 		$this->assertEquals($expected, $this->request->isValidIP($address, $type));
 	}
 
+	//--------------------------------------------------------------------
+
+	public function testGetIPAddressDefault()
+	{
+		$this->assertEquals('0.0.0.0', $this->request->getIPAddress());
+	}
+
+	public function testGetIPAddressNormal()
+	{
+		$expected				 = '123.123.123.123';
+		$_SERVER['REMOTE_ADDR']	 = $expected;
+		$this->request			 = new Request(new App());
+		$this->assertEquals($expected, $this->request->getIPAddress());
+		// call a second time to exercise the initial conditional block in getIPAddress()
+		$this->assertEquals($expected, $this->request->getIPAddress());
+	}
+
+	public function testGetIPAddressThruProxy()
+	{
+		$expected						 = '123.123.123.123';
+		$_SERVER['REMOTE_ADDR']			 = '10.0.1.200';
+		$config							 = new App();
+		$config->proxyIPs				 = '10.0.1.200,192.168.5.0/24';
+		$_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+		$this->request					 = new Request($config);
+
+		// we should see the original forwarded address
+		$this->assertEquals($expected, $this->request->getIPAddress());
+	}
+
+	public function testGetIPAddressThruProxyInvalid()
+	{
+		$expected						 = '123.456.23.123';
+		$_SERVER['REMOTE_ADDR']			 = '10.0.1.200';
+		$config							 = new App();
+		$config->proxyIPs				 = '10.0.1.200,192.168.5.0/24';
+		$_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+		$this->request					 = new Request($config);
+
+		// spoofed address invalid
+		$this->assertEquals('10.0.1.200', $this->request->getIPAddress());
+	}
+
+	public function testGetIPAddressThruProxyNotWhitelisted()
+	{
+		$expected						 = '123.456.23.123';
+		$_SERVER['REMOTE_ADDR']			 = '10.10.1.200';
+		$config							 = new App();
+		$config->proxyIPs				 = '10.0.1.200,192.168.5.0/24';
+		$_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+		$this->request					 = new Request($config);
+
+		// spoofed address invalid
+		$this->assertEquals('10.10.1.200', $this->request->getIPAddress());
+	}
+
+	public function testGetIPAddressThruProxySubnet()
+	{
+		$expected						 = '123.123.123.123';
+		$_SERVER['REMOTE_ADDR']			 = '192.168.5.21';
+		$config							 = new App();
+		$config->proxyIPs				 = ['192.168.5.0/24'];
+		$_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+		$this->request					 = new Request($config);
+
+		// we should see the original forwarded address
+		$this->assertEquals($expected, $this->request->getIPAddress());
+	}
+
+	public function testGetIPAddressThruProxyOutofSubnet()
+	{
+		$expected						 = '123.123.123.123';
+		$_SERVER['REMOTE_ADDR']			 = '192.168.5.21';
+		$config							 = new App();
+		$config->proxyIPs				 = ['192.168.5.0/28'];
+		$_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+		$this->request					 = new Request($config);
+
+		// we should see the original forwarded address
+		$this->assertEquals('192.168.5.21', $this->request->getIPAddress());
+	}
+
+	//FIXME getIPAddress should have more testing, to 100% code coverage
+	
+	//--------------------------------------------------------------------
+
 	public function testMethodReturnsRightStuff()
 	{
 		// Defaults method to GET now.
 		$this->assertEquals('get', $this->request->getMethod());
 		$this->assertEquals('GET', $this->request->getMethod(true));
 	}
+
 }
diff --git a/user_guide_src/source/libraries/request.rst b/user_guide_src/source/libraries/request.rst
index 44db00fe5439..b96dddce38e4 100644
--- a/user_guide_src/source/libraries/request.rst
+++ b/user_guide_src/source/libraries/request.rst
@@ -15,7 +15,7 @@ See the documentation for the :doc:`IncomingRequest Class </libraries/incomingre
 Class Reference
 ===============
 
-.. php:class:: CodeIgniter\\HTTP\\IncomingRequest
+.. php:class:: CodeIgniter\\HTTP\\Request
 
 	.. php:method:: getIPAddress()
 
@@ -28,7 +28,7 @@ Class Reference
 
 			echo $request->getIPAddress();
 
-		.. important:: This method takes into account the ``App->proxy_ips`` setting and will
+		.. important:: This method takes into account the ``App->proxyIPs`` setting and will
 			return the reported HTTP_X_FORWARDED_FOR, HTTP_CLIENT_IP, HTTP_X_CLIENT_IP, or
 			HTTP_X_CLUSTER_CLIENT_IP address for the allowed IP address.
 
@@ -58,7 +58,7 @@ Class Reference
 		Accepts an optional second string parameter of 'ipv4' or 'ipv6' to specify
 		an IP format. The default checks for both formats.
 
-	.. php:method:: method([$upper = FALSE])
+	.. php:method:: getMethod([$upper = FALSE])
 
 		:param	bool	$upper: Whether to return the request method name in upper or lower case
 		:returns:	HTTP request method
@@ -68,9 +68,9 @@ Class Reference
 		in uppercase or lowercase.
 		::
 
-			echo $request->method(TRUE); // Outputs: POST
-			echo $request->method(FALSE); // Outputs: post
-			echo $request->method(); // Outputs: post
+			echo $request->getMethod(TRUE); // Outputs: POST
+			echo $request->getMethod(FALSE); // Outputs: post
+			echo $request->getMethod(); // Outputs: post
 
 	.. php:method:: getServer([$index = null[, $filter = null[, $flags = null]]])
 

From 67aadd9e379d9679a216027c704d4533a9056695 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Mon, 16 Jul 2018 22:46:12 -0500
Subject: [PATCH 55/69] Removing extra return statement from Response setJSON.

---
 system/HTTP/Response.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/system/HTTP/Response.php b/system/HTTP/Response.php
index 5b342df1f26a..19ecf588e7d0 100644
--- a/system/HTTP/Response.php
+++ b/system/HTTP/Response.php
@@ -420,8 +420,6 @@ public function setJSON($body)
 		$this->body = $this->formatBody($body, 'json');
 
 		return $this;
-
-		return $this;
 	}
 
 	//--------------------------------------------------------------------

From f5e15415b8fd5b32715010ab771f1da0d602cf33 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Tue, 17 Jul 2018 23:04:42 -0500
Subject: [PATCH 56/69] InsertBatch and UpdateBatch now included in Model and
 will validate each row prior to saving. Fixes #967

---
 system/Database/BaseBuilder.php          | 22 +++----
 system/HTTP/Exceptions/HTTPException.php |  4 +-
 system/Model.php                         | 60 ++++++++++++++++++
 tests/system/Database/Live/ModelTest.php | 79 ++++++++++++++++++++++++
 4 files changed, 153 insertions(+), 12 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index c2c5201e4f99..4bc38037b677 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1508,13 +1508,13 @@ public function getWhere($where = null, $limit = null, $offset = null)
 	 * @param    array $set    An associative array of insert values
 	 * @param    bool  $escape Whether to escape values and identifiers
 	 *
-	 * @param int      $batch_size
+	 * @param int      $batchSize
 	 * @param bool     $testing
 	 *
 	 * @return int Number of rows inserted or FALSE on failure
 	 * @throws DatabaseException
 	 */
-	public function insertBatch($set = null, $escape = null, $batch_size = 100, $testing = false)
+	public function insertBatch($set = null, $escape = null, $batchSize = 100, $testing = false)
 	{
 		if ($set === null)
 		{
@@ -1547,9 +1547,9 @@ public function insertBatch($set = null, $escape = null, $batch_size = 100, $tes
 
 		// Batch this baby
 		$affected_rows = 0;
-		for ($i = 0, $total = count($this->QBSet); $i < $total; $i += $batch_size)
+		for ($i = 0, $total = count($this->QBSet); $i < $total; $i += $batchSize)
 		{
-			$sql = $this->_insertBatch($this->db->protectIdentifiers($table, true, $escape, false), $this->QBKeys, array_slice($this->QBSet, $i, $batch_size));
+			$sql = $this->_insertBatch($this->db->protectIdentifiers($table, true, $escape, false), $this->QBKeys, array_slice($this->QBSet, $i, $batchSize));
 
 			if ($testing)
 			{
@@ -1975,15 +1975,15 @@ protected function validateUpdate()
 	 *
 	 * Compiles an update string and runs the query
 	 *
-	 * @param    array  $set        An associative array of update values
-	 * @param    string $index      The where key
-	 * @param    int    $batch_size The size of the batch to run
-	 * @param    bool   $returnSQL  True means SQL is returned, false will execute the query
+	 * @param    array  $set       An associative array of update values
+	 * @param    string $index     The where key
+	 * @param    int    $batchSize The size of the batch to run
+	 * @param    bool   $returnSQL True means SQL is returned, false will execute the query
 	 *
 	 * @return    mixed    Number of rows affected or FALSE on failure
 	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
 	 */
-	public function updateBatch($set = null, $index = null, $batch_size = 100, $returnSQL = false)
+	public function updateBatch($set = null, $index = null, $batchSize = 100, $returnSQL = false)
 	{
 		if ($index === null)
 		{
@@ -2025,9 +2025,9 @@ public function updateBatch($set = null, $index = null, $batch_size = 100, $retu
 		// Batch this baby
 		$affected_rows = 0;
 		$savedSQL = [];
-		for ($i = 0, $total = count($this->QBSet); $i < $total; $i += $batch_size)
+		for ($i = 0, $total = count($this->QBSet); $i < $total; $i += $batchSize)
 		{
-			$sql = $this->_updateBatch($table, array_slice($this->QBSet, $i, $batch_size), $this->db->protectIdentifiers($index)
+			$sql = $this->_updateBatch($table, array_slice($this->QBSet, $i, $batchSize), $this->db->protectIdentifiers($index)
 			);
 
 			if ($returnSQL)
diff --git a/system/HTTP/Exceptions/HTTPException.php b/system/HTTP/Exceptions/HTTPException.php
index 5810950a14c2..9b9cf56730aa 100644
--- a/system/HTTP/Exceptions/HTTPException.php
+++ b/system/HTTP/Exceptions/HTTPException.php
@@ -193,9 +193,11 @@ public static function forAlreadyMoved()
 	/**
 	 * For Uploaded file move
 	 *
+	 * @param string|null $path
+	 *
 	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
 	 */
-	public static function forInvalidFile()
+	public static function forInvalidFile(string $path=null)
 	{
 		return new static(lang('HTTP.invalidFile'));
 	}
diff --git a/system/Model.php b/system/Model.php
index fe78f507a192..2f99682826eb 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -622,6 +622,35 @@ public function insert($data = null, bool $returnID = true)
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Compiles batch insert strings and runs the queries, validating each row prior.
+	 *
+	 * @param    array $set    An associative array of insert values
+	 * @param    bool  $escape Whether to escape values and identifiers
+	 *
+	 * @param int      $batchSize
+	 * @param bool     $testing
+	 *
+	 * @return int Number of rows inserted or FALSE on failure
+	 */
+	public function insertBatch($set = null, $escape = null, $batchSize = 100, $testing = false)
+	{
+		if (is_array($set) && $this->skipValidation === false)
+		{
+			foreach ($set as $row)
+			{
+				if ($this->validate($row) === false)
+				{
+					return false;
+				}
+			}
+		}
+
+		return $this->builder()->insertBatch($set, $escape, $batchSize, $testing);
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Updates a single record in $this->table. If an object is provided,
 	 * it will attempt to convert it into an array.
@@ -712,6 +741,37 @@ public function update($id = null, $data = null)
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Update_Batch
+	 *
+	 * Compiles an update string and runs the query
+	 *
+	 * @param    array  $set       An associative array of update values
+	 * @param    string $index     The where key
+	 * @param    int    $batchSize The size of the batch to run
+	 * @param    bool   $returnSQL True means SQL is returned, false will execute the query
+	 *
+	 * @return    mixed    Number of rows affected or FALSE on failure
+	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 */
+	public function updateBatch($set = null, $index = null, $batchSize = 100, $returnSQL = false)
+	{
+		if (is_array($set) && $this->skipValidation === false)
+		{
+			foreach ($set as $row)
+			{
+				if ($this->validate($row) === false)
+				{
+					return false;
+				}
+			}
+		}
+
+		return $this->builder()->updateBatch($set, $index, $batchSize, $returnSQL);
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Deletes a single record from $this->table where $id matches
 	 * the table's primaryKey
diff --git a/tests/system/Database/Live/ModelTest.php b/tests/system/Database/Live/ModelTest.php
index 5e75a8a9f9f8..baa8387e8484 100644
--- a/tests/system/Database/Live/ModelTest.php
+++ b/tests/system/Database/Live/ModelTest.php
@@ -633,4 +633,83 @@ public function testUpdateArray()
 		$this->seeInDatabase('user', ['id' => 1, 'name' => 'Foo Bar']);
 		$this->seeInDatabase('user', ['id' => 2, 'name' => 'Foo Bar']);
 	}
+
+	public function testInsertBatchSuccess()
+	{
+		$job_data = [
+			['name' => 'Comedian', 'description' => 'Theres something in your teeth'],
+			['name' => 'Cab Driver', 'description' => 'Iam yellow'],
+		];
+
+		$model = new JobModel($this->db);
+		$model->insertBatch($job_data);
+
+		$this->seeInDatabase('job', ['name' => 'Comedian']);
+		$this->seeInDatabase('job', ['name' => 'Cab Driver']);
+	}
+
+	public function testInsertBatchValidationFail()
+	{
+		$job_data = [
+			['name' => 'Comedian', 'description' => null],
+		];
+
+		$model = new JobModel($this->db);
+
+		$this->setPrivateProperty($model, 'validationRules', ['description' => 'required']);
+
+		$this->assertFalse($model->insertBatch($job_data));
+
+		$error = $model->errors();
+		$this->assertTrue(isset($error['description']));
+	}
+
+	public function testUpdateBatchSuccess()
+	{
+		$data = [
+			[
+				'name' => 'Derek Jones',
+				'country' => 'Greece'
+			],
+			[
+				'name' => 'Ahmadinejad',
+				'country' => 'Greece'
+			],
+		];
+
+		$model = new EventModel($this->db);
+
+		$model->updateBatch($data, 'name');
+
+		$this->seeInDatabase('user', [
+			'name' => 'Derek Jones',
+			'country' => 'Greece'
+		]);
+		$this->seeInDatabase('user', [
+			'name' => 'Ahmadinejad',
+			'country' => 'Greece'
+		]);
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testUpdateBatchValidationFail()
+	{
+		$data = [
+			[
+				'name' => 'Derek Jones',
+				'country' => null
+			],
+		];
+
+		$model = new EventModel($this->db);
+		$this->setPrivateProperty($model, 'validationRules', ['country' => 'required']);
+
+		$this->assertFalse($model->updateBatch($data, 'name'));
+
+		$error = $model->errors();
+		$this->assertTrue(isset($error['country']));
+	}
+
+	//--------------------------------------------------------------------
 }

From 31f15bbddbce1bb9032a7315be36eba98729f605 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Tue, 17 Jul 2018 23:18:56 -0500
Subject: [PATCH 57/69] Fixing safe_mailto by removing CDATA comment hack that
 no longer works in modern browsers and in HTML5. Fixes #1102

---
 system/Helpers/url_helper.php          |  2 --
 tests/system/Helpers/URLHelperTest.php | 18 +++++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
index dfbc7b24da9b..50145dad2d56 100644
--- a/system/Helpers/url_helper.php
+++ b/system/Helpers/url_helper.php
@@ -460,7 +460,6 @@ function safe_mailto($email, $title = '', $attributes = ''): string
 
 		// improve obfuscation by eliminating newlines & whitespace
 		$output = "<script type=\"text/javascript\">"
-				. "//<![CDATA["
 				. "var l=new Array();";
 
 		for ($i = 0, $c = count($x); $i < $c; $i ++ )
@@ -472,7 +471,6 @@ function safe_mailto($email, $title = '', $attributes = ''): string
 				. "if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");"
 				. "else document.write(unescape(l[i]));"
 				. "}"
-				. "//]]>"
 				. '</script>';
 
 		return $output;
diff --git a/tests/system/Helpers/URLHelperTest.php b/tests/system/Helpers/URLHelperTest.php
index e1ecc4803602..bd678a6df8d4 100644
--- a/tests/system/Helpers/URLHelperTest.php
+++ b/tests/system/Helpers/URLHelperTest.php
@@ -690,11 +690,11 @@ public function testMailto($expected = '', $email, $title = '', $attributes = ''
 	public function safeMailtoPatterns()
 	{
 		return [
-			'page01' => ["<script type=\"text/javascript\">//<![CDATA[var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|101';l[5] = '|77';l[6] = '|32';l[7] = '|116';l[8] = '|99';l[9] = '|97';l[10] = '|116';l[11] = '|110';l[12] = '|111';l[13] = '|67';l[14] = '|32';l[15] = '|111';l[16] = '|116';l[17] = '|32';l[18] = '|101';l[19] = '|114';l[20] = '|101';l[21] = '|72';l[22] = '|32';l[23] = '|107';l[24] = '|99';l[25] = '|105';l[26] = '|108';l[27] = '|67';l[28] = '>';l[29] = '\"';l[30] = '|109';l[31] = '|111';l[32] = '|99';l[33] = '|46';l[34] = '|101';l[35] = '|116';l[36] = '|105';l[37] = '|115';l[38] = '|45';l[39] = '|121';l[40] = '|109';l[41] = '|64';l[42] = '|101';l[43] = '|109';l[44] = ':';l[45] = 'o';l[46] = 't';l[47] = 'l';l[48] = 'i';l[49] = 'a';l[50] = 'm';l[51] = '\"';l[52] = '=';l[53] = 'f';l[54] = 'e';l[55] = 'r';l[56] = 'h';l[57] = ' ';l[58] = 'a';l[59] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}//]]></script>",
+			'page01' => ["<script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|101';l[5] = '|77';l[6] = '|32';l[7] = '|116';l[8] = '|99';l[9] = '|97';l[10] = '|116';l[11] = '|110';l[12] = '|111';l[13] = '|67';l[14] = '|32';l[15] = '|111';l[16] = '|116';l[17] = '|32';l[18] = '|101';l[19] = '|114';l[20] = '|101';l[21] = '|72';l[22] = '|32';l[23] = '|107';l[24] = '|99';l[25] = '|105';l[26] = '|108';l[27] = '|67';l[28] = '>';l[29] = '\"';l[30] = '|109';l[31] = '|111';l[32] = '|99';l[33] = '|46';l[34] = '|101';l[35] = '|116';l[36] = '|105';l[37] = '|115';l[38] = '|45';l[39] = '|121';l[40] = '|109';l[41] = '|64';l[42] = '|101';l[43] = '|109';l[44] = ':';l[45] = 'o';l[46] = 't';l[47] = 'l';l[48] = 'i';l[49] = 'a';l[50] = 'm';l[51] = '\"';l[52] = '=';l[53] = 'f';l[54] = 'e';l[55] = 'r';l[56] = 'h';l[57] = ' ';l[58] = 'a';l[59] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script>",
 				'me@my-site.com', 'Click Here to Contact Me'],
-			'page02' => ["<script type=\"text/javascript\">//<![CDATA[var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|101';l[5] = '|77';l[6] = '|32';l[7] = '|116';l[8] = '|99';l[9] = '|97';l[10] = '|116';l[11] = '|110';l[12] = '|111';l[13] = '|67';l[14] = '>';l[15] = '\"';l[16] = '|101';l[17] = '|109';l[18] = '|32';l[19] = '|108';l[20] = '|105';l[21] = '|97';l[22] = '|77';l[23] = ' title=\"';l[24] = '\"';l[25] = '|109';l[26] = '|111';l[27] = '|99';l[28] = '|46';l[29] = '|101';l[30] = '|116';l[31] = '|105';l[32] = '|115';l[33] = '|45';l[34] = '|121';l[35] = '|109';l[36] = '|64';l[37] = '|101';l[38] = '|109';l[39] = ':';l[40] = 'o';l[41] = 't';l[42] = 'l';l[43] = 'i';l[44] = 'a';l[45] = 'm';l[46] = '\"';l[47] = '=';l[48] = 'f';l[49] = 'e';l[50] = 'r';l[51] = 'h';l[52] = ' ';l[53] = 'a';l[54] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}//]]></script>",
+			'page02' => ["<script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|101';l[5] = '|77';l[6] = '|32';l[7] = '|116';l[8] = '|99';l[9] = '|97';l[10] = '|116';l[11] = '|110';l[12] = '|111';l[13] = '|67';l[14] = '>';l[15] = '\"';l[16] = '|101';l[17] = '|109';l[18] = '|32';l[19] = '|108';l[20] = '|105';l[21] = '|97';l[22] = '|77';l[23] = ' title=\"';l[24] = '\"';l[25] = '|109';l[26] = '|111';l[27] = '|99';l[28] = '|46';l[29] = '|101';l[30] = '|116';l[31] = '|105';l[32] = '|115';l[33] = '|45';l[34] = '|121';l[35] = '|109';l[36] = '|64';l[37] = '|101';l[38] = '|109';l[39] = ':';l[40] = 'o';l[41] = 't';l[42] = 'l';l[43] = 'i';l[44] = 'a';l[45] = 'm';l[46] = '\"';l[47] = '=';l[48] = 'f';l[49] = 'e';l[50] = 'r';l[51] = 'h';l[52] = ' ';l[53] = 'a';l[54] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script>",
 				'me@my-site.com', 'Contact Me', ['title' => 'Mail me']],
-			'page03' => ["<script type=\"text/javascript\">//<![CDATA[var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|101';l[9] = '|116';l[10] = '|105';l[11] = '|115';l[12] = '|45';l[13] = '|121';l[14] = '|109';l[15] = '|64';l[16] = '|101';l[17] = '|109';l[18] = '>';l[19] = '\"';l[20] = '|109';l[21] = '|111';l[22] = '|99';l[23] = '|46';l[24] = '|101';l[25] = '|116';l[26] = '|105';l[27] = '|115';l[28] = '|45';l[29] = '|121';l[30] = '|109';l[31] = '|64';l[32] = '|101';l[33] = '|109';l[34] = ':';l[35] = 'o';l[36] = 't';l[37] = 'l';l[38] = 'i';l[39] = 'a';l[40] = 'm';l[41] = '\"';l[42] = '=';l[43] = 'f';l[44] = 'e';l[45] = 'r';l[46] = 'h';l[47] = ' ';l[48] = 'a';l[49] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}//]]></script>",
+			'page03' => ["<script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|101';l[9] = '|116';l[10] = '|105';l[11] = '|115';l[12] = '|45';l[13] = '|121';l[14] = '|109';l[15] = '|64';l[16] = '|101';l[17] = '|109';l[18] = '>';l[19] = '\"';l[20] = '|109';l[21] = '|111';l[22] = '|99';l[23] = '|46';l[24] = '|101';l[25] = '|116';l[26] = '|105';l[27] = '|115';l[28] = '|45';l[29] = '|121';l[30] = '|109';l[31] = '|64';l[32] = '|101';l[33] = '|109';l[34] = ':';l[35] = 'o';l[36] = 't';l[37] = 'l';l[38] = 'i';l[39] = 'a';l[40] = 'm';l[41] = '\"';l[42] = '=';l[43] = 'f';l[44] = 'e';l[45] = 'r';l[46] = 'h';l[47] = ' ';l[48] = 'a';l[49] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script>",
 				'me@my-site.com'],
 		];
 	}
@@ -757,7 +757,7 @@ public function autolinkEmails()
 			'test01' => ['www.codeigniter.com test',
 				'www.codeigniter.com test'],
 			'test02' => ['This is my noreply@codeigniter.com test',
-				"This is my <script type=\"text/javascript\">//<![CDATA[var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|101';l[10] = '|116';l[11] = '|105';l[12] = '|110';l[13] = '|103';l[14] = '|105';l[15] = '|101';l[16] = '|100';l[17] = '|111';l[18] = '|99';l[19] = '|64';l[20] = '|121';l[21] = '|108';l[22] = '|112';l[23] = '|101';l[24] = '|114';l[25] = '|111';l[26] = '|110';l[27] = '>';l[28] = '\"';l[29] = '|109';l[30] = '|111';l[31] = '|99';l[32] = '|46';l[33] = '|114';l[34] = '|101';l[35] = '|116';l[36] = '|105';l[37] = '|110';l[38] = '|103';l[39] = '|105';l[40] = '|101';l[41] = '|100';l[42] = '|111';l[43] = '|99';l[44] = '|64';l[45] = '|121';l[46] = '|108';l[47] = '|112';l[48] = '|101';l[49] = '|114';l[50] = '|111';l[51] = '|110';l[52] = ':';l[53] = 'o';l[54] = 't';l[55] = 'l';l[56] = 'i';l[57] = 'a';l[58] = 'm';l[59] = '\"';l[60] = '=';l[61] = 'f';l[62] = 'e';l[63] = 'r';l[64] = 'h';l[65] = ' ';l[66] = 'a';l[67] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}//]]></script> test"],
+				"This is my <script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|101';l[10] = '|116';l[11] = '|105';l[12] = '|110';l[13] = '|103';l[14] = '|105';l[15] = '|101';l[16] = '|100';l[17] = '|111';l[18] = '|99';l[19] = '|64';l[20] = '|121';l[21] = '|108';l[22] = '|112';l[23] = '|101';l[24] = '|114';l[25] = '|111';l[26] = '|110';l[27] = '>';l[28] = '\"';l[29] = '|109';l[30] = '|111';l[31] = '|99';l[32] = '|46';l[33] = '|114';l[34] = '|101';l[35] = '|116';l[36] = '|105';l[37] = '|110';l[38] = '|103';l[39] = '|105';l[40] = '|101';l[41] = '|100';l[42] = '|111';l[43] = '|99';l[44] = '|64';l[45] = '|121';l[46] = '|108';l[47] = '|112';l[48] = '|101';l[49] = '|114';l[50] = '|111';l[51] = '|110';l[52] = ':';l[53] = 'o';l[54] = 't';l[55] = 'l';l[56] = 'i';l[57] = 'a';l[58] = 'm';l[59] = '\"';l[60] = '=';l[61] = 'f';l[62] = 'e';l[63] = 'r';l[64] = 'h';l[65] = ' ';l[66] = 'a';l[67] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script> test"],
 			'test03' => ['<br />www.google.com',
 				'<br />www.google.com'],
 			'test04' => ['Download CodeIgniter at www.codeigniter.com. Period test.',
@@ -767,9 +767,9 @@ public function autolinkEmails()
 			'test06' => ['This one: ://codeigniter.com must not break this one: http://codeigniter.com',
 				'This one: ://codeigniter.com must not break this one: http://codeigniter.com'],
 			'test07' => ['Visit example.com or email foo@bar.com',
-				"Visit example.com or email <script type=\"text/javascript\">//<![CDATA[var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|97';l[10] = '|98';l[11] = '|64';l[12] = '|111';l[13] = '|111';l[14] = '|102';l[15] = '>';l[16] = '\"';l[17] = '|109';l[18] = '|111';l[19] = '|99';l[20] = '|46';l[21] = '|114';l[22] = '|97';l[23] = '|98';l[24] = '|64';l[25] = '|111';l[26] = '|111';l[27] = '|102';l[28] = ':';l[29] = 'o';l[30] = 't';l[31] = 'l';l[32] = 'i';l[33] = 'a';l[34] = 'm';l[35] = '\"';l[36] = '=';l[37] = 'f';l[38] = 'e';l[39] = 'r';l[40] = 'h';l[41] = ' ';l[42] = 'a';l[43] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}//]]></script>"],
+				"Visit example.com or email <script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|97';l[10] = '|98';l[11] = '|64';l[12] = '|111';l[13] = '|111';l[14] = '|102';l[15] = '>';l[16] = '\"';l[17] = '|109';l[18] = '|111';l[19] = '|99';l[20] = '|46';l[21] = '|114';l[22] = '|97';l[23] = '|98';l[24] = '|64';l[25] = '|111';l[26] = '|111';l[27] = '|102';l[28] = ':';l[29] = 'o';l[30] = 't';l[31] = 'l';l[32] = 'i';l[33] = 'a';l[34] = 'm';l[35] = '\"';l[36] = '=';l[37] = 'f';l[38] = 'e';l[39] = 'r';l[40] = 'h';l[41] = ' ';l[42] = 'a';l[43] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script>"],
 			'test08' => ['Visit www.example.com or email foo@bar.com',
-				"Visit www.example.com or email <script type=\"text/javascript\">//<![CDATA[var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|97';l[10] = '|98';l[11] = '|64';l[12] = '|111';l[13] = '|111';l[14] = '|102';l[15] = '>';l[16] = '\"';l[17] = '|109';l[18] = '|111';l[19] = '|99';l[20] = '|46';l[21] = '|114';l[22] = '|97';l[23] = '|98';l[24] = '|64';l[25] = '|111';l[26] = '|111';l[27] = '|102';l[28] = ':';l[29] = 'o';l[30] = 't';l[31] = 'l';l[32] = 'i';l[33] = 'a';l[34] = 'm';l[35] = '\"';l[36] = '=';l[37] = 'f';l[38] = 'e';l[39] = 'r';l[40] = 'h';l[41] = ' ';l[42] = 'a';l[43] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}//]]></script>"],
+				"Visit www.example.com or email <script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|97';l[10] = '|98';l[11] = '|64';l[12] = '|111';l[13] = '|111';l[14] = '|102';l[15] = '>';l[16] = '\"';l[17] = '|109';l[18] = '|111';l[19] = '|99';l[20] = '|46';l[21] = '|114';l[22] = '|97';l[23] = '|98';l[24] = '|64';l[25] = '|111';l[26] = '|111';l[27] = '|102';l[28] = ':';l[29] = 'o';l[30] = 't';l[31] = 'l';l[32] = 'i';l[33] = 'a';l[34] = 'm';l[35] = '\"';l[36] = '=';l[37] = 'f';l[38] = 'e';l[39] = 'r';l[40] = 'h';l[41] = ' ';l[42] = 'a';l[43] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script>"],
 		];
 	}
 
@@ -787,7 +787,7 @@ public function autolinkBoth()
 			'test01' => ['www.codeigniter.com test',
 				'<a href="http://www.codeigniter.com">www.codeigniter.com</a> test'],
 			'test02' => ['This is my noreply@codeigniter.com test',
-				"This is my <script type=\"text/javascript\">//<![CDATA[var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|101';l[10] = '|116';l[11] = '|105';l[12] = '|110';l[13] = '|103';l[14] = '|105';l[15] = '|101';l[16] = '|100';l[17] = '|111';l[18] = '|99';l[19] = '|64';l[20] = '|121';l[21] = '|108';l[22] = '|112';l[23] = '|101';l[24] = '|114';l[25] = '|111';l[26] = '|110';l[27] = '>';l[28] = '\"';l[29] = '|109';l[30] = '|111';l[31] = '|99';l[32] = '|46';l[33] = '|114';l[34] = '|101';l[35] = '|116';l[36] = '|105';l[37] = '|110';l[38] = '|103';l[39] = '|105';l[40] = '|101';l[41] = '|100';l[42] = '|111';l[43] = '|99';l[44] = '|64';l[45] = '|121';l[46] = '|108';l[47] = '|112';l[48] = '|101';l[49] = '|114';l[50] = '|111';l[51] = '|110';l[52] = ':';l[53] = 'o';l[54] = 't';l[55] = 'l';l[56] = 'i';l[57] = 'a';l[58] = 'm';l[59] = '\"';l[60] = '=';l[61] = 'f';l[62] = 'e';l[63] = 'r';l[64] = 'h';l[65] = ' ';l[66] = 'a';l[67] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}//]]></script> test"],
+				"This is my <script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|101';l[10] = '|116';l[11] = '|105';l[12] = '|110';l[13] = '|103';l[14] = '|105';l[15] = '|101';l[16] = '|100';l[17] = '|111';l[18] = '|99';l[19] = '|64';l[20] = '|121';l[21] = '|108';l[22] = '|112';l[23] = '|101';l[24] = '|114';l[25] = '|111';l[26] = '|110';l[27] = '>';l[28] = '\"';l[29] = '|109';l[30] = '|111';l[31] = '|99';l[32] = '|46';l[33] = '|114';l[34] = '|101';l[35] = '|116';l[36] = '|105';l[37] = '|110';l[38] = '|103';l[39] = '|105';l[40] = '|101';l[41] = '|100';l[42] = '|111';l[43] = '|99';l[44] = '|64';l[45] = '|121';l[46] = '|108';l[47] = '|112';l[48] = '|101';l[49] = '|114';l[50] = '|111';l[51] = '|110';l[52] = ':';l[53] = 'o';l[54] = 't';l[55] = 'l';l[56] = 'i';l[57] = 'a';l[58] = 'm';l[59] = '\"';l[60] = '=';l[61] = 'f';l[62] = 'e';l[63] = 'r';l[64] = 'h';l[65] = ' ';l[66] = 'a';l[67] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script> test"],
 			'test03' => ['<br />www.google.com',
 				'<br /><a href="http://www.google.com">www.google.com</a>'],
 			'test04' => ['Download CodeIgniter at www.codeigniter.com. Period test.',
@@ -797,9 +797,9 @@ public function autolinkBoth()
 			'test06' => ['This one: ://codeigniter.com must not break this one: http://codeigniter.com',
 				'This one: <a href="://codeigniter.com">://codeigniter.com</a> must not break this one: <a href="http://codeigniter.com">http://codeigniter.com</a>'],
 			'test07' => ['Visit example.com or email foo@bar.com',
-				"Visit example.com or email <script type=\"text/javascript\">//<![CDATA[var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|97';l[10] = '|98';l[11] = '|64';l[12] = '|111';l[13] = '|111';l[14] = '|102';l[15] = '>';l[16] = '\"';l[17] = '|109';l[18] = '|111';l[19] = '|99';l[20] = '|46';l[21] = '|114';l[22] = '|97';l[23] = '|98';l[24] = '|64';l[25] = '|111';l[26] = '|111';l[27] = '|102';l[28] = ':';l[29] = 'o';l[30] = 't';l[31] = 'l';l[32] = 'i';l[33] = 'a';l[34] = 'm';l[35] = '\"';l[36] = '=';l[37] = 'f';l[38] = 'e';l[39] = 'r';l[40] = 'h';l[41] = ' ';l[42] = 'a';l[43] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}//]]></script>"],
+				"Visit example.com or email <script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|97';l[10] = '|98';l[11] = '|64';l[12] = '|111';l[13] = '|111';l[14] = '|102';l[15] = '>';l[16] = '\"';l[17] = '|109';l[18] = '|111';l[19] = '|99';l[20] = '|46';l[21] = '|114';l[22] = '|97';l[23] = '|98';l[24] = '|64';l[25] = '|111';l[26] = '|111';l[27] = '|102';l[28] = ':';l[29] = 'o';l[30] = 't';l[31] = 'l';l[32] = 'i';l[33] = 'a';l[34] = 'm';l[35] = '\"';l[36] = '=';l[37] = 'f';l[38] = 'e';l[39] = 'r';l[40] = 'h';l[41] = ' ';l[42] = 'a';l[43] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script>"],
 			'test08' => ['Visit www.example.com or email foo@bar.com',
-				"Visit <a href=\"http://www.example.com\">www.example.com</a> or email <script type=\"text/javascript\">//<![CDATA[var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|97';l[10] = '|98';l[11] = '|64';l[12] = '|111';l[13] = '|111';l[14] = '|102';l[15] = '>';l[16] = '\"';l[17] = '|109';l[18] = '|111';l[19] = '|99';l[20] = '|46';l[21] = '|114';l[22] = '|97';l[23] = '|98';l[24] = '|64';l[25] = '|111';l[26] = '|111';l[27] = '|102';l[28] = ':';l[29] = 'o';l[30] = 't';l[31] = 'l';l[32] = 'i';l[33] = 'a';l[34] = 'm';l[35] = '\"';l[36] = '=';l[37] = 'f';l[38] = 'e';l[39] = 'r';l[40] = 'h';l[41] = ' ';l[42] = 'a';l[43] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}//]]></script>"],
+				"Visit <a href=\"http://www.example.com\">www.example.com</a> or email <script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|97';l[10] = '|98';l[11] = '|64';l[12] = '|111';l[13] = '|111';l[14] = '|102';l[15] = '>';l[16] = '\"';l[17] = '|109';l[18] = '|111';l[19] = '|99';l[20] = '|46';l[21] = '|114';l[22] = '|97';l[23] = '|98';l[24] = '|64';l[25] = '|111';l[26] = '|111';l[27] = '|102';l[28] = ':';l[29] = 'o';l[30] = 't';l[31] = 'l';l[32] = 'i';l[33] = 'a';l[34] = 'm';l[35] = '\"';l[36] = '=';l[37] = 'f';l[38] = 'e';l[39] = 'r';l[40] = 'h';l[41] = ' ';l[42] = 'a';l[43] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script>"],
 		];
 	}
 

From 7cab071dea8f1fd986f499a9baeda2504b688092 Mon Sep 17 00:00:00 2001
From: ytetsuro <phper.0o0@gmail.com>
Date: Thu, 19 Jul 2018 21:56:44 +0900
Subject: [PATCH 58/69] fix: Fixed a bug where you can not change the path
 freely

---
 system/Commands/Server/rewrite.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Commands/Server/rewrite.php b/system/Commands/Server/rewrite.php
index a7af4d421149..2ad9a7bbc946 100644
--- a/system/Commands/Server/rewrite.php
+++ b/system/Commands/Server/rewrite.php
@@ -22,7 +22,7 @@
 $uri = urldecode(parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
 
 // Front Controller path - expected to be in the default folder
-$fcpath = realpath(__DIR__ . '/../../../public') . DIRECTORY_SEPARATOR;
+$fcpath = FCPATH;
 
 // Full path
 $path = $fcpath . ltrim($uri, '/');

From ef986a4bc13d520a598a8e2259b48dbdd57e09bb Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Fri, 20 Jul 2018 10:25:33 -0500
Subject: [PATCH 59/69] Revert "Fixed a bug where you can not change the path
 freely"

---
 system/Commands/Server/rewrite.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Commands/Server/rewrite.php b/system/Commands/Server/rewrite.php
index 2ad9a7bbc946..a7af4d421149 100644
--- a/system/Commands/Server/rewrite.php
+++ b/system/Commands/Server/rewrite.php
@@ -22,7 +22,7 @@
 $uri = urldecode(parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
 
 // Front Controller path - expected to be in the default folder
-$fcpath = FCPATH;
+$fcpath = realpath(__DIR__ . '/../../../public') . DIRECTORY_SEPARATOR;
 
 // Full path
 $path = $fcpath . ltrim($uri, '/');

From 364847cec70efbc842f4255e811539a3bca252a6 Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Sat, 21 Jul 2018 00:36:06 -0700
Subject: [PATCH 60/69] Beef up IncomingRequest & Negotiate unit testing

---
 system/HTTP/IncomingRequest.php               |  63 +++----
 system/HTTP/Negotiate.php                     |   2 +-
 tests/_support/HTTP/MockIncomingRequest.php   |   8 +-
 .../HTTP/IncomingRequestDetectingTest.php     | 143 ++++++++++++++
 tests/system/HTTP/IncomingRequestTest.php     | 175 +++++++++++++++---
 tests/system/HTTP/NegotiateTest.php           |  40 +++-
 6 files changed, 363 insertions(+), 68 deletions(-)
 create mode 100644 tests/system/HTTP/IncomingRequestDetectingTest.php

diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 5623d4ede5b8..6aee98dcc3c3 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -1,4 +1,6 @@
-<?php namespace CodeIgniter\HTTP;
+<?php
+
+namespace CodeIgniter\HTTP;
 
 /**
  * CodeIgniter
@@ -80,7 +82,7 @@ class IncomingRequest extends Request
 	protected $enableCSRF = false;
 
 	/**
-	 * A \CodeIgniter\HTTPLite\URI instance.
+	 * A \CodeIgniter\HTTP\URI instance.
 	 *
 	 * @var URI
 	 */
@@ -98,7 +100,7 @@ class IncomingRequest extends Request
 	 *
 	 * @var \CodeIgniter\HTTP\Negotiate
 	 */
-	protected $negotiate;
+	protected $negotiator;
 
 	/**
 	 * The default Locale this request
@@ -242,6 +244,8 @@ public function setLocale(string $locale)
 		// If the intl extension is loaded, make sure
 		// that we set the locale for it... if not, though,
 		// don't worry about it.
+		// this should not block code coverage thru unit testing
+		// @codeCoverageIgnoreStart
 		try
 		{
 			if (class_exists('\Locale', false))
@@ -250,8 +254,9 @@ public function setLocale(string $locale)
 			}
 		} catch (\Exception $e)
 		{
-
+			
 		}
+		// @codeCoverageIgnoreEnd
 
 		return $this;
 	}
@@ -294,12 +299,10 @@ public function isSecure(): bool
 		if ( ! empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off')
 		{
 			return true;
-		}
-		elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https')
+		} elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https')
 		{
 			return true;
-		}
-		elseif ( ! empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off')
+		} elseif ( ! empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off')
 		{
 			return true;
 		}
@@ -533,7 +536,6 @@ public function getFiles()
 		return $this->files->all(); // return all files
 	}
 
-
 	//--------------------------------------------------------------------
 
 	/**
@@ -584,13 +586,14 @@ protected function detectURI($protocol, $baseURL)
 			$this->uri->setHost(parse_url($baseURL, PHP_URL_HOST));
 			$this->uri->setPort(parse_url($baseURL, PHP_URL_PORT));
 			$this->uri->resolveRelativeURI(parse_url($baseURL, PHP_URL_PATH));
-		}
-		else
+		} else
 		{
-			if(! is_cli())
+			// @codeCoverageIgnoreStart
+			if ( ! is_cli())
 			{
 				throw FrameworkException::forEmptyBaseURL();
 			}
+			// @codeCoverageIgnoreEnd
 		}
 	}
 
@@ -604,7 +607,7 @@ protected function detectURI($protocol, $baseURL)
 	 *
 	 * @return string
 	 */
-	public function detectPath($protocol)
+	public function detectPath($protocol = '')
 	{
 		if (empty($protocol))
 		{
@@ -642,25 +645,21 @@ public function detectPath($protocol)
 	 */
 	public function negotiate(string $type, array $supported, bool $strictMatch = false)
 	{
-		if (is_null($this->negotiate))
+		if (is_null($this->negotiator))
 		{
-			$this->negotiate = Services::negotiator($this, true);
+			$this->negotiator = Services::negotiator($this, true);
 		}
 
 		switch (strtolower($type))
 		{
 			case 'media':
-				return $this->negotiate->media($supported, $strictMatch);
-				break;
+				return $this->negotiator->media($supported, $strictMatch);
 			case 'charset':
-				return $this->negotiate->charset($supported);
-				break;
+				return $this->negotiator->charset($supported);
 			case 'encoding':
-				return $this->negotiate->encoding($supported);
-				break;
+				return $this->negotiator->encoding($supported);
 			case 'language':
-				return $this->negotiate->language($supported);
-				break;
+				return $this->negotiator->language($supported);
 		}
 
 		throw HTTPException::forInvalidNegotiationType($type);
@@ -689,25 +688,24 @@ protected function parseRequestURI(): string
 
 		if (isset($_SERVER['SCRIPT_NAME'][0]))
 		{
+			// strip the script name from the beginning of the URI
 			if (strpos($uri, $_SERVER['SCRIPT_NAME']) === 0)
 			{
 				$uri = (string) substr($uri, strlen($_SERVER['SCRIPT_NAME']));
-			}
-			elseif (strpos($uri, dirname($_SERVER['SCRIPT_NAME'])) === 0)
-			{
-				$uri = (string) substr($uri, strlen(dirname($_SERVER['SCRIPT_NAME'])));
-			}
+			} elseif (strpos($uri, dirname($_SERVER['SCRIPT_NAME'])) === 0)
+			// if the script is nested, strip the parent folder & script from the URI
+				if (strpos($uri, $_SERVER['SCRIPT_NAME']) > 0)
+					$uri = (string) substr($uri, strpos($uri, $_SERVER['SCRIPT_NAME']) + strlen($_SERVER['SCRIPT_NAME']));
 		}
 
-		// This section ensures that even on servers that require the URI to be in the query string (Nginx) a correct
+		// This section ensures that even on servers that require the URI to contain the query string (Nginx) a correct
 		// URI is found, and also fixes the QUERY_STRING getServer var and $_GET array.
 		if (trim($uri, '/') === '' && strncmp($query, '/', 1) === 0)
 		{
 			$query = explode('?', $query, 2);
 			$uri = $query[0];
 			$_SERVER['QUERY_STRING'] = $query[1] ?? '';
-		}
-		else
+		} else
 		{
 			$_SERVER['QUERY_STRING'] = $query;
 		}
@@ -738,8 +736,7 @@ protected function parseQueryString(): string
 		if (trim($uri, '/') === '')
 		{
 			return '';
-		}
-		elseif (strncmp($uri, '/', 1) === 0)
+		} elseif (strncmp($uri, '/', 1) === 0)
 		{
 			$uri = explode('?', $uri, 2);
 			$_SERVER['QUERY_STRING'] = $uri[1] ?? '';
diff --git a/system/HTTP/Negotiate.php b/system/HTTP/Negotiate.php
index 0f23152423f6..7af05b35b701 100644
--- a/system/HTTP/Negotiate.php
+++ b/system/HTTP/Negotiate.php
@@ -213,7 +213,7 @@ protected function getBestMatch(array $supported, string $header = null, bool $e
 
 		// If no acceptable values exist, return the
 		// first that we support.
-		if (empty($acceptable))
+		if (count($acceptable) === 0)
 		{
 			return $supported[0];
 		}
diff --git a/tests/_support/HTTP/MockIncomingRequest.php b/tests/_support/HTTP/MockIncomingRequest.php
index f6592e728e7c..0812135259b2 100644
--- a/tests/_support/HTTP/MockIncomingRequest.php
+++ b/tests/_support/HTTP/MockIncomingRequest.php
@@ -4,10 +4,10 @@
 
 class MockIncomingRequest extends IncomingRequest
 {
-    public function populateHeaders()
-    {
-        // Don't do anything... force the tester to manually set the headers they want.
-    }
+//    public function populateHeaders()
+//    {
+//        // Don't do anything... force the tester to manually set the headers they want.
+//    }
 
     public function detectURI($protocol, $baseURL)
     {
diff --git a/tests/system/HTTP/IncomingRequestDetectingTest.php b/tests/system/HTTP/IncomingRequestDetectingTest.php
new file mode 100644
index 000000000000..0872f7462a73
--- /dev/null
+++ b/tests/system/HTTP/IncomingRequestDetectingTest.php
@@ -0,0 +1,143 @@
+<?php
+
+namespace CodeIgniter\HTTP;
+
+use Config\App;
+use CodeIgniter\HTTP\Files\UploadedFile;
+
+/**
+ * @backupGlobals enabled
+ */
+class IncomingRequestDetectingTest extends \CIUnitTestCase
+{
+
+    /**
+     * @var \CodeIgniter\HTTP\IncomingRequest
+     */
+    protected $request;
+
+    public function setUp()
+    {
+	parent::setUp();
+
+	$_POST = $_GET = $_SERVER = $_REQUEST = $_ENV = $_COOKIE = $_SESSION = [];
+	$origin = 'http://www.example.com/index.php/woot?code=good#pos';
+	$this->request = new IncomingRequest(new App(), new URI($origin), null, new UserAgent());
+    }
+
+    //--------------------------------------------------------------------
+
+    public function testPathDefault()
+    {
+	$this->request->uri = '/index.php/woot?code=good#pos';
+	$_SERVER['REQUEST_URI'] = '/index.php/woot';
+	$_SERVER['SCRIPT_NAME'] = '/index.php';
+	$expected = 'woot';
+	$this->assertEquals($expected, $this->request->detectPath());
+    }
+
+    public function testPathRequestURI()
+    {
+	$this->request->uri = '/index.php/woot?code=good#pos';
+	$_SERVER['REQUEST_URI'] = '/index.php/woot';
+	$_SERVER['SCRIPT_NAME'] = '/index.php';
+	$expected = 'woot';
+	$this->assertEquals($expected, $this->request->detectPath('REQUEST_URI'));
+    }
+
+    public function testPathRequestURINested()
+    {
+	$this->request->uri = '/ci/index.php/woot?code=good#pos';
+	$_SERVER['REQUEST_URI'] = '/index.php/woot';
+	$_SERVER['SCRIPT_NAME'] = '/index.php';
+	$expected = 'woot';
+	$this->assertEquals($expected, $this->request->detectPath('REQUEST_URI'));
+    }
+
+    public function testPathRequestURISubfolder()
+    {
+	$this->request->uri = '/ci/index.php/popcorn/woot?code=good#pos';
+	$_SERVER['REQUEST_URI'] = '/ci/index.php/popcorn/woot';
+	$_SERVER['SCRIPT_NAME'] = '/index.php';
+	$expected = 'popcorn/woot';
+	$this->assertEquals($expected, $this->request->detectPath('REQUEST_URI'));
+    }
+
+    public function testPathRequestURINginx()
+    {
+	$this->request->uri = '/ci/index.php/woot?code=good#pos';
+	$_SERVER['REQUEST_URI'] = '/index.php/woot?code=good';
+	$_SERVER['SCRIPT_NAME'] = '/index.php';
+	$expected = 'woot';
+	$this->assertEquals($expected, $this->request->detectPath('REQUEST_URI'));
+    }
+
+    public function testPathRequestURINginxRedirecting()
+    {
+	$this->request->uri = '/?/ci/index.php/woot';
+	$_SERVER['REQUEST_URI'] = '/?/ci/woot';
+	$_SERVER['SCRIPT_NAME'] = '/index.php';
+	$expected = 'ci/woot';
+	$this->assertEquals($expected, $this->request->detectPath('REQUEST_URI'));
+    }
+
+    public function testPathRequestURISuppressed()
+    {
+	$this->request->uri = '/woot?code=good#pos';
+	$_SERVER['REQUEST_URI'] = '/woot';
+	$_SERVER['SCRIPT_NAME'] = '/';
+	$expected = 'woot';
+	$this->assertEquals($expected, $this->request->detectPath('REQUEST_URI'));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function testPathQueryString()
+    {
+	$this->request->uri = '/?/ci/index.php/woot';
+	$_SERVER['REQUEST_URI'] = '/?/ci/woot';
+	$_SERVER['QUERY_STRING'] = '/ci/woot';
+	$_SERVER['SCRIPT_NAME'] = '/index.php';
+	$expected = 'ci/woot';
+	$this->assertEquals($expected, $this->request->detectPath('QUERY_STRING'));
+    }
+
+    public function testPathQueryStringEmpty()
+    {
+	$this->request->uri = '/?/ci/index.php/woot';
+	$_SERVER['REQUEST_URI'] = '/?/ci/woot';
+	$_SERVER['QUERY_STRING'] = '';
+	$_SERVER['SCRIPT_NAME'] = '/index.php';
+	$expected = '';
+	$this->assertEquals($expected, $this->request->detectPath('QUERY_STRING'));
+    }
+
+    //--------------------------------------------------------------------
+
+    public function testPathPathInfo()
+    {
+	$this->request->uri = '/index.php/woot?code=good#pos';
+	$this->request->setGlobal('server', [
+	    'PATH_INFO' => null,
+	]);
+	$_SERVER['REQUEST_URI'] = '/index.php/woot';
+	$_SERVER['SCRIPT_NAME'] = '/index.php';
+	$expected = 'woot';
+	$this->assertEquals($expected, $this->request->detectPath('PATH_INFO'));
+    }
+
+    public function testPathPathInfoGlobal()
+    {
+	$this->request->uri = '/index.php/woot?code=good#pos';
+	$this->request->uri = '/index.php/woot?code=good#pos';
+	$this->request->setGlobal('server', [
+	    'PATH_INFO' => 'silliness',
+	]);
+	$_SERVER['REQUEST_URI'] = '/index.php/woot';
+	$_SERVER['SCRIPT_NAME'] = '/index.php';
+
+	$expected = 'silliness';
+	$this->assertEquals($expected, $this->request->detectPath('PATH_INFO'));
+    }
+
+}
diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index eb8245510574..36cf7425a1b8 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -1,12 +1,16 @@
-<?php namespace CodeIgniter\HTTP;
+<?php
+
+namespace CodeIgniter\HTTP;
 
 use Config\App;
+use CodeIgniter\HTTP\Files\UploadedFile;
 
 /**
  * @backupGlobals enabled
  */
 class IncomingRequestTest extends \CIUnitTestCase
 {
+
 	/**
 	 * @var \CodeIgniter\HTTP\IncomingRequest
 	 */
@@ -31,8 +35,6 @@ public function testCanGrabRequestVars()
 		$this->assertNull($this->request->getVar('TESTY'));
 	}
 
-	//--------------------------------------------------------------------
-
 	public function testCanGrabGetVars()
 	{
 		$_GET['TEST'] = 5;
@@ -41,8 +43,6 @@ public function testCanGrabGetVars()
 		$this->assertNull($this->request->getGEt('TESTY'));
 	}
 
-	//--------------------------------------------------------------------
-
 	public function testCanGrabPostVars()
 	{
 		$_POST['TEST'] = 5;
@@ -51,8 +51,6 @@ public function testCanGrabPostVars()
 		$this->assertNull($this->request->getPost('TESTY'));
 	}
 
-	//--------------------------------------------------------------------
-
 	public function testCanGrabPostBeforeGet()
 	{
 		$_POST['TEST'] = 5;
@@ -64,20 +62,29 @@ public function testCanGrabPostBeforeGet()
 
 	//--------------------------------------------------------------------
 
-    /**
-     * @group single
-     */
-    public function testCanGetOldInput()
-    {
-        $_SESSION['_ci_old_input'] = [
-            'get' => ['one' => 'two'],
-            'post' => ['name' => 'foo']
-        ];
+	public function testCanGetOldInput()
+	{
+		$_SESSION['_ci_old_input'] = [
+			'get' => ['one' => 'two'],
+			'post' => ['name' => 'foo']
+		];
 
-        $this->assertEquals('foo', $this->request->getOldInput('name'));
-        $this->assertEquals('two', $this->request->getOldInput('one'));
-    }
+		$this->assertEquals('foo', $this->request->getOldInput('name'));
+		$this->assertEquals('two', $this->request->getOldInput('one'));
+	}
 
+	public function testCanGetOldInputDotted()
+	{
+		$_SESSION['_ci_old_input'] = [
+			'get' => ['apple' => ['name' => 'two']],
+			'post' => ['banana' => ['name' => 'foo']],
+		];
+
+		$this->assertEquals('foo', $this->request->getOldInput('banana.name'));
+		$this->assertEquals('two', $this->request->getOldInput('apple.name'));
+	}
+
+	//--------------------------------------------------------------------
 
 	public function testCanGrabServerVars()
 	{
@@ -89,8 +96,6 @@ public function testCanGrabServerVars()
 		$this->assertNull($this->request->getServer('TESTY'));
 	}
 
-	//--------------------------------------------------------------------
-
 	public function testCanGrabEnvVars()
 	{
 		$server = $this->getPrivateProperty($this->request, 'globals');
@@ -101,8 +106,6 @@ public function testCanGrabEnvVars()
 		$this->assertNull($this->request->getEnv('TESTY'));
 	}
 
-	//--------------------------------------------------------------------
-
 	public function testCanGrabCookieVars()
 	{
 		$_COOKIE['TEST'] = 5;
@@ -111,7 +114,7 @@ public function testCanGrabCookieVars()
 		$this->assertNull($this->request->getCookie('TESTY'));
 	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 	public function testStoresDefaultLocale()
 	{
@@ -121,8 +124,6 @@ public function testStoresDefaultLocale()
 		$this->assertEquals($config->defaultLocale, $this->request->getLocale());
 	}
 
-	//--------------------------------------------------------------------
-
 	public function testSetLocaleSaves()
 	{
 		$config = new App();
@@ -136,6 +137,19 @@ public function testSetLocaleSaves()
 		$this->assertEquals('en', $request->getLocale());
 	}
 
+	public function testSetBadLocale()
+	{
+		$config = new App();
+		$config->supportedLocales = ['en', 'es'];
+		$config->defaultLocale = 'es';
+		$config->baseURL = 'http://example.com';
+
+		$request = new IncomingRequest($config, new URI(), null, new UserAgent());
+
+		$request->setLocale('xx');
+		$this->assertEquals('es', $request->getLocale());
+	}
+
 	//--------------------------------------------------------------------
 
 	public function testNegotiatesLocale()
@@ -153,6 +167,44 @@ public function testNegotiatesLocale()
 		$this->assertEquals('es', $request->getLocale());
 	}
 
+	// The negotiation tests below are not intended to exercise the HTTP\Negotiate class -
+	// that is up to the NegotiateTest. These are only to make sure that the requests
+	// flow through to the negotiator
+	
+	public function testNegotiatesNot()
+	{
+		$this->request->setHeader('Accept-Charset', 'iso-8859-5, unicode-1-1;q=0.8');
+
+		$this->expectException(Exceptions\HTTPException::class);
+		$this->request->negotiate('something bogus', ['iso-8859-5', 'unicode-1-1']);
+	}
+
+	public function testNegotiatesCharset()
+	{
+//		$_SERVER['HTTP_ACCEPT_CHARSET'] = 'iso-8859-5, unicode-1-1;q=0.8';
+		$this->request->setHeader('Accept-Charset', 'iso-8859-5, unicode-1-1;q=0.8');
+
+		$this->assertEquals(strtolower($this->request->config->charset), $this->request->negotiate('charset', ['iso-8859', 'unicode-1-2']));
+	}
+
+	public function testNegotiatesMedia()
+	{
+		$this->request->setHeader('Accept', 'text/plain; q=0.5, text/html, text/x-dvi; q=0.8, text/x-c');
+		$this->assertEquals('text/html', $this->request->negotiate('media', ['text/html', 'text/x-c', 'text/x-dvi', 'text/plain']));
+	}
+
+	public function testNegotiatesEncoding()
+	{
+		$this->request->setHeader('Accept-Encoding', 'gzip;q=1.0, identity; q=0.4, compress;q=0.5');
+		$this->assertEquals('gzip', $this->request->negotiate('encoding', ['gzip', 'compress']));
+	}
+
+	public function testNegotiatesLanguage()
+	{
+		$this->request->setHeader('Accept-Language', 'da, en-gb;q=0.8, en;q=0.7');
+		$this->assertEquals('en', $this->request->negotiate('language', ['en', 'da']));
+	}
+
 	//--------------------------------------------------------------------
 
 	public function testCanGrabGetRawJSON()
@@ -172,8 +224,6 @@ public function testCanGrabGetRawJSON()
 		$this->assertEquals($expected, $request->getJSON(true));
 	}
 
-	//--------------------------------------------------------------------
-
 	public function testCanGrabGetRawInput()
 	{
 		$rawstring = 'username=admin001&role=administrator&usepass=0';
@@ -193,4 +243,73 @@ public function testCanGrabGetRawInput()
 	}
 
 	//--------------------------------------------------------------------
+
+	public function testIsCLI()
+	{
+		// this should be the case in unit testing
+		$this->assertTrue($this->request->isCLI());
+	}
+
+	public function testIsAJAX()
+	{
+		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'xmlhttprequest';
+		$this->assertTrue($this->request->isAJAX());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testIsSecure()
+	{
+		$_SERVER['HTTPS'] = 'on';
+		$this->assertTrue($this->request->isSecure());
+	}
+
+	public function testIsSecureFrontEnd()
+	{
+		$_SERVER['HTTP_FRONT_END_HTTPS'] = 'on';
+		$this->assertTrue($this->request->isSecure());
+	}
+
+	public function testIsSecureForwarded()
+	{
+		$_SERVER['HTTP_X_FORWARDED_PROTO'] = 'https';
+		$this->assertTrue($this->request->isSecure());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testUserAgent()
+	{
+		$_SERVER['HTTP_USER_AGENT'] = 'Mozilla';
+		$config = new App();
+		$request = new IncomingRequest($config, new URI(), null, new UserAgent());
+		$this->assertEquals('Mozilla', $request->getUserAgent());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testFileCollectionFactory()
+	{
+		$_FILES = [
+			'userfile' => [
+				'name' => 'someFile.txt',
+				'type' => 'text/plain',
+				'size' => '124',
+				'tmp_name' => '/tmp/myTempFile.txt',
+				'error' => 0
+			]
+		];
+
+		$files = $this->request->getFiles();
+		$this->assertCount(1, $files);
+
+		$file = array_shift($files);
+		$this->assertInstanceOf(UploadedFile::class, $file);
+
+		$this->assertEquals('someFile.txt', $file->getName());
+		$this->assertEquals(124, $file->getSize());
+	}
+
+		//--------------------------------------------------------------------
+
 }
diff --git a/tests/system/HTTP/NegotiateTest.php b/tests/system/HTTP/NegotiateTest.php
index 75bcd67a940c..4dbeefc39c14 100644
--- a/tests/system/HTTP/NegotiateTest.php
+++ b/tests/system/HTTP/NegotiateTest.php
@@ -1,9 +1,12 @@
-<?php namespace CodeIgniter\HTTP;
+<?php
+
+namespace CodeIgniter\HTTP;
 
 use Config\App;
 
 class NegotiateTest extends \CIUnitTestCase
 {
+
 	/**
 	 * @var CodeIgniter\HTTP\Request
 	 */
@@ -36,6 +39,7 @@ public function tearDown()
 	public function testNegotiateMediaFindsHighestMatch()
 	{
 		$this->request->setHeader('Accept', 'text/plain; q=0.5, text/html, text/x-dvi; q=0.8, text/x-c');
+		$this->negotiate->setRequest($this->request);
 
 		$this->assertEquals('text/html', $this->negotiate->media(['text/html', 'text/x-c', 'text/x-dvi', 'text/plain']));
 		$this->assertEquals('text/x-c', $this->negotiate->media(['text/x-c', 'text/x-dvi', 'text/plain']));
@@ -50,7 +54,7 @@ public function testNegotiateMediaFindsHighestMatch()
 
 	public function testParseHeaderDeterminesCorrectPrecedence()
 	{
-		$header =$this->negotiate->parseHeader('text/*, text/plain, text/plain;format=flowed, */*');
+		$header = $this->negotiate->parseHeader('text/*, text/plain, text/plain;format=flowed, */*');
 
 		$this->assertEquals('text/plain', $header[0]['value']);
 		$this->assertEquals('flowed', $header[0]['params']['format']);
@@ -134,4 +138,36 @@ public function testAcceptLanguageBasics()
 	}
 
 	//--------------------------------------------------------------------
+	public function testBestMatchEmpty()
+	{
+		$this->expectException(Exceptions\HTTPException::class);
+		$this->negotiate->media([]);
+	}
+
+	public function testBestMatchNoHeader()
+	{
+		$this->request->setHeader('Accept','');
+		$this->assertEquals('', $this->negotiate->media(['apple', 'banana'], true));
+		$this->assertEquals('apple/mac', $this->negotiate->media(['apple/mac', 'banana/yellow'], false));
+	}
+
+	public function testBestMatchNotAcceptable()
+	{
+		$this->request->setHeader('Accept','popcorn/cheddar');
+		$this->assertEquals('apple/mac', $this->negotiate->media(['apple/mac', 'banana/yellow'],false));
+	}
+
+	public function testBestMatchFirstSupported()
+	{
+		$this->request->setHeader('Accept','popcorn/cheddar, */*');
+		$this->assertEquals('apple/mac', $this->negotiate->media(['apple/mac', 'banana/yellow'],false));
+	}
+
+	public function testBestMatchLowQuality()
+	{
+		$this->request->setHeader('Accept','popcorn/cheddar;q=0, apple/mac, */*');
+		$this->assertEquals('apple/mac', $this->negotiate->media(['apple/mac', 'popcorn/cheddar'],false));
+		$this->assertEquals('apple/mac', $this->negotiate->media(['popcorn/cheddar','apple/mac'],false));
+	}
+
 }

From d976b25d81d3169f9419f6612a7983f5e65351a7 Mon Sep 17 00:00:00 2001
From: ytetsuro <phper.0o0@gmail.com>
Date: Sat, 21 Jul 2018 22:05:45 +0900
Subject: [PATCH 61/69] fix: Remove the dependence on path.

---
 system/Commands/Server/rewrite.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Commands/Server/rewrite.php b/system/Commands/Server/rewrite.php
index a7af4d421149..aedc5deef350 100644
--- a/system/Commands/Server/rewrite.php
+++ b/system/Commands/Server/rewrite.php
@@ -6,7 +6,7 @@
  * development server based around PHP's built-in development
  * server. This file simply tries to mimic Apache's mod_rewrite
  * functionality so the site will operate as normal.
- * 
+ *
  */
 // @codeCoverageIgnoreStart
 // Avoid this file run when listing commands
@@ -22,7 +22,7 @@
 $uri = urldecode(parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
 
 // Front Controller path - expected to be in the default folder
-$fcpath = realpath(__DIR__ . '/../../../public') . DIRECTORY_SEPARATOR;
+$fcpath = $_SERVER['DOCUMENT_ROOT'] . DIRECTORY_SEPARATOR;
 
 // Full path
 $path = $fcpath . ltrim($uri, '/');

From 5525455af3890c609bdb31271500bfeaaf286a6d Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 23 Jul 2018 14:53:04 +0700
Subject: [PATCH 62/69] update esc function with apply $encoding check with its
 create new instance when defined escaper->getEncoding() not equals than
 passed encoding

---
 system/Common.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/system/Common.php b/system/Common.php
index 19db00d7df6c..62bd6032826d 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -276,6 +276,11 @@ function esc($data, $context = 'html', $encoding = null)
 			        $escaper = new \Zend\Escaper\Escaper($encoding);
                        }
 
+                       if ($encoding && $escaper->getEncoding() !== $encoding)
+                       {
+                               $escaper = new \Zend\Escaper\Escaper($encoding);
+                       }
+
 			$data = $escaper->$method($data);
 		}
 

From feff78ac329eee5c24d46b7bce91a4b570c75b4e Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 24 Jul 2018 08:12:59 +0700
Subject: [PATCH 63/69] php 7.2 fix Request::getIPAddress() error count():
 Parameter must be an array or an object that implements Countable

---
 system/HTTP/Request.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/HTTP/Request.php b/system/HTTP/Request.php
index 139a457efed2..37fd8573a0d0 100644
--- a/system/HTTP/Request.php
+++ b/system/HTTP/Request.php
@@ -131,7 +131,7 @@ public function getIPAddress(): string
 
 			if ($spoof)
 			{
-				for ($i = 0, $c = count($this->proxyIPs); $i < $c; $i ++ )
+				for ($i = 0, $c = count($proxy_ips); $i < $c; $i ++ )
 				{
 					// Check if we have an IP address or a subnet
 					if (strpos($proxy_ips[$i], '/') === FALSE)

From ed10225046d39a107d9098b55a0f6917551ee5db Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Tue, 24 Jul 2018 09:44:49 -0700
Subject: [PATCH 64/69] Rework Dotenv testing to use VFS

---
 system/Config/DotEnv.php           |  1 +
 tests/system/Config/DotEnvTest.php | 34 +++++++++++++++++++++---------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/system/Config/DotEnv.php b/system/Config/DotEnv.php
index c3684317e5c9..0ac1f24c9c29 100644
--- a/system/Config/DotEnv.php
+++ b/system/Config/DotEnv.php
@@ -109,6 +109,7 @@ public function load()
 			}
 		}
 
+		return true; // for success
 	}
 
 	//--------------------------------------------------------------------
diff --git a/tests/system/Config/DotEnvTest.php b/tests/system/Config/DotEnvTest.php
index ca3638cdd764..050ae1e5c0f0 100644
--- a/tests/system/Config/DotEnvTest.php
+++ b/tests/system/Config/DotEnvTest.php
@@ -1,4 +1,8 @@
-<?php namespace CodeIgniter\Config;
+<?php
+namespace CodeIgniter\Config;
+
+use org\bovigo\vfs\vfsStream;
+use org\bovigo\vfs\vfsStreamDirectory;
 
 //require_once 'system/Benchmark/Timer.php';
 
@@ -16,17 +20,28 @@ public function setup()
 	{
 		parent::setUp();
 
-		$this->fixturesFolder = __DIR__.'/fixtures';
-                $file = "unreadable.env";
-		$path = rtrim($this->fixturesFolder, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.$file;
-                chmod($path, 0644);
+		$this->root = vfsStream::setup();
+		$this->fixturesFolder = $this->root->url();
+		$this->path = TESTPATH . 'system/Config/fixtures';
+		vfsStream::copyFromFileSystem($this->path, $this->root);
+
+		$file = "unreadable.env";
+		$path = rtrim($this->fixturesFolder, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $file;
+		chmod($path, 0644);
+	}
+
+	public function tearDown()
+	{
+		parent::tearDown();
+
+		$this->root = null;
 	}
 
 	//--------------------------------------------------------------------
 
 	public function testReturnsFalseIfCannotFindFile()
 	{
-		$dotenv = new DotEnv(__DIR__);
+		$dotenv = new DotEnv($this->fixturesFolder, 'bogus');
 		$this->assertFalse($dotenv->load());
 	}
 
@@ -74,9 +89,9 @@ public function testCommentedLoadsVars()
 	public function testLoadsUnreadableFile()
 	{
 		$file = "unreadable.env";
-		$path = rtrim($this->fixturesFolder, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.$file;
-                chmod($path, 0000);
-		$this->expectException('InvalidArgumentException');
+		$path = rtrim($this->fixturesFolder, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $file;
+		chmod($path, 0000);
+		$this->expectException('\InvalidArgumentException');
 		$this->expectExceptionMessage("The .env file is not readable: {$path}");
 		$dotenv = new DotEnv($this->fixturesFolder, $file);
 		$dotenv->load();
@@ -178,5 +193,4 @@ public function testDotenvAllowsSpecialCharacters()
 	}
 
 	//--------------------------------------------------------------------
-
 }

From 9e165acca7822e76345f56000ca2bcd0406236bf Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Tue, 24 Jul 2018 11:27:47 -0700
Subject: [PATCH 65/69] Flesh out URI tests for 100% coverage

---
 system/HTTP/URI.php           |  19 +++---
 tests/system/HTTP/URITest.php | 113 ++++++++++++++++++++++------------
 2 files changed, 82 insertions(+), 50 deletions(-)

diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index 1d8797917171..cd82a884f6e4 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -1,4 +1,5 @@
-<?php namespace CodeIgniter\HTTP;
+<?php
+namespace CodeIgniter\HTTP;
 
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 
@@ -493,7 +494,7 @@ public function __toString()
 	{
 		return self::createURIString(
 						$this->getScheme(), $this->getAuthority(), $this->getPath(), // Absolute URIs should use a "/" for an empty path
-	  $this->getQuery(), $this->getFragment()
+						$this->getQuery(), $this->getFragment()
 		);
 	}
 
@@ -737,9 +738,7 @@ protected function decode(string $value)
 		// This won't catch all cases, specifically
 		// changing ' ' to '+' has the same length
 		// but doesn't really matter for our cases here.
-		return strlen($decoded) < strlen($value)
-			? $decoded
-			: $value;
+		return strlen($decoded) < strlen($value) ? $decoded : $value;
 	}
 
 	/**
@@ -898,7 +897,8 @@ protected function filterPath(string $path = null)
 
 		// Encode characters
 		$path = preg_replace_callback(
-				'/(?:[^' . self::CHAR_UNRESERVED . ':@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/', function(array $matches) {
+				'/(?:[^' . self::CHAR_UNRESERVED . ':@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/', function(array $matches)
+		{
 			return rawurlencode($matches[0]);
 		}, $path
 		);
@@ -951,13 +951,8 @@ protected function applyParts($parts)
 		{
 			if ( ! is_null($parts['port']))
 			{
+				// Valid port numbers are enforced by earlier parse_url or setPort()
 				$port = (int) $parts['port'];
-
-				if (1 > $port || 0xffff < $port)
-				{
-					throw HTTPException::forInvalidPort($port);
-				}
-
 				$this->port = $port;
 			}
 		}
diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php
index aa76626c0fc3..7e2d95a63734 100644
--- a/tests/system/HTTP/URITest.php
+++ b/tests/system/HTTP/URITest.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\HTTP\Exceptions\HTTPException;
@@ -16,7 +15,7 @@ public function setUp()
 
 	public function tearDown()
 	{
-
+		
 	}
 
 	//--------------------------------------------------------------------
@@ -55,6 +54,16 @@ public function testSegmentsIsPopulatedRightForMultipleSegments()
 
 	//--------------------------------------------------------------------
 
+	public function testSegmentOutOfRange()
+	{
+		$this->expectException(HTTPException::class);
+		$url = "http://abc.com/a123/b/c";
+		$uri = new URI($url);
+		$uri->getSegment(22);
+	}
+
+	//--------------------------------------------------------------------
+
 	public function testCanCastAsString()
 	{
 		$url = 'http://username:password@hostname:9090/path?arg=value#anchor';
@@ -84,10 +93,19 @@ public function testEmptyUri()
 	{
 		$url = '';
 		$uri = new URI($url);
-		$this->assertEquals('http://'.$url, (string) $uri);
+		$this->assertEquals('http://' . $url, (string) $uri);
 		$url = '/';
 		$uri = new URI($url);
-		$this->assertEquals('http://'.$url, (string) $uri);
+		$this->assertEquals('http://' . $url, (string) $uri);
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testMalformedUri()
+	{
+		$this->expectException(HTTPException::class);
+		$url = "http://abc:a123";
+		$uri = new URI($url);
 	}
 
 	//--------------------------------------------------------------------
@@ -107,9 +125,9 @@ public function testMissingScheme()
 	public function testSchemeSub()
 	{
 		$url = 'example.com';
-		$uri = new URI('http://'.$url);
+		$uri = new URI('http://' . $url);
 		$uri->setScheme('x');
-		$this->assertEquals('x://'.$url, (string) $uri);
+		$this->assertEquals('x://' . $url, (string) $uri);
 	}
 
 	//--------------------------------------------------------------------
@@ -230,6 +248,16 @@ public function testSetPortZero()
 
 	//--------------------------------------------------------------------
 
+	public function testCatchesBadPort()
+	{
+		$this->expectException(HTTPException::class);
+		$url = 'http://username:password@hostname:90909/path?arg=value#anchor';
+		$uri = new URI();
+		$uri->setURI($url);
+	}
+
+	//--------------------------------------------------------------------
+
 	public function testSetPathSetsValue()
 	{
 		$url = 'http://example.com/path';
@@ -427,11 +455,11 @@ public function defaultResolutions()
 			['g/', 'http://a/b/c/g/'],
 			['/g', 'http://a/g'],
 			['#s', 'http://a/b/c/d#s'],
+			['http://abc.com/x', 'http://abc.com/x'],
+			['?fruit=banana', 'http://a/b/c/d?fruit=banana'],
 		];
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * @dataProvider defaultResolutions
 	 */
@@ -446,36 +474,34 @@ public function testResolveRelativeURI($rel, $expected)
 		$this->assertEquals($expected, (string) $new);
 	}
 
-	//--------------------------------------------------------------------
-
-    /**
-     * @dataProvider defaultResolutions
-     * @group single
-     */
-    public function testResolveRelativeURIHTTPS($rel, $expected)
-    {
-        $base = 'https://a/b/c/d';
+	/**
+	 * @dataProvider defaultResolutions
+	 * @group single
+	 */
+	public function testResolveRelativeURIHTTPS($rel, $expected)
+	{
+		$base = 'https://a/b/c/d';
 
-        $expected = str_replace('http:', 'https:', $expected);
+		$expected = str_replace('http:', 'https:', $expected);
 
-        $uri = new URI($base);
+		$uri = new URI($base);
 
-        $new = $uri->resolveRelativeURI($rel);
+		$new = $uri->resolveRelativeURI($rel);
 
-        $this->assertEquals($expected, (string) $new);
-    }
+		$this->assertEquals($expected, (string) $new);
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 	public function testAddQueryVar()
 	{
-	    $base = 'http://example.com/foo';
+		$base = 'http://example.com/foo';
 
 		$uri = new URI($base);
 
 		$uri->addQuery('bar', 'baz');
 
-		$this->assertEquals('http://example.com/foo?bar=baz', (string)$uri);
+		$this->assertEquals('http://example.com/foo?bar=baz', (string) $uri);
 	}
 
 	//--------------------------------------------------------------------
@@ -505,7 +531,7 @@ public function testAddQueryVarRespectsExistingQueryVars()
 
 		$uri->addQuery('baz', 'foz');
 
-		$this->assertEquals('http://example.com/foo?bar=baz&baz=foz', (string)$uri);
+		$this->assertEquals('http://example.com/foo?bar=baz&baz=foz', (string) $uri);
 	}
 
 	//--------------------------------------------------------------------
@@ -518,7 +544,7 @@ public function testStripQueryVars()
 
 		$uri->stripQuery('bar', 'baz');
 
-		$this->assertEquals('http://example.com/foo?foo=bar', (string)$uri);
+		$this->assertEquals('http://example.com/foo?foo=bar', (string) $uri);
 	}
 
 	//--------------------------------------------------------------------
@@ -531,7 +557,18 @@ public function testKeepQueryVars()
 
 		$uri->keepQuery('bar', 'baz');
 
-		$this->assertEquals('http://example.com/foo?bar=baz&baz=foz', (string)$uri);
+		$this->assertEquals('http://example.com/foo?bar=baz&baz=foz', (string) $uri);
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testEmptyQueryVars()
+	{
+		$base = 'http://example.com/foo';
+
+		$uri = new URI($base);
+		$uri->setQuery('foo=&bar=baz&baz=foz');
+		$this->assertEquals('http://example.com/foo?foo=&bar=baz&baz=foz', (string) $uri);
 	}
 
 	//--------------------------------------------------------------------
@@ -558,15 +595,15 @@ public function testGetQueryOnly()
 
 	//--------------------------------------------------------------------
 
-    /**
-     * @see https://github.com/bcit-ci/CodeIgniter4/issues/331
-     * @group single
-     */
-    public function testNoExtraSlashes()
-    {
-        $this->assertEquals('http://entirely.different.com/subfolder', (string)(new URI('entirely.different.com/subfolder')));
-        $this->assertEquals('http://localhost/subfolder', (string)(new URI('localhost/subfolder')));
-        $this->assertEquals('http://localtest.me/subfolder', (string)(new URI('localtest.me/subfolder')));
-    }
+	/**
+	 * @see https://github.com/bcit-ci/CodeIgniter4/issues/331
+	 * @group single
+	 */
+	public function testNoExtraSlashes()
+	{
+		$this->assertEquals('http://entirely.different.com/subfolder', (string) (new URI('entirely.different.com/subfolder')));
+		$this->assertEquals('http://localhost/subfolder', (string) (new URI('localhost/subfolder')));
+		$this->assertEquals('http://localtest.me/subfolder', (string) (new URI('localtest.me/subfolder')));
+	}
 
 }

From b56cf5b0663ea8f40905f22f8495abb33f23b5e4 Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Wed, 25 Jul 2018 00:49:53 -0700
Subject: [PATCH 66/69] Beef up UserAgent tests for 100% coverage

---
 tests/system/HTTP/UserAgentTest.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/system/HTTP/UserAgentTest.php b/tests/system/HTTP/UserAgentTest.php
index 459b7f151313..c50b66cf6542 100644
--- a/tests/system/HTTP/UserAgentTest.php
+++ b/tests/system/HTTP/UserAgentTest.php
@@ -95,4 +95,15 @@ public function testParse()
 		$this->assertTrue($this->agent->isMobile('android'));
 	}
 
+	public function testParseBot()
+	{
+		$new_agent = 'Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)';
+		$this->agent->parse($new_agent);
+
+		$this->assertFalse($this->agent->isBrowser());
+		$this->assertTrue($this->agent->isRobot());
+		$this->assertFalse($this->agent->isRobot('Bob'));
+		$this->assertFalse($this->agent->isMobile());
+	}
+
 }

From fab1fbeaf9210579faea5384abe6c08a7abf3f01 Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Wed, 25 Jul 2018 01:05:29 -0700
Subject: [PATCH 67/69] Remove unused code in Message

---
 system/HTTP/Message.php           | 23 +++--------------------
 tests/system/HTTP/MessageTest.php |  2 +-
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/system/HTTP/Message.php b/system/HTTP/Message.php
index 1d9634e1dd02..663255bc5208 100644
--- a/system/HTTP/Message.php
+++ b/system/HTTP/Message.php
@@ -1,4 +1,5 @@
-<?php namespace CodeIgniter\HTTP;
+<?php
+namespace CodeIgniter\HTTP;
 
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 
@@ -147,14 +148,7 @@ public function populateHeaders()
 				$header = str_replace('_', ' ', strtolower($header));
 				$header = str_replace(' ', '-', ucwords($header));
 
-				if (array_key_exists($key, $_SERVER))
-				{
-					$this->setHeader($header, $_SERVER[$key]);
-				}
-				else
-				{
-					$this->setHeader($header, '');
-				}
+				$this->setHeader($header, $_SERVER[$key]);
 
 				// Add us to the header map so we can find them case-insensitively
 				$this->headerMap[strtolower($header)] = $header;
@@ -246,13 +240,6 @@ public function getHeaderLine(string $name): string
 			return '';
 		}
 
-		// If there are more than 1 headers with this name,
-		// then return the value of the first.
-		if (is_array($this->headers[$orig_name]))
-		{
-			return $this->headers[$orig_name][0]->getValueLine();
-		}
-
 		return $this->headers[$orig_name]->getValueLine();
 	}
 
@@ -286,10 +273,6 @@ public function setHeader(string $name, $value)
 		{
 			$this->headers[$name] = new Header($name, $value);
 		}
-		else
-		{
-			$this->headers[$name][] = new Header($name, $value);
-		}
 
 		return $this;
 	}
diff --git a/tests/system/HTTP/MessageTest.php b/tests/system/HTTP/MessageTest.php
index 339568c4ca75..d7c5f8c861d3 100644
--- a/tests/system/HTTP/MessageTest.php
+++ b/tests/system/HTTP/MessageTest.php
@@ -221,7 +221,7 @@ public function testPopulateHeadersWithoutContentType()
 		$_SERVER = $original; // restore so code coverage doesn't break
 	}
 
-	//--------------------------------------------------------------------
+ 	//--------------------------------------------------------------------
 
 	public function testPopulateHeadersWithoutHTTP()
 	{

From d6331833b5de24731411f74bed29bf962bfbb3f9 Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Thu, 26 Jul 2018 07:15:20 -0700
Subject: [PATCH 68/69] Fix IncomingRequestURI parsing

---
 system/HTTP/IncomingRequest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 6aee98dcc3c3..5b16068bbfec 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -696,6 +696,8 @@ protected function parseRequestURI(): string
 			// if the script is nested, strip the parent folder & script from the URI
 				if (strpos($uri, $_SERVER['SCRIPT_NAME']) > 0)
 					$uri = (string) substr($uri, strpos($uri, $_SERVER['SCRIPT_NAME']) + strlen($_SERVER['SCRIPT_NAME']));
+				elseif (strpos($uri, dirname($_SERVER['SCRIPT_NAME'])) > 0)
+					$uri = (string) substr($uri, strpos($uri, dirname($_SERVER['SCRIPT_NAME'])));
 		}
 
 		// This section ensures that even on servers that require the URI to contain the query string (Nginx) a correct

From a77aab36fbf295593ae654b7cf2ef3e8e7014985 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Thu, 26 Jul 2018 12:48:30 -0500
Subject: [PATCH 69/69] Clearer Formatting for migrate:status command.

---
 system/Commands/Database/MigrateStatus.php | 24 ++++++++++++++--------
 system/Language/en/Migrations.php          |  1 -
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/system/Commands/Database/MigrateStatus.php b/system/Commands/Database/MigrateStatus.php
index 364dc422c90e..b51dfb7a3a80 100644
--- a/system/Commands/Database/MigrateStatus.php
+++ b/system/Commands/Database/MigrateStatus.php
@@ -93,6 +93,12 @@ class MigrateStatus extends BaseCommand
 		'-g' => 'Set database group',
 	];
 
+	protected $ignoredNamespaces = [
+		'CodeIgniter',
+		'Config',
+		'Tests\Support'
+	];
+
 	/**
 	 * Displays a list of all migrations and whether they've been run or not.
 	 *
@@ -114,25 +120,25 @@ public function run(array $params = [])
 		// Loop for all $namespaces
 		foreach ($namespaces as $namespace => $path)
 		{
+			if (in_array($namespace, $this->ignoredNamespaces))
+			{
+				continue;
+			}
 
 			$runner->setNamespace($namespace);
 			$migrations = $runner->findMigrations();
 			$history = $runner->getHistory();
 
+			CLI::write($namespace);
+
 			if (empty($migrations))
 			{
-				CLI::error("$namespace: " . lang('Migrations.noneFound'));
+				CLI::error(lang('Migrations.noneFound'));
 				continue;
 			}
 
 			ksort($migrations);
 
-			CLI::newLine(1);
-
-			CLI::write(lang('Migrations.historyFor') . "$namespace: ", 'green');
-
-			CLI::newLine(1);
-
 			$max = 0;
 			foreach ($migrations as $version => $migration)
 			{
@@ -142,7 +148,7 @@ public function run(array $params = [])
 				$max = max($max, strlen($file));
 			}
 
-			CLI::write(str_pad(lang('Migrations.filename'), $max + 6) . lang('Migrations.on'), 'yellow');
+			CLI::write('  '. str_pad(lang('Migrations.filename'), $max + 4) . lang('Migrations.on'), 'yellow');
 
 
 			foreach ($migrations as $version => $migration)
@@ -157,7 +163,7 @@ public function run(array $params = [])
 
 					$date = date("Y-m-d H:i:s", $row['time']);
 				}
-				CLI::write(str_pad($migration->name, $max + 6) . ($date ? $date : '---'));
+				CLI::write(str_pad('  '.$migration->name, $max + 6) . ($date ? $date : '---'));
 			}
 		}
 	}
diff --git a/system/Language/en/Migrations.php b/system/Language/en/Migrations.php
index 98e52cb39e78..2f498d5f2a9a 100644
--- a/system/Language/en/Migrations.php
+++ b/system/Language/en/Migrations.php
@@ -45,7 +45,6 @@
 	'on'                => 'Migrated On: ',
 	'migSeeder'         => 'Seeder name',
 	'migMissingSeeder'  => 'You must provide a seeder name.',
-	'historyFor'        => 'Migration history For ',
 	'removed'           => 'Rolling back: ',
 	'added'             => 'Running: ',