From 57896cf5158732101d6e09843b34f6b5f8fbba8a Mon Sep 17 00:00:00 2001
From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Thu, 1 Mar 2018 22:39:23 -0300
Subject: [PATCH] Make some skipped tests run, and fix some skip messages

---
 ext/date/tests/gmstrftime_variation9.phpt |  8 ++++----
 ext/filter/tests/bug52209.phpt            |  9 +++++----
 ext/soap/tests/bugs/bug34657.phpt         | 11 ++---------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/ext/date/tests/gmstrftime_variation9.phpt b/ext/date/tests/gmstrftime_variation9.phpt
index 6ba33ac394..ec69404cfc 100644
--- a/ext/date/tests/gmstrftime_variation9.phpt
+++ b/ext/date/tests/gmstrftime_variation9.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test gmstrftime() function : usage variation - Checking week related formats which was not supported on Windows before vc14. 
+Test gmstrftime() function : usage variation - Checking week related formats which was not supported on Windows before vc14.
 --SKIPIF--
 <?php
 if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
-    die("skip Test is not valid for Windows");
+    die("skip Test is only valid for Windows");
 }
 ?>
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : usage variation ***\n";
diff --git a/ext/filter/tests/bug52209.phpt b/ext/filter/tests/bug52209.phpt
index 79db749454..3035784147 100644
--- a/ext/filter/tests/bug52209.phpt
+++ b/ext/filter/tests/bug52209.phpt
@@ -2,11 +2,12 @@
 Bug #52209 (INPUT_ENV returns NULL for set variables (CLI))
 --SKIPIF--
 <?php
-/* This test makes no sense on windows as an empty variable 
-   would never show up in the "set" list. Which means, it's 
+/* This test makes no sense on windows as an empty variable
+   would never show up in the "set" list. Which means, it's
    always undefined in PHP. */
 if(substr(PHP_OS, 0, 3) == "WIN") die("skip Not for Windows");
-if (!extension_loaded("filter") || !empty($_ENV['PWD'])) die("skip");
+if (!extension_loaded("filter")) die ('skip filter extension not loaded');
+if (empty($_ENV['PWD'])) die('skip PWD is empty');
 ?>
 --INI--
 variables_order=GPCSE
@@ -14,5 +15,5 @@ variables_order=GPCSE
 <?php
 	var_dump(filter_input(INPUT_ENV, 'PWD'));
 ?>
---EXPECTF--	
+--EXPECTF--
 string(%d) "%s"
diff --git a/ext/soap/tests/bugs/bug34657.phpt b/ext/soap/tests/bugs/bug34657.phpt
index 9b67ec69ad..8c182ad7d4 100644
--- a/ext/soap/tests/bugs/bug34657.phpt
+++ b/ext/soap/tests/bugs/bug34657.phpt
@@ -1,15 +1,8 @@
 --TEST--
 Bug #34657 (If you get a communication problem when loading the WSDL, it fatal's)
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
-if (extension_loaded("openssl")) {
-	/* 
-	 when openssl loaded, tcp stream is less verbose, so some error messages are missing 
-	 so let's skip the test in this case  
-	 */
-	die("skip OpenSSL extension required");
-}
+<?php
+require_once('skipif.inc');
 ?>
 --FILE--
 <?php
-- 
2.50.1