Merge pull request #1798 from udan11/coding_style

Miscellaneous coding style fixes
phpmyadmin · Jul 18, 2015 · 48044b5 · 48044b5
2 parents e4d4349 + 236e0b6
commit 48044b5
Show file tree

Hide file tree

Showing 460 changed files with 130 additions and 584 deletions.
diff --git a/PMAStandard/Sniffs/Files/SpacesAroundConcatSniff.php b/PMAStandard/Sniffs/Files/SpacesAroundConcatSniff.php
@@ -76,5 +76,3 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 }//end class
 
 // }}}
-
-?>
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
@@ -1944,4 +1944,3 @@ function PMA_Config_fatalErrorHandler()
     register_shutdown_function('PMA_Config_fatalErrorHandler');
 }
 
-?>
diff --git a/libraries/DBQbe.class.php b/libraries/DBQbe.class.php
@@ -1966,4 +1966,3 @@ private function _getLeftJoinColumnCandidatesBest(
         }
     }
 }
-?>
diff --git a/libraries/DatabaseInterface.class.php b/libraries/DatabaseInterface.class.php
@@ -3133,4 +3133,3 @@ public function getTable($db_name, $table_name)
         return new PMA_Table($table_name, $db_name, $this);
     }
 }
-?>
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
@@ -5762,4 +5762,3 @@ private function _getPartialText($str)
     }
 }
 
-?>
diff --git a/libraries/Error.class.php b/libraries/Error.class.php
@@ -467,4 +467,3 @@ static function relPath($dest)
         );
     }
 }
-?>
diff --git a/libraries/File.class.php b/libraries/File.class.php
@@ -729,4 +729,3 @@ public function eof()
 
     }
 }
-?>
diff --git a/libraries/Font.class.php b/libraries/Font.class.php
@@ -142,4 +142,3 @@ public static function getStringWidth($text, $font, $fontSize, $charLists = null
         return (int)ceil($textWidth * $modifier);
     }
 }
-?>
diff --git a/libraries/Header.class.php b/libraries/Header.class.php
@@ -779,4 +779,3 @@ private function _addRecentTable($db, $table)
     }
 }
 
-?>
diff --git a/libraries/Index.class.php b/libraries/Index.class.php
@@ -1056,4 +1056,3 @@ public function getCompareData()
         );
     }
 }
-?>
diff --git a/libraries/List.class.php b/libraries/List.class.php
@@ -119,4 +119,3 @@ public function getDefault()
      */
     abstract public function build();
 }
-?>
diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php
@@ -190,4 +190,3 @@ public function getDefault()
         return $this->getEmpty();
     }
 }
-?>
diff --git a/libraries/Menu.class.php b/libraries/Menu.class.php
@@ -640,4 +640,3 @@ public function setTable($table)
     }
 }
 
-?>
diff --git a/libraries/Message.class.php b/libraries/Message.class.php
@@ -756,4 +756,3 @@ public function getMessageWithIcon($message)
 
     }
 }
-?>
diff --git a/libraries/OutputBuffering.class.php b/libraries/OutputBuffering.class.php
@@ -136,4 +136,3 @@ public function flush()
     }
 }
 
-?>
diff --git a/libraries/PMA.php b/libraries/PMA.php
@@ -106,4 +106,3 @@ public function getDatabaseList()
         return $this->databases;
     }
 }
-?>
diff --git a/libraries/Partition.class.php b/libraries/Partition.class.php
@@ -97,4 +97,3 @@ static public function havePartitioning()
         return $have_partitioning;
     }
 }
-?>
diff --git a/libraries/RecentFavoriteTable.class.php b/libraries/RecentFavoriteTable.class.php
@@ -390,4 +390,3 @@ private function _getPmaTable()
         return null;
     }
 }
-?>
diff --git a/libraries/Response.class.php b/libraries/Response.class.php
@@ -396,4 +396,3 @@ public static function response()
     }
 }
 
-?>
diff --git a/libraries/ServerStatusData.class.php b/libraries/ServerStatusData.class.php
@@ -506,4 +506,3 @@ public static function getHtmlForRefreshList($name,
     }
 }
 
-?>
diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php
@@ -448,4 +448,3 @@ public function getPage($id)
     }
 }
 
-?>
diff --git a/libraries/String.class.php b/libraries/String.class.php
@@ -185,4 +185,3 @@ public function numberInRangeInclusive($num, $lower, $upper)
         return $this->_type->numberInRangeInclusive($num, $lower, $upper);
     }
 }
-?>
diff --git a/libraries/StringAbstractType.class.php b/libraries/StringAbstractType.class.php
@@ -32,4 +32,3 @@ public function numberInRangeInclusive($num, $lower, $upper)
         return ($num >= $lower && $num <= $upper);
     }
 }
-?>
diff --git a/libraries/StringByte.int.php b/libraries/StringByte.int.php
@@ -175,4 +175,3 @@ public function ord($string);
      */
     public function chr($ascii);
 }
-?>
diff --git a/libraries/StringCType.class.php b/libraries/StringCType.class.php
@@ -107,4 +107,3 @@ public function isHexDigit($c)
         return ctype_xdigit($c);
     } // end of the "isHexDigit()" function
 }
-?>
diff --git a/libraries/StringNativeType.class.php b/libraries/StringNativeType.class.php
@@ -135,4 +135,3 @@ public function isHexDigit($c)
             || $this->numberInRangeInclusive($ord_c, $ord_Alower, $ord_Flower));
     } // end of the "isHexDigit()" function
 }
-?>
diff --git a/libraries/StringType.int.php b/libraries/StringType.int.php
@@ -87,4 +87,3 @@ public function isHexDigit($c);
      */
     public function numberInRangeInclusive($num, $lower, $upper);
 }
-?>
diff --git a/libraries/Table.class.php b/libraries/Table.class.php
@@ -2346,4 +2346,3 @@ public function showCreate()
         );
     }
 }
-?>
diff --git a/libraries/TableSearch.class.php b/libraries/TableSearch.class.php
@@ -852,4 +852,3 @@ public function getColumnMinMax($column)
         return $result;
     }
 }
-?>
diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php
@@ -482,4 +482,3 @@ function getCssGradient($start_color, $end_color)
         return implode("\n", $result);
     }
 }
-?>
diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php
@@ -457,4 +457,3 @@ public function printCss()
         return false;
     }
 }
-?>
diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php
@@ -1028,4 +1028,3 @@ private static function _getTrackingTable()
             . '.' . PMA_Util::backquote($cfgRelation['tracking']);
     }
 }
-?>
diff --git a/libraries/Util.class.php b/libraries/Util.class.php
@@ -4863,4 +4863,3 @@ public static function getClassForType($type)
     }
 }
 
-?>
diff --git a/libraries/bfShapeFiles/ShapeFile.lib.php b/libraries/bfShapeFiles/ShapeFile.lib.php
@@ -679,4 +679,3 @@ function setError($error) {
     }
   }
 
-?>
diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php
@@ -1404,4 +1404,3 @@ function PMA_getHTMLforEditingPage($selected_fld,$selected_db)
     $html .= '</form>';
     return $html;
 }
-?>
diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php
@@ -117,4 +117,3 @@ function PMA_convertString($src_charset, $dest_charset, $what)
     }
 } //  end of the "PMA_convertString()" function
 
-?>
diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php
@@ -404,4 +404,3 @@ function PMA_analyseShowGrant()
     $GLOBALS['dbs_to_test']       = false;
 }
 
-?>
diff --git a/libraries/cleanup.lib.php b/libraries/cleanup.lib.php
@@ -48,4 +48,3 @@ function PMA_removeRequestVars(&$whitelist)
         }
     }
 }
-?>
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
@@ -1239,4 +1239,3 @@
 if (! defined('PMA_MINIMUM_COMMON')) {
     include_once 'libraries/config/page_settings.class.php';
 }
-?>
diff --git a/libraries/config.default.php b/libraries/config.default.php
@@ -3151,4 +3151,3 @@
 );
 
 
-?>
diff --git a/libraries/config.values.php b/libraries/config.values.php
@@ -272,4 +272,3 @@
         array('validateUpperBound', 'value:QueryHistoryMax')
     )
 );
-?>
diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
@@ -540,4 +540,3 @@ public function getConfigArray()
         return $c;
     }
 }
-?>
diff --git a/libraries/config/Form.class.php b/libraries/config/Form.class.php
@@ -228,4 +228,3 @@ public function loadForm($form_name, $form)
         $this->readTypes();
     }
 }
-?>
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
@@ -876,4 +876,3 @@ private function _fillPostArrayParameters($post_values, $key)
         }
     }
 }
-?>
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
@@ -510,4 +510,3 @@ function PMA_displayErrors($name, $error_list)
     $htmlOutput .= '</dl>';
     return $htmlOutput;
 }
-?>
diff --git a/libraries/config/Validator.class.php b/libraries/config/Validator.class.php
@@ -621,4 +621,3 @@ public static function validateUpperBound($path, $values, $max_value)
             : sprintf(__('Value must be equal or lower than %s!'), $max_value)));
     }
 }
-?>
diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php
@@ -51,4 +51,3 @@ function PMA_langName($canonical_path, $type = 'name', $default = 'key')
         ? ($type == 'desc' ? PMA_lang($lang_key) : $GLOBALS["strConfig$lang_key"])
         : ($default == 'key' ? $lang_key : $default);
 }
-?>
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
@@ -859,4 +859,3 @@
 );
 $strConfigZeroConf_name = __('Enable Zero Configuration mode');
 
-?>
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
@@ -399,4 +399,3 @@
     ':group:' . __('Data'),
         'texytext_null',
         'texytext_columns'));
-?>
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
@@ -297,4 +297,3 @@
     ':group:' . __('Data'),
         'Export/texytext_null',
         'Export/texytext_columns');
-?>
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
@@ -1014,4 +1014,3 @@ function PMA_setGlobalDbOrTable($param)
         $GLOBALS['url_params'][$param] = $GLOBALS[$param];
     }
 }
-?>
diff --git a/libraries/create_addfield.lib.php b/libraries/create_addfield.lib.php
@@ -385,4 +385,3 @@ function PMA_tryColumnCreationQuery($db, $table, $err_url)
     }
     return array($GLOBALS['dbi']->tryQuery($sql_query) , $sql_query);
 }
-?>
diff --git a/libraries/data_dictionary_relations.lib.php b/libraries/data_dictionary_relations.lib.php
@@ -164,4 +164,3 @@
     )
 );
 
-?>
diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php
@@ -105,4 +105,3 @@
  */
 $url_query = PMA_URL_getCommon(array('db' => $db));
 
-?>
diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php
@@ -394,4 +394,3 @@ function PMA_getQueryDetails()
 {
     return PMA\Template::get('designer/query_details')->render();
 }
-?>
diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php
@@ -246,4 +246,3 @@
 if (empty($sub_part)) {
     $sub_part = '_structure';
 }
-?>
diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php
@@ -103,4 +103,3 @@
         }
     }
 } // end if (ensures table exists)
-?>
diff --git a/libraries/dbi/DBIDrizzle.class.php b/libraries/dbi/DBIDrizzle.class.php
@@ -551,4 +551,3 @@ public function storeResult($link)
         return false;
     }
 }
-?>
diff --git a/libraries/dbi/DBIDummy.class.php b/libraries/dbi/DBIDummy.class.php
@@ -966,4 +966,3 @@ public function fieldFlags($result, $i)
         return '';
     }
 }
-?>
diff --git a/libraries/dbi/DBIExtension.int.php b/libraries/dbi/DBIExtension.int.php
@@ -259,4 +259,3 @@ function PMA_defineClientAPI($version)
         );
     }
 }
-?>
diff --git a/libraries/dbi/DBIMysql.class.php b/libraries/dbi/DBIMysql.class.php
@@ -466,4 +466,3 @@ public function storeResult($result)
         return false;
     }
 }
-?>
diff --git a/libraries/dbi/DBIMysqli.class.php b/libraries/dbi/DBIMysqli.class.php
@@ -620,4 +620,3 @@ public function fieldFlags($result, $i)
         return implode(' ', $flags);
     }
 }
-?>
diff --git a/libraries/display_create_database.lib.php b/libraries/display_create_database.lib.php
@@ -59,4 +59,3 @@
         )
         . '' . __('No Privileges') . '</span>';
 } // end create db form or message
-?>
diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php
@@ -79,4 +79,3 @@ function PMA_getHtmlForCreateTable($db)
 if (!defined('TESTSUITE')) {
     echo PMA_getHtmlForCreateTable($db);
 }
-?>
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
@@ -1022,4 +1022,3 @@ function PMA_getHtmlForAliasModalDialog($db = '', $table = '')
     $html .= '</div>';
     return $html;
 }
-?>
diff --git a/libraries/display_import.inc.php b/libraries/display_import.inc.php
@@ -62,4 +62,3 @@
 $response = PMA_Response::getInstance();
 $response->addHTML($html);
 
-?>
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
@@ -618,4 +618,3 @@ function PMA_getHtmlForImportWithPlugin($upload_id)
     return $html;
 }
 
-?>
diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php
@@ -126,4 +126,3 @@ function PMA_importAjaxStatus($id)
         $_SESSION[$GLOBALS['SESSION_KEY']]['handler']::getUploadStatus($id)
     );
 }
-?>
diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php
@@ -95,4 +95,3 @@ function PMA_getLanguageSelectorHtml($use_fieldset = false, $show_doc = true)
     return $retval;
 }
 
-?>
diff --git a/libraries/display_structure.inc.php b/libraries/display_structure.inc.php
@@ -271,4 +271,3 @@
 $response->addHTML(
     '<div class="clearfloat"></div>'
 );
-?>
diff --git a/libraries/engines/bdb.lib.php b/libraries/engines/bdb.lib.php
@@ -84,4 +84,3 @@ public function getMysqlHelpPage()
     }
 }
 
-?>
diff --git a/libraries/engines/berkeleydb.lib.php b/libraries/engines/berkeleydb.lib.php
@@ -23,4 +23,3 @@ class PMA_StorageEngine_Berkeleydb extends PMA_StorageEngine_Bdb
 {
 }
 
-?>
diff --git a/libraries/engines/binlog.lib.php b/libraries/engines/binlog.lib.php
@@ -28,4 +28,3 @@ public function getMysqlHelpPage()
     }
 }
 
-?>
diff --git a/libraries/engines/innobase.lib.php b/libraries/engines/innobase.lib.php
@@ -22,4 +22,3 @@
 class PMA_StorageEngine_Innobase extends PMA_StorageEngine_Innodb
 {
 }
-?>
diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php
@@ -389,4 +389,3 @@ public function supportsFilePerTable()
     }
 }
 
-?>
diff --git a/libraries/engines/memory.lib.php b/libraries/engines/memory.lib.php
@@ -31,4 +31,3 @@ public function getVariables()
     }
 }
 
-?>
diff --git a/libraries/engines/merge.lib.php b/libraries/engines/merge.lib.php
@@ -18,4 +18,3 @@ class PMA_StorageEngine_Merge extends PMA_StorageEngine
 {
 }
 
-?>
diff --git a/libraries/engines/mrg_myisam.lib.php b/libraries/engines/mrg_myisam.lib.php
@@ -33,4 +33,3 @@ public function getMysqlHelpPage()
     }
 }
 
-?>
diff --git a/libraries/engines/myisam.lib.php b/libraries/engines/myisam.lib.php
@@ -66,4 +66,3 @@ public function getVariables()
     }
 }
 
-?>