diff --git a/db_datadict.php b/db_datadict.php
index e53c992dfe..8602d95f4a 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -67,7 +67,8 @@ foreach ($tables as $table) {
     /**
      * Gets table information
      */
-    $show_comment = $GLOBALS['dbi']->getTable($db, $table)->sGetStatusInfo('TABLE_COMMENT');
+    $show_comment = $GLOBALS['dbi']->getTable($db, $table)
+        ->sGetStatusInfo('TABLE_COMMENT');
 
     /**
      * Gets table keys and retains them
diff --git a/db_designer.php b/db_designer.php
index 221087ee4e..00731675c4 100644
--- a/db_designer.php
+++ b/db_designer.php
@@ -94,8 +94,8 @@ if (isset($_REQUEST['operation'])) {
             && $GLOBALS['cfgRelation']['designersettingswork']
         ) {
             $orig_data_query = 'SELECT ' . PMA_Util::backquote('settings_data')
-                . ' FROM `' . $cfgDesigner['db'] . '`.`' . $cfgDesigner['table'] . '` WHERE '
-                . PMA_Util::backquote('username') . ' = "'
+                . ' FROM `' . $cfgDesigner['db'] . '`.`' . $cfgDesigner['table']
+                . '` WHERE ' . PMA_Util::backquote('username') . ' = "'
                 . $cfgDesigner['user'] . '"';
 
             $orig_data = $GLOBALS['dbi']->fetchSingleRow($orig_data_query);
@@ -113,8 +113,8 @@ if (isset($_REQUEST['operation'])) {
                 $save_query = 'UPDATE `' . $cfgDesigner['db'] . '`.`'
                     . $cfgDesigner['table'] . '` SET '
                     . PMA_Util::backquote('settings_data') . ' = \''
-                    . $orig_data . '\' WHERE ' . PMA_Util::backquote('username') . ' = "'
-                    . $cfgDesigner['user'] . '";';
+                    . $orig_data . '\' WHERE ' . PMA_Util::backquote('username')
+                    . ' = "' . $cfgDesigner['user'] . '";';
 
                 $success = $GLOBALS['dbi']->query($save_query);
             } else {
@@ -122,7 +122,8 @@ if (isset($_REQUEST['operation'])) {
 
                 $query = 'INSERT INTO ' . PMA_Util::backquote($cfgDesigner['db'])
                     . '.' . PMA_Util::backquote($cfgDesigner['table'])
-                    . ' VALUES("' . PMA_Util::sqlAddSlashes($cfgDesigner['user']) . '", \''
+                    . ' VALUES("' . PMA_Util::sqlAddSlashes($cfgDesigner['user'])
+                    . '", \''
                     . PMA_Util::sqlAddSlashes(json_encode($save_data)) . '\');';
 
                 $success = $GLOBALS['dbi']->query($query);
diff --git a/db_export.php b/db_export.php
index 67871bd654..1657a87bf8 100644
--- a/db_export.php
+++ b/db_export.php
@@ -44,7 +44,8 @@ if (isset($_GET['structure_or_data_forced'])) {
 } else {
     $force_val = 0;
 }
-$multi_values .= '<input type="hidden" name="structure_or_data_forced" value="' . $force_val . '">';
+$multi_values .= '<input type="hidden" name="structure_or_data_forced" value="'
+    . $force_val . '">';
 $multi_values .= '<table class="export_table_select">'
     . '<thead><tr><th></th>'
     . '<th>' . __('Tables') . '</th>'
@@ -53,8 +54,10 @@ $multi_values .= '<table class="export_table_select">'
     . '</tr><tr>'
     . '<td></td>'
     . '<td class="export_table_name all">' . __('Select all') . '</td>'
-    . '<td class="export_structure all"><input type="checkbox" id="table_structure_all" /></td>'
-    . '<td class="export_data all"><input type="checkbox" id="table_data_all" /></td>'
+    . '<td class="export_structure all">'
+    . '<input type="checkbox" id="table_structure_all" /></td>'
+    . '<td class="export_data all"><input type="checkbox" id="table_data_all" />'
+    . '</td>'
     . '</tr></thead>'
     . '<tbody>';
 $multi_values .= "\n";
@@ -103,10 +106,13 @@ foreach ($tables as $each_table) {
     $multi_values .= '<tr>';
     $multi_values .= '<td><input type="checkbox" name="table_select[]"'
         . ' value="' . $table_html . '"' . $is_checked . ' /></td>';
-    $multi_values .= '<td class="export_table_name">' . str_replace(' ', '&nbsp;', $table_html) . '</td>';
-    $multi_values .= '<td class="export_structure"><input type="checkbox" name="table_structure[]"'
+    $multi_values .= '<td class="export_table_name">'
+        . str_replace(' ', '&nbsp;', $table_html) . '</td>';
+    $multi_values .= '<td class="export_structure">'
+        . '<input type="checkbox" name="table_structure[]"'
         . ' value="' . $table_html . '"' . $structure_checked . ' /></td>';
-    $multi_values .= '<td class="export_data"><input type="checkbox" name="table_data[]"'
+    $multi_values .= '<td class="export_data">'
+        . '<input type="checkbox" name="table_data[]"'
         . ' value="' . $table_html . '"' . $data_checked . ' /></td>';
     $multi_values .= '</tr>';
 } // end for
diff --git a/db_operations.php b/db_operations.php
index 12b2e1d5d3..487a4a9700 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -270,7 +270,10 @@ if (!$is_information_schema) {
         && $cfg['PmaNoRelation_DisableWarning'] == false
     ) {
         $message = PMA_Message::notice(
-            __('The phpMyAdmin configuration storage has been deactivated. %sFind out why%s.')
+            __(
+                'The phpMyAdmin configuration storage has been deactivated. ' .
+                '%sFind out why%s.'
+            )
         );
         $message->addParam(
             '<a href="' . $cfg['PmaAbsoluteUri']
diff --git a/index.php b/index.php
index b377fbc76b..f596952c54 100644
--- a/index.php
+++ b/index.php
@@ -618,7 +618,8 @@ if (isset($GLOBALS['dbi'])
                 sprintf(
                     __(
                         'Your PHP MySQL library version %s differs from your ' .
-                        'MySQL server version %s. This may cause unpredictable behavior.'
+                        'MySQL server version %s. This may cause unpredictable ' .
+                        'behavior.'
                     ),
                     $_client_info,
                     substr(
diff --git a/libraries/controllers/TableSearchController.class.php b/libraries/controllers/TableSearchController.class.php
index 922be5d003..cfe6e33380 100644
--- a/libraries/controllers/TableSearchController.class.php
+++ b/libraries/controllers/TableSearchController.class.php
@@ -1,4 +1,10 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Holds the PMA\Controllers\Table\TableSearchController
+ *
+ * @package PMA\Controllers\Table
+ */
 
 namespace PMA\Controllers\Table;
 
@@ -15,8 +21,11 @@ require_once 'libraries/sql.lib.php';
 require_once 'libraries/bookmark.lib.php';
 require_once 'libraries/controllers/TableController.class.php';
 
-
-
+/**
+ * Class TableSearchController
+ *
+ * @package PhpMyAdmin
+ */
 class TableSearchController extends TableController
 {
     /**
diff --git a/tbl_find_replace.php b/tbl_find_replace.php
index 83623834e8..8bff91c467 100644
--- a/tbl_find_replace.php
+++ b/tbl_find_replace.php
@@ -20,7 +20,9 @@ use PMA\DI;
 
 $container = DI\Container::getDefaultContainer();
 $container->factory('PMA\Controllers\Table\TableSearchController');
-$container->alias('TableSearchController', 'PMA\Controllers\Table\TableSearchController');
+$container->alias(
+    'TableSearchController', 'PMA\Controllers\Table\TableSearchController'
+);
 
 $dependency_definitions = array(
     'searchType' => 'replace',
diff --git a/tbl_select.php b/tbl_select.php
index 94390aff45..aa7e6d6d8b 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -21,7 +21,9 @@ use PMA\DI;
 
 $container = DI\Container::getDefaultContainer();
 $container->factory('PMA\Controllers\Table\TableSearchController');
-$container->alias('TableSearchController', 'PMA\Controllers\Table\TableSearchController');
+$container->alias(
+    'TableSearchController', 'PMA\Controllers\Table\TableSearchController'
+);
 
 /* Define dependencies for the concerned controller */
 $dependency_definitions = array(