Merge pull request #13433 from mauriciofauth/classes

Move classes to PhpMyAdmin namespace

libraries/classes/File.php

@@ -11,7 +11,7 @@ use PMA\libraries\config\ConfigFile;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Message;
 use PMA\libraries\Util;
-use PMA\libraries\ZipExtension;
+use PhpMyAdmin\ZipExtension;
 
 /**
  * File wrapper class

libraries/classes/OpenDocument.php

@@ -7,7 +7,7 @@
  */
 namespace PhpMyAdmin;
 
-use PMA\libraries\ZipFile;
+use PhpMyAdmin\ZipFile;
 
 /**
  * Simplfied OpenDocument creator class

libraries/classes/ZipExtension.php

@@ -5,8 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
 use ZipArchive;
 

libraries/classes/ZipFile.php

@@ -5,11 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
-
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
+namespace PhpMyAdmin;
 
 /**
  * Zip file creation class.
@@ -203,4 +199,4 @@ class ZipFile
             return $data . $header;
         }
     } // end of the 'file()' method
-} // end of the 'PMA\libraries\ZipFile' class
+} // end of the 'PhpMyAdmin\ZipFile' class

libraries/export.lib.php

@@ -10,7 +10,7 @@ use PhpMyAdmin\Encoding;
 use PhpMyAdmin\Message;
 use PMA\libraries\plugins\ExportPlugin;
 use PMA\libraries\Table;
-use PMA\libraries\ZipFile;
+use PhpMyAdmin\ZipFile;
 use PMA\libraries\URL;
 use PMA\libraries\Sanitize;
 

libraries/plugins/import/ImportShp.php

@@ -16,7 +16,7 @@ use PMA\libraries\gis\GISMultilinestring;
 use PMA\libraries\gis\GISMultipoint;
 use PMA\libraries\gis\GISPoint;
 use PMA\libraries\gis\GISPolygon;
-use PMA\libraries\ZipExtension;
+use PhpMyAdmin\ZipExtension;
 
 /**
  * Handles the import for ESRI Shape files

test/classes/ZipExtensionTest.php

@@ -5,7 +5,7 @@
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\ZipExtension;
+use PhpMyAdmin\ZipExtension;
 
 require_once 'test/PMATestCase.php';
 

test/classes/ZipFileTest.php

@@ -1,16 +1,16 @@
 <?php
 /**
- * Tests PMA\libraries\ZipFile
+ * Tests PhpMyAdmin\ZipFile
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\ZipFile;
+use PhpMyAdmin\ZipFile;
 
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\ZipFile
+ * Tests for PhpMyAdmin\ZipFile
  *
  * @package PhpMyAdmin-test
  */