From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Fri, 27 Jul 2018 03:48:30 +0000 (-0300)
Subject: Remove superfluous check for PHP 7+ tests
X-Git-Tag: php-7.3.0beta1~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ec64a831d861a8a17ec40a46f6ae985769cc77f;p=php

Remove superfluous check for PHP 7+ tests
---

diff --git a/ext/opcache/tests/bug76275.phpt b/ext/opcache/tests/bug76275.phpt
index 82e4272185..4be55d8335 100644
--- a/ext/opcache/tests/bug76275.phpt
+++ b/ext/opcache/tests/bug76275.phpt
@@ -6,12 +6,6 @@ opcache.enable_cli=1
 opcache.file_cache=/tmp
 --FILE--
 <?php
-
-if (PHP_VERSION_ID >= 70000) {
-    echo "Done";
-    return;
-}
-
 if (!is_callable('random_bytes')) {
     try {
     } catch (com_exception $e) {
@@ -22,8 +16,8 @@ if (!is_callable('random_bytes')) {
         throw new Exception(
             'There is no suitable CSPRNG installed on your system'
         );
-        return '';
     }
 }
+echo 'Done';
 --EXPECT--
 Done
diff --git a/ext/simplexml/tests/SimpleXMLElement_xpath_3.phpt b/ext/simplexml/tests/SimpleXMLElement_xpath_3.phpt
index c968a33970..8682cf818d 100644
--- a/ext/simplexml/tests/SimpleXMLElement_xpath_3.phpt
+++ b/ext/simplexml/tests/SimpleXMLElement_xpath_3.phpt
@@ -2,7 +2,6 @@
 Testing xpath() with invalid XML
 --SKIPIF--
 <?php
-if (PHP_MAJOR_VERSION < 7) die("skip this test is for PHP 7+ only");
 if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platforms only");
 ?>
 --FILE--
diff --git a/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt b/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt
index cb6b3ad08f..28e0517651 100644
--- a/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt
+++ b/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt
@@ -3,7 +3,6 @@ Testing xpath() with invalid XML
 --SKIPIF--
 <?php
 if (!extension_loaded('simplexml')) die('skip simplexml extension not loaded');
-if (PHP_MAJOR_VERSION < 7) die("skip this test is for PHP 7+ only");
 if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platforms only");
 ?>
 --FILE--