From: Florian MARGAINE <florian@margaine.com>
Date: Sat, 20 Sep 2014 16:24:38 +0000 (+0200)
Subject: Reverts some unwanted changes
X-Git-Tag: PRE_NATIVE_TLS_MERGE~158^2~82^2~3^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ad996da17ee073ddc5b4f2111992a7684167eb7;p=php

Reverts some unwanted changes
---

diff --git a/ext/posix/tests/posix_access_error_modes.phpt b/ext/posix/tests/posix_access_error_modes.phpt
index 8a3d239fa3..fb04e34683 100644
--- a/ext/posix/tests/posix_access_error_modes.phpt
+++ b/ext/posix/tests/posix_access_error_modes.phpt
@@ -38,7 +38,7 @@ chmod ($filename, 0700);
 unlink($filename);
 ?>
 --EXPECTF--
-WDeprecated: Directive 'safe_mode' is deprecated in PHP 7.3 and greater in Unknown on line %d
+WDeprecated: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line %d
 bool(false)
 bool(false)
 bool(false)
diff --git a/ext/simplexml/tests/bug24392.phpt b/ext/simplexml/tests/bug24392.phpt
index 3883018f52..0a462e5770 100644
--- a/ext/simplexml/tests/bug24392.phpt
+++ b/ext/simplexml/tests/bug24392.phpt
@@ -13,7 +13,7 @@ foreach ($s->item as $item) {
 EU Parliament to Vote on New Patent Rules
 Most Powerful Amateur Rocket in Canada
 GF FX 5900 Ultra vs. ATi Radeon 9800 Pro
-PHP 7 Beta 1
+PHP 5 Beta 1
 Engaging with the OSS Community
 Pure Math, Pure Joy
 Windows Tech Writer Looks at Linux
diff --git a/ext/xmlreader/TODO b/ext/xmlreader/TODO
index ff6b9b0baf..744c56192a 100644
--- a/ext/xmlreader/TODO
+++ b/ext/xmlreader/TODO
@@ -1,6 +1,6 @@
 - Implement functions to support PHP 4
 
-- Refactor internals once libxml 2.6.x is minimum requirement for PHP 7
+- Refactor internals once libxml 2.6.x is minimum requirement for PHP 5
   use new api for creating the xmlTextReaderPtr
 
 - Add Custom Error Handling