projects
/
m6w6
/
ext-pq
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge branch 'master' of git.php.net:/pecl/database/pq
[m6w6/ext-pq]
/
tests
/
conv001.phpt
diff --git
a/tests/conv001.phpt
b/tests/conv001.phpt
index f8eef52a7583e8f8bd17a5d816c1c9da3dbc868a..ec88151d4227c08e1d01748b3286582cceeaa91d 100644
(file)
--- a/
tests/conv001.phpt
+++ b/
tests/conv001.phpt
@@
-3,6
+3,7
@@
converter
--SKIPIF--
<?php
include "_skipif.inc";
--SKIPIF--
<?php
include "_skipif.inc";
+_ext("json");
?>
--INI--
date.timezone=UTC
?>
--INI--
date.timezone=UTC
@@
-12,7
+13,7
@@
echo "Test\n";
include "_setup.inc";
include "_setup.inc";
-abstract class Converter implements pq\Converter
Interface
+abstract class Converter implements pq\Converter
{
protected $types;
{
protected $types;
@@
-27,11
+28,11
@@
class HStoreConverter extends Converter
return [ $this->types["hstore"]->oid ];
}
return [ $this->types["hstore"]->oid ];
}
- function convertFromString($string) {
+ function convertFromString($string
, $type
) {
return eval("return [$string];");
}
return eval("return [$string];");
}
- function convertToString($data) {
+ function convertToString($data
, $type
) {
$string = "";
foreach ($data as $k => $v) {
if (isset($v)) {
$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));
}
return array_map("intval", explode(" ", $string));
}
- function convertToString($data) {
+ function convertToString($data
, $type
) {
return implode(" ", $data);
}
}
return implode(" ", $data);
}
}
@@
-68,11
+69,11
@@
class JSONConverter extends Converter
return [ $this->types["json"]->oid ];
}
return [ $this->types["json"]->oid ];
}
- function convertFromString($string) {
+ function convertFromString($string
, $type
) {
return json_decode($string);
}
return json_decode($string);
}
- function convertToString($data) {
+ function convertToString($data
, $type
) {
return json_encode($data);
}
}
return json_encode($data);
}
}
@@
-346,7
+347,7
@@
array(1) {
string(3) "UTC"
}
[17]=>
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"]=>
["format"]=>
string(14) "Y-m-d H:i:s.uO"
["date"]=>