From: Felipe Pena <felipe@php.net>
Date: Sat, 19 Apr 2008 23:11:26 +0000 (+0000)
Subject: - Fixed tests
X-Git-Tag: RELEASE_2_0_0b1~317
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18fad25a772c5c82a2073c32810e205ccd5b0c45;p=php

- Fixed tests
---

diff --git a/Zend/tests/030.phpt b/Zend/tests/030.phpt
index f6af9c0584..3bdc0dc740 100644
--- a/Zend/tests/030.phpt
+++ b/Zend/tests/030.phpt
@@ -68,31 +68,31 @@ object(Exception)#2 (6) {
 ok
 --UEXPECTF--
 object(Exception)#2 (6) {
-  ["message":protected]=>
-  string(3) "foo"
-  ["string":"Exception":private]=>
-  string(0) ""
-  ["code":protected]=>
+  [u"message":protected]=>
+  unicode(3) "foo"
+  [u"string":u"Exception":private]=>
+  unicode(0) ""
+  [u"code":protected]=>
   int(0)
-  ["file":protected]=>
-  string(32) "%s"
-  ["line":protected]=>
+  [u"file":protected]=>
+  unicode(%d) "%s"
+  [u"line":protected]=>
   int(%d)
-  ["trace":"Exception":private]=>
+  [u"trace":u"Exception":private]=>
   array(1) {
     [0]=>
     array(6) {
-      ["file"]=>
-      string(32) "%s"
-      ["line"]=>
+      [u"file"]=>
+      unicode(%d) "%s"
+      [u"line"]=>
       int(%d)
-      ["function"]=>
-      string(3) "bar"
-      ["class"]=>
-      string(3) "foo"
-      ["type"]=>
-      string(2) "->"
-      ["args"]=>
+      [u"function"]=>
+      unicode(3) "bar"
+      [u"class"]=>
+      unicode(3) "foo"
+      [u"type"]=>
+      unicode(2) "->"
+      [u"args"]=>
       array(0) {
       }
     }
diff --git a/ext/standard/tests/array/natcasesort_variation3.phpt b/ext/standard/tests/array/natcasesort_variation3.phpt
index 62e51a5e3c..9f28c80cb9 100644
--- a/ext/standard/tests/array/natcasesort_variation3.phpt
+++ b/ext/standard/tests/array/natcasesort_variation3.phpt
@@ -1,5 +1,9 @@
 --TEST--
 Test natcasesort() function : usage variations - different numeric types
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
+?>
 --FILE--
 <?php
 /* Prototype  : bool natcasesort(array &$array_arg)
@@ -219,4 +223,4 @@ array(7) {
   [1]=>
   float(2147483648)
 }
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/network/ip_x86_64.phpt b/ext/standard/tests/network/ip_x86_64.phpt
index bc3e72c2a2..23bbc931ea 100644
--- a/ext/standard/tests/network/ip_x86_64.phpt
+++ b/ext/standard/tests/network/ip_x86_64.phpt
@@ -48,20 +48,51 @@ string(7) "0.0.0.0"
 int(1118019956)
 string(14) "66.163.161.116"
 
-Warning: Wrong parameter count for ip2long() in %s on line %d
+Warning: ip2long() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 bool(false)
 bool(false)
 int(1869573999)
 
-Notice: Array to string conversion in %s on line %d
-bool(false)
+Warning: ip2long() expects parameter 1 to be string, array given in %s on line %d
+NULL
 
-Warning: Wrong parameter count for long2ip() in %s on line %d
+Warning: long2ip() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 string(13) "255.254.82.80"
 string(7) "0.0.0.0"
 
-Notice: Array to string conversion in %s on line %d
-string(7) "0.0.0.0"
+Warning: long2ip() expects parameter 1 to be string, array given in %s on line %d
+NULL
+Done
+--UEXPECTF--	
+int(2130706433)
+unicode(9) "127.0.0.1"
+int(167772161)
+unicode(8) "10.0.0.1"
+int(4294967295)
+unicode(15) "255.255.255.255"
+int(4294967040)
+unicode(13) "255.255.255.0"
+int(0)
+unicode(7) "0.0.0.0"
+int(1118019956)
+unicode(14) "66.163.161.116"
+
+Warning: ip2long() expects exactly 1 parameter, 0 given in %s on line %d
+NULL
+bool(false)
+bool(false)
+int(1869573999)
+
+Warning: ip2long() expects parameter 1 to be binary string, array given in %s on line %d
+NULL
+
+Warning: long2ip() expects exactly 1 parameter, 0 given in %s on line %d
+NULL
+unicode(13) "255.254.82.80"
+unicode(7) "0.0.0.0"
+
+Warning: long2ip() expects parameter 1 to be binary string, array given in %s on line %d
+NULL
 Done