summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavey Shafik <me@daveyshafik.com>2015-12-07 01:12:40 -0500
committerDavey Shafik <me@daveyshafik.com>2015-12-07 01:12:40 -0500
commit821f122e59019dee8e141d8a40cce6b4150dfe6b (patch)
treeb1409951232f6361932c080c7672bf7282f915c4
parent0a6610cdb671a4579f90388d6489db72c7b57d9c (diff)
downloadphp7-mysql-shim-821f122e59019dee8e141d8a40cce6b4150dfe6b.zip
php7-mysql-shim-821f122e59019dee8e141d8a40cce6b4150dfe6b.tar.gz
php7-mysql-shim-821f122e59019dee8e141d8a40cce6b4150dfe6b.tar.bz2
Handle weirdness with `mysql_table_name()`, especially on HHVM
-rw-r--r--lib/mysql.php6
-rw-r--r--tests/MySqlShimTest.php4
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/mysql.php b/lib/mysql.php
index 03ebdce..1860fdc 100644
--- a/lib/mysql.php
+++ b/lib/mysql.php
@@ -505,7 +505,7 @@ namespace {
return mysql_result($result, $row, 'Database');
}
- function mysql_table_name($result, $row)
+ function mysql_tablename($result, $row)
{
if (\Dshafik\MySQL::checkValidResult($result, __FUNCTION__)) {
// @codeCoverageIgnoreStart
@@ -584,9 +584,9 @@ namespace {
return mysql_db_name(... $args);
}
- function mysql_tablename(... $args)
+ function mysql_table_name(... $args)
{
- return mysql_table_name(... $args);
+ return mysql_tablename(... $args);
}
}
}
diff --git a/tests/MySqlShimTest.php b/tests/MySqlShimTest.php
index 8a2e063..460c4a6 100644
--- a/tests/MySqlShimTest.php
+++ b/tests/MySqlShimTest.php
@@ -868,8 +868,8 @@ class MySqlShimTest extends \PHPUnit_Framework_TestCase
"args" => [0]
],
[
- "function" => "mysql_table_name",
- "message" => "mysql_table_name() expects parameter 1 to be resource, null given",
+ "function" => "mysql_tablename",
+ "message" => "mysql_tablename() expects parameter 1 to be resource, null given",
"args" => [0]
],
];