From 36c936357cb15127e1e6e419f2e8f1c95d246d9e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Aug 2019 12:25:24 +0200
Subject: [PATCH] Add phpunit testDolStringIsGoodIso

---
 htdocs/core/lib/functions.lib.php |  2 +-
 test/phpunit/FunctionsLibTest.php | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 625cbbee4b7..30267a57ad5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5635,7 +5635,7 @@ function dol_string_is_good_iso($s)
 	$ok=1;
 	for($scursor=0;$scursor<$len;$scursor++)
 	{
-		$ordchar=ord($s{$scursor});
+		$ordchar=ord($s[$scursor]);
 		//print $scursor.'-'.$ordchar.'<br>';
 		if ($ordchar < 32 && $ordchar != 13 && $ordchar != 10) { $ok=0; break; }
 		if ($ordchar > 126 && $ordchar < 160) { $ok=0; break; }
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index 5b2b65c9e50..2a7734716eb 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -1260,4 +1260,25 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
 
         return true;
     }
+
+    /**
+     * testDolStringIsGoodIso
+     *
+     * @return boolean
+     */
+    public function testDolStringIsGoodIso()
+    {
+    	global $conf, $langs;
+
+    	$chaine='This is an ISO string';
+    	$result = dol_string_is_good_iso($chaine);
+    	$this->assertEquals($result, 1);
+
+    	$chaine='This is a not ISO string '.chr(0);
+    	$result = dol_string_is_good_iso($chaine);
+    	$this->assertEquals($result, 0);
+
+    	return true;
+    }
+
 }