Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1: Fix failing tests/lang due to whitespace
author: Peter Kokot <peterkokot@gmail.com> 2018-10-13 15:23:35 +0200
committer: Peter Kokot <peterkokot@gmail.com> 2018-10-13 15:23:35 +0200
commit: c25b1a7e8cc1757cc633a74dac31ac4f951757d8 (patch)
tree: 530754ab0ffa96ac0aa6f707372bb244e2a407dc
parent: 102cf75eebb88bdad9317939741cbe411d2f5ad8 (diff)
parent: ed64e1d59a546b63334d94f31304921f3d156609 (diff)
download: php-git-c25b1a7e8cc1757cc633a74dac31ac4f951757d8.tar.gz
2 files changed, 69 insertions, 69 deletions
diff --git a/tests/lang/023.phpt b/tests/lang/023.phpt
index 331308d01d..59bd472f64 100644
--- a/tests/lang/023.phpt
+++ b/tests/lang/023.phpt
@@ -5,7 +5,7 @@ date.timezone=UTC
 --FILE--
 PHP Regression Test
 
-<?php 
+<?php
 
 include("023-1.inc");
 
@@ -246,7 +246,7 @@ $i=2<br>
 
 *** Nested file include test ***<br>
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
diff --git a/tests/lang/024.phpt b/tests/lang/024.phpt
index 954b58fa05..357846555a 100644
--- a/tests/lang/024.phpt
+++ b/tests/lang/024.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Looped regression test (may take a while)
 --FILE--
-<?php 
+<?php
 for ($jdk=0; $jdk<50; $jdk++) {
 ?><html>
 <head>
@@ -11,11 +11,11 @@ for ($jdk=0; $jdk<50; $jdk++) {
     */
 ?>
 *** Testing assignments and variable aliasing: ***
-<?php 
+<?php
   /* This test tests assignments to variables using other variables as variable-names */
-  $a = "b"; 
-  $$a = "test"; 
-  $$$a = "blah"; 
+  $a = "b";
+  $$a = "test";
+  $$$a = "blah";
   ${$$$a}["associative arrays work too"] = "this is nifty";
 ?>
 This should read "blah": <?php echo "$test\n"; ?>
@@ -23,7 +23,7 @@ This should read "this is nifty": <?php echo $blah[$test="associative arrays wor
 *************************************************
 
 *** Testing integer operators ***
-<?php 
+<?php
   /* test just about any operator possible on $i and $j (ints) */
   $i = 5;
   $j = 3;
@@ -47,7 +47,7 @@ Correct result - 3:  <?php echo $j%$i; ?>
 *********************************
 
 *** Testing real operators ***
-<?php 
+<?php
   /* test just about any operator possible on $i and $j (floats) */
   $i = 5.0;
   $j = 3.0;
@@ -72,7 +72,7 @@ Correct result - 3:  <?php echo $j%$i; ?>
 
 *** Testing if/elseif/else control ***
 
-<?php 
+<?php
 /* sick if/elseif/else test by Andi :) */
 $a = 5;
 if ($a == "4") {
@@ -107,7 +107,7 @@ if ($a == "4") {
 
 *** Seriously nested if's test ***
 ** spelling correction by kluzz **
-<?php 
+<?php
 /* yet another sick if/elseif/else test by Zeev */
 $i=$j=0;
 echo "Only two lines of text should follow:\n";
@@ -143,7 +143,7 @@ if (0) { /* this code is not supposed to be executed */
 } elseif (2-2) {  /* as long as 2-2==0, this isn't supposed to be executed either */
   $i = ++$j;
   echo "hmm, this shouldn't be displayed #2\n";
-  if (1) { 
+  if (1) {
     $j = ++$i;
     if (0) {
       $j = $i*2+$j*($i++);
@@ -197,7 +197,7 @@ if (0) { /* this code is not supposed to be executed */
 ?>
 
 *** C-style else-if's ***
-<?php 
+<?php
   /* looks like without we even tried, C-style else-if structure works fine! */
   if ($a=0) {
     echo "This shouldn't be displayed\n";
@@ -214,7 +214,7 @@ if (0) { /* this code is not supposed to be executed */
 *************************
 
 *** WHILE tests ***
-<?php 
+<?php
 $i=0;
 $j=20;
 while ($i<(2*$j)) {
@@ -232,7 +232,7 @@ while ($i<(2*$j)) {
 
 
 *** Nested WHILEs ***
-<?php 
+<?php
 $arr_len=3;
 
 $i=0;
@@ -268,7 +268,7 @@ while ($i<$arr_len) {
 *********************
 
 *** hash test... ***
-<?php 
+<?php
 /*
 $i=0;
 
@@ -288,7 +288,7 @@ echo "commented out...";
 **************************
 
 *** Hash resizing test ***
-<?php 
+<?php
 $i = 10;
 $a = "b";
 while ($i > 0) {
@@ -310,7 +310,7 @@ while ($i > 0) {
 
 
 *** break/continue test ***
-<?php 
+<?php
 $i=0;
 
 echo "\$i should go from 0 to 2\n";
@@ -364,7 +364,7 @@ while ($i<5) {
 <?php include("023-2.inc"); ?>
 ********************************
 
-<?php 
+<?php
 {
   echo "Tests completed.\n";  # testing some PHP style comment...
 }
@@ -589,7 +589,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -814,7 +814,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -1039,7 +1039,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -1264,7 +1264,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -1489,7 +1489,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -1714,7 +1714,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -1939,7 +1939,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -2164,7 +2164,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -2389,7 +2389,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -2614,7 +2614,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -2839,7 +2839,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -3064,7 +3064,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -3289,7 +3289,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -3514,7 +3514,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -3739,7 +3739,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -3964,7 +3964,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -4189,7 +4189,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -4414,7 +4414,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -4639,7 +4639,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -4864,7 +4864,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -5089,7 +5089,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -5314,7 +5314,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -5539,7 +5539,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -5764,7 +5764,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -5989,7 +5989,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -6214,7 +6214,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -6439,7 +6439,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -6664,7 +6664,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -6889,7 +6889,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -7114,7 +7114,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -7339,7 +7339,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -7564,7 +7564,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -7789,7 +7789,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -8014,7 +8014,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -8239,7 +8239,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -8464,7 +8464,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -8689,7 +8689,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -8914,7 +8914,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -9139,7 +9139,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -9364,7 +9364,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -9589,7 +9589,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -9814,7 +9814,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -10039,7 +10039,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -10264,7 +10264,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -10489,7 +10489,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -10714,7 +10714,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -10939,7 +10939,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -11164,7 +11164,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -11389,7 +11389,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
@@ -11614,7 +11614,7 @@ $i=2
 
 *** Nested file include test ***
 <html>
-This is Finish.phtml.  This file is supposed to be included 
+This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
author	Peter Kokot <peterkokot@gmail.com>	2018-10-13 15:23:35 +0200
committer	Peter Kokot <peterkokot@gmail.com>	2018-10-13 15:23:35 +0200
commit	c25b1a7e8cc1757cc633a74dac31ac4f951757d8 (patch)
tree	530754ab0ffa96ac0aa6f707372bb244e2a407dc
parent	102cf75eebb88bdad9317939741cbe411d2f5ad8 (diff)
parent	ed64e1d59a546b63334d94f31304921f3d156609 (diff)
download	php-git-c25b1a7e8cc1757cc633a74dac31ac4f951757d8.tar.gz