diff --git a/import.php b/import.php
index 73e276ad98..90dc7b5787 100644
--- a/import.php
+++ b/import.php
@@ -553,7 +553,10 @@ if ($GLOBALS['PMA_recoding_engine'] != PMA_CHARSET_NONE && isset($charset_of_fil
         // Drizzle doesn't support other character sets,
         // so we can't fallback to SET NAMES - throw an error
         $message = PMA_Message::error(
-            __('Cannot convert file\'s character set without character set conversion library!')
+            __(
+                'Cannot convert file\'s character'
+                . ' set without character set conversion library!'
+            )
         );
         PMA_stopImport($message);
     } else {
@@ -656,11 +659,18 @@ if (! empty($id_bookmark) && $action_bookmark == 2) {
 // Did we hit timeout? Tell it user.
 if ($timeout_passed) {
     $message = PMA_Message::error(
-        __('Script timeout passed, if you want to finish import, please resubmit same file and import will resume.')
+        __(
+            'Script timeout passed, if you want to finish import,'
+            . ' please resubmit same file and import will resume.'
+        )
     );
     if ($offset == 0 || (isset($original_skip) && $original_skip == $offset)) {
         $message->addString(
-            __('However on last run no data has been parsed, this usually means phpMyAdmin won\'t be able to finish this import unless you increase php time limits.')
+            __(
+                'However on last run no data has been parsed,'
+                . ' this usually means phpMyAdmin won\'t be able to'
+                . ' finish this import unless you increase php time limits.'
+            )
         );
     }
 }
diff --git a/libraries/Console.class.php b/libraries/Console.class.php
index 19aab62c8e..0b4fd50fdf 100644
--- a/libraries/Console.class.php
+++ b/libraries/Console.class.php
@@ -246,8 +246,10 @@ class PMA_Console
             }
 
             $output .= '</div>'; // .console_message_container
-            $output .= '<div class="query_input"><span class="console_query_input"></span></div>'
-                    .  '</div>'; // Messages end
+            $output .= '<div class="query_input">'
+                    . '<span class="console_query_input"></span>'
+                    . '</div>';
+            $output .= '</div>'; // Messages end
 
             // Dark the console while other cards cover it
             $output .= '<div class="mid_layer"></div>';
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index d1104f611f..8df703181e 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -594,7 +594,10 @@ if ($GLOBALS['PMA_Config']->error_config_default_file) {
 }
 if ($GLOBALS['PMA_Config']->error_pma_uri) {
     trigger_error(
-        __('The [code]$cfg[\'PmaAbsoluteUri\'][/code] directive MUST be set in your configuration file!'),
+        __(
+            'The [code]$cfg[\'PmaAbsoluteUri\'][/code]'
+            . ' directive MUST be set in your configuration file!'
+        ),
         E_USER_ERROR
     );
 }
diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php
index e7a2db717b..a46e912167 100644
--- a/libraries/db_designer.lib.php
+++ b/libraries/db_designer.lib.php
@@ -709,19 +709,19 @@ function PMA_getDatabaseTables(
                 $html .= '<img src="' . $_SESSION['PMA_Theme']->getImgPath()
                     . 'pmd/Field_small';
 
-                if (/*overload*/mb_strstr($tab_column[$t_n]["TYPE"][$j], 'char')
-                    || /*overload*/mb_strstr($tab_column[$t_n]["TYPE"][$j], 'text')
+                if (strstr($tab_column[$t_n]["TYPE"][$j], 'char')
+                    || strstr($tab_column[$t_n]["TYPE"][$j], 'text')
                 ) {
                     $html .= '_char';
-                } elseif (/*overload*/mb_strstr($tab_column[$t_n]["TYPE"][$j], 'int')
-                    || /*overload*/mb_strstr($tab_column[$t_n]["TYPE"][$j], 'float')
-                    || /*overload*/mb_strstr($tab_column[$t_n]["TYPE"][$j], 'double')
-                    || /*overload*/mb_strstr($tab_column[$t_n]["TYPE"][$j], 'decimal')
+                } elseif (strstr($tab_column[$t_n]["TYPE"][$j], 'int')
+                    || strstr($tab_column[$t_n]["TYPE"][$j], 'float')
+                    || strstr($tab_column[$t_n]["TYPE"][$j], 'double')
+                    || strstr($tab_column[$t_n]["TYPE"][$j], 'decimal')
                 ) {
                     $html .= '_int';
-                } elseif (/*overload*/mb_strstr($tab_column[$t_n]["TYPE"][$j], 'date')
-                    || /*overload*/mb_strstr($tab_column[$t_n]["TYPE"][$j], 'time')
-                    || /*overload*/mb_strstr($tab_column[$t_n]["TYPE"][$j], 'year')
+                } elseif (strstr($tab_column[$t_n]["TYPE"][$j], 'date')
+                    || strstr($tab_column[$t_n]["TYPE"][$j], 'time')
+                    || strstr($tab_column[$t_n]["TYPE"][$j], 'year')
                 ) {
                     $html .= '_date';
                 }
diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php
index 219b6bc127..ad5e3c69a4 100644
--- a/libraries/display_create_table.lib.php
+++ b/libraries/display_create_table.lib.php
@@ -63,7 +63,8 @@ function PMA_getHtmlForCreateTable($db)
     $html .= ' </div>';
     $html .= '  <div class="formelement">';
     $html .= __('Number of columns') . ":";
-    $html .= '  <input type="number" min="1" name="num_fields" value="4" required="required" />';
+    $html .= '  <input type="number" min="1" name="num_fields" '
+        . 'value="4" required="required" />';
     $html .= ' </div>';
     $html .= '  <div class="clearfloat"></div>';
     $html .= '</fieldset>';
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index 910d89b551..f804c6e2e2 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -490,12 +490,21 @@ function PMA_getHtmlForImportWithPlugin($upload_id)
     $html .= '            } else { ';
     $html .= '                var now = new Date(); ';
     $html .= '                now = Date.UTC( ';
-    $html .= '                    now.getFullYear(), now.getMonth(), now.getDate(), ';
-    $html .= '                    now.getHours(), now.getMinutes(), now.getSeconds()) ';
+    $html .= '                    now.getFullYear(), ';
+    $html .= '                    now.getMonth(), ';
+    $html .= '                    now.getDate(), ';
+    $html .= '                    now.getHours(), ';
+    $html .= '                    now.getMinutes(), ';
+    $html .= '                    now.getSeconds()) ';
     $html .= '                    + now.getMilliseconds() - 1000; ';
-    $html .= '                var statustext = PMA_sprintf("' . $statustext_str . '", ';
-    $html .= '                    formatBytes(complete, 1, PMA_messages.strDecimalSeparator), ';
-    $html .= '                    formatBytes(total, 1, PMA_messages.strDecimalSeparator) ';
+    $html .= '                var statustext = PMA_sprintf(';
+    $html .= '                    "' . $statustext_str . '", ';
+    $html .= '                    formatBytes( ';
+    $html .= '                        complete, 1, PMA_messages.strDecimalSeparator';
+    $html .= '                    ), ';
+    $html .= '                    formatBytes(';
+    $html .= '                        total, 1, PMA_messages.strDecimalSeparator';
+    $html .= '                    ) ';
     $html .= '                ); ';
 
     $html .= '                if ($("#importmain").is(":visible")) { ';
@@ -526,7 +535,8 @@ function PMA_getHtmlForImportWithPlugin($upload_id)
     $html .= '                    var estimated_time; ';
     $html .= '                    if (minutes > 0) { ';
     $html .= '                        estimated_time = "' . $remaining_min . '"';
-    $html .= '                        .replace("%MIN", minutes).replace("%SEC", seconds); ';
+    $html .= '                            .replace("%MIN", minutes)';
+    $html .= '                            .replace("%SEC", seconds); ';
     $html .= '                    } ';
     $html .= '                    else { ';
     $html .= '                        estimated_time = "' . $remaining_second . '"';
@@ -543,10 +553,12 @@ function PMA_getHtmlForImportWithPlugin($upload_id)
 
     // show percent in window title
     $html .= '                if (original_title !== false) { ';
-    $html .= '                    parent.document.title = percent_str + " - " + original_title; ';
+    $html .= '                    parent.document.title ';
+    $html .= '                        = percent_str + " - " + original_title; ';
     $html .= '                } ';
     $html .= '                else { ';
-    $html .= '                    document.title = percent_str + " - " + original_title; ';
+    $html .= '                    document.title ';
+    $html .= '                        = percent_str + " - " + original_title; ';
     $html .= '                } ';
     $html .= '                $("#statustext").html(statustext); ';
     $html .= '            }  ';
diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php
index d33236e993..24f00d9973 100644
--- a/libraries/plugins/export/ExportSql.class.php
+++ b/libraries/plugins/export/ExportSql.class.php
@@ -401,8 +401,8 @@ class ExportSql extends ExportPlugin
                     ),
                     'both' => __(
                         'both of the above<br /> &nbsp; &nbsp; &nbsp; Example:'
-                        . ' <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES (1,2,3),'
-                        . ' (4,5,6), (7,8,9)</code>'
+                        . ' <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES'
+                        . ' (1,2,3), (4,5,6), (7,8,9)</code>'
                     ),
                     'none' => __(
                         'neither of the above<br /> &nbsp; &nbsp; &nbsp; Example:'
diff --git a/libraries/plugins/import/ImportSql.class.php b/libraries/plugins/import/ImportSql.class.php
index d0b7bc46d9..306d75abba 100644
--- a/libraries/plugins/import/ImportSql.class.php
+++ b/libraries/plugins/import/ImportSql.class.php
@@ -556,7 +556,8 @@ class ImportSql extends ImportPlugin
         //Don't look for the SQL delimiter if not found previously
         //or if it's still after current position.
         if (null === $firstSqlDelimiter
-            || (false !== $firstSqlDelimiter && $firstSqlDelimiter < $this->_delimiterPosition)
+            || (false !== $firstSqlDelimiter
+            && $firstSqlDelimiter < $this->_delimiterPosition)
         ) {
             // the cost of doing this one with preg_match() would be too high
             $firstSqlDelimiter = $this->_stringFctToUse['strpos'](
diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php
index 5d838bf8ab..586c45b779 100644
--- a/setup/lib/index.lib.php
+++ b/setup/lib/index.lib.php
@@ -115,7 +115,10 @@ function PMA_versionCheck()
             'error',
             $message_id,
             __('Version check'),
-            __('Reading of version failed. Maybe you\'re offline or the upgrade server does not respond.')
+            __(
+                'Reading of version failed. '
+                . 'Maybe you\'re offline or the upgrade server does not respond.'
+            )
         );
         return;
     }