Fix skip messages

diff --git a/ext/standard/tests/password/password_get_info_argon2.phpt b/ext/standard/tests/password/password_get_info_argon2.phpt
index 903f9faca5287f32ed6b7dcd0e92a3c43fdbd182..80c6f934163279905c60f650b4efa80530307df0 100644 (file)
--- a/ext/standard/tests/password/password_get_info_argon2.phpt
+++ b/ext/standard/tests/password/password_get_info_argon2.phpt
@@ -1,29 +1,29 @@
---TEST--
-Test normal operation of password_get_info() with Argon2
---SKIPIF--
-<?php
-if (!defined('PASSWORD_ARGON2I')) die('Skipped: password_get_info not built with Argon2');
-?>
---FILE--
-<?php
-
-var_dump(password_get_info('$argon2i$v=19$m=65536,t=3,p=1$SWhIcG5MT21Pc01PbWdVZw$WagZELICsz7jlqOR2YzoEVTWb2oOX1tYdnhZYXxptbU'));
-echo "OK!";
-?>
---EXPECT--
-array(3) {
-  ["algo"]=>
-  int(2)
-  ["algoName"]=>
-  string(7) "argon2i"
-  ["options"]=>
-  array(3) {
-    ["memory_cost"]=>
-    int(65536)
-    ["time_cost"]=>
-    int(3)
-    ["threads"]=>
-    int(1)
-  }
-}
+--TEST--\r
+Test normal operation of password_get_info() with Argon2\r
+--SKIPIF--\r
+<?php\r
+if (!defined('PASSWORD_ARGON2I')) die('skip password_get_info not built with Argon2');\r
+?>\r
+--FILE--\r
+<?php\r
+\r
+var_dump(password_get_info('$argon2i$v=19$m=65536,t=3,p=1$SWhIcG5MT21Pc01PbWdVZw$WagZELICsz7jlqOR2YzoEVTWb2oOX1tYdnhZYXxptbU'));\r
+echo "OK!";\r
+?>\r
+--EXPECT--\r
+array(3) {\r
+  ["algo"]=>\r
+  int(2)\r
+  ["algoName"]=>\r
+  string(7) "argon2i"\r
+  ["options"]=>\r
+  array(3) {\r
+    ["memory_cost"]=>\r
+    int(65536)\r
+    ["time_cost"]=>\r
+    int(3)\r
+    ["threads"]=>\r
+    int(1)\r
+  }\r
+}\r
 OK!
\ No newline at end of file

diff --git a/ext/standard/tests/password/password_hash_argon2.phpt b/ext/standard/tests/password/password_hash_argon2.phpt
index 03fee3978e28b9296cee3f2c2fe1a1c04b127284..7bd8cd700c13bad53f6af6cfcf20d6f0ce2d17e5 100644 (file)
--- a/ext/standard/tests/password/password_hash_argon2.phpt
+++ b/ext/standard/tests/password/password_hash_argon2.phpt
@@ -1,18 +1,18 @@
---TEST--
-Test normal operation of password_hash() with argon2
---SKIPIF--
-<?php
-if (!defined('PASSWORD_ARGON2I')) die('Skipped: password_hash not built with Argon2');
---FILE--
-<?php
-
-$password = "the password for testing 12345!";
-
-$hash = password_hash($password, PASSWORD_ARGON2I);
-var_dump(password_verify($password, $hash));
-
-echo "OK!";
-?>
---EXPECT--
-bool(true)
+--TEST--\r
+Test normal operation of password_hash() with argon2\r
+--SKIPIF--\r
+<?php\r
+if (!defined('PASSWORD_ARGON2I')) die('skip password_hash not built with Argon2');\r
+--FILE--\r
+<?php\r
+\r
+$password = "the password for testing 12345!";\r
+\r
+$hash = password_hash($password, PASSWORD_ARGON2I);\r
+var_dump(password_verify($password, $hash));\r
+\r
+echo "OK!";\r
+?>\r
+--EXPECT--\r
+bool(true)\r
 OK!
\ No newline at end of file

diff --git a/ext/standard/tests/password/password_hash_error_argon2.phpt b/ext/standard/tests/password/password_hash_error_argon2.phpt
index 39a0c4722c3c4844734991c450686bd6f35f89a4..7e8722ec6f18d8a4fe3a9ce65628e20392e080d4 100644 (file)
--- a/ext/standard/tests/password/password_hash_error_argon2.phpt
+++ b/ext/standard/tests/password/password_hash_error_argon2.phpt
@@ -1,21 +1,21 @@
---TEST--
-Test error operation of password_hash() with argon2
---SKIPIF--
-<?php
-if (!defined('PASSWORD_ARGON2I')) die('Skipped: password_hash not built with Argon2');
-?>
---FILE--
-<?php
-var_dump(password_hash('test', PASSWORD_ARGON2I, ['memory_cost' => 0]));
-var_dump(password_hash('test', PASSWORD_ARGON2I, ['time_cost' => 0]));
-var_dump(password_hash('test', PASSWORD_ARGON2I, ['threads' => 0]));
-?>
---EXPECTF--
-Warning: password_hash(): Memory cost is outside of allowed memory range in %s on line %d
-NULL
-
-Warning: password_hash(): Time cost is outside of allowed time range in %s on line %d
-NULL
-
-Warning: password_hash(): Invalid number of threads in %s on line %d
+--TEST--\r
+Test error operation of password_hash() with argon2\r
+--SKIPIF--\r
+<?php\r
+if (!defined('PASSWORD_ARGON2I')) die('skip password_hash not built with Argon2');\r
+?>\r
+--FILE--\r
+<?php\r
+var_dump(password_hash('test', PASSWORD_ARGON2I, ['memory_cost' => 0]));\r
+var_dump(password_hash('test', PASSWORD_ARGON2I, ['time_cost' => 0]));\r
+var_dump(password_hash('test', PASSWORD_ARGON2I, ['threads' => 0]));\r
+?>\r
+--EXPECTF--\r
+Warning: password_hash(): Memory cost is outside of allowed memory range in %s on line %d\r
+NULL\r
+\r
+Warning: password_hash(): Time cost is outside of allowed time range in %s on line %d\r
+NULL\r
+\r
+Warning: password_hash(): Invalid number of threads in %s on line %d\r
 NULL
\ No newline at end of file

diff --git a/ext/standard/tests/password/password_needs_rehash_argon2.phpt b/ext/standard/tests/password/password_needs_rehash_argon2.phpt
index 1fec77d3bdf07d8c380aa2a58971b5e138916463..0199d954232320c9401a6ba9e1a11cc877aef821 100644 (file)
--- a/ext/standard/tests/password/password_needs_rehash_argon2.phpt
+++ b/ext/standard/tests/password/password_needs_rehash_argon2.phpt
@@ -1,22 +1,22 @@
---TEST--
-Test normal operation of password_needs_rehash() with argon2
---SKIPIF--
-<?php
-if (!defined('PASSWORD_ARGON2I')) die('Skipped: password_needs_rehash not built with Argon2');
-?>
---FILE--
-<?php
-
-$hash = '$argon2i$v=19$m=65536,t=3,p=1$YkprUktYN0lHQTd2bWRFeA$79aA+6IvgclpDAJVoezProlqzIPy7do/P0sBDXS9Nn0';
-var_dump(password_needs_rehash($hash, PASSWORD_ARGON2I));
-var_dump(password_needs_rehash($hash, PASSWORD_ARGON2I, ['memory_cost' => 1<<17]));
-var_dump(password_needs_rehash($hash, PASSWORD_ARGON2I, ['time_cost' => 2]));
-var_dump(password_needs_rehash($hash, PASSWORD_ARGON2I, ['threads' => 2]));
-echo "OK!";
-?>
---EXPECT--
-bool(false)
-bool(true)
-bool(true)
-bool(true)
-OK!
+--TEST--\r
+Test normal operation of password_needs_rehash() with argon2\r
+--SKIPIF--\r
+<?php\r
+if (!defined('PASSWORD_ARGON2I')) die('skip password_needs_rehash not built with Argon2');\r
+?>\r
+--FILE--\r
+<?php\r
+\r
+$hash = '$argon2i$v=19$m=65536,t=3,p=1$YkprUktYN0lHQTd2bWRFeA$79aA+6IvgclpDAJVoezProlqzIPy7do/P0sBDXS9Nn0';\r
+var_dump(password_needs_rehash($hash, PASSWORD_ARGON2I));\r
+var_dump(password_needs_rehash($hash, PASSWORD_ARGON2I, ['memory_cost' => 1<<17]));\r
+var_dump(password_needs_rehash($hash, PASSWORD_ARGON2I, ['time_cost' => 2]));\r
+var_dump(password_needs_rehash($hash, PASSWORD_ARGON2I, ['threads' => 2]));\r
+echo "OK!";\r
+?>\r
+--EXPECT--\r
+bool(false)\r
+bool(true)\r
+bool(true)\r
+bool(true)\r
+OK!\r

diff --git a/ext/standard/tests/password/password_verify_argon2.phpt b/ext/standard/tests/password/password_verify_argon2.phpt
index 99917a7a28861f55ce1b98aee5853dd9430e5440..e3a35942f59116c552f8e9bceb26d69f6069ac66 100644 (file)
--- a/ext/standard/tests/password/password_verify_argon2.phpt
+++ b/ext/standard/tests/password/password_verify_argon2.phpt
@@ -1,18 +1,18 @@
---TEST--
-Test normal operation of password_verify() with argon2
---SKIPIF--
-<?php
-if (!defined('PASSWORD_ARGON2I')) die('Skipped: password_verify not built with Argon2');
-?>
---FILE--
-<?php
-
-var_dump(password_verify('test', '$argon2i$v=19$m=65536,t=3,p=1$OEVjWWs2Z3YvWlNZQ0ZmNw$JKin7ahjmh8JYvMyFcXri0Ss/Uvd3uYpD7MG6C/5Cy0'));
-
-var_dump(password_verify('argon2', '$argon2i$v=19$m=65536,t=3,p=1$OEVjWWs2Z3YvWlNZQ0ZmNw$JKin7ahjmh8JYvMyFcXri0Ss/Uvd3uYpD7MG6C/5Cy0'));
-echo "OK!";
-?>
---EXPECT--
-bool(true)
-bool(false)
+--TEST--\r
+Test normal operation of password_verify() with argon2\r
+--SKIPIF--\r
+<?php\r
+if (!defined('PASSWORD_ARGON2I')) die('skip password_verify not built with Argon2');\r
+?>\r
+--FILE--\r
+<?php\r
+\r
+var_dump(password_verify('test', '$argon2i$v=19$m=65536,t=3,p=1$OEVjWWs2Z3YvWlNZQ0ZmNw$JKin7ahjmh8JYvMyFcXri0Ss/Uvd3uYpD7MG6C/5Cy0'));\r
+\r
+var_dump(password_verify('argon2', '$argon2i$v=19$m=65536,t=3,p=1$OEVjWWs2Z3YvWlNZQ0ZmNw$JKin7ahjmh8JYvMyFcXri0Ss/Uvd3uYpD7MG6C/5Cy0'));\r
+echo "OK!";\r
+?>\r
+--EXPECT--\r
+bool(true)\r
+bool(false)\r
 OK!
\ No newline at end of file