From 76827e39ba0d6fd271a3cd78b91deb430425eb56 Mon Sep 17 00:00:00 2001
From: Kalle Sommer Nielsen <kalle@php.net>
Date: Tue, 26 Jun 2018 22:38:00 +0200
Subject: [PATCH] Minor cleanup in regards to magic_quotes in tests:

- dba008.phpt never runs anyway, no need to keep it
- bug75357.phpt has a branch that is never hit, which should not change the bug behavior in anyway
- bug55371.phpt added a simple 'done' test to not let the EXPECT section be empty
---
 ext/dba/tests/dba008.phpt                     | 37 -------------------
 ext/opcache/tests/bug75357.phpt               |  3 --
 .../tests/general_functions/bug55371.phpt     |  3 ++
 3 files changed, 3 insertions(+), 40 deletions(-)
 delete mode 100644 ext/dba/tests/dba008.phpt

diff --git a/ext/dba/tests/dba008.phpt b/ext/dba/tests/dba008.phpt
deleted file mode 100644
index f7015d921f..0000000000
--- a/ext/dba/tests/dba008.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-DBA magic_quotes_runtime Test
---SKIPIF--
-<?php 
-	die('skip, magic_quotes removed');
-	require_once(dirname(__FILE__) .'/skipif.inc');
-	die("info $HND handler used");
-?>
---FILE--
-<?php
-	require_once(dirname(__FILE__) .'/test.inc');
-	echo "database handler: $handler\n";
-	if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
-		ini_set('magic_quotes_runtime', 0);
-		dba_insert("key1", '"', $db_file);
-		var_dump(dba_fetch("key1", $db_file));
-		ini_set('magic_quotes_runtime', 1);
-		var_dump(dba_fetch("key1", $db_file));
-		dba_replace("key1", '\"', $db_file);
-		var_dump(dba_fetch("key1", $db_file));
-		ini_set('magic_quotes_runtime', 0);
-		var_dump(dba_fetch("key1", $db_file));
-		dba_close($db_file);
-	} else {
-		echo "Error creating database\n";
-	}
-?>
---CLEAN--
-<?php 
-	require(dirname(__FILE__) .'/clean.inc'); 
-?>
---EXPECTF--
-database handler: %s
-string(1) """
-string(2) "\""
-string(2) "\""
-string(1) """
diff --git a/ext/opcache/tests/bug75357.phpt b/ext/opcache/tests/bug75357.phpt
index 9dbace25e6..359f6160c2 100644
--- a/ext/opcache/tests/bug75357.phpt
+++ b/ext/opcache/tests/bug75357.phpt
@@ -26,9 +26,6 @@ function wp_slash( $value ) {
 }
 
 function addslashes_gpc($gpc) {
-	if ( get_magic_quotes_gpc() )
-		$gpc = stripslashes($gpc);
-
 	return wp_slash($gpc);
 }
 
diff --git a/ext/standard/tests/general_functions/bug55371.phpt b/ext/standard/tests/general_functions/bug55371.phpt
index 179da01f39..e28a6e5009 100644
--- a/ext/standard/tests/general_functions/bug55371.phpt
+++ b/ext/standard/tests/general_functions/bug55371.phpt
@@ -6,5 +6,8 @@ Bug #55371 (get_magic_quotes_gpc() and get_magic_quotes_runtime() throw deprecat
 get_magic_quotes_gpc();
 get_magic_quotes_runtime();
 
+echo 'done';
+
 ?>
 --EXPECT--
+done
-- 
2.40.0