From e6219a095de78ce03be4a36360020a6f4fe94105 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Sun, 21 Aug 2022 15:58:09 +0200
Subject: Fix sloppy comparison

---
 src/tests/global_strict/global_strict_issue432.phpt | 21 +++++++++++++++++++++
 src/tests/sloppy_comparison/sloppy_comparison.phpt  |  2 +-
 .../sloppy_comparison/sloppy_comparison_array.phpt  |  2 +-
 .../sloppy_comparison_array_keys.phpt               |  4 ++--
 .../sloppy_comparison_array_search.phpt             |  4 ++--
 .../sloppy_comparison_disable.phpt                  | 19 +++++++++++++++++--
 6 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 src/tests/global_strict/global_strict_issue432.phpt

(limited to 'src/tests')

diff --git a/src/tests/global_strict/global_strict_issue432.phpt b/src/tests/global_strict/global_strict_issue432.phpt
new file mode 100644
index 0000000..008529e
--- /dev/null
+++ b/src/tests/global_strict/global_strict_issue432.phpt
@@ -0,0 +1,21 @@
+--TEST--
+Global strict mode, for issue #432
+--SKIPIF--
+<?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
+--INI--
+sp.configuration_file={PWD}/config/global_strict_disabled.ini
+--FILE--
+<?php 
+$filename = '/tmp/test.txt';
+file_put_contents($filename, '0');
+$var = file_get_contents($filename);
+if ($var == "0") {
+	print("WIN");
+}
+if ($var == 0) {
+	print("WIN");
+}
+unlink($filename);
+?>
+--EXPECT--
+WINWIN
diff --git a/src/tests/sloppy_comparison/sloppy_comparison.phpt b/src/tests/sloppy_comparison/sloppy_comparison.phpt
index da28e3d..cf91f15 100644
--- a/src/tests/sloppy_comparison/sloppy_comparison.phpt
+++ b/src/tests/sloppy_comparison/sloppy_comparison.phpt
@@ -12,7 +12,7 @@ if ($qwe == 0) {
 }
 $qwe = "0e123";
 if ("0e432" == $qwe) {
-  echo "failed";
+  echo "failed_power";
 }
 $qwe = [];
 $test = false;
diff --git a/src/tests/sloppy_comparison/sloppy_comparison_array.phpt b/src/tests/sloppy_comparison/sloppy_comparison_array.phpt
index 79f9ed6..1316663 100644
--- a/src/tests/sloppy_comparison/sloppy_comparison_array.phpt
+++ b/src/tests/sloppy_comparison/sloppy_comparison_array.phpt
@@ -8,7 +8,7 @@ sp.configuration_file={PWD}/config/sloppy_comparison.ini
 <?php 
 $qwe = array(rand(1,2), "qwe");
 var_dump(in_array(0, $qwe));
-var_dump(in_array(0, $qwe, 0));
+var_dump(in_array(0, $qwe, false));
 ?>
 --EXPECT--
 bool(false)
diff --git a/src/tests/sloppy_comparison/sloppy_comparison_array_keys.phpt b/src/tests/sloppy_comparison/sloppy_comparison_array_keys.phpt
index 934f3ba..25e89e8 100644
--- a/src/tests/sloppy_comparison/sloppy_comparison_array_keys.phpt
+++ b/src/tests/sloppy_comparison/sloppy_comparison_array_keys.phpt
@@ -8,8 +8,8 @@ sp.configuration_file={PWD}/config/sloppy_comparison.ini
 <?php 
 $qwe = array(rand(1,2), "qwe");
 var_dump(array_keys($qwe, 0));
-var_dump(array_keys($qwe, 0, 0));
-var_dump(array_keys($qwe, 0, 1));
+var_dump(array_keys($qwe, 0, FALSE));
+var_dump(array_keys($qwe, 0, TRUE));
 
 $toto = [
         "toto" => 1,
diff --git a/src/tests/sloppy_comparison/sloppy_comparison_array_search.phpt b/src/tests/sloppy_comparison/sloppy_comparison_array_search.phpt
index 60d11d1..ac3f10f 100644
--- a/src/tests/sloppy_comparison/sloppy_comparison_array_search.phpt
+++ b/src/tests/sloppy_comparison/sloppy_comparison_array_search.phpt
@@ -8,8 +8,8 @@ sp.configuration_file={PWD}/config/sloppy_comparison.ini
 <?php 
 $qwe = array(rand(1,2), "qwe");
 var_dump(array_search(0, $qwe));
-var_dump(array_search(0, $qwe, 0));
-var_dump(array_search(0, $qwe, 1));
+var_dump(array_search(0, $qwe, FALSE));
+var_dump(array_search(0, $qwe, TRUE));
 ?>
 --EXPECT--
 bool(false)
diff --git a/src/tests/sloppy_comparison/sloppy_comparison_disable.phpt b/src/tests/sloppy_comparison/sloppy_comparison_disable.phpt
index cdcd9a8..be615f5 100644
--- a/src/tests/sloppy_comparison/sloppy_comparison_disable.phpt
+++ b/src/tests/sloppy_comparison/sloppy_comparison_disable.phpt
@@ -9,8 +9,23 @@ sp.allow_broken_configuration=On
 <?php 
 $qwe = "abc";
 if ($qwe == 0) {
-  echo "OK";
+  echo "ONE";
 }
+$qwe = "0e123";
+if ("0e432" == $qwe) {
+  echo "TWO";
+}
+$qwe = [];
+$test = false;
+if ($test == $qwe) {
+  echo "THREE";
+}
+eval("
+\$asd = 'qwe';
+if (\$asd == 0) {
+  echo 'FOUR';
+}
+");
 ?>
 --EXPECT--
-OK
+ONETWOTHREEFOUR
-- 
cgit v1.3