Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix test portability

diff --cc ext/session/tests/016.phpt
index ce01c4d0374c579d7e3340b75b0c78aceae93e25,fc2187e1273b13cc125f9660d9918cb18411f6da..5e20ca348b9e11aab893e4e109d30e0bdcd4e998
--- 1/ext/session/tests/016.phpt
--- 2/ext/session/tests/016.phpt
+++ b/ext/session/tests/016.phpt
@@@ -24,5 -24,7 +24,6 @@@ print "I live\n"
  --EXPECTF--
  Warning: session_start(): Failed to create session data file path. Too short session ID, invalid save_path or path lentgth exceeds MAXPATHLEN(%d) in %s on line 4
  
- Warning: session_start(): Failed to read session data: files (path: 123;:/really\completely:::/invalid;;,23123;213) in %s on line 4
- I live
 -Warning: session_write_close(): Failed to create session data file path. Too short session ID, invalid save_path or path lentgth exceeds MAXPATHLEN(%d) in %s on line 6
 -
 -Warning: session_write_close(): Failed to write session data (files). Please verify that the current setting of session.save_path is correct (123;:/really%scompletely:::/invalid;;,23123;213) in %s on line 6
++Warning: session_start(): Failed to read session data: files (path: 123;:/really%scompletely:::/invalid;;,23123;213) in %s on line 4
+ I live
++