diff --git a/libraries/controllers/TableRelationController.class.php b/libraries/controllers/TableRelationController.class.php
index 4942ff1de2..892e5250a5 100644
--- a/libraries/controllers/TableRelationController.class.php
+++ b/libraries/controllers/TableRelationController.class.php
@@ -70,13 +70,13 @@ class TableRelationController extends TableController
     /**
      * Constructor
      *
-     * @param array  $options_array
-     * @param array  $cfgRelation
-     * @param string $tbl_storage_engine
-     * @param array  $existrel
+     * @param array  $options_array      Options
+     * @param array  $cfgRelation        Config relation
+     * @param string $tbl_storage_engine Table storage engine
+     * @param array  $existrel           
      * @param array  $existrel_foreign
      * @param string $disp
-     * @param string $upd_query
+     * @param string $upd_query          Update query
      */
     public function __construct($options_array, $cfgRelation, $tbl_storage_engine,
         $existrel, $existrel_foreign, $disp, $upd_query
diff --git a/libraries/controllers/TableSearchController.class.php b/libraries/controllers/TableSearchController.class.php
index cfe6e33380..5e036c8e26 100644
--- a/libraries/controllers/TableSearchController.class.php
+++ b/libraries/controllers/TableSearchController.class.php
@@ -90,10 +90,10 @@ class TableSearchController extends TableController
     /**
      * Constructor
      *
-     * @param string $db
-     * @param string $table
-     * @param string $searchType
-     * @param string $url_query
+     * @param string $db         DB name
+     * @param string $table      Table name
+     * @param string $searchType Search type
+     * @param string $url_query  URL query
      */
     public function __construct($db, $table, $searchType, $url_query)
     {
@@ -385,6 +385,9 @@ class TableSearchController extends TableController
     /**
      * Zoom submit action
      *
+     * @param string $dataLabel Data label
+     * @param string $goto      Goto
+     *
      * @return void
      */
     public function zoomSubmitAction($dataLabel, $goto)
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index 7c8f3d5b0a..07b0edf614 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -747,7 +747,9 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both')
              * @var CreateStatement $stmt
              */
             $stmt = $parser->statements[0];
-            $foreign['foreign_keys_data'] = SqlParser\Utils\Table::getForeignKeys($stmt);
+            $foreign['foreign_keys_data'] = SqlParser\Utils\Table::getForeignKeys(
+                $stmt
+            );
         }
     }
 
@@ -1329,7 +1331,8 @@ function PMA_getForeignData(
         // We could also do the SELECT anyway, with a LIMIT, and ensure that
         // the current value of the field is one of the choices.
 
-        $the_total   = $GLOBALS['dbi']->getTable($foreign_db, $foreign_table)->countRecords(true);
+        $the_total = $GLOBALS['dbi']->getTable($foreign_db, $foreign_table)
+            ->countRecords(true);
 
         if ($override_total == true
             || $the_total < $GLOBALS['cfg']['ForeignKeyMaxLimit']
diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index d85149fa90..2ffd20a9f2 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -152,8 +152,9 @@ function PMA_getHtmlForSlaveConfiguration(
         $html .= ' <select name="master_connection">';
         $html .= '<option value="">' . __('Default') . '</option>';
         foreach ($server_slave_multi_replication as $server) {
-            $html .= '<option' . (isset($_REQUEST['master_connection']) && $_REQUEST['master_connection'] == $server['Connection_name'] ?
-                ' selected="selected"' : '') . '>' . $server['Connection_name']
+            $html .= '<option' . (isset($_REQUEST['master_connection'])
+                && $_REQUEST['master_connection'] == $server['Connection_name'] ?
+                    ' selected="selected"' : '') . '>' . $server['Connection_name']
                 . '</option>';
         }
         $html .= '</select>';
@@ -228,7 +229,10 @@ function PMA_getHtmlForSlaveConfiguration(
         $reconfiguremaster_link = 'server_replication.php'
             . PMA_URL_getCommon($_url_params);
 
-        $html .= __('Server is configured as slave in a replication process. Would you like to:');
+        $html .= __(
+            'Server is configured as slave in a replication process. Would you ' .
+            'like to:'
+        );
         $html .= '<br />';
         $html .= '<ul>';
         $html .= ' <li><a href="#" id="slave_status_href">';
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 75c1d74bfd..c173799ea6 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -800,8 +800,8 @@ function PMA_getHtmlForRequires($row)
         . 'REQUIRE SUBJECT'
         . '</dfn></code></label>';
     $html_output .= '<input type="text" name="x509_subject" id="text_x509_subject" '
-        . 'value="' . (isset($row['x509_subject']) ? $row['x509_subject'] : '') . '" '
-        . 'size=80" title="'
+        . 'value="' . (isset($row['x509_subject']) ? $row['x509_subject'] : '')
+        . '" size=80" title="'
         . __(
             'Requires that a valid X509 certificate with this subject be presented.'
         )
@@ -837,7 +837,9 @@ function PMA_getHtmlForRequires($row)
             'Requires SSL-encrypted connections.'
         )
         . '"'
-        . ((isset($row['ssl_type']) && ($row['ssl_type'] == 'ANY' || $row['ssl_type'] == ''))
+        . ((isset($row['ssl_type'])
+            && ($row['ssl_type'] == 'ANY'
+                || $row['ssl_type'] == ''))
             ? ' checked="checked"'
             : ''
         )
@@ -1608,7 +1610,8 @@ function PMA_getHtmlForLoginInformationFields($mode = 'new')
         // use default value of '%' to match with the default 'Any host'
         . htmlspecialchars(isset($GLOBALS['hostname']) ? $GLOBALS['hostname'] : '%')
         . '" title="' . __('Host name')
-        . '" onchange="pred_hostname.value = \'userdefined\'; this.required = true;" '
+        . '" onchange="pred_hostname.value = \'userdefined\'; '
+        . 'this.required = true;" '
         . ((isset($GLOBALS['pred_hostname'])
                 && $GLOBALS['pred_hostname'] == 'userdefined'
             )
@@ -1658,7 +1661,8 @@ function PMA_getHtmlForLoginInformationFields($mode = 'new')
         . '</span>' . "\n"
         . '<input type="password" id="text_pma_pw" name="pma_pw" '
         . 'title="' . __('Password') . '" '
-        . 'onchange="pred_password.value = \'userdefined\'; this.required = true; pma_pw2.required = true;" '
+        . 'onchange="pred_password.value = \'userdefined\'; this.required = true; '
+        . 'pma_pw2.required = true;" '
         . (isset($GLOBALS['username']) ? '' : 'required="required"')
         . '/>' . "\n"
         . '</div>' . "\n";
@@ -1671,7 +1675,8 @@ function PMA_getHtmlForLoginInformationFields($mode = 'new')
         . '<span class="options">&nbsp;</span>' . "\n"
         . '<input type="password" name="pma_pw2" id="text_pma_pw2" '
         . 'title="' . __('Re-type') . '" '
-        . 'onchange="pred_password.value = \'userdefined\'; this.required = true; pma_pw.required = true;" '
+        . 'onchange="pred_password.value = \'userdefined\'; this.required = true; '
+        . 'pma_pw.required = true;" '
         . (isset($GLOBALS['username']) ? '' : 'required="required"')
         . '/>' . "\n"
         . '</div>' . "\n"
@@ -2295,7 +2300,8 @@ function PMA_getHtmlTableBodyForSpecificDbOrTablePrivs($privMap, $db)
                 $html_output .= ' rowspan="' . $nbPrivileges . '"';
             }
             $html_output .= '>';
-            $html_output .= '<input type="checkbox" class="checkall" name="selected_usr[]" '
+            $html_output .= '<input type="checkbox" class="checkall" '
+                . 'name="selected_usr[]" '
                 . 'id="checkbox_sel_users_' . ($index_checkbox++) . '" '
                 . 'value="' . $value . '" /></td>' . "\n";
 
diff --git a/libraries/server_status_processes.lib.php b/libraries/server_status_processes.lib.php
index d3708635eb..a5cdf73e77 100644
--- a/libraries/server_status_processes.lib.php
+++ b/libraries/server_status_processes.lib.php
@@ -141,7 +141,7 @@ function PMA_getHtmlForServerProcesslist()
         if (! empty($_REQUEST['showExecuting'])) {
             $sql_query .= ' WHERE state = "executing" ';
         }
-        if (! empty($_REQUEST['order_by_field']) && ! empty($_REQUEST['sort_order'])) {
+        if (!empty($_REQUEST['order_by_field']) && !empty($_REQUEST['sort_order'])) {
             $sql_query .= ' ORDER BY '
                 . PMA_Util::backquote($_REQUEST['order_by_field'])
                 . ' ' . $_REQUEST['sort_order'];
diff --git a/libraries/server_variables.lib.php b/libraries/server_variables.lib.php
index 9dde1a44c7..459939e3e7 100644
--- a/libraries/server_variables.lib.php
+++ b/libraries/server_variables.lib.php
@@ -1581,18 +1581,22 @@ function PMA_getArrayForDocumentLinks()
         'performance_schema_digests_size',
         'performance-schema-system-variables',
         'sysvar');
-    $variable_doc_links['performance_schema_events_stages_history_long_size'] = array(
-        'performance_schema_events_stages_history_long_size',
-        'performance-schema-system-variables',
-        'sysvar');
+    $variable_doc_links['performance_schema_events_stages_history_long_size']
+        = array(
+            'performance_schema_events_stages_history_long_size',
+            'performance-schema-system-variables',
+            'sysvar',
+        );
     $variable_doc_links['performance_schema_events_stages_history_size'] = array(
         'performance_schema_events_stages_history_size',
         'performance-schema-system-variables',
         'sysvar');
-    $variable_doc_links['performance_schema_events_statements_history_long_size'] = array(
-        'performance_schema_events_statements_history_long_size',
-        'performance-schema-system-variables',
-        'sysvar');
+    $variable_doc_links['performance_schema_events_statements_history_long_size']
+        = array(
+            'performance_schema_events_statements_history_long_size',
+            'performance-schema-system-variables',
+            'sysvar',
+        );
     $variable_doc_links['performance_schema_events_statements_history_size'] = array(
         'performance_schema_events_statements_history_size',
         'performance-schema-system-variables',
diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php
index 9956039c5b..dbcf071afb 100644
--- a/libraries/sql.lib.php
+++ b/libraries/sql.lib.php
@@ -1166,7 +1166,8 @@ function PMA_countQueryResults(
                  * @todo In countRecords(), MaxExactCount is also verified,
                  *       so can we avoid checking it twice?
                  */
-                $unlim_num_rows = $GLOBALS['dbi']->getTable($db, $table)->countRecords(true);
+                $unlim_num_rows = $GLOBALS['dbi']->getTable($db, $table)
+                    ->countRecords(true);
             }
 
         } else {
@@ -2106,7 +2107,9 @@ function PMA_executeQueryAndGetQueryResponse($analyzed_sql_results,
         );
 
     // No rows returned -> move back to the calling page
-    if ((0 == $num_rows && 0 == $unlim_num_rows) || $analyzed_sql_results['is_affected']) {
+    if ((0 == $num_rows && 0 == $unlim_num_rows)
+        || $analyzed_sql_results['is_affected']
+    ) {
         $html_output = PMA_getQueryResponseForNoResultsReturned(
             $analyzed_sql_results, $db, $table,
             isset($message_to_show) ? $message_to_show : null,
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 15578fdf11..9fc349d396 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -252,8 +252,8 @@ function PMA_getHtmlForSqlQueryFormInsert(
         $html .= '<input type="button" value="' . __('Format') . '" id="format"'
             . ' class="button sqlbutton" />';
     }
-    $html .= '<input type="button" value="' . __('Get auto-saved query') . '" id="saved"'
-        . ' class="button sqlbutton" />';
+    $html .= '<input type="button" value="' . __('Get auto-saved query')
+        . '" id="saved" class="button sqlbutton" />';
 
     // parameter binding
     $html .= '<div>';
diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php
index 9beeae410e..fc3c443cbd 100644
--- a/libraries/structure.lib.php
+++ b/libraries/structure.lib.php
@@ -686,7 +686,10 @@ function PMA_getHtmlForNotNullEngineViewTable($table_is_view, $current_table,
             $show_superscript = PMA_Util::showHint(
                 PMA_sanitize(
                     sprintf(
-                        __('This view has at least this number of rows. Please refer to %sdocumentation%s.'),
+                        __(
+                            'This view has at least this number of rows. Please ' .
+                            'refer to %sdocumentation%s.'
+                        ),
                         '[doc@cfg_MaxExactCountViews]',
                         '[/doc]'
                     )
@@ -861,7 +864,8 @@ function PMA_tableHeader($db_is_system_schema = false, $replication = false)
             . '        ' . __('Replication') . "\n"
             . '</th>';
     }
-    $html_output .= '<th colspan="' . $action_colspan . '" class="print_ignore">' . "\n"
+    $html_output .= '<th colspan="' . $action_colspan . '" class="print_ignore">'
+        . "\n"
         . '        ' . __('Action') . "\n"
         . '</th>'
         // larger values are more interesting so default sort order is DESC
@@ -2136,7 +2140,8 @@ function PMA_getHtmlForActionsInTableStructure($type, $tbl_storage_engine,
     $primary, $field_name, $url_query, $titles, $row, $rownum,
     $columns_with_unique_index, $isInCentralColumns
 ) {
-    $html_output = '<td class="print_ignore"><ul class="table-structure-actions resizable-menu">';
+    $html_output = '<td class="print_ignore">'
+        . '<ul class="table-structure-actions resizable-menu">';
     $html_output .= PMA_getHtmlForActionRowInStructureTable(
         $type, $tbl_storage_engine,
         'primary nowrap',
@@ -2595,7 +2600,8 @@ function PMA_updateColumns($db, $table)
                 && ! empty($_REQUEST['field_adjust_privileges'][$i])
                 && $_REQUEST['field_orig'][$i] != $_REQUEST['field_name'][$i]
             ) {
-                    $adjust_privileges[$_REQUEST['field_orig'][$i]] = $_REQUEST['field_name'][$i];
+                $adjust_privileges[$_REQUEST['field_orig'][$i]]
+                    = $_REQUEST['field_name'][$i];
             }
         }
     } // end for
@@ -2656,11 +2662,16 @@ function PMA_updateColumns($db, $table)
         $result = $GLOBALS['dbi']->tryQuery($sql_query);
 
         if ($result !== false) {
-            $changed_privileges = PMA_adjustColumnPrivileges($db, $table, $adjust_privileges);
+            $changed_privileges = PMA_adjustColumnPrivileges(
+                $db, $table, $adjust_privileges
+            );
 
             if ($changed_privileges) {
                 $message = PMA_Message::success(
-                    __('Table %1$s has been altered successfully. Privileges have been adjusted.')
+                    __(
+                        'Table %1$s has been altered successfully. Privileges ' .
+                        'have been adjusted.'
+                    )
                 );
             } else {
                 $message = PMA_Message::success(
diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index f93d97a370..832659ce88 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -145,20 +145,40 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
         $columnMeta = array_merge(
             $columnMeta,
             array(
-                'Field' => Util\get($_REQUEST, "field_name.${columnNumber}", false),
-                'Type' => Util\get($_REQUEST, "field_type.${columnNumber}", false),
-                'Collation' => Util\get($_REQUEST, "field_collation.${columnNumber}", ''),
-                'Null' => Util\get($_REQUEST, "field_null.${columnNumber}", ''),
-                'DefaultType' => Util\get($_REQUEST, "field_default_type.${columnNumber}", 'NONE'),
-                'DefaultValue' => Util\get($_REQUEST, "field_default_value.${columnNumber}", ''),
-                'Extra' => Util\get($_REQUEST, "field_extra.${columnNumber}", false),
-                'Virtuality' => Util\get($_REQUEST, "field_virtuality.${columnNumber}", ''),
-                'Expression' => Util\get($_REQUEST, "field_expression.${columnNumber}", ''),
+                'Field'        => Util\get(
+                    $_REQUEST, "field_name.${columnNumber}", false
+                ),
+                'Type'         => Util\get(
+                    $_REQUEST, "field_type.${columnNumber}", false
+                ),
+                'Collation'    => Util\get(
+                    $_REQUEST, "field_collation.${columnNumber}", ''
+                ),
+                'Null'         => Util\get(
+                    $_REQUEST, "field_null.${columnNumber}", ''
+                ),
+                'DefaultType'  => Util\get(
+                    $_REQUEST, "field_default_type.${columnNumber}", 'NONE'
+                ),
+                'DefaultValue' => Util\get(
+                    $_REQUEST, "field_default_value.${columnNumber}", ''
+                ),
+                'Extra'        => Util\get(
+                    $_REQUEST, "field_extra.${columnNumber}", false
+                ),
+                'Virtuality'   => Util\get(
+                    $_REQUEST, "field_virtuality.${columnNumber}", ''
+                ),
+                'Expression'   => Util\get(
+                    $_REQUEST, "field_expression.${columnNumber}", ''
+                ),
             )
         );
 
         $columnMeta['Key'] = '';
-        $parts = explode('_', Util\get($_REQUEST, "field_key.${columnNumber}", ''), 2);
+        $parts = explode(
+            '_', Util\get($_REQUEST, "field_key.${columnNumber}", ''), 2
+        );
         if (count($parts) == 2 && $parts[1] == $columnNumber) {
             $columnMeta['Key'] = Util\get(
                 array(
@@ -191,15 +211,23 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
         }
 
         $length = Util\get($_REQUEST, "field_length.${columnNumber}", $length);
-        $submit_attribute = Util\get($_REQUEST, "field_attribute.${columnNumber}", false);
-        $comments_map[$columnMeta['Field']] = Util\get($_REQUEST, "field_comments.${columnNumber}");
+        $submit_attribute = Util\get(
+            $_REQUEST, "field_attribute.${columnNumber}", false
+        );
+        $comments_map[$columnMeta['Field']] = Util\get(
+            $_REQUEST, "field_comments.${columnNumber}"
+        );
 
         $mime_map[$columnMeta['Field']] = array_merge(
             $mime_map[$columnMeta['Field']],
             array(
                 'mimetype' => Util\get($_REQUEST, "field_mimetype.${$columnNumber}"),
-                'transformation' => Util\get($_REQUEST, "field_transformation.${$columnNumber}"),
-                'transformation_options' => Util\get($_REQUEST, "field_transformation_options.${$columnNumber}")
+                'transformation' => Util\get(
+                    $_REQUEST, "field_transformation.${$columnNumber}"
+                ),
+                'transformation_options' => Util\get(
+                    $_REQUEST, "field_transformation_options.${$columnNumber}"
+                ),
             )
         );
 
@@ -210,7 +238,9 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
         );
         if (in_array($columnMeta['Extra'], $virtual)) {
             $table = new PMA_Table($GLOBALS['table'], $GLOBALS['db']);
-            $expressions = $table->getColumnGenerationExpression($columnMeta['Field']);
+            $expressions = $table->getColumnGenerationExpression(
+                $columnMeta['Field']
+            );
             $columnMeta['Expression'] = $expressions[$columnMeta['Field']];
         }
         switch ($columnMeta['Default']) {
@@ -320,15 +350,33 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
         $form_params = array_merge(
             $form_params,
             array(
-                "field_default_value_orig[${columnNumber}]" => Util\get($columnMeta, 'Default', ''),
-                "field_default_type_orig[${columnNumber}]" => Util\get($columnMeta, 'DefaultType', ''),
-                "field_collation_orig[${columnNumber}]" => Util\get($columnMeta, 'Collation', ''),
-                "field_attribute_orig[${columnNumber}]" => trim(Util\get($extracted_columnspec, 'attribute', '')),
-                "field_null_orig[${columnNumber}]" => Util\get($columnMeta, 'Null', ''),
-                "field_extra_orig[${columnNumber}]" => Util\get($columnMeta, 'Extra', ''),
-                "field_comments_orig[${columnNumber}]" => Util\get($columnMeta, 'Comment', ''),
-                "field_virtuality_orig[${columnNumber}]" => Util\get($columnMeta, 'Virtuality', ''),
-                "field_expression_orig[${columnNumber}]" => Util\get($columnMeta, 'Expression', ''),
+                "field_default_value_orig[${columnNumber}]" => Util\get(
+                    $columnMeta, 'Default', ''
+                ),
+                "field_default_type_orig[${columnNumber}]"  => Util\get(
+                    $columnMeta, 'DefaultType', ''
+                ),
+                "field_collation_orig[${columnNumber}]"     => Util\get(
+                    $columnMeta, 'Collation', ''
+                ),
+                "field_attribute_orig[${columnNumber}]"     => trim(
+                    Util\get($extracted_columnspec, 'attribute', '')
+                ),
+                "field_null_orig[${columnNumber}]"          => Util\get(
+                    $columnMeta, 'Null', ''
+                ),
+                "field_extra_orig[${columnNumber}]"         => Util\get(
+                    $columnMeta, 'Extra', ''
+                ),
+                "field_comments_orig[${columnNumber}]"      => Util\get(
+                    $columnMeta, 'Comment', ''
+                ),
+                "field_virtuality_orig[${columnNumber}]"    => Util\get(
+                    $columnMeta, 'Virtuality', ''
+                ),
+                "field_expression_orig[${columnNumber}]"    => Util\get(
+                    $columnMeta, 'Expression', ''
+                ),
             )
         );
     }
diff --git a/libraries/tracking.lib.php b/libraries/tracking.lib.php
index d8e83d542b..ba9456d761 100644
--- a/libraries/tracking.lib.php
+++ b/libraries/tracking.lib.php
@@ -220,7 +220,8 @@ function PMA_getHtmlForActivateDeactivateTracking(
     );
     $html .= '</legend>';
     $html .= '<input type="hidden" name="version" value="' . $last_version . '" />';
-    $html .= '<input type="hidden" name="toggle_activation" value="' . $value . '" />';
+    $html .= '<input type="hidden" name="toggle_activation" value="' . $value
+        . '" />';
     $html .= '<input type="submit" value="' . $button . '" />';
     $html .= '</fieldset>';
     $html .= '</form>';
diff --git a/test/libraries/PMA_GIS_modifyQuery_test.php b/test/libraries/PMA_GIS_modifyQuery_test.php
index 7451af526e..ad45d40ccc 100644
--- a/test/libraries/PMA_GIS_modifyQuery_test.php
+++ b/test/libraries/PMA_GIS_modifyQuery_test.php
@@ -20,16 +20,17 @@ require_once 'libraries/Util.class.php';
 class PMA_GIS_ModifyQueryTest extends PHPUnit_Framework_TestCase
 {
      //@todo: Move this test to GIS_Visualization's
-     /**
-      * Test PMA_GIS_modifyQuery method
-      *
-      * @param string $sql_query      query to modify
-      * @param array  $settings       visualization settings
-      * @param string $modified_query modified query
-      *
-      * @dataProvider provider
-      * @return void
-      */
+    /**
+     * Test PMA_GIS_modifyQuery method
+     *
+     * @internal     param string $sql_query query to modify
+     * @internal     param array  $settings visualization settings
+     * @internal     param string $modified_query modified query
+     *
+     * @return void
+     *
+     * @dataProvider provider
+     */
     public function testModifyQuery(/*$sql_query, $settings, $modified_query*/)
     {
         // $this->assertEquals(