Merge branch 'PHP-7.0'

* PHP-7.0:
  fix broken skipif and add xfail for now

Author: weltling

ext/openssl/tests/openssl_error_string_basic.phpt

@@ -5,7 +5,8 @@ openssl_error_string() tests
 if (!extension_loaded("openssl")) print "skip";
 //if (OPENSSL_VERSION_NUMBER < 0x10001001) die("skip OpenSSLv1.0.1 required");
 ?>
-?>
+-XFAIL--
+ot ready baked yet, fails different ways on different envs
 --FILE--
 <?php
 // helper function to dump openssl errors
@@ -178,4 +179,4 @@ string(61) "error:02001002:system library:fopen:No such file or directory"
 string(53) "error:2006D080:BIO routines:BIO_new_file:no such file"
 string(55) "error:20068079:BIO routines:BIO_gets:unsupported method"
 string(54) "error:0906D06C:PEM routines:PEM_read_bio:no start line"
-string(54) "error:0906D06C:PEM routines:PEM_read_bio:no start line"
+string(54) "error:0906D06C:PEM routines:PEM_read_bio:no start line"