Add coding standard rules for whitespace

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Jan 20, 2020 · 2859079 · 2859079
1 parent 63dbcd0
commit 2859079
Show file tree

Hide file tree

Showing 99 changed files with 61 additions and 182 deletions.
diff --git a/examples/openid.php b/examples/openid.php
@@ -34,6 +34,7 @@
 ];
 
 // phpcs:disable PSR1.Files.SideEffects
+
 /**
  * Simple function to show HTML page with given content.
  *
@@ -82,6 +83,7 @@ function Die_error($e)
     Show_page($contents);
     exit;
 }
+
 // phpcs:enable
 
 /* Need to have cookie visible from parent directory */

diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php
@@ -1484,7 +1484,7 @@ public function setCookie(
 
         $httpCookieName = $this->getCookieName($cookie);
 
-        if (! $this->issetCookie($cookie) ||  $this->getCookie($cookie) !== $value) {
+        if (! $this->issetCookie($cookie) || $this->getCookie($cookie) !== $value) {
             // set cookie with new value
             /* Calculate cookie validity */
             if ($validity === null) {

diff --git a/libraries/classes/Config/FormDisplay.php b/libraries/classes/Config/FormDisplay.php
@@ -780,7 +780,6 @@ public function hasErrors()
         return count($this->_errors) > 0;
     }
 
-
     /**
      * Returns link to documentation
      *

diff --git a/libraries/classes/Config/Validator.php b/libraries/classes/Config/Validator.php
@@ -364,7 +364,6 @@ public static function validatePMAStorage($path, array $values)
         return $result;
     }
 
-
     /**
      * Validates regular expression
      *

diff --git a/libraries/classes/Controllers/HomeController.php b/libraries/classes/Controllers/HomeController.php
@@ -58,7 +58,6 @@ public function __construct($response, $dbi, Template $template, $config, ThemeM
         $this->themeManager = $themeManager;
     }
 
-
     /**
      * @param array $params Request parameters
      *

diff --git a/libraries/classes/Controllers/Table/RelationController.php b/libraries/classes/Controllers/Table/RelationController.php
@@ -368,7 +368,7 @@ public function getDropdownValueForDatabase(string $storageEngine): void
 
             while ($row = $this->dbi->fetchArray($tables_rs)) {
                 if (isset($row['Engine'])
-                    &&  mb_strtoupper($row['Engine']) == $storageEngine
+                    && mb_strtoupper($row['Engine']) == $storageEngine
                 ) {
                     $tables[] = htmlspecialchars($row['Name']);
                 }

diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php
@@ -556,7 +556,6 @@ public static function noCacheHeader(): void
         header('Last-Modified: ' . gmdate(DATE_RFC1123));
     }
 
-
     /**
      * Sends header indicating file download.
      *

diff --git a/libraries/classes/Database/Designer.php b/libraries/classes/Database/Designer.php
@@ -303,7 +303,6 @@ public function getDatabaseTables(
         ]);
     }
 
-
     /**
      * Returns HTML for Designer page
      *

diff --git a/libraries/classes/Database/Qbe.php b/libraries/classes/Database/Qbe.php
@@ -384,6 +384,7 @@ private function _setCriteriaTablesAndColumns()
         // sets the largest width found
         $this->_realwidth = $this->_form_column_width . 'ex';
     }
+
     /**
      * Provides select options list containing column names
      *

diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php
@@ -392,7 +392,6 @@ public function getTables(string $database, $link = DatabaseInterface::CONNECT_U
         return $tables;
     }
 
-
     /**
      * returns
      *
@@ -854,7 +853,6 @@ public function getVirtualTables(string $db): array
         return $views;
     }
 
-
     /**
      * returns array with databases containing extended infos about them
      *

diff --git a/libraries/classes/Display/Export.php b/libraries/classes/Display/Export.php
@@ -330,7 +330,6 @@ private function getHtmlForOptionsOutputSaveDir()
         ]);
     }
 
-
     /**
      * Prints Html For Export Options
      *

diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php
@@ -440,7 +440,6 @@ public function setProperties(
         $editable,
         $is_browse_dist
     ) {
-
         $this->__set('unlim_num_rows', $unlim_num_rows);
         $this->__set('fields_meta', $fields_meta);
         $this->__set('is_count', $is_count);
@@ -1389,7 +1388,6 @@ private function _getFieldVisibilityParams(
         array &$displayParts,
         $full_or_partial_text_link
     ) {
-
         $button_html = '';
         $display_params = $this->__get('display_params');
 
@@ -1586,7 +1584,6 @@ private function _getOptionsBlock()
      */
     private function _getFullOrPartialTextButtonOrLink()
     {
-
         $url_params_full_text = [
             'db' => $this->__get('db'),
             'table' => $this->__get('table'),
@@ -1667,7 +1664,6 @@ private function _getOrderLinkAndSortedHeaderHtml(
         $col_visib,
         $col_visib_j
     ) {
-
         $sorted_header_html = '';
 
         // Checks if the table name is required; it's the case
@@ -1832,15 +1828,15 @@ private function _getSingleAndMultiSortUrls(
             $query_head = $is_first_clause ? "\nORDER BY " : '';
             // Again a check to see if the given column is a aggregate column
             if (mb_strpos($name_to_use_in_sort, '(') !== false) {
-                $sort_order .=  $query_head . $name_to_use_in_sort . ' ' ;
+                $sort_order .=  $query_head . $name_to_use_in_sort . ' ';
             } else {
                 if (strlen($sort_tbl_new) > 0) {
                     $sort_tbl_new .= '.';
                 }
                 $sort_order .=  $query_head . $sort_tbl_new
                   . Util::backquote(
                       $name_to_use_in_sort
-                  ) . ' ' ;
+                  ) . ' ';
             }
 
             // For a special case where the code generates two dots between
@@ -1918,7 +1914,6 @@ private function _isInSorted(
         $sort_tbl,
         $name_to_use_in_sort
     ) {
-
         $index_in_expression = 0;
 
         foreach ($sort_expression_nodirection as $index => $clause) {
@@ -2115,7 +2110,6 @@ private function _getDraggableClassForSortableColumns(
         $order_link,
         $comments
     ) {
-
         $draggable_html = '<th';
         $th_class = [];
         $th_class[] = 'draggable';
@@ -2164,7 +2158,6 @@ private function _getDraggableClassForNonSortableColumns(
         $fields_meta,
         $comments
     ) {
-
         $draggable_html = '<th';
         $th_class = [];
         $th_class[] = 'draggable';
@@ -2207,7 +2200,6 @@ private function _getColumnAtRightSide(
         $full_or_partial_text_link,
         $colspan
     ) {
-
         $right_column_html = '';
         $display_params = $this->__get('display_params');
 
@@ -3084,7 +3076,6 @@ private function _getSpecialLinkUrl(
      */
     private function _getRowInfoForSpecialLinks(array $row, $col_order)
     {
-
         $row_info = [];
         $fields_meta = $this->__get('fields_meta');
 
@@ -3231,7 +3222,6 @@ private function _getModifiedLinks(
         $clause_is_unique,
         $url_sql_query
     ) {
-
         $_url_params = [
             'db'               => $this->__get('db'),
             'table'            => $this->__get('table'),
@@ -3298,7 +3288,6 @@ private function _getDeleteAndKillLinks(
         $del_lnk,
         array $row
     ) {
-
         $goto = $this->__get('goto');
 
         if ($del_lnk == self::DELETE_ROW) { // delete row case
@@ -3380,7 +3369,6 @@ private function _getDeleteAndKillLinks(
      */
     private function _getActionLinkContent($icon, $display_text)
     {
-
         $linkContent = '';
 
         if (isset($GLOBALS['cfg']['RowActionType'])
@@ -3446,7 +3434,6 @@ private function _getPlacedLinks(
         $del_str,
         ?string $js_conf
     ) {
-
         if (! isset($js_conf)) {
             $js_conf = '';
         }
@@ -3560,7 +3547,6 @@ private function _getDataCellForNumericColumns(
         $default_function,
         array $transform_options
     ) {
-
         if (! isset($column) || $column === null) {
             $cell = $this->_buildNullDisplay(
                 'right ' . $class,
@@ -3948,7 +3934,6 @@ private function _getDataCellForNonNumericColumns(
      */
     public function setConfigParamsForDisplayTable()
     {
-
         $sql_md5 = md5($this->__get('sql_query'));
         $query = [];
         if (isset($_SESSION['tmpval']['query'][$sql_md5])) {
@@ -4338,7 +4323,6 @@ public function getTable(
      */
     private function _getOffsets()
     {
-
         if ($_SESSION['tmpval']['max_rows'] == self::ALL_ROWS) {
             $pos_next     = 0;
             $pos_prev     = 0;
@@ -4511,7 +4495,6 @@ private function _setMessageInformation(
         $pre_count,
         $after_count
     ) {
-
         $unlim_num_rows = $this->__get('unlim_num_rows'); // To use in isset()
 
         if (! empty($analyzed_sql_results['statement']->limit)) {
@@ -5516,7 +5499,6 @@ private function _getCopyLink(
      */
     private function _getDeleteLink($del_url, $del_str, $js_conf, $class)
     {
-
         $ret = '';
         if (empty($del_url)) {
             return $ret;

diff --git a/libraries/classes/Encoding.php b/libraries/classes/Encoding.php
@@ -290,7 +290,6 @@ public static function kanjiStrConv(string $str, string $enc, string $kana): str
         return $dist;
     }
 
-
     /**
      * Kanji file encoding convert
      *

diff --git a/libraries/classes/Engines/Pbxt.php b/libraries/classes/Engines/Pbxt.php
@@ -157,6 +157,7 @@ public function resolveTypeSize($formatted_size)
     }
 
     //--------------------
+
     /**
      * Get information about pages
      *
@@ -171,6 +172,7 @@ public function getInfoPages()
     }
 
     //--------------------
+
     /**
      * Get content of documentation page
      *

diff --git a/libraries/classes/Error.php b/libraries/classes/Error.php
@@ -216,7 +216,6 @@ public function setFile(string $file): void
         $this->file = self::relPath($file);
     }
 
-
     /**
      * returns unique PhpMyAdmin\Error::$hash, if not exists it will be created
      *

diff --git a/libraries/classes/ErrorHandler.php b/libraries/classes/ErrorHandler.php
@@ -357,7 +357,7 @@ public function getDispErrors(): string
         // if preference is not 'never' and
         // there are 'actual' errors to be reported
         if ($GLOBALS['cfg']['SendErrorReports'] != 'never'
-            &&  $this->countErrors() !=  $this->countUserErrors()
+            && $this->countErrors() !=  $this->countUserErrors()
         ) {
             // add report button.
             $retval .= '<form method="post" action="' . Url::getFromRoute('/error-report')

diff --git a/libraries/classes/File.php b/libraries/classes/File.php
@@ -623,7 +623,6 @@ public function setHandle($handle): void
         $this->_handle = $handle;
     }
 
-
     /**
      * Sets error message for unsupported compression.
      *

diff --git a/libraries/classes/Gis/GisPolygon.php b/libraries/classes/Gis/GisPolygon.php
@@ -405,7 +405,6 @@ public function generateWkt(array $gis_data, $index, $empty = '')
      */
     public static function area(array $ring)
     {
-
         $no_of_points = count($ring);
 
         // If the last point is same as the first point ignore it

diff --git a/libraries/classes/Html/Forms/Fields/BrowseUploadFileBlock.php b/libraries/classes/Html/Forms/Fields/BrowseUploadFileBlock.php
@@ -18,7 +18,6 @@
  */
 class BrowseUploadFileBlock implements FieldGenerator
 {
-
     /**
      * Prepare the form used to browse anywhere on the local server for a file to
      * import

diff --git a/libraries/classes/Html/Forms/Fields/DropDown.php b/libraries/classes/Html/Forms/Fields/DropDown.php
@@ -21,7 +21,6 @@
  */
 class DropDown implements FieldGenerator
 {
-
     /**
      * Generates and returns an HTML dropdown
      *

diff --git a/libraries/classes/Html/Forms/Fields/DropDownUploadFileBlock.php b/libraries/classes/Html/Forms/Fields/DropDownUploadFileBlock.php
@@ -20,7 +20,6 @@
  */
 class DropDownUploadFileBlock implements FieldGenerator
 {
-
     /**
      * Prepare the form used to select a file to import from the server upload
      * directory

diff --git a/libraries/classes/Html/Forms/Fields/FKCheckbox.php b/libraries/classes/Html/Forms/Fields/FKCheckbox.php
@@ -22,7 +22,6 @@
  */
 class FKCheckbox implements FieldGenerator
 {
-
     /**
      * Get HTML for Foreign key check checkbox
      *

diff --git a/libraries/classes/Html/Forms/Fields/MaxFileSize.php b/libraries/classes/Html/Forms/Fields/MaxFileSize.php
@@ -15,7 +15,6 @@
  */
 class MaxFileSize implements FieldGenerator
 {
-
     /**
      * Generates a hidden field which should indicate to the browser
      * the maximum size for upload

diff --git a/libraries/classes/Html/Forms/Fields/RadioList.php b/libraries/classes/Html/Forms/Fields/RadioList.php
@@ -21,7 +21,6 @@
  */
 class RadioList implements FieldGenerator
 {
-
     /**
      * Generates a set of radio HTML fields
      *

diff --git a/libraries/classes/Html/Generator.php b/libraries/classes/Html/Generator.php
@@ -1411,7 +1411,6 @@ public static function getListNavigator(
         $name = 'pos',
         $classes = []
     ): string {
-
         // This is often coming from $cfg['MaxTableList'] and
         // people sometimes set it to empty string
         $max_count = intval($max_count);

diff --git a/libraries/classes/Import.php b/libraries/classes/Import.php
@@ -349,7 +349,6 @@ public function lookForUse(?string $buffer, ?string $db, ?bool $reload): array
         ];
     }
 
-
     /**
      * Returns next part of imported file/buffer
      *
@@ -1340,7 +1339,6 @@ public function buildSql(
         $import_notice = $message;
     }
 
-
     /**
      * Stops the import on (mostly upload/file related) error
      *