Promote warnings to exceptions in settype() function

Author: kocsismate

Zend/tests/settype_resource.phpt

@@ -93,14 +93,19 @@ foreach ($types as $type) {
   $loop_count = 1;
   foreach ($values as $var) {
      echo "-- Iteration $loop_count --\n"; $loop_count ++;
-     // set to new type
-     var_dump( settype($var, $type) );
 
-     // dump the var
-     var_dump( $var );
+     try {
+        // set to new type
+        var_dump( settype($var, $type) );
 
-     // check the new type
-     var_dump( gettype($var) );
+        // dump the var
+        var_dump( $var );
+
+        // check the new type
+        var_dump( gettype($var) );
+     } catch (ValueError $exception) {
+         echo $exception->getMessage() . "\n";
+     }
   }
 }
 
@@ -539,94 +544,33 @@ string(7) "boolean"
 
 -- Setting type of data to resource --
 -- Iteration 1 --
-2: settype(): Cannot convert to resource type
-bool(false)
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-string(5) "array"
+Cannot convert to resource type
 -- Iteration 2 --
-2: settype(): Cannot convert to resource type
-bool(false)
-string(14) "another string"
-string(6) "string"
+Cannot convert to resource type
 -- Iteration 3 --
-2: settype(): Cannot convert to resource type
-bool(false)
-array(3) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-  [2]=>
-  int(4)
-}
-string(5) "array"
+Cannot convert to resource type
 -- Iteration 4 --
-2: settype(): Cannot convert to resource type
-bool(false)
-int(1)
-string(7) "integer"
+Cannot convert to resource type
 -- Iteration 5 --
-2: settype(): Cannot convert to resource type
-bool(false)
-int(-20)
-string(7) "integer"
+Cannot convert to resource type
 -- Iteration 6 --
-2: settype(): Cannot convert to resource type
-bool(false)
-float(2.54)
-string(6) "double"
+Cannot convert to resource type
 -- Iteration 7 --
-2: settype(): Cannot convert to resource type
-bool(false)
-float(-2.54)
-string(6) "double"
+Cannot convert to resource type
 -- Iteration 8 --
-2: settype(): Cannot convert to resource type
-bool(false)
-NULL
-string(4) "NULL"
+Cannot convert to resource type
 -- Iteration 9 --
-2: settype(): Cannot convert to resource type
-bool(false)
-bool(false)
-string(7) "boolean"
+Cannot convert to resource type
 -- Iteration 10 --
-2: settype(): Cannot convert to resource type
-bool(false)
-string(11) "some string"
-string(6) "string"
+Cannot convert to resource type
 -- Iteration 11 --
-2: settype(): Cannot convert to resource type
-bool(false)
-string(6) "string"
-string(6) "string"
+Cannot convert to resource type
 -- Iteration 12 --
-2: settype(): Cannot convert to resource type
-bool(false)
-resource(%d) of type (stream)
-string(8) "resource"
+Cannot convert to resource type
 -- Iteration 13 --
-2: settype(): Cannot convert to resource type
-bool(false)
-resource(%d) of type (stream)
-string(8) "resource"
+Cannot convert to resource type
 -- Iteration 14 --
-2: settype(): Cannot convert to resource type
-bool(false)
-object(point)#1 (2) {
-  ["x"]=>
-  int(10)
-  ["y"]=>
-  int(20)
-}
-string(6) "object"
+Cannot convert to resource type
 
 -- Setting type of data to array --
 -- Iteration 1 --

ext/standard/tests/general_functions/gettype_settype_basic.phpt

@@ -16,15 +16,17 @@ echo "**** Testing gettype() and settype() functions ****\n";
 echo "\n*** Testing settype(): error conditions ***\n";
 
 // passing an invalid type to set
-var_dump( settype( $var, "unknown" ) );
+try {
+    settype( $var, "unknown" );
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 **** Testing gettype() and settype() functions ****
 
 *** Testing settype(): error conditions ***
-
-Warning: settype(): Invalid type in %s on line %d
-bool(false)
+Invalid type
 Done