loosen catchable error message

zend emits a special error for typehint violations. We aren't going to be string compatabile with this as they emit 2 line numbers and files. Lets just make sure we fatal at the same point in the test.
2013-05-09 19:21:06 -07:00
commit d7ce66ff73
@@ -5,4 +5,4 @@ HipHop Fatal error: %a
 Stack trace:
 #0 %s(%d): DateTimeZone->__construct('GMT', 99)
 #1 {main}
-  thrown in hphp/test/zend/bad/ext-date/DateTimeZone_construct_error.php on line %d
+  thrown in hphp/test/zend/bad/ext-date/DateTimeZone_construct_error.phpt on line %d
@@ -5,4 +5,4 @@ HipHop Fatal error: %a
 Stack trace:
 #0 %s(%d): DateTime->__construct('GMT', Object(DateTimeZone), 99)
 #1 {main}
-  thrown in hphp/test/zend/bad/ext-date/DateTime_construct_error.php on line %d
+  thrown in hphp/test/zend/bad/ext-date/DateTime_construct_error.phpt on line %d
@@ -82,7 +82,7 @@ bool(false)

 -- Iteration 21 --
 HipHop Notice: %a
-xyz' is invalid in hphp/test/zend/bad/ext-date/date_default_timezone_set_variation1.php on line %d
+xyz' is invalid in hphp/test/zend/bad/ext-date/date_default_timezone_set_variation1.phpt on line %d
 bool(false)

 -- Iteration 22 --
@@ -2,7 +2,7 @@

 -- Testing gmmktime() function with more than expected no. of arguments --

-Deprecated: gmmktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/gmmktime_error.php on line %d
+Deprecated: gmmktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/gmmktime_error.phpt on line %d
 int(1218182888)
 HipHop Warning: %a
 bool(false)
@@ -6,6 +6,6 @@ int(%i)
 int(%i)
 int(%i)

-Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_basic1.php on line %d
+Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_basic1.phpt on line %d
 int(%i)
 ===DONE===
@@ -2,7 +2,7 @@

 -- Testing mktime() function with Zero arguments --

-Strict Standards: mktime(): You should be using the time() function instead in hphp/test/zend/bad/ext-date/mktime_error.php on line %d
+Strict Standards: mktime(): You should be using the time() function instead in hphp/test/zend/bad/ext-date/mktime_error.phpt on line %d
 int(%d)

 -- Testing mktime() function with more than expected no. of arguments --
@@ -5,27 +5,27 @@ int(%i)

 -- int 12345 --

-Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.php on line %d
+Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.phpt on line %d
 int(%i)

 -- int -12345 --

-Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.php on line %d
+Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.phpt on line %d
 int(%i)

 -- float 10.5 --

-Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.php on line %d
+Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.phpt on line %d
 int(-205165755)

 -- float -10.5 --

-Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.php on line %d
+Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.phpt on line %d
 int(%i)

 -- float .5 --

-Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.php on line %d
+Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.phpt on line %d
 int(-205162155)

 -- empty array --
@@ -46,32 +46,32 @@ bool(false)

 -- uppercase NULL --

-Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.php on line %d
+Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.phpt on line %d
 int(%i)

 -- lowercase null --

-Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.php on line %d
+Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.phpt on line %d
 int(%i)

 -- lowercase true --

-Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.php on line %d
+Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.phpt on line %d
 int(%i)

 -- lowercase false --

-Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.php on line %d
+Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.phpt on line %d
 int(%i)

 -- uppercase TRUE --

-Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.php on line %d
+Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.phpt on line %d
 int(%i)

 -- uppercase FALSE --

-Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.php on line %d
+Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.phpt on line %d
 int(%i)

 -- empty string DQ --
@@ -108,12 +108,12 @@ bool(false)

 -- undefined var --

-Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.php on line %d
+Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.phpt on line %d
 int(%i)

 -- unset var --

-Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.php on line %d
+Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/ext-date/mktime_variation7.phpt on line %d
 int(%i)

 -- resource --
@@ -1,3 +1,3 @@
 HipHop Warning: %a
- in hphp/test/zend/bad/ext-gd/createfromwbmp2.php on line %d
+ in hphp/test/zend/bad/ext-gd/createfromwbmp2.phpt on line %d
 HipHop Warning: %a
@@ -1 +1 @@
-Catchable fatal error: Collator::compare(): Object not initialized in hphp/test/zend/bad/ext-intl/bug60192-compare.php on line %d
+HipHop Fatal error: %a
@@ -1 +1 @@
-Catchable fatal error: Collator::getLocale(): Object not initialized in hphp/test/zend/bad/ext-intl/bug60192-getlocale.php on line %d
+HipHop Fatal error: %a
@@ -1 +0,0 @@
-Catchable fatal error: Collator::getSortKey(): Object not initialized in hphp/test/zend/bad/ext-intl/bug60192-getsortkey.php on line %d
@@ -1 +1 @@
-Catchable fatal error: Collator::sort(): Object not initialized in hphp/test/zend/bad/ext-intl/bug60192-sort.php on line %d
+HipHop Fatal error: %a
@@ -1 +1 @@
-Catchable fatal error: Collator::sortWithSortKeys(): Object not initialized in hphp/test/zend/bad/ext-intl/bug60192-sortwithsortkeys.php on line %d
+HipHop Fatal error: %a
@@ -1,4 +1,4 @@
 HipHop Warning: %a
 HipHop Warning: %a

-Catchable fatal error: Argument 1 passed to transliterator_create_inverse() must be an instance of Transliterator, string given in hphp/test/zend/bad/ext-intl/transliterator_create_inverse_error.php on line %d
+HipHop Fatal error: %a
@@ -5,4 +5,4 @@ HipHop Warning: %a
 HipHop Warning: %a


-Catchable fatal error: Argument 1 passed to transliterator_get_error_code() must be an instance of Transliterator, array given in hphp/test/zend/bad/ext-intl/transliterator_get_error_code_error.php on line %d
+HipHop Fatal error: %a
@@ -5,4 +5,4 @@ HipHop Warning: %a
 HipHop Warning: %a


-Catchable fatal error: Argument 1 passed to transliterator_get_error_message() must be an instance of Transliterator, array given in hphp/test/zend/bad/ext-intl/transliterator_get_error_message_error.php on line %d
+HipHop Fatal error: %a
@@ -1,4 +1,4 @@
 bool(false)

-Deprecated: Function ereg() is deprecated in hphp/test/zend/bad/ext-mbstring/php_gr_jp_10830.php on line %d
+Deprecated: Function ereg() is deprecated in hphp/test/zend/bad/ext-mbstring/php_gr_jp_10830.phpt on line %d
 bool(false)
@@ -1,4 +1,4 @@
-Deprecated: Function ereg_replace() is deprecated in hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-1.php on line %d
+Deprecated: Function ereg_replace() is deprecated in hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-1.phpt on line %d
 string(2) "bb"
 string(2) "bb"
 string(2) "bb"
@@ -1,8 +1,8 @@
 string(4) "ABZZ"

-Deprecated: Function ereg_replace() is deprecated in hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-2.php on line %d
+Deprecated: Function ereg_replace() is deprecated in hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-2.phpt on line %d
 string(4) "ABZZ"
 string(4) "ABZZ"

-Deprecated: Function ereg_replace() is deprecated in hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-2.php on line %d
+Deprecated: Function ereg_replace() is deprecated in hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-2.phpt on line %d
 string(4) "ABZZ"
@@ -5,4 +5,4 @@ HipHop Warning: %a
 NULL
 bool(false)

-Catchable fatal error: Object of class stdClass could not be converted to string in %sbug38261.php on line %d
+HipHop Fatal error: %a
@@ -22,4 +22,4 @@ string(1) "a"
 Arg value is /[a-zA-Z]/
 string(1) "1"

-Catchable fatal error: Object of class stdClass could not be converted to string in %spreg_replace_error1.php on line %d
+HipHop Fatal error: %a
@@ -7,4 +7,4 @@ Arg value is: Array
 HipHop Warning: %a
 bool(false)

-Catchable fatal error: Object of class stdClass could not be converted to string in %spreg_replace_error2.php on line %d
+HipHop Fatal error: %a
@@ -1,4 +1,4 @@
-Deprecated: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in hphp/test/zend/bad/ext-posix/posix_access.php on line %d
+Deprecated: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in hphp/test/zend/bad/ext-posix/posix_access.phpt on line %d
 bool(true)
 bool(true)
 bool(true)
@@ -1,3 +1,3 @@
-Deprecated: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in hphp/test/zend/bad/ext-posix/posix_access_safemode.php on line %d
+Deprecated: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in hphp/test/zend/bad/ext-posix/posix_access_safemode.phpt on line %d
 bool(false)
 ===DONE===
@@ -82,4 +82,4 @@ valid output
 Arg value  
 valid output

-Catchable fatal error: Object of class stdClass could not be converted to string in hphp/test/zend/bad/ext-posix/posix_getgrgid_variation.php on line %d
+HipHop Fatal error: %a
@@ -82,4 +82,4 @@ valid output
 Arg value  
 valid output

-Catchable fatal error: Object of class stdClass could not be converted to string in hphp/test/zend/bad/ext-posix/posix_getpgid_variation.php on line %d
+HipHop Fatal error: %a
@@ -82,4 +82,4 @@ valid output
 Arg value  
 valid output

-Catchable fatal error: Object of class stdClass could not be converted to string in hphp/test/zend/bad/ext-posix/posix_getpwuid_variation.php on line %d
+HipHop Fatal error: %a
@@ -82,4 +82,4 @@ bool(false)
 Arg value  
 bool(false)

-Catchable fatal error: Object of class stdClass could not be converted to string in hphp/test/zend/bad/ext-posix/posix_kill_variation1.php on line %d
+HipHop Fatal error: %a
@@ -82,4 +82,4 @@ bool(false)
 Arg value  
 bool(false)

-Catchable fatal error: Object of class stdClass could not be converted to string in hphp/test/zend/bad/ext-posix/posix_kill_variation2.php on line %d
+HipHop Fatal error: %a
@@ -1,4 +1,4 @@
-Deprecated: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in hphp/test/zend/bad/ext-posix/posix_mkfifo_safemode.php on line %d
+Deprecated: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in hphp/test/zend/bad/ext-posix/posix_mkfifo_safemode.phpt on line %d
 HipHop Warning: %a
 bool(false)
 bool(true)
@@ -82,4 +82,4 @@ string
 Arg value  
 string

-Catchable fatal error: Object of class stdClass could not be converted to string in hphp/test/zend/bad/ext-posix/posix_strerror_variation1.php on line %d
+HipHop Fatal error: %a
@@ -132,7 +132,7 @@ bool(true)
 -- Iteration 24 --
 bool(true)

-Strict Standards: Resource ID#%d used as offset, casting to integer (%d) in hphp/test/zend/bad/ext-session/session_encode_error2.php on line %d
+Strict Standards: Resource ID#%d used as offset, casting to integer (%d) in hphp/test/zend/bad/ext-session/session_encode_error2.phpt on line %d
 HipHop Notice: %a
 bool(false)
 bool(true)
@@ -1,5 +1,5 @@
 HipHop Warning: %a
- in hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_ipv6_udp-win32.php on line %d
+ in hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_ipv6_udp-win32.phpt on line %d
 HipHop Warning: %a
 HipHop Warning: %a
 HipHop Warning: %a
@@ -2,4 +2,4 @@ HipHop Fatal error: %a
 Stack trace:
 #0 %s(%d): DirectoryIterator->__construct('')
 #1 {main}
-  thrown in hphp/test/zend/bad/ext-spl/DirectoryIterator_empty_constructor.php on line %d
+  thrown in hphp/test/zend/bad/ext-spl/DirectoryIterator_empty_constructor.phpt on line %d
@@ -2,4 +2,4 @@ HipHop Fatal error: %a
 Stack trace:
 #0 %s
 #1 {main}
-  thrown in hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetGet_param_array.php on line %d
+  thrown in hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetGet_param_array.phpt on line %d
@@ -2,4 +2,4 @@ HipHop Fatal error: %a
 Stack trace:
 #0 %s
 #1 {main}
-  thrown in hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetGet_param_string.php on line %d
+  thrown in hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetGet_param_string.phpt on line %d
@@ -11,4 +11,4 @@ one=>1
 two=>2
 ===Append===

-Catchable fatal error: ArrayIterator::append(): Cannot append properties to objects, use ArrayIterator::offsetSet() instead in %sarray_013.php on line %d
+HipHop Fatal error: %a
@@ -4,4 +4,4 @@ Stack trace:
 #1 [internal function]: Foo->getIterator()
 #2 %s: iterator_to_array(Object(Foo))
 #3 {main}
-  thrown in hphp/test/zend/bad/ext-spl/bug52238.php on line %d
+  thrown in hphp/test/zend/bad/ext-spl/bug52238.phpt on line %d
@@ -2,4 +2,4 @@ HipHop Fatal error: %a
 Stack trace:
 #0 %s(%d): DirectoryIterator->__construct('?/abc')
 #1 {main}
-  thrown in hphp/test/zend/bad/ext-spl/bug54291.php on line %d
+  thrown in hphp/test/zend/bad/ext-spl/bug54291.phpt on line %d
@@ -22,14 +22,14 @@ int(4)
 int(4)
 ===1===
 MyRecursiveArrayIterator::hasChildren()
-Exception: State 1: MyRecursiveArrayIterator::hasChildren() in hphp/test/zend/bad/ext-spl/iterator_047.php on line %d
+Exception: State 1: MyRecursiveArrayIterator::hasChildren() in hphp/test/zend/bad/ext-spl/iterator_047.phpt on line %d
 ===2===
 MyRecursiveArrayIterator::hasChildren()
 int(0)
 int(0)
 MyRecursiveArrayIterator::hasChildren()
 MyRecursiveArrayIterator::getChildren()
-Exception: State 2: MyRecursiveArrayIterator::getChildren() in hphp/test/zend/bad/ext-spl/iterator_047.php on line %d
+Exception: State 2: MyRecursiveArrayIterator::getChildren() in hphp/test/zend/bad/ext-spl/iterator_047.phpt on line %d
 ===3===
 MyRecursiveArrayIterator::hasChildren()
 int(0)
@@ -1,4 +1,4 @@
 HipHop Warning: %a
 HipHop Warning: %a

-Catchable fatal error: Argument 1 passed to iterator_count() must implement interface Traversable, %unicode_string_optional% given %s
+HipHop Fatal error: %a
@@ -1,4 +1,4 @@
 HipHop Warning: %a
 HipHop Warning: %a

-Catchable fatal error: Argument 1 passed to iterator_to_array() must implement interface Traversable, %unicode_string_optional% given %s
+HipHop Fatal error: %a
@@ -4,4 +4,4 @@ Stack trace:
 #0 [internal function]: MyRecursiveIteratorIterator->beginchildren()
 #1 %s: RecursiveIteratorIterator->next()
 #2 {main}
-  thrown in hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_beginchildren_error.php on line %d
+  thrown in hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_beginchildren_error.phpt on line %d
@@ -4,4 +4,4 @@ Stack trace:
 #0 [internal function]: MyRecursiveIteratorIterator->callHasChildren()
 #1 %s: RecursiveIteratorIterator->next()
 #2 {main}
-  thrown in hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_callHasChildren_error.php on line %d
+  thrown in hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_callHasChildren_error.phpt on line %d
@@ -8,4 +8,4 @@ Stack trace:
 #0 [internal function]: MyRecursiveIteratorIterator->endchildren()
 #1 %s: RecursiveIteratorIterator->next()
 #2 {main}
-  thrown in hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_endchildren_error.php on line %d
+  thrown in hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_endchildren_error.phpt on line %d
@@ -4,4 +4,4 @@ Stack trace:
 #0 [internal function]: MyRecursiveIteratorIterator->nextelement()
 #1 %s: RecursiveIteratorIterator->next()
 #2 {main}
-  thrown in hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_nextelement_error.php on line %d
+  thrown in hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_nextelement_error.phpt on line %d
@@ -3,4 +3,4 @@ Stack trace:
 #0 [internal function]: MyHeap->count()
 #1 %s count(Object(MyHeap))
 #2 {main}
-  thrown in hphp/test/zend/bad/ext-spl/spl_heap_count_basic.php on line %d
+  thrown in hphp/test/zend/bad/ext-spl/spl_heap_count_basic.phpt on line %d
@@ -0,0 +1,32 @@
+<?php
+
+function my_udf_md5($foo)
+{
+	return md5($foo);
+}
+
+require_once(dirname(__FILE__) . '/new_db.inc');
+define('TIMENOW', time());
+
+echo "Creating Table\n";
+var_dump($db->exec('CREATE TABLE test (time INTEGER, id STRING)'));
+
+echo "INSERT into table\n";
+var_dump($db->exec("INSERT INTO test (time, id) VALUES (" . TIMENOW . ", 'a')"));
+var_dump($db->exec("INSERT INTO test (time, id) VALUES (" . TIMENOW . ", 'b')"));
+
+echo "CREATING UDF\n";
+var_dump($db->createFunction('my_udf_md5', 'my_udf_md5'));
+
+echo "SELECTING results\n";
+$results = $db->query("SELECT my_udf_md5(id) FROM test ORDER BY id ASC");
+while ($result = $results->fetchArray(SQLITE3_NUM))
+{
+	var_dump($result);
+}
+$results->finalize();
+
+echo "Closing database\n";
+var_dump($db->close());
+echo "Done\n";
+?>
@@ -0,0 +1,19 @@
+Creating Table
+bool(true)
+INSERT into table
+bool(true)
+bool(true)
+CREATING UDF
+bool(true)
+SELECTING results
+array(1) {
+  [0]=>
+  string(32) "0cc175b9c0f1b6a831c399e269772661"
+}
+array(1) {
+  [0]=>
+  string(32) "92eb5ffee6ae2fec3ad71c777531578f"
+}
+Closing database
+bool(true)
+Done
@@ -0,0 +1,36 @@
+<?php
+
+require_once(dirname(__FILE__) . '/new_db.inc');
+
+function sum_list_step($context, $rows, $string) {
+	if (empty($context))
+	{
+		$context = array('total' => 0, 'values' => array());
+	}
+	$context['total'] += intval($string);
+	$context['values'][] = $context['total'];
+	return $context;
+}
+
+function sum_list_finalize($context) {
+	return implode(',', $context['values']);
+}
+
+echo "Creating Table\n";
+var_dump($db->exec('CREATE TABLE test (a INTEGER, b INTEGER)'));
+
+echo "INSERT into table\n";
+var_dump($db->exec("INSERT INTO test (a, b) VALUES (1, -1)"));
+var_dump($db->exec("INSERT INTO test (a, b) VALUES (2, -2)"));
+var_dump($db->exec("INSERT INTO test (a, b) VALUES (3, -3)"));
+var_dump($db->exec("INSERT INTO test (a, b) VALUES (4, -4)"));
+var_dump($db->exec("INSERT INTO test (a, b) VALUES (4, -4)"));
+
+$db->createAggregate('S', 'sum_list_step', 'sum_list_finalize', 1);
+
+print_r($db->querySingle("SELECT S(a), S(b) FROM test", true));
+
+echo "Closing database\n";
+var_dump($db->close());
+echo "Done\n";
+?>
@@ -0,0 +1,16 @@
+Creating Table
+bool(true)
+INSERT into table
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+Array
+(
+    [S(a)] => 1,3,6,10,14
+    [S(b)] => -1,-3,-6,-10,-14
+)
+Closing database
+bool(true)
+Done
@@ -0,0 +1,17 @@
+<?php
+
+require_once(dirname(__FILE__) . '/new_db.inc');
+
+$func = 'strtoupper';
+var_dump($db->createfunction($func, $func));
+var_dump($db->querySingle('SELECT strtoupper("test")'));
+
+$func2 = 'strtolower';
+var_dump($db->createfunction($func2, $func2));
+var_dump($db->querySingle('SELECT strtolower("TEST")'));
+
+var_dump($db->createfunction($func, $func2));
+var_dump($db->querySingle('SELECT strtoupper("tEst")'));
+
+
+?>
@@ -0,0 +1,6 @@
+bool(true)
+%string|unicode%(4) "TEST"
+bool(true)
+%string|unicode%(4) "test"
+bool(true)
+%string|unicode%(4) "test"
@@ -1 +1 @@
-Catchable fatal error: Argument 1 passed to VariableStream::__construct() must be of the type array, none given in hphp/test/zend/bad/ext-standard-file/bug38450_3.phpt on line %d
+HipHop Fatal error: %a
@@ -7,4 +7,4 @@ HipHop Warning: %a
 HipHop Warning: %a
 Incorrect input

-Catchable fatal error: Object of class classA could not be converted to string in hphp/test/zend/bad/ext-standard-math/base_convert_error.phpt on line %d
+HipHop Fatal error: %a
@@ -4,4 +4,4 @@ HipHop Warning: %a
 HipHop Warning: %a
 Incorrect input

-Catchable fatal error: Object of class classA could not be converted to string in hphp/test/zend/bad/ext-standard-math/bindec_error.phpt on line %d
+HipHop Fatal error: %a
@@ -6,4 +6,4 @@ HipHop Warning: %a

 -- Incorrect input --

-Catchable fatal error: Object of class classA could not be converted to string in hphp/test/zend/bad/ext-standard-math/hexdec_error.phpt on line %d
+HipHop Fatal error: %a
@@ -6,4 +6,4 @@ HipHop Warning: %a

 -- Incorrect input --

-Catchable fatal error: Object of class classA could not be converted to string in hphp/test/zend/bad/ext-standard-math/octdec_error.phpt on line %d
+HipHop Fatal error: %a
@@ -1 +0,0 @@
-Catchable fatal error: Object of class Closure could not be converted to string in hphp/test/zend/bad/ext-standard-streams/bug61115.phpt on line %d
@@ -10,4 +10,4 @@ NULL

 -- Testing strval() function with object which has not toString() method  --

-Catchable fatal error: Object of class MyClass could not be converted to string in hphp/test/zend/bad/ext-standard-strings/strval_error.phpt on line %d
+HipHop Fatal error: %a
@@ -1 +0,0 @@
-Catchable fatal error: Argument 1 passed to f() must be an instance of UndefClass, instance of stdClass given, called in %s
@@ -1 +1 @@
-Parse error: %s in hphp/test/zend/bad/tests-classes/constants_error_005.php on line %d
+Parse error: %s in hphp/test/zend/bad/tests-classes/constants_error_005.phpt on line %d
@@ -1 +1 @@
-Parse error: %s in hphp/test/zend/bad/tests-classes/constants_error_006.php on line %d
+Parse error: %s in hphp/test/zend/bad/tests-classes/constants_error_006.phpt on line %d
@@ -1 +1 @@
-Parse error: %s in hphp/test/zend/bad/tests-classes/constants_error_007.php on line %d
+Parse error: %s in hphp/test/zend/bad/tests-classes/constants_error_007.phpt on line %d
@@ -1 +1 @@
-Catchable fatal error: Argument 1 passed to MyTestClass::__construct() must be an instance of MyObject, none given, called in %sinterfaces_003.php on line %d
+HipHop Fatal error: %a
@@ -1,3 +1,3 @@
-Strict Standards: Declaration of C::foo() should be compatible with A::foo($arg1 = 1) in hphp/test/zend/bad/tests-classes/method_override_optional_arg_001.php on line %d
+Strict Standards: Declaration of C::foo() should be compatible with A::foo($arg1 = 1) in hphp/test/zend/bad/tests-classes/method_override_optional_arg_001.phpt on line %d
 int(1)
 int(3)
@@ -1,2 +1,2 @@
-Strict Standards: Declaration of B::foo() should be compatible with A::foo($arg = 1) in hphp/test/zend/bad/tests-classes/method_override_optional_arg_002.php on line %d
+Strict Standards: Declaration of B::foo() should be compatible with A::foo($arg = 1) in hphp/test/zend/bad/tests-classes/method_override_optional_arg_002.phpt on line %d
 foo
@@ -1,16 +1,16 @@
 --> Access visible static prop like instance prop:
 bool(false)

-Strict Standards: Accessing static property C::$x as non static in hphp/test/zend/bad/tests-classes/static_properties_003.php on line 11
+Strict Standards: Accessing static property C::$x as non static in hphp/test/zend/bad/tests-classes/static_properties_003.phpt on line 11

-Strict Standards: Accessing static property C::$x as non static in hphp/test/zend/bad/tests-classes/static_properties_003.php on line 12
+Strict Standards: Accessing static property C::$x as non static in hphp/test/zend/bad/tests-classes/static_properties_003.phpt on line 12
 HipHop Notice: %a

-Strict Standards: Accessing static property C::$x as non static in hphp/test/zend/bad/tests-classes/static_properties_003.php on line 13
+Strict Standards: Accessing static property C::$x as non static in hphp/test/zend/bad/tests-classes/static_properties_003.phpt on line 13

-Strict Standards: Accessing static property C::$x as non static in hphp/test/zend/bad/tests-classes/static_properties_003.php on line 15
+Strict Standards: Accessing static property C::$x as non static in hphp/test/zend/bad/tests-classes/static_properties_003.phpt on line 15

-Strict Standards: Accessing static property C::$x as non static in hphp/test/zend/bad/tests-classes/static_properties_003.php on line 16
+Strict Standards: Accessing static property C::$x as non static in hphp/test/zend/bad/tests-classes/static_properties_003.phpt on line 16
 %unicode|string%(3) "ref"
 %unicode|string%(5) "C::$x"

@@ -1 +0,0 @@
-Catchable fatal error: Argument 1 passed to FooBar::a() must implement interface Foo, instance of Blort given, called in hphp/test/zend/bad/tests-classes/type_hinting_001.php on line 27 and defined in hphp/test/zend/bad/tests-classes/type_hinting_001.php on line 12
@@ -1 +0,0 @@
-Catchable fatal error: Argument 1 passed to Foo::a() must be an instance of NonExisting, instance of Foo given, called in hphp/test/zend/bad/tests-classes/type_hinting_002.php on line %d and defined in hphp/test/zend/bad/tests-classes/type_hinting_002.php on line %d
@@ -16,4 +16,4 @@ array(1) {
  int(25)
 }

-Catchable fatal error: Argument 1 passed to Test::f1() must be of the type array, integer given, called in hphp/test/zend/bad/tests-classes/type_hinting_003.php on line %d and defined in hphp/test/zend/bad/tests-classes/type_hinting_003.php on line %d
+HipHop Fatal error: %a
@@ -1,4 +1,4 @@
-Strict Standards: Declaration of D2::f() should be compatible with C::f(array $a) in hphp/test/zend/bad/tests-classes/type_hinting_005a.php on line 8
+Strict Standards: Declaration of D2::f() should be compatible with C::f(array $a) in hphp/test/zend/bad/tests-classes/type_hinting_005a.phpt on line 8
 Compatible hint.
 Class hint, should be array.
 ==DONE==
@@ -1,3 +1,3 @@
-Strict Standards: Declaration of D::f() should be compatible with C::f(array $a) in hphp/test/zend/bad/tests-classes/type_hinting_005b.php on line 5
+Strict Standards: Declaration of D::f() should be compatible with C::f(array $a) in hphp/test/zend/bad/tests-classes/type_hinting_005b.phpt on line 5
 No hint, should be array.
 ==DONE==
@@ -1,3 +1,3 @@
-Strict Standards: Declaration of D::f() should be compatible with C::f(SomeClass $a) in hphp/test/zend/bad/tests-classes/type_hinting_005c.php on line 5
+Strict Standards: Declaration of D::f() should be compatible with C::f(SomeClass $a) in hphp/test/zend/bad/tests-classes/type_hinting_005c.phpt on line 5
 Array hint, should be class.
 ==DONE==
@@ -1,3 +1,3 @@
-Strict Standards: Declaration of D::f() should be compatible with C::f($a) in hphp/test/zend/bad/tests-classes/type_hinting_005d.php on line 5
+Strict Standards: Declaration of D::f() should be compatible with C::f($a) in hphp/test/zend/bad/tests-classes/type_hinting_005d.phpt on line 5
 Array hint, should be nothing.
 ==DONE==
@@ -20,4 +20,4 @@ int(2)
 object(foo)#%d (0) {
 }

-Catchable fatal error: Argument 1 passed to typehint() must be an instance of foo, integer given in hphp/test/zend/bad/tests-lang/bug24658.php on line %d
+HipHop Fatal error: %a
@@ -3,4 +3,4 @@ Stack trace:
 #0 [internal function]: output_handler('', %d)
 #1 %s(%d): ob_end_clean()
 #2 {main}
-  thrown in hphp/test/zend/bad/tests-lang/bug32828.php on line %d
+  thrown in hphp/test/zend/bad/tests-lang/bug32828.phpt on line %d
@@ -1 +0,0 @@
-Catchable fatal error: Argument 1 passed to blah() must be an instance of Foo, instance of stdClass given, called in %scatchable_error_001.php on line 15 and defined in %scatchable_error_001.php on line 5
@@ -1,2 +1,2 @@
-Strict Standards: Only variables should be passed by reference in hphp/test/zend/bad/tests-lang/passByReference_004.php on line 13
+Strict Standards: Only variables should be passed by reference in hphp/test/zend/bad/tests-lang/passByReference_004.phpt on line 13
 int(5)
@@ -24,34 +24,34 @@ string(12) "Ref2 changed"
 ---- Pass by ref / pass by val: static method calls ----
 HipHop Notice: %a

-Strict Standards: Non-static method C::v() should not be called statically in hphp/test/zend/bad/tests-lang/passByReference_005.php on line 95
+Strict Standards: Non-static method C::v() should not be called statically in hphp/test/zend/bad/tests-lang/passByReference_005.phpt on line 95

-Strict Standards: Non-static method C::r() should not be called statically in hphp/test/zend/bad/tests-lang/passByReference_005.php on line 96
+Strict Standards: Non-static method C::r() should not be called statically in hphp/test/zend/bad/tests-lang/passByReference_005.phpt on line 96
 HipHop Notice: %a
 NULL
 string(11) "Ref changed"
 HipHop Notice: %a
 HipHop Notice: %a

-Strict Standards: Non-static method C::vv() should not be called statically in hphp/test/zend/bad/tests-lang/passByReference_005.php on line 100
+Strict Standards: Non-static method C::vv() should not be called statically in hphp/test/zend/bad/tests-lang/passByReference_005.phpt on line 100
 HipHop Notice: %a
 HipHop Notice: %a
 NULL
 NULL
 HipHop Notice: %a

-Strict Standards: Non-static method C::vr() should not be called statically in hphp/test/zend/bad/tests-lang/passByReference_005.php on line 104
+Strict Standards: Non-static method C::vr() should not be called statically in hphp/test/zend/bad/tests-lang/passByReference_005.phpt on line 104
 HipHop Notice: %a
 NULL
 string(11) "Ref changed"
 HipHop Notice: %a

-Strict Standards: Non-static method C::rv() should not be called statically in hphp/test/zend/bad/tests-lang/passByReference_005.php on line 108
+Strict Standards: Non-static method C::rv() should not be called statically in hphp/test/zend/bad/tests-lang/passByReference_005.phpt on line 108
 HipHop Notice: %a
 string(11) "Ref changed"
 NULL

-Strict Standards: Non-static method C::rr() should not be called statically in hphp/test/zend/bad/tests-lang/passByReference_005.php on line 112
+Strict Standards: Non-static method C::rr() should not be called statically in hphp/test/zend/bad/tests-lang/passByReference_005.phpt on line 112
 string(12) "Ref1 changed"
 string(12) "Ref2 changed"

@@ -34,7 +34,7 @@ object(stdClass)#%d (1) {

 ---- Pass uninitialised arrays & objects by ref: static method call ---

-Strict Standards: Non-static method C::refs() should not be called statically in hphp/test/zend/bad/tests-lang/passByReference_006.php on line 39
+Strict Standards: Non-static method C::refs() should not be called statically in hphp/test/zend/bad/tests-lang/passByReference_006.phpt on line 39
 array(1) {
  [0]=>
  string(12) "Ref1 changed"
@@ -1,6 +1,6 @@
 Pass a function call that returns a value:

-Strict Standards: Only variables should be passed by reference in hphp/test/zend/bad/tests-lang/passByReference_007.php on line 44
+Strict Standards: Only variables should be passed by reference in hphp/test/zend/bad/tests-lang/passByReference_007.phpt on line 44
 string(8) "original"
 string(8) "original"
 Pass a function call that returns a reference:
@@ -9,7 +9,7 @@ string(7) "changed"

 Pass a static method call that returns a value:

-Strict Standards: Only variables should be passed by reference in hphp/test/zend/bad/tests-lang/passByReference_007.php on line 55
+Strict Standards: Only variables should be passed by reference in hphp/test/zend/bad/tests-lang/passByReference_007.phpt on line 55
 string(8) "original"
 string(8) "original"
 Pass a static method call that returns a reference:
@@ -18,7 +18,7 @@ string(7) "changed"

 Pass a method call that returns a value:

-Strict Standards: Only variables should be passed by reference in hphp/test/zend/bad/tests-lang/passByReference_007.php on line 67
+Strict Standards: Only variables should be passed by reference in hphp/test/zend/bad/tests-lang/passByReference_007.phpt on line 67
 string(8) "original"
 string(8) "original"
 Pass a method call that returns a reference:
@@ -1,13 +1,13 @@
 ---> Pass constant assignment by reference:

-Strict Standards: Only variables should be passed by reference in hphp/test/zend/bad/tests-lang/passByReference_010.php on line 9
+Strict Standards: Only variables should be passed by reference in hphp/test/zend/bad/tests-lang/passByReference_010.phpt on line 9
 string(10) "a.original"
 string(10) "a.original"


 ---> Pass variable assignment by reference:

-Strict Standards: Only variables should be passed by reference in hphp/test/zend/bad/tests-lang/passByReference_010.php on line 15
+Strict Standards: Only variables should be passed by reference in hphp/test/zend/bad/tests-lang/passByReference_010.phpt on line 15
 string(10) "a.original"
 string(10) "a.original"

@@ -19,6 +19,6 @@ string(9) "a.changed"

 ---> Pass concat assignment by reference:

-Strict Standards: Only variables should be passed by reference in hphp/test/zend/bad/tests-lang/passByReference_010.php on line 28
+Strict Standards: Only variables should be passed by reference in hphp/test/zend/bad/tests-lang/passByReference_010.phpt on line 28
 string(20) "b.originala.original"
 string(10) "a.original"
@@ -1,6 +1,6 @@
-Strict Standards: Only variables should be passed by reference in hphp/test/zend/bad/tests-lang/passByReference_012.php on line %d
+Strict Standards: Only variables should be passed by reference in hphp/test/zend/bad/tests-lang/passByReference_012.phpt on line %d
 string(3) "two"

-Strict Standards: Only variables should be passed by reference in hphp/test/zend/bad/tests-lang/passByReference_012.php on line %d
+Strict Standards: Only variables should be passed by reference in hphp/test/zend/bad/tests-lang/passByReference_012.phpt on line %d
 string(3) "one"
 ===DONE===
@@ -1,3 +1,3 @@
-Strict Standards: Only variables should be assigned by reference in hphp/test/zend/bad/tests-lang/returnByReference.002.php on line 13
+Strict Standards: Only variables should be assigned by reference in hphp/test/zend/bad/tests-lang/returnByReference.002.phpt on line 13
 string(8) "original"
 string(7) "changed"
@@ -1,6 +1,6 @@
 ---> 1. Trying to assign by reference the return value of a function that returns by value:

-Strict Standards: Only variables should be assigned by reference in hphp/test/zend/bad/tests-lang/returnByReference.003.php on line 17
+Strict Standards: Only variables should be assigned by reference in hphp/test/zend/bad/tests-lang/returnByReference.003.phpt on line 17
 int(5)
 int(100)

@@ -1,6 +1,6 @@
 ---> 1. Trying to assign by reference the return value of a function that returns by value:

-Strict Standards: Only variables should be assigned by reference in hphp/test/zend/bad/tests-lang/returnByReference.004.php on line 19
+Strict Standards: Only variables should be assigned by reference in hphp/test/zend/bad/tests-lang/returnByReference.004.phpt on line 19
 int(5)
 int(100)

@@ -1,6 +1,6 @@
 ---> 1. Trying to assign by reference the return value of a function that returns by value:

-Strict Standards: Only variables should be assigned by reference in hphp/test/zend/bad/tests-lang/returnByReference.005.php on line 20
+Strict Standards: Only variables should be assigned by reference in hphp/test/zend/bad/tests-lang/returnByReference.005.phpt on line 20
 int(5)
 int(100)

@@ -1 +0,0 @@
-Catchable fatal error: Argument 1 passed to type_hint_foo() must be an instance of Foo, instance of Bar given, called in hphp/test/zend/bad/tests-lang/type_hints_001.php on line 16 and defined in hphp/test/zend/bad/tests-lang/type_hints_001.php on line 9
@@ -1,4 +1,4 @@
-%s: %sivision by zero in hphp/test/zend/bad/tests-run-test/test008.php on line %d
+%s: %sivision by zero in hphp/test/zend/bad/tests-run-test/test008.phpt on line %d
 string(1) "1"
 string(4) "8191"
 string(1) "0"
@@ -1,6 +1,6 @@
 PRE-CLASS-GUARD-TraitsTest
 PRE-CLASS-GUARD-TraitsTest2

-Strict Standards: THello1 and THello2 define the same property ($foo) in the composition of TraitsTest2. This might be incompatible, to improve maintainability consider using accessor methods in traits instead. Class was composed in hphp/test/zend/bad/zend-traits/property001.php on line %d
+Strict Standards: THello1 and THello2 define the same property ($foo) in the composition of TraitsTest2. This might be incompatible, to improve maintainability consider using accessor methods in traits instead. Class was composed in hphp/test/zend/bad/zend-traits/property001.phpt on line %d
 bool(true)
 bool(true)
@@ -1,5 +1,5 @@
 PRE-CLASS-GUARD

-Strict Standards: Notice and THello1 define the same property ($hello) in the composition of Notice. This might be incompatible, to improve maintainability consider using accessor methods in traits instead. Class was composed in hphp/test/zend/bad/zend-traits/property005.php on line %d
+Strict Standards: Notice and THello1 define the same property ($hello) in the composition of Notice. This might be incompatible, to improve maintainability consider using accessor methods in traits instead. Class was composed in hphp/test/zend/bad/zend-traits/property005.phpt on line %d
 POST-CLASS-GUARD
 HipHop Fatal error: %a
@@ -1,5 +1,5 @@
 PRE-CLASS-GUARD
 POST-CLASS-GUARD

-Strict Standards: Notice and THello1 define the same property ($hello) in the composition of Notice. This might be incompatible, to improve maintainability consider using accessor methods in traits instead. Class was composed in hphp/test/zend/bad/zend-traits/property006.php on line %d
+Strict Standards: Notice and THello1 define the same property ($hello) in the composition of Notice. This might be incompatible, to improve maintainability consider using accessor methods in traits instead. Class was composed in hphp/test/zend/bad/zend-traits/property006.phpt on line %d
 POST-CLASS-GUARD2
@@ -1,7 +1,7 @@
 PRE-CLASS-GUARD

-Strict Standards: Base and THello1 define the same property ($hello) in the composition of SameNameInSubClassProducesNotice. This might be incompatible, to improve maintainability consider using accessor methods in traits instead. Class was composed in hphp/test/zend/bad/zend-traits/property007.php on line %d
+Strict Standards: Base and THello1 define the same property ($hello) in the composition of SameNameInSubClassProducesNotice. This might be incompatible, to improve maintainability consider using accessor methods in traits instead. Class was composed in hphp/test/zend/bad/zend-traits/property007.phpt on line %d
 POST-CLASS-GUARD

-Strict Standards: Notice and THello1 define the same property ($hello) in the composition of Notice. This might be incompatible, to improve maintainability consider using accessor methods in traits instead. Class was composed in hphp/test/zend/bad/zend-traits/property007.php on line %d
+Strict Standards: Notice and THello1 define the same property ($hello) in the composition of Notice. This might be incompatible, to improve maintainability consider using accessor methods in traits instead. Class was composed in hphp/test/zend/bad/zend-traits/property007.phpt on line %d
 POST-CLASS-GUARD2
@@ -1,6 +1,6 @@
-Strict Standards: BaseWithPropA and AHelloProperty define the same property ($hello) in the composition of SubclassA. This might be incompatible, to improve maintainability consider using accessor methods in traits instead. Class was composed in hphp/test/zend/bad/zend-traits/property009.php on line %d
+Strict Standards: BaseWithPropA and AHelloProperty define the same property ($hello) in the composition of SubclassA. This might be incompatible, to improve maintainability consider using accessor methods in traits instead. Class was composed in hphp/test/zend/bad/zend-traits/property009.phpt on line %d

-Strict Standards: BaseWithTPropB and AHelloProperty define the same property ($hello) in the composition of SubclassB. This might be incompatible, to improve maintainability consider using accessor methods in traits instead. Class was composed in hphp/test/zend/bad/zend-traits/property009.php on line %d
+Strict Standards: BaseWithTPropB and AHelloProperty define the same property ($hello) in the composition of SubclassB. This might be incompatible, to improve maintainability consider using accessor methods in traits instead. Class was composed in hphp/test/zend/bad/zend-traits/property009.phpt on line %d
 object(SubclassClassicInheritance)#1 (1) {
  ["hello"]=>
  int(0)
@@ -1,7 +1,7 @@
-Strict Standards: Non-static method foo::bar() should not be called statically in hphp/test/zend/bad/zend/009.php on line %d
+Strict Standards: Non-static method foo::bar() should not be called statically in hphp/test/zend/bad/zend/009.phpt on line %d
 string(3) "foo"

-Strict Standards: Non-static method foo::bar() should not be called statically in hphp/test/zend/bad/zend/009.php on line %d
+Strict Standards: Non-static method foo::bar() should not be called statically in hphp/test/zend/bad/zend/009.phpt on line %d
 string(3) "foo"
 string(3) "foo"
 string(3) "foo"
@@ -11,6 +11,6 @@ bool(false)
 HipHop Warning: %a
 bool(true)

-Deprecated: error in hphp/test/zend/bad/zend/015.php on line %d
+Deprecated: error in hphp/test/zend/bad/zend/015.phpt on line %d
 bool(true)
 Done
@@ -1 +1 @@
-Parse error: %s error,%sexpecting %s in hphp/test/zend/bad/zend/access_modifiers_003.php on line %d
+Parse error: %s error,%sexpecting %s in hphp/test/zend/bad/zend/access_modifiers_003.phpt on line %d
@@ -1,3 +1,3 @@
 3

-Catchable fatal error: Argument 1 passed to foo() must be of the type array, integer given, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php on line 2
+HipHop Fatal error: %a
@@ -3,4 +3,4 @@ Stack trace:
 #0 %s(%d): impl->__get('counter')
 #1 %s(%d): impl->__construct()
 #2 {main}
-  thrown in hphp/test/zend/bad/zend/bug38624.php on line %d
+  thrown in hphp/test/zend/bad/zend/bug38624.phpt on line %d
--- a/Mostrar Mais
+++ b/Mostrar Mais
				`@@ -1 +0,0 @@`
				`Catchable fatal error: Collator::getSortKey(): Object not initialized in hphp/test/zend/bad/ext-intl/bug60192-getsortkey.php on line %d`
				`@@ -1 +0,0 @@`
				`Catchable fatal error: Object of class Closure could not be converted to string in hphp/test/zend/bad/ext-standard-streams/bug61115.phpt on line %d`
				`@@ -1 +0,0 @@`
				`Catchable fatal error: Argument 1 passed to f() must be an instance of UndefClass, instance of stdClass given, called in %s`