php · tpunt · Sep 15, 2017 · Sep 15, 2017 · Sep 16, 2017 · Sep 21, 2017
diff --git a/Zend/tests/flexible-heredoc-complex-test1.phpt b/Zend/tests/flexible-heredoc-complex-test1.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Flexible heredoc syntax complex test 1: interpolated nested heredocs
+with different delimiter names
+--FILE--
+<?php
+
+$a = 'b';
+${"b\nb\n d"} = 'b';
+
+var_dump(<<<DOC1
+    a
+    ${<<<DOC2
+        b
+        ${<<<DOC3
+            a
+            DOC3}
+         d
+        DOC2
+    }
+    c
+    DOC1);
+
+?>
+--EXPECT--
+string(5) "a
+b
+c"
diff --git a/Zend/tests/flexible-heredoc-complex-test2.phpt b/Zend/tests/flexible-heredoc-complex-test2.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Flexible heredoc syntax complex test 2: interpolated nested heredocs
+with the same delimiter name
+--FILE--
+<?php
+
+$a = 'b';
+${"b\nb\n d"} = 'b';
+
+var_dump(<<<DOC1
+    a
+    ${<<<DOC1
+        b
+        ${<<<DOC1
+            a
+            DOC1}
+         d
+        DOC1
+    }
+    c
+    DOC1);
+
+?>
+--EXPECT--
+string(5) "a
+b
+c"
diff --git a/Zend/tests/flexible-heredoc-complex-test3.phpt b/Zend/tests/flexible-heredoc-complex-test3.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Flexible heredoc syntax complex test 3: interpolated nested heredocs
+with the same delimiter name with different levels of indentation
+--FILE--
+<?php
+
+${' a'} = ' b';
+${' b'} = 'c';
+${"b\n b"} = 'b';
+
+var_dump(<<<DOC1
+      a
+     ${<<<DOC2
+        b
+        ${<<<DOC3
+             a
+            DOC3}
+        DOC2
+     }
+    c
+    DOC1);
+
+?>
+--EXPECT--
+string(8) "  a
+ b
+c"
diff --git a/Zend/tests/flexible-heredoc-complex-test4.phpt b/Zend/tests/flexible-heredoc-complex-test4.phpt
@@ -0,0 +1,35 @@
+--TEST--
+Flexible heredoc syntax complex test 4: interpolated variable with
+the same delimiter name as the heredoc
+--FILE--
+<?php
+
+{
+    $FOO = "FOO";
+    define("FOO", "FOO");
+    $b = <<<FOO
+    Test
+    ${
+        FOO
+    }
+    FOO;
+    var_dump($b);
+}
+
+{
+    $FOO = "FOO";
+    $b = <<<FOO
+        Test
+        ${
+        FOO
+        }
+    FOO;
+    var_dump($b);
+}
+
+?>
+--EXPECT--
+string(8) "Test
+FOO"
+string(16) "    Test
+    FOO"
diff --git a/Zend/tests/flexible-heredoc-error1.phpt b/Zend/tests/flexible-heredoc-error1.phpt
@@ -0,0 +1,14 @@
+--TEST--
+Flexible heredoc syntax 1: different indentation for body (spaces) ending marker (tabs)
+--FILE--
+<?php
+
+echo <<<END
+	   a
+	  b
+	 c
+		END;
+
+?>
+--EXPECTF--
+Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
diff --git a/Zend/tests/flexible-heredoc-error10.phpt b/Zend/tests/flexible-heredoc-error10.phpt
@@ -0,0 +1,13 @@
+--TEST--
+Flexible heredoc syntax error 10: unindented variable interpolation (as first value)
+--FILE--
+<?php
+
+$var = 'Bar';
+var_dump(<<<TEST
+$var
+ TEST);
+
+?>
+--EXPECTF--
+Parse error: Invalid body indentation level (expecting an indentation level of at least 1) in %s on line %d
diff --git a/Zend/tests/flexible-heredoc-error11.phpt b/Zend/tests/flexible-heredoc-error11.phpt
@@ -0,0 +1,13 @@
+--TEST--
+Flexible heredoc syntax error 11: show erroneous line in error message (variable interpolation)
+--FILE--
+<?php
+
+echo <<<END
+ a
+$a
+ END;
+
+?>
+--EXPECTF--
+Parse error: Invalid body indentation level (expecting an indentation level of at least 1) in %s on line 5
diff --git a/Zend/tests/flexible-heredoc-error12.phpt b/Zend/tests/flexible-heredoc-error12.phpt
@@ -0,0 +1,13 @@
+--TEST--
+Flexible heredoc syntax error 12: show erroneous line in error message (mixed indentation)
+--FILE--
+<?php
+
+echo <<<END
+ a
+	b
+ END;
+
+?>
+--EXPECTF--
+Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line 5
diff --git a/Zend/tests/flexible-heredoc-error13.phpt b/Zend/tests/flexible-heredoc-error13.phpt
@@ -0,0 +1,13 @@
+--TEST--
+Flexible heredoc syntax error 12: show erroneous line in error message (lacking indentation)
+--FILE--
+<?php
+
+echo <<<END
+ a
+b
+ END;
+
+?>
+--EXPECTF--
+Parse error: Invalid body indentation level (expecting an indentation level of at least 1) in %s on line 5
diff --git a/Zend/tests/flexible-heredoc-error2.phpt b/Zend/tests/flexible-heredoc-error2.phpt
@@ -0,0 +1,14 @@
+--TEST--
+Flexible heredoc syntax 2: mixing spaces and tabs in body
+--FILE--
+<?php
+
+echo <<<END
+    	a
+    	b
+    	c
+     END;
+
+?>
+--EXPECTF--
+Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
diff --git a/Zend/tests/flexible-heredoc-error3.phpt b/Zend/tests/flexible-heredoc-error3.phpt
@@ -0,0 +1,14 @@
+--TEST--
+Flexible heredoc syntax error 3: mixing spaces and tabs in ending marker
+--FILE--
+<?php
+
+echo <<<END
+		 a
+		 b
+		 c
+		 END;
+
+?>
+--EXPECTF--
+Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
diff --git a/Zend/tests/flexible-heredoc-error4.phpt b/Zend/tests/flexible-heredoc-error4.phpt
@@ -0,0 +1,14 @@
+--TEST--
+Flexible heredoc syntax error 4: not enough body indentation
+--FILE--
+<?php
+
+echo <<<END
+      a
+     b
+    c
+     END;
+
+?>
+--EXPECTF--
+Parse error: Invalid body indentation level (expecting an indentation level of at least 5) in %s on line %d
diff --git a/Zend/tests/flexible-heredoc-error5.phpt b/Zend/tests/flexible-heredoc-error5.phpt
@@ -0,0 +1,11 @@
+--TEST--
+Flexible heredoc syntax error 5: mixing spaces and tabs in ending marker for 0 length body
+--FILE--
+<?php
+
+echo <<<END
+	 END;
+
+?>
+--EXPECTF--
+Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
diff --git a/Zend/tests/flexible-heredoc-error6.phpt b/Zend/tests/flexible-heredoc-error6.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Flexible heredoc syntax error 6: no ending token on 0 length body
+--DESCRIPTION--
+Note: the closing ?> has been deliberately elided.
+--FILE--
+<?php
+
+echo <<<END
+--EXPECTF--
+Parse error: syntax error, unexpected end of file in %s on line %d
diff --git a/Zend/tests/flexible-heredoc-error7.phpt b/Zend/tests/flexible-heredoc-error7.phpt
@@ -0,0 +1,11 @@
+--TEST--
+Flexible heredoc syntax error 7: no ending token
+--DESCRIPTION--
+Note: the closing ?> has been deliberately elided.
+--FILE--
+<?php
+
+echo <<<END
+
+--EXPECTF--
+Parse error: syntax error, unexpected end of file, expecting variable (T_VARIABLE) or heredoc end (T_END_HEREDOC) or ${ (T_DOLLAR_OPEN_CURLY_BRACES) or {$ (T_CURLY_OPEN) in %s on line %d
diff --git a/Zend/tests/flexible-heredoc-error8.phpt b/Zend/tests/flexible-heredoc-error8.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Flexible heredoc syntax error 8: don't interpret \t as indentation
+--FILE--
+<?php
+
+<<<end
+\ta
+	end);
+
+?>
+--EXPECTF--
+Parse error: Invalid body indentation level (expecting an indentation level of at least 1) in %s on line %d
diff --git a/Zend/tests/flexible-heredoc-error9.phpt b/Zend/tests/flexible-heredoc-error9.phpt
@@ -0,0 +1,14 @@
+--TEST--
+Flexible heredoc syntax error 9: unindented variable interpolation
+--FILE--
+<?php
+
+$var = 'Bar';
+var_dump(<<<TEST
+  Foo
+$var
+  TEST);
+
+?>
+--EXPECTF--
+Parse error: Invalid body indentation level (expecting an indentation level of at least 2) in %s on line %d
diff --git a/Zend/tests/flexible-heredoc-nowdoc-lineno.phpt b/Zend/tests/flexible-heredoc-nowdoc-lineno.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Flexible heredoc lineno: ensure the compiler globals line number is correct
+--FILE--
+<?php
+
+$heredoc = <<<EOT
+hello world
+EOT;
+
+$heredoc = <<<'EOT'
+hello world
+EOT;
+
+$heredoc = <<<EOT
+ hello world
+ EOT;
+
+$heredoc = <<<'EOT'
+ hello world
+ EOT;
+
+try {
+	throw new exception();
+} catch (Exception $e) {
+	var_dump($e->getLine());
+}
+
+?>
+--EXPECT--
+int(20)