Fix merge conflicts

Signed-off-by: Marc Delisle <marc@infomarc.info>

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" />

libraries/DbQbe.php

@@ -7,10 +7,6 @@
  */
 namespace PMA\libraries;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Class to handle database QBE search
  *

libraries/advisor.lib.php

@@ -5,9 +5,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Formats interval like 10 per hour

libraries/autoloader.php

@@ -1,7 +1,6 @@
 <?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Run autoloader
+ * Load class autoloader
  *
  * @package PhpMyAdmin
  */

libraries/bookmark.lib.php

@@ -6,10 +6,6 @@
  * @package PhpMyAdmin
  */
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Defines the bookmark parameters for the current user
  *

libraries/browse_foreigners.lib.php

@@ -5,9 +5,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Function to get html for one relational key

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
  *

libraries/cleanup.lib.php

@@ -5,9 +5,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Removes all variables from request except whitelisted ones.

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') {

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
  *

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 {
 

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
   *

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.
  *

libraries/display_git_revision.lib.php

@@ -5,9 +5,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
 * Prints details about the current Git commit revision

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
  *

libraries/display_select_lang.lib.php

@@ -5,9 +5,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Compares the names of two languages.

libraries/engines/Bdb.php

@@ -9,10 +9,6 @@ namespace PMA\libraries\engines;
 
 use PMA\libraries\StorageEngine;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The BDB storage engine
  *

libraries/engines/Berkeleydb.php

@@ -7,10 +7,6 @@
  */
 namespace PMA\libraries\engines;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * This is same as BDB
  *

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
  *

libraries/engines/Innobase.php

@@ -7,10 +7,6 @@
  */
 namespace PMA\libraries\engines;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The Innobase storage engine
  *

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
  *

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
  *

libraries/engines/Merge.php

@@ -9,10 +9,6 @@ namespace PMA\libraries\engines;
 
 use PMA\libraries\StorageEngine;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The MERGE storage engine
  *

libraries/engines/Mrg_Myisam.php

@@ -7,10 +7,6 @@
  */
 namespace PMA\libraries\engines;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The MERGE storage engine
  *

libraries/engines/Myisam.php

@@ -9,10 +9,6 @@ namespace PMA\libraries\engines;
 
 use PMA\libraries\StorageEngine;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The MyISAM storage engine
  *

libraries/engines/Ndbcluster.php

@@ -9,10 +9,6 @@ namespace PMA\libraries\engines;
 
 use PMA\libraries\StorageEngine;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The NDBCLUSTER storage engine
  *

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
  *

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
  *

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
  *

libraries/file_listing.lib.php

@@ -5,9 +5,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Returns array of filtered file names

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.
  *

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.
  *

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
  *

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
  *

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
  *

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
  *

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
  *

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
  *

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
  *

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';
 
 /**

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

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
  *

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

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

libraries/logging.lib.php

@@ -7,9 +7,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Logs user information to webserver logs.

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.

libraries/mult_submits.lib.php

@@ -7,9 +7,6 @@
  *
  * @package PhpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
 
 /**
  * Gets url params

libraries/mysql_charsets.lib.php

@@ -7,10 +7,6 @@
  */
 use PMA\libraries\Util;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Generate charset dropdown box
  *

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
  *

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
  *

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
  *

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
  *

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

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
  *

libraries/plugins/auth/swekey/swekey.auth.lib.php

@@ -8,10 +8,6 @@
 
 use PMA\libraries\Message;
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Checks Swekey authentication.
  *

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
  *

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
  *

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.
  */

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';
 

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
  *

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.
  */

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

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

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

libraries/plugins/schema/RelationStats.php

@@ -7,10 +7,6 @@
  */
 namespace PMA\libraries\plugins\schema;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Relations preferences/statistics
  *

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
  *

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
  *

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
  *

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
  *

libraries/plugins/schema/TableStats.php

@@ -9,10 +9,6 @@ namespace PMA\libraries\plugins\schema;
 
 use PMA;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Table preferences/statistics
  *

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
  *

libraries/plugins/schema/dia/RelationStatsDia.php

@@ -7,10 +7,6 @@
  */
 namespace PMA\libraries\plugins\schema\dia;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Relation preferences/statistics
  *

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
  *

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
  *

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
  *

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
  *

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.
  */

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.
  */

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
  *

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
  *

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
  *

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

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
  *

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
  *

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
  *

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 '')

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
  *

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.
  *

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
  *

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.
  *

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.
  *

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.
  *

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.
  *

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.
  *

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.
  *

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.
  *

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.
  *

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.

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.
  *