From a2fa5d748a5437c185d0f603e0e4ab991f7d7b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Sun, 16 Jul 2017 16:36:05 -0300 Subject: [PATCH] Move Engines classes to PhpMyAdmin namespace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- .../{engines => classes/Engines}/Bdb.php | 2 +- .../Engines}/Berkeleydb.php | 2 +- .../{engines => classes/Engines}/Binlog.php | 2 +- .../{engines => classes/Engines}/Innobase.php | 2 +- .../{engines => classes/Engines}/Innodb.php | 2 +- .../{engines => classes/Engines}/Memory.php | 2 +- .../{engines => classes/Engines}/Merge.php | 2 +- .../Engines}/MrgMyisam.php | 2 +- .../{engines => classes/Engines}/Myisam.php | 2 +- .../Engines}/Ndbcluster.php | 2 +- .../{engines => classes/Engines}/Pbxt.php | 2 +- .../Engines}/PerformanceSchema.php | 2 +- libraries/classes/StorageEngine.php | 24 +++++++++---------- libraries/operations.lib.php | 2 +- test/classes/StorageEngineTest.php | 24 +++++++++---------- test/classes/engines/BdbTest.php | 6 ++--- test/classes/engines/BinlogTest.php | 4 ++-- test/classes/engines/InnodbTest.php | 4 ++-- test/classes/engines/MemoryTest.php | 4 ++-- test/classes/engines/MrgMyisamTest.php | 6 ++--- test/classes/engines/MyisamTest.php | 4 ++-- test/classes/engines/NdbclusterTest.php | 4 ++-- test/classes/engines/PbxtTest.php | 4 ++-- 23 files changed, 55 insertions(+), 55 deletions(-) rename libraries/{engines => classes/Engines}/Bdb.php (98%) rename libraries/{engines => classes/Engines}/Berkeleydb.php (87%) rename libraries/{engines => classes/Engines}/Binlog.php (93%) rename libraries/{engines => classes/Engines}/Innobase.php (87%) rename libraries/{engines => classes/Engines}/Innodb.php (99%) rename libraries/{engines => classes/Engines}/Memory.php (94%) rename libraries/{engines => classes/Engines}/Merge.php (88%) rename libraries/{engines => classes/Engines}/MrgMyisam.php (93%) rename libraries/{engines => classes/Engines}/Myisam.php (99%) rename libraries/{engines => classes/Engines}/Ndbcluster.php (96%) rename libraries/{engines => classes/Engines}/Pbxt.php (99%) rename libraries/{engines => classes/Engines}/PerformanceSchema.php (94%) diff --git a/libraries/engines/Bdb.php b/libraries/classes/Engines/Bdb.php similarity index 98% rename from libraries/engines/Bdb.php rename to libraries/classes/Engines/Bdb.php index e99b84aefe..cde9480c7b 100644 --- a/libraries/engines/Bdb.php +++ b/libraries/classes/Engines/Bdb.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Engines */ -namespace PMA\libraries\engines; +namespace PhpMyAdmin\Engines; use PhpMyAdmin\StorageEngine; diff --git a/libraries/engines/Berkeleydb.php b/libraries/classes/Engines/Berkeleydb.php similarity index 87% rename from libraries/engines/Berkeleydb.php rename to libraries/classes/Engines/Berkeleydb.php index 55941e646b..ad4f46059a 100644 --- a/libraries/engines/Berkeleydb.php +++ b/libraries/classes/Engines/Berkeleydb.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Engines */ -namespace PMA\libraries\engines; +namespace PhpMyAdmin\Engines; /** * This is same as BDB diff --git a/libraries/engines/Binlog.php b/libraries/classes/Engines/Binlog.php similarity index 93% rename from libraries/engines/Binlog.php rename to libraries/classes/Engines/Binlog.php index 11d31f09df..4c4211fe81 100644 --- a/libraries/engines/Binlog.php +++ b/libraries/classes/Engines/Binlog.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Engines */ -namespace PMA\libraries\engines; +namespace PhpMyAdmin\Engines; use PhpMyAdmin\StorageEngine; diff --git a/libraries/engines/Innobase.php b/libraries/classes/Engines/Innobase.php similarity index 87% rename from libraries/engines/Innobase.php rename to libraries/classes/Engines/Innobase.php index e3fc63b06c..9aeb8b305b 100644 --- a/libraries/engines/Innobase.php +++ b/libraries/classes/Engines/Innobase.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Engines */ -namespace PMA\libraries\engines; +namespace PhpMyAdmin\Engines; /** * The Innobase storage engine diff --git a/libraries/engines/Innodb.php b/libraries/classes/Engines/Innodb.php similarity index 99% rename from libraries/engines/Innodb.php rename to libraries/classes/Engines/Innodb.php index 7fa9a1a719..72cc8f4aa0 100644 --- a/libraries/engines/Innodb.php +++ b/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; diff --git a/libraries/engines/Memory.php b/libraries/classes/Engines/Memory.php similarity index 94% rename from libraries/engines/Memory.php rename to libraries/classes/Engines/Memory.php index de655b954c..b2a8b9fc88 100644 --- a/libraries/engines/Memory.php +++ b/libraries/classes/Engines/Memory.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Engines */ -namespace PMA\libraries\engines; +namespace PhpMyAdmin\Engines; use PhpMyAdmin\StorageEngine; diff --git a/libraries/engines/Merge.php b/libraries/classes/Engines/Merge.php similarity index 88% rename from libraries/engines/Merge.php rename to libraries/classes/Engines/Merge.php index c765712774..e610c8b63a 100644 --- a/libraries/engines/Merge.php +++ b/libraries/classes/Engines/Merge.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Engines */ -namespace PMA\libraries\engines; +namespace PhpMyAdmin\Engines; use PhpMyAdmin\StorageEngine; diff --git a/libraries/engines/MrgMyisam.php b/libraries/classes/Engines/MrgMyisam.php similarity index 93% rename from libraries/engines/MrgMyisam.php rename to libraries/classes/Engines/MrgMyisam.php index 8fdc76e850..24465b88aa 100644 --- a/libraries/engines/MrgMyisam.php +++ b/libraries/classes/Engines/MrgMyisam.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Engines */ -namespace PMA\libraries\engines; +namespace PhpMyAdmin\Engines; /** * The MERGE storage engine diff --git a/libraries/engines/Myisam.php b/libraries/classes/Engines/Myisam.php similarity index 99% rename from libraries/engines/Myisam.php rename to libraries/classes/Engines/Myisam.php index 18ec5669c6..b0341fda7a 100644 --- a/libraries/engines/Myisam.php +++ b/libraries/classes/Engines/Myisam.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Engines */ -namespace PMA\libraries\engines; +namespace PhpMyAdmin\Engines; use PhpMyAdmin\StorageEngine; diff --git a/libraries/engines/Ndbcluster.php b/libraries/classes/Engines/Ndbcluster.php similarity index 96% rename from libraries/engines/Ndbcluster.php rename to libraries/classes/Engines/Ndbcluster.php index de241f03ba..49e87ae2c8 100644 --- a/libraries/engines/Ndbcluster.php +++ b/libraries/classes/Engines/Ndbcluster.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Engines */ -namespace PMA\libraries\engines; +namespace PhpMyAdmin\Engines; use PhpMyAdmin\StorageEngine; diff --git a/libraries/engines/Pbxt.php b/libraries/classes/Engines/Pbxt.php similarity index 99% rename from libraries/engines/Pbxt.php rename to libraries/classes/Engines/Pbxt.php index 5cc56704ee..9be40e7d30 100644 --- a/libraries/engines/Pbxt.php +++ b/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; diff --git a/libraries/engines/PerformanceSchema.php b/libraries/classes/Engines/PerformanceSchema.php similarity index 94% rename from libraries/engines/PerformanceSchema.php rename to libraries/classes/Engines/PerformanceSchema.php index 61486a0354..9c62704831 100644 --- a/libraries/engines/PerformanceSchema.php +++ b/libraries/classes/Engines/PerformanceSchema.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Engines */ -namespace PMA\libraries\engines; +namespace PhpMyAdmin\Engines; use PhpMyAdmin\StorageEngine; diff --git a/libraries/classes/StorageEngine.php b/libraries/classes/StorageEngine.php index bdb420fc2d..f1e1dcbe46 100644 --- a/libraries/classes/StorageEngine.php +++ b/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; /** diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php index dac373477f..93eef582f7 100644 --- a/libraries/operations.lib.php +++ b/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; diff --git a/test/classes/StorageEngineTest.php b/test/classes/StorageEngineTest.php index ace3620462..2a001e3bbd 100644 --- a/test/classes/StorageEngineTest.php +++ b/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'), ); } diff --git a/test/classes/engines/BdbTest.php b/test/classes/engines/BdbTest.php index bd3df76ec4..de7bbfff35 100644 --- a/test/classes/engines/BdbTest.php +++ b/test/classes/engines/BdbTest.php @@ -1,6 +1,6 @@