Merge pull request #13498 from mauriciofauth/classes

Move Engines classes to PhpMyAdmin namespace

libraries/classes/Engines/Bdb.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Engines
  */
-namespace PMA\libraries\engines;
+namespace PhpMyAdmin\Engines;
 
 use PhpMyAdmin\StorageEngine;
 

libraries/classes/Engines/Berkeleydb.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Engines
  */
-namespace PMA\libraries\engines;
+namespace PhpMyAdmin\Engines;
 
 /**
  * This is same as BDB

libraries/classes/Engines/Binlog.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Engines
  */
-namespace PMA\libraries\engines;
+namespace PhpMyAdmin\Engines;
 
 use PhpMyAdmin\StorageEngine;
 

libraries/classes/Engines/Innobase.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Engines
  */
-namespace PMA\libraries\engines;
+namespace PhpMyAdmin\Engines;
 
 /**
  * The Innobase storage engine

libraries/classes/Engines/Innodb.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Engines
  */
-namespace PMA\libraries\engines;
+namespace PhpMyAdmin\Engines;
 
 use PhpMyAdmin\StorageEngine;
 use PhpMyAdmin\Util;

libraries/classes/Engines/Memory.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Engines
  */
-namespace PMA\libraries\engines;
+namespace PhpMyAdmin\Engines;
 
 use PhpMyAdmin\StorageEngine;
 

libraries/classes/Engines/Merge.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Engines
  */
-namespace PMA\libraries\engines;
+namespace PhpMyAdmin\Engines;
 
 use PhpMyAdmin\StorageEngine;
 

libraries/classes/Engines/MrgMyisam.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Engines
  */
-namespace PMA\libraries\engines;
+namespace PhpMyAdmin\Engines;
 
 /**
  * The MERGE storage engine

libraries/classes/Engines/Myisam.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Engines
  */
-namespace PMA\libraries\engines;
+namespace PhpMyAdmin\Engines;
 
 use PhpMyAdmin\StorageEngine;
 

libraries/classes/Engines/Ndbcluster.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Engines
  */
-namespace PMA\libraries\engines;
+namespace PhpMyAdmin\Engines;
 
 use PhpMyAdmin\StorageEngine;
 

libraries/classes/Engines/Pbxt.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Engines
  */
-namespace PMA\libraries\engines;
+namespace PhpMyAdmin\Engines;
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\StorageEngine;

libraries/classes/Engines/PerformanceSchema.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Engines
  */
-namespace PMA\libraries\engines;
+namespace PhpMyAdmin\Engines;
 
 use PhpMyAdmin\StorageEngine;
 

libraries/classes/StorageEngine.php

@@ -7,18 +7,18 @@
  */
 namespace PhpMyAdmin;
 
-use PMA\libraries\engines\Bdb;
-use PMA\libraries\engines\Berkeleydb;
-use PMA\libraries\engines\Binlog;
-use PMA\libraries\engines\Innobase;
-use PMA\libraries\engines\Innodb;
-use PMA\libraries\engines\Memory;
-use PMA\libraries\engines\Merge;
-use PMA\libraries\engines\MrgMyisam;
-use PMA\libraries\engines\Myisam;
-use PMA\libraries\engines\Ndbcluster;
-use PMA\libraries\engines\Pbxt;
-use PMA\libraries\engines\PerformanceSchema;
+use PhpMyAdmin\Engines\Bdb;
+use PhpMyAdmin\Engines\Berkeleydb;
+use PhpMyAdmin\Engines\Binlog;
+use PhpMyAdmin\Engines\Innobase;
+use PhpMyAdmin\Engines\Innodb;
+use PhpMyAdmin\Engines\Memory;
+use PhpMyAdmin\Engines\Merge;
+use PhpMyAdmin\Engines\MrgMyisam;
+use PhpMyAdmin\Engines\Myisam;
+use PhpMyAdmin\Engines\Ndbcluster;
+use PhpMyAdmin\Engines\Pbxt;
+use PhpMyAdmin\Engines\PerformanceSchema;
 use PhpMyAdmin\Util;
 
 /**

libraries/operations.lib.php

@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\engines\Innodb;
+use PhpMyAdmin\Engines\Innodb;
 use PhpMyAdmin\Charsets;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Message;

test/classes/StorageEngineTest.php

@@ -126,18 +126,18 @@ class StorageEngineTest extends PMATestCase
     {
         return array(
             array('PhpMyAdmin\StorageEngine', 'unknown engine'),
-            array('PMA\libraries\engines\Bdb', 'Bdb'),
-            array('PMA\libraries\engines\Berkeleydb', 'Berkeleydb'),
-            array('PMA\libraries\engines\Binlog', 'Binlog'),
-            array('PMA\libraries\engines\Innobase', 'Innobase'),
-            array('PMA\libraries\engines\Innodb', 'Innodb'),
-            array('PMA\libraries\engines\Memory', 'Memory'),
-            array('PMA\libraries\engines\Merge', 'Merge'),
-            array('PMA\libraries\engines\MrgMyisam', 'Mrg_Myisam'),
-            array('PMA\libraries\engines\Myisam', 'Myisam'),
-            array('PMA\libraries\engines\Ndbcluster', 'Ndbcluster'),
-            array('PMA\libraries\engines\Pbxt', 'Pbxt'),
-            array('PMA\libraries\engines\PerformanceSchema', 'Performance_Schema'),
+            array('PhpMyAdmin\Engines\Bdb', 'Bdb'),
+            array('PhpMyAdmin\Engines\Berkeleydb', 'Berkeleydb'),
+            array('PhpMyAdmin\Engines\Binlog', 'Binlog'),
+            array('PhpMyAdmin\Engines\Innobase', 'Innobase'),
+            array('PhpMyAdmin\Engines\Innodb', 'Innodb'),
+            array('PhpMyAdmin\Engines\Memory', 'Memory'),
+            array('PhpMyAdmin\Engines\Merge', 'Merge'),
+            array('PhpMyAdmin\Engines\MrgMyisam', 'Mrg_Myisam'),
+            array('PhpMyAdmin\Engines\Myisam', 'Myisam'),
+            array('PhpMyAdmin\Engines\Ndbcluster', 'Ndbcluster'),
+            array('PhpMyAdmin\Engines\Pbxt', 'Pbxt'),
+            array('PhpMyAdmin\Engines\PerformanceSchema', 'Performance_Schema'),
         );
     }
 

test/classes/engines/BdbTest.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests for PMA\libraries\engines\Bdb
+ * Tests for PhpMyAdmin\Engines\Bdb
  *
  * @package PhpMyAdmin-test
  */
@@ -9,13 +9,13 @@
  * Include to test.
  */
 
-use PMA\libraries\engines\Bdb;
+use PhpMyAdmin\Engines\Bdb;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\engines\Bdb
+ * Tests for PhpMyAdmin\Engines\Bdb
  *
  * @package PhpMyAdmin-test
  */

test/classes/engines/BinlogTest.php

@@ -9,13 +9,13 @@
  * Include to test.
  */
 
-use PMA\libraries\engines\Binlog;
+use PhpMyAdmin\Engines\Binlog;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\engines\Binlog
+ * Tests for PhpMyAdmin\Engines\Binlog
  *
  * @package PhpMyAdmin-test
  */

test/classes/engines/InnodbTest.php

@@ -9,13 +9,13 @@
  * Include to test.
  */
 
-use PMA\libraries\engines\Innodb;
+use PhpMyAdmin\Engines\Innodb;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\engines\Innodb
+ * Tests for PhpMyAdmin\Engines\Innodb
  *
  * @package PhpMyAdmin-test
  */

test/classes/engines/MemoryTest.php

@@ -9,13 +9,13 @@
  * Include to test.
  */
 
-use PMA\libraries\engines\Memory;
+use PhpMyAdmin\Engines\Memory;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\engines\Memory
+ * Tests for PhpMyAdmin\Engines\Memory
  *
  * @package PhpMyAdmin-test
  */

test/classes/engines/MrgMyisamTest.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests for PMA\libraries\engines\MrgMyisam
+ * Tests for PhpMyAdmin\Engines\MrgMyisam
  *
  * @package PhpMyAdmin-test
  */
@@ -9,13 +9,13 @@
  * Include to test.
  */
 
-use PMA\libraries\engines\MrgMyisam;
+use PhpMyAdmin\Engines\MrgMyisam;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\engines\MrgMyisam
+ * Tests for PhpMyAdmin\Engines\MrgMyisam
  *
  * @package PhpMyAdmin-test
  */

test/classes/engines/MyisamTest.php

@@ -9,13 +9,13 @@
  * Include to test.
  */
 
-use PMA\libraries\engines\Myisam;
+use PhpMyAdmin\Engines\Myisam;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\engines\Myisam
+ * Tests for PhpMyAdmin\Engines\Myisam
  *
  * @package PhpMyAdmin-test
  */

test/classes/engines/NdbclusterTest.php

@@ -9,13 +9,13 @@
  * Include to test.
  */
 
-use PMA\libraries\engines\Ndbcluster;
+use PhpMyAdmin\Engines\Ndbcluster;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\engines\Ndbcluster
+ * Tests for PhpMyAdmin\Engines\Ndbcluster
  *
  * @package PhpMyAdmin-test
  */

test/classes/engines/PbxtTest.php

@@ -11,13 +11,13 @@
  */
 
 use PhpMyAdmin\Core;
-use PMA\libraries\engines\Pbxt;
+use PhpMyAdmin\Engines\Pbxt;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\engines\Pbxt;
+ * Tests for PhpMyAdmin\Engines\Pbxt;
  *
  * @package PhpMyAdmin-test
  */