Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix failing ext/session/tests due to final newlines

diff --cc ext/session/tests/session_module_name_variation4.phpt
Simple merge

diff --cc ext/session/tests/session_set_save_handler_variation2.phpt
index 71f533d93d3c56d01e5f5024423c46e9ce15a1d2,4be68c7be58aeabbb06d2cf281a49fa333a175e8..976d796f5caa0bc4384dad54ba0e30069f3882c5
--- 1/ext/session/tests/session_set_save_handler_variation2.phpt
--- 2/ext/session/tests/session_set_save_handler_variation2.phpt
+++ b/ext/session/tests/session_set_save_handler_variation2.phpt
@@@ -26,10 -26,7 +26,9 @@@ 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
  bool(false)
  bool(true)
  

diff --cc ext/session/tests/session_set_save_handler_variation3.phpt
index 7ac98342762896077e46bf77827d6bf4ab129674,b8e8fe5e621051215d64610a325b08ff35e14250..6afa753b901a53f5ee5775d16aebb24b82feabe7
--- 1/ext/session/tests/session_set_save_handler_variation3.phpt
--- 2/ext/session/tests/session_set_save_handler_variation3.phpt
+++ b/ext/session/tests/session_set_save_handler_variation3.phpt
@@@ -28,11 -27,6 +28,10 @@@ 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
 +
 +Warning: session_set_save_handler(): Cannot change save handler when session is active in %s on line 17
  bool(false)
  bool(true)
 -

diff --cc ext/session/tests/session_set_save_handler_variation4.phpt
Simple merge

diff --cc ext/session/tests/session_set_save_handler_variation5.phpt
Simple merge