Fix some implementation bugs

tpunt · tpunt · commit 24c24fc86478 · 2017-09-26T23:08:52.000+01:00
diff --git a/Zend/tests/flexible-heredoc-error1.phpt b/Zend/tests/flexible-heredoc-error1.phpt
@@ -3,14 +3,10 @@ Flexible heredoc syntax 1: different indentation for body (spaces) ending marker
 --FILE--
 <?php
 
-try {
-	echo <<<END
+echo <<<END
 	   a
 	  b
 	 c
 		END;
-} catch (ParseError $pe) {
-	var_dump($e->getMessage());
-}
 --EXPECTF--
 Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
diff --git a/Zend/tests/flexible-heredoc-error2.phpt b/Zend/tests/flexible-heredoc-error2.phpt
@@ -3,14 +3,10 @@ Flexible heredoc syntax 2: mixing spaces and tabs in body
 --FILE--
 <?php
 
-try {
-    echo <<<END
+echo <<<END
     	a
     	b
     	c
      END;
-} catch (ParseError $pe) {
-    var_dump($e->getMessage());
-}
 --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
@@ -3,14 +3,10 @@ Flexible heredoc syntax error 3: mixing spaces and tabs in ending marker
 --FILE--
 <?php
 
-try {
-	echo <<<END
+echo <<<END
 		 a
 		 b
 		 c
 		 END;
-} catch (ParseError $pe) {
-	var_dump($e->getMessage());
-}
 --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
@@ -3,14 +3,10 @@ Flexible heredoc syntax error 4: not enough body indentation
 --FILE--
 <?php
 
-try {
-    echo <<<END
+echo <<<END
       a
      b
     c
      END;
-} catch (ParseError $pe) {
-    var_dump($e->getMessage());
-}
 --EXPECTF--
-Parse error: Invalid body indentation level (expecting an indentation at least 5) in %s on line %d
+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,9 @@
+--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,8 @@
+--TEST--
+Flexible heredoc syntax error 6: no ending token on 0 length body
+--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,9 @@
+--TEST--
+Flexible heredoc syntax error 7: no ending token
+--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-nowdoc.phpt b/Zend/tests/flexible-heredoc-nowdoc.phpt
@@ -3,18 +3,29 @@ Flexible heredoc/nowdoc syntax
 --FILE--
 <?php
 
+$test = 'c';
+
+var_dump(<<<'END'
+ END);
+
+var_dump(<<<END
+
+  END);
+
 echo <<<'END'
      a
     b
+
    c
+
   d
  e
  END, PHP_EOL;
 
 echo <<<END
 	    a
 	   b
-	  c
+	  $test
 	 d
 	e
 	END, PHP_EOL;
@@ -37,7 +48,7 @@ echo <<<END
 	a\r\n
 \ta\n
    b\r\n
-  c\n
+  $test\n
  d\r\n
 e\n
 END, PHP_EOL;
@@ -51,9 +62,13 @@ e
 END, PHP_EOL;
 ?>
 --EXPECT--
+string(0) ""
+string(0) ""
     a
    b
+
   c
+
  d
 e
     a
diff --git a/Zend/tests/flexible-nowdoc-error1.phpt b/Zend/tests/flexible-nowdoc-error1.phpt
@@ -3,14 +3,10 @@ Flexible nowdoc syntax 1: different indentation for body (spaces) ending marker
 --FILE--
 <?php
 
-try {
-	echo <<<'END'
+echo <<<'END'
 	   a
 	  b
 	 c
 		END;
-} catch (ParseError $pe) {
-	var_dump($e->getMessage());
-}
 --EXPECTF--
 Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
diff --git a/Zend/tests/flexible-nowdoc-error2.phpt b/Zend/tests/flexible-nowdoc-error2.phpt
@@ -3,14 +3,10 @@ Flexible nowdoc syntax 2: mixing spaces and tabs in body
 --FILE--
 <?php
 
-try {
-    echo <<<'END'
+echo <<<'END'
     	a
     	b
     	c
      END;
-} catch (ParseError $pe) {
-    var_dump($e->getMessage());
-}
 --EXPECTF--
 Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
diff --git a/Zend/tests/flexible-nowdoc-error3.phpt b/Zend/tests/flexible-nowdoc-error3.phpt
@@ -3,14 +3,10 @@ Flexible nowdoc syntax error 3: mixing spaces and tabs in ending marker
 --FILE--
 <?php
 
-try {
-	echo <<<'END'
+echo <<<'END'
 		 a
 		 b
 		 c
 		 END;
-} catch (ParseError $pe) {
-	var_dump($e->getMessage());
-}
 --EXPECTF--
 Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
diff --git a/Zend/tests/flexible-nowdoc-error4.phpt b/Zend/tests/flexible-nowdoc-error4.phpt
@@ -3,14 +3,10 @@ Flexible nowdoc syntax error 4: not enough body indentation
 --FILE--
 <?php
 
-try {
-    echo <<<'END'
+echo <<<'END'
       a
      b
     c
      END;
-} catch (ParseError $pe) {
-    var_dump($e->getMessage());
-}
 --EXPECTF--
-Parse error: Invalid body indentation level (expecting an indentation at least 5) in %s on line %d
+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-nowdoc-error5.phpt b/Zend/tests/flexible-nowdoc-error5.phpt
@@ -0,0 +1,9 @@
+--TEST--
+Flexible nowdoc 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/zend_language_scanner.c b/Zend/zend_language_scanner.c
diff --git a/Zend/zend_language_scanner.h b/Zend/zend_language_scanner.h
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l

Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,10 @@ Flexible heredoc syntax 1: different indentation for body (spaces) ending marker`
`3`	`3`	`--FILE--`
`4`	`4`	`<?php`
`5`	`5`
`6`		`-try {`
`7`		`- echo <<<END`
	`6`	`+echo <<<END`
`8`	`7`	`a`
`9`	`8`	`b`
`10`	`9`	`c`
`11`	`10`	`END;`
`12`		`-} catch (ParseError $pe) {`
`13`		`- var_dump($e->getMessage());`
`14`		`-}`
`15`	`11`	`--EXPECTF--`
`16`	`12`	`Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d`
Original file line number	Diff line number	Diff line change
`@@ -3,18 +3,29 @@ Flexible heredoc/nowdoc syntax`
`3`	`3`	`--FILE--`
`4`	`4`	`<?php`
`5`	`5`
	`6`	`+$test = 'c';`
	`7`	`+`
	`8`	`+var_dump(<<<'END'`
	`9`	`+ END);`
	`10`	`+`
	`11`	`+var_dump(<<<END`
	`12`	`+`
	`13`	`+ END);`
	`14`	`+`
`6`	`15`	`echo <<<'END'`
`7`	`16`	`a`
`8`	`17`	`b`
	`18`	`+`
`9`	`19`	`c`
	`20`	`+`
`10`	`21`	`d`
`11`	`22`	`e`
`12`	`23`	`END, PHP_EOL;`
`13`	`24`
`14`	`25`	`echo <<<END`
`15`	`26`	`a`
`16`	`27`	`b`
`17`		`- c`
	`28`	`+ $test`
`18`	`29`	`d`
`19`	`30`	`e`
`20`	`31`	`END, PHP_EOL;`
`@@ -37,7 +48,7 @@ echo <<<END`
`37`	`48`	`a\r\n`
`38`	`49`	`\ta\n`
`39`	`50`	`b\r\n`
`40`		`- c\n`
	`51`	`+ $test\n`
`41`	`52`	`d\r\n`
`42`	`53`	`e\n`
`43`	`54`	`END, PHP_EOL;`
`@@ -51,9 +62,13 @@ e`
`51`	`62`	`END, PHP_EOL;`
`52`	`63`	`?>`
`53`	`64`	`--EXPECT--`
	`65`	`+string(0) ""`
	`66`	`+string(0) ""`
`54`	`67`	`a`
`55`	`68`	`b`
	`69`	`+`
`56`	`70`	`c`
	`71`	`+`
`57`	`72`	`d`
`58`	`73`	`e`
`59`	`74`	`a`
Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,10 @@ Flexible nowdoc syntax 1: different indentation for body (spaces) ending marker`
`3`	`3`	`--FILE--`
`4`	`4`	`<?php`
`5`	`5`
`6`		`-try {`
`7`		`- echo <<<'END'`
	`6`	`+echo <<<'END'`
`8`	`7`	`a`
`9`	`8`	`b`
`10`	`9`	`c`
`11`	`10`	`END;`
`12`		`-} catch (ParseError $pe) {`
`13`		`- var_dump($e->getMessage());`
`14`		`-}`
`15`	`11`	`--EXPECTF--`
`16`	`12`	`Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d`