Imported Upstream version 5.2.2upstream/5.2.2

1 files changed, 46 insertions, 9 deletions

diff --git a/ext/standard/tests/strings/sha1.phpt b/ext/standard/tests/strings/sha1.phpt
index c405eedde..ed8f47457 100644
--- a/ext/standard/tests/strings/sha1.phpt
+++ b/ext/standard/tests/strings/sha1.phpt
@@ -2,13 +2,50 @@
 sha1() with ASCII output
 --FILE--
 <?php
-echo sha1("abc")."\n";
-echo sha1("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq")."\n";
-echo sha1("a")."\n";
-echo sha1("0123456701234567012345670123456701234567012345670123456701234567")."\n";
+
+$filename = dirname(__FILE__)."/sha1.dat";
+$a = array(
+	"abc",
+	"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+	"a",
+	"0123456701234567012345670123456701234567012345670123456701234567",
+	""
+);
+
+foreach ($a as $str) {
+	var_dump($val1 = sha1($str));
+	file_put_contents($filename, $str);
+	var_dump($val2 = sha1_file($filename));
+	var_dump($val1 === $val2);
+}
+
+var_dump(sha1($str, true));
+var_dump(sha1_file($filename, true));
+
+@unlink($filename);
+
+sha1_file($filename);
+
+echo "Done\n";
 ?>
---EXPECT--
-a9993e364706816aba3e25717850c26c9cd0d89d
-84983e441c3bd26ebaae4aa1f95129e5e54670f1
-86f7e437faa5a7fce15d1ddcb9eaeaea377667b8
-e0c094e867ef46c350ef54a7f59dd60bed92ae83
+--EXPECTF--
+string(40) "a9993e364706816aba3e25717850c26c9cd0d89d"
+string(40) "a9993e364706816aba3e25717850c26c9cd0d89d"
+bool(true)
+string(40) "84983e441c3bd26ebaae4aa1f95129e5e54670f1"
+string(40) "84983e441c3bd26ebaae4aa1f95129e5e54670f1"
+bool(true)
+string(40) "86f7e437faa5a7fce15d1ddcb9eaeaea377667b8"
+string(40) "86f7e437faa5a7fce15d1ddcb9eaeaea377667b8"
+bool(true)
+string(40) "e0c094e867ef46c350ef54a7f59dd60bed92ae83"
+string(40) "e0c094e867ef46c350ef54a7f59dd60bed92ae83"
+bool(true)
+string(40) "da39a3ee5e6b4b0d3255bfef95601890afd80709"
+string(40) "da39a3ee5e6b4b0d3255bfef95601890afd80709"
+bool(true)
+string(20) "%s"
+string(20) "%s"
+
+Warning: sha1_file(%ssha1.dat): failed to open stream: No such file or directory in %s on line %d
+Done