Make PHPcs happy.

Tithugues · Tithugues · commit 3827e3e9886f · 2015-06-12T22:24:32.000+02:00
Signed-off-by: Hugues Peccatte &lt;hugues.peccatte@gmail.com&gt;
diff --git a/libraries/DatabaseInterface.class.php b/libraries/DatabaseInterface.class.php
@@ -3115,8 +3115,8 @@ public function getSystemDatabase()
     /**
      * Get a table with database name and table name
      *
-     * @param $db_name
-     * @param $table_name
+     * @param string $db_name    DB name
+     * @param string $table_name Table name
      *
      * @return PMA_Table
      */
diff --git a/libraries/Table.class.php b/libraries/Table.class.php
@@ -74,9 +74,9 @@ class PMA_Table
     /**
      * Constructor
      *
-     * @param string $table_name table name
-     * @param string $db_name database name
-     * @param PMA_DatabaseInterface $dbi database interface for the table
+     * @param string                $table_name table name
+     * @param string                $db_name    database name
+     * @param PMA_DatabaseInterface $dbi        database interface for the table
      */
     function __construct($table_name, $db_name, PMA_DatabaseInterface $dbi = null)
     {
@@ -1625,7 +1625,7 @@ protected function loadUiPrefs()
         $server_id = $GLOBALS['server'];
 
         // set session variable if it's still undefined
-        if (! isset($_SESSION['tmpval']['table_uiprefs'][$server_id][$this->_db_name][$this->_name])) {
+        if (!isset($_SESSION['tmpval']['table_uiprefs'][$server_id][$this->_db_name][$this->_name])) {
             // check whether we can get from pmadb
             $_SESSION['tmpval']['table_uiprefs'][$server_id][$this->_db_name]
             [$this->_name] = $cfgRelation['uiprefswork']
@@ -1819,11 +1819,14 @@ public function getReservedColumnNames()
     public function getNameAndTypeOfTheColumns()
     {
         $columns = array();
-        foreach ($this->_dbi->getColumnsFull($this->_db_name, $this->_name) as $row) {
+        foreach ($this->_dbi->getColumnsFull(
+            $this->_db_name, $this->_name
+        ) as $row) {
             if (preg_match('@^(set|enum)\((.+)\)$@i', $row['Type'], $tmp)) {
-                $tmp[2] = /*overload*/mb_substr(
-                    preg_replace('@([^,])\'\'@', '\\1\\\'', ',' . $tmp[2]), 1
-                );
+                $tmp[2] = /*overload*/
+                    mb_substr(
+                        preg_replace('@([^,])\'\'@', '\\1\\\'', ',' . $tmp[2]), 1
+                    );
                 $columns[$row['Field']] = $tmp[1] . '('
                     . str_replace(',', ', ', $tmp[2]) . ')';
             } else {
@@ -1836,7 +1839,8 @@ public function getNameAndTypeOfTheColumns()
     /**
      * Get index with index name
      *
-     * @param $index
+     * @param string $index Index name
+     *
      * @return PMA_Index
      */
     public function getIndex($index)
@@ -1890,7 +1894,9 @@ public function getSqlQueryForIndexCreateOrEdit($index, &$error)
             case 'INDEX':
             case 'SPATIAL':
                 if ($index->getName() == 'PRIMARY') {
-                    $error = PMA_Message::error(__('Can\'t rename index to PRIMARY!'));
+                    $error = PMA_Message::error(
+                        __('Can\'t rename index to PRIMARY!')
+                    );
                 }
                 $sql_query .= sprintf(
                     ' ADD %s ',
diff --git a/tbl_chart.php b/tbl_chart.php
@@ -140,14 +140,17 @@
 /**
  * Displays the page
  */
-$response->addHTML(Template::get('tbl_chart')->render(
-    array(
-        'url_query' => $url_query,
-        'url_params' => $url_params,
-        'keys' => $keys,
-        'fields_meta' => $fields_meta,
-        'numeric_types' => $numeric_types,
-        'numeric_column_count' => $numeric_column_count,
-        'sql_query' => $sql_query
-    )
-));
+$response->addHTML(
+    Template::get('tbl_chart')
+        ->render(
+            array(
+                'url_query' => $url_query,
+                'url_params' => $url_params,
+                'keys' => $keys,
+                'fields_meta' => $fields_meta,
+                'numeric_types' => $numeric_types,
+                'numeric_column_count' => $numeric_column_count,
+                'sql_query' => $sql_query
+            )
+        )
+);
diff --git a/tbl_indexes.php b/tbl_indexes.php
@@ -47,9 +47,11 @@
         PMA_Response::getInstance()->addJSON(
             'sql_data',
             PMA\Template::get('preview_sql')
-                ->render(array(
-                    'query_data' => $sql_query
-                ))
+                ->render(
+                    array(
+                        'query_data' => $sql_query
+                    )
+                )
         );
     } elseif (!$error) {
 
@@ -121,7 +123,8 @@
 }
 
 $response = PMA_Response::getInstance();
-$response->addHTML(PMA\Template::get('index_form')
+$response->addHTML(
+    PMA\Template::get('index_form')
     ->render(
         array(
             'fields' => $fields,
diff --git a/test/libraries/PMA_tbl_indexes_test.php b/test/libraries/PMA_tbl_indexes_test.php
@@ -122,7 +122,9 @@ public function testPMAGetHtmlForIndexForm()
          * );
          * $add_fields = 3;
          *
-         * $html = PMA_getHtmlForIndexForm($fields, $index, $form_params, $add_fields);
+         * $html = PMA_getHtmlForIndexForm(
+         *     $fields, $index, $form_params, $add_fields
+         * );
          *
          * //PMA_URL_getHiddenInputs
          * $this->assertContains(

Original file line number	Diff line number	Diff line change
`@@ -3115,8 +3115,8 @@ public function getSystemDatabase()`
`3115`	`3115`	`/**`
`3116`	`3116`	`* Get a table with database name and table name`
`3117`	`3117`	`*`
`3118`		`- * @param $db_name`
`3119`		`- * @param $table_name`
	`3118`	`+ * @param string $db_name DB name`
	`3119`	`+ * @param string $table_name Table name`
`3120`	`3120`	`*`
`3121`	`3121`	`* @return PMA_Table`
`3122`	`3122`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,9 @@ public function testPMAGetHtmlForIndexForm()`
`122`	`122`	`* );`
`123`	`123`	`* $add_fields = 3;`
`124`	`124`	`*`
`125`		`- * $html = PMA_getHtmlForIndexForm($fields, $index, $form_params, $add_fields);`
	`125`	`+ * $html = PMA_getHtmlForIndexForm(`
	`126`	`+ * $fields, $index, $form_params, $add_fields`
	`127`	`+ * );`
`126`	`128`	`*`
`127`	`129`	`* //PMA_URL_getHiddenInputs`
`128`	`130`	`* $this->assertContains(`