From e1d0646fed082fd32bb6e2d7785ead6bb4227cfa Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Sat, 23 May 2015 01:21:30 +0200 Subject: [PATCH] Make PHPcs happy. Signed-off-by: Hugues Peccatte --- libraries/DatabaseInterface.class.php | 4 ++-- libraries/operations.lib.php | 2 +- libraries/rte/rte_routines.lib.php | 2 +- test/classes/PMA_Template_test.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/DatabaseInterface.class.php b/libraries/DatabaseInterface.class.php index 1ea445a561..eac7dc175b 100644 --- a/libraries/DatabaseInterface.class.php +++ b/libraries/DatabaseInterface.class.php @@ -2171,7 +2171,7 @@ class PMA_DatabaseInterface . " `DTD_IDENTIFIER`" . " FROM `information_schema`.`ROUTINES`" . " WHERE `ROUTINE_SCHEMA` " . PMA_Util::getCollateForIS() - . " = '" . PMA_Util::sqlAddSlashes($db) ."'"; + . " = '" . PMA_Util::sqlAddSlashes($db) . "'"; if (PMA_isValid($which, array('FUNCTION','PROCEDURE'))) { $query .= " AND `ROUTINE_TYPE` = '" . $which . "'"; } @@ -2266,7 +2266,7 @@ class PMA_DatabaseInterface . "`DATABASE_COLLATION` AS `Database Collation`" . " FROM `information_schema`.`EVENTS`" . " WHERE `EVENT_SCHEMA` " . PMA_Util::getCollateForIS() - . " = '" . PMA_Util::sqlAddSlashes($db) ."'"; + . " = '" . PMA_Util::sqlAddSlashes($db) . "'"; if (! empty($name)) { $query .= " AND `EVENT_NAME`" . " = '" . PMA_Util::sqlAddSlashes($name) . "'"; diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php index fa2562851d..3b78504504 100644 --- a/libraries/operations.lib.php +++ b/libraries/operations.lib.php @@ -655,7 +655,7 @@ function PMA_AdjustPrivileges_copyDB($oldDb, $newname) . PMA_Util::backquote('procs_priv') . ' VALUES("' . $old_priv[0] . '", "' . $newname . '", "' . $old_priv[2] . '", "' . $old_priv[3] . '", "' . $old_priv[4] . '", "' . $old_priv[5] . '", "' - . $old_priv[6] . '", "' . $old_priv[7] .'");'; + . $old_priv[6] . '", "' . $old_priv[7] . '");'; $GLOBALS['dbi']->query($newDb_proc_privs_query); } diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 79faad76d7..eac86e3792 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -362,7 +362,7 @@ function PMA_RTN_handleEditor() . PMA_Util::backquote('mysql') . '.' . PMA_Util::backquote('procs_priv') . ' VALUES("' . $priv[0] . '", "' - . $priv[1]. '", "' . $priv[2] . '", "' + . $priv[1] . '", "' . $priv[2] . '", "' . $_REQUEST['item_name'] . '", "' . $_REQUEST['item_type'] . '", "' . $priv[5] . '", "' diff --git a/test/classes/PMA_Template_test.php b/test/classes/PMA_Template_test.php index e2ad0d06a6..d54a884edc 100644 --- a/test/classes/PMA_Template_test.php +++ b/test/classes/PMA_Template_test.php @@ -52,7 +52,7 @@ class PMA_Template_Test extends PHPUnit_Framework_TestCase */ public function testTrim() { - $html = file_get_contents(PMA\Template::BASE_PATH.'test/trim.phtml'); + $html = file_get_contents(PMA\Template::BASE_PATH . 'test/trim.phtml'); $this->assertEquals( 'outer value value',