8 files changed, 22 insertions, 11 deletions
diff --git a/tests/strings/004.phpt b/tests/strings/004.phpt
index a283fda699..7bcb452937 100644
--- a/tests/strings/004.phpt
+++ b/tests/strings/004.phpt
@@ -4,7 +4,6 @@ highlight_string() buffering
 highlight.string=#DD0000
 highlight.comment=#FF9900
 highlight.keyword=#007700
-highlight.bg=#FFFFFF
 highlight.default=#0000BB
 highlight.html=#000000
 --FILE--
diff --git a/tests/strings/bug26703.phpt b/tests/strings/bug26703.phpt
index ef2d81de4a..bea8fb1214 100644
--- a/tests/strings/bug26703.phpt
+++ b/tests/strings/bug26703.phpt
@@ -4,7 +4,6 @@ Bug #26703 (Certain characters inside strings incorrectly treated as keywords)
 highlight.string=#DD0000
 highlight.comment=#FF9900
 highlight.keyword=#007700
-highlight.bg=#FFFFFF
 highlight.default=#0000BB
 highlight.html=#000000
 --FILE--
diff --git a/tests/strings/offsets_chaining_1.phpt b/tests/strings/offsets_chaining_1.phpt
index 3aae90747c..eecdfb9637 100644
--- a/tests/strings/offsets_chaining_1.phpt
+++ b/tests/strings/offsets_chaining_1.phpt
@@ -8,4 +8,5 @@ $string = "foobar";
 var_dump($string[0][0][0][0]);
 ?>
 --EXPECTF--
-Fatal error: Cannot use string offset as an array in %s on line %d
+string(1) "f"
+
diff --git a/tests/strings/offsets_chaining_2.phpt b/tests/strings/offsets_chaining_2.phpt
index 7a567cd125..07f67f0fd0 100644
--- a/tests/strings/offsets_chaining_2.phpt
+++ b/tests/strings/offsets_chaining_2.phpt
@@ -8,4 +8,5 @@ $string = "foobar";
 var_dump($string{0}{0}[0][0]);
 ?>
 --EXPECTF--
-Fatal error: Cannot use string offset as an array in %s on line %d
+string(1) "f"
+
diff --git a/tests/strings/offsets_chaining_3.phpt b/tests/strings/offsets_chaining_3.phpt
index a5d1233a4c..23b8e70179 100644
--- a/tests/strings/offsets_chaining_3.phpt
+++ b/tests/strings/offsets_chaining_3.phpt
@@ -8,4 +8,5 @@ $string = "foobar";
 var_dump(isset($string[0][0][0][0]));
 ?>
 --EXPECTF--
-Fatal error: Cannot use string offset as an array in %s on line %d
+bool(true)
+
diff --git a/tests/strings/offsets_chaining_4.phpt b/tests/strings/offsets_chaining_4.phpt
index 8049f66a09..79b95c135b 100644
--- a/tests/strings/offsets_chaining_4.phpt
+++ b/tests/strings/offsets_chaining_4.phpt
@@ -8,4 +8,5 @@ $string = "foobar";
 var_dump(isset($string{0}{0}[0][0]));
 ?>
 --EXPECTF--
-Fatal error: Cannot use string offset as an array in %s on line %d
+bool(true)
+
diff --git a/tests/strings/offsets_chaining_5.phpt b/tests/strings/offsets_chaining_5.phpt
index bb811326f8..efcf2f3074 100644
--- a/tests/strings/offsets_chaining_5.phpt
+++ b/tests/strings/offsets_chaining_5.phpt
@@ -15,9 +15,13 @@ var_dump($array['expected_array']['foo']['bar']);
 --EXPECTF--
 bool(true)
 string(6) "foobar"
-bool(true)
+bool(false)
+
+Warning: Illegal string offset 'foo' in %soffsets_chaining_5.php on line %d
 string(1) "f"
 bool(false)
 
-Fatal error: Cannot use string offset as an array in %s on line %d
+Warning: Illegal string offset 'foo' in %soffsets_chaining_5.php on line %d
 
+Warning: Illegal string offset 'bar' in %soffsets_chaining_5.php on line %d
+string(1) "f"
diff --git a/tests/strings/offsets_general.phpt b/tests/strings/offsets_general.phpt
index effe9dd1d2..9d69ea2bf5 100644
--- a/tests/strings/offsets_general.phpt
+++ b/tests/strings/offsets_general.phpt
@@ -18,16 +18,21 @@ var_dump(isset($string{0}{0}));
 var_dump($string{"foo"});
 var_dump(isset($string{"foo"}{"bar"}));
 ?>
---EXPECT--
+--EXPECTF--
 string(1) "f"
 string(1) "o"
 bool(true)
-bool(false)
+bool(true)
+
+Warning: Illegal string offset 'foo' in %s line %d
 string(1) "f"
 bool(false)
 string(1) "f"
 string(1) "o"
 bool(true)
-bool(false)
+bool(true)
+
+Warning: Illegal string offset 'foo' in %s line %d
 string(1) "f"
 bool(false)
+