Merge pull request #1569 from natanfelles/common

Test esc() with different encodings and ignore app-only helpers
codeigniter4 · Dec 3, 2018 · 95b599d · 95b599d
2 parents e326916 + f91b3e0
commit 95b599d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/system/Common.php b/system/Common.php
@@ -581,7 +581,9 @@ function helper($filenames)
 				{
 					if (strpos($path, APPPATH) === 0)
 					{
+						// @codeCoverageIgnoreStart
 						$appHelper = $path;
+						// @codeCoverageIgnoreEnd
 					}
 					elseif (strpos($path, BASEPATH) === 0)
 					{
@@ -597,7 +599,9 @@ function helper($filenames)
 			// App-level helpers should override all others
 			if (! empty($appHelper))
 			{
+				// @codeCoverageIgnoreStart
 				$includes[] = $appHelper;
+				// @codeCoverageIgnoreEnd
 			}
 
 			// All namespaced files get added in next

diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
@@ -152,6 +152,15 @@ public function testViewCell()
 
 	// ------------------------------------------------------------------------
 
+	public function testEscapeWithDifferentEncodings()
+	{
+		$this->assertEquals('&lt;x', esc('<x', 'html', 'utf-8'));
+		$this->assertEquals('&lt;x', esc('<x', 'html', 'iso-8859-1'));
+		$this->assertEquals('&lt;x', esc('<x', 'html', 'windows-1251'));
+	}
+
+	// ------------------------------------------------------------------------
+
 	public function testEscapeBadContext()
 	{
 		$this->expectException(InvalidArgumentException::class);