diff --git a/PMAStandard/ruleset.xml b/PMAStandard/ruleset.xml
index e46b001ba6..6974ec640a 100644
--- a/PMAStandard/ruleset.xml
+++ b/PMAStandard/ruleset.xml
@@ -3,12 +3,7 @@
   <!-- http://pear.php.net/manual/en/package.php.php-codesniffer.annotated-ruleset.php -->
   <description>phpMyAdmin custom coding standard</description>
 
-  <rule ref="PEAR">
-    <exclude name="PEAR.Commenting.FileComment" />
-    <exclude name="PEAR.Commenting.ClassComment" />
-    <exclude name="PEAR.Commenting.FunctionComment" />
-    <exclude name="Generic.Commenting.DocComment" />
-  </rule>
+  <rule ref="PSR1" />
   <rule ref="Generic.Metrics.NestingLevel" />
   <!-- There MUST NOT be trailing whitespace at the end of lines. -->
   <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace" />
diff --git a/libraries/DbQbe.php b/libraries/DbQbe.php
index 7d1b637b17..1e18dc9132 100644
--- a/libraries/DbQbe.php
+++ b/libraries/DbQbe.php
@@ -7,10 +7,6 @@
  */
 namespace PMA\libraries;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Class to handle database QBE search
  *
diff --git a/libraries/advisor.lib.php b/libraries/advisor.lib.php
index ad4ac92ecd..cacd296309 100644
--- a/libraries/advisor.lib.php
+++ b/libraries/advisor.lib.php
@@ -5,9 +5,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Formats interval like 10 per hour
diff --git a/libraries/autoloader.php b/libraries/autoloader.php
index 563e7afa13..8497005133 100644
--- a/libraries/autoloader.php
+++ b/libraries/autoloader.php
@@ -1,7 +1,6 @@
 <?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Run autoloader
+ * Load class autoloader
  *
  * @package PhpMyAdmin
  */
diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php
index 41684aff0a..0a02bdd1ee 100644
--- a/libraries/bookmark.lib.php
+++ b/libraries/bookmark.lib.php
@@ -6,10 +6,6 @@
  * @package PhpMyAdmin
  */
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Defines the bookmark parameters for the current user
  *
diff --git a/libraries/browse_foreigners.lib.php b/libraries/browse_foreigners.lib.php
index e4cce3f48a..c93a19a77e 100644
--- a/libraries/browse_foreigners.lib.php
+++ b/libraries/browse_foreigners.lib.php
@@ -5,9 +5,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Function to get html for one relational key
diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php
index 59e9d5992b..75ee7981da 100644
--- a/libraries/central_columns.lib.php
+++ b/libraries/central_columns.lib.php
@@ -8,10 +8,6 @@
 use PMA\libraries\Message;
 use PMA\libraries\Util;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Defines the central_columns parameters for the current user
  *
diff --git a/libraries/cleanup.lib.php b/libraries/cleanup.lib.php
index 8db63cb56e..b4f07c9df5 100644
--- a/libraries/cleanup.lib.php
+++ b/libraries/cleanup.lib.php
@@ -5,9 +5,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Removes all variables from request except whitelisted ones.
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index aae6d65814..e4b0739804 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -533,7 +533,7 @@ if (PMA_isValid($_REQUEST['sql_query'])) {
 /**
  * lang detection is done here
  */
-require './libraries/select_lang.lib.php';
+require './libraries/select_lang.inc.php';
 
 // Defines the cell alignment values depending on text direction
 if ($GLOBALS['text_dir'] == 'ltr') {
diff --git a/libraries/create_addfield.lib.php b/libraries/create_addfield.lib.php
index bb7507e0c0..04820e8760 100644
--- a/libraries/create_addfield.lib.php
+++ b/libraries/create_addfield.lib.php
@@ -5,13 +5,8 @@
  *
  * @package PhpMyAdmin
  */
-
 use PMA\libraries\Table;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Transforms the radio button field_key into 4 arrays
  *
diff --git a/libraries/database_interface.inc.php b/libraries/database_interface.inc.php
index dab9bef7cf..b262d7f5fc 100644
--- a/libraries/database_interface.inc.php
+++ b/libraries/database_interface.inc.php
@@ -6,6 +6,7 @@
  *
  * @package PhpMyAdmin-DBI
  */
+use PMA\libraries\dbi\DBIDummy;
 use PMA\libraries\di\Container;
 use PMA\libraries\DatabaseInterface;
 use PMA\libraries\dbi\DBIMysql;
@@ -19,7 +20,6 @@ if (defined('TESTSUITE')) {
     /**
      * For testsuite we use dummy driver which can fake some queries.
      */
-    include_once './libraries/dbi/DBIDummy.php';
     $extension = new DBIDummy();
 } else {
 
diff --git a/libraries/dbi/DBIDummy.php b/libraries/dbi/DBIDummy.php
index 2cbcc4a6fc..84a824adb5 100644
--- a/libraries/dbi/DBIDummy.php
+++ b/libraries/dbi/DBIDummy.php
@@ -10,9 +10,9 @@
  * @package    PhpMyAdmin-DBI
  * @subpackage Dummy
  */
-use PMA\libraries\dbi\DBIExtension;
+namespace PMA\libraries\dbi;
 
-if (! defined('PHPMYADMIN')) {
+if (!defined('PHPMYADMIN')) {
     exit;
 }
 
@@ -22,25 +22,25 @@ if (! defined('PHPMYADMIN')) {
 $GLOBALS['dummy_queries'] = array(
     array('query' => 'SELECT 1', 'result' => array(array('1'))),
     array(
-        'query' => 'SELECT CURRENT_USER();',
+        'query'  => 'SELECT CURRENT_USER();',
         'result' => array(array('pma_test@localhost')),
     ),
     array(
-        'query' => "SHOW VARIABLES LIKE 'lower_case_table_names'",
-        'result' => array(array('lower_case_table_names', '1'))
+        'query'  => "SHOW VARIABLES LIKE 'lower_case_table_names'",
+        'result' => array(array('lower_case_table_names', '1')),
     ),
     array(
-        'query' => 'SELECT 1 FROM mysql.user LIMIT 1',
+        'query'  => 'SELECT 1 FROM mysql.user LIMIT 1',
         'result' => array(array('1')),
     ),
     array(
-        'query' => "SELECT 1 FROM `INFORMATION_SCHEMA`.`USER_PRIVILEGES`"
+        'query'  => "SELECT 1 FROM `INFORMATION_SCHEMA`.`USER_PRIVILEGES`"
             . " WHERE `PRIVILEGE_TYPE` = 'CREATE USER'"
             . " AND '''pma_test''@''localhost''' LIKE `GRANTEE` LIMIT 1",
         'result' => array(array('1')),
     ),
     array(
-        'query' => "SELECT 1 FROM (SELECT `GRANTEE`, `IS_GRANTABLE`"
+        'query'  => "SELECT 1 FROM (SELECT `GRANTEE`, `IS_GRANTABLE`"
             . " FROM `INFORMATION_SCHEMA`.`COLUMN_PRIVILEGES`"
             . " UNION SELECT `GRANTEE`, `IS_GRANTABLE`"
             . " FROM `INFORMATION_SCHEMA`.`TABLE_PRIVILEGES`"
@@ -53,31 +53,31 @@ $GLOBALS['dummy_queries'] = array(
         'result' => array(array('1')),
     ),
     array(
-        'query' => 'SHOW MASTER LOGS',
+        'query'  => 'SHOW MASTER LOGS',
         'result' => false,
     ),
     array(
-        'query' => 'SHOW STORAGE ENGINES',
+        'query'  => 'SHOW STORAGE ENGINES',
         'result' => array(
             array(
-                'Engine' => 'dummy',
+                'Engine'  => 'dummy',
                 'Support' => 'YES',
-                'Comment' => 'dummy comment'
+                'Comment' => 'dummy comment',
             ),
             array(
-                'Engine' => 'dummy2',
+                'Engine'  => 'dummy2',
                 'Support' => 'NO',
-                'Comment' => 'dummy2 comment'
+                'Comment' => 'dummy2 comment',
             ),
             array(
-                'Engine' => 'FEDERATED',
+                'Engine'  => 'FEDERATED',
                 'Support' => 'NO',
-                'Comment' => 'Federated MySQL storage engine'
+                'Comment' => 'Federated MySQL storage engine',
             ),
-        )
+        ),
     ),
     array(
-        'query' => 'SHOW STATUS WHERE Variable_name'
+        'query'  => 'SHOW STATUS WHERE Variable_name'
             . ' LIKE \'Innodb\\_buffer\\_pool\\_%\''
             . ' OR Variable_name = \'Innodb_page_size\';',
         'result' => array(
@@ -95,141 +95,176 @@ $GLOBALS['dummy_queries'] = array(
             array('Innodb_buffer_pool_wait_free', 0),
             array('Innodb_buffer_pool_write_requests', 64),
             array('Innodb_page_size', 16384),
-        )
+        ),
     ),
     array(
-        'query' => 'SHOW ENGINE INNODB STATUS;',
+        'query'  => 'SHOW ENGINE INNODB STATUS;',
         'result' => false,
     ),
     array(
-        'query' => 'SELECT @@innodb_version;',
+        'query'  => 'SELECT @@innodb_version;',
         'result' => array(
             array('1.1.8'),
-        )
-    ),
-    array(
-        'query' => 'SELECT @@disabled_storage_engines',
-        'result' => array(
-            array(''),
-        )
-    ),
-    array(
-        'query' => 'SHOW GLOBAL VARIABLES LIKE \'innodb_file_per_table\';',
-        'result' => array(
-            array('innodb_file_per_table', 'OFF'),
-        )
-    ),
-    array(
-        'query' => 'SHOW GLOBAL VARIABLES LIKE \'innodb_file_format\';',
-        'result' => array(
-            array('innodb_file_format', 'Antelope'),
-        )
-    ),
-    array(
-        'query' => 'SELECT @@collation_server',
-        'result' => array(
-            array('utf8_general_ci'),
-        )
-    ),
-    array(
-        'query' => 'SELECT @@lc_messages;',
-        'result' => array(),
-    ),
-    array(
-        'query' => 'SHOW SESSION VARIABLES LIKE \'FOREIGN_KEY_CHECKS\';',
-        'result' => array(
-            array('foreign_key_checks', 'ON')
         ),
     ),
     array(
-        'query' => 'SHOW TABLES FROM `pma_test`;',
+        'query'  => 'SELECT @@disabled_storage_engines',
+        'result' => array(
+            array(''),
+        ),
+    ),
+    array(
+        'query'  => 'SHOW GLOBAL VARIABLES LIKE \'innodb_file_per_table\';',
+        'result' => array(
+            array('innodb_file_per_table', 'OFF'),
+        ),
+    ),
+    array(
+        'query'  => 'SHOW GLOBAL VARIABLES LIKE \'innodb_file_format\';',
+        'result' => array(
+            array('innodb_file_format', 'Antelope'),
+        ),
+    ),
+    array(
+        'query'  => 'SELECT @@collation_server',
+        'result' => array(
+            array('utf8_general_ci'),
+        ),
+    ),
+    array(
+        'query'  => 'SELECT @@lc_messages;',
+        'result' => array(),
+    ),
+    array(
+        'query'  => 'SHOW SESSION VARIABLES LIKE \'FOREIGN_KEY_CHECKS\';',
+        'result' => array(
+            array('foreign_key_checks', 'ON'),
+        ),
+    ),
+    array(
+        'query'  => 'SHOW TABLES FROM `pma_test`;',
         'result' => array(
             array('table1'),
             array('table2'),
-        )
+        ),
     ),
     array(
-        'query' => 'SHOW TABLES FROM `pmadb`',
+        'query'  => 'SHOW TABLES FROM `pmadb`',
         'result' => array(
             array('column_info'),
-        )
+        ),
     ),
     array(
-        'query' => 'SHOW COLUMNS FROM `pma_test`.`table1`',
+        'query'   => 'SHOW COLUMNS FROM `pma_test`.`table1`',
         'columns' => array(
-            'Field', 'Type', 'Null', 'Key', 'Default', 'Extra'
+            'Field',
+            'Type',
+            'Null',
+            'Key',
+            'Default',
+            'Extra',
         ),
-        'result' => array(
+        'result'  => array(
             array('i', 'int(11)', 'NO', 'PRI', 'NULL', 'auto_increment'),
             array('o', 'int(11)', 'NO', 'MUL', 'NULL', ''),
-        )
+        ),
     ),
     array(
-        'query' => 'SHOW INDEXES FROM `pma_test`.`table1` WHERE (Non_unique = 0)',
+        'query'  => 'SHOW INDEXES FROM `pma_test`.`table1` WHERE (Non_unique = 0)',
         'result' => array(),
     ),
     array(
-        'query' => 'SHOW COLUMNS FROM `pma_test`.`table2`',
+        'query'   => 'SHOW COLUMNS FROM `pma_test`.`table2`',
         'columns' => array(
-            'Field', 'Type', 'Null', 'Key', 'Default', 'Extra'
+            'Field',
+            'Type',
+            'Null',
+            'Key',
+            'Default',
+            'Extra',
         ),
-        'result' => array(
+        'result'  => array(
             array('i', 'int(11)', 'NO', 'PRI', 'NULL', 'auto_increment'),
             array('o', 'int(11)', 'NO', 'MUL', 'NULL', ''),
-        )
+        ),
     ),
     array(
-        'query' => 'SHOW INDEXES FROM `pma_test`.`table1`',
+        'query'  => 'SHOW INDEXES FROM `pma_test`.`table1`',
         'result' => array(),
     ),
     array(
-        'query' => 'SHOW INDEXES FROM `pma_test`.`table2`',
+        'query'  => 'SHOW INDEXES FROM `pma_test`.`table2`',
         'result' => array(),
     ),
     array(
-        'query' => 'SHOW COLUMNS FROM `pma`.`table1`',
+        'query'   => 'SHOW COLUMNS FROM `pma`.`table1`',
         'columns' => array(
-            'Field', 'Type', 'Null', 'Key', 'Default', 'Extra',
-            'Privileges', 'Comment'
+            'Field',
+            'Type',
+            'Null',
+            'Key',
+            'Default',
+            'Extra',
+            'Privileges',
+            'Comment',
         ),
-        'result' => array(
+        'result'  => array(
             array(
-                'i', 'int(11)', 'NO', 'PRI', 'NULL', 'auto_increment',
-                'select,insert,update,references', ''
+                'i',
+                'int(11)',
+                'NO',
+                'PRI',
+                'NULL',
+                'auto_increment',
+                'select,insert,update,references',
+                '',
             ),
             array(
-                'o', 'varchar(100)', 'NO', 'MUL', 'NULL', '',
-                'select,insert,update,references', ''
+                'o',
+                'varchar(100)',
+                'NO',
+                'MUL',
+                'NULL',
+                '',
+                'select,insert,update,references',
+                '',
             ),
-        )
+        ),
     ),
     array(
-        'query' => 'SELECT * FROM information_schema.CHARACTER_SETS',
+        'query'   => 'SELECT * FROM information_schema.CHARACTER_SETS',
         'columns' => array(
-            'CHARACTER_SET_NAME', 'DEFAULT_COLLATE_NAME', 'DESCRIPTION', 'MAXLEN'
+            'CHARACTER_SET_NAME',
+            'DEFAULT_COLLATE_NAME',
+            'DESCRIPTION',
+            'MAXLEN',
         ),
-        'result' => array(
+        'result'  => array(
             array('utf8', 'utf8_general_ci', 'UTF-8 Unicode', 3),
-        )
+        ),
     ),
     array(
-        'query' => 'SELECT * FROM information_schema.COLLATIONS',
+        'query'   => 'SELECT * FROM information_schema.COLLATIONS',
         'columns' => array(
-            'COLLATION_NAME', 'CHARACTER_SET_NAME', 'ID', 'IS_DEFAULT',
-            'IS_COMPILED', 'SORTLEN'
+            'COLLATION_NAME',
+            'CHARACTER_SET_NAME',
+            'ID',
+            'IS_DEFAULT',
+            'IS_COMPILED',
+            'SORTLEN',
         ),
-        'result' => array(
+        'result'  => array(
             array('utf8_general_ci', 'utf8', 33, 'Yes', 'Yes', 1),
             array('utf8_bin', 'utf8', 83, '', 'Yes', 1),
-        )
+        ),
     ),
     array(
-        'query' => 'SELECT `TABLE_NAME` FROM `INFORMATION_SCHEMA`.`TABLES`'
+        'query'  => 'SELECT `TABLE_NAME` FROM `INFORMATION_SCHEMA`.`TABLES`'
             . ' WHERE `TABLE_SCHEMA`=\'pma_test\' AND `TABLE_TYPE`=\'BASE TABLE\'',
         'result' => array(),
     ),
     array(
-        'query' => 'SELECT `column_name`, `mimetype`, `transformation`,'
+        'query'   => 'SELECT `column_name`, `mimetype`, `transformation`,'
             . ' `transformation_options`, `input_transformation`,'
             . ' `input_transformation_options`'
             . ' FROM `pmadb`.`column_info`'
@@ -239,21 +274,25 @@ $GLOBALS['dummy_queries'] = array(
             . ' OR `input_transformation` != \'\''
             . ' OR `input_transformation_options` != \'\')',
         'columns' => array(
-            'column_name', 'mimetype', 'transformation', 'transformation_options',
-            'input_transformation', 'input_transformation_options'
+            'column_name',
+            'mimetype',
+            'transformation',
+            'transformation_options',
+            'input_transformation',
+            'input_transformation_options',
         ),
-        'result' => array(
+        'result'  => array(
             array('o', 'text/plain', 'sql', '', 'regex', '/pma/i'),
-            array('col', 't', 'o/p', '', 'i/p', '')
-        )
+            array('col', 't', 'o/p', '', 'i/p', ''),
+        ),
     ),
     array(
-        'query' => 'SELECT TABLE_NAME FROM information_schema.VIEWS'
+        'query'  => 'SELECT TABLE_NAME FROM information_schema.VIEWS'
             . ' WHERE TABLE_SCHEMA = \'pma_test\' AND TABLE_NAME = \'table1\'',
         'result' => array(),
     ),
     array(
-        'query' => 'SELECT *, `TABLE_SCHEMA` AS `Db`, `TABLE_NAME` AS `Name`,'
+        'query'   => 'SELECT *, `TABLE_SCHEMA` AS `Db`, `TABLE_NAME` AS `Name`,'
             . ' `TABLE_TYPE` AS `TABLE_TYPE`, `ENGINE` AS `Engine`,'
             . ' `ENGINE` AS `Type`, `VERSION` AS `Version`,'
             . ' `ROW_FORMAT` AS `Row_format`, `TABLE_ROWS` AS `Rows`,'
@@ -270,30 +309,96 @@ $GLOBALS['dummy_queries'] = array(
             . ' WHERE `TABLE_SCHEMA` IN (\'pma_test\')'
             . ' AND t.`TABLE_NAME` = \'table1\' ORDER BY Name ASC',
         'columns' => array(
-            'TABLE_CATALOG', 'TABLE_SCHEMA', 'TABLE_NAME', 'TABLE_TYPE', 'ENGINE',
-            'VERSION', 'ROW_FORMAT', 'TABLE_ROWS', 'AVG_ROW_LENGTH', 'DATA_LENGTH',
-            'MAX_DATA_LENGTH', 'INDEX_LENGTH', 'DATA_FREE', 'AUTO_INCREMENT',
-            'CREATE_TIME', 'UPDATE_TIME', 'CHECK_TIME', 'TABLE_COLLATION',
-            'CHECKSUM', 'CREATE_OPTIONS', 'TABLE_COMMENT', 'Db', 'Name',
-            'TABLE_TYPE', 'Engine', 'Type', 'Version', 'Row_format', 'Rows',
-            'Avg_row_length', 'Data_length', 'Max_data_length', 'Index_length',
-            'Data_free', 'Auto_increment', 'Create_time', 'Update_time',
-            'Check_time', 'Collation', 'Checksum', 'Create_options', 'Comment'
+            'TABLE_CATALOG',
+            'TABLE_SCHEMA',
+            'TABLE_NAME',
+            'TABLE_TYPE',
+            'ENGINE',
+            'VERSION',
+            'ROW_FORMAT',
+            'TABLE_ROWS',
+            'AVG_ROW_LENGTH',
+            'DATA_LENGTH',
+            'MAX_DATA_LENGTH',
+            'INDEX_LENGTH',
+            'DATA_FREE',
+            'AUTO_INCREMENT',
+            'CREATE_TIME',
+            'UPDATE_TIME',
+            'CHECK_TIME',
+            'TABLE_COLLATION',
+            'CHECKSUM',
+            'CREATE_OPTIONS',
+            'TABLE_COMMENT',
+            'Db',
+            'Name',
+            'TABLE_TYPE',
+            'Engine',
+            'Type',
+            'Version',
+            'Row_format',
+            'Rows',
+            'Avg_row_length',
+            'Data_length',
+            'Max_data_length',
+            'Index_length',
+            'Data_free',
+            'Auto_increment',
+            'Create_time',
+            'Update_time',
+            'Check_time',
+            'Collation',
+            'Checksum',
+            'Create_options',
+            'Comment',
         ),
-        'result' => array(
+        'result'  => array(
             array(
-                'def', 'smash', 'issues_issue', 'BASE TABLE', 'InnoDB', '10',
-                'Compact', '9136', '862', '7880704', '0', '1032192', '420478976',
-                '155862', '2012-08-29 13:28:28', 'NULL', 'NULL', 'utf8_general_ci',
-                'NULL', '', '', 'smash', 'issues_issue', 'BASE TABLE', 'InnoDB',
-                'InnoDB', '10', 'Compact', '9136', '862', '7880704', '0', '1032192',
-                '420478976', '155862', '2012-08-29 13:28:28', 'NULL', 'NULL',
-                'utf8_general_ci', 'NULL'
+                'def',
+                'smash',
+                'issues_issue',
+                'BASE TABLE',
+                'InnoDB',
+                '10',
+                'Compact',
+                '9136',
+                '862',
+                '7880704',
+                '0',
+                '1032192',
+                '420478976',
+                '155862',
+                '2012-08-29 13:28:28',
+                'NULL',
+                'NULL',
+                'utf8_general_ci',
+                'NULL',
+                '',
+                '',
+                'smash',
+                'issues_issue',
+                'BASE TABLE',
+                'InnoDB',
+                'InnoDB',
+                '10',
+                'Compact',
+                '9136',
+                '862',
+                '7880704',
+                '0',
+                '1032192',
+                '420478976',
+                '155862',
+                '2012-08-29 13:28:28',
+                'NULL',
+                'NULL',
+                'utf8_general_ci',
+                'NULL',
             ),
         ),
     ),
     array(
-        'query' => 'SELECT *, `TABLE_SCHEMA` AS `Db`, `TABLE_NAME` AS `Name`,'
+        'query'   => 'SELECT *, `TABLE_SCHEMA` AS `Db`, `TABLE_NAME` AS `Name`,'
             . ' `TABLE_TYPE` AS `TABLE_TYPE`, `ENGINE` AS `Engine`,'
             . ' `ENGINE` AS `Type`, `VERSION` AS `Version`,'
             . ' `ROW_FORMAT` AS `Row_format`, `TABLE_ROWS` AS `Rows`,'
@@ -309,41 +414,108 @@ $GLOBALS['dummy_queries'] = array(
             . ' FROM `information_schema`.`TABLES` t'
             . ' WHERE `TABLE_SCHEMA` IN (\'pma_test\')'
             . ' AND t.`TABLE_NAME` = \'table1\' ORDER BY Name ASC',
-        'columns' => array('TABLE_CATALOG', 'TABLE_SCHEMA', 'TABLE_NAME',
-            'TABLE_TYPE', 'ENGINE', 'VERSION', 'ROW_FORMAT', 'TABLE_ROWS',
-            'AVG_ROW_LENGTH', 'DATA_LENGTH', 'MAX_DATA_LENGTH',
-            'INDEX_LENGTH', 'DATA_FREE', 'AUTO_INCREMENT', 'CREATE_TIME',
-            'UPDATE_TIME', 'CHECK_TIME', 'TABLE_COLLATION', 'CHECKSUM',
-            'CREATE_OPTIONS', 'TABLE_COMMENT', 'Db', 'Name', 'TABLE_TYPE',
-            'Engine', 'Type', 'Version', 'Row_format', 'Rows',
-            'Avg_row_length', 'Data_length', 'Max_data_length',
-            'Index_length', 'Data_free', 'Auto_increment', 'Create_time',
-            'Update_time', 'Check_time', 'Collation', 'Checksum',
-            'Create_options', 'Comment'),
-        'result' => array(
-            array('def', 'smash', 'issues_issue', 'BASE TABLE', 'InnoDB', '10',
-                'Compact', '9136', '862', '7880704', '0', '1032192',
-                '420478976', '155862', '2012-08-29 13:28:28', 'NULL', 'NULL',
-                'utf8_general_ci', 'NULL', '', '', 'smash', 'issues_issue',
-                'BASE TABLE', 'InnoDB', 'InnoDB', '10', 'Compact', '9136',
-                '862', '7880704', '0', '1032192', '420478976', '155862',
-                '2012-08-29 13:28:28', 'NULL', 'NULL', 'utf8_general_ci',
-                'NULL'),
+        'columns' => array(
+            'TABLE_CATALOG',
+            'TABLE_SCHEMA',
+            'TABLE_NAME',
+            'TABLE_TYPE',
+            'ENGINE',
+            'VERSION',
+            'ROW_FORMAT',
+            'TABLE_ROWS',
+            'AVG_ROW_LENGTH',
+            'DATA_LENGTH',
+            'MAX_DATA_LENGTH',
+            'INDEX_LENGTH',
+            'DATA_FREE',
+            'AUTO_INCREMENT',
+            'CREATE_TIME',
+            'UPDATE_TIME',
+            'CHECK_TIME',
+            'TABLE_COLLATION',
+            'CHECKSUM',
+            'CREATE_OPTIONS',
+            'TABLE_COMMENT',
+            'Db',
+            'Name',
+            'TABLE_TYPE',
+            'Engine',
+            'Type',
+            'Version',
+            'Row_format',
+            'Rows',
+            'Avg_row_length',
+            'Data_length',
+            'Max_data_length',
+            'Index_length',
+            'Data_free',
+            'Auto_increment',
+            'Create_time',
+            'Update_time',
+            'Check_time',
+            'Collation',
+            'Checksum',
+            'Create_options',
+            'Comment',
+        ),
+        'result'  => array(
+            array(
+                'def',
+                'smash',
+                'issues_issue',
+                'BASE TABLE',
+                'InnoDB',
+                '10',
+                'Compact',
+                '9136',
+                '862',
+                '7880704',
+                '0',
+                '1032192',
+                '420478976',
+                '155862',
+                '2012-08-29 13:28:28',
+                'NULL',
+                'NULL',
+                'utf8_general_ci',
+                'NULL',
+                '',
+                '',
+                'smash',
+                'issues_issue',
+                'BASE TABLE',
+                'InnoDB',
+                'InnoDB',
+                '10',
+                'Compact',
+                '9136',
+                '862',
+                '7880704',
+                '0',
+                '1032192',
+                '420478976',
+                '155862',
+                '2012-08-29 13:28:28',
+                'NULL',
+                'NULL',
+                'utf8_general_ci',
+                'NULL',
+            ),
         ),
     ),
     array(
-        'query' => 'SELECT COUNT(*) FROM `pma_test`.`table1`',
+        'query'  => 'SELECT COUNT(*) FROM `pma_test`.`table1`',
         'result' => array(array(0)),
     ),
     array(
-        'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
+        'query'  => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
             . '`USER_PRIVILEGES`'
             . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\''
             . ' AND PRIVILEGE_TYPE=\'TRIGGER\'',
         'result' => array(),
     ),
     array(
-        'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
+        'query'  => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
             . '`SCHEMA_PRIVILEGES`'
             . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\''
             . ' AND PRIVILEGE_TYPE=\'TRIGGER\' AND \'pma_test\''
@@ -351,7 +523,7 @@ $GLOBALS['dummy_queries'] = array(
         'result' => array(),
     ),
     array(
-        'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
+        'query'  => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
             . '`TABLE_PRIVILEGES`'
             . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\''
             . ' AND PRIVILEGE_TYPE=\'TRIGGER\' AND \'pma_test\''
@@ -359,14 +531,14 @@ $GLOBALS['dummy_queries'] = array(
         'result' => array(),
     ),
     array(
-        'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
+        'query'  => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
             . '`USER_PRIVILEGES`'
             . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\''
             . ' AND PRIVILEGE_TYPE=\'EVENT\'',
         'result' => array(),
     ),
     array(
-        'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
+        'query'  => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
             . '`SCHEMA_PRIVILEGES`'
             . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\''
             . ' AND PRIVILEGE_TYPE=\'EVENT\' AND \'pma_test\''
@@ -374,7 +546,7 @@ $GLOBALS['dummy_queries'] = array(
         'result' => array(),
     ),
     array(
-        'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
+        'query'  => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
             . '`TABLE_PRIVILEGES`'
             . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\''
             . ' AND PRIVILEGE_TYPE=\'EVENT\''
@@ -382,11 +554,11 @@ $GLOBALS['dummy_queries'] = array(
         'result' => array(),
     ),
     array(
-        'query' => 'RENAME TABLE `pma_test`.`table1` TO `pma_test`.`table3`;',
+        'query'  => 'RENAME TABLE `pma_test`.`table1` TO `pma_test`.`table3`;',
         'result' => array(),
     ),
     array(
-        'query' => 'SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION,'
+        'query'  => 'SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION,'
             . ' EVENT_OBJECT_TABLE, ACTION_TIMING, ACTION_STATEMENT, '
             . 'EVENT_OBJECT_SCHEMA, EVENT_OBJECT_TABLE, DEFINER'
             . ' FROM information_schema.TRIGGERS'
@@ -395,114 +567,114 @@ $GLOBALS['dummy_queries'] = array(
         'result' => array(),
     ),
     array(
-        'query' => 'SHOW TABLES FROM `pma`;',
+        'query'  => 'SHOW TABLES FROM `pma`;',
         'result' => array(),
     ),
     array(
-        'query' => "SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`."
+        'query'  => "SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`."
             . "`SCHEMA_PRIVILEGES` WHERE GRANTEE='''pma_test''@''localhost'''"
             . " AND PRIVILEGE_TYPE='EVENT' AND TABLE_SCHEMA='pma'",
         'result' => array(),
     ),
     array(
-        'query' => "SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`."
+        'query'  => "SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`."
             . "`SCHEMA_PRIVILEGES` WHERE GRANTEE='''pma_test''@''localhost'''"
             . " AND PRIVILEGE_TYPE='TRIGGER' AND TABLE_SCHEMA='pma'",
         'result' => array(),
     ),
     array(
-        'query' => 'SELECT DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA'
-        . ' WHERE SCHEMA_NAME = \'pma_test\' LIMIT 1',
+        'query'   => 'SELECT DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA'
+            . ' WHERE SCHEMA_NAME = \'pma_test\' LIMIT 1',
         'columns' => array('DEFAULT_COLLATION_NAME'),
-        'result' => array(
-            array('utf8_general_ci')
-        )
+        'result'  => array(
+            array('utf8_general_ci'),
+        ),
     ),
     array(
-        'query' => 'SELECT @@collation_database',
+        'query'   => 'SELECT @@collation_database',
         'columns' => array('@@collation_database'),
-        'result' => array(
+        'result'  => array(
             array('bar'),
-        )
+        ),
     ),
     array(
-        'query' => "SHOW TABLES FROM `phpmyadmin`",
+        'query'  => "SHOW TABLES FROM `phpmyadmin`",
         'result' => array(),
     ),
     array(
-        'query' => "SELECT tracking_active FROM `pmadb`.`tracking`" .
+        'query'   => "SELECT tracking_active FROM `pmadb`.`tracking`" .
             " WHERE db_name = 'pma_test_db'" .
             " AND table_name = 'pma_test_table'" .
             " ORDER BY version DESC",
         'columns' => array('tracking_active'),
-        'result' => array(
-                array(1)
-            )
+        'result'  => array(
+            array(1),
+        ),
     ),
     array(
-        'query' => "SELECT tracking_active FROM `pmadb`.`tracking`" .
+        'query'  => "SELECT tracking_active FROM `pmadb`.`tracking`" .
             " WHERE db_name = 'pma_test_db'" .
             " AND table_name = 'pma_test_table2'" .
             " ORDER BY version DESC",
-        'result' => array()
+        'result' => array(),
     ),
     array(
-        'query' => "SHOW SLAVE STATUS",
+        'query'  => "SHOW SLAVE STATUS",
         'result' => array(
             array(
-                'Slave_IO_State' => 'running',
-                'Master_Host' => 'locahost',
-                'Master_User' => 'Master_User',
-                'Master_Port' => '1002',
-                'Connect_Retry' => 'Connect_Retry',
-                'Master_Log_File' => 'Master_Log_File',
-                'Read_Master_Log_Pos' => 'Read_Master_Log_Pos',
-                'Relay_Log_File' => 'Relay_Log_File',
-                'Relay_Log_Pos' => 'Relay_Log_Pos',
-                'Relay_Master_Log_File' =>  'Relay_Master_Log_File',
-                'Slave_IO_Running' => 'NO',
-                'Slave_SQL_Running' => 'NO',
-                'Replicate_Do_DB' => 'Replicate_Do_DB',
-                'Replicate_Ignore_DB' => 'Replicate_Ignore_DB',
-                'Replicate_Do_Table' => 'Replicate_Do_Table',
-                'Replicate_Ignore_Table' => 'Replicate_Ignore_Table',
-                'Replicate_Wild_Do_Table' => 'Replicate_Wild_Do_Table',
+                'Slave_IO_State'              => 'running',
+                'Master_Host'                 => 'locahost',
+                'Master_User'                 => 'Master_User',
+                'Master_Port'                 => '1002',
+                'Connect_Retry'               => 'Connect_Retry',
+                'Master_Log_File'             => 'Master_Log_File',
+                'Read_Master_Log_Pos'         => 'Read_Master_Log_Pos',
+                'Relay_Log_File'              => 'Relay_Log_File',
+                'Relay_Log_Pos'               => 'Relay_Log_Pos',
+                'Relay_Master_Log_File'       => 'Relay_Master_Log_File',
+                'Slave_IO_Running'            => 'NO',
+                'Slave_SQL_Running'           => 'NO',
+                'Replicate_Do_DB'             => 'Replicate_Do_DB',
+                'Replicate_Ignore_DB'         => 'Replicate_Ignore_DB',
+                'Replicate_Do_Table'          => 'Replicate_Do_Table',
+                'Replicate_Ignore_Table'      => 'Replicate_Ignore_Table',
+                'Replicate_Wild_Do_Table'     => 'Replicate_Wild_Do_Table',
                 'Replicate_Wild_Ignore_Table' => 'Replicate_Wild_Ignore_Table',
-                'Last_Errno' => 'Last_Errno',
-                'Last_Error' => 'Last_Error',
-                'Skip_Counter' =>  'Skip_Counter',
-                'Exec_Master_Log_Pos' => 'Exec_Master_Log_Pos',
-                'Relay_Log_Space' => 'Relay_Log_Space',
-                'Until_Condition' => 'Until_Condition',
-                'Until_Log_File' => 'Until_Log_File',
-                'Until_Log_Pos' => 'Until_Log_Pos',
-                'Master_SSL_Allowed' => 'Master_SSL_Allowed',
-                'Master_SSL_CA_File' => 'Master_SSL_CA_File',
-                'Master_SSL_CA_Path' => 'Master_SSL_CA_Path',
-                'Master_SSL_Cert' => 'Master_SSL_Cert',
-                'Master_SSL_Cipher' => 'Master_SSL_Cipher',
-                'Master_SSL_Key' => 'Master_SSL_Key',
-                'Seconds_Behind_Master' => 'Seconds_Behind_Master',
-            )
-        )
+                'Last_Errno'                  => 'Last_Errno',
+                'Last_Error'                  => 'Last_Error',
+                'Skip_Counter'                => 'Skip_Counter',
+                'Exec_Master_Log_Pos'         => 'Exec_Master_Log_Pos',
+                'Relay_Log_Space'             => 'Relay_Log_Space',
+                'Until_Condition'             => 'Until_Condition',
+                'Until_Log_File'              => 'Until_Log_File',
+                'Until_Log_Pos'               => 'Until_Log_Pos',
+                'Master_SSL_Allowed'          => 'Master_SSL_Allowed',
+                'Master_SSL_CA_File'          => 'Master_SSL_CA_File',
+                'Master_SSL_CA_Path'          => 'Master_SSL_CA_Path',
+                'Master_SSL_Cert'             => 'Master_SSL_Cert',
+                'Master_SSL_Cipher'           => 'Master_SSL_Cipher',
+                'Master_SSL_Key'              => 'Master_SSL_Key',
+                'Seconds_Behind_Master'       => 'Seconds_Behind_Master',
+            ),
+        ),
     ),
     array(
-        'query' => "SHOW MASTER STATUS",
+        'query'  => "SHOW MASTER STATUS",
         'result' => array(
             array(
-                "File" => "master-bin.000030",
-                "Position" => "107",
-                "Binlog_Do_DB" => "Binlog_Do_DB",
+                "File"             => "master-bin.000030",
+                "Position"         => "107",
+                "Binlog_Do_DB"     => "Binlog_Do_DB",
                 "Binlog_Ignore_DB" => "Binlog_Ignore_DB",
-            )
-        )
+            ),
+        ),
     ),
     array(
-        'query' => "SHOW GRANTS",
-        'result' => array()
+        'query'  => "SHOW GRANTS",
+        'result' => array(),
     ),
     array(
-        'query' => "SELECT `SCHEMA_NAME` FROM `INFORMATION_SCHEMA`.`SCHEMATA`, "
+        'query'  => "SELECT `SCHEMA_NAME` FROM `INFORMATION_SCHEMA`.`SCHEMATA`, "
             . "(SELECT DB_first_level FROM ( SELECT DISTINCT "
             . "SUBSTRING_INDEX(SCHEMA_NAME, '_', 1) DB_first_level "
             . "FROM INFORMATION_SCHEMA.SCHEMATA WHERE TRUE ) t ORDER BY "
@@ -511,112 +683,112 @@ $GLOBALS['dummy_queries'] = array(
             . "ORDER BY SCHEMA_NAME ASC",
         'result' => array(
             "test",
-        )
+        ),
     ),
     array(
-        'query' => "SELECT COUNT(*) FROM ( SELECT DISTINCT SUBSTRING_INDEX("
+        'query'  => "SELECT COUNT(*) FROM ( SELECT DISTINCT SUBSTRING_INDEX("
             . "SCHEMA_NAME, '_', 1) DB_first_level "
             . "FROM INFORMATION_SCHEMA.SCHEMATA WHERE TRUE ) t",
         'result' => array(
             array(1),
-        )
-    ),
-    array(
-        'query' => "SELECT `PARTITION_METHOD` "
-            . "FROM `information_schema`.`PARTITIONS` "
-            . "WHERE `TABLE_SCHEMA` = 'db' AND `TABLE_NAME` = 'table'",
-        'result' => array()
-    ),
-    array(
-        'query' => "SHOW PLUGINS",
-        'result' => array(
-            array('Name' => 'partition')
-        )
-    ),
-    array(
-        'query' => "SHOW FULL TABLES FROM `default` WHERE `Table_type`='BASE TABLE'",
-        'result' => array(
-            array("test1", "BASE TABLE"),
-            array("test2", "BASE TABLE"),
-        )
-    ),
-    array(
-        'query' => "SHOW FULL TABLES FROM `default` "
-            . "WHERE `Table_type`!='BASE TABLE'",
-        'result' => array()
-    ),
-    array(
-        'query' => "SHOW FUNCTION STATUS WHERE `Db`='default'",
-        'result' => array(array("Name" => "testFunction"))
-    ),
-    array(
-        'query' => "SHOW PROCEDURE STATUS WHERE `Db`='default'",
-        'result' => array()
-    ),
-    array(
-        'query' => "SHOW EVENTS FROM `default`",
-        'result' => array()
-    ),
-    array(
-        'query' => "FLUSH PRIVILEGES",
-        'result' => array()
-    ),
-    array(
-        'query' => "SELECT * FROM `mysql`.`db` LIMIT 1",
-        'result' => array()
-    ),
-    array(
-        'query' => "SELECT * FROM `mysql`.`columns_priv` LIMIT 1",
-        'result' => array()
-    ),
-    array(
-        'query' => "SELECT * FROM `mysql`.`tables_priv` LIMIT 1",
-        'result' => array()
-    ),
-    array(
-        'query' => "SELECT * FROM `mysql`.`procs_priv` LIMIT 1",
-        'result' => array()
-    ),
-    array(
-        'query' => 'DELETE FROM `mysql`.`db` WHERE `host` = "" '
-            . 'AND `Db` = "" AND `User` = "" LIMIT 1',
-        'result' => true
-    ),
-    array(
-        'query' => 'DELETE FROM `mysql`.`columns_priv` WHERE '
-            . '`host` = "" AND `Db` = "" AND `User` = "" LIMIT 1',
-        'result' => true
-    ),
-    array(
-        'query' => 'DELETE FROM `mysql`.`tables_priv` WHERE '
-            . '`host` = "" AND `Db` = "" AND `User` = "" AND Table_name = "" '
-            . 'LIMIT 1',
-        'result' => true
-    ),
-    array(
-        'query' => 'DELETE FROM `mysql`.`procs_priv` WHERE '
-            . '`host` = "" AND `Db` = "" AND `User` = "" AND `Routine_name` = "" '
-            . 'AND `Routine_type` = "" LIMIT 1',
-        'result' => true
-    ),
-    array(
-        'query' => 'SELECT `plugin` FROM `mysql`.`user` WHERE '
-            . '`User` = "pma_username" AND `Host` = "pma_hostname" LIMIT 1',
-        'result' => array()
-    ),
-    array(
-        'query' => 'SELECT @@default_authentication_plugin',
-        'result' => array(
-            array('@@default_authentication_plugin' => 'mysql_native_password')
         ),
     ),
     array(
-        'query' => "SELECT TABLE_NAME FROM information_schema.VIEWS WHERE "
-            . "TABLE_SCHEMA = 'db' AND TABLE_NAME = 'table'",
-        'result' => array()
+        'query'  => "SELECT `PARTITION_METHOD` "
+            . "FROM `information_schema`.`PARTITIONS` "
+            . "WHERE `TABLE_SCHEMA` = 'db' AND `TABLE_NAME` = 'table'",
+        'result' => array(),
     ),
     array(
-        'query' => "SELECT *, `TABLE_SCHEMA` AS `Db`, "
+        'query'  => "SHOW PLUGINS",
+        'result' => array(
+            array('Name' => 'partition'),
+        ),
+    ),
+    array(
+        'query'  => "SHOW FULL TABLES FROM `default` WHERE `Table_type`='BASE TABLE'",
+        'result' => array(
+            array("test1", "BASE TABLE"),
+            array("test2", "BASE TABLE"),
+        ),
+    ),
+    array(
+        'query'  => "SHOW FULL TABLES FROM `default` "
+            . "WHERE `Table_type`!='BASE TABLE'",
+        'result' => array(),
+    ),
+    array(
+        'query'  => "SHOW FUNCTION STATUS WHERE `Db`='default'",
+        'result' => array(array("Name" => "testFunction")),
+    ),
+    array(
+        'query'  => "SHOW PROCEDURE STATUS WHERE `Db`='default'",
+        'result' => array(),
+    ),
+    array(
+        'query'  => "SHOW EVENTS FROM `default`",
+        'result' => array(),
+    ),
+    array(
+        'query'  => "FLUSH PRIVILEGES",
+        'result' => array(),
+    ),
+    array(
+        'query'  => "SELECT * FROM `mysql`.`db` LIMIT 1",
+        'result' => array(),
+    ),
+    array(
+        'query'  => "SELECT * FROM `mysql`.`columns_priv` LIMIT 1",
+        'result' => array(),
+    ),
+    array(
+        'query'  => "SELECT * FROM `mysql`.`tables_priv` LIMIT 1",
+        'result' => array(),
+    ),
+    array(
+        'query'  => "SELECT * FROM `mysql`.`procs_priv` LIMIT 1",
+        'result' => array(),
+    ),
+    array(
+        'query'  => 'DELETE FROM `mysql`.`db` WHERE `host` = "" '
+            . 'AND `Db` = "" AND `User` = "" LIMIT 1',
+        'result' => true,
+    ),
+    array(
+        'query'  => 'DELETE FROM `mysql`.`columns_priv` WHERE '
+            . '`host` = "" AND `Db` = "" AND `User` = "" LIMIT 1',
+        'result' => true,
+    ),
+    array(
+        'query'  => 'DELETE FROM `mysql`.`tables_priv` WHERE '
+            . '`host` = "" AND `Db` = "" AND `User` = "" AND Table_name = "" '
+            . 'LIMIT 1',
+        'result' => true,
+    ),
+    array(
+        'query'  => 'DELETE FROM `mysql`.`procs_priv` WHERE '
+            . '`host` = "" AND `Db` = "" AND `User` = "" AND `Routine_name` = "" '
+            . 'AND `Routine_type` = "" LIMIT 1',
+        'result' => true,
+    ),
+    array(
+        'query'  => 'SELECT `plugin` FROM `mysql`.`user` WHERE '
+            . '`User` = "pma_username" AND `Host` = "pma_hostname" LIMIT 1',
+        'result' => array(),
+    ),
+    array(
+        'query'  => 'SELECT @@default_authentication_plugin',
+        'result' => array(
+            array('@@default_authentication_plugin' => 'mysql_native_password'),
+        ),
+    ),
+    array(
+        'query'  => "SELECT TABLE_NAME FROM information_schema.VIEWS WHERE "
+            . "TABLE_SCHEMA = 'db' AND TABLE_NAME = 'table'",
+        'result' => array(),
+    ),
+    array(
+        'query'  => "SELECT *, `TABLE_SCHEMA` AS `Db`, "
             . "`TABLE_NAME` AS `Name`, `TABLE_TYPE` AS `TABLE_TYPE`, "
             . "`ENGINE` AS `Engine`, `ENGINE` AS `Type`, "
             . "`VERSION` AS `Version`, `ROW_FORMAT` AS `Row_format`, "
@@ -633,26 +805,26 @@ $GLOBALS['dummy_queries'] = array(
             . "FROM `information_schema`.`TABLES` t "
             . "WHERE `TABLE_SCHEMA` IN ('db') "
             . "AND t.`TABLE_NAME` = 'table' ORDER BY Name ASC",
-        'result' => array()
+        'result' => array(),
     ),
     array(
-        'query' => "SHOW TABLE STATUS FROM `db` WHERE `Name` LIKE 'table%'",
-        'result' => array()
+        'query'  => "SHOW TABLE STATUS FROM `db` WHERE `Name` LIKE 'table%'",
+        'result' => array(),
     ),
     array(
-        'query' => "SELECT @@have_partitioning;",
-        'result' => array()
+        'query'  => "SELECT @@have_partitioning;",
+        'result' => array(),
     ),
     array(
-        'query' => "SELECT @@lower_case_table_names",
-        'result' => array()
+        'query'  => "SELECT @@lower_case_table_names",
+        'result' => array(),
     ),
     array(
-        'query' => "SELECT `PLUGIN_NAME`, `PLUGIN_DESCRIPTION` "
+        'query'  => "SELECT `PLUGIN_NAME`, `PLUGIN_DESCRIPTION` "
             . "FROM `information_schema`.`PLUGINS` "
             . "WHERE `PLUGIN_TYPE` = 'AUTHENTICATION';",
-        'result' => array()
-    )
+        'result' => array(),
+    ),
 );
 /**
  * Current database.
@@ -663,7 +835,7 @@ $GLOBALS['dummy_db'] = '';
 $GLOBALS['userlink'] = 1;
 $GLOBALS['controllink'] = 2;
 $GLOBALS['cfg']['DBG']['sql'] = false;
-if (! defined('PMA_MARIADB')) {
+if (!defined('PMA_MARIADB')) {
     define('PMA_MARIADB', 0);
 }
 
@@ -692,7 +864,10 @@ class DBIDummy implements DBIExtension
      * @return mixed false on error or a mysqli object on success
      */
     public function connect(
-        $user, $password, $is_controluser = false, $server = null,
+        $user,
+        $password,
+        $is_controluser = false,
+        $server = null,
         $auxiliary_connection = false
     ) {
         return true;
@@ -709,6 +884,7 @@ class DBIDummy implements DBIExtension
     public function selectDb($dbname, $link)
     {
         $GLOBALS['dummy_db'] = $dbname;
+
         return true;
     }
 
@@ -737,6 +913,7 @@ class DBIDummy implements DBIExtension
             return $i;
         }
         echo "Not supported query: $query\n";
+
         return false;
     }
 
@@ -768,6 +945,7 @@ class DBIDummy implements DBIExtension
         }
         $ret = $query_data['result'][$query_data['pos']];
         $GLOBALS['dummy_queries'][$result]['pos'] += 1;
+
         return $ret;
     }
 
@@ -790,6 +968,7 @@ class DBIDummy implements DBIExtension
         foreach ($data as $key => $val) {
             $data[$GLOBALS['dummy_queries'][$result]['columns'][$key]] = $val;
         }
+
         return $data;
     }
 
@@ -813,6 +992,7 @@ class DBIDummy implements DBIExtension
         foreach ($data as $key => $val) {
             $ret[$GLOBALS['dummy_queries'][$result]['columns'][$key]] = $val;
         }
+
         return $ret;
     }
 
@@ -826,6 +1006,7 @@ class DBIDummy implements DBIExtension
     public function fetchRow($result)
     {
         $data = $this->fetchAny($result);
+
         return $data;
     }
 
@@ -843,6 +1024,7 @@ class DBIDummy implements DBIExtension
             return false;
         }
         $GLOBALS['dummy_queries'][$result]['pos'] = $offset;
+
         return true;
     }
 
diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php
index 28abe6b817..d72009bc61 100644
--- a/libraries/display_change_password.lib.php
+++ b/libraries/display_change_password.lib.php
@@ -7,10 +7,6 @@
  */
 use PMA\libraries\Message;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
   * Get HTML for the Change password dialog
   *
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 73537fe7a9..d4ebd04bf3 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -10,10 +10,6 @@ use PMA\libraries\Message;
 use PMA\libraries\plugins\ExportPlugin;
 use PMA\libraries\Table;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Outputs appropriate checked statement for checkbox.
  *
diff --git a/libraries/display_git_revision.lib.php b/libraries/display_git_revision.lib.php
index b670d11abf..bd179973dc 100644
--- a/libraries/display_git_revision.lib.php
+++ b/libraries/display_git_revision.lib.php
@@ -5,9 +5,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
 * Prints details about the current Git commit revision
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index d40cda6150..862484ff97 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -8,14 +8,9 @@
  *
  * @package PhpMyAdmin
  */
-
 use PMA\libraries\Message;
 use PMA\libraries\plugins\ImportPlugin;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Prints Html For Display Import Hidden Input
  *
diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php
index 99eb895fcc..1318c8b10d 100644
--- a/libraries/display_select_lang.lib.php
+++ b/libraries/display_select_lang.lib.php
@@ -5,9 +5,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Compares the names of two languages.
diff --git a/libraries/engines/Bdb.php b/libraries/engines/Bdb.php
index c9a456860b..6c28ae3ba4 100644
--- a/libraries/engines/Bdb.php
+++ b/libraries/engines/Bdb.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\engines;
 
 use PMA\libraries\StorageEngine;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The BDB storage engine
  *
diff --git a/libraries/engines/Berkeleydb.php b/libraries/engines/Berkeleydb.php
index 7cbae983fe..55941e646b 100644
--- a/libraries/engines/Berkeleydb.php
+++ b/libraries/engines/Berkeleydb.php
@@ -7,10 +7,6 @@
  */
 namespace PMA\libraries\engines;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * This is same as BDB
  *
diff --git a/libraries/engines/Binlog.php b/libraries/engines/Binlog.php
index f6a4b0d153..0012f8525c 100644
--- a/libraries/engines/Binlog.php
+++ b/libraries/engines/Binlog.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\engines;
 
 use PMA\libraries\StorageEngine;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The binary log storage engine
  *
diff --git a/libraries/engines/Innobase.php b/libraries/engines/Innobase.php
index fea1f1a472..e3fc63b06c 100644
--- a/libraries/engines/Innobase.php
+++ b/libraries/engines/Innobase.php
@@ -7,10 +7,6 @@
  */
 namespace PMA\libraries\engines;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The Innobase storage engine
  *
diff --git a/libraries/engines/Innodb.php b/libraries/engines/Innodb.php
index 0e940592c6..bbb531ba62 100644
--- a/libraries/engines/Innodb.php
+++ b/libraries/engines/Innodb.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\engines;
 use PMA\libraries\StorageEngine;
 use PMA\libraries\Util;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The InnoDB storage engine
  *
diff --git a/libraries/engines/Memory.php b/libraries/engines/Memory.php
index c4190e3d78..b4e8824891 100644
--- a/libraries/engines/Memory.php
+++ b/libraries/engines/Memory.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\engines;
 
 use PMA\libraries\StorageEngine;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The MEMORY (HEAP) storage engine
  *
diff --git a/libraries/engines/Merge.php b/libraries/engines/Merge.php
index 60f19f88d4..dc9553a753 100644
--- a/libraries/engines/Merge.php
+++ b/libraries/engines/Merge.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\engines;
 
 use PMA\libraries\StorageEngine;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The MERGE storage engine
  *
diff --git a/libraries/engines/Mrg_Myisam.php b/libraries/engines/Mrg_Myisam.php
index b778498a51..39bd272066 100644
--- a/libraries/engines/Mrg_Myisam.php
+++ b/libraries/engines/Mrg_Myisam.php
@@ -7,10 +7,6 @@
  */
 namespace PMA\libraries\engines;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The MERGE storage engine
  *
diff --git a/libraries/engines/Myisam.php b/libraries/engines/Myisam.php
index 0fc92cfb83..7dff629eea 100644
--- a/libraries/engines/Myisam.php
+++ b/libraries/engines/Myisam.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\engines;
 
 use PMA\libraries\StorageEngine;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The MyISAM storage engine
  *
diff --git a/libraries/engines/Ndbcluster.php b/libraries/engines/Ndbcluster.php
index a267ed1767..cbf1fc754b 100644
--- a/libraries/engines/Ndbcluster.php
+++ b/libraries/engines/Ndbcluster.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\engines;
 
 use PMA\libraries\StorageEngine;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The NDBCLUSTER storage engine
  *
diff --git a/libraries/engines/Pbxt.php b/libraries/engines/Pbxt.php
index 0968a1b561..33b968fd96 100644
--- a/libraries/engines/Pbxt.php
+++ b/libraries/engines/Pbxt.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\engines;
 use PMA;
 use PMA\libraries\StorageEngine;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The PBXT storage engine
  *
diff --git a/libraries/engines/Performance_Schema.php b/libraries/engines/Performance_Schema.php
index 913395d241..e0c53aef7f 100644
--- a/libraries/engines/Performance_Schema.php
+++ b/libraries/engines/Performance_Schema.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\engines;
 
 use PMA\libraries\StorageEngine;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The performance schema storage engine
  *
diff --git a/libraries/export.lib.php b/libraries/export.lib.php
index 186c925e57..601f6262a1 100644
--- a/libraries/export.lib.php
+++ b/libraries/export.lib.php
@@ -6,16 +6,11 @@
  *
  * @package PhpMyAdmin
  */
-
 use PMA\libraries\Message;
 use PMA\libraries\plugins\ExportPlugin;
 use PMA\libraries\Table;
 use PMA\libraries\ZipFile;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Sets a session variable upon a possible fatal error during export
  *
diff --git a/libraries/file_listing.lib.php b/libraries/file_listing.lib.php
index 4e78c4623a..73ab36bc30 100644
--- a/libraries/file_listing.lib.php
+++ b/libraries/file_listing.lib.php
@@ -5,9 +5,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Returns array of filtered file names
diff --git a/libraries/gis/GISFactory.php b/libraries/gis/GISFactory.php
index 45c89bd1f0..3cf1b2a940 100644
--- a/libraries/gis/GISFactory.php
+++ b/libraries/gis/GISFactory.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\gis;
 
 use PMA;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Factory class that handles the creation of geometric objects.
  *
diff --git a/libraries/gis/GISGeometry.php b/libraries/gis/GISGeometry.php
index b066c56e98..c6868a0690 100644
--- a/libraries/gis/GISGeometry.php
+++ b/libraries/gis/GISGeometry.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\gis;
 
 use \TCPDF;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Base class for all GIS data type classes.
  *
diff --git a/libraries/gis/GISGeometrycollection.php b/libraries/gis/GISGeometrycollection.php
index eb37af7577..e22e25993b 100644
--- a/libraries/gis/GISGeometrycollection.php
+++ b/libraries/gis/GISGeometrycollection.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\gis;
 
 use \TCPDF;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles actions related to GIS GEOMETRYCOLLECTION objects
  *
diff --git a/libraries/gis/GISLinestring.php b/libraries/gis/GISLinestring.php
index cf54e93401..62cf7324be 100644
--- a/libraries/gis/GISLinestring.php
+++ b/libraries/gis/GISLinestring.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\gis;
 
 use \TCPDF;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles actions related to GIS LINESTRING objects
  *
diff --git a/libraries/gis/GISMultilinestring.php b/libraries/gis/GISMultilinestring.php
index bbf7b83e04..33bb249f3a 100644
--- a/libraries/gis/GISMultilinestring.php
+++ b/libraries/gis/GISMultilinestring.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\gis;
 
 use \TCPDF;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles actions related to GIS MULTILINESTRING objects
  *
diff --git a/libraries/gis/GISMultipoint.php b/libraries/gis/GISMultipoint.php
index 892f05126f..febbc25f3a 100644
--- a/libraries/gis/GISMultipoint.php
+++ b/libraries/gis/GISMultipoint.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\gis;
 
 use \TCPDF;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles actions related to GIS MULTIPOINT objects
  *
diff --git a/libraries/gis/GISMultipolygon.php b/libraries/gis/GISMultipolygon.php
index 7be556c6d3..d6b7745683 100644
--- a/libraries/gis/GISMultipolygon.php
+++ b/libraries/gis/GISMultipolygon.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\gis;
 
 use \TCPDF;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles actions related to GIS MULTIPOLYGON objects
  *
diff --git a/libraries/gis/GISPoint.php b/libraries/gis/GISPoint.php
index cf1d888adb..d8020f068f 100644
--- a/libraries/gis/GISPoint.php
+++ b/libraries/gis/GISPoint.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\gis;
 
 use \TCPDF;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles actions related to GIS POINT objects
  *
diff --git a/libraries/gis/GISPolygon.php b/libraries/gis/GISPolygon.php
index e577299dbf..759913046d 100644
--- a/libraries/gis/GISPolygon.php
+++ b/libraries/gis/GISPolygon.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\gis;
 use PMA\libraries\Util;
 use \TCPDF;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles actions related to GIS POLYGON objects
  *
diff --git a/libraries/gis/GISVisualization.php b/libraries/gis/GISVisualization.php
index fd8d165e8a..3336fb8342 100644
--- a/libraries/gis/GISVisualization.php
+++ b/libraries/gis/GISVisualization.php
@@ -11,10 +11,6 @@ namespace PMA\libraries\gis;
 use PMA\libraries\Util;
 use \TCPDF;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 require_once 'libraries/sql.lib.php';
 
 /**
diff --git a/libraries/index.lib.php b/libraries/index.lib.php
index c5d2439092..804faea201 100644
--- a/libraries/index.lib.php
+++ b/libraries/index.lib.php
@@ -1,14 +1,10 @@
 <?php
-
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * set of functions for structure section in pma
  *
  * @package PhpMyAdmin
  */
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Get HTML for display indexes
diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
index d2db3f551d..909a539397 100644
--- a/libraries/insert_edit.lib.php
+++ b/libraries/insert_edit.lib.php
@@ -5,14 +5,9 @@
  *
  * @package PhpMyAdmin
  */
-
 use PMA\libraries\Message;
 use PMA\libraries\plugins\TransformationsPlugin;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Retrieve form parameters for insert/edit form
  *
diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php
index afd703f27a..90a74853de 100644
--- a/libraries/ip_allow_deny.lib.php
+++ b/libraries/ip_allow_deny.lib.php
@@ -6,9 +6,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Gets the "true" IP address of the current user
diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php
index 5c31a6b6cc..7edcb004f6 100644
--- a/libraries/js_escape.lib.php
+++ b/libraries/js_escape.lib.php
@@ -6,9 +6,6 @@
  * @package PhpMyAdmin
  *
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Format a string so it can be a string inside JavaScript code inside an
diff --git a/libraries/logging.lib.php b/libraries/logging.lib.php
index 49db0ec122..540ff5a4a5 100644
--- a/libraries/logging.lib.php
+++ b/libraries/logging.lib.php
@@ -7,9 +7,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Logs user information to webserver logs.
diff --git a/libraries/mime.lib.php b/libraries/mime.lib.php
index 85b684d9e4..3d3c95cc80 100644
--- a/libraries/mime.lib.php
+++ b/libraries/mime.lib.php
@@ -6,9 +6,6 @@
  * @package PhpMyAdmin
  * @todo Maybe we could try to use fileinfo module if loaded
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Tries to detect MIME type of content.
diff --git a/libraries/mult_submits.lib.php b/libraries/mult_submits.lib.php
index d14fe56b87..12b4abc06c 100644
--- a/libraries/mult_submits.lib.php
+++ b/libraries/mult_submits.lib.php
@@ -7,9 +7,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Gets url params
diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php
index 5f3820497d..0db209a904 100644
--- a/libraries/mysql_charsets.lib.php
+++ b/libraries/mysql_charsets.lib.php
@@ -7,10 +7,6 @@
  */
 use PMA\libraries\Util;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Generate charset dropdown box
  *
diff --git a/libraries/navigation/nodes/Node.php b/libraries/navigation/nodes/Node.php
index 5e8b68ab46..7874ee2a81 100644
--- a/libraries/navigation/nodes/Node.php
+++ b/libraries/navigation/nodes/Node.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\navigation\nodes;
 
 use PMA\libraries\Util;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The Node is the building block for the collapsible navigation tree
  *
diff --git a/libraries/navigation/nodes/NodeColumn.php b/libraries/navigation/nodes/NodeColumn.php
index b2ce327817..75f64b6ff7 100644
--- a/libraries/navigation/nodes/NodeColumn.php
+++ b/libraries/navigation/nodes/NodeColumn.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\navigation\nodes;
 
 use PMA;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Represents a columns node in the navigation tree
  *
diff --git a/libraries/navigation/nodes/NodeColumnContainer.php b/libraries/navigation/nodes/NodeColumnContainer.php
index f55a56e893..aa678a72b6 100644
--- a/libraries/navigation/nodes/NodeColumnContainer.php
+++ b/libraries/navigation/nodes/NodeColumnContainer.php
@@ -11,10 +11,6 @@ use PMA;
 use PMA\libraries\navigation\NodeFactory;
 use PMA\libraries\Util;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Represents a container for column nodes in the navigation tree
  *
diff --git a/libraries/navigation/nodes/NodeEvent.php b/libraries/navigation/nodes/NodeEvent.php
index 61d2f2fe2e..d394682005 100644
--- a/libraries/navigation/nodes/NodeEvent.php
+++ b/libraries/navigation/nodes/NodeEvent.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\navigation\nodes;
 
 use PMA;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Represents a event node in the navigation tree
  *
diff --git a/libraries/normalization.lib.php b/libraries/normalization.lib.php
index 5af24ed595..513978e9c5 100644
--- a/libraries/normalization.lib.php
+++ b/libraries/normalization.lib.php
@@ -1,19 +1,13 @@
 <?php
-
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * set of functions used for normalization
  *
  * @package PhpMyAdmin
  */
-
 use PMA\libraries\Message;
 use PMA\libraries\Util;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * build the html for columns of $colTypeCategory category
  * in form of given $listType in a table
diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php
index 9ad8dd8eea..6bda47cfa3 100644
--- a/libraries/operations.lib.php
+++ b/libraries/operations.lib.php
@@ -1,12 +1,10 @@
 <?php
-
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * set of functions with the operations section in pma
  *
  * @package PhpMyAdmin
  */
-
 use PMA\libraries\engines\Innodb;
 use PMA\libraries\Message;
 use PMA\libraries\Partition;
@@ -16,10 +14,6 @@ use PMA\libraries\StorageEngine;
 use PMA\libraries\Table;
 use PMA\libraries\Util;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Get HTML output for database comment
  *
diff --git a/libraries/plugins/auth/swekey/swekey.auth.lib.php b/libraries/plugins/auth/swekey/swekey.auth.lib.php
index 70ebbde7d0..1447f6f945 100644
--- a/libraries/plugins/auth/swekey/swekey.auth.lib.php
+++ b/libraries/plugins/auth/swekey/swekey.auth.lib.php
@@ -8,10 +8,6 @@
 
 use PMA\libraries\Message;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Checks Swekey authentication.
  *
diff --git a/libraries/plugins/import/ImportCsv.php b/libraries/plugins/import/ImportCsv.php
index 5119633296..5a8691ef8a 100644
--- a/libraries/plugins/import/ImportCsv.php
+++ b/libraries/plugins/import/ImportCsv.php
@@ -13,10 +13,6 @@ use PMA\libraries\properties\options\items\BoolPropertyItem;
 use PMA;
 use PMA\libraries\properties\options\items\TextPropertyItem;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the import for the CSV format
  *
diff --git a/libraries/plugins/import/ImportMediawiki.php b/libraries/plugins/import/ImportMediawiki.php
index 056a762b50..1f7e4d9d0a 100644
--- a/libraries/plugins/import/ImportMediawiki.php
+++ b/libraries/plugins/import/ImportMediawiki.php
@@ -12,10 +12,6 @@ use PMA\libraries\properties\plugins\ImportPluginProperties;
 use PMA;
 use PMA\libraries\plugins\ImportPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the import for the MediaWiki format
  *
diff --git a/libraries/plugins/import/ImportOds.php b/libraries/plugins/import/ImportOds.php
index 39a25647b9..fee97131d8 100644
--- a/libraries/plugins/import/ImportOds.php
+++ b/libraries/plugins/import/ImportOds.php
@@ -18,10 +18,6 @@ use PMA;
 use PMA\libraries\plugins\ImportPlugin;
 use SimpleXMLElement;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * We need way to disable external XML entities processing.
  */
diff --git a/libraries/plugins/import/ImportShp.php b/libraries/plugins/import/ImportShp.php
index eb8e5c5512..ab73334b85 100644
--- a/libraries/plugins/import/ImportShp.php
+++ b/libraries/plugins/import/ImportShp.php
@@ -18,10 +18,6 @@ use PMA\libraries\gis\GISPoint;
 use PMA\libraries\gis\GISPolygon;
 use PMA\libraries\plugins\import\ShapeFile;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /* Get the ShapeFile class */
 require_once 'libraries/bfShapeFiles/ShapeFile.lib.php';
 
diff --git a/libraries/plugins/import/ImportSql.php b/libraries/plugins/import/ImportSql.php
index fbac12f3d5..bc0ef38580 100644
--- a/libraries/plugins/import/ImportSql.php
+++ b/libraries/plugins/import/ImportSql.php
@@ -17,10 +17,6 @@ use PMA\libraries\plugins\ImportPlugin;
 use PMA\libraries\properties\options\items\SelectPropertyItem;
 use SqlParser;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the import for the SQL format
  *
diff --git a/libraries/plugins/import/ImportXml.php b/libraries/plugins/import/ImportXml.php
index d5b143bde6..bc433c6182 100644
--- a/libraries/plugins/import/ImportXml.php
+++ b/libraries/plugins/import/ImportXml.php
@@ -15,10 +15,6 @@ use PMA;
 use PMA\libraries\plugins\ImportPlugin;
 use SimpleXMLElement;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * We need way to disable external XML entities processing.
  */
diff --git a/libraries/plugins/import/ShapeFile.php b/libraries/plugins/import/ShapeFile.php
index b63c4462e2..350458f669 100644
--- a/libraries/plugins/import/ShapeFile.php
+++ b/libraries/plugins/import/ShapeFile.php
@@ -9,10 +9,6 @@
  */
 namespace PMA\libraries\plugins\import;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * 1) To load data from .dbf file only when the dBase extension is available.
  * 2) To use PMA_importGetNextChunk() functionality to read data, rather than
diff --git a/libraries/plugins/import/ShapeRecord.php b/libraries/plugins/import/ShapeRecord.php
index b2e8df17a6..d36e112915 100644
--- a/libraries/plugins/import/ShapeRecord.php
+++ b/libraries/plugins/import/ShapeRecord.php
@@ -9,10 +9,6 @@
  */
 namespace PMA\libraries\plugins\import;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * 1) To load data from .dbf file only when the dBase extension is available.
  * 2) To use PMA_importGetNextChunk() functionality to read data, rather than
diff --git a/libraries/plugins/schema/ExportRelationSchema.php b/libraries/plugins/schema/ExportRelationSchema.php
index aaf6a2398f..9d5f7cfd33 100644
--- a/libraries/plugins/schema/ExportRelationSchema.php
+++ b/libraries/plugins/schema/ExportRelationSchema.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\schema;
 
 use PMA;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * This class is inherited by all schema classes
  * It contains those methods which are common in them
diff --git a/libraries/plugins/schema/RelationStats.php b/libraries/plugins/schema/RelationStats.php
index f5d269b0de..d22b180598 100644
--- a/libraries/plugins/schema/RelationStats.php
+++ b/libraries/plugins/schema/RelationStats.php
@@ -7,10 +7,6 @@
  */
 namespace PMA\libraries\plugins\schema;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Relations preferences/statistics
  *
diff --git a/libraries/plugins/schema/SchemaDia.php b/libraries/plugins/schema/SchemaDia.php
index bffea01bcc..3cf868e10d 100644
--- a/libraries/plugins/schema/SchemaDia.php
+++ b/libraries/plugins/schema/SchemaDia.php
@@ -15,10 +15,6 @@ use PMA\libraries\plugins\schema\dia\DiaRelationSchema;
 use PMA\libraries\properties\plugins\SchemaPluginProperties;
 use PMA\libraries\properties\options\items\SelectPropertyItem;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the schema export for the Dia format
  *
diff --git a/libraries/plugins/schema/SchemaEps.php b/libraries/plugins/schema/SchemaEps.php
index 39969d836f..ea1a173aaa 100644
--- a/libraries/plugins/schema/SchemaEps.php
+++ b/libraries/plugins/schema/SchemaEps.php
@@ -16,10 +16,6 @@ use PMA\libraries\plugins\SchemaPlugin;
 use PMA\libraries\properties\plugins\SchemaPluginProperties;
 use PMA\libraries\properties\options\items\SelectPropertyItem;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the schema export for the EPS format
  *
diff --git a/libraries/plugins/schema/SchemaPdf.php b/libraries/plugins/schema/SchemaPdf.php
index 345bb817ee..7bfbf2edaf 100644
--- a/libraries/plugins/schema/SchemaPdf.php
+++ b/libraries/plugins/schema/SchemaPdf.php
@@ -16,10 +16,6 @@ use PMA\libraries\plugins\SchemaPlugin;
 use PMA\libraries\properties\plugins\SchemaPluginProperties;
 use PMA\libraries\properties\options\items\SelectPropertyItem;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the schema export for the PDF format
  *
diff --git a/libraries/plugins/schema/SchemaSvg.php b/libraries/plugins/schema/SchemaSvg.php
index 507a9f370e..d0e21250f3 100644
--- a/libraries/plugins/schema/SchemaSvg.php
+++ b/libraries/plugins/schema/SchemaSvg.php
@@ -15,10 +15,6 @@ use PMA\libraries\plugins\SchemaPlugin;
 use PMA\libraries\plugins\schema\svg\SvgRelationSchema;
 use PMA\libraries\properties\plugins\SchemaPluginProperties;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the schema export for the SVG format
  *
diff --git a/libraries/plugins/schema/TableStats.php b/libraries/plugins/schema/TableStats.php
index bd5520db94..69fea39655 100644
--- a/libraries/plugins/schema/TableStats.php
+++ b/libraries/plugins/schema/TableStats.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\plugins\schema;
 
 use PMA;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Table preferences/statistics
  *
diff --git a/libraries/plugins/schema/dia/DiaRelationSchema.php b/libraries/plugins/schema/dia/DiaRelationSchema.php
index ea7ff32ffb..01a0249faa 100644
--- a/libraries/plugins/schema/dia/DiaRelationSchema.php
+++ b/libraries/plugins/schema/dia/DiaRelationSchema.php
@@ -13,10 +13,6 @@ use PMA\libraries\plugins\schema\pdf\TableStatsPdf;
 use PMA\libraries\plugins\schema\svg\TableStatsSvg;
 use PMA\libraries\plugins\schema\dia\TableStatsDia;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Dia Relation Schema Class
  *
diff --git a/libraries/plugins/schema/dia/RelationStatsDia.php b/libraries/plugins/schema/dia/RelationStatsDia.php
index f5a52a06b8..f40ec2256e 100644
--- a/libraries/plugins/schema/dia/RelationStatsDia.php
+++ b/libraries/plugins/schema/dia/RelationStatsDia.php
@@ -7,10 +7,6 @@
  */
 namespace PMA\libraries\plugins\schema\dia;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Relation preferences/statistics
  *
diff --git a/libraries/plugins/schema/dia/TableStatsDia.php b/libraries/plugins/schema/dia/TableStatsDia.php
index a319716950..883af32e0e 100644
--- a/libraries/plugins/schema/dia/TableStatsDia.php
+++ b/libraries/plugins/schema/dia/TableStatsDia.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\schema\dia;
 use PMA\libraries\plugins\schema\ExportRelationSchema;
 use PMA\libraries\plugins\schema\TableStats;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Table preferences/statistics
  *
diff --git a/libraries/plugins/schema/eps/EpsRelationSchema.php b/libraries/plugins/schema/eps/EpsRelationSchema.php
index 45699e4124..039e89f5c1 100644
--- a/libraries/plugins/schema/eps/EpsRelationSchema.php
+++ b/libraries/plugins/schema/eps/EpsRelationSchema.php
@@ -13,10 +13,6 @@ use PMA\libraries\plugins\schema\ExportRelationSchema;
 use PMA\libraries\plugins\schema\pdf\TableStatsPdf;
 use PMA\libraries\plugins\schema\svg\TableStatsSvg;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * EPS Relation Schema Class
  *
diff --git a/libraries/plugins/schema/eps/RelationStatsEps.php b/libraries/plugins/schema/eps/RelationStatsEps.php
index bbc33c9e41..dd8d93f112 100644
--- a/libraries/plugins/schema/eps/RelationStatsEps.php
+++ b/libraries/plugins/schema/eps/RelationStatsEps.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\plugins\schema\eps;
 
 use PMA\libraries\plugins\schema\RelationStats;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Relation preferences/statistics
  *
diff --git a/libraries/plugins/schema/eps/TableStatsEps.php b/libraries/plugins/schema/eps/TableStatsEps.php
index 091eb32d33..c53cb883dc 100644
--- a/libraries/plugins/schema/eps/TableStatsEps.php
+++ b/libraries/plugins/schema/eps/TableStatsEps.php
@@ -11,10 +11,6 @@ use PMA;
 use PMA\libraries\plugins\schema\ExportRelationSchema;
 use PMA\libraries\plugins\schema\TableStats;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Table preferences/statistics
  *
diff --git a/libraries/plugins/schema/pdf/Pdf.php b/libraries/plugins/schema/pdf/Pdf.php
index 9e0858427e..befcc4d9e7 100644
--- a/libraries/plugins/schema/pdf/Pdf.php
+++ b/libraries/plugins/schema/pdf/Pdf.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\schema\pdf;
 use PMA\libraries\PDF as PDF_lib;
 use PMA\libraries\Util;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Skip the plugin if TCPDF is not available.
  */
diff --git a/libraries/plugins/schema/pdf/PdfRelationSchema.php b/libraries/plugins/schema/pdf/PdfRelationSchema.php
index e1b1602615..dce4822a9a 100644
--- a/libraries/plugins/schema/pdf/PdfRelationSchema.php
+++ b/libraries/plugins/schema/pdf/PdfRelationSchema.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\schema\pdf;
 use PMA\libraries\plugins\schema\ExportRelationSchema;
 use PMA\libraries\Util;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Skip the plugin if TCPDF is not available.
  */
diff --git a/libraries/plugins/schema/pdf/RelationStatsPdf.php b/libraries/plugins/schema/pdf/RelationStatsPdf.php
index c8f31283fa..06be9c2d52 100644
--- a/libraries/plugins/schema/pdf/RelationStatsPdf.php
+++ b/libraries/plugins/schema/pdf/RelationStatsPdf.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\plugins\schema\pdf;
 
 use PMA\libraries\plugins\schema\RelationStats;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Relation preferences/statistics
  *
diff --git a/libraries/plugins/schema/pdf/TableStatsPdf.php b/libraries/plugins/schema/pdf/TableStatsPdf.php
index 5ca8a9c668..cf0b60aa1a 100644
--- a/libraries/plugins/schema/pdf/TableStatsPdf.php
+++ b/libraries/plugins/schema/pdf/TableStatsPdf.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\schema\pdf;
 use PMA\libraries\plugins\schema\ExportRelationSchema;
 use PMA\libraries\plugins\schema\TableStats;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Table preferences/statistics
  *
diff --git a/libraries/plugins/schema/svg/RelationStatsSvg.php b/libraries/plugins/schema/svg/RelationStatsSvg.php
index d53ca96c20..b3ee1e3610 100644
--- a/libraries/plugins/schema/svg/RelationStatsSvg.php
+++ b/libraries/plugins/schema/svg/RelationStatsSvg.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\plugins\schema\svg;
 
 use PMA\libraries\plugins\schema\RelationStats;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Relation preferences/statistics
  *
diff --git a/libraries/plugins/schema/svg/Svg.php b/libraries/plugins/schema/svg/Svg.php
index d5bcb62890..c880ec0e83 100644
--- a/libraries/plugins/schema/svg/Svg.php
+++ b/libraries/plugins/schema/svg/Svg.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\schema\svg;
 use PMA;
 use XMLWriter;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * This Class inherits the XMLwriter class and
  * helps in developing structure of SVG Schema Export
diff --git a/libraries/plugins/schema/svg/TableStatsSvg.php b/libraries/plugins/schema/svg/TableStatsSvg.php
index d1bce10a9f..5e1cbf75fc 100644
--- a/libraries/plugins/schema/svg/TableStatsSvg.php
+++ b/libraries/plugins/schema/svg/TableStatsSvg.php
@@ -11,10 +11,6 @@ use PMA;
 use PMA\libraries\plugins\schema\ExportRelationSchema;
 use PMA\libraries\plugins\schema\TableStats;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Table preferences/statistics
  *
diff --git a/libraries/plugins/transformations/Text_Plain_Link.php b/libraries/plugins/transformations/Text_Plain_Link.php
index 8a13ff4b8e..769435e828 100644
--- a/libraries/plugins/transformations/Text_Plain_Link.php
+++ b/libraries/plugins/transformations/Text_Plain_Link.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations;
 
 use PMA\libraries\plugins\transformations\abs\TextLinkTransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the link transformation for text plain
  *
diff --git a/libraries/plugins/transformations/Text_Plain_Longtoipv4.php b/libraries/plugins/transformations/Text_Plain_Longtoipv4.php
index 88af533632..ac621eabc7 100644
--- a/libraries/plugins/transformations/Text_Plain_Longtoipv4.php
+++ b/libraries/plugins/transformations/Text_Plain_Longtoipv4.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations;
 
 use PMA\libraries\plugins\transformations\abs\LongToIPv4TransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the long to ipv4 transformation for text plain
  *
diff --git a/libraries/plugins/transformations/Text_Plain_PreApPend.php b/libraries/plugins/transformations/Text_Plain_PreApPend.php
index a140472d5f..8bc07f0b99 100644
--- a/libraries/plugins/transformations/Text_Plain_PreApPend.php
+++ b/libraries/plugins/transformations/Text_Plain_PreApPend.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations;
 
 use PMA\libraries\plugins\transformations\abs\PreApPendTransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the prepend and/or append transformation for text plain.
  * Has two options: the text to be prepended and appended (if any, default '')
diff --git a/libraries/plugins/transformations/Text_Plain_Substring.php b/libraries/plugins/transformations/Text_Plain_Substring.php
index dade4ebd49..a8128e03c4 100644
--- a/libraries/plugins/transformations/Text_Plain_Substring.php
+++ b/libraries/plugins/transformations/Text_Plain_Substring.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations;
 
 use PMA\libraries\plugins\transformations\abs\SubstringTransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the substring transformation for text plain
  *
diff --git a/libraries/plugins/transformations/abs/Bool2TextTransformationsPlugin.php b/libraries/plugins/transformations/abs/Bool2TextTransformationsPlugin.php
index 03329868ac..0272ec4d7d 100644
--- a/libraries/plugins/transformations/abs/Bool2TextTransformationsPlugin.php
+++ b/libraries/plugins/transformations/abs/Bool2TextTransformationsPlugin.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\abs;
 
 use PMA\libraries\plugins\TransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Provides common methods for all of the Bool2Text transformations plugins.
  *
diff --git a/libraries/plugins/transformations/abs/CodeMirrorEditorTransformationPlugin.php b/libraries/plugins/transformations/abs/CodeMirrorEditorTransformationPlugin.php
index 7d3aba33c3..54ab6ed9a9 100644
--- a/libraries/plugins/transformations/abs/CodeMirrorEditorTransformationPlugin.php
+++ b/libraries/plugins/transformations/abs/CodeMirrorEditorTransformationPlugin.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\plugins\transformations\abs;
 
 use PMA\libraries\plugins\IOTransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Provides common methods for all the CodeMirror syntax highlighted editors
  *
diff --git a/libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php b/libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php
index 01a6a4c218..47f53ecedb 100644
--- a/libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php
+++ b/libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php
@@ -11,10 +11,6 @@ namespace PMA\libraries\plugins\transformations\abs;
 use PMA;
 use PMA\libraries\plugins\TransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Provides common methods for all of the date format transformations plugins.
  *
diff --git a/libraries/plugins/transformations/abs/DownloadTransformationsPlugin.php b/libraries/plugins/transformations/abs/DownloadTransformationsPlugin.php
index 1109ec4ba5..ee556cdeb4 100644
--- a/libraries/plugins/transformations/abs/DownloadTransformationsPlugin.php
+++ b/libraries/plugins/transformations/abs/DownloadTransformationsPlugin.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\abs;
 
 use PMA\libraries\plugins\TransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Provides common methods for all of the download transformations plugins.
  *
diff --git a/libraries/plugins/transformations/abs/ExternalTransformationsPlugin.php b/libraries/plugins/transformations/abs/ExternalTransformationsPlugin.php
index 08cc675bfd..ae618ce013 100644
--- a/libraries/plugins/transformations/abs/ExternalTransformationsPlugin.php
+++ b/libraries/plugins/transformations/abs/ExternalTransformationsPlugin.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\abs;
 
 use PMA\libraries\plugins\TransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Provides common methods for all of the external transformations plugins.
  *
diff --git a/libraries/plugins/transformations/abs/FormattedTransformationsPlugin.php b/libraries/plugins/transformations/abs/FormattedTransformationsPlugin.php
index 3dc690c64c..798dc539e4 100644
--- a/libraries/plugins/transformations/abs/FormattedTransformationsPlugin.php
+++ b/libraries/plugins/transformations/abs/FormattedTransformationsPlugin.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\abs;
 
 use PMA\libraries\plugins\TransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Provides common methods for all of the formatted transformations plugins.
  *
diff --git a/libraries/plugins/transformations/abs/HexTransformationsPlugin.php b/libraries/plugins/transformations/abs/HexTransformationsPlugin.php
index cccb99efb3..f2bab93fa3 100644
--- a/libraries/plugins/transformations/abs/HexTransformationsPlugin.php
+++ b/libraries/plugins/transformations/abs/HexTransformationsPlugin.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\abs;
 
 use PMA\libraries\plugins\TransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Provides common methods for all of the hex transformations plugins.
  *
diff --git a/libraries/plugins/transformations/abs/ImageUploadTransformationsPlugin.php b/libraries/plugins/transformations/abs/ImageUploadTransformationsPlugin.php
index 2ea9efb453..a976ff62ac 100644
--- a/libraries/plugins/transformations/abs/ImageUploadTransformationsPlugin.php
+++ b/libraries/plugins/transformations/abs/ImageUploadTransformationsPlugin.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\abs;
 
 use PMA\libraries\plugins\IOTransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Provides common methods for all of the image upload transformations plugins.
  *
diff --git a/libraries/plugins/transformations/abs/LongToIPv4TransformationsPlugin.php b/libraries/plugins/transformations/abs/LongToIPv4TransformationsPlugin.php
index bdcb3e4960..8ca5817a37 100644
--- a/libraries/plugins/transformations/abs/LongToIPv4TransformationsPlugin.php
+++ b/libraries/plugins/transformations/abs/LongToIPv4TransformationsPlugin.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\abs;
 
 use PMA\libraries\plugins\TransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Provides common methods for all of the long to IPv4 transformations plugins.
  *
diff --git a/libraries/plugins/transformations/abs/PreApPendTransformationsPlugin.php b/libraries/plugins/transformations/abs/PreApPendTransformationsPlugin.php
index fc3ac2e6be..9d85a3d72d 100644
--- a/libraries/plugins/transformations/abs/PreApPendTransformationsPlugin.php
+++ b/libraries/plugins/transformations/abs/PreApPendTransformationsPlugin.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\abs;
 
 use PMA\libraries\plugins\TransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Provides common methods for all of the prepend/append transformations plugins.
  *
diff --git a/libraries/plugins/transformations/abs/RegexValidationTransformationsPlugin.php b/libraries/plugins/transformations/abs/RegexValidationTransformationsPlugin.php
index 2a5f239d0f..63995e4a9f 100644
--- a/libraries/plugins/transformations/abs/RegexValidationTransformationsPlugin.php
+++ b/libraries/plugins/transformations/abs/RegexValidationTransformationsPlugin.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\abs;
 
 use PMA\libraries\plugins\IOTransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Provides common methods for all of the regex validation
  * input transformations plugins.
diff --git a/libraries/plugins/transformations/abs/SQLTransformationsPlugin.php b/libraries/plugins/transformations/abs/SQLTransformationsPlugin.php
index 8519bebc6f..ae054e40e3 100644
--- a/libraries/plugins/transformations/abs/SQLTransformationsPlugin.php
+++ b/libraries/plugins/transformations/abs/SQLTransformationsPlugin.php
@@ -11,10 +11,6 @@ namespace PMA\libraries\plugins\transformations\abs;
 use PMA;
 use PMA\libraries\plugins\TransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Provides common methods for all of the SQL transformations plugins.
  *
diff --git a/libraries/plugins/transformations/abs/SubstringTransformationsPlugin.php b/libraries/plugins/transformations/abs/SubstringTransformationsPlugin.php
index c879228727..432b673c4b 100644
--- a/libraries/plugins/transformations/abs/SubstringTransformationsPlugin.php
+++ b/libraries/plugins/transformations/abs/SubstringTransformationsPlugin.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\abs;
 
 use PMA\libraries\plugins\TransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Provides common methods for all of the substring transformations plugins.
  *
diff --git a/libraries/plugins/transformations/abs/TextFileUploadTransformationsPlugin.php b/libraries/plugins/transformations/abs/TextFileUploadTransformationsPlugin.php
index 68ad36109e..41142437d0 100644
--- a/libraries/plugins/transformations/abs/TextFileUploadTransformationsPlugin.php
+++ b/libraries/plugins/transformations/abs/TextFileUploadTransformationsPlugin.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\abs;
 
 use PMA\libraries\plugins\IOTransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Provides common methods for all of the text file upload
  * input transformations plugins.
diff --git a/libraries/plugins/transformations/input/Image_JPEG_Upload.php b/libraries/plugins/transformations/input/Image_JPEG_Upload.php
index 7015678fc5..9f87cf4e76 100644
--- a/libraries/plugins/transformations/input/Image_JPEG_Upload.php
+++ b/libraries/plugins/transformations/input/Image_JPEG_Upload.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\input;
 
 use PMA\libraries\plugins\transformations\abs\ImageUploadTransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the image upload input transformation for JPEG.
  * Has two option: width & height of the thumbnail
diff --git a/libraries/plugins/transformations/input/Text_Plain_FileUpload.php b/libraries/plugins/transformations/input/Text_Plain_FileUpload.php
index 1f1c4bdf5a..a4fe62434d 100644
--- a/libraries/plugins/transformations/input/Text_Plain_FileUpload.php
+++ b/libraries/plugins/transformations/input/Text_Plain_FileUpload.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\input;
 
 use PMA\libraries\plugins\transformations\abs\TextFileUploadTransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the input text file upload transformation for text plain.
  *
diff --git a/libraries/plugins/transformations/input/Text_Plain_Iptobinary.php b/libraries/plugins/transformations/input/Text_Plain_Iptobinary.php
index e93a55c10b..a490350a17 100644
--- a/libraries/plugins/transformations/input/Text_Plain_Iptobinary.php
+++ b/libraries/plugins/transformations/input/Text_Plain_Iptobinary.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\input;
 
 use PMA\libraries\plugins\IOTransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the IPv4/IPv6 to binary transformation for text plain
  *
diff --git a/libraries/plugins/transformations/input/Text_Plain_JsonEditor.php b/libraries/plugins/transformations/input/Text_Plain_JsonEditor.php
index f6f0529afc..6122c41ffe 100644
--- a/libraries/plugins/transformations/input/Text_Plain_JsonEditor.php
+++ b/libraries/plugins/transformations/input/Text_Plain_JsonEditor.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\input;
 
 use PMA\libraries\plugins\transformations\abs\CodeMirrorEditorTransformationPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * JSON editing with syntax highlighted CodeMirror editor
  *
diff --git a/libraries/plugins/transformations/input/Text_Plain_RegexValidation.php b/libraries/plugins/transformations/input/Text_Plain_RegexValidation.php
index 718378c3f7..5ea4f5fdbd 100644
--- a/libraries/plugins/transformations/input/Text_Plain_RegexValidation.php
+++ b/libraries/plugins/transformations/input/Text_Plain_RegexValidation.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\input;
 
 use PMA\libraries\plugins\transformations\abs\RegexValidationTransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the input regex validation transformation for text plain.
  * Has one option: the regular expression
diff --git a/libraries/plugins/transformations/input/Text_Plain_SqlEditor.php b/libraries/plugins/transformations/input/Text_Plain_SqlEditor.php
index 4d59cd35cc..dbee75e470 100644
--- a/libraries/plugins/transformations/input/Text_Plain_SqlEditor.php
+++ b/libraries/plugins/transformations/input/Text_Plain_SqlEditor.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\input;
 
 use PMA\libraries\plugins\transformations\abs\CodeMirrorEditorTransformationPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * SQL editing with syntax highlighted CodeMirror editor
  *
diff --git a/libraries/plugins/transformations/input/Text_Plain_XmlEditor.php b/libraries/plugins/transformations/input/Text_Plain_XmlEditor.php
index d8012b7cbe..b0b407a413 100644
--- a/libraries/plugins/transformations/input/Text_Plain_XmlEditor.php
+++ b/libraries/plugins/transformations/input/Text_Plain_XmlEditor.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\input;
 
 use PMA\libraries\plugins\transformations\abs\CodeMirrorEditorTransformationPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * XML (and HTML) editing with syntax highlighted CodeMirror editor
  *
diff --git a/libraries/plugins/transformations/output/Application_Octetstream_Download.php b/libraries/plugins/transformations/output/Application_Octetstream_Download.php
index 50b44284bd..3f175d21be 100644
--- a/libraries/plugins/transformations/output/Application_Octetstream_Download.php
+++ b/libraries/plugins/transformations/output/Application_Octetstream_Download.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\output;
 
 use PMA\libraries\plugins\transformations\abs\DownloadTransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the download transformation for application octetstream
  *
diff --git a/libraries/plugins/transformations/output/Application_Octetstream_Hex.php b/libraries/plugins/transformations/output/Application_Octetstream_Hex.php
index ab0a9fb7c6..6f990d73c6 100644
--- a/libraries/plugins/transformations/output/Application_Octetstream_Hex.php
+++ b/libraries/plugins/transformations/output/Application_Octetstream_Hex.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\output;
 
 use PMA\libraries\plugins\transformations\abs\HexTransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the hex transformation for application octetstream
  *
diff --git a/libraries/plugins/transformations/output/Image_JPEG_Inline.php b/libraries/plugins/transformations/output/Image_JPEG_Inline.php
index d82bebbb52..eb0aa9c491 100644
--- a/libraries/plugins/transformations/output/Image_JPEG_Inline.php
+++ b/libraries/plugins/transformations/output/Image_JPEG_Inline.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\output;
 
 use PMA\libraries\plugins\transformations\abs\InlineTransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the inline transformation for image jpeg
  *
diff --git a/libraries/plugins/transformations/output/Image_JPEG_Link.php b/libraries/plugins/transformations/output/Image_JPEG_Link.php
index 0c8bd64565..27beb8c670 100644
--- a/libraries/plugins/transformations/output/Image_JPEG_Link.php
+++ b/libraries/plugins/transformations/output/Image_JPEG_Link.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\output;
 
 use PMA\libraries\plugins\transformations\abs\ImageLinkTransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the link transformation for image jpeg
  *
diff --git a/libraries/plugins/transformations/output/Image_PNG_Inline.php b/libraries/plugins/transformations/output/Image_PNG_Inline.php
index d3b686043b..2f5d4252b8 100644
--- a/libraries/plugins/transformations/output/Image_PNG_Inline.php
+++ b/libraries/plugins/transformations/output/Image_PNG_Inline.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\output;
 
 use PMA\libraries\plugins\transformations\abs\InlineTransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the inline transformation for image png
  *
diff --git a/libraries/plugins/transformations/output/Text_Octetstream_Sql.php b/libraries/plugins/transformations/output/Text_Octetstream_Sql.php
index bf40645579..81d8997acb 100644
--- a/libraries/plugins/transformations/output/Text_Octetstream_Sql.php
+++ b/libraries/plugins/transformations/output/Text_Octetstream_Sql.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\output;
 
 use PMA\libraries\plugins\transformations\abs\SQLTransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the sql transformation for blob data
  *
diff --git a/libraries/plugins/transformations/output/Text_Plain_Binarytoip.php b/libraries/plugins/transformations/output/Text_Plain_Binarytoip.php
index a35d6ad00b..94e6f088c6 100644
--- a/libraries/plugins/transformations/output/Text_Plain_Binarytoip.php
+++ b/libraries/plugins/transformations/output/Text_Plain_Binarytoip.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\output;
 
 use PMA\libraries\plugins\TransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the binary to IPv4/IPv6 transformation for text plain
  *
diff --git a/libraries/plugins/transformations/output/Text_Plain_Bool2Text.php b/libraries/plugins/transformations/output/Text_Plain_Bool2Text.php
index a937c1b8a7..3611419494 100644
--- a/libraries/plugins/transformations/output/Text_Plain_Bool2Text.php
+++ b/libraries/plugins/transformations/output/Text_Plain_Bool2Text.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\output;
 
 use PMA\libraries\plugins\transformations\abs\Bool2TextTransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the Boolean to Text transformation for text plain.
  * Has one option: the output format (default 'T/F')
diff --git a/libraries/plugins/transformations/output/Text_Plain_Dateformat.php b/libraries/plugins/transformations/output/Text_Plain_Dateformat.php
index c6a7ca8521..9590499328 100644
--- a/libraries/plugins/transformations/output/Text_Plain_Dateformat.php
+++ b/libraries/plugins/transformations/output/Text_Plain_Dateformat.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\output;
 
 use PMA\libraries\plugins\transformations\abs\DateFormatTransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the date format transformation for text plain
  *
diff --git a/libraries/plugins/transformations/output/Text_Plain_External.php b/libraries/plugins/transformations/output/Text_Plain_External.php
index 8be89192a8..1b8eb4c8fc 100644
--- a/libraries/plugins/transformations/output/Text_Plain_External.php
+++ b/libraries/plugins/transformations/output/Text_Plain_External.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\output;
 
 use PMA\libraries\plugins\transformations\abs\ExternalTransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the external transformation for text plain
  *
diff --git a/libraries/plugins/transformations/output/Text_Plain_Formatted.php b/libraries/plugins/transformations/output/Text_Plain_Formatted.php
index def6cb7a57..dbe1c53415 100644
--- a/libraries/plugins/transformations/output/Text_Plain_Formatted.php
+++ b/libraries/plugins/transformations/output/Text_Plain_Formatted.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\output;
 
 use PMA\libraries\plugins\transformations\abs\FormattedTransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the formatted transformation for text plain
  *
diff --git a/libraries/plugins/transformations/output/Text_Plain_Imagelink.php b/libraries/plugins/transformations/output/Text_Plain_Imagelink.php
index c36c1a74f0..122d3cc1fc 100644
--- a/libraries/plugins/transformations/output/Text_Plain_Imagelink.php
+++ b/libraries/plugins/transformations/output/Text_Plain_Imagelink.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\plugins\transformations\output;
 
 use PMA\libraries\plugins\transformations\abs\TextImageLinkTransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the image link transformation for text plain
  *
diff --git a/libraries/plugins/transformations/output/Text_Plain_Json.php b/libraries/plugins/transformations/output/Text_Plain_Json.php
index a7523a79ef..2e4c4c6629 100644
--- a/libraries/plugins/transformations/output/Text_Plain_Json.php
+++ b/libraries/plugins/transformations/output/Text_Plain_Json.php
@@ -12,10 +12,6 @@ use PMA;
 use PMA\libraries\plugins\TransformationsPlugin;
 use PMA\libraries\Response;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the json transformation for text plain
  *
diff --git a/libraries/plugins/transformations/output/Text_Plain_Sql.php b/libraries/plugins/transformations/output/Text_Plain_Sql.php
index 369f072b9c..71b1b5d88c 100644
--- a/libraries/plugins/transformations/output/Text_Plain_Sql.php
+++ b/libraries/plugins/transformations/output/Text_Plain_Sql.php
@@ -11,10 +11,6 @@ namespace PMA\libraries\plugins\transformations\output;
 use PMA\libraries\Response;
 use PMA\libraries\plugins\transformations\abs\SQLTransformationsPlugin;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the sql transformation for text plain
  *
diff --git a/libraries/plugins/transformations/output/Text_Plain_Xml.php b/libraries/plugins/transformations/output/Text_Plain_Xml.php
index 65ed6a9787..c670271444 100644
--- a/libraries/plugins/transformations/output/Text_Plain_Xml.php
+++ b/libraries/plugins/transformations/output/Text_Plain_Xml.php
@@ -12,10 +12,6 @@ use PMA;
 use PMA\libraries\plugins\TransformationsPlugin;
 use PMA\libraries\Response;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Handles the XML transformation for text plain
  *
diff --git a/libraries/properties/PropertyItem.php b/libraries/properties/PropertyItem.php
index 34d98e694d..40f910cea9 100644
--- a/libraries/properties/PropertyItem.php
+++ b/libraries/properties/PropertyItem.php
@@ -7,10 +7,6 @@
  */
 namespace PMA\libraries\properties;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Provides an interface for Property classes
  *
diff --git a/libraries/properties/options/OptionsPropertyGroup.php b/libraries/properties/options/OptionsPropertyGroup.php
index 78e16d8920..d07d655efc 100644
--- a/libraries/properties/options/OptionsPropertyGroup.php
+++ b/libraries/properties/options/OptionsPropertyGroup.php
@@ -7,12 +7,6 @@
  */
 namespace PMA\libraries\properties\options;
 
-use PMA\libraries\properties\options\OptionsPropertyItem;
-
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Parents group property items and provides methods to manage groups of
  * properties.
diff --git a/libraries/properties/options/OptionsPropertyItem.php b/libraries/properties/options/OptionsPropertyItem.php
index 39290e8ab8..d8b3f587af 100644
--- a/libraries/properties/options/OptionsPropertyItem.php
+++ b/libraries/properties/options/OptionsPropertyItem.php
@@ -10,10 +10,6 @@ namespace PMA\libraries\properties\options;
 
 use PMA\libraries\properties\PropertyItem;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Superclass for
  *  - PMA\libraries\properties\options\OptionsPropertyOneItem and
diff --git a/libraries/properties/options/OptionsPropertyOneItem.php b/libraries/properties/options/OptionsPropertyOneItem.php
index 34ab1cb827..7a17472075 100644
--- a/libraries/properties/options/OptionsPropertyOneItem.php
+++ b/libraries/properties/options/OptionsPropertyOneItem.php
@@ -7,12 +7,6 @@
  */
 namespace PMA\libraries\properties\options;
 
-use PMA\libraries\properties\options\OptionsPropertyItem;
-
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Parents only single property items (not groups).
  * Defines possible options and getters and setters for them.
diff --git a/libraries/properties/options/groups/OptionsPropertyMainGroup.php b/libraries/properties/options/groups/OptionsPropertyMainGroup.php
index 4b13514db2..0ff6124c9c 100644
--- a/libraries/properties/options/groups/OptionsPropertyMainGroup.php
+++ b/libraries/properties/options/groups/OptionsPropertyMainGroup.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\properties\options\groups;
 
 use PMA\libraries\properties\options\OptionsPropertyGroup;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Group property item class of type main
  *
diff --git a/libraries/properties/options/groups/OptionsPropertyRootGroup.php b/libraries/properties/options/groups/OptionsPropertyRootGroup.php
index 9cb16f1415..62a3c97606 100644
--- a/libraries/properties/options/groups/OptionsPropertyRootGroup.php
+++ b/libraries/properties/options/groups/OptionsPropertyRootGroup.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\properties\options\groups;
 
 use PMA\libraries\properties\options\OptionsPropertyGroup;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Group property item class of type root
  *
diff --git a/libraries/properties/options/groups/OptionsPropertySubgroup.php b/libraries/properties/options/groups/OptionsPropertySubgroup.php
index 5ea9878fd4..d8120552ec 100644
--- a/libraries/properties/options/groups/OptionsPropertySubgroup.php
+++ b/libraries/properties/options/groups/OptionsPropertySubgroup.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\properties\options\groups;
 
 use PMA\libraries\properties\options\OptionsPropertyGroup;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Group property item class of type subgroup
  *
diff --git a/libraries/properties/options/items/BoolPropertyItem.php b/libraries/properties/options/items/BoolPropertyItem.php
index ad5e106a6c..c4315a8fbf 100644
--- a/libraries/properties/options/items/BoolPropertyItem.php
+++ b/libraries/properties/options/items/BoolPropertyItem.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\properties\options\items;
 
 use PMA\libraries\properties\options\OptionsPropertyOneItem;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Single property item class of type bool
  *
diff --git a/libraries/properties/options/items/DocPropertyItem.php b/libraries/properties/options/items/DocPropertyItem.php
index 8d38d1dc33..09399f34e9 100644
--- a/libraries/properties/options/items/DocPropertyItem.php
+++ b/libraries/properties/options/items/DocPropertyItem.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\properties\options\items;
 
 use PMA\libraries\properties\options\OptionsPropertyOneItem;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Single property item class of type doc
  *
diff --git a/libraries/properties/options/items/HiddenPropertyItem.php b/libraries/properties/options/items/HiddenPropertyItem.php
index 95df74b06d..7a8ac777ec 100644
--- a/libraries/properties/options/items/HiddenPropertyItem.php
+++ b/libraries/properties/options/items/HiddenPropertyItem.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\properties\options\items;
 
 use PMA\libraries\properties\options\OptionsPropertyOneItem;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Single property item class of type hidden
  *
diff --git a/libraries/properties/options/items/MessageOnlyPropertyItem.php b/libraries/properties/options/items/MessageOnlyPropertyItem.php
index 30277d6768..ada4a112a4 100644
--- a/libraries/properties/options/items/MessageOnlyPropertyItem.php
+++ b/libraries/properties/options/items/MessageOnlyPropertyItem.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\properties\options\items;
 
 use PMA\libraries\properties\options\OptionsPropertyOneItem;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Single property item class of type messageOnly
  *
diff --git a/libraries/properties/options/items/NumberPropertyItem.php b/libraries/properties/options/items/NumberPropertyItem.php
index 397c3271d7..0c11ca523f 100644
--- a/libraries/properties/options/items/NumberPropertyItem.php
+++ b/libraries/properties/options/items/NumberPropertyItem.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\properties\options\items;
 
 use PMA\libraries\properties\options\OptionsPropertyOneItem;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Single property item class of type number
  *
diff --git a/libraries/properties/options/items/RadioPropertyItem.php b/libraries/properties/options/items/RadioPropertyItem.php
index b8b6b909ea..5ec02b27e7 100644
--- a/libraries/properties/options/items/RadioPropertyItem.php
+++ b/libraries/properties/options/items/RadioPropertyItem.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\properties\options\items;
 
 use PMA\libraries\properties\options\OptionsPropertyOneItem;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Single property item class of type radio
  *
diff --git a/libraries/properties/options/items/SelectPropertyItem.php b/libraries/properties/options/items/SelectPropertyItem.php
index 5c7db28197..e09ee3e9a3 100644
--- a/libraries/properties/options/items/SelectPropertyItem.php
+++ b/libraries/properties/options/items/SelectPropertyItem.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\properties\options\items;
 
 use PMA\libraries\properties\options\OptionsPropertyOneItem;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Single property item class of type select
  *
diff --git a/libraries/properties/options/items/TextPropertyItem.php b/libraries/properties/options/items/TextPropertyItem.php
index 6960da62f3..98143b5fab 100644
--- a/libraries/properties/options/items/TextPropertyItem.php
+++ b/libraries/properties/options/items/TextPropertyItem.php
@@ -9,10 +9,6 @@ namespace PMA\libraries\properties\options\items;
 
 use PMA\libraries\properties\options\OptionsPropertyOneItem;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Single property item class of type text
  *
diff --git a/libraries/properties/plugins/ExportPluginProperties.php b/libraries/properties/plugins/ExportPluginProperties.php
index c76b546197..44914629b9 100644
--- a/libraries/properties/plugins/ExportPluginProperties.php
+++ b/libraries/properties/plugins/ExportPluginProperties.php
@@ -7,10 +7,6 @@
  */
 namespace PMA\libraries\properties\plugins;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Defines possible options and getters and setters for them.
  *
diff --git a/libraries/properties/plugins/ImportPluginProperties.php b/libraries/properties/plugins/ImportPluginProperties.php
index 3c06a63db4..afb82e1d79 100644
--- a/libraries/properties/plugins/ImportPluginProperties.php
+++ b/libraries/properties/plugins/ImportPluginProperties.php
@@ -7,12 +7,6 @@
  */
 namespace PMA\libraries\properties\plugins;
 
-use PMA\libraries\properties\plugins\PluginPropertyItem;
-
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Defines possible options and getters and setters for them.
  *
diff --git a/libraries/properties/plugins/PluginPropertyItem.php b/libraries/properties/plugins/PluginPropertyItem.php
index 3f865db9e0..0fc0cdc0fc 100644
--- a/libraries/properties/plugins/PluginPropertyItem.php
+++ b/libraries/properties/plugins/PluginPropertyItem.php
@@ -11,10 +11,6 @@ namespace PMA\libraries\properties\plugins;
 use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
 use PMA\libraries\properties\PropertyItem;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Superclass for
  *  - PMA\libraries\properties\plugins\ExportPluginProperties,
diff --git a/libraries/properties/plugins/SchemaPluginProperties.php b/libraries/properties/plugins/SchemaPluginProperties.php
index 2eac568d3d..7aba43c413 100644
--- a/libraries/properties/plugins/SchemaPluginProperties.php
+++ b/libraries/properties/plugins/SchemaPluginProperties.php
@@ -7,10 +7,6 @@
  */
 namespace PMA\libraries\properties\plugins;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Defines possible options and getters and setters for them.
  *
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index b4dade2a45..1b188767cf 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -10,10 +10,6 @@ use PMA\libraries\Table;
 use PMA\libraries\RecentFavoriteTable;
 use SqlParser\Statements\CreateStatement;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Executes a query as controluser if possible, otherwise as normal user
  *
diff --git a/libraries/relation_cleanup.lib.php b/libraries/relation_cleanup.lib.php
index 18514162e6..e5502acc9b 100644
--- a/libraries/relation_cleanup.lib.php
+++ b/libraries/relation_cleanup.lib.php
@@ -5,9 +5,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Cleanup column related relation stuff
diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index 5f112fc33d..52d4603013 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -7,10 +7,6 @@
  */
 use PMA\libraries\Message;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * returns HTML for error message
  *
diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php
index 7ebf5b9baa..a2d3eb3285 100644
--- a/libraries/sanitizing.lib.php
+++ b/libraries/sanitizing.lib.php
@@ -5,9 +5,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Checks whether given link is valid
diff --git a/libraries/select_lang.inc.php b/libraries/select_lang.inc.php
new file mode 100644
index 0000000000..484c3a4182
--- /dev/null
+++ b/libraries/select_lang.inc.php
@@ -0,0 +1,164 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * phpMyAdmin Language Loading File
+ *
+ * @package PhpMyAdmin
+ */
+
+require_once 'libraries/select_lang.lib.php';
+
+/**
+ * @global string  path to the translations directory;
+ *                 may be absent if the kit is English-only
+ */
+$GLOBALS['lang_path'] = './locale/';
+
+/**
+ * Load gettext functions.
+ */
+require_once GETTEXT_INC;
+
+/**
+ * @global string  interface language
+ */
+$GLOBALS['lang'] = 'en';
+/**
+ * @global boolean whether loading lang from cfg failed
+ */
+$GLOBALS['lang_failed_cfg'] = false;
+/**
+ * @global boolean whether loading lang from cookie failed
+ */
+$GLOBALS['lang_failed_cookie'] = false;
+/**
+ * @global boolean whether loading lang from user request failed
+ */
+$GLOBALS['lang_failed_request'] = false;
+/**
+ * @global string text direction ltr or rtl
+ */
+$GLOBALS['text_dir'] = 'ltr';
+
+/**
+ * @global array supported languages
+ */
+$GLOBALS['available_languages'] = PMA_langList();
+
+// Language filtering support
+if (! empty($GLOBALS['cfg']['FilterLanguages'])) {
+    $new_lang = array();
+    foreach ($GLOBALS['available_languages'] as $key => $val) {
+        if (preg_match('@' . $GLOBALS['cfg']['FilterLanguages'] . '@', $key)) {
+            $new_lang[$key] = $val;
+        }
+    }
+    if (count($new_lang) > 0) {
+        $GLOBALS['available_languages'] = $new_lang;
+    }
+    unset($key, $val, $new_lang);
+}
+
+/**
+ * @global array MySQL charsets map
+ */
+$GLOBALS['mysql_charset_map'] = array(
+    'big5'         => 'big5',
+    'cp-866'       => 'cp866',
+    'euc-jp'       => 'ujis',
+    'euc-kr'       => 'euckr',
+    'gb2312'       => 'gb2312',
+    'gbk'          => 'gbk',
+    'iso-8859-1'   => 'latin1',
+    'iso-8859-2'   => 'latin2',
+    'iso-8859-7'   => 'greek',
+    'iso-8859-8'   => 'hebrew',
+    'iso-8859-8-i' => 'hebrew',
+    'iso-8859-9'   => 'latin5',
+    'iso-8859-13'  => 'latin7',
+    'iso-8859-15'  => 'latin1',
+    'koi8-r'       => 'koi8r',
+    'shift_jis'    => 'sjis',
+    'tis-620'      => 'tis620',
+    'utf-8'        => 'utf8',
+    'windows-1250' => 'cp1250',
+    'windows-1251' => 'cp1251',
+    'windows-1252' => 'latin1',
+    'windows-1256' => 'cp1256',
+    'windows-1257' => 'cp1257',
+);
+
+/*
+ * Do the work!
+ */
+
+if (! PMA_langCheck()) {
+    // fallback language
+    $fall_back_lang = 'en';
+    $line = __LINE__;
+    if (! PMA_langSet($fall_back_lang)) {
+        trigger_error(
+            'phpMyAdmin-ERROR: invalid lang code: '
+            . __FILE__ . '#' . $line . ', check hard coded fall back language.',
+            E_USER_WARNING
+        );
+        // stop execution
+        // and tell the user that his chosen language is invalid
+        PMA_fatalError(
+            'Could not load any language, '
+            . 'please check your language settings and folder.'
+        );
+    }
+}
+
+// Set locale
+_setlocale(LC_MESSAGES, $GLOBALS['lang']);
+_bindtextdomain('phpmyadmin', $GLOBALS['lang_path']);
+_bind_textdomain_codeset('phpmyadmin', 'UTF-8');
+_textdomain('phpmyadmin');
+
+/**
+ * Messages for phpMyAdmin.
+ *
+ * These messages are here for easy transition to Gettext.
+ * You should not add any messages here, use instead gettext directly
+ * in your template/PHP file.
+ */
+
+if (! function_exists('__')) {
+    PMA_fatalError('Bad invocation!');
+}
+
+/* Text direction for language */
+if (in_array($GLOBALS['lang'], array('ar', 'fa', 'he', 'ur'))) {
+    $GLOBALS['text_dir'] = 'rtl';
+} else {
+    $GLOBALS['text_dir'] = 'ltr';
+}
+
+/* TCPDF */
+$GLOBALS['l'] = array();
+
+/* TCPDF settings */
+$GLOBALS['l']['a_meta_charset'] = 'UTF-8';
+$GLOBALS['l']['a_meta_dir'] = $GLOBALS['text_dir'];
+$GLOBALS['l']['a_meta_language'] = $GLOBALS['lang'];
+
+/* TCPDF translations */
+$GLOBALS['l']['w_page'] = __('Page number:');
+
+
+// now, that we have loaded the language strings we can send the errors
+if ($GLOBALS['lang_failed_cfg']
+    || $GLOBALS['lang_failed_cookie']
+    || $GLOBALS['lang_failed_request']
+) {
+    trigger_error(
+        __('Ignoring unsupported language code.'),
+        E_USER_ERROR
+    );
+}
+unset(
+    $line, $fall_back_lang, $GLOBALS['lang_failed_cfg'],
+    $GLOBALS['lang_failed_cookie'], $GLOBALS['lang_failed_request']
+);
diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index 02305139bf..8ce3e50e5d 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -5,9 +5,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Returns language name
@@ -466,158 +463,3 @@ function PMA_langList()
 
     return $result;
 }
-
-/**
- * @global string  path to the translations directory;
- *                 may be absent if the kit is English-only
- */
-$GLOBALS['lang_path'] = './locale/';
-
-/**
- * Load gettext functions.
- */
-require_once GETTEXT_INC;
-
-/**
- * @global string  interface language
- */
-$GLOBALS['lang'] = 'en';
-/**
- * @global boolean whether loading lang from cfg failed
- */
-$GLOBALS['lang_failed_cfg'] = false;
-/**
- * @global boolean whether loading lang from cookie failed
- */
-$GLOBALS['lang_failed_cookie'] = false;
-/**
- * @global boolean whether loading lang from user request failed
- */
-$GLOBALS['lang_failed_request'] = false;
-/**
- * @global string text direction ltr or rtl
- */
-$GLOBALS['text_dir'] = 'ltr';
-
-/**
- * @global array supported languages
- */
-$GLOBALS['available_languages'] = PMA_langList();
-
-// Language filtering support
-if (! empty($GLOBALS['cfg']['FilterLanguages'])) {
-    $new_lang = array();
-    foreach ($GLOBALS['available_languages'] as $key => $val) {
-        if (preg_match('@' . $GLOBALS['cfg']['FilterLanguages'] . '@', $key)) {
-            $new_lang[$key] = $val;
-        }
-    }
-    if (count($new_lang) > 0) {
-        $GLOBALS['available_languages'] = $new_lang;
-    }
-    unset($key, $val, $new_lang);
-}
-
-/**
- * @global array MySQL charsets map
- */
-$GLOBALS['mysql_charset_map'] = array(
-    'big5'         => 'big5',
-    'cp-866'       => 'cp866',
-    'euc-jp'       => 'ujis',
-    'euc-kr'       => 'euckr',
-    'gb2312'       => 'gb2312',
-    'gbk'          => 'gbk',
-    'iso-8859-1'   => 'latin1',
-    'iso-8859-2'   => 'latin2',
-    'iso-8859-7'   => 'greek',
-    'iso-8859-8'   => 'hebrew',
-    'iso-8859-8-i' => 'hebrew',
-    'iso-8859-9'   => 'latin5',
-    'iso-8859-13'  => 'latin7',
-    'iso-8859-15'  => 'latin1',
-    'koi8-r'       => 'koi8r',
-    'shift_jis'    => 'sjis',
-    'tis-620'      => 'tis620',
-    'utf-8'        => 'utf8',
-    'windows-1250' => 'cp1250',
-    'windows-1251' => 'cp1251',
-    'windows-1252' => 'latin1',
-    'windows-1256' => 'cp1256',
-    'windows-1257' => 'cp1257',
-);
-
-/*
- * Do the work!
- */
-
-if (! PMA_langCheck()) {
-    // fallback language
-    $fall_back_lang = 'en';
-    $line = __LINE__;
-    if (! PMA_langSet($fall_back_lang)) {
-        trigger_error(
-            'phpMyAdmin-ERROR: invalid lang code: '
-            . __FILE__ . '#' . $line . ', check hard coded fall back language.',
-            E_USER_WARNING
-        );
-        // stop execution
-        // and tell the user that his chosen language is invalid
-        PMA_fatalError(
-            'Could not load any language, '
-            . 'please check your language settings and folder.'
-        );
-    }
-}
-
-// Set locale
-_setlocale(LC_MESSAGES, $GLOBALS['lang']);
-_bindtextdomain('phpmyadmin', $GLOBALS['lang_path']);
-_bind_textdomain_codeset('phpmyadmin', 'UTF-8');
-_textdomain('phpmyadmin');
-
-/**
- * Messages for phpMyAdmin.
- *
- * These messages are here for easy transition to Gettext.
- * You should not add any messages here, use instead gettext directly
- * in your template/PHP file.
- */
-
-if (! function_exists('__')) {
-    PMA_fatalError('Bad invocation!');
-}
-
-/* Text direction for language */
-if (in_array($GLOBALS['lang'], array('ar', 'fa', 'he', 'ur'))) {
-    $GLOBALS['text_dir'] = 'rtl';
-} else {
-    $GLOBALS['text_dir'] = 'ltr';
-}
-
-/* TCPDF */
-$GLOBALS['l'] = array();
-
-/* TCPDF settings */
-$GLOBALS['l']['a_meta_charset'] = 'UTF-8';
-$GLOBALS['l']['a_meta_dir'] = $GLOBALS['text_dir'];
-$GLOBALS['l']['a_meta_language'] = $GLOBALS['lang'];
-
-/* TCPDF translations */
-$GLOBALS['l']['w_page'] = __('Page number:');
-
-
-// now, that we have loaded the language strings we can send the errors
-if ($GLOBALS['lang_failed_cfg']
-    || $GLOBALS['lang_failed_cookie']
-    || $GLOBALS['lang_failed_request']
-) {
-    trigger_error(
-        __('Ignoring unsupported language code.'),
-        E_USER_ERROR
-    );
-}
-unset(
-    $line, $fall_back_lang, $GLOBALS['lang_failed_cfg'],
-    $GLOBALS['lang_failed_cookie'], $GLOBALS['lang_failed_request']
-);
diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php
index 82dd149fdc..63e1a69029 100644
--- a/libraries/select_server.lib.php
+++ b/libraries/select_server.lib.php
@@ -5,9 +5,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Renders the server selection in list or selectbox form, or option tags only
diff --git a/libraries/server_bin_log.lib.php b/libraries/server_bin_log.lib.php
index d419fe6142..7fd7920683 100644
--- a/libraries/server_bin_log.lib.php
+++ b/libraries/server_bin_log.lib.php
@@ -1,6 +1,5 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
  * functions for displaying server binary log
  *
@@ -11,10 +10,6 @@
 use PMA\libraries\Message;
 use PMA\libraries\Util;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Returns the html for log selector.
  *
diff --git a/libraries/server_common.lib.php b/libraries/server_common.lib.php
index de0ed4fbdc..7e3a2ca94c 100644
--- a/libraries/server_common.lib.php
+++ b/libraries/server_common.lib.php
@@ -5,9 +5,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Returns the html for the sub-page heading
diff --git a/libraries/server_engines.lib.php b/libraries/server_engines.lib.php
index 1477b80fd1..e37810ccb6 100644
--- a/libraries/server_engines.lib.php
+++ b/libraries/server_engines.lib.php
@@ -1,6 +1,5 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
  * functions for displaying server engines
  *
@@ -10,10 +9,6 @@
  */
 use PMA\libraries\StorageEngine;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * setup HTML for server Engines information
  *
diff --git a/libraries/server_plugins.lib.php b/libraries/server_plugins.lib.php
index 80ddc4ba37..0f2ec9a08d 100644
--- a/libraries/server_plugins.lib.php
+++ b/libraries/server_plugins.lib.php
@@ -1,6 +1,5 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
  * functions for displaying server plugins
  *
@@ -8,9 +7,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Returns the common SQL used to retrieve plugin data
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 2d4e9cc02e..b64f120b60 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -5,16 +5,11 @@
  *
  * @package PhpMyAdmin
  */
-
 use PMA\libraries\DatabaseInterface;
 use PMA\libraries\Message;
 use PMA\libraries\Template;
 use PMA\libraries\Util;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Get Html for User Group Dialog
  *
diff --git a/libraries/server_status.lib.php b/libraries/server_status.lib.php
index b906a64ee1..b126bfd784 100644
--- a/libraries/server_status.lib.php
+++ b/libraries/server_status.lib.php
@@ -1,6 +1,5 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
  * functions for displaying server status
  *
@@ -10,10 +9,6 @@
  */
 use PMA\libraries\ServerStatusData;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Prints server status information: processes, connections and traffic
  *
diff --git a/libraries/server_status_advisor.lib.php b/libraries/server_status_advisor.lib.php
index 46644f5c0e..f78577bd34 100644
--- a/libraries/server_status_advisor.lib.php
+++ b/libraries/server_status_advisor.lib.php
@@ -1,6 +1,5 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
  * functions for displaying server status sub item: advisor
  *
@@ -8,9 +7,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Returns html with PMA\libraries\Advisor
diff --git a/libraries/server_status_monitor.lib.php b/libraries/server_status_monitor.lib.php
index 03a2283c10..75623c1a82 100644
--- a/libraries/server_status_monitor.lib.php
+++ b/libraries/server_status_monitor.lib.php
@@ -1,6 +1,5 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
  * functions for displaying server status sub item: monitor
  *
@@ -11,10 +10,6 @@
 use PMA\libraries\ServerStatusData;
 use PMA\libraries\Util;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Prints html with monitor
  *
diff --git a/libraries/server_status_processes.lib.php b/libraries/server_status_processes.lib.php
index 4bf0844021..460c2a8dd7 100644
--- a/libraries/server_status_processes.lib.php
+++ b/libraries/server_status_processes.lib.php
@@ -1,6 +1,5 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
  * functions for displaying processes list
  *
@@ -12,10 +11,6 @@ use PMA\libraries\Message;
 use PMA\libraries\ServerStatusData;
 use PMA\libraries\Util;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Prints html for auto refreshing processes list
  *
diff --git a/libraries/server_status_queries.lib.php b/libraries/server_status_queries.lib.php
index b8f62c87fe..b81f90679e 100644
--- a/libraries/server_status_queries.lib.php
+++ b/libraries/server_status_queries.lib.php
@@ -1,6 +1,5 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
  * functions for displaying query statistics for the server
  *
@@ -10,10 +9,6 @@
  */
 use PMA\libraries\ServerStatusData;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Returns the html content for the query statistics
  *
diff --git a/libraries/server_status_variables.lib.php b/libraries/server_status_variables.lib.php
index 467458f72f..55495f5af3 100644
--- a/libraries/server_status_variables.lib.php
+++ b/libraries/server_status_variables.lib.php
@@ -1,6 +1,5 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
  * functions for displaying server status variables
  *
@@ -10,10 +9,6 @@
  */
 use PMA\libraries\ServerStatusData;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Returns the html for the list filter
  *
diff --git a/libraries/server_user_groups.lib.php b/libraries/server_user_groups.lib.php
index 6d38601105..293655a40b 100644
--- a/libraries/server_user_groups.lib.php
+++ b/libraries/server_user_groups.lib.php
@@ -6,10 +6,6 @@
  * @package PhpMyAdmin
  */
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Return HTML to list the users belonging to a given user group
  *
diff --git a/libraries/server_users.lib.php b/libraries/server_users.lib.php
index 09b72d7818..a903173499 100644
--- a/libraries/server_users.lib.php
+++ b/libraries/server_users.lib.php
@@ -6,10 +6,6 @@
  * @package PhpMyAdmin
  */
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Get HTML for secondary level menu tabs on 'Users' page
  *
diff --git a/libraries/session.inc.php b/libraries/session.inc.php
index fcd4507094..70a177b916 100644
--- a/libraries/session.inc.php
+++ b/libraries/session.inc.php
@@ -114,21 +114,4 @@ if (! isset($_SESSION[' PMA_token '])) {
     $_SESSION[' PMA_token '] = md5(uniqid(rand(), true));
 }
 
-/**
- * tries to secure session from hijacking and fixation
- * should be called before login and after successful login
- * (only required if sensitive information stored in session)
- *
- * @return void
- */
-function PMA_secureSession()
-{
-    // prevent session fixation and XSS
-    // (better to use session_status() if available)
-    if ((PMA_PHP_INT_VERSION >= 50400 && session_status() === PHP_SESSION_ACTIVE)
-        || (PMA_PHP_INT_VERSION < 50400 && session_id() !== '')
-    ) {
-        session_regenerate_id(true);
-    }
-    $_SESSION[' PMA_token '] = md5(uniqid(rand(), true));
-}
+require_once 'libraries/session.lib.php';
\ No newline at end of file
diff --git a/libraries/session.lib.php b/libraries/session.lib.php
new file mode 100644
index 0000000000..c4925c454f
--- /dev/null
+++ b/libraries/session.lib.php
@@ -0,0 +1,26 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * session library
+ *
+ * @package PhpMyAdmin
+ */
+
+/**
+ * tries to secure session from hijacking and fixation
+ * should be called before login and after successful login
+ * (only required if sensitive information stored in session)
+ *
+ * @return void
+ */
+function PMA_secureSession()
+{
+    // prevent session fixation and XSS
+    // (better to use session_status() if available)
+    if ((PMA_PHP_INT_VERSION >= 50400 && session_status() === PHP_SESSION_ACTIVE)
+        || (PMA_PHP_INT_VERSION < 50400 && session_id() !== '')
+    ) {
+        session_regenerate_id(true);
+    }
+    $_SESSION[' PMA_token '] = md5(uniqid(rand(), true));
+}
diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php
index cff550b9a4..661201ad03 100644
--- a/libraries/sql.lib.php
+++ b/libraries/sql.lib.php
@@ -10,10 +10,6 @@ use PMA\libraries\Message;
 use PMA\libraries\Table;
 use PMA\libraries\Response;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Parses and analyzes the given SQL query.
  *
diff --git a/test/classes/DatabaseInterfaceTest.php b/test/classes/DatabaseInterfaceTest.php
index d640867b73..be7fc0fcfd 100644
--- a/test/classes/DatabaseInterfaceTest.php
+++ b/test/classes/DatabaseInterfaceTest.php
@@ -6,11 +6,6 @@
  * @package PhpMyAdmin-test
  */
 
-/*
- * Include to test.
- */
-require_once 'libraries/dbi/DBIDummy.php';
-
 /**
  * Tests basic functionality of dummy dbi driver
  *
@@ -28,8 +23,8 @@ class DatabaseInterfaceTest extends PHPUnit_Framework_TestCase
      */
     function setup()
     {
-        //$extension = new DBIDummy();
-        $extension = $this->getMockBuilder('DBIDummy')
+        //$extension = new PMA\libraries\dbi\DBIDummy();
+        $extension = $this->getMockBuilder('PMA\libraries\dbi\DBIDummy')
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/test/classes/HeaderTest.php b/test/classes/HeaderTest.php
index 3d32fa5a5a..c9bca3ef5d 100644
--- a/test/classes/HeaderTest.php
+++ b/test/classes/HeaderTest.php
@@ -16,7 +16,7 @@ require_once 'libraries/core.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/vendor_config.php';
-require_once 'libraries/select_lang.lib.php';
+require_once 'libraries/select_lang.inc.php';
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/js_escape.lib.php';
 
diff --git a/test/classes/MenuTest.php b/test/classes/MenuTest.php
index b96130052e..476b0bb3fb 100644
--- a/test/classes/MenuTest.php
+++ b/test/classes/MenuTest.php
@@ -17,7 +17,7 @@ require_once 'libraries/core.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/vendor_config.php';
-require_once 'libraries/select_lang.lib.php';
+require_once 'libraries/select_lang.inc.php';
 require_once 'libraries/relation.lib.php';
 
 /**
diff --git a/test/classes/plugin/auth/AuthenticationCookieTest.php b/test/classes/plugin/auth/AuthenticationCookieTest.php
index 14eb83dc55..e61fd75676 100644
--- a/test/classes/plugin/auth/AuthenticationCookieTest.php
+++ b/test/classes/plugin/auth/AuthenticationCookieTest.php
@@ -16,7 +16,7 @@ require_once 'libraries/config.default.php';
 require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/select_lang.lib.php';
+require_once 'libraries/select_lang.inc.php';
 require_once 'libraries/plugins/auth/AuthenticationCookie.php';
 
 /**
diff --git a/test/libraries/common/PMA_checkParameters_test.php b/test/libraries/common/PMA_checkParameters_test.php
index e77b39e793..1e73e60541 100644
--- a/test/libraries/common/PMA_checkParameters_test.php
+++ b/test/libraries/common/PMA_checkParameters_test.php
@@ -16,7 +16,7 @@ require_once 'libraries/core.lib.php';
 
 
 
-require_once 'libraries/select_lang.lib.php';
+require_once 'libraries/select_lang.inc.php';
 require_once 'libraries/sanitizing.lib.php';
 
 /**
diff --git a/test/libraries/core/PMA_fatalError_test.php b/test/libraries/core/PMA_fatalError_test.php
index bf14d8716d..757b9a003a 100644
--- a/test/libraries/core/PMA_fatalError_test.php
+++ b/test/libraries/core/PMA_fatalError_test.php
@@ -19,7 +19,7 @@ require_once 'libraries/vendor_config.php';
 require_once 'libraries/core.lib.php';
 
 require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/select_lang.lib.php';
+require_once 'libraries/select_lang.inc.php';
 require_once 'libraries/sanitizing.lib.php';
 
 require_once 'libraries/url_generating.lib.php';
diff --git a/test/libraries/core/PMA_getTableCount_test_dis.php b/test/libraries/core/PMA_getTableCount_test_dis.php
index 958a76f6e5..d64cbb0508 100644
--- a/test/libraries/core/PMA_getTableCount_test_dis.php
+++ b/test/libraries/core/PMA_getTableCount_test_dis.php
@@ -19,7 +19,7 @@ require_once 'libraries/core.lib.php';
 
 
 require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/select_lang.lib.php';
+require_once 'libraries/select_lang.inc.php';
 require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/config.default.php';
 
diff --git a/test/libraries/core/PMA_headerLocation_test.php b/test/libraries/core/PMA_headerLocation_test.php
index 68bd419b1b..b10c3f1988 100644
--- a/test/libraries/core/PMA_headerLocation_test.php
+++ b/test/libraries/core/PMA_headerLocation_test.php
@@ -15,7 +15,7 @@ use PMA\libraries\Theme;
 require_once 'libraries/vendor_config.php';
 require_once 'libraries/core.lib.php';
 require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/select_lang.lib.php';
+require_once 'libraries/select_lang.inc.php';
 require_once 'libraries/sanitizing.lib.php';
 
 require_once 'libraries/url_generating.lib.php';
diff --git a/test/libraries/core/PMA_warnMissingExtension_test.php b/test/libraries/core/PMA_warnMissingExtension_test.php
index 5c87fe7869..6c36a7ea32 100644
--- a/test/libraries/core/PMA_warnMissingExtension_test.php
+++ b/test/libraries/core/PMA_warnMissingExtension_test.php
@@ -14,7 +14,7 @@ use PMA\libraries\Theme;
 
 require_once 'libraries/vendor_config.php';
 require_once 'libraries/core.lib.php';
-require_once 'libraries/select_lang.lib.php';
+require_once 'libraries/select_lang.inc.php';
 
 
 
diff --git a/test/libraries/select_lang/PMA_langDetails_test.php b/test/libraries/select_lang/PMA_langDetails_test.php
index c6bb5c23ab..609cbe1404 100644
--- a/test/libraries/select_lang/PMA_langDetails_test.php
+++ b/test/libraries/select_lang/PMA_langDetails_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Test for PMA_langDetails from select_lang.lib.php
+ * Test for PMA_langDetails from select_lang.inc.php
  *
  * @package PhpMyAdmin-test
  * @group select_lang.lib-tests
@@ -10,10 +10,10 @@
 /*
  * Include to test.
  */
-require_once 'libraries/select_lang.lib.php';
+require_once 'libraries/select_lang.inc.php';
 
 /**
- * Test for PMA_langDetails from select_lang.lib.php
+ * Test for PMA_langDetails from select_lang.inc.php
  *
  * @package PhpMyAdmin-test
  * @group select_lang.lib-tests
diff --git a/test/libraries/select_lang/PMA_langList_test.php b/test/libraries/select_lang/PMA_langList_test.php
index 4f9e803e0a..98fc4f04ec 100644
--- a/test/libraries/select_lang/PMA_langList_test.php
+++ b/test/libraries/select_lang/PMA_langList_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Test for PMA_langList from select_lang.lib.php
+ * Test for PMA_langList from select_lang.inc.php
  *
  * @package PhpMyAdmin-test
  * @group select_lang.lib-tests
@@ -12,10 +12,10 @@
  */
 require_once 'libraries/core.lib.php';
 require_once 'libraries/vendor_config.php';
-require_once 'libraries/select_lang.lib.php';
+require_once 'libraries/select_lang.inc.php';
 
 /**
- * Test for PMA_langList from select_lang.lib.php
+ * Test for PMA_langList from select_lang.inc.php
  *
  * @package PhpMyAdmin-test
  * @group select_lang.lib-tests
diff --git a/test/libraries/select_lang/PMA_langName_test.php b/test/libraries/select_lang/PMA_langName_test.php
index 1aad721a8d..5cf727e967 100644
--- a/test/libraries/select_lang/PMA_langName_test.php
+++ b/test/libraries/select_lang/PMA_langName_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Test for PMA_languageName from select_lang.lib.php
+ * Test for PMA_languageName from select_lang.inc.php
  *
  * @package PhpMyAdmin-test
  * @group select_lang.lib-tests
@@ -10,10 +10,10 @@
 /*
  * Include to test.
  */
-require_once 'libraries/select_lang.lib.php';
+require_once 'libraries/select_lang.inc.php';
 
 /**
- * Test for PMA_languageName from select_lang.lib.php
+ * Test for PMA_languageName from select_lang.inc.php
  *
  * @package PhpMyAdmin-test
  * @group select_lang.lib-tests
diff --git a/test/libraries/select_lang/locale_gettext_test.php b/test/libraries/select_lang/locale_gettext_test.php
index 7d21b08e8c..08cbad1c6b 100644
--- a/test/libraries/select_lang/locale_gettext_test.php
+++ b/test/libraries/select_lang/locale_gettext_test.php
@@ -9,7 +9,7 @@
  * Include to test.
  */
 
-require_once 'libraries/select_lang.lib.php';
+require_once 'libraries/select_lang.inc.php';
 
 /**
  * Class for testing correctness of locales.