summaryrefslogtreecommitdiffstats
path: root/5.patch
blob: 9ebaacfeef416bde9cf13baad22b4fe5cab37c18 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
From e6cbc5cd2ac0189cbddfe0bf585655ef9dbab2ab Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 13 Sep 2019 11:50:37 +0200
Subject: [PATCH] Fix: Trying to access array offset on value of type bool

---
 src/Bidi.php      | 2 +-
 test/BidiTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bidi.php b/src/Bidi.php
index 3da33c7..cb49a41 100644
--- a/src/Bidi.php
+++ b/src/Bidi.php
@@ -176,7 +176,7 @@ protected function setInput($str = null, $chrarr = null, $ordarr = null, $forcer
         $this->str = $str;
         $this->chrarr = $chrarr;
         $this->ordarr = $ordarr;
-        $this->forcertl = (($forcertl === false) ? false : strtoupper($forcertl[0]));
+        $this->forcertl = (is_string($forcertl) ? strtoupper($forcertl[0]) : false);
     }
 
     /**
diff --git a/test/BidiTest.php b/test/BidiTest.php
index 6fed41f..5b9cb0c 100644
--- a/test/BidiTest.php
+++ b/test/BidiTest.php
@@ -86,7 +86,7 @@ public function bidiStrDataProvider()
             array(
                 "\n\nABC\nEFG\n\nHIJ\n\n",
                 "\n\nABC\nEFG\n\nHIJ\n\n",
-                true
+                'L'
             ),
             array(
                 json_decode('"\u202EABC\u202C"'),