Try to fix setcookie() tests on 32-bit

php · Sep 8, 2020 · 2d1b872 · 2d1b872
1 parent a6a9611
commit 2d1b872
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 15 deletions.
diff --git a/ext/standard/tests/network/setcookie_array_option_error.phpt b/ext/standard/tests/network/setcookie_array_option_error.phpt
@@ -25,13 +25,6 @@ try {
 } catch (\ValueError $e) {
     echo $e->getMessage() . "\n";
 }
-// Invalid expiration date
-// To go above year 9999: 60 * 60 * 24 * 365 * 9999
-try {
-    setcookie('name', 'value', ['expires' => 315328464000]);
-} catch (\ValueError $e) {
-    echo $e->getMessage() . "\n";
-}
 // Invalid path key content
 try {
     setcookie('name', 'value', ['path' => '/;/']);
@@ -52,17 +45,28 @@ try {
     echo $e->getMessage() . "\n";
 }
 
+if (PHP_INT_SIZE == 8) {
+    try {
+        // To go above year 9999: 60 * 60 * 24 * 365 * 9999
+        setrawcookie('name', 'value', ['expires' => 315328464000]);
+    } catch (\ValueError $e) {
+        var_dump($e->getMessage() == 'setcookie(): "expires" option cannot have a year greater than 9999');
+    }
+} else {
+    var_dump(true);
+}
+
 var_dump(headers_list());
 --EXPECTHEADERS--
 
 --EXPECTF--
 setcookie(): option "unknown_key" is invalid
 setcookie(): option array cannot have numeric keys
 setcookie(): option "foo" is invalid
-setcookie(): "expires" option cannot have a year greater than 9999
 setcookie(): "path" option cannot contain ",", ";", " ", "\t", "\r", "\n", "\013", or "\014"
 setcookie(): "domain" option cannot contain ",", ";", " ", "\t", "\r", "\n", "\013", or "\014"
 setcookie(): Expects exactly 3 arguments when argument #3 ($expires_or_options) is an array
+bool(false)
 array(1) {
   [0]=>
   string(%s) "X-Powered-By: PHP/%s"

diff --git a/ext/standard/tests/network/setcookie_error.phpt b/ext/standard/tests/network/setcookie_error.phpt
@@ -22,12 +22,6 @@ try {
 } catch (\ValueError $e) {
     echo $e->getMessage() . "\n";
 }
-// To go above year 9999: 60 * 60 * 24 * 365 * 9999
-try {
-    setcookie('name', 'value', 315328464000);
-} catch (\ValueError $e) {
-    echo $e->getMessage() . "\n";
-}
 try {
     setcookie('name', 'value', 100, 'invalid;');
 } catch (\ValueError $e) {
@@ -39,15 +33,28 @@ try {
     echo $e->getMessage() . "\n";
 }
 
+if (PHP_INT_SIZE == 8) {
+    try {
+        // To go above year 9999: 60 * 60 * 24 * 365 * 9999
+        setcookie('name', 'value', 315328464000);
+    } catch (\ValueError $e) {
+        var_dump($e->getMessage() == 'setcookie(): "expires" option cannot have a year greater than 9999');
+    }
+} else {
+    var_dump(true);
+}
+
 var_dump(headers_list());
+
+?>
 --EXPECTHEADERS--
 
 --EXPECTF--
 setcookie(): Argument #1 ($name) cannot be empty
 setcookie(): Argument #1 ($name) cannot contain "=", ",", ";", " ", "\t", "\r", "\n", "\013", or "\014"
-setcookie(): "expires" option cannot have a year greater than 9999
 setcookie(): "path" option cannot contain ",", ";", " ", "\t", "\r", "\n", "\013", or "\014"
 setcookie(): "domain" option cannot contain ",", ";", " ", "\t", "\r", "\n", "\013", or "\014"
+bool(true)
 array(2) {
   [0]=>
   string(%d) "X-Powered-By: PHP/%s"

diff --git a/ext/standard/tests/network/setrawcookie_error.phpt b/ext/standard/tests/network/setrawcookie_error.phpt
@@ -39,7 +39,20 @@ try {
     echo $e->getMessage() . "\n";
 }
 
+if (PHP_INT_SIZE == 8) {
+    try {
+        // To go above year 9999: 60 * 60 * 24 * 365 * 9999
+        setrawcookie('name', 'value', 315328464000);
+    } catch (\ValueError $e) {
+        var_dump($e->getMessage() == 'setrawcookie(): "expires" option cannot have a year greater than 9999');
+    }
+} else {
+    var_dump(true);
+}
+
 var_dump(headers_list());
+
+?>
 --EXPECTHEADERS--
 
 --EXPECTF--
@@ -49,6 +62,7 @@ setrawcookie(): Argument #2 ($value) cannot contain ",", ";", " ", "\t", "\r", "
 setrawcookie(): "expires" option cannot have a year greater than 9999
 setrawcookie(): "path" option cannot contain ",", ";", " ", "\t", "\r", "\n", "\013", or "\014"
 setrawcookie(): "domain" option cannot contain ",", ";", " ", "\t", "\r", "\n", "\013", or "\014"
+bool(true)
 array(1) {
   [0]=>
   string(%d) "X-Powered-By: PHP/%s"