From 101c78050032de22832a83630ea136b2752d0fe6 Mon Sep 17 00:00:00 2001
From: Jeff Welch <whatthejeff@gmail.com>
Date: Fri, 8 Nov 2013 13:07:22 -0500
Subject: [PATCH 1/3] Fixed tests that fail with non-default
 `serialize_precision` configurations.

See:

 * https://bugs.php.net/bug.php?id=64760
 * 4dc4302
---
 ext/standard/tests/general_functions/var_export-locale.phpt | 2 +-
 ext/standard/tests/general_functions/var_export_basic3.phpt | 2 +-
 ext/standard/tests/general_functions/var_export_basic5.phpt | 2 ++
 tests/lang/bug24640.phpt                                    | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ext/standard/tests/general_functions/var_export-locale.phpt b/ext/standard/tests/general_functions/var_export-locale.phpt
index 3cbebe9c723..b6f87c431c5 100644
--- a/ext/standard/tests/general_functions/var_export-locale.phpt
+++ b/ext/standard/tests/general_functions/var_export-locale.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test var_export() function with locale
 --INI--
-precision=14
+serialize_precision=17
 --SKIPIF--
 <?php
 if (!setlocale(LC_ALL, "german", "de","de_DE","de_DE.ISO8859-1","de_DE.ISO_8859-1","de_DE.UTF-8")) {
diff --git a/ext/standard/tests/general_functions/var_export_basic3.phpt b/ext/standard/tests/general_functions/var_export_basic3.phpt
index 9e27d904258..58c04481679 100644
--- a/ext/standard/tests/general_functions/var_export_basic3.phpt
+++ b/ext/standard/tests/general_functions/var_export_basic3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test var_export() function with valid float values
 --INI--
-precision=14
+serialize_precision=17
 --FILE--
 <?php
 /* Prototype  : mixed var_export(mixed var [, bool return])
diff --git a/ext/standard/tests/general_functions/var_export_basic5.phpt b/ext/standard/tests/general_functions/var_export_basic5.phpt
index 1512fa8377b..dacb3553230 100644
--- a/ext/standard/tests/general_functions/var_export_basic5.phpt
+++ b/ext/standard/tests/general_functions/var_export_basic5.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test var_export() function with valid arrays
+--INI--
+serialize_precision=17
 --FILE--
 <?php
 /* Prototype  : mixed var_export(mixed var [, bool return])
diff --git a/tests/lang/bug24640.phpt b/tests/lang/bug24640.phpt
index e41d0201b77..d02889101e6 100644
--- a/tests/lang/bug24640.phpt
+++ b/tests/lang/bug24640.phpt
@@ -2,6 +2,7 @@
 Bug #24640 (var_export and var_dump can't output large float)
 --INI--
 precision=12
+serialize_precision=17
 --FILE--
 <?php
 function test($v)

From 050dd59c639d2c742042bc884021fc3d0fca0c7b Mon Sep 17 00:00:00 2001
From: Aaron Hamid <aaron.hamid@gmail.com>
Date: Sun, 17 Nov 2013 22:59:42 -0500
Subject: [PATCH 2/3] added a test to cover distinction between boolean return
 value of unserialize function and deserializing serialized boolean

---
 .../serialize/serialization_error_002.phpt    | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 ext/standard/tests/serialize/serialization_error_002.phpt

diff --git a/ext/standard/tests/serialize/serialization_error_002.phpt b/ext/standard/tests/serialize/serialization_error_002.phpt
new file mode 100644
index 00000000000..6525aaaf435
--- /dev/null
+++ b/ext/standard/tests/serialize/serialization_error_002.phpt
@@ -0,0 +1,52 @@
+--TEST--
+Test unserialize(): error is indistinguishable from deserialized boolean
+--FILE--
+<?php
+/* Prototype  : proto string serialize(mixed variable)
+ * Description: Returns a string representation of variable (which can later be unserialized) 
+ * Source code: ext/standard/var.c
+ * Alias to functions: 
+ */
+/* Prototype  : proto mixed unserialize(string variable_representation)
+ * Description: Takes a string representation of variable and recreates it 
+ * Source code: ext/standard/var.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing unserialize() error/boolean distinction ***\n";
+
+$garbage = "obvious non-serialized data";
+$serialized_false = serialize(false);
+
+var_dump($serialized_false);
+
+$deserialized_garbage = unserialize($garbage);
+var_dump($deserialized_garbage);
+
+$deserialized_false = unserialize($serialized_false);
+var_dump($deserialized_false);
+
+echo "unserialize error and deserialized false are identical? " . (bool) ($deserialized_false == $deserialized_garbage) . "\n";
+
+// candidate safe idiom for determining whether data is serialized
+function isSerialized($str) {
+    return ($str == serialize(false) || @unserialize($str) !== false);
+}
+
+// Test unserialize error idiom
+var_dump(isSerialized($garbage));
+var_dump(isSerialized($serialized_false));
+
+echo "Done";
+?>
+--EXPECTF--
+*** Testing unserialize() error/boolean distinction ***
+string(4) "b:0;"
+
+Notice: unserialize(): Error at offset 0 of 27 bytes in %s/serialization_error_002.php on line 20
+bool(false)
+bool(false)
+unserialize error and deserialized false are identical? 1
+bool(false)
+bool(true)
+Done

From 0d558afc057e5e939d6cab325b2ddf2c170f0103 Mon Sep 17 00:00:00 2001
From: Yasuo Ohgaki <yohgaki@php.net>
Date: Wed, 20 Nov 2013 07:17:53 +0900
Subject: [PATCH 3/3] Fix WS in serialization_error_002.phpt

---
 ext/standard/tests/serialize/serialization_error_002.phpt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ext/standard/tests/serialize/serialization_error_002.phpt b/ext/standard/tests/serialize/serialization_error_002.phpt
index 6525aaaf435..6b4f6e376b7 100644
--- a/ext/standard/tests/serialize/serialization_error_002.phpt
+++ b/ext/standard/tests/serialize/serialization_error_002.phpt
@@ -3,14 +3,14 @@ Test unserialize(): error is indistinguishable from deserialized boolean
 --FILE--
 <?php
 /* Prototype  : proto string serialize(mixed variable)
- * Description: Returns a string representation of variable (which can later be unserialized) 
+ * Description: Returns a string representation of variable (which can later be unserialized)
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 /* Prototype  : proto mixed unserialize(string variable_representation)
- * Description: Takes a string representation of variable and recreates it 
+ * Description: Takes a string representation of variable and recreates it
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing unserialize() error/boolean distinction ***\n";