X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=tests%2Fconv001.phpt;h=ec88151d4227c08e1d01748b3286582cceeaa91d;hp=f8eef52a7583e8f8bd17a5d816c1c9da3dbc868a;hb=07b495a28adae2152164369654b365a93273cea9;hpb=9ba862160ca65ed9a1e5eada87dcceba7fbf08d7

diff --git a/tests/conv001.phpt b/tests/conv001.phpt
index f8eef52..ec88151 100644
--- a/tests/conv001.phpt
+++ b/tests/conv001.phpt
@@ -3,6 +3,7 @@ converter
 --SKIPIF--
 <?php
 include "_skipif.inc";
+_ext("json");
 ?>
 --INI--
 date.timezone=UTC
@@ -12,7 +13,7 @@ echo "Test\n";
 
 include "_setup.inc";
 
-abstract class Converter implements pq\ConverterInterface
+abstract class Converter implements pq\Converter
 {
 	protected $types;
 	
@@ -27,11 +28,11 @@ class HStoreConverter extends Converter
 		return [ $this->types["hstore"]->oid ];
 	}
 	
-	function convertFromString($string) {
+	function convertFromString($string, $type) {
 		return eval("return [$string];");
 	}
 	
-	function convertToString($data) {
+	function convertToString($data, $type) {
 		$string = "";
 		foreach ($data as $k => $v) {
 			if (isset($v)) {
@@ -53,11 +54,11 @@ class IntVectorConverter extends Converter
 		];
 	}
 	
-	function convertFromString($string) {
+	function convertFromString($string, $type) {
 		return array_map("intval", explode(" ", $string));
 	}
 	
-	function convertToString($data) {
+	function convertToString($data, $type) {
 		return implode(" ", $data);
 	}
 }
@@ -68,11 +69,11 @@ class JSONConverter extends Converter
 		return [ $this->types["json"]->oid ];
 	}
 	
-	function convertFromString($string) {
+	function convertFromString($string, $type) {
 		return json_decode($string);
 	}
 	
-	function convertToString($data) {
+	function convertToString($data, $type) {
 		return json_encode($data);
 	}
 }
@@ -346,7 +347,7 @@ array(1) {
       string(3) "UTC"
     }
     [17]=>
-    object(pq\DateTime)#159 (4) {
+    object(pq\DateTime)#%d (4) {
       ["format"]=>
       string(14) "Y-m-d H:i:s.uO"
       ["date"]=>