sixd                                     Tue, 23 Aug 2011 20:59:10 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=315404

Log:
Update log, marking 5.4 and trunk as XFAIL due to bug #55496

Bug: https://bugs.php.net/55496 (Assigned) Interactive mode doesn't force a 
newline before the prompt
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/sapi/cli/tests/016.phpt
    U   php/php-src/branches/PHP_5_4/sapi/cli/tests/016.phpt
    U   php/php-src/trunk/sapi/cli/tests/016.phpt

Modified: php/php-src/branches/PHP_5_3/sapi/cli/tests/016.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/cli/tests/016.phpt        2011-08-23 
20:22:07 UTC (rev 315403)
+++ php/php-src/branches/PHP_5_3/sapi/cli/tests/016.phpt        2011-08-23 
20:59:10 UTC (rev 315404)
@@ -65,25 +65,37 @@
 --------------
 Interactive shell

-php > Hello world
-php >
+php > echo 'Hello world';
+Hello world
+php > exit

+
 --------------
 Snippet no. 2:
 --------------
 Interactive shell

-php > php ' php ' multine
+php > echo 'multine
+php ' single
+php ' quote';
+multine
 single
 quote
-php >
+php > exit

+
 --------------
 Snippet no. 3:
 --------------
 Interactive shell

-php > <<< > <<< > <<< > <<< > <<< > Here
+php > echo <<<HEREDOC
+<<< > Here
+<<< > comes
+<<< > the
+<<< > doc
+<<< > HEREDOC;
+Here
 comes
 the
 doc
@@ -94,7 +106,11 @@
 --------------
 Interactive shell

-php > php { php { php > Done
+php > if (0) {
+php {     echo "I'm not there";
+php { }
+php > echo "Done";
+Done
 php >

 --------------
@@ -102,7 +118,11 @@
 --------------
 Interactive shell

-php > php { php { php > I was called!
+php > function a_function_with_some_name() {
+php {     echo "I was called!";
+php { }
+php > a_function_with_some_name();
+I was called!
 php >

 Done

Modified: php/php-src/branches/PHP_5_4/sapi/cli/tests/016.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/cli/tests/016.phpt        2011-08-23 
20:22:07 UTC (rev 315403)
+++ php/php-src/branches/PHP_5_4/sapi/cli/tests/016.phpt        2011-08-23 
20:59:10 UTC (rev 315404)
@@ -59,31 +59,45 @@

 echo "\nDone\n";
 ?>
+--XFAIL--
+https://bugs.php.net/bug.php?id=55496
 --EXPECTF--
 --------------
 Snippet no. 1:
 --------------
 Interactive shell

-php > Hello world
-php >
+php > echo 'Hello world';
+Hello world
+php > exit

+
 --------------
 Snippet no. 2:
 --------------
 Interactive shell

-php > php ' php ' multine
+php > echo 'multine
+php ' single
+php ' quote';
+multine
 single
 quote
-php >
+php > exit

+
 --------------
 Snippet no. 3:
 --------------
 Interactive shell

-php > <<< > <<< > <<< > <<< > <<< > Here
+php > echo <<<HEREDOC
+<<< > Here
+<<< > comes
+<<< > the
+<<< > doc
+<<< > HEREDOC;
+Here
 comes
 the
 doc
@@ -94,7 +108,11 @@
 --------------
 Interactive shell

-php > php { php { php > Done
+php > if (0) {
+php {     echo "I'm not there";
+php { }
+php > echo "Done";
+Done
 php >

 --------------
@@ -102,7 +120,11 @@
 --------------
 Interactive shell

-php > php { php { php > I was called!
+php > function a_function_with_some_name() {
+php {     echo "I was called!";
+php { }
+php > a_function_with_some_name();
+I was called!
 php >

 Done

Modified: php/php-src/trunk/sapi/cli/tests/016.phpt
===================================================================
--- php/php-src/trunk/sapi/cli/tests/016.phpt   2011-08-23 20:22:07 UTC (rev 
315403)
+++ php/php-src/trunk/sapi/cli/tests/016.phpt   2011-08-23 20:59:10 UTC (rev 
315404)
@@ -59,31 +59,45 @@

 echo "\nDone\n";
 ?>
+--XFAIL--
+https://bugs.php.net/bug.php?id=55496
 --EXPECTF--
 --------------
 Snippet no. 1:
 --------------
 Interactive shell

-php > Hello world
-php >
+php > echo 'Hello world';
+Hello world
+php > exit

+
 --------------
 Snippet no. 2:
 --------------
 Interactive shell

-php > php ' php ' multine
+php > echo 'multine
+php ' single
+php ' quote';
+multine
 single
 quote
-php >
+php > exit

+
 --------------
 Snippet no. 3:
 --------------
 Interactive shell

-php > <<< > <<< > <<< > <<< > <<< > Here
+php > echo <<<HEREDOC
+<<< > Here
+<<< > comes
+<<< > the
+<<< > doc
+<<< > HEREDOC;
+Here
 comes
 the
 doc
@@ -94,7 +108,11 @@
 --------------
 Interactive shell

-php > php { php { php > Done
+php > if (0) {
+php {     echo "I'm not there";
+php { }
+php > echo "Done";
+Done
 php >

 --------------
@@ -102,7 +120,11 @@
 --------------
 Interactive shell

-php > php { php { php > I was called!
+php > function a_function_with_some_name() {
+php {     echo "I was called!";
+php { }
+php > a_function_with_some_name();
+I was called!
 php >

 Done

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to