From 466a7645c77b6c19a526db662440cb7a6df58b56 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 12 Apr 2013 21:45:02 +0530
Subject: [PATCH 1/5] PHP keywords must be lowercase

---
 import.php                                     |  4 ++--
 libraries/DisplayResults.class.php             | 10 +++++-----
 libraries/Theme.class.php                      |  2 +-
 libraries/mult_submits.inc.php                 |  8 ++++----
 libraries/mysql_charsets.lib.php               |  2 +-
 libraries/operations.lib.php                   | 10 +++++-----
 libraries/plugins/export/ExportSql.class.php   |  4 ++--
 libraries/schema/Eps_Relation_Schema.class.php |  2 +-
 libraries/schema/Svg_Relation_Schema.class.php |  2 +-
 tbl_relation.php                               |  2 +-
 transformation_wrapper.php                     |  2 +-
 11 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/import.php b/import.php
index 2a4f4e15e7..78f238730c 100644
--- a/import.php
+++ b/import.php
@@ -77,7 +77,7 @@ if (! empty($sql_query)) {
         $ajax_reload['table_name'] = PMA_Util::unQuote($rename_table_names[2]);
         $ajax_reload['reload'] = true;
     }
-    
+
     $sql_query = '';
 } elseif (! empty($sql_localfile)) {
     // run SQL file on server
@@ -565,7 +565,7 @@ if (strlen($sql_query) <= $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
 
 // There was an error?
 if (isset($my_die)) {
-    foreach ($my_die AS $key => $die) {
+    foreach ($my_die as $key => $die) {
         PMA_Util::mysqlDie(
             $die['error'], $die['sql'], '', $err_url, $error
         );
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index 073df10a46..ab2f8206d0 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -2656,7 +2656,7 @@ class PMA_DisplayResults
 
 
     /**
-     * Get the values for one data row 
+     * Get the values for one data row
      *
      * @param integer &$dt_result         the link id associated to the query
      *                                    which results have to be displayed
@@ -2696,8 +2696,8 @@ class PMA_DisplayResults
 
         $row_info = $this->_getRowInfoForSpecialLinks($row, $col_order);
 
-        for ($currentColumn = 0; 
-                $currentColumn < $this->__get('fields_cnt'); 
+        for ($currentColumn = 0;
+                $currentColumn < $this->__get('fields_cnt');
                 ++$currentColumn) {
 
             // assign $i with appropriate column order
@@ -3462,7 +3462,7 @@ class PMA_DisplayResults
 
 
     /**
-     * Get the combined classes for a column 
+     * Get the combined classes for a column
      *
      * @param string  $grid_edit_class  the class for all editable columns
      * @param string  $not_null_class   the class for not null columns
@@ -4036,7 +4036,7 @@ class PMA_DisplayResults
         list($col_order, $col_visib) = $this->_getColumnParams($analyzed_sql);
 
         // Prepares data
-        foreach ($vertical_display['desc'] AS $j => $val) {
+        foreach ($vertical_display['desc'] as $j => $val) {
 
             // assign appropriate key with current column order
             $key = $col_order ? $col_order[$j] : $j;
diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php
index bf1ee8f6f8..9f2f640e6e 100644
--- a/libraries/Theme.class.php
+++ b/libraries/Theme.class.php
@@ -374,7 +374,7 @@ class PMA_Theme
         global $cfg;
 
         $css_string     = '';
-        foreach ($cfg['SQP']['fmtColor'] AS $key => $col) {
+        foreach ($cfg['SQP']['fmtColor'] as $key => $col) {
             $css_string .= $this->buildSQPCssRule('syntax_' . $key, 'color', $col);
         }
 
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index 181bfc1aa3..24368d945a 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -127,7 +127,7 @@ if (! empty($submit_mult)
         case 'change':
             PMA_displayHtmlForColumnChange($db, $table, $selected, $action);
             // execution stops here but PMA_Response correctly finishes
-            // the rendering 
+            // the rendering
             exit;
         case 'browse':
             // this should already be handled by tbl_structure.php
@@ -165,7 +165,7 @@ if (!empty($submit_mult) && !empty($what)) {
     }
     $selected_cnt   = count($selected);
     $i = 0;
-    foreach ($selected AS $idx => $sval) {
+    foreach ($selected as $idx => $sval) {
         switch ($what) {
         case 'row_delete':
             $full_query .= 'DELETE FROM ' . PMA_Util::backquote($db) . '.' . PMA_Util::backquote($table)
@@ -503,7 +503,7 @@ if (!empty($submit_mult) && !empty($what)) {
                 PMA_DBI_select_db($db);
             }
             $result = PMA_DBI_query($a_query);
-            
+
             if ($query_type == 'drop_db') {
                 PMA_clearTransformations($selected[$i]);
             } elseif ($query_type == 'drop_tbl') {
@@ -511,7 +511,7 @@ if (!empty($submit_mult) && !empty($what)) {
             } else if ($query_type == 'drop_fld') {
                 PMA_clearTransformations($db, $table, $selected[$i]);
             }
-            
+
         } // end if
     } // end for
 
diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php
index 45c48afe34..d0a73cec4d 100644
--- a/libraries/mysql_charsets.lib.php
+++ b/libraries/mysql_charsets.lib.php
@@ -80,7 +80,7 @@ if (! PMA_Util::cacheExists('mysql_charsets', true)) {
     }
 
     sort($mysql_collations_flat, SORT_STRING);
-    foreach ($mysql_collations AS $key => $value) {
+    foreach ($mysql_collations as $key => $value) {
         sort($mysql_collations[$key], SORT_STRING);
         reset($mysql_collations[$key]);
     }
diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php
index 5c45607488..7a15495402 100644
--- a/libraries/operations.lib.php
+++ b/libraries/operations.lib.php
@@ -1361,11 +1361,11 @@ function PMA_getHtmlForReferentialIntegrityCheck($foreign, $url_params)
 
     $html_output .= '<ul>';
 
-    foreach ($foreign AS $master => $arr) {
+    foreach ($foreign as $master => $arr) {
         $join_query  = 'SELECT '
             . PMA_Util::backquote($GLOBALS['table']) . '.*'
             . ' FROM ' . PMA_Util::backquote($GLOBALS['table'])
-            . ' LEFT JOIN ' 
+            . ' LEFT JOIN '
             . PMA_Util::backquote($arr['foreign_db'])
             . '.'
             . PMA_Util::backquote($arr['foreign_table']);
@@ -1378,13 +1378,13 @@ function PMA_getHtmlForReferentialIntegrityCheck($foreign, $url_params)
         $join_query .= ' ON '
             . PMA_Util::backquote($GLOBALS['table']) . '.'
             . PMA_Util::backquote($master)
-            . ' = ' 
-            . PMA_Util::backquote($arr['foreign_db']) 
+            . ' = '
+            . PMA_Util::backquote($arr['foreign_db'])
             . '.'
             . PMA_Util::backquote($foreign_table) . '.'
             . PMA_Util::backquote($arr['foreign_field'])
             . ' WHERE '
-            . PMA_Util::backquote($arr['foreign_db']) 
+            . PMA_Util::backquote($arr['foreign_db'])
             . '.'
             . PMA_Util::backquote($foreign_table) . '.'
             . PMA_Util::backquote($arr['foreign_field'])
diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php
index ca17a2d617..8326f21eec 100644
--- a/libraries/plugins/export/ExportSql.class.php
+++ b/libraries/plugins/export/ExportSql.class.php
@@ -1350,7 +1350,7 @@ class ExportSql extends ExportPlugin
                 . PMA_Util::backquote($table, $sql_backquotes) . ':'
             );
             @reset($mime_map);
-            foreach ($mime_map AS $mime_field => $mime) {
+            foreach ($mime_map as $mime_field => $mime) {
                 $schema_create .=
                     $this->_exportComment(
                         '  '
@@ -1375,7 +1375,7 @@ class ExportSql extends ExportPlugin
                     . PMA_Util::backquote($table, $sql_backquotes)
                     . ':'
                 );
-            foreach ($res_rel AS $rel_field => $rel) {
+            foreach ($res_rel as $rel_field => $rel) {
                 $schema_create .=
                     $this->_exportComment(
                         '  '
diff --git a/libraries/schema/Eps_Relation_Schema.class.php b/libraries/schema/Eps_Relation_Schema.class.php
index 57a91c04e6..ffa4842eca 100644
--- a/libraries/schema/Eps_Relation_Schema.class.php
+++ b/libraries/schema/Eps_Relation_Schema.class.php
@@ -837,7 +837,7 @@ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema
 
         $alltables = $this->getAllTables($db, $this->pageNumber);
 
-        foreach ($alltables AS $table) {
+        foreach ($alltables as $table) {
             if (! isset($this->_tables[$table])) {
                 $this->_tables[$table] = new Table_Stats(
                     $table, $eps->getFont(), $eps->getFontSize(), $this->pageNumber,
diff --git a/libraries/schema/Svg_Relation_Schema.class.php b/libraries/schema/Svg_Relation_Schema.class.php
index 5151029c20..26b1e40601 100644
--- a/libraries/schema/Svg_Relation_Schema.class.php
+++ b/libraries/schema/Svg_Relation_Schema.class.php
@@ -811,7 +811,7 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema
         $svg->startSvgDoc('1000px', '1000px');
         $alltables = $this->getAllTables($db, $this->pageNumber);
 
-        foreach ($alltables AS $table) {
+        foreach ($alltables as $table) {
             if (! isset($this->_tables[$table])) {
                 $this->_tables[$table] = new Table_Stats(
                     $table, $svg->getFont(), $svg->getFontSize(), $this->pageNumber,
diff --git a/tbl_relation.php b/tbl_relation.php
index 20ee4823a2..ba0d8a2462 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -545,7 +545,7 @@ if (count($columns) > 0) {
             . '<select name="display_field">'
             . '<option value="">---</option>';
 
-        foreach ($save_row AS $row) {
+        foreach ($save_row as $row) {
             $html_output .= '<option value="'
                 . htmlspecialchars($row['Field']) . '"';
             if (isset($disp) && $row['Field'] == $disp) {
diff --git a/transformation_wrapper.php b/transformation_wrapper.php
index bd3d9f987c..436be5a187 100644
--- a/transformation_wrapper.php
+++ b/transformation_wrapper.php
@@ -77,7 +77,7 @@ if ($cfgRelation['commwork'] && $cfgRelation['mimework']) {
         ? $mime_map[$transform_key]['transformation_options'] : ''
     );
 
-    foreach ($mime_options AS $key => $option) {
+    foreach ($mime_options as $key => $option) {
         if (substr($option, 0, 10) == '; charset=') {
             $mime_options['charset'] = $option;
         }

From ae0125b01360ba61b1b90391007c32107e7e636e Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 12 Apr 2013 21:54:03 +0530
Subject: [PATCH 2/5] Closing parenthesis of a multi-line IF statement must be
 on a new line

---
 libraries/Index.class.php | 3 ++-
 tbl_tracking.php          | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libraries/Index.class.php b/libraries/Index.class.php
index 152b155475..8621955080 100644
--- a/libraries/Index.class.php
+++ b/libraries/Index.class.php
@@ -661,7 +661,8 @@ class PMA_Index
                     . '</td>';
 
                 if (PMA_MYSQL_INT_VERSION > 50500
-                    && $column->getSeqInIndex() == 1) {
+                    && $column->getSeqInIndex() == 1
+                ) {
                     $r .= '<td ' . $row_span . '>'
                         . htmlspecialchars($index->getComments()) . '</td>';
                 }
diff --git a/tbl_tracking.php b/tbl_tracking.php
index e0fdb22af7..7e87043e0a 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -300,7 +300,8 @@ if (isset($_REQUEST['snapshot'])) {
     $drop_create_statements = $data['ddlog'][0]['statement'];
 
     if (strstr($data['ddlog'][0]['statement'], 'DROP TABLE')
-        || strstr($data['ddlog'][0]['statement'], 'DROP VIEW')) {
+        || strstr($data['ddlog'][0]['statement'], 'DROP VIEW')
+    ) {
         $drop_create_statements .= $data['ddlog'][1]['statement'];
     }
     // Print SQL code

From 1641845e943c17908f97fb0164bc940bf299f47a Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 12 Apr 2013 21:59:14 +0530
Subject: [PATCH 3/5] Fix superfluous doc comments

---
 test/classes/PMA_Scripts_test.php             | 3 ---
 test/libraries/PMA_build_html_for_db_test.php | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/test/classes/PMA_Scripts_test.php b/test/classes/PMA_Scripts_test.php
index b3749bcfff..1f6e18ca8b 100644
--- a/test/classes/PMA_Scripts_test.php
+++ b/test/classes/PMA_Scripts_test.php
@@ -66,9 +66,6 @@ class PMA_Scripts_test extends PHPUnit_Framework_TestCase
     /**
      * Test for _includeFile
      *
-     * @param array  $files  A list of files to include
-     * @param string $output output from the _includeFile method
-     *
      * @return void
      */
     public function testIncludeFile()
diff --git a/test/libraries/PMA_build_html_for_db_test.php b/test/libraries/PMA_build_html_for_db_test.php
index 22dd1dc6fe..74b2573d34 100644
--- a/test/libraries/PMA_build_html_for_db_test.php
+++ b/test/libraries/PMA_build_html_for_db_test.php
@@ -107,12 +107,11 @@ class PMA_build_html_for_db_test extends PHPUnit_Framework_TestCase
      *
      * @param array   $current
      * @param boolean $is_superuser
-     * @param string  $checkall
      * @param string  $url_query
      * @param array   $column_order
      * @param array   $replication_types
      * @param array   $replication_info
-     * @param string  $output
+     * @param array   $tags
      *
      * @return void
      * @dataProvider providerForTestBuildHtmlForDb

From 8ea9c0719e4f8554e4a37330cd7d98f74f7a91e3 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 12 Apr 2013 22:00:54 +0530
Subject: [PATCH 4/5] TRUE, FALSE and NULL must be lowercase

---
 test/classes/PMA_Config_test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/classes/PMA_Config_test.php b/test/classes/PMA_Config_test.php
index c73343e678..f7407fdc5c 100644
--- a/test/classes/PMA_Config_test.php
+++ b/test/classes/PMA_Config_test.php
@@ -770,8 +770,8 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
 
         $this->object->set('fontsize', 10);
         $this->assertEquals(10 + $partial_sum, $this->object->getThemeUniqueValue());
-        $this->object->set('fontsize', NULL);
-        
+        $this->object->set('fontsize', null);
+
         $_COOKIE['pma_fontsize'] = 20;
         $this->assertEquals(20 + $partial_sum, $this->object->getThemeUniqueValue());
         unset($_COOKIE['pma_fontsize']);

From 2007eb7ff78f93e31c74628451a050d5651156cf Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 12 Apr 2013 22:09:26 +0530
Subject: [PATCH 5/5] Space after exclamation mark

---
 libraries/Config.class.php                    |  4 ++--
 libraries/bookmark.lib.php                    |  4 ++--
 libraries/common.inc.php                      |  4 ++--
 libraries/config/ConfigFile.class.php         |  2 +-
 libraries/config/Form.class.php               |  2 +-
 libraries/config/FormDisplay.class.php        |  6 ++---
 libraries/config/FormDisplay.tpl.php          |  4 ++--
 libraries/config/validate.lib.php             | 22 +++++++++----------
 libraries/database_interface.lib.php          |  6 ++---
 libraries/dbi/drizzle-wrappers.lib.php        |  6 ++---
 libraries/dbi/drizzle.dbi.lib.php             |  4 ++--
 libraries/dbi/mysql.dbi.lib.php               |  4 ++--
 libraries/dbi/mysqli.dbi.lib.php              |  4 ++--
 .../schema/Dia_Relation_Schema.class.php      |  4 ++--
 .../schema/Export_Relation_Schema.class.php   |  4 ++--
 .../schema/Svg_Relation_Schema.class.php      |  2 +-
 libraries/schema/User_Schema.class.php        |  6 ++---
 .../schema/Visio_Relation_Schema.class.php    |  4 ++--
 18 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index dfb24e38d2..8c4ddee607 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -612,7 +612,7 @@ class PMA_Config
         } else {
             $link = 'https://api.github.com/repos/phpmyadmin/phpmyadmin/git/commits/'
                 . $hash;
-            $is_found = $this->checkHTTP($link, !$commit);
+            $is_found = $this->checkHTTP($link, ! $commit);
             switch($is_found) {
             case false:
                 $is_remote_commit = false;
@@ -721,7 +721,7 @@ class PMA_Config
         }
         $ch = curl_init($link);
         curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
-        curl_setopt($ch, CURLOPT_NOBODY, !$get_body);
+        curl_setopt($ch, CURLOPT_NOBODY, ! $get_body);
         curl_setopt($ch, CURLOPT_HEADER, 1);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php
index 9f3d52f4f0..46ac78a6e3 100644
--- a/libraries/bookmark.lib.php
+++ b/libraries/bookmark.lib.php
@@ -122,9 +122,9 @@ function PMA_Bookmark_get($db, $id, $id_field = 'id', $action_bookmark_all = fal
         . '.' . PMA_Util::backquote($cfgBookmark['table'])
         . ' WHERE dbase = \'' . PMA_Util::sqlAddSlashes($db) . '\'';
 
-    if (!$action_bookmark_all) {
+    if (! $action_bookmark_all) {
         $query .= ' AND (user = \'' . PMA_Util::sqlAddSlashes($cfgBookmark['user']) . '\'';
-        if (!$exact_user_match) {
+        if (! $exact_user_match) {
             $query .= ' OR user = \'\'';
         }
         $query .= ')';
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 5e0976827d..c26acc3cdb 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -907,14 +907,14 @@ if (! defined('PMA_MINIMUM_COMMON')) {
         } // end if
 
         // is root allowed?
-        if (!$cfg['Server']['AllowRoot'] && $cfg['Server']['user'] == 'root') {
+        if (! $cfg['Server']['AllowRoot'] && $cfg['Server']['user'] == 'root') {
             $allowDeny_forbidden = true;
             PMA_log_user($cfg['Server']['user'], 'root-denied');
             $auth_plugin->authFails();
         }
 
         // is a login without password allowed?
-        if (!$cfg['Server']['AllowNoPassword'] && $cfg['Server']['password'] == '') {
+        if (! $cfg['Server']['AllowNoPassword'] && $cfg['Server']['password'] == '') {
             $login_without_password_is_forbidden = true;
             PMA_log_user($cfg['Server']['user'], 'empty-denied');
             $auth_plugin->authFails();
diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index 82ba052df8..db431b2471 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -423,7 +423,7 @@ class ConfigFile
         $dsn = $this->getValue("$path/extension") . '://';
         if ($this->getValue("$path/auth_type") == 'config') {
             $dsn .= $this->getValue("$path/user");
-            if (!$this->getValue("$path/nopassword")) {
+            if (! $this->getValue("$path/nopassword")) {
                 $dsn .= ':***';
             }
             $dsn .= '@';
diff --git a/libraries/config/Form.class.php b/libraries/config/Form.class.php
index d82e66b69e..b06be3f043 100644
--- a/libraries/config/Form.class.php
+++ b/libraries/config/Form.class.php
@@ -105,7 +105,7 @@ class Form
                 }
                 $keys[] = is_bool($value[$i]) ? (int)$value[$i] : $value[$i];
             }
-            if (!$has_string_keys) {
+            if (! $has_string_keys) {
                 $value = array_combine($keys, $value);
             }
         }
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index ee86f5384d..686eb29736 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -172,7 +172,7 @@ class FormDisplay
             foreach ($errors as $path => $error_list) {
                 $work_path = array_search($path, $this->_systemPaths);
                 // field error
-                if (!$work_path) {
+                if (! $work_path) {
                     // form error, fix path
                     $work_path = $path;
                 }
@@ -219,7 +219,7 @@ class FormDisplay
                 break;
             }
         }
-        if (!$is_new_server) {
+        if (! $is_new_server) {
             $this->_validate();
         }
 
@@ -274,7 +274,7 @@ class FormDisplay
         PMA_displayFormBottom();
 
         // if not already done, send strings used for valdiation to JavaScript
-        if (!$js_lang_sent) {
+        if (! $js_lang_sent) {
             $js_lang_sent = true;
             $js_lang = array();
             foreach ($this->_jsLangStrings as $strName => $strValue) {
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index 064ff0dbfc..13b5090bc7 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -30,7 +30,7 @@ function PMA_displayFormTop($action = null, $method = 'post', $hidden_fields = n
     echo '<input type="hidden" name="tab_hash" value="" />';
     // we do validation on page refresh when browser remembers field values,
     // add a field with known value which will be used for checks
-    if (!$has_check_page_refresh) {
+    if (! $has_check_page_refresh) {
         $has_check_page_refresh = true;
         echo '<input type="hidden" name="check_page_refresh" '
             . ' id="check_page_refresh" value="" />' . "\n";
@@ -352,7 +352,7 @@ function PMA_displayGroupHeader($header_text)
     global $_FormDisplayGroup;
 
     $_FormDisplayGroup++;
-    if (!$header_text) {
+    if (! $header_text) {
         return;
     }
     $colspan = defined('PMA_SETUP')
diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php
index cd03b6bed9..6079b544ed 100644
--- a/libraries/config/validate.lib.php
+++ b/libraries/config/validate.lib.php
@@ -114,10 +114,10 @@ function PMA_config_validate($validator_id, &$values, $isPostSource)
             if (is_array($r)) {
                 foreach ($r as $key => $error_list) {
                     // skip empty values if $isPostSource is false
-                    if (!$isPostSource && empty($error_list)) {
+                    if (! $isPostSource && empty($error_list)) {
                         continue;
                     }
-                    if (!isset($result[$key])) {
+                    if (! isset($result[$key])) {
                         $result[$key] = array();
                     }
                     $result[$key] = array_merge($result[$key], (array)$error_list);
@@ -210,7 +210,7 @@ function test_db_connection(
     if ($extension == 'drizzle') {
         while (1) {
             $drizzle = @drizzle_create();
-            if (!$drizzle) {
+            if (! $drizzle) {
                 $error = __('Could not initialize Drizzle connection library');
                 break;
             }
@@ -219,7 +219,7 @@ function test_db_connection(
                 : @drizzle_con_add_tcp(
                     $drizzle, $host, $port, $user, $pass, null, 0
                 );
-            if (!$conn) {
+            if (! $conn) {
                 $error = __('Could not connect to Drizzle server');
                 drizzle_free($drizzle);
                 break;
@@ -227,7 +227,7 @@ function test_db_connection(
             // connection object is set up but we have to send some query
             // to actually connect
             $res = @drizzle_query($conn, 'SELECT 1');
-            if (!$res) {
+            if (! $res) {
                 $error = __('Could not connect to Drizzle server');
             } else {
                 drizzle_result_free($res);
@@ -238,14 +238,14 @@ function test_db_connection(
         }
     } else if ($extension == 'mysql') {
         $conn = @mysql_connect($host . $socket . $port, $user, $pass);
-        if (!$conn) {
+        if (! $conn) {
             $error = __('Could not connect to MySQL server');
         } else {
             mysql_close($conn);
         }
     } else {
         $conn = @mysqli_connect($host, $user, $pass, null, $port, $socket);
-        if (!$conn) {
+        if (! $conn) {
             $error = __('Could not connect to MySQL server');
         } else {
             mysqli_close($conn);
@@ -299,7 +299,7 @@ function validate_server($path, $values)
         $error = true;
     }
 
-    if (!$error && $values['Servers/1/auth_type'] == 'config') {
+    if (! $error && $values['Servers/1/auth_type'] == 'config') {
         $password = $values['Servers/1/nopassword'] ? null
             : $values['Servers/1/password'];
         $test = test_db_connection(
@@ -351,7 +351,7 @@ function validate_pmadb($path, $values)
             = __('Empty phpMyAdmin control user password while using pmadb');
         $error = true;
     }
-    if (!$error) {
+    if (! $error) {
         $test = test_db_connection(
             $values['Servers/1/extension'], $values['Servers/1/connect_type'],
             $values['Servers/1/host'], $values['Servers/1/port'],
@@ -474,8 +474,8 @@ function test_number(
     }
 
     if (intval($values[$path]) != $values[$path]
-        || (!$allow_neg && $values[$path] < 0)
-        || (!$allow_zero && $values[$path] == 0)
+        || (! $allow_neg && $values[$path] < 0)
+        || (! $allow_zero && $values[$path] == 0)
         || $values[$path] > $max_value
     ) {
         return $error_string;
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 0a43ce44a1..b6334abb84 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -612,7 +612,7 @@ function PMA_DBI_get_tables_full($database, $table = false,
                 $each_tables = apc_fetch($cacheKey);
             }
 
-            if (!$each_tables) {
+            if (! $each_tables) {
                 $each_tables = PMA_DBI_fetch_result($sql, 'Name', null, $link);
             }
 
@@ -855,7 +855,7 @@ function PMA_DBI_get_databases_full($database = null, $force_stats = false,
          * cause MySQL does not support natural ordering, we have to do it afterward
          */
         $limit = '';
-        if (!$GLOBALS['cfg']['NaturalOrder']) {
+        if (! $GLOBALS['cfg']['NaturalOrder']) {
             if ($limit_count) {
                 $limit = ' LIMIT ' . $limit_count . ' OFFSET ' . $limit_offset;
             }
@@ -1313,7 +1313,7 @@ function PMA_DBI_get_columns($database, $table, $column = null, $full = false,
                 $has_pk_candidates = true;
             }
         }
-        if (!$has_pk && $has_pk_candidates) {
+        if (! $has_pk && $has_pk_candidates) {
             // check whether we can promote some unique index to PRI
             $sql = "
                 SELECT i.index_name, p.column_name
diff --git a/libraries/dbi/drizzle-wrappers.lib.php b/libraries/dbi/drizzle-wrappers.lib.php
index 430a78d97f..ba560f71f9 100644
--- a/libraries/dbi/drizzle-wrappers.lib.php
+++ b/libraries/dbi/drizzle-wrappers.lib.php
@@ -298,7 +298,7 @@ class PMA_DrizzleResult
      */
     public function getColumns()
     {
-        if (!$this->_columns) {
+        if (! $this->_columns) {
             $this->_readColumns();
         }
         return $this->_columns;
@@ -324,7 +324,7 @@ class PMA_DrizzleResult
      */
     private function _transformResultRow(&$row, $fetchMode)
     {
-        if (!$row) {
+        if (! $row) {
             return;
         }
 
@@ -354,7 +354,7 @@ class PMA_DrizzleResult
     {
         // read column names on first fetch, only buffered results
         // allow for reading it later
-        if (!$this->_columns) {
+        if (! $this->_columns) {
             $this->_readColumns();
         }
         if ($fetchMode === null) {
diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php
index 093e5d624b..f4384c531c 100644
--- a/libraries/dbi/drizzle.dbi.lib.php
+++ b/libraries/dbi/drizzle.dbi.lib.php
@@ -108,14 +108,14 @@ function PMA_DBI_connect($user, $password, $is_controluser = false,
         $client_flags |= DRIZZLE_CAPABILITIES_SSL;
     }
 
-    if (!$server) {
+    if (! $server) {
         $link = @PMA_DBI_real_connect(
             $drizzle, $cfg['Server']['host'], $server_port, $server_socket, $user,
             $password, false, $client_flags
         );
         // Retry with empty password if we're allowed to
         if ($link == false && isset($cfg['Server']['nopassword'])
-            && $cfg['Server']['nopassword'] && !$is_controluser
+            && $cfg['Server']['nopassword'] && ! $is_controluser
         ) {
             $link = @PMA_DBI_real_connect(
                 $drizzle, $cfg['Server']['host'], $server_port, $server_socket,
diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
index 6a7e15df5f..a04c2f9082 100644
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/libraries/dbi/mysql.dbi.lib.php
@@ -129,14 +129,14 @@ function PMA_DBI_connect(
         $client_flags |= MYSQL_CLIENT_SSL;
     }
 
-    if (!$server) {
+    if (! $server) {
         $link = PMA_DBI_real_connect(
             $cfg['Server']['host'] . $server_port . $server_socket,
             $user, $password, empty($client_flags) ? null : $client_flags
         );
 
         // Retry with empty password if we're allowed to
-        if (empty($link) && $cfg['Server']['nopassword'] && !$is_controluser) {
+        if (empty($link) && $cfg['Server']['nopassword'] && ! $is_controluser) {
             $link = PMA_DBI_real_connect(
                 $cfg['Server']['host'] . $server_port . $server_socket,
                 $user, '', empty($client_flags) ? null : $client_flags
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index 5f08d69981..55a3d47762 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -161,7 +161,7 @@ function PMA_DBI_connect(
         $client_flags |= MYSQLI_CLIENT_SSL;
     }
 
-    if (!$server) {
+    if (! $server) {
         $return_value = @PMA_DBI_real_connect(
             $link,
             $cfg['Server']['host'],
@@ -175,7 +175,7 @@ function PMA_DBI_connect(
         // Retry with empty password if we're allowed to
         if ($return_value == false
             && isset($cfg['Server']['nopassword']) && $cfg['Server']['nopassword']
-            && !$is_controluser
+            && ! $is_controluser
         ) {
             $return_value = @PMA_DBI_real_connect(
                 $link,
diff --git a/libraries/schema/Dia_Relation_Schema.class.php b/libraries/schema/Dia_Relation_Schema.class.php
index 6be71fd0ce..14230ab808 100644
--- a/libraries/schema/Dia_Relation_Schema.class.php
+++ b/libraries/schema/Dia_Relation_Schema.class.php
@@ -226,11 +226,11 @@ class Table_Stats
     function __construct($tableName, $pageNumber, $showKeys = false)
     {
         global $dia, $cfgRelation, $db;
-        
+
         $this->tableName = $tableName;
         $sql = 'DESCRIBE ' . PMA_Util::backquote($tableName);
         $result = PMA_DBI_try_query($sql, null, PMA_DBI_QUERY_STORE);
-        if (!$result || !PMA_DBI_num_rows($result)) {
+        if (! $result || ! PMA_DBI_num_rows($result)) {
             $dia->dieSchema(
                 $pageNumber, "DIA",
                 sprintf(__('The %s table doesn\'t exist!'), $tableName)
diff --git a/libraries/schema/Export_Relation_Schema.class.php b/libraries/schema/Export_Relation_Schema.class.php
index 4863f5f68e..f8a3acf46e 100644
--- a/libraries/schema/Export_Relation_Schema.class.php
+++ b/libraries/schema/Export_Relation_Schema.class.php
@@ -191,7 +191,7 @@ class PMA_Export_Relation_Schema
     public function getAllTables($db, $pageNumber)
     {
         global $cfgRelation;
-        
+
         // Get All tables
         $tab_sql = 'SELECT table_name FROM '
             . PMA_Util::backquote($GLOBALS['cfgRelation']['db']) . '.'
@@ -200,7 +200,7 @@ class PMA_Export_Relation_Schema
             . ' AND pdf_page_number = ' . $pageNumber;
 
         $tab_rs = PMA_queryAsControlUser($tab_sql, null, PMA_DBI_QUERY_STORE);
-        if (!$tab_rs || !PMA_DBI_num_rows($tab_rs) > 0) {
+        if (! $tab_rs || ! PMA_DBI_num_rows($tab_rs) > 0) {
             $this->dieSchema('', __('This page does not contain any tables!'));
         }
         while ($curr_table = @PMA_DBI_fetch_assoc($tab_rs)) {
diff --git a/libraries/schema/Svg_Relation_Schema.class.php b/libraries/schema/Svg_Relation_Schema.class.php
index 26b1e40601..f9b694fb70 100644
--- a/libraries/schema/Svg_Relation_Schema.class.php
+++ b/libraries/schema/Svg_Relation_Schema.class.php
@@ -435,7 +435,7 @@ class Table_Stats
          . ' AND   pdf_page_number = ' . $pageNumber;
         $result = PMA_queryAsControlUser($sql, false, PMA_DBI_QUERY_STORE);
 
-        if (!$result || !PMA_DBI_num_rows($result)) {
+        if (! $result || ! PMA_DBI_num_rows($result)) {
             $svg->dieSchema(
                 $pageNumber,
                 "SVG",
diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php
index 3b0ef6d0f1..2f91b8f6f4 100644
--- a/libraries/schema/User_Schema.class.php
+++ b/libraries/schema/User_Schema.class.php
@@ -329,7 +329,7 @@ class PMA_User_Schema
                     echo 'even';
                 }
                 echo '">';
-                $odd_row = !$odd_row;
+                $odd_row = ! $odd_row;
 
                 echo '<td>';
                 echo '<select name="c_table_' . $i . '[name]">';
@@ -514,7 +514,7 @@ class PMA_User_Schema
                 $shoot       = true;
             }
         }
-        if (!$shoot) {
+        if (! $shoot) {
             return;
         }
         echo '<br /><form action="schema_edit.php" method="post">' . "\n"
@@ -569,7 +569,7 @@ class PMA_User_Schema
                 . 'class="pdflayout_table"'
                 . '>'
                 . '<u>'
-                . htmlspecialchars($temp_sh_page['table_name']) 
+                . htmlspecialchars($temp_sh_page['table_name'])
                 . '</u>';
 
             if (isset($with_field_names)) {
diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php
index 04f4d4c9ce..1ea394dee0 100644
--- a/libraries/schema/Visio_Relation_Schema.class.php
+++ b/libraries/schema/Visio_Relation_Schema.class.php
@@ -225,7 +225,7 @@ class Table_Stats
         $this->_tableName = $tableName;
         $sql = 'DESCRIBE ' . PMA_Util::backquote($tableName);
         $result = PMA_DBI_try_query($sql, null, PMA_DBI_QUERY_STORE);
-        if (!$result || !PMA_DBI_num_rows($result)) {
+        if (! $result || ! PMA_DBI_num_rows($result)) {
             $visio->dieSchema(
                 $pageNumber,
                 "VISIO",
@@ -275,7 +275,7 @@ class Table_Stats
          . ' AND   pdf_page_number = ' . $pageNumber;
         $result = PMA_queryAsControlUser($sql, false, PMA_DBI_QUERY_STORE);
 
-        if (!$result || !PMA_DBI_num_rows($result)) {
+        if (! $result || ! PMA_DBI_num_rows($result)) {
             $visio->dieSchema(
                 $pageNumber,
                 "VISIO",