From f1c664d37960be8a53efae67f99193a1c3be22b0 Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Fri, 18 Aug 2017 17:38:16 +0200
Subject: [PATCH] Fix skipifs

---
 tests/run-test/bug75042-2.phpt | 7 ++-----
 tests/run-test/bug75042.phpt   | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/tests/run-test/bug75042-2.phpt b/tests/run-test/bug75042-2.phpt
index c79eb4495f..25f6d08e61 100644
--- a/tests/run-test/bug75042-2.phpt
+++ b/tests/run-test/bug75042-2.phpt
@@ -2,10 +2,7 @@
 phpt EXTENSIONS directive with static module
 --SKIPIF--
 <?php
-if(empty($_ENV['TEST_PHP_EXECUTABLE'])) {
-	die('skip TEST_PHP_EXECUTABLE not set');
-}
-$php = $_ENV['TEST_PHP_EXECUTABLE'];
+$php = getenv('TEST_PHP_EXECUTABLE');
 if (false === stripos(`$php -n -m`, 'spl')) {
 	die('skip spl is NOT built static');
 }
@@ -15,4 +12,4 @@ SPL
 <?php
 var_dump(extension_loaded('spl'));
 --EXPECT--
-bool(true)
\ No newline at end of file
+bool(true)
diff --git a/tests/run-test/bug75042.phpt b/tests/run-test/bug75042.phpt
index 10a0f45040..001e8f3e7d 100644
--- a/tests/run-test/bug75042.phpt
+++ b/tests/run-test/bug75042.phpt
@@ -2,10 +2,7 @@
 phpt EXTENSIONS directive with shared module
 --SKIPIF--
 <?php
-if(empty($_ENV['TEST_PHP_EXECUTABLE'])) {
-	die('skip TEST_PHP_EXECUTABLE not set');
-}
-$php = $_ENV['TEST_PHP_EXECUTABLE'];
+$php = getenv('TEST_PHP_EXECUTABLE');
 if (false !== stripos(`$php -n -m`, 'openssl')) {
 	die('skip openssl is built static');
 }
@@ -17,4 +14,4 @@ openssl
 <?php
 var_dump(extension_loaded('openssl'));
 --EXPECT--
-bool(true)
\ No newline at end of file
+bool(true)
-- 
2.50.1