Move classes to PhpMyAdmin namespace

- Move ZipExtension to PhpMyAdmin namespace - Move ZipFile to PhpMyAdmin namespace Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
phpmyadmin · Jul 1, 2017 · 42bfa9c · 42bfa9c
1 parent 94b34d8
commit 42bfa9c
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 16 deletions.
diff --git a/libraries/classes/File.php b/libraries/classes/File.php
@@ -11,7 +11,7 @@
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Message;
 use PMA\libraries\Util;
-use PMA\libraries\ZipExtension;
+use PhpMyAdmin\ZipExtension;
 
 /**
  * File wrapper class

diff --git a/libraries/classes/OpenDocument.php b/libraries/classes/OpenDocument.php
@@ -7,7 +7,7 @@
  */
 namespace PhpMyAdmin;
 
-use PMA\libraries\ZipFile;
+use PhpMyAdmin\ZipFile;
 
 /**
  * Simplfied OpenDocument creator class

diff --git a/libraries/ZipExtension.php → libraries/classes/ZipExtension.php b/libraries/ZipExtension.php → libraries/classes/ZipExtension.php
@@ -5,8 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
 use ZipArchive;
 

diff --git a/libraries/ZipFile.php → libraries/classes/ZipFile.php b/libraries/ZipFile.php → 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 @@ function file()
             return $data . $header;
         }
     } // end of the 'file()' method
-} // end of the 'PMA\libraries\ZipFile' class
+} // end of the 'PhpMyAdmin\ZipFile' class
diff --git a/libraries/export.lib.php b/libraries/export.lib.php
@@ -10,7 +10,7 @@
 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;
 

diff --git a/libraries/plugins/import/ImportShp.php b/libraries/plugins/import/ImportShp.php
@@ -16,7 +16,7 @@
 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

diff --git a/test/classes/ZipExtensionTest.php b/test/classes/ZipExtensionTest.php
@@ -5,7 +5,7 @@
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\ZipExtension;
+use PhpMyAdmin\ZipExtension;
 
 require_once 'test/PMATestCase.php';
 

diff --git a/test/classes/ZipFileTest.php b/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
  */