Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2: Fix failing ext/session/tests due to final newlines
7 years ago · cad70d9db6
8 changed files with 0 additions and 8 deletions
--- a/ext/session/tests/session_module_name_variation4.phpt
+++ b/ext/session/tests/session_module_name_variation4.phpt
@ -42,7 +42,6 @@ ob_end_flush();
 ?>
 --EXPECT--
 *** Testing session_module_name() : variation ***
-
 array(3) {
  ["Blah"]=>
  string(12) "Hello World!"
--- a/ext/session/tests/session_set_save_handler_basic.phpt
+++ b/ext/session/tests/session_set_save_handler_basic.phpt
@ -58,7 +58,6 @@ ob_end_flush();
 ?>
 --EXPECTF--
 *** Testing session_set_save_handler() : basic functionality ***
-
 string(%d) "%s"

 Warning: session_module_name(): Cannot find named PHP session module () in %s on line %d
--- a/ext/session/tests/session_set_save_handler_closures.phpt
+++ b/ext/session/tests/session_set_save_handler_closures.phpt
@ -51,7 +51,6 @@ ob_end_flush();
 ?>
 --EXPECTF--
 *** Testing session_set_save_handler() : using closures as callbacks ***
-
 string(%d) "%s"

 Warning: session_module_name(): Cannot find named PHP session module () in %s on line %d
--- a/ext/session/tests/session_set_save_handler_variation2.phpt
+++ b/ext/session/tests/session_set_save_handler_variation2.phpt
@ -26,7 +26,6 @@ ob_end_flush();
 ?>
 --EXPECTF--
 *** Testing session_set_save_handler() : variation ***
-
 bool(true)

 Warning: session_set_save_handler(): Cannot change save handler when session is active in %s on line 17
--- a/ext/session/tests/session_set_save_handler_variation3.phpt
+++ b/ext/session/tests/session_set_save_handler_variation3.phpt
@ -28,7 +28,6 @@ ob_end_flush();
 ?>
 --EXPECTF--
 *** Testing session_set_save_handler() : variation ***
-
 int(2)

 Warning: session_save_path(): Cannot change save path when session is active in %s on line 16
--- a/ext/session/tests/session_set_save_handler_variation4.phpt
+++ b/ext/session/tests/session_set_save_handler_variation4.phpt
@ -51,7 +51,6 @@ ob_end_flush();
 ?>
 --EXPECTF--
 *** Testing session_set_save_handler() : variation ***
-
 Open [%s,PHPSESSID]
 Read [%s,%s]
 GC [0]
--- a/ext/session/tests/session_set_save_handler_variation5.phpt
+++ b/ext/session/tests/session_set_save_handler_variation5.phpt
@ -57,7 +57,6 @@ ob_end_flush();
 ?>
 --EXPECTF--
 *** Testing session_set_save_handler() : variation ***
-
 string(0) ""
 *** Without lazy_write ***
 bool(true)
--- a/ext/session/tests/session_set_save_handler_variation6.phpt
+++ b/ext/session/tests/session_set_save_handler_variation6.phpt
@ -62,7 +62,6 @@ ob_end_flush();
 ?>
 --EXPECTF--
 *** Testing session_set_save_handler() : test write short circuit ***
-
 Open [%s,PHPSESSID]
 CreateID [PHPT-%s]
 Read [%s,%s]