From 982e6180b1fd66d8d9f91ac7d921139390e9c900 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Tue, 18 Jul 2017 13:14:41 +0000 Subject: [PATCH 01/12] Translated using Weblate (Turkish) Currently translated at 100.0% (3213 of 3213 strings) [CI skip] --- po/tr.po | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/po/tr.po b/po/tr.po index ac0cd766e7..081b18523e 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2017-07-18 13:31+0200\n" -"PO-Revision-Date: 2017-06-28 09:43+0000\n" +"PO-Revision-Date: 2017-07-18 17:37+0000\n" "Last-Translator: Burak Yavuz \n" -"Language-Team: Turkish \n" +"Language-Team: Turkish " +"\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 2.15-dev\n" +"X-Generator: Weblate 2.16-dev\n" #: ajax.php:16 ajax.php:33 export.php:195 schema_export.php:66 msgid "Bad type!" @@ -4333,6 +4333,7 @@ msgstr "İç sütun:" #: libraries/classes/Dbi/DbiMysqli.php:158 msgid "SSL connection enforced by server, automatically enabling it." msgstr "" +"SSL bağlantısı sunucu tarafından zorlandı, otomatik olarak etkinleştiriliyor." #: libraries/classes/DisplayResults.php:910 msgid "Save edited data" @@ -6110,22 +6111,15 @@ msgid "" "corrupted!" msgstr "" "PHP yapılandırmanızda mbstring.func_overload işlevini etkinleştirdiniz. Bu " -"seçenek phpMyAdmin ile uyumlusuzdur ve bazı veri bozulmalarına sebep " -"olabilir!" +"seçenek phpMyAdmin ile uyumsuzdur ve bazı veri bozulmalarına sebep olabilir!" #: libraries/common.inc.php:486 -#, fuzzy -#| msgid "" -#| "You have enabled mbstring.func_overload in your PHP configuration. This " -#| "option is incompatible with phpMyAdmin and might cause some data to be " -#| "corrupted!" msgid "" "You have disabled ini_get and/or ini_set in php.ini. This option is " "incompatible with phpMyAdmin!" msgstr "" -"PHP yapılandırmanızda mbstring.func_overload işlevini etkinleştirdiniz. Bu " -"seçenek phpMyAdmin ile uyumlusuzdur ve bazı veri bozulmalarına sebep " -"olabilir!" +"Php.ini dosyasında ini_get ve/veya ini_set işlevini etkisizleştirdiniz. Bu " +"seçenek phpMyAdmin ile uyumsuzdur!" #: libraries/common.inc.php:519 #, php-format @@ -10203,10 +10197,8 @@ msgid "Server Choice:" msgstr "Sunucu Seçimi:" #: libraries/plugins/auth/AuthenticationCookie.php:341 -#, fuzzy -#| msgid "Could not connect to the database server!" msgid "Failed to connect to the reCAPTCHA service!" -msgstr "Veritabanı sunucusuna bağlanamadı!" +msgstr "reCAPTCHA hizmetine bağlanma başarısız!" #: libraries/plugins/auth/AuthenticationCookie.php:343 msgid "Entered captcha is wrong, try again!" @@ -10215,6 +10207,8 @@ msgstr "Girilen captcha yanlış, tekrar deneyin!" #: libraries/plugins/auth/AuthenticationCookie.php:348 msgid "Missing reCAPTCHA verification, maybe it has been blocked by adblock?" msgstr "" +"reCAPTCHA doğrulaması eksik, belki adblock tarafından engellenmiş olabilir " +"mi?" #: libraries/plugins/auth/AuthenticationCookie.php:372 msgid "You are not allowed to log in to this MySQL server!" From 3de772ea5aef66e6bfd6ead1e787fa83fa9463da Mon Sep 17 00:00:00 2001 From: Domen Date: Tue, 18 Jul 2017 19:29:14 +0000 Subject: [PATCH 02/12] Translated using Weblate (Slovenian) Currently translated at 100.0% (3213 of 3213 strings) [CI skip] --- po/sl.po | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/po/sl.po b/po/sl.po index e079b606a4..d4243050c7 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,17 +4,17 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2017-07-18 13:31+0200\n" -"PO-Revision-Date: 2017-06-28 15:31+0000\n" +"PO-Revision-Date: 2017-07-18 19:30+0000\n" "Last-Translator: Domen \n" -"Language-Team: Slovenian \n" +"Language-Team: Slovenian " +"\n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3;\n" -"X-Generator: Weblate 2.15-dev\n" +"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3;\n" +"X-Generator: Weblate 2.16-dev\n" #: ajax.php:16 ajax.php:33 export.php:195 schema_export.php:66 msgid "Bad type!" @@ -4341,7 +4341,7 @@ msgstr "V stolpcu:" #: libraries/classes/Dbi/DbiMysqli.php:158 msgid "SSL connection enforced by server, automatically enabling it." -msgstr "" +msgstr "Povezavo SSL je vsilil strežnik; samodejno sem jo omogočil." #: libraries/classes/DisplayResults.php:910 msgid "Save edited data" @@ -6128,17 +6128,12 @@ msgstr "" "združljiva s phpMyAdminom in lahko pokvari nekatere podatke!" #: libraries/common.inc.php:486 -#, fuzzy -#| msgid "" -#| "You have enabled mbstring.func_overload in your PHP configuration. This " -#| "option is incompatible with phpMyAdmin and might cause some data to be " -#| "corrupted!" msgid "" "You have disabled ini_get and/or ini_set in php.ini. This option is " "incompatible with phpMyAdmin!" msgstr "" -"V vaši konfiguraciji PHP ste omogočili mbstring.func_overload. Možnost ni " -"združljiva s phpMyAdminom in lahko pokvari nekatere podatke!" +"V php.ini ste onemogočili ini_get in/ali ini_set. Ta možnost ni združljiva s " +"phpMyAdminom!" #: libraries/common.inc.php:519 #, php-format @@ -10192,10 +10187,8 @@ msgid "Server Choice:" msgstr "Izbira strežnika:" #: libraries/plugins/auth/AuthenticationCookie.php:341 -#, fuzzy -#| msgid "Could not connect to the database server!" msgid "Failed to connect to the reCAPTCHA service!" -msgstr "Ne morem se povezati s strežnikom zbirke podatkov!" +msgstr "Ne morem se povezati s strežnikom storitve reCAPTCHA!" #: libraries/plugins/auth/AuthenticationCookie.php:343 msgid "Entered captcha is wrong, try again!" @@ -10203,7 +10196,7 @@ msgstr "Vnesena captcha je napačna; poskusite znova!" #: libraries/plugins/auth/AuthenticationCookie.php:348 msgid "Missing reCAPTCHA verification, maybe it has been blocked by adblock?" -msgstr "" +msgstr "Manjka preverjanje reCAPTCHA; morda ga je blokiral adblock?" #: libraries/plugins/auth/AuthenticationCookie.php:372 msgid "You are not allowed to log in to this MySQL server!" From 13006d735c98dc262e0c8aad520931aaae954402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Tue, 18 Jul 2017 23:05:41 -0300 Subject: [PATCH 03/12] Move GIS 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 --- gis_data_editor.php | 10 ++++---- .../Table/TableGisVisualizationController.php | 6 ++--- .../Gis/GisFactory.php} | 20 ++++++++-------- .../Gis/GisGeometry.php} | 6 ++--- .../Gis/GisGeometryCollection.php} | 24 +++++++++---------- .../Gis/GisLineString.php} | 10 ++++---- .../Gis/GisMultiLineString.php} | 10 ++++---- .../Gis/GisMultiPoint.php} | 10 ++++---- .../Gis/GisMultiPolygon.php} | 16 ++++++------- .../GISPoint.php => classes/Gis/GisPoint.php} | 10 ++++---- .../Gis/GisPolygon.php} | 16 ++++++------- .../Gis/GisVisualization.php} | 20 ++++++++-------- libraries/plugins/import/ImportShp.php | 14 +++++------ ...{GISFactoryTest.php => GisFactoryTest.php} | 24 +++++++++---------- .../gis/{GISGeomTest.php => GisGeomTest.php} | 2 +- ...Test.php => GisGeometryCollectionTest.php} | 10 ++++---- ...ISGeometryTest.php => GisGeometryTest.php} | 10 ++++---- ...nestringTest.php => GisLineStringTest.php} | 14 +++++------ ...ingTest.php => GisMultiLineStringTest.php} | 14 +++++------ ...ltipointTest.php => GisMultiPointTest.php} | 14 +++++------ ...olygonTest.php => GisMultiPolygonTest.php} | 14 +++++------ .../{GISPointTest.php => GisPointTest.php} | 14 +++++------ ...{GISPolygonTest.php => GisPolygonTest.php} | 14 +++++------ 23 files changed, 151 insertions(+), 151 deletions(-) rename libraries/{gis/GISFactory.php => classes/Gis/GisFactory.php} (66%) rename libraries/{gis/GISGeometry.php => classes/Gis/GisGeometry.php} (99%) rename libraries/{gis/GISGeometrycollection.php => classes/Gis/GisGeometryCollection.php} (95%) rename libraries/{gis/GISLinestring.php => classes/Gis/GisLineString.php} (98%) rename libraries/{gis/GISMultilinestring.php => classes/Gis/GisMultiLineString.php} (98%) rename libraries/{gis/GISMultipoint.php => classes/Gis/GisMultiPoint.php} (98%) rename libraries/{gis/GISMultipolygon.php => classes/Gis/GisMultiPolygon.php} (98%) rename libraries/{gis/GISPoint.php => classes/Gis/GisPoint.php} (98%) rename libraries/{gis/GISPolygon.php => classes/Gis/GisPolygon.php} (98%) rename libraries/{gis/GISVisualization.php => classes/Gis/GisVisualization.php} (98%) rename test/classes/gis/{GISFactoryTest.php => GisFactoryTest.php} (63%) rename test/classes/gis/{GISGeomTest.php => GisGeomTest.php} (96%) rename test/classes/gis/{GISGeometrycollectionTest.php => GisGeometryCollectionTest.php} (97%) rename test/classes/gis/{GISGeometryTest.php => GisGeometryTest.php} (96%) rename test/classes/gis/{GISLinestringTest.php => GisLineStringTest.php} (97%) rename test/classes/gis/{GISMultilinestringTest.php => GisMultiLineStringTest.php} (97%) rename test/classes/gis/{GISMultipointTest.php => GisMultiPointTest.php} (97%) rename test/classes/gis/{GISMultipolygonTest.php => GisMultiPolygonTest.php} (98%) rename test/classes/gis/{GISPointTest.php => GisPointTest.php} (97%) rename test/classes/gis/{GISPolygonTest.php => GisPolygonTest.php} (98%) diff --git a/gis_data_editor.php b/gis_data_editor.php index f1d93d1e8b..7d38a3648f 100644 --- a/gis_data_editor.php +++ b/gis_data_editor.php @@ -7,8 +7,8 @@ */ use PhpMyAdmin\Core; -use PMA\libraries\gis\GISFactory; -use PMA\libraries\gis\GISVisualization; +use PhpMyAdmin\Gis\GisFactory; +use PhpMyAdmin\Gis\GisVisualization; use PhpMyAdmin\Response; use PhpMyAdmin\Url; @@ -70,7 +70,7 @@ if (! isset($gis_data['gis_type'])) { $geom_type = htmlspecialchars($gis_data['gis_type']); // Generate parameters from value passed. -$gis_obj = GISFactory::factory($geom_type); +$gis_obj = GisFactory::factory($geom_type); if (isset($_REQUEST['value'])) { $gis_data = array_merge( $gis_data, $gis_obj->generateParams($_REQUEST['value']) @@ -91,10 +91,10 @@ $visualizationSettings = array( 'spatialColumn' => 'wkt' ); $data = array(array('wkt' => $wkt_with_zero, 'srid' => $srid)); -$visualization = GISVisualization::getByData($data, $visualizationSettings) +$visualization = GisVisualization::getByData($data, $visualizationSettings) ->toImage('svg'); -$open_layers = GISVisualization::getByData($data, $visualizationSettings) +$open_layers = GisVisualization::getByData($data, $visualizationSettings) ->asOl(); // If the call is to update the WKT and visualization make an AJAX response diff --git a/libraries/classes/Controllers/Table/TableGisVisualizationController.php b/libraries/classes/Controllers/Table/TableGisVisualizationController.php index 686f2a6e13..8069f77ced 100644 --- a/libraries/classes/Controllers/Table/TableGisVisualizationController.php +++ b/libraries/classes/Controllers/Table/TableGisVisualizationController.php @@ -9,7 +9,7 @@ namespace PhpMyAdmin\Controllers\Table; use PhpMyAdmin\Controllers\TableController; use PhpMyAdmin\Core; -use PMA\libraries\gis\GISVisualization; +use PhpMyAdmin\Gis\GisVisualization; use PhpMyAdmin\Message; use PhpMyAdmin\Template; use PhpMyAdmin\Url; @@ -41,7 +41,7 @@ class TableGisVisualizationController extends TableController protected $visualizationSettings; /** - * @var \PMA\libraries\gis\GISVisualization $visualization + * @var \PhpMyAdmin\Gis\GisVisualization $visualization */ protected $visualization; @@ -143,7 +143,7 @@ class TableGisVisualizationController extends TableController $rows = $GLOBALS['cfg']['MaxRows']; } } - $this->visualization = GISVisualization::get( + $this->visualization = GisVisualization::get( $this->sql_query, $this->visualizationSettings, $rows, diff --git a/libraries/gis/GISFactory.php b/libraries/classes/Gis/GisFactory.php similarity index 66% rename from libraries/gis/GISFactory.php rename to libraries/classes/Gis/GisFactory.php index c5f98cf87e..560f89d828 100644 --- a/libraries/gis/GISFactory.php +++ b/libraries/classes/Gis/GisFactory.php @@ -5,21 +5,21 @@ * * @package PhpMyAdmin-GIS */ -namespace PMA\libraries\gis; +namespace PhpMyAdmin\Gis; /** * Factory class that handles the creation of geometric objects. * * @package PhpMyAdmin-GIS */ -class GISFactory +class GisFactory { /** * Returns the singleton instance of geometric class of the given type. * * @param string $type type of the geometric object * - * @return GISGeometry the singleton instance of geometric class + * @return GisGeometry the singleton instance of geometric class * of the given type * * @access public @@ -29,19 +29,19 @@ class GISFactory { switch (strtoupper($type)) { case 'MULTIPOLYGON' : - return GISMultipolygon::singleton(); + return GisMultiPolygon::singleton(); case 'POLYGON' : - return GISPolygon::singleton(); + return GisPolygon::singleton(); case 'MULTIPOINT' : - return GISMultipoint::singleton(); + return GisMultiPoint::singleton(); case 'POINT' : - return GISPoint::singleton(); + return GisPoint::singleton(); case 'MULTILINESTRING' : - return GISMultilinestring::singleton(); + return GisMultiLineString::singleton(); case 'LINESTRING' : - return GISLinestring::singleton(); + return GisLineString::singleton(); case 'GEOMETRYCOLLECTION' : - return GISGeometrycollection::singleton(); + return GisGeometryCollection::singleton(); default : return false; } diff --git a/libraries/gis/GISGeometry.php b/libraries/classes/Gis/GisGeometry.php similarity index 99% rename from libraries/gis/GISGeometry.php rename to libraries/classes/Gis/GisGeometry.php index a0f8cf6c16..8abb0bddc0 100644 --- a/libraries/gis/GISGeometry.php +++ b/libraries/classes/Gis/GisGeometry.php @@ -6,16 +6,16 @@ * @package PhpMyAdmin-GIS */ -namespace PMA\libraries\gis; +namespace PhpMyAdmin\Gis; -use \TCPDF; +use TCPDF; /** * Base class for all GIS data type classes. * * @package PhpMyAdmin-GIS */ -abstract class GISGeometry +abstract class GisGeometry { /** * Prepares and returns the code related to a row in the GIS dataset as SVG. diff --git a/libraries/gis/GISGeometrycollection.php b/libraries/classes/Gis/GisGeometryCollection.php similarity index 95% rename from libraries/gis/GISGeometrycollection.php rename to libraries/classes/Gis/GisGeometryCollection.php index 932f0ff208..5f81db43ea 100644 --- a/libraries/gis/GISGeometrycollection.php +++ b/libraries/classes/Gis/GisGeometryCollection.php @@ -6,16 +6,16 @@ * @package PhpMyAdmin-GIS */ -namespace PMA\libraries\gis; +namespace PhpMyAdmin\Gis; -use \TCPDF; +use TCPDF; /** * Handles actions related to GIS GEOMETRYCOLLECTION objects * * @package PhpMyAdmin-GIS */ -class GISGeometrycollection extends GISGeometry +class GisGeometryCollection extends GisGeometry { // Hold the singleton instance of the class private static $_instance; @@ -32,7 +32,7 @@ class GISGeometrycollection extends GISGeometry /** * Returns the singleton. * - * @return GISGeometrycollection the singleton + * @return GisGeometryCollection the singleton * @access public */ public static function singleton() @@ -75,7 +75,7 @@ class GISGeometrycollection extends GISGeometry } $type = mb_substr($sub_part, 0, $type_pos); - $gis_obj = GISFactory::factory($type); + $gis_obj = GisFactory::factory($type); if (!$gis_obj) { continue; } @@ -137,7 +137,7 @@ class GISGeometrycollection extends GISGeometry } $type = mb_substr($sub_part, 0, $type_pos); - $gis_obj = GISFactory::factory($type); + $gis_obj = GisFactory::factory($type); if (!$gis_obj) { continue; } @@ -184,7 +184,7 @@ class GISGeometrycollection extends GISGeometry } $type = mb_substr($sub_part, 0, $type_pos); - $gis_obj = GISFactory::factory($type); + $gis_obj = GisFactory::factory($type); if (!$gis_obj) { continue; } @@ -232,7 +232,7 @@ class GISGeometrycollection extends GISGeometry } $type = mb_substr($sub_part, 0, $type_pos); - $gis_obj = GISFactory::factory($type); + $gis_obj = GisFactory::factory($type); if (!$gis_obj) { continue; } @@ -281,7 +281,7 @@ class GISGeometrycollection extends GISGeometry } $type = mb_substr($sub_part, 0, $type_pos); - $gis_obj = GISFactory::factory($type); + $gis_obj = GisFactory::factory($type); if (!$gis_obj) { continue; } @@ -350,7 +350,7 @@ class GISGeometrycollection extends GISGeometry for ($i = 0; $i < $geom_count; $i++) { if (isset($gis_data[$i]['gis_type'])) { $type = $gis_data[$i]['gis_type']; - $gis_obj = GISFactory::factory($type); + $gis_obj = GisFactory::factory($type); if (!$gis_obj) { continue; } @@ -381,7 +381,7 @@ class GISGeometrycollection extends GISGeometry public function generateParams($value) { $params = array(); - $data = GISGeometry::generateParams($value); + $data = GisGeometry::generateParams($value); $params['srid'] = $data['srid']; $wkt = $data['wkt']; @@ -403,7 +403,7 @@ class GISGeometrycollection extends GISGeometry continue; } $type = mb_substr($sub_part, 0, $type_pos); - $gis_obj = GISFactory::factory($type); + $gis_obj = GisFactory::factory($type); if (!$gis_obj) { continue; } diff --git a/libraries/gis/GISLinestring.php b/libraries/classes/Gis/GisLineString.php similarity index 98% rename from libraries/gis/GISLinestring.php rename to libraries/classes/Gis/GisLineString.php index 0935c8edd3..00a80e2271 100644 --- a/libraries/gis/GISLinestring.php +++ b/libraries/classes/Gis/GisLineString.php @@ -6,16 +6,16 @@ * @package PhpMyAdmin-GIS */ -namespace PMA\libraries\gis; +namespace PhpMyAdmin\Gis; -use \TCPDF; +use TCPDF; /** * Handles actions related to GIS LINESTRING objects * * @package PhpMyAdmin-GIS */ -class GISLinestring extends GISGeometry +class GisLineString extends GisGeometry { // Hold the singleton instance of the class private static $_instance; @@ -32,7 +32,7 @@ class GISLinestring extends GISGeometry /** * Returns the singleton. * - * @return GISLinestring the singleton + * @return GisLineString the singleton * @access public */ public static function singleton() @@ -324,7 +324,7 @@ class GISLinestring extends GISGeometry $params = array(); if ($index == -1) { $index = 0; - $data = GISGeometry::generateParams($value); + $data = GisGeometry::generateParams($value); $params['srid'] = $data['srid']; $wkt = $data['wkt']; } else { diff --git a/libraries/gis/GISMultilinestring.php b/libraries/classes/Gis/GisMultiLineString.php similarity index 98% rename from libraries/gis/GISMultilinestring.php rename to libraries/classes/Gis/GisMultiLineString.php index 398815ef48..7fe4359ff3 100644 --- a/libraries/gis/GISMultilinestring.php +++ b/libraries/classes/Gis/GisMultiLineString.php @@ -6,16 +6,16 @@ * @package PhpMyAdmin-GIS */ -namespace PMA\libraries\gis; +namespace PhpMyAdmin\Gis; -use \TCPDF; +use TCPDF; /** * Handles actions related to GIS MULTILINESTRING objects * * @package PhpMyAdmin-GIS */ -class GISMultilinestring extends GISGeometry +class GisMultiLineString extends GisGeometry { // Hold the singleton instance of the class private static $_instance; @@ -32,7 +32,7 @@ class GISMultilinestring extends GISGeometry /** * Returns the singleton. * - * @return GISMultilinestring the singleton + * @return GisMultiLineString the singleton * @access public */ public static function singleton() @@ -405,7 +405,7 @@ class GISMultilinestring extends GISGeometry $params = array(); if ($index == -1) { $index = 0; - $data = GISGeometry::generateParams($value); + $data = GisGeometry::generateParams($value); $params['srid'] = $data['srid']; $wkt = $data['wkt']; } else { diff --git a/libraries/gis/GISMultipoint.php b/libraries/classes/Gis/GisMultiPoint.php similarity index 98% rename from libraries/gis/GISMultipoint.php rename to libraries/classes/Gis/GisMultiPoint.php index e63c0034c1..611c3f83e6 100644 --- a/libraries/gis/GISMultipoint.php +++ b/libraries/classes/Gis/GisMultiPoint.php @@ -6,16 +6,16 @@ * @package PhpMyAdmin-GIS */ -namespace PMA\libraries\gis; +namespace PhpMyAdmin\Gis; -use \TCPDF; +use TCPDF; /** * Handles actions related to GIS MULTIPOINT objects * * @package PhpMyAdmin-GIS */ -class GISMultipoint extends GISGeometry +class GisMultiPoint extends GisGeometry { // Hold the singleton instance of the class private static $_instance; @@ -32,7 +32,7 @@ class GISMultipoint extends GISGeometry /** * Returns the singleton. * - * @return GISMultipoint the singleton + * @return GisMultiPoint the singleton * @access public */ public static function singleton() @@ -352,7 +352,7 @@ class GISMultipoint extends GISGeometry $params = array(); if ($index == -1) { $index = 0; - $data = GISGeometry::generateParams($value); + $data = GisGeometry::generateParams($value); $params['srid'] = $data['srid']; $wkt = $data['wkt']; } else { diff --git a/libraries/gis/GISMultipolygon.php b/libraries/classes/Gis/GisMultiPolygon.php similarity index 98% rename from libraries/gis/GISMultipolygon.php rename to libraries/classes/Gis/GisMultiPolygon.php index b47dc74d23..cd32782efc 100644 --- a/libraries/gis/GISMultipolygon.php +++ b/libraries/classes/Gis/GisMultiPolygon.php @@ -6,16 +6,16 @@ * @package PhpMyAdmin-GIS */ -namespace PMA\libraries\gis; +namespace PhpMyAdmin\Gis; -use \TCPDF; +use TCPDF; /** * Handles actions related to GIS MULTIPOLYGON objects * * @package PhpMyAdmin-GIS */ -class GISMultipolygon extends GISGeometry +class GisMultiPolygon extends GisGeometry { // Hold the singleton instance of the class private static $_instance; @@ -32,7 +32,7 @@ class GISMultipolygon extends GISGeometry /** * Returns the singleton. * - * @return GISMultipolygon the singleton + * @return GisMultiPolygon the singleton * @access public */ public static function singleton() @@ -448,14 +448,14 @@ class GISMultipolygon extends GISGeometry // correctly classify inner rings to their respective outer rings. foreach ($row_data['parts'] as $i => $ring) { $row_data['parts'][$i]['isOuter'] - = GISPolygon::isOuterRing($ring['points']); + = GisPolygon::isOuterRing($ring['points']); } // Find points on surface for inner rings foreach ($row_data['parts'] as $i => $ring) { if (!$ring['isOuter']) { $row_data['parts'][$i]['pointOnSurface'] - = GISPolygon::getPointOnSurface($ring['points']); + = GisPolygon::getPointOnSurface($ring['points']); } } @@ -471,7 +471,7 @@ class GISMultipolygon extends GISGeometry // If the pointOnSurface of the inner ring // is also inside the outer ring - if (GISPolygon::isPointInsidePolygon( + if (GisPolygon::isPointInsidePolygon( $ring1['pointOnSurface'], $ring2['points'] ) @@ -549,7 +549,7 @@ class GISMultipolygon extends GISGeometry $params = array(); if ($index == -1) { $index = 0; - $data = GISGeometry::generateParams($value); + $data = GisGeometry::generateParams($value); $params['srid'] = $data['srid']; $wkt = $data['wkt']; } else { diff --git a/libraries/gis/GISPoint.php b/libraries/classes/Gis/GisPoint.php similarity index 98% rename from libraries/gis/GISPoint.php rename to libraries/classes/Gis/GisPoint.php index b92beb9899..2942d2ee0d 100644 --- a/libraries/gis/GISPoint.php +++ b/libraries/classes/Gis/GisPoint.php @@ -6,16 +6,16 @@ * @package PhpMyAdmin-GIS */ -namespace PMA\libraries\gis; +namespace PhpMyAdmin\Gis; -use \TCPDF; +use TCPDF; /** * Handles actions related to GIS POINT objects * * @package PhpMyAdmin-GIS */ -class GISPoint extends GISGeometry +class GisPoint extends GisGeometry { // Hold the singleton instance of the class private static $_instance; @@ -32,7 +32,7 @@ class GISPoint extends GISGeometry /** * Returns the singleton. * - * @return GISPoint the singleton + * @return GisPoint the singleton * @access public */ public static function singleton() @@ -331,7 +331,7 @@ class GISPoint extends GISGeometry $params = array(); if ($index == -1) { $index = 0; - $data = GISGeometry::generateParams($value); + $data = GisGeometry::generateParams($value); $params['srid'] = $data['srid']; $wkt = $data['wkt']; } else { diff --git a/libraries/gis/GISPolygon.php b/libraries/classes/Gis/GisPolygon.php similarity index 98% rename from libraries/gis/GISPolygon.php rename to libraries/classes/Gis/GisPolygon.php index 06b9828733..d0d81033db 100644 --- a/libraries/gis/GISPolygon.php +++ b/libraries/classes/Gis/GisPolygon.php @@ -5,17 +5,17 @@ * * @package PhpMyAdmin-GIS */ -namespace PMA\libraries\gis; +namespace PhpMyAdmin\Gis; use PhpMyAdmin\Util; -use \TCPDF; +use TCPDF; /** * Handles actions related to GIS POLYGON objects * * @package PhpMyAdmin-GIS */ -class GISPolygon extends GISGeometry +class GisPolygon extends GisGeometry { // Hold the singleton instance of the class private static $_instance; @@ -32,7 +32,7 @@ class GISPolygon extends GISGeometry /** * Returns the singleton. * - * @return GISPolygon the singleton + * @return GisPolygon the singleton * @access public */ public static function singleton() @@ -437,7 +437,7 @@ class GISPolygon extends GISGeometry { // If area is negative then it's in clockwise orientation, // i.e. it's an outer ring - if (GISPolygon::area($ring) < 0) { + if (GisPolygon::area($ring) < 0) { return true; } @@ -553,11 +553,11 @@ class GISPolygon extends GISGeometry // One of the points should be inside the polygon, // unless epsilon chosen is too large - if (GISPolygon::isPointInsidePolygon($pointA, $ring)) { + if (GisPolygon::isPointInsidePolygon($pointA, $ring)) { return $pointA; } - if (GISPolygon::isPointInsidePolygon($pointB, $ring)) { + if (GisPolygon::isPointInsidePolygon($pointB, $ring)) { return $pointB; } @@ -583,7 +583,7 @@ class GISPolygon extends GISGeometry $params = array(); if ($index == -1) { $index = 0; - $data = GISGeometry::generateParams($value); + $data = GisGeometry::generateParams($value); $params['srid'] = $data['srid']; $wkt = $data['wkt']; } else { diff --git a/libraries/gis/GISVisualization.php b/libraries/classes/Gis/GisVisualization.php similarity index 98% rename from libraries/gis/GISVisualization.php rename to libraries/classes/Gis/GisVisualization.php index 8927b636ea..1227d4c7a2 100644 --- a/libraries/gis/GISVisualization.php +++ b/libraries/classes/Gis/GisVisualization.php @@ -6,19 +6,19 @@ * @package PhpMyAdmin-GIS */ -namespace PMA\libraries\gis; +namespace PhpMyAdmin\Gis; use PhpMyAdmin\Core; -use PhpMyAdmin\Util; -use \TCPDF; use PhpMyAdmin\Sanitize; +use PhpMyAdmin\Util; +use TCPDF; /** * Handles visualization of GIS data * * @package PhpMyAdmin-GIS */ -class GISVisualization +class GisVisualization { /** * @var array Raw data for the visualization @@ -78,13 +78,13 @@ class GISVisualization * @param integer $row number of rows * @param integer $pos start position * - * @return GISVisualization + * @return GisVisualization * * @access public */ public static function get($sql_query, $options, $row, $pos) { - return new GISVisualization($sql_query, $options, $row, $pos); + return new GisVisualization($sql_query, $options, $row, $pos); } /** @@ -94,11 +94,11 @@ class GISVisualization * ignored * @param array $options Users specified options * - * @return GISVisualization + * @return GisVisualization */ public static function getByData($data, $options) { - return new GISVisualization(null, $options, null, null, $data); + return new GisVisualization(null, $options, null, null, $data); } /** @@ -558,7 +558,7 @@ class GISVisualization } $type = mb_substr($ref_data, 0, $type_pos); - $gis_obj = GISFactory::factory($type); + $gis_obj = GisFactory::factory($type); if (!$gis_obj) { continue; } @@ -647,7 +647,7 @@ class GISVisualization } $type = mb_substr($ref_data, 0, $type_pos); - $gis_obj = GISFactory::factory($type); + $gis_obj = GisFactory::factory($type); if (!$gis_obj) { continue; } diff --git a/libraries/plugins/import/ImportShp.php b/libraries/plugins/import/ImportShp.php index 7a756bab00..d5bbd2bc4c 100644 --- a/libraries/plugins/import/ImportShp.php +++ b/libraries/plugins/import/ImportShp.php @@ -8,11 +8,11 @@ */ namespace PMA\libraries\plugins\import; -use PMA\libraries\gis\GISFactory; -use PMA\libraries\gis\GISMultilinestring; -use PMA\libraries\gis\GISMultipoint; -use PMA\libraries\gis\GISPoint; -use PMA\libraries\gis\GISPolygon; +use PhpMyAdmin\Gis\GisFactory; +use PhpMyAdmin\Gis\GisMultiLineString; +use PhpMyAdmin\Gis\GisMultiPoint; +use PhpMyAdmin\Gis\GisPoint; +use PhpMyAdmin\Gis\GisPolygon; use PhpMyAdmin\Message; use PMA\libraries\plugins\ImportPlugin; use PMA\libraries\properties\plugins\ImportPluginProperties; @@ -186,8 +186,8 @@ class ImportShp extends ImportPlugin } if (isset($gis_type)) { - /** @var GISMultilinestring|\PMA\libraries\gis\GISMultipoint|\PMA\libraries\gis\GISPoint|GISPolygon $gis_obj */ - $gis_obj = GISFactory::factory($gis_type); + /** @var GisMultiLineString|\PhpMyAdmin\Gis\GisMultiPoint|\PhpMyAdmin\Gis\GisPoint|GisPolygon $gis_obj */ + $gis_obj = GisFactory::factory($gis_type); } else { $gis_obj = null; } diff --git a/test/classes/gis/GISFactoryTest.php b/test/classes/gis/GisFactoryTest.php similarity index 63% rename from test/classes/gis/GISFactoryTest.php rename to test/classes/gis/GisFactoryTest.php index 5a1a924d0f..685fd30ba6 100644 --- a/test/classes/gis/GISFactoryTest.php +++ b/test/classes/gis/GisFactoryTest.php @@ -1,18 +1,18 @@ assertInstanceOf($geom, GISFactory::factory($type)); + $this->assertInstanceOf($geom, GisFactory::factory($type)); } /** @@ -39,31 +39,31 @@ class GISFactoryTest extends PHPUnit_Framework_TestCase return array( array( 'MULTIPOLYGON', - 'PMA\libraries\gis\GISMultipolygon' + 'PhpMyAdmin\Gis\GisMultiPolygon' ), array( 'POLYGON', - 'PMA\libraries\gis\GISPolygon' + 'PhpMyAdmin\Gis\GisPolygon' ), array( 'MULTILINESTRING', - 'PMA\libraries\gis\GISMultilinestring' + 'PhpMyAdmin\Gis\GisMultiLineString' ), array( 'LINESTRING', - 'PMA\libraries\gis\GISLinestring' + 'PhpMyAdmin\Gis\GisLineString' ), array( 'MULTIPOINT', - 'PMA\libraries\gis\GISMultipoint' + 'PhpMyAdmin\Gis\GisMultiPoint' ), array( 'POINT', - 'PMA\libraries\gis\GISPoint' + 'PhpMyAdmin\Gis\GisPoint' ), array( 'GEOMETRYCOLLECTION', - 'PMA\libraries\gis\GISGeometrycollection' + 'PhpMyAdmin\Gis\GisGeometryCollection' ), ); } diff --git a/test/classes/gis/GISGeomTest.php b/test/classes/gis/GisGeomTest.php similarity index 96% rename from test/classes/gis/GISGeomTest.php rename to test/classes/gis/GisGeomTest.php index e303bd8137..a2ef32c8c1 100644 --- a/test/classes/gis/GISGeomTest.php +++ b/test/classes/gis/GisGeomTest.php @@ -11,7 +11,7 @@ * * @package PhpMyAdmin-test */ -abstract class GISGeomTest extends PHPUnit_Framework_TestCase +abstract class GisGeomTest extends PHPUnit_Framework_TestCase { /** diff --git a/test/classes/gis/GISGeometrycollectionTest.php b/test/classes/gis/GisGeometryCollectionTest.php similarity index 97% rename from test/classes/gis/GISGeometrycollectionTest.php rename to test/classes/gis/GisGeometryCollectionTest.php index 287011ba8f..8116752a0f 100644 --- a/test/classes/gis/GISGeometrycollectionTest.php +++ b/test/classes/gis/GisGeometryCollectionTest.php @@ -2,19 +2,19 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Test for PMA\libraries\gis\GISGeometry + * Test for PhpMyAdmin\Gis\GisGeometry * * @package PhpMyAdmin-test */ -use PMA\libraries\gis\GISGeometrycollection; +use PhpMyAdmin\Gis\GisGeometryCollection; /** - * Tests for PMA\libraries\gis\GISGeometrycollection class + * Tests for PhpMyAdmin\Gis\GisGeometryCollection class * * @package PhpMyAdmin-test */ -class GISGeometryCollectionTest extends PHPUnit_Framework_TestCase +class GisGeometryCollectionTest extends PHPUnit_Framework_TestCase { /** @@ -31,7 +31,7 @@ class GISGeometryCollectionTest extends PHPUnit_Framework_TestCase */ protected function setUp() { - $this->object = GISGeometrycollection::singleton(); + $this->object = GisGeometryCollection::singleton(); } /** diff --git a/test/classes/gis/GISGeometryTest.php b/test/classes/gis/GisGeometryTest.php similarity index 96% rename from test/classes/gis/GISGeometryTest.php rename to test/classes/gis/GisGeometryTest.php index a84c0236d5..f343500419 100644 --- a/test/classes/gis/GISGeometryTest.php +++ b/test/classes/gis/GisGeometryTest.php @@ -1,17 +1,17 @@ object = $this->getMockForAbstractClass('PMA\libraries\gis\GISGeometry'); + $this->object = $this->getMockForAbstractClass('PhpMyAdmin\Gis\GisGeometry'); } /** @@ -52,7 +52,7 @@ class GISGeometryTest extends PHPUnit_Framework_TestCase */ private function _callProtectedFunction($name, $params) { - $class = new ReflectionClass('PMA\libraries\gis\GISGeometry'); + $class = new ReflectionClass('PhpMyAdmin\Gis\GisGeometry'); $method = $class->getMethod($name); $method->setAccessible(true); return $method->invokeArgs($this->object, $params); diff --git a/test/classes/gis/GISLinestringTest.php b/test/classes/gis/GisLineStringTest.php similarity index 97% rename from test/classes/gis/GISLinestringTest.php rename to test/classes/gis/GisLineStringTest.php index 5f31225140..79544da360 100644 --- a/test/classes/gis/GISLinestringTest.php +++ b/test/classes/gis/GisLineStringTest.php @@ -1,24 +1,24 @@ object = GISLinestring::singleton(); + $this->object = GisLineString::singleton(); } /** diff --git a/test/classes/gis/GISMultilinestringTest.php b/test/classes/gis/GisMultiLineStringTest.php similarity index 97% rename from test/classes/gis/GISMultilinestringTest.php rename to test/classes/gis/GisMultiLineStringTest.php index 31b0289e71..16caefb5e5 100644 --- a/test/classes/gis/GISMultilinestringTest.php +++ b/test/classes/gis/GisMultiLineStringTest.php @@ -1,24 +1,24 @@ object = GISMultilinestring::singleton(); + $this->object = GisMultiLineString::singleton(); } /** diff --git a/test/classes/gis/GISMultipointTest.php b/test/classes/gis/GisMultiPointTest.php similarity index 97% rename from test/classes/gis/GISMultipointTest.php rename to test/classes/gis/GisMultiPointTest.php index 867541a434..254e4b60fd 100644 --- a/test/classes/gis/GISMultipointTest.php +++ b/test/classes/gis/GisMultiPointTest.php @@ -1,24 +1,24 @@ object = GISMultipoint::singleton(); + $this->object = GisMultiPoint::singleton(); } /** diff --git a/test/classes/gis/GISMultipolygonTest.php b/test/classes/gis/GisMultiPolygonTest.php similarity index 98% rename from test/classes/gis/GISMultipolygonTest.php rename to test/classes/gis/GisMultiPolygonTest.php index 5cc54a347d..0557f7a8c7 100644 --- a/test/classes/gis/GISMultipolygonTest.php +++ b/test/classes/gis/GisMultiPolygonTest.php @@ -1,24 +1,24 @@ object = GISMultipolygon::singleton(); + $this->object = GisMultiPolygon::singleton(); } /** diff --git a/test/classes/gis/GISPointTest.php b/test/classes/gis/GisPointTest.php similarity index 97% rename from test/classes/gis/GISPointTest.php rename to test/classes/gis/GisPointTest.php index 9de4a39b1b..b680a56990 100644 --- a/test/classes/gis/GISPointTest.php +++ b/test/classes/gis/GisPointTest.php @@ -1,24 +1,24 @@ object = GISPoint::singleton(); + $this->object = GisPoint::singleton(); } /** diff --git a/test/classes/gis/GISPolygonTest.php b/test/classes/gis/GisPolygonTest.php similarity index 98% rename from test/classes/gis/GISPolygonTest.php rename to test/classes/gis/GisPolygonTest.php index 0dea3ca434..2a6b7bfb79 100644 --- a/test/classes/gis/GISPolygonTest.php +++ b/test/classes/gis/GisPolygonTest.php @@ -1,24 +1,24 @@ object = GISPolygon::singleton(); + $this->object = GisPolygon::singleton(); } /** From 17f5524190a62531f6bd9df82ff17bbbc24058c7 Mon Sep 17 00:00:00 2001 From: Erik V Date: Wed, 19 Jul 2017 09:47:54 +0000 Subject: [PATCH 04/12] Translated using Weblate (German) Currently translated at 99.8% (3209 of 3213 strings) [CI skip] --- po/de.po | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/po/de.po b/po/de.po index feb241a6e7..31de03596e 100644 --- a/po/de.po +++ b/po/de.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2017-07-18 13:31+0200\n" -"PO-Revision-Date: 2017-06-23 15:38+0000\n" -"Last-Translator: Alpix \n" -"Language-Team: German \n" +"PO-Revision-Date: 2017-07-19 09:47+0000\n" +"Last-Translator: Erik V \n" +"Language-Team: German " +"\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.15-dev\n" +"X-Generator: Weblate 2.16-dev\n" #: ajax.php:16 ajax.php:33 export.php:195 schema_export.php:66 msgid "Bad type!" @@ -3513,11 +3513,9 @@ msgid "accent-sensitive" msgstr "Beachtet Groß- und Kleinschreibung" #: libraries/classes/Charsets.php:597 -#, fuzzy -#| msgid "multilingual" msgctxt "Collation variant" msgid "multi-level" -msgstr "mehrsprachig" +msgstr "mehrschichtig" #: libraries/classes/Charsets.php:600 msgctxt "Collation variant" From 5b9ad5ee04c9caa474c7efb1393210a8f3683fa2 Mon Sep 17 00:00:00 2001 From: Vladimir G Date: Wed, 19 Jul 2017 14:12:02 +0000 Subject: [PATCH 05/12] Translated using Weblate (Russian) Currently translated at 93.8% (3015 of 3213 strings) [CI skip] --- po/ru.po | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/po/ru.po b/po/ru.po index fdee07d5f2..5e820bf0a1 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,17 +4,17 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2017-07-18 13:31+0200\n" -"PO-Revision-Date: 2016-11-18 10:29+0000\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Russian \n" +"PO-Revision-Date: 2017-07-19 14:12+0000\n" +"Last-Translator: Vladimir G. \n" +"Language-Team: Russian " +"\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 2.10-dev\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" +"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 2.16-dev\n" #: ajax.php:16 ajax.php:33 export.php:195 schema_export.php:66 msgid "Bad type!" @@ -28,9 +28,7 @@ msgstr "Ошибочный тип!" msgid "" "The %s file is not available on this system, please visit %s for more " "information." -msgstr "" -"Файл %s не найден. Вся дополнительная информация находится на сайте www." -"phpmyadmin.net." +msgstr "Файл %s не найден. Вся дополнительная информация находится на сайте %s." #: db_central_columns.php:110 msgid "The central list of columns for the current database is empty." @@ -3155,9 +3153,10 @@ msgid "Failed formatting string for rule '%s'." msgstr "Не удалось форматировать строку для правила '%s'." #: libraries/classes/Advisor.php:478 -#, php-format +#, fuzzy, php-format msgid "Error in reading file: The file '%s' does not exist or is not readable!" msgstr "" +"Ошибка чтения файла: Файл '%s' не существует или не доступен для чтения!" #: libraries/classes/Advisor.php:503 #, php-format From dc1407ca666ed2e35bcf6bf9406941017a1a627c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Wed, 19 Jul 2017 21:52:26 -0300 Subject: [PATCH 06/12] Move navigation 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 --- libraries/classes/Header.php | 2 +- .../Navigation}/Navigation.php | 2 +- .../Navigation}/NavigationHeader.php | 2 +- .../Navigation}/NavigationTree.php | 18 +++++++++--------- .../Navigation}/NodeFactory.php | 7 +++---- .../Navigation/Nodes}/Node.php | 6 +++--- .../Navigation/Nodes}/NodeColumn.php | 2 +- .../Navigation/Nodes}/NodeColumnContainer.php | 4 ++-- .../Navigation/Nodes}/NodeDatabase.php | 10 +++++----- .../Navigation/Nodes}/NodeDatabaseChild.php | 2 +- .../Nodes}/NodeDatabaseChildContainer.php | 2 +- .../Nodes}/NodeDatabaseContainer.php | 4 ++-- .../Navigation/Nodes}/NodeEvent.php | 2 +- .../Navigation/Nodes}/NodeEventContainer.php | 4 ++-- .../Navigation/Nodes}/NodeFunction.php | 2 +- .../Nodes}/NodeFunctionContainer.php | 4 ++-- .../Navigation/Nodes}/NodeIndex.php | 2 +- .../Navigation/Nodes}/NodeIndexContainer.php | 4 ++-- .../Navigation/Nodes}/NodeProcedure.php | 2 +- .../Nodes}/NodeProcedureContainer.php | 4 ++-- .../Navigation/Nodes}/NodeTable.php | 10 +++++----- .../Navigation/Nodes}/NodeTableContainer.php | 4 ++-- .../Navigation/Nodes}/NodeTrigger.php | 2 +- .../Navigation/Nodes}/NodeTriggerContainer.php | 4 ++-- .../Navigation/Nodes}/NodeView.php | 2 +- .../Navigation/Nodes}/NodeViewContainer.php | 4 ++-- navigation.php | 2 +- test/classes/navigation/NavigationTest.php | 8 ++++---- test/classes/navigation/NavigationTreeTest.php | 8 ++++---- .../navigation/NodeColumnContainerTest.php | 9 ++++----- test/classes/navigation/NodeColumnTest.php | 9 ++++----- .../navigation/NodeDatabaseChildTest.php | 10 +++++----- test/classes/navigation/NodeDatabaseTest.php | 7 +++---- .../navigation/NodeEventContainerTest.php | 7 +++---- test/classes/navigation/NodeEventTest.php | 7 +++---- test/classes/navigation/NodeFactoryTest.php | 15 +++++++-------- .../navigation/NodeFunctionContainerTest.php | 7 +++---- test/classes/navigation/NodeFunctionTest.php | 7 +++---- .../navigation/NodeIndexContainerTest.php | 7 +++---- test/classes/navigation/NodeIndexTest.php | 7 +++---- .../navigation/NodeProcedureContainerTest.php | 7 +++---- test/classes/navigation/NodeProcedureTest.php | 7 +++---- .../navigation/NodeTableContainerTest.php | 7 +++---- test/classes/navigation/NodeTableTest.php | 7 +++---- test/classes/navigation/NodeTest.php | 7 +++---- .../navigation/NodeTriggerContainerTest.php | 7 +++---- test/classes/navigation/NodeTriggerTest.php | 7 +++---- .../navigation/NodeViewContainerTest.php | 7 +++---- test/classes/navigation/NodeViewTest.php | 7 +++---- 49 files changed, 132 insertions(+), 152 deletions(-) rename libraries/{navigation => classes/Navigation}/Navigation.php (99%) rename libraries/{navigation => classes/Navigation}/NavigationHeader.php (99%) rename libraries/{navigation => classes/Navigation}/NavigationTree.php (99%) rename libraries/{navigation => classes/Navigation}/NodeFactory.php (93%) rename libraries/{navigation/nodes => classes/Navigation/Nodes}/Node.php (98%) rename libraries/{navigation/nodes => classes/Navigation/Nodes}/NodeColumn.php (96%) rename libraries/{navigation/nodes => classes/Navigation/Nodes}/NodeColumnContainer.php (94%) rename libraries/{navigation/nodes => classes/Navigation/Nodes}/NodeDatabase.php (98%) rename libraries/{navigation/nodes => classes/Navigation/Nodes}/NodeDatabaseChild.php (97%) rename libraries/{navigation/nodes => classes/Navigation/Nodes}/NodeDatabaseChildContainer.php (96%) rename libraries/{navigation/nodes => classes/Navigation/Nodes}/NodeDatabaseContainer.php (93%) rename libraries/{navigation/nodes => classes/Navigation/Nodes}/NodeEvent.php (96%) rename libraries/{navigation/nodes => classes/Navigation/Nodes}/NodeEventContainer.php (94%) rename libraries/{navigation/nodes => classes/Navigation/Nodes}/NodeFunction.php (97%) rename libraries/{navigation/nodes => classes/Navigation/Nodes}/NodeFunctionContainer.php (94%) rename libraries/{navigation/nodes => classes/Navigation/Nodes}/NodeIndex.php (96%) rename libraries/{navigation/nodes => classes/Navigation/Nodes}/NodeIndexContainer.php (94%) rename libraries/{navigation/nodes => classes/Navigation/Nodes}/NodeProcedure.php (97%) rename libraries/{navigation/nodes => classes/Navigation/Nodes}/NodeProcedureContainer.php (94%) rename libraries/{navigation/nodes => classes/Navigation/Nodes}/NodeTable.php (96%) rename libraries/{navigation/nodes => classes/Navigation/Nodes}/NodeTableContainer.php (94%) rename libraries/{navigation/nodes => classes/Navigation/Nodes}/NodeTrigger.php (96%) rename libraries/{navigation/nodes => classes/Navigation/Nodes}/NodeTriggerContainer.php (94%) rename libraries/{navigation/nodes => classes/Navigation/Nodes}/NodeView.php (96%) rename libraries/{navigation/nodes => classes/Navigation/Nodes}/NodeViewContainer.php (94%) diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php index 2cd2e9936e..752e2cc118 100644 --- a/libraries/classes/Header.php +++ b/libraries/classes/Header.php @@ -12,7 +12,7 @@ use PhpMyAdmin\Console; use PhpMyAdmin\Core; use PhpMyAdmin\Menu; use PhpMyAdmin\Message; -use PMA\libraries\navigation\Navigation; +use PhpMyAdmin\Navigation\Navigation; use PhpMyAdmin\RecentFavoriteTable; use PhpMyAdmin\Sanitize; use PhpMyAdmin\Scripts; diff --git a/libraries/navigation/Navigation.php b/libraries/classes/Navigation/Navigation.php similarity index 99% rename from libraries/navigation/Navigation.php rename to libraries/classes/Navigation/Navigation.php index df5bd3cb0a..f801b52c7b 100644 --- a/libraries/navigation/Navigation.php +++ b/libraries/classes/Navigation/Navigation.php @@ -6,7 +6,7 @@ * * @package PhpMyAdmin-navigation */ -namespace PMA\libraries\navigation; +namespace PhpMyAdmin\Navigation; use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Message; diff --git a/libraries/navigation/NavigationHeader.php b/libraries/classes/Navigation/NavigationHeader.php similarity index 99% rename from libraries/navigation/NavigationHeader.php rename to libraries/classes/Navigation/NavigationHeader.php index aba2b38910..2a6d5d8558 100644 --- a/libraries/navigation/NavigationHeader.php +++ b/libraries/classes/Navigation/NavigationHeader.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation; +namespace PhpMyAdmin\Navigation; use PhpMyAdmin\Sanitize; use PhpMyAdmin\Template; diff --git a/libraries/navigation/NavigationTree.php b/libraries/classes/Navigation/NavigationTree.php similarity index 99% rename from libraries/navigation/NavigationTree.php rename to libraries/classes/Navigation/NavigationTree.php index d9ffa8a9de..bc55d00b62 100644 --- a/libraries/navigation/NavigationTree.php +++ b/libraries/classes/Navigation/NavigationTree.php @@ -5,13 +5,13 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation; +namespace PhpMyAdmin\Navigation; -use PMA\libraries\navigation\nodes\Node; -use PMA\libraries\navigation\nodes\NodeDatabase; -use PMA\libraries\navigation\nodes\NodeTable; -use PMA\libraries\navigation\nodes\NodeTableContainer; -use PMA\libraries\navigation\nodes\NodeViewContainer; +use PhpMyAdmin\Navigation\Nodes\Node; +use PhpMyAdmin\Navigation\Nodes\NodeDatabase; +use PhpMyAdmin\Navigation\Nodes\NodeTable; +use PhpMyAdmin\Navigation\Nodes\NodeTableContainer; +use PhpMyAdmin\Navigation\Nodes\NodeViewContainer; use PhpMyAdmin\RecentFavoriteTable; use PhpMyAdmin\Response; use PhpMyAdmin\Util; @@ -860,7 +860,7 @@ class NavigationTree $children = $this->_tree->children; usort( $children, - array('PMA\\libraries\\navigation\\NavigationTree', 'sortNode') + array('PhpMyAdmin\\Navigation\\NavigationTree', 'sortNode') ); $this->_setVisibility(); for ($i = 0, $nbChildren = count($children); $i < $nbChildren; $i++) { @@ -903,7 +903,7 @@ class NavigationTree $children = $node->children; usort( $children, - array('PMA\\libraries\\navigation\\NavigationTree', 'sortNode') + array('PhpMyAdmin\\Navigation\\NavigationTree', 'sortNode') ); for ($i = 0, $nbChildren = count($children); $i < $nbChildren; $i++) { if ($i + 1 != $nbChildren) { @@ -1299,7 +1299,7 @@ class NavigationTree $children = $this->_tree->children; usort( $children, - array('PMA\\libraries\\navigation\\NavigationTree', 'sortNode') + array('PhpMyAdmin\\Navigation\\NavigationTree', 'sortNode') ); $this->_setVisibility(); for ($i = 0, $nbChildren = count($children); $i < $nbChildren; $i++) { diff --git a/libraries/navigation/NodeFactory.php b/libraries/classes/Navigation/NodeFactory.php similarity index 93% rename from libraries/navigation/NodeFactory.php rename to libraries/classes/Navigation/NodeFactory.php index 305a7e7bb0..5c0f4dc9ba 100644 --- a/libraries/navigation/NodeFactory.php +++ b/libraries/classes/Navigation/NodeFactory.php @@ -5,9 +5,9 @@ * * @package PhpMyAdmin-navigation */ -namespace PMA\libraries\navigation; +namespace PhpMyAdmin\Navigation; -use PMA\libraries\navigation\nodes\Node; +use PhpMyAdmin\Navigation\Nodes\Node; /** * Node factory - instantiates Node objects or objects derived from the Node class @@ -16,7 +16,7 @@ use PMA\libraries\navigation\nodes\Node; */ class NodeFactory { - protected static $_namespace = 'PMA\\libraries\\navigation\\nodes\\%s'; + protected static $_namespace = 'PhpMyAdmin\\Navigation\\Nodes\\%s'; /** * Sanitizes the name of a Node class * @@ -89,4 +89,3 @@ class NodeFactory return new $class($name, $type, $is_group); } } - diff --git a/libraries/navigation/nodes/Node.php b/libraries/classes/Navigation/Nodes/Node.php similarity index 98% rename from libraries/navigation/nodes/Node.php rename to libraries/classes/Navigation/Nodes/Node.php index 62f4a6c9b5..c8ca16dc5b 100644 --- a/libraries/navigation/nodes/Node.php +++ b/libraries/classes/Navigation/Nodes/Node.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; @@ -341,7 +341,7 @@ class Node /** * Returns the names of children of type $type present inside this container - * This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase and PMA\libraries\navigation\nodes\NodeTable classes + * This method is overridden by the PhpMyAdmin\Navigation\Nodes\NodeDatabase and PhpMyAdmin\Navigation\Nodes\NodeTable classes * * @param string $type The type of item we are looking for * ('tables', 'views', etc) @@ -550,7 +550,7 @@ class Node /** * Returns the number of children of type $type present inside this container - * This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase and PMA\libraries\navigation\nodes\NodeTable classes + * This method is overridden by the PhpMyAdmin\Navigation\Nodes\NodeDatabase and PhpMyAdmin\Navigation\Nodes\NodeTable classes * * @param string $type The type of item we are looking for * ('tables', 'views', etc) diff --git a/libraries/navigation/nodes/NodeColumn.php b/libraries/classes/Navigation/Nodes/NodeColumn.php similarity index 96% rename from libraries/navigation/nodes/NodeColumn.php rename to libraries/classes/Navigation/Nodes/NodeColumn.php index 99bcd8978e..e7215f88b7 100644 --- a/libraries/navigation/nodes/NodeColumn.php +++ b/libraries/classes/Navigation/Nodes/NodeColumn.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; diff --git a/libraries/navigation/nodes/NodeColumnContainer.php b/libraries/classes/Navigation/Nodes/NodeColumnContainer.php similarity index 94% rename from libraries/navigation/nodes/NodeColumnContainer.php rename to libraries/classes/Navigation/Nodes/NodeColumnContainer.php index 308f00ff0c..927718c08d 100644 --- a/libraries/navigation/nodes/NodeColumnContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeColumnContainer.php @@ -5,9 +5,9 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; -use PMA\libraries\navigation\NodeFactory; +use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Util; /** diff --git a/libraries/navigation/nodes/NodeDatabase.php b/libraries/classes/Navigation/Nodes/NodeDatabase.php similarity index 98% rename from libraries/navigation/nodes/NodeDatabase.php rename to libraries/classes/Navigation/Nodes/NodeDatabase.php index bf0b71bbb4..4698c68c5e 100644 --- a/libraries/navigation/nodes/NodeDatabase.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabase.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Url; use PhpMyAdmin\Util; @@ -57,8 +57,8 @@ class NodeDatabase extends Node /** * Returns the number of children of type $type present inside this container - * This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase - * and PMA\libraries\navigation\nodes\NodeTable classes + * This method is overridden by the PhpMyAdmin\Navigation\Nodes\NodeDatabase + * and PhpMyAdmin\Navigation\Nodes\NodeTable classes * * @param string $type The type of item we are looking for * ('tables', 'views', etc) @@ -352,8 +352,8 @@ class NodeDatabase extends Node /** * Returns the names of children of type $type present inside this container - * This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase - * and PMA\libraries\navigation\nodes\NodeTable classes + * This method is overridden by the PhpMyAdmin\Navigation\Nodes\NodeDatabase + * and PhpMyAdmin\Navigation\Nodes\NodeTable classes * * @param string $type The type of item we are looking for * ('tables', 'views', etc) diff --git a/libraries/navigation/nodes/NodeDatabaseChild.php b/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php similarity index 97% rename from libraries/navigation/nodes/NodeDatabaseChild.php rename to libraries/classes/Navigation/Nodes/NodeDatabaseChild.php index bcea8cdede..d0616857eb 100644 --- a/libraries/navigation/nodes/NodeDatabaseChild.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Url; use PhpMyAdmin\Util; diff --git a/libraries/navigation/nodes/NodeDatabaseChildContainer.php b/libraries/classes/Navigation/Nodes/NodeDatabaseChildContainer.php similarity index 96% rename from libraries/navigation/nodes/NodeDatabaseChildContainer.php rename to libraries/classes/Navigation/Nodes/NodeDatabaseChildContainer.php index 59250f7270..e11ff6970c 100644 --- a/libraries/navigation/nodes/NodeDatabaseChildContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabaseChildContainer.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; /** * Represents container node that carries children of a database diff --git a/libraries/navigation/nodes/NodeDatabaseContainer.php b/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php similarity index 93% rename from libraries/navigation/nodes/NodeDatabaseContainer.php rename to libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php index 73fbb5003e..d5a08d9a85 100644 --- a/libraries/navigation/nodes/NodeDatabaseContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php @@ -5,9 +5,9 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; -use PMA\libraries\navigation\NodeFactory; +use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Util; require_once './libraries/check_user_privileges.lib.php'; diff --git a/libraries/navigation/nodes/NodeEvent.php b/libraries/classes/Navigation/Nodes/NodeEvent.php similarity index 96% rename from libraries/navigation/nodes/NodeEvent.php rename to libraries/classes/Navigation/Nodes/NodeEvent.php index 45a25f9930..03015b19f8 100644 --- a/libraries/navigation/nodes/NodeEvent.php +++ b/libraries/classes/Navigation/Nodes/NodeEvent.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; diff --git a/libraries/navigation/nodes/NodeEventContainer.php b/libraries/classes/Navigation/Nodes/NodeEventContainer.php similarity index 94% rename from libraries/navigation/nodes/NodeEventContainer.php rename to libraries/classes/Navigation/Nodes/NodeEventContainer.php index 10362c9f1c..7c4b61cecb 100644 --- a/libraries/navigation/nodes/NodeEventContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeEventContainer.php @@ -5,9 +5,9 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; -use PMA\libraries\navigation\NodeFactory; +use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Util; /** diff --git a/libraries/navigation/nodes/NodeFunction.php b/libraries/classes/Navigation/Nodes/NodeFunction.php similarity index 97% rename from libraries/navigation/nodes/NodeFunction.php rename to libraries/classes/Navigation/Nodes/NodeFunction.php index 0523f0bc64..dea19ddc33 100644 --- a/libraries/navigation/nodes/NodeFunction.php +++ b/libraries/classes/Navigation/Nodes/NodeFunction.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; diff --git a/libraries/navigation/nodes/NodeFunctionContainer.php b/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php similarity index 94% rename from libraries/navigation/nodes/NodeFunctionContainer.php rename to libraries/classes/Navigation/Nodes/NodeFunctionContainer.php index f0864762a3..9ff6de783d 100644 --- a/libraries/navigation/nodes/NodeFunctionContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php @@ -5,9 +5,9 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; -use PMA\libraries\navigation\NodeFactory; +use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Util; /** diff --git a/libraries/navigation/nodes/NodeIndex.php b/libraries/classes/Navigation/Nodes/NodeIndex.php similarity index 96% rename from libraries/navigation/nodes/NodeIndex.php rename to libraries/classes/Navigation/Nodes/NodeIndex.php index a836ce89c0..359b905737 100644 --- a/libraries/navigation/nodes/NodeIndex.php +++ b/libraries/classes/Navigation/Nodes/NodeIndex.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; diff --git a/libraries/navigation/nodes/NodeIndexContainer.php b/libraries/classes/Navigation/Nodes/NodeIndexContainer.php similarity index 94% rename from libraries/navigation/nodes/NodeIndexContainer.php rename to libraries/classes/Navigation/Nodes/NodeIndexContainer.php index 5d34361efe..2e28dfd4a7 100644 --- a/libraries/navigation/nodes/NodeIndexContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeIndexContainer.php @@ -5,9 +5,9 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; -use PMA\libraries\navigation\NodeFactory; +use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Util; /** diff --git a/libraries/navigation/nodes/NodeProcedure.php b/libraries/classes/Navigation/Nodes/NodeProcedure.php similarity index 97% rename from libraries/navigation/nodes/NodeProcedure.php rename to libraries/classes/Navigation/Nodes/NodeProcedure.php index be3a891b17..e442503d38 100644 --- a/libraries/navigation/nodes/NodeProcedure.php +++ b/libraries/classes/Navigation/Nodes/NodeProcedure.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; diff --git a/libraries/navigation/nodes/NodeProcedureContainer.php b/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php similarity index 94% rename from libraries/navigation/nodes/NodeProcedureContainer.php rename to libraries/classes/Navigation/Nodes/NodeProcedureContainer.php index e88b2e32ed..f9ed5ea138 100644 --- a/libraries/navigation/nodes/NodeProcedureContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php @@ -5,9 +5,9 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; -use PMA\libraries\navigation\NodeFactory; +use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Util; /** diff --git a/libraries/navigation/nodes/NodeTable.php b/libraries/classes/Navigation/Nodes/NodeTable.php similarity index 96% rename from libraries/navigation/nodes/NodeTable.php rename to libraries/classes/Navigation/Nodes/NodeTable.php index 65cd08167d..f11a99ad68 100644 --- a/libraries/navigation/nodes/NodeTable.php +++ b/libraries/classes/Navigation/Nodes/NodeTable.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; @@ -75,8 +75,8 @@ class NodeTable extends NodeDatabaseChild /** * Returns the number of children of type $type present inside this container - * This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase - * and PMA\libraries\navigation\nodes\NodeTable classes + * This method is overridden by the PhpMyAdmin\Navigation\Nodes\NodeDatabase + * and PhpMyAdmin\Navigation\Nodes\NodeTable classes * * @param string $type The type of item we are looking for * ('columns' or 'indexes') @@ -145,8 +145,8 @@ class NodeTable extends NodeDatabaseChild /** * Returns the names of children of type $type present inside this container - * This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase - * and PMA\libraries\navigation\nodes\NodeTable classes + * This method is overridden by the PhpMyAdmin\Navigation\Nodes\NodeDatabase + * and PhpMyAdmin\Navigation\Nodes\NodeTable classes * * @param string $type The type of item we are looking for * ('tables', 'views', etc) diff --git a/libraries/navigation/nodes/NodeTableContainer.php b/libraries/classes/Navigation/Nodes/NodeTableContainer.php similarity index 94% rename from libraries/navigation/nodes/NodeTableContainer.php rename to libraries/classes/Navigation/Nodes/NodeTableContainer.php index 61d993bad9..cf6880adf2 100644 --- a/libraries/navigation/nodes/NodeTableContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeTableContainer.php @@ -5,9 +5,9 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; -use PMA\libraries\navigation\NodeFactory; +use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Util; /** diff --git a/libraries/navigation/nodes/NodeTrigger.php b/libraries/classes/Navigation/Nodes/NodeTrigger.php similarity index 96% rename from libraries/navigation/nodes/NodeTrigger.php rename to libraries/classes/Navigation/Nodes/NodeTrigger.php index 42dff457d3..8ba7c35ea0 100644 --- a/libraries/navigation/nodes/NodeTrigger.php +++ b/libraries/classes/Navigation/Nodes/NodeTrigger.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; diff --git a/libraries/navigation/nodes/NodeTriggerContainer.php b/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php similarity index 94% rename from libraries/navigation/nodes/NodeTriggerContainer.php rename to libraries/classes/Navigation/Nodes/NodeTriggerContainer.php index 422d2708b6..989c2692ce 100644 --- a/libraries/navigation/nodes/NodeTriggerContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php @@ -5,9 +5,9 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; -use PMA\libraries\navigation\NodeFactory; +use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Util; /** diff --git a/libraries/navigation/nodes/NodeView.php b/libraries/classes/Navigation/Nodes/NodeView.php similarity index 96% rename from libraries/navigation/nodes/NodeView.php rename to libraries/classes/Navigation/Nodes/NodeView.php index b4c548f155..987aba119d 100644 --- a/libraries/navigation/nodes/NodeView.php +++ b/libraries/classes/Navigation/Nodes/NodeView.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; diff --git a/libraries/navigation/nodes/NodeViewContainer.php b/libraries/classes/Navigation/Nodes/NodeViewContainer.php similarity index 94% rename from libraries/navigation/nodes/NodeViewContainer.php rename to libraries/classes/Navigation/Nodes/NodeViewContainer.php index dfa5486f88..394173a783 100644 --- a/libraries/navigation/nodes/NodeViewContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeViewContainer.php @@ -5,9 +5,9 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; -use PMA\libraries\navigation\NodeFactory; +use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Util; /** diff --git a/navigation.php b/navigation.php index bfa4e566c6..73add27fd9 100644 --- a/navigation.php +++ b/navigation.php @@ -9,7 +9,7 @@ // Include common functionalities use PhpMyAdmin\Response; use PhpMyAdmin\Config\PageSettings; -use PMA\libraries\navigation\Navigation; +use PhpMyAdmin\Navigation\Navigation; require_once './libraries/common.inc.php'; diff --git a/test/classes/navigation/NavigationTest.php b/test/classes/navigation/NavigationTest.php index 29daf2fb8b..4e5b6ba155 100644 --- a/test/classes/navigation/NavigationTest.php +++ b/test/classes/navigation/NavigationTest.php @@ -1,7 +1,7 @@ object = new PMA\libraries\navigation\Navigation(); + $this->object = new PhpMyAdmin\Navigation\Navigation(); $GLOBALS['cfgRelation']['db'] = 'pmadb'; $GLOBALS['cfgRelation']['navigationhiding'] = 'navigationhiding'; $GLOBALS['cfg']['Server']['user'] = 'user'; diff --git a/test/classes/navigation/NavigationTreeTest.php b/test/classes/navigation/NavigationTreeTest.php index 17a4ff1ec1..39fbc4ae39 100644 --- a/test/classes/navigation/NavigationTreeTest.php +++ b/test/classes/navigation/NavigationTreeTest.php @@ -1,7 +1,7 @@ object = new PMA\libraries\navigation\NavigationTree(); + $this->object = new PhpMyAdmin\Navigation\NavigationTree(); } /** diff --git a/test/classes/navigation/NodeColumnContainerTest.php b/test/classes/navigation/NodeColumnContainerTest.php index e9e071462e..bccc8299e9 100644 --- a/test/classes/navigation/NodeColumnContainerTest.php +++ b/test/classes/navigation/NodeColumnContainerTest.php @@ -1,19 +1,18 @@ object = $this->getMockForAbstractClass( - 'PMA\libraries\navigation\nodes\NodeDatabaseChild', array('child') + 'PhpMyAdmin\Navigation\Nodes\NodeDatabaseChild', array('child') ); } diff --git a/test/classes/navigation/NodeDatabaseTest.php b/test/classes/navigation/NodeDatabaseTest.php index e13a17c053..a6f285d8be 100644 --- a/test/classes/navigation/NodeDatabaseTest.php +++ b/test/classes/navigation/NodeDatabaseTest.php @@ -1,19 +1,18 @@ setAccessible(true); diff --git a/test/classes/navigation/NodeTriggerContainerTest.php b/test/classes/navigation/NodeTriggerContainerTest.php index d153107323..44d7b85552 100644 --- a/test/classes/navigation/NodeTriggerContainerTest.php +++ b/test/classes/navigation/NodeTriggerContainerTest.php @@ -1,19 +1,18 @@ Date: Thu, 20 Jul 2017 09:37:39 -0300 Subject: [PATCH 07/12] Fix class not found MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/Navigation/NavigationTree.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/classes/Navigation/NavigationTree.php b/libraries/classes/Navigation/NavigationTree.php index bc55d00b62..e1aa71fb7d 100644 --- a/libraries/classes/Navigation/NavigationTree.php +++ b/libraries/classes/Navigation/NavigationTree.php @@ -1207,7 +1207,7 @@ class NavigationTree $children = $node->children; usort( $children, - array('PMA\\libraries\\navigation\\NavigationTree', 'sortNode') + array('PhpMyAdmin\\Navigation\\NavigationTree', 'sortNode') ); $buffer = ''; $extra_class = ''; From 2631bcedbaeede80db7ad2828ce06189970a4147 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Thu, 20 Jul 2017 11:50:12 -0300 Subject: [PATCH 08/12] Move plugins 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 --- db_operations.php | 4 +- doc/transformations.rst | 11 ++- export.php | 4 +- import.php | 4 +- libraries/check_user_privileges.lib.php | 2 +- libraries/classes/DisplayResults.php | 20 ++--- .../Plugins/Auth}/AuthenticationConfig.php | 4 +- .../Plugins/Auth}/AuthenticationCookie.php | 4 +- .../Plugins/Auth}/AuthenticationHttp.php | 4 +- .../Plugins/Auth}/AuthenticationSignon.php | 4 +- .../Plugins}/AuthenticationPlugin.php | 2 +- .../Plugins/Export}/ExportCodegen.php | 6 +- .../Plugins/Export}/ExportCsv.php | 4 +- .../Plugins/Export}/ExportExcel.php | 2 +- .../Plugins/Export}/ExportHtmlword.php | 4 +- .../Plugins/Export}/ExportJson.php | 4 +- .../Plugins/Export}/ExportLatex.php | 4 +- .../Plugins/Export}/ExportMediawiki.php | 4 +- .../Plugins/Export}/ExportOds.php | 7 +- .../Plugins/Export}/ExportOdt.php | 7 +- .../Plugins/Export}/ExportPdf.php | 12 +-- .../Plugins/Export}/ExportPhparray.php | 4 +- .../Plugins/Export}/ExportSql.php | 4 +- .../Plugins/Export}/ExportTexytext.php | 4 +- .../Plugins/Export}/ExportXml.php | 4 +- .../Plugins/Export}/ExportYaml.php | 4 +- .../Plugins/Export/Helpers}/Pdf.php | 4 +- .../Plugins/Export/Helpers}/TableProperty.php | 8 +- .../export => classes/Plugins/Export}/README | 6 +- .../Plugins}/ExportPlugin.php | 2 +- .../Plugins}/IOTransformationsPlugin.php | 4 +- .../Plugins/Import}/AbstractImportCsv.php | 4 +- .../Plugins/Import}/ImportCsv.php | 2 +- .../Plugins/Import}/ImportLdi.php | 4 +- .../Plugins/Import}/ImportMediawiki.php | 4 +- .../Plugins/Import}/ImportOds.php | 4 +- .../Plugins/Import}/ImportShp.php | 4 +- .../Plugins/Import}/ImportSql.php | 4 +- .../Plugins/Import}/ImportXml.php | 4 +- .../import => classes/Plugins/Import}/README | 9 +-- .../Plugins/Import}/ShapeFileImport.php | 2 +- .../Plugins/Import/Upload}/UploadApc.php | 4 +- .../Plugins/Import/Upload}/UploadNoplugin.php | 4 +- .../Plugins/Import/Upload}/UploadProgress.php | 4 +- .../Plugins/Import/Upload}/UploadSession.php | 4 +- .../Plugins}/ImportPlugin.php | 2 +- .../Plugins/Schema/Dia}/Dia.php | 2 +- .../Plugins/Schema/Dia}/DiaRelationSchema.php | 14 ++-- .../Plugins/Schema/Dia}/RelationStatsDia.php | 6 +- .../Plugins/Schema/Dia}/TableStatsDia.php | 10 +-- .../Plugins/Schema/Eps}/Eps.php | 2 +- .../Plugins/Schema/Eps}/EpsRelationSchema.php | 14 ++-- .../Plugins/Schema/Eps}/RelationStatsEps.php | 8 +- .../Plugins/Schema/Eps}/TableStatsEps.php | 12 +-- .../Plugins/Schema}/ExportRelationSchema.php | 4 +- .../Plugins/Schema/Pdf}/Pdf.php | 2 +- .../Plugins/Schema/Pdf}/PdfRelationSchema.php | 4 +- .../Plugins/Schema/Pdf}/RelationStatsPdf.php | 8 +- .../Plugins/Schema/Pdf}/TableStatsPdf.php | 12 +-- .../Plugins/Schema}/RelationStats.php | 2 +- .../Plugins/Schema}/SchemaDia.php | 6 +- .../Plugins/Schema}/SchemaEps.php | 6 +- .../Plugins/Schema}/SchemaPdf.php | 6 +- .../Plugins/Schema}/SchemaSvg.php | 6 +- .../Plugins/Schema/Svg}/RelationStatsSvg.php | 8 +- .../Plugins/Schema/Svg}/Svg.php | 4 +- .../Plugins/Schema/Svg}/SvgRelationSchema.php | 24 +++--- .../Plugins/Schema/Svg}/TableStatsSvg.php | 12 +-- .../Plugins/Schema}/TableStats.php | 2 +- .../Plugins}/SchemaPlugin.php | 2 +- .../Abs}/Bool2TextTransformationsPlugin.php | 4 +- .../CodeMirrorEditorTransformationPlugin.php | 4 +- .../Abs}/DateFormatTransformationsPlugin.php | 4 +- .../Abs}/DownloadTransformationsPlugin.php | 4 +- .../Abs}/ExternalTransformationsPlugin.php | 6 +- .../Abs}/FormattedTransformationsPlugin.php | 4 +- .../Abs}/HexTransformationsPlugin.php | 4 +- .../Abs}/ImageLinkTransformationsPlugin.php | 4 +- .../Abs}/ImageUploadTransformationsPlugin.php | 4 +- .../Abs}/InlineTransformationsPlugin.php | 4 +- .../Abs}/LongToIPv4TransformationsPlugin.php | 4 +- .../Abs}/PreApPendTransformationsPlugin.php | 4 +- .../RegexValidationTransformationsPlugin.php | 4 +- .../Abs}/SQLTransformationsPlugin.php | 4 +- .../Abs}/SubstringTransformationsPlugin.php | 4 +- .../TextFileUploadTransformationsPlugin.php | 4 +- .../TextImageLinkTransformationsPlugin.php | 4 +- .../Abs}/TextLinkTransformationsPlugin.php | 4 +- .../Input}/Image_JPEG_Upload.php | 4 +- .../Input}/Text_Plain_FileUpload.php | 4 +- .../Input}/Text_Plain_Iptobinary.php | 4 +- .../Input}/Text_Plain_JsonEditor.php | 4 +- .../Input}/Text_Plain_RegexValidation.php | 4 +- .../Input}/Text_Plain_SqlEditor.php | 4 +- .../Input}/Text_Plain_XmlEditor.php | 4 +- .../Application_Octetstream_Download.php | 4 +- .../Output}/Application_Octetstream_Hex.php | 4 +- .../Output}/Image_JPEG_Inline.php | 4 +- .../Output}/Image_JPEG_Link.php | 4 +- .../Output}/Image_PNG_Inline.php | 4 +- .../Output}/Text_Octetstream_Sql.php | 4 +- .../Output}/Text_Plain_Binarytoip.php | 4 +- .../Output}/Text_Plain_Bool2Text.php | 4 +- .../Output}/Text_Plain_Dateformat.php | 4 +- .../Output}/Text_Plain_External.php | 4 +- .../Output}/Text_Plain_Formatted.php | 4 +- .../Output}/Text_Plain_Imagelink.php | 4 +- .../Output}/Text_Plain_Json.php | 4 +- .../Output}/Text_Plain_Sql.php | 4 +- .../Output}/Text_Plain_Xml.php | 4 +- .../Plugins/Transformations}/README | 0 .../Plugins/Transformations}/TEMPLATE | 4 +- .../Transformations}/TEMPLATE_ABSTRACT | 4 +- .../Transformations}/Text_Plain_Link.php | 4 +- .../Text_Plain_Longtoipv4.php | 4 +- .../Transformations}/Text_Plain_PreApPend.php | 4 +- .../Transformations}/Text_Plain_Substring.php | 4 +- .../Plugins}/TransformationsInterface.php | 2 +- .../Plugins}/TransformationsPlugin.php | 2 +- .../Plugins}/UploadInterface.php | 2 +- libraries/classes/Table.php | 6 +- libraries/classes/Tracker.php | 6 +- libraries/classes/Transformations.php | 16 ++-- libraries/classes/Util.php | 2 +- libraries/common.inc.php | 6 +- libraries/db_designer.lib.php | 4 +- libraries/display_export.lib.php | 4 +- libraries/display_import.lib.php | 8 +- libraries/display_import_ajax.lib.php | 6 +- libraries/export.lib.php | 2 +- libraries/insert_edit.lib.php | 6 +- libraries/operations.lib.php | 2 +- libraries/plugin_interface.lib.php | 4 +- schema_export.php | 4 +- tbl_replace.php | 4 +- test/classes/DisplayResultsTest.php | 2 +- test/classes/TransformationsTest.php | 44 +++++----- .../plugin/auth/AuthenticationConfigTest.php | 14 ++-- .../plugin/auth/AuthenticationCookieTest.php | 81 +++++++++---------- .../plugin/auth/AuthenticationHttpTest.php | 16 ++-- .../plugin/auth/AuthenticationSignonTest.php | 42 +++++----- .../plugin/export/ExportCodegenTest.php | 52 ++++++------ test/classes/plugin/export/ExportCsvTest.php | 24 +++--- .../classes/plugin/export/ExportExcelTest.php | 12 +-- .../plugin/export/ExportHtmlwordTest.php | 44 +++++----- test/classes/plugin/export/ExportJsonTest.php | 24 +++--- .../classes/plugin/export/ExportLatexTest.php | 30 +++---- .../plugin/export/ExportMediawikiTest.php | 24 +++--- test/classes/plugin/export/ExportOdsTest.php | 28 +++---- test/classes/plugin/export/ExportOdtTest.php | 48 ++++++----- test/classes/plugin/export/ExportPdfTest.php | 56 ++++++------- .../plugin/export/ExportPhparrayTest.php | 24 +++--- test/classes/plugin/export/ExportSqlTest.php | 70 ++++++++-------- .../plugin/export/ExportTexytextTest.php | 40 ++++----- test/classes/plugin/export/ExportXmlTest.php | 24 +++--- test/classes/plugin/export/ExportYamlTest.php | 24 +++--- .../export/helpers/TablePropertyTest.php | 28 +++---- test/classes/plugin/import/ImportCsvTest.php | 6 +- test/classes/plugin/import/ImportLdiTest.php | 6 +- .../plugin/import/ImportMediawikiTest.php | 6 +- test/classes/plugin/import/ImportOdsTest.php | 7 +- test/classes/plugin/import/ImportShpTest.php | 6 +- test/classes/plugin/import/ImportSqlTest.php | 6 +- test/classes/plugin/import/ImportXmlTest.php | 6 +- .../TransformationPluginsTest.php | 64 +++++++-------- test/classes/schema/DiaRelationSchemaTest.php | 6 +- test/classes/schema/EpsRelationSchemaTest.php | 2 +- .../schema/ExportRelationSchemaTest.php | 6 +- test/classes/schema/PdfRelationSchemaTest.php | 2 +- test/classes/schema/SvgRelationSchemaTest.php | 6 +- test/libraries/PMA_display_export_test.php | 2 +- test/libraries/PMA_insert_edit_test.php | 2 +- 172 files changed, 770 insertions(+), 782 deletions(-) rename libraries/{plugins/auth => classes/Plugins/Auth}/AuthenticationConfig.php (98%) rename libraries/{plugins/auth => classes/Plugins/Auth}/AuthenticationCookie.php (99%) rename libraries/{plugins/auth => classes/Plugins/Auth}/AuthenticationHttp.php (98%) rename libraries/{plugins/auth => classes/Plugins/Auth}/AuthenticationSignon.php (98%) rename libraries/{plugins => classes/Plugins}/AuthenticationPlugin.php (99%) rename libraries/{plugins/export => classes/Plugins/Export}/ExportCodegen.php (99%) rename libraries/{plugins/export => classes/Plugins/Export}/ExportCsv.php (99%) rename libraries/{plugins/export => classes/Plugins/Export}/ExportExcel.php (98%) rename libraries/{plugins/export => classes/Plugins/Export}/ExportHtmlword.php (99%) rename libraries/{plugins/export => classes/Plugins/Export}/ExportJson.php (98%) rename libraries/{plugins/export => classes/Plugins/Export}/ExportLatex.php (99%) rename libraries/{plugins/export => classes/Plugins/Export}/ExportMediawiki.php (99%) rename libraries/{plugins/export => classes/Plugins/Export}/ExportOds.php (99%) rename libraries/{plugins/export => classes/Plugins/Export}/ExportOdt.php (99%) rename libraries/{plugins/export => classes/Plugins/Export}/ExportPdf.php (97%) rename libraries/{plugins/export => classes/Plugins/Export}/ExportPhparray.php (98%) rename libraries/{plugins/export => classes/Plugins/Export}/ExportSql.php (99%) rename libraries/{plugins/export => classes/Plugins/Export}/ExportTexytext.php (99%) rename libraries/{plugins/export => classes/Plugins/Export}/ExportXml.php (99%) rename libraries/{plugins/export => classes/Plugins/Export}/ExportYaml.php (98%) rename libraries/{plugins/export/helpers => classes/Plugins/Export/Helpers}/Pdf.php (99%) rename libraries/{plugins/export/helpers => classes/Plugins/Export/Helpers}/TableProperty.php (96%) rename libraries/{plugins/export => classes/Plugins/Export}/README (96%) rename libraries/{plugins => classes/Plugins}/ExportPlugin.php (99%) rename libraries/{plugins => classes/Plugins}/IOTransformationsPlugin.php (96%) rename libraries/{plugins/import => classes/Plugins/Import}/AbstractImportCsv.php (97%) rename libraries/{plugins/import => classes/Plugins/Import}/ImportCsv.php (99%) rename libraries/{plugins/import => classes/Plugins/Import}/ImportLdi.php (98%) rename libraries/{plugins/import => classes/Plugins/Import}/ImportMediawiki.php (99%) rename libraries/{plugins/import => classes/Plugins/Import}/ImportOds.php (99%) rename libraries/{plugins/import => classes/Plugins/Import}/ImportShp.php (99%) rename libraries/{plugins/import => classes/Plugins/Import}/ImportSql.php (98%) rename libraries/{plugins/import => classes/Plugins/Import}/ImportXml.php (99%) rename libraries/{plugins/import => classes/Plugins/Import}/README (95%) rename libraries/{plugins/import => classes/Plugins/Import}/ShapeFileImport.php (95%) rename libraries/{plugins/import/upload => classes/Plugins/Import/Upload}/UploadApc.php (95%) rename libraries/{plugins/import/upload => classes/Plugins/Import/Upload}/UploadNoplugin.php (93%) rename libraries/{plugins/import/upload => classes/Plugins/Import/Upload}/UploadProgress.php (96%) rename libraries/{plugins/import/upload => classes/Plugins/Import/Upload}/UploadSession.php (96%) rename libraries/{plugins => classes/Plugins}/ImportPlugin.php (98%) rename libraries/{plugins/schema/dia => classes/Plugins/Schema/Dia}/Dia.php (99%) rename libraries/{plugins/schema/dia => classes/Plugins/Schema/Dia}/DiaRelationSchema.php (94%) rename libraries/{plugins/schema/dia => classes/Plugins/Schema/Dia}/RelationStatsDia.php (97%) rename libraries/{plugins/schema/dia => classes/Plugins/Schema/Dia}/TableStatsDia.php (96%) rename libraries/{plugins/schema/eps => classes/Plugins/Schema/Eps}/Eps.php (99%) rename libraries/{plugins/schema/eps => classes/Plugins/Schema/Eps}/EpsRelationSchema.php (94%) rename libraries/{plugins/schema/eps => classes/Plugins/Schema/Eps}/RelationStatsEps.php (93%) rename libraries/{plugins/schema/eps => classes/Plugins/Schema/Eps}/TableStatsEps.php (92%) rename libraries/{plugins/schema => classes/Plugins/Schema}/ExportRelationSchema.php (98%) rename libraries/{plugins/schema/pdf => classes/Plugins/Schema/Pdf}/Pdf.php (99%) rename libraries/{plugins/schema/pdf => classes/Plugins/Schema/Pdf}/PdfRelationSchema.php (99%) rename libraries/{plugins/schema/pdf => classes/Plugins/Schema/Pdf}/RelationStatsPdf.php (94%) rename libraries/{plugins/schema/pdf => classes/Plugins/Schema/Pdf}/TableStatsPdf.php (94%) rename libraries/{plugins/schema => classes/Plugins/Schema}/RelationStats.php (98%) rename libraries/{plugins/schema => classes/Plugins/Schema}/SchemaDia.php (95%) rename libraries/{plugins/schema => classes/Plugins/Schema}/SchemaEps.php (95%) rename libraries/{plugins/schema => classes/Plugins/Schema}/SchemaPdf.php (96%) rename libraries/{plugins/schema => classes/Plugins/Schema}/SchemaSvg.php (94%) rename libraries/{plugins/schema/svg => classes/Plugins/Schema/Svg}/RelationStatsSvg.php (94%) rename libraries/{plugins/schema/svg => classes/Plugins/Schema/Svg}/Svg.php (98%) rename libraries/{plugins/schema/svg => classes/Plugins/Schema/Svg}/SvgRelationSchema.php (91%) rename libraries/{plugins/schema/svg => classes/Plugins/Schema/Svg}/TableStatsSvg.php (93%) rename libraries/{plugins/schema => classes/Plugins/Schema}/TableStats.php (99%) rename libraries/{plugins => classes/Plugins}/SchemaPlugin.php (98%) rename libraries/{plugins/transformations/abs => classes/Plugins/Transformations/Abs}/Bool2TextTransformationsPlugin.php (94%) rename libraries/{plugins/transformations/abs => classes/Plugins/Transformations/Abs}/CodeMirrorEditorTransformationPlugin.php (95%) rename libraries/{plugins/transformations/abs => classes/Plugins/Transformations/Abs}/DateFormatTransformationsPlugin.php (98%) rename libraries/{plugins/transformations/abs => classes/Plugins/Transformations/Abs}/DownloadTransformationsPlugin.php (96%) rename libraries/{plugins/transformations/abs => classes/Plugins/Transformations/Abs}/ExternalTransformationsPlugin.php (96%) rename libraries/{plugins/transformations/abs => classes/Plugins/Transformations/Abs}/FormattedTransformationsPlugin.php (93%) rename libraries/{plugins/transformations/abs => classes/Plugins/Transformations/Abs}/HexTransformationsPlugin.php (94%) rename libraries/{plugins/transformations/abs => classes/Plugins/Transformations/Abs}/ImageLinkTransformationsPlugin.php (94%) rename libraries/{plugins/transformations/abs => classes/Plugins/Transformations/Abs}/ImageUploadTransformationsPlugin.php (97%) rename libraries/{plugins/transformations/abs => classes/Plugins/Transformations/Abs}/InlineTransformationsPlugin.php (95%) rename libraries/{plugins/transformations/abs => classes/Plugins/Transformations/Abs}/LongToIPv4TransformationsPlugin.php (93%) rename libraries/{plugins/transformations/abs => classes/Plugins/Transformations/Abs}/PreApPendTransformationsPlugin.php (94%) rename libraries/{plugins/transformations/abs => classes/Plugins/Transformations/Abs}/RegexValidationTransformationsPlugin.php (94%) rename libraries/{plugins/transformations/abs => classes/Plugins/Transformations/Abs}/SQLTransformationsPlugin.php (92%) rename libraries/{plugins/transformations/abs => classes/Plugins/Transformations/Abs}/SubstringTransformationsPlugin.php (95%) rename libraries/{plugins/transformations/abs => classes/Plugins/Transformations/Abs}/TextFileUploadTransformationsPlugin.php (96%) rename libraries/{plugins/transformations/abs => classes/Plugins/Transformations/Abs}/TextImageLinkTransformationsPlugin.php (95%) rename libraries/{plugins/transformations/abs => classes/Plugins/Transformations/Abs}/TextLinkTransformationsPlugin.php (95%) rename libraries/{plugins/transformations/input => classes/Plugins/Transformations/Input}/Image_JPEG_Upload.php (85%) rename libraries/{plugins/transformations/input => classes/Plugins/Transformations/Input}/Text_Plain_FileUpload.php (84%) rename libraries/{plugins/transformations/input => classes/Plugins/Transformations/Input}/Text_Plain_Iptobinary.php (97%) rename libraries/{plugins/transformations/input => classes/Plugins/Transformations/Input}/Text_Plain_JsonEditor.php (92%) rename libraries/{plugins/transformations/input => classes/Plugins/Transformations/Input}/Text_Plain_RegexValidation.php (85%) rename libraries/{plugins/transformations/input => classes/Plugins/Transformations/Input}/Text_Plain_SqlEditor.php (92%) rename libraries/{plugins/transformations/input => classes/Plugins/Transformations/Input}/Text_Plain_XmlEditor.php (92%) rename libraries/{plugins/transformations/output => classes/Plugins/Transformations/Output}/Application_Octetstream_Download.php (85%) rename libraries/{plugins/transformations/output => classes/Plugins/Transformations/Output}/Application_Octetstream_Hex.php (85%) rename libraries/{plugins/transformations/output => classes/Plugins/Transformations/Output}/Image_JPEG_Inline.php (84%) rename libraries/{plugins/transformations/output => classes/Plugins/Transformations/Output}/Image_JPEG_Link.php (84%) rename libraries/{plugins/transformations/output => classes/Plugins/Transformations/Output}/Image_PNG_Inline.php (84%) rename libraries/{plugins/transformations/output => classes/Plugins/Transformations/Output}/Text_Octetstream_Sql.php (84%) rename libraries/{plugins/transformations/output => classes/Plugins/Transformations/Output}/Text_Plain_Binarytoip.php (95%) rename libraries/{plugins/transformations/output => classes/Plugins/Transformations/Output}/Text_Plain_Bool2Text.php (85%) rename libraries/{plugins/transformations/output => classes/Plugins/Transformations/Output}/Text_Plain_Dateformat.php (84%) rename libraries/{plugins/transformations/output => classes/Plugins/Transformations/Output}/Text_Plain_External.php (84%) rename libraries/{plugins/transformations/output => classes/Plugins/Transformations/Output}/Text_Plain_Formatted.php (84%) rename libraries/{plugins/transformations/output => classes/Plugins/Transformations/Output}/Text_Plain_Imagelink.php (84%) rename libraries/{plugins/transformations/output => classes/Plugins/Transformations/Output}/Text_Plain_Json.php (95%) rename libraries/{plugins/transformations/output => classes/Plugins/Transformations/Output}/Text_Plain_Sql.php (90%) rename libraries/{plugins/transformations/output => classes/Plugins/Transformations/Output}/Text_Plain_Xml.php (95%) rename libraries/{plugins/transformations => classes/Plugins/Transformations}/README (100%) rename libraries/{plugins/transformations => classes/Plugins/Transformations}/TEMPLATE (86%) rename libraries/{plugins/transformations => classes/Plugins/Transformations}/TEMPLATE_ABSTRACT (94%) rename libraries/{plugins/transformations => classes/Plugins/Transformations}/Text_Plain_Link.php (85%) rename libraries/{plugins/transformations => classes/Plugins/Transformations}/Text_Plain_Longtoipv4.php (85%) rename libraries/{plugins/transformations => classes/Plugins/Transformations}/Text_Plain_PreApPend.php (86%) rename libraries/{plugins/transformations => classes/Plugins/Transformations}/Text_Plain_Substring.php (85%) rename libraries/{plugins => classes/Plugins}/TransformationsInterface.php (96%) rename libraries/{plugins => classes/Plugins}/TransformationsPlugin.php (98%) rename libraries/{plugins => classes/Plugins}/UploadInterface.php (94%) diff --git a/db_operations.php b/db_operations.php index 010fa0496f..a7ce9745b7 100644 --- a/db_operations.php +++ b/db_operations.php @@ -12,7 +12,7 @@ * @package PhpMyAdmin */ use PhpMyAdmin\Response; -use PMA\libraries\plugins\export\ExportSql; +use PhpMyAdmin\Plugins\Export\ExportSql; /** * requirements @@ -77,7 +77,7 @@ if (strlen($GLOBALS['db']) > 0 $export_sql_plugin = PMA_getPlugin( "export", "sql", - 'libraries/plugins/export/', + 'libraries/classes/Plugins/Export/', array( 'single_table' => isset($single_table), 'export_type' => 'database' diff --git a/doc/transformations.rst b/doc/transformations.rst index be60b33c80..f04f80c455 100644 --- a/doc/transformations.rst +++ b/doc/transformations.rst @@ -3,7 +3,7 @@ Transformations =============== -.. note:: +.. note:: You need to have configured the :ref:`linked-tables` for using transformations feature. @@ -87,9 +87,9 @@ File structure ++++++++++++++ All specific transformations for mimetypes are defined through class -files in the directory 'libraries/plugins/transformations/'. Each of +files in the directory 'libraries/classes/Plugins/Transformations/'. Each of them extends a certain transformation abstract class declared in -libraries/plugins/transformations/abstract. +libraries/classes/Plugins/Transformations/Abs. They are stored in files to ease up customization and easy adding of new transformations. @@ -117,8 +117,8 @@ getInfo() returns the transformation's description and possible options it may receive and applyTransformation() is the method that does the actual work of the transformation plug-in. -Please see the libraries/plugins/transformations/TEMPLATE and -libraries/plugins/transformations/TEMPLATE\_ABSTRACT files for adding +Please see the libraries/classes/Plugins/Transformations/TEMPLATE and +libraries/classes/Plugins/Transformations/TEMPLATE\_ABSTRACT files for adding your own transformation plug-in. You can also generate a new transformation plug-in (with or without the abstract transformation class), by using @@ -140,4 +140,3 @@ The applyTransformation() method always gets passed three variables: unsigned/zerofill/not\_null/... properties. The $meta->mimetype variable contains the original MIME-type of the column (i.e. 'text/plain', 'image/jpeg' etc.) - diff --git a/export.php b/export.php index 54a3c2ec9b..9f153c8bca 100644 --- a/export.php +++ b/export.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Core; use PhpMyAdmin\Encoding; -use PMA\libraries\plugins\ExportPlugin; +use PhpMyAdmin\Plugins\ExportPlugin; use PhpMyAdmin\Url; use PhpMyAdmin\Util; use PhpMyAdmin\Sanitize; @@ -183,7 +183,7 @@ $what = Core::securePath($_POST['what']); $export_plugin = PMA_getPlugin( "export", $what, - 'libraries/plugins/export/', + 'libraries/classes/Plugins/Export/', array( 'export_type' => $export_type, 'single_table' => isset($single_table) diff --git a/import.php b/import.php index b98cbed3a1..76ed062add 100644 --- a/import.php +++ b/import.php @@ -10,7 +10,7 @@ use PhpMyAdmin\Bookmark; use PhpMyAdmin\Core; use PhpMyAdmin\Encoding; use PhpMyAdmin\File; -use PMA\libraries\plugins\ImportPlugin; +use PhpMyAdmin\Plugins\ImportPlugin; use PhpMyAdmin\Response; use PhpMyAdmin\Sql; use PhpMyAdmin\Url; @@ -522,7 +522,7 @@ if (! $error) { $import_plugin = PMA_getPlugin( "import", $format, - 'libraries/plugins/import/', + 'libraries/classes/Plugins/Import/', $import_type ); if ($import_plugin == null) { diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php index 15847bdc78..e2e4afa517 100644 --- a/libraries/check_user_privileges.lib.php +++ b/libraries/check_user_privileges.lib.php @@ -290,7 +290,7 @@ function PMA_analyseShowGrant() $GLOBALS['dbi']->freeResult($rs_usr); // must also cacheUnset() them in - // libraries/plugins/auth/AuthenticationCookie.php + // PhpMyAdmin\Plugins\Auth\AuthenticationCookie PhpMyAdmin\Util::cacheSet('is_create_db_priv', $GLOBALS['is_create_db_priv']); PhpMyAdmin\Util::cacheSet('is_reload_priv', $GLOBALS['is_reload_priv']); PhpMyAdmin\Util::cacheSet('db_to_create', $GLOBALS['db_to_create']); diff --git a/libraries/classes/DisplayResults.php b/libraries/classes/DisplayResults.php index ecf4a7ebbc..eabada6697 100644 --- a/libraries/classes/DisplayResults.php +++ b/libraries/classes/DisplayResults.php @@ -11,7 +11,7 @@ use PhpMyAdmin\Core; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Index; use PhpMyAdmin\Message; -use PMA\libraries\plugins\transformations\Text_Plain_Link; +use PhpMyAdmin\Plugins\Transformations\Text_Plain_Link; use PhpMyAdmin\Response; use PhpMyAdmin\Sanitize; use PhpMyAdmin\Sql; @@ -246,23 +246,23 @@ class DisplayResults private function _setDefaultTransformations() { $json_highlighting_data = array( - 'libraries/plugins/transformations/output/Text_Plain_Json.php', - 'PMA\libraries\plugins\transformations\output\Text_Plain_Json', + 'libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php', + 'PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Json', 'Text_Plain' ); $sql_highlighting_data = array( - 'libraries/plugins/transformations/output/Text_Plain_Sql.php', - 'PMA\libraries\plugins\transformations\output\Text_Plain_Sql', + 'libraries/classes/Plugins/Transformations/Output/Text_Plain_Sql.php', + 'PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Sql', 'Text_Plain' ); $blob_sql_highlighting_data = array( - 'libraries/plugins/transformations/output/Text_Octetstream_Sql.php', - 'PMA\libraries\plugins\transformations\output\Text_Octetstream_Sql', + 'libraries/classes/Plugins/Transformations/Output/Text_Octetstream_Sql.php', + 'PhpMyAdmin\Plugins\Transformations\Output\Text_Octetstream_Sql', 'Text_Octetstream' ); $link_data = array( - 'libraries/plugins/transformations/Text_Plain_Link.php', - 'PMA\libraries\plugins\transformations\Text_Plain_Link', + 'libraries/classes/Plugins/Transformations/Text_Plain_Link.php', + 'PhpMyAdmin\Plugins\Transformations\Text_Plain_Link', 'Text_Plain' ); $this->transformation_info = array( @@ -3050,7 +3050,7 @@ class DisplayResults ) { $file = $mime_map[$orgFullColName]['transformation']; - $include_file = 'libraries/plugins/transformations/' . $file; + $include_file = 'libraries/classes/Plugins/Transformations/' . $file; if (@file_exists($include_file)) { diff --git a/libraries/plugins/auth/AuthenticationConfig.php b/libraries/classes/Plugins/Auth/AuthenticationConfig.php similarity index 98% rename from libraries/plugins/auth/AuthenticationConfig.php rename to libraries/classes/Plugins/Auth/AuthenticationConfig.php index 2cc12bdc7f..79a2242efc 100644 --- a/libraries/plugins/auth/AuthenticationConfig.php +++ b/libraries/classes/Plugins/Auth/AuthenticationConfig.php @@ -6,9 +6,9 @@ * @package PhpMyAdmin-Authentication * @subpackage Config */ -namespace PMA\libraries\plugins\auth; +namespace PhpMyAdmin\Plugins\Auth; -use PMA\libraries\plugins\AuthenticationPlugin; +use PhpMyAdmin\Plugins\AuthenticationPlugin; use PhpMyAdmin\Response; use PhpMyAdmin\Url; use PhpMyAdmin\Util; diff --git a/libraries/plugins/auth/AuthenticationCookie.php b/libraries/classes/Plugins/Auth/AuthenticationCookie.php similarity index 99% rename from libraries/plugins/auth/AuthenticationCookie.php rename to libraries/classes/Plugins/Auth/AuthenticationCookie.php index 0f2aa5f2e6..fe9a9a86af 100644 --- a/libraries/plugins/auth/AuthenticationCookie.php +++ b/libraries/classes/Plugins/Auth/AuthenticationCookie.php @@ -6,12 +6,12 @@ * @package PhpMyAdmin-Authentication * @subpackage Cookie */ -namespace PMA\libraries\plugins\auth; +namespace PhpMyAdmin\Plugins\Auth; use phpseclib\Crypt; use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; -use PMA\libraries\plugins\AuthenticationPlugin; +use PhpMyAdmin\Plugins\AuthenticationPlugin; use PhpMyAdmin\Response; use PhpMyAdmin\Util; use PhpMyAdmin\Config; diff --git a/libraries/plugins/auth/AuthenticationHttp.php b/libraries/classes/Plugins/Auth/AuthenticationHttp.php similarity index 98% rename from libraries/plugins/auth/AuthenticationHttp.php rename to libraries/classes/Plugins/Auth/AuthenticationHttp.php index 2be5e3db43..d58c35c1f8 100644 --- a/libraries/plugins/auth/AuthenticationHttp.php +++ b/libraries/classes/Plugins/Auth/AuthenticationHttp.php @@ -7,9 +7,9 @@ * @package PhpMyAdmin-Authentication * @subpackage HTTP */ -namespace PMA\libraries\plugins\auth; +namespace PhpMyAdmin\Plugins\Auth; -use PMA\libraries\plugins\AuthenticationPlugin; +use PhpMyAdmin\Plugins\AuthenticationPlugin; use PhpMyAdmin\Message; use PhpMyAdmin\Response; use PhpMyAdmin\Config; diff --git a/libraries/plugins/auth/AuthenticationSignon.php b/libraries/classes/Plugins/Auth/AuthenticationSignon.php similarity index 98% rename from libraries/plugins/auth/AuthenticationSignon.php rename to libraries/classes/Plugins/Auth/AuthenticationSignon.php index 0b4d4e42a3..b0087030b1 100644 --- a/libraries/plugins/auth/AuthenticationSignon.php +++ b/libraries/classes/Plugins/Auth/AuthenticationSignon.php @@ -6,10 +6,10 @@ * @package PhpMyAdmin-Authentication * @subpackage SignOn */ -namespace PMA\libraries\plugins\auth; +namespace PhpMyAdmin\Plugins\Auth; use PhpMyAdmin\Core; -use PMA\libraries\plugins\AuthenticationPlugin; +use PhpMyAdmin\Plugins\AuthenticationPlugin; use PhpMyAdmin\Util; /** diff --git a/libraries/plugins/AuthenticationPlugin.php b/libraries/classes/Plugins/AuthenticationPlugin.php similarity index 99% rename from libraries/plugins/AuthenticationPlugin.php rename to libraries/classes/Plugins/AuthenticationPlugin.php index 3edc909226..d112c5a487 100644 --- a/libraries/plugins/AuthenticationPlugin.php +++ b/libraries/classes/Plugins/AuthenticationPlugin.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries\plugins; +namespace PhpMyAdmin\Plugins; use PhpMyAdmin\Core; use PhpMyAdmin\Sanitize; diff --git a/libraries/plugins/export/ExportCodegen.php b/libraries/classes/Plugins/Export/ExportCodegen.php similarity index 99% rename from libraries/plugins/export/ExportCodegen.php rename to libraries/classes/Plugins/Export/ExportCodegen.php index 2fbee9cfd2..96b78fdcf7 100644 --- a/libraries/plugins/export/ExportCodegen.php +++ b/libraries/classes/Plugins/Export/ExportCodegen.php @@ -6,10 +6,10 @@ * @package PhpMyAdmin-Export * @subpackage CodeGen */ -namespace PMA\libraries\plugins\export; +namespace PhpMyAdmin\Plugins\Export; -use PMA\libraries\plugins\ExportPlugin; -use PMA\libraries\plugins\export\helpers\TableProperty; +use PhpMyAdmin\Plugins\ExportPlugin; +use PhpMyAdmin\Plugins\Export\Helpers\TableProperty; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; diff --git a/libraries/plugins/export/ExportCsv.php b/libraries/classes/Plugins/Export/ExportCsv.php similarity index 99% rename from libraries/plugins/export/ExportCsv.php rename to libraries/classes/Plugins/Export/ExportCsv.php index 43d2292ee0..5d3d8a5426 100644 --- a/libraries/plugins/export/ExportCsv.php +++ b/libraries/classes/Plugins/Export/ExportCsv.php @@ -7,10 +7,10 @@ * @subpackage CSV */ -namespace PMA\libraries\plugins\export; +namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; -use PMA\libraries\plugins\ExportPlugin; +use PhpMyAdmin\Plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; diff --git a/libraries/plugins/export/ExportExcel.php b/libraries/classes/Plugins/Export/ExportExcel.php similarity index 98% rename from libraries/plugins/export/ExportExcel.php rename to libraries/classes/Plugins/Export/ExportExcel.php index a8b60c7299..2fa11547d6 100644 --- a/libraries/plugins/export/ExportExcel.php +++ b/libraries/classes/Plugins/Export/ExportExcel.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin-Export * @subpackage CSV-Excel */ -namespace PMA\libraries\plugins\export; +namespace PhpMyAdmin\Plugins\Export; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; diff --git a/libraries/plugins/export/ExportHtmlword.php b/libraries/classes/Plugins/Export/ExportHtmlword.php similarity index 99% rename from libraries/plugins/export/ExportHtmlword.php rename to libraries/classes/Plugins/Export/ExportHtmlword.php index 0d320c2af2..a9c658bf16 100644 --- a/libraries/plugins/export/ExportHtmlword.php +++ b/libraries/classes/Plugins/Export/ExportHtmlword.php @@ -6,10 +6,10 @@ * @package PhpMyAdmin-Export * @subpackage HTML-Word */ -namespace PMA\libraries\plugins\export; +namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; -use PMA\libraries\plugins\ExportPlugin; +use PhpMyAdmin\Plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; diff --git a/libraries/plugins/export/ExportJson.php b/libraries/classes/Plugins/Export/ExportJson.php similarity index 98% rename from libraries/plugins/export/ExportJson.php rename to libraries/classes/Plugins/Export/ExportJson.php index 24dd893422..fed539acdf 100644 --- a/libraries/plugins/export/ExportJson.php +++ b/libraries/classes/Plugins/Export/ExportJson.php @@ -6,10 +6,10 @@ * @package PhpMyAdmin-Export * @subpackage JSON */ -namespace PMA\libraries\plugins\export; +namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; -use PMA\libraries\plugins\ExportPlugin; +use PhpMyAdmin\Plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; diff --git a/libraries/plugins/export/ExportLatex.php b/libraries/classes/Plugins/Export/ExportLatex.php similarity index 99% rename from libraries/plugins/export/ExportLatex.php rename to libraries/classes/Plugins/Export/ExportLatex.php index f014cbbaff..17862c8aa6 100644 --- a/libraries/plugins/export/ExportLatex.php +++ b/libraries/classes/Plugins/Export/ExportLatex.php @@ -6,10 +6,10 @@ * @package PhpMyAdmin-Export * @subpackage Latex */ -namespace PMA\libraries\plugins\export; +namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; -use PMA\libraries\plugins\ExportPlugin; +use PhpMyAdmin\Plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; diff --git a/libraries/plugins/export/ExportMediawiki.php b/libraries/classes/Plugins/Export/ExportMediawiki.php similarity index 99% rename from libraries/plugins/export/ExportMediawiki.php rename to libraries/classes/Plugins/Export/ExportMediawiki.php index 322b1b6e40..ea30f14eec 100644 --- a/libraries/plugins/export/ExportMediawiki.php +++ b/libraries/classes/Plugins/Export/ExportMediawiki.php @@ -6,10 +6,10 @@ * @package PhpMyAdmin-Export * @subpackage MediaWiki */ -namespace PMA\libraries\plugins\export; +namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; -use PMA\libraries\plugins\ExportPlugin; +use PhpMyAdmin\Plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; diff --git a/libraries/plugins/export/ExportOds.php b/libraries/classes/Plugins/Export/ExportOds.php similarity index 99% rename from libraries/plugins/export/ExportOds.php rename to libraries/classes/Plugins/Export/ExportOds.php index 7617d431a0..74e671be13 100644 --- a/libraries/plugins/export/ExportOds.php +++ b/libraries/classes/Plugins/Export/ExportOds.php @@ -6,11 +6,11 @@ * @package PhpMyAdmin-Export * @subpackage ODS */ -namespace PMA\libraries\plugins\export; +namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\OpenDocument; -use PMA\libraries\plugins\ExportPlugin; +use PhpMyAdmin\Plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; @@ -18,8 +18,6 @@ use PMA\libraries\properties\options\items\BoolPropertyItem; use PMA\libraries\properties\options\items\HiddenPropertyItem; use PMA\libraries\properties\options\items\TextPropertyItem; -$GLOBALS['ods_buffer'] = ''; - /** * Handles the export for the ODS class * @@ -33,6 +31,7 @@ class ExportOds extends ExportPlugin */ public function __construct() { + $GLOBALS['ods_buffer'] = ''; $this->setProperties(); } diff --git a/libraries/plugins/export/ExportOdt.php b/libraries/classes/Plugins/Export/ExportOdt.php similarity index 99% rename from libraries/plugins/export/ExportOdt.php rename to libraries/classes/Plugins/Export/ExportOdt.php index 913c51bfbb..a3e2661ff7 100644 --- a/libraries/plugins/export/ExportOdt.php +++ b/libraries/classes/Plugins/Export/ExportOdt.php @@ -6,11 +6,11 @@ * @package PhpMyAdmin-Export * @subpackage ODT */ -namespace PMA\libraries\plugins\export; +namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\OpenDocument; -use PMA\libraries\plugins\ExportPlugin; +use PhpMyAdmin\Plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; @@ -20,8 +20,6 @@ use PMA\libraries\properties\options\items\TextPropertyItem; use PhpMyAdmin\Transformations; use PhpMyAdmin\Util; -$GLOBALS['odt_buffer'] = ''; - /** * Handles the export for the ODT class * @@ -35,6 +33,7 @@ class ExportOdt extends ExportPlugin */ public function __construct() { + $GLOBALS['odt_buffer'] = ''; $this->setProperties(); } diff --git a/libraries/plugins/export/ExportPdf.php b/libraries/classes/Plugins/Export/ExportPdf.php similarity index 97% rename from libraries/plugins/export/ExportPdf.php rename to libraries/classes/Plugins/Export/ExportPdf.php index bac46971b9..089342bd44 100644 --- a/libraries/plugins/export/ExportPdf.php +++ b/libraries/classes/Plugins/Export/ExportPdf.php @@ -6,10 +6,10 @@ * @package PhpMyAdmin-Export * @subpackage PDF */ -namespace PMA\libraries\plugins\export; +namespace PhpMyAdmin\Plugins\Export; -use PMA\libraries\plugins\ExportPlugin; -use PMA\libraries\plugins\export\helpers\Pdf; +use PhpMyAdmin\Plugins\ExportPlugin; +use PhpMyAdmin\Plugins\Export\Helpers\Pdf; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; @@ -33,7 +33,7 @@ if (! class_exists('TCPDF')) { class ExportPdf extends ExportPlugin { /** - * PMA\libraries\plugins\export\helpers\Pdf instance + * PhpMyAdmin\Plugins\Export\Helpers\Pdf instance * * @var Pdf */ @@ -343,7 +343,7 @@ class ExportPdf extends ExportPlugin /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */ /** - * Gets the PMA\libraries\plugins\export\helpers\Pdf instance + * Gets the PhpMyAdmin\Plugins\Export\Helpers\Pdf instance * * @return Pdf */ @@ -353,7 +353,7 @@ class ExportPdf extends ExportPlugin } /** - * Instantiates the PMA\libraries\plugins\export\helpers\Pdf class + * Instantiates the PhpMyAdmin\Plugins\Export\Helpers\Pdf class * * @param Pdf $pdf The instance * diff --git a/libraries/plugins/export/ExportPhparray.php b/libraries/classes/Plugins/Export/ExportPhparray.php similarity index 98% rename from libraries/plugins/export/ExportPhparray.php rename to libraries/classes/Plugins/Export/ExportPhparray.php index 8c249be2a3..d99dee8372 100644 --- a/libraries/plugins/export/ExportPhparray.php +++ b/libraries/classes/Plugins/Export/ExportPhparray.php @@ -7,10 +7,10 @@ * @subpackage PHP */ -namespace PMA\libraries\plugins\export; +namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; -use PMA\libraries\plugins\ExportPlugin; +use PhpMyAdmin\Plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\items\HiddenPropertyItem; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; diff --git a/libraries/plugins/export/ExportSql.php b/libraries/classes/Plugins/Export/ExportSql.php similarity index 99% rename from libraries/plugins/export/ExportSql.php rename to libraries/classes/Plugins/Export/ExportSql.php index 9907503a84..6ea9d5f753 100644 --- a/libraries/plugins/export/ExportSql.php +++ b/libraries/classes/Plugins/Export/ExportSql.php @@ -6,11 +6,11 @@ * @package PhpMyAdmin-Export * @subpackage SQL */ -namespace PMA\libraries\plugins\export; +namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\Charsets; use PhpMyAdmin\DatabaseInterface; -use PMA\libraries\plugins\ExportPlugin; +use PhpMyAdmin\Plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; diff --git a/libraries/plugins/export/ExportTexytext.php b/libraries/classes/Plugins/Export/ExportTexytext.php similarity index 99% rename from libraries/plugins/export/ExportTexytext.php rename to libraries/classes/Plugins/Export/ExportTexytext.php index 51f88d4db3..522d8cf369 100644 --- a/libraries/plugins/export/ExportTexytext.php +++ b/libraries/classes/Plugins/Export/ExportTexytext.php @@ -6,10 +6,10 @@ * @package PhpMyAdmin-Export * @subpackage Texy!text */ -namespace PMA\libraries\plugins\export; +namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; -use PMA\libraries\plugins\ExportPlugin; +use PhpMyAdmin\Plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; diff --git a/libraries/plugins/export/ExportXml.php b/libraries/classes/Plugins/Export/ExportXml.php similarity index 99% rename from libraries/plugins/export/ExportXml.php rename to libraries/classes/Plugins/Export/ExportXml.php index 9fb8d5d326..38e6d4ab2b 100644 --- a/libraries/plugins/export/ExportXml.php +++ b/libraries/classes/Plugins/Export/ExportXml.php @@ -6,10 +6,10 @@ * @package PhpMyAdmin-Export * @subpackage XML */ -namespace PMA\libraries\plugins\export; +namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; -use PMA\libraries\plugins\ExportPlugin; +use PhpMyAdmin\Plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; diff --git a/libraries/plugins/export/ExportYaml.php b/libraries/classes/Plugins/Export/ExportYaml.php similarity index 98% rename from libraries/plugins/export/ExportYaml.php rename to libraries/classes/Plugins/Export/ExportYaml.php index 6c001f67f1..03d027c6e6 100644 --- a/libraries/plugins/export/ExportYaml.php +++ b/libraries/classes/Plugins/Export/ExportYaml.php @@ -7,10 +7,10 @@ * @subpackage YAML */ -namespace PMA\libraries\plugins\export; +namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; -use PMA\libraries\plugins\ExportPlugin; +use PhpMyAdmin\Plugins\ExportPlugin; use PMA\libraries\properties\plugins\ExportPluginProperties; use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; diff --git a/libraries/plugins/export/helpers/Pdf.php b/libraries/classes/Plugins/Export/Helpers/Pdf.php similarity index 99% rename from libraries/plugins/export/helpers/Pdf.php rename to libraries/classes/Plugins/Export/Helpers/Pdf.php index 60623b34ae..67ff1ebdda 100644 --- a/libraries/plugins/export/helpers/Pdf.php +++ b/libraries/classes/Plugins/Export/Helpers/Pdf.php @@ -1,12 +1,12 @@ 'table', 'single_table' => false, diff --git a/libraries/classes/Tracker.php b/libraries/classes/Tracker.php index 2f08f15ab4..03d5f36fce 100644 --- a/libraries/classes/Tracker.php +++ b/libraries/classes/Tracker.php @@ -7,7 +7,7 @@ */ namespace PhpMyAdmin; -use PMA\libraries\plugins\export\ExportSql; +use PhpMyAdmin\Plugins\Export\ExportSql; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Statements\AlterStatement; use PhpMyAdmin\SqlParser\Statements\CreateStatement; @@ -192,11 +192,11 @@ class Tracker // get Export SQL instance include_once "libraries/plugin_interface.lib.php"; - /* @var $export_sql_plugin \PMA\libraries\plugins\export\ExportSql */ + /* @var $export_sql_plugin \PhpMyAdmin\Plugins\Export\ExportSql */ $export_sql_plugin = PMA_getPlugin( "export", "sql", - 'libraries/plugins/export/', + 'libraries/classes/Plugins/Export/', array( 'export_type' => $export_type, 'single_table' => false, diff --git a/libraries/classes/Transformations.php b/libraries/classes/Transformations.php index 5f33c646f4..dd7c58f3c2 100644 --- a/libraries/classes/Transformations.php +++ b/libraries/classes/Transformations.php @@ -100,13 +100,13 @@ class Transformations $stack = array(); $sub_dirs = array( - 'input/' => 'input_', - 'output/' => '', + 'Input/' => 'input_', + 'Output/' => '', '' => '' ); foreach ($sub_dirs as $sd => $prefix) { - $handle = opendir('libraries/plugins/transformations/' . $sd); + $handle = opendir('libraries/classes/Plugins/Transformations/' . $sd); if (! $handle) { $stack[$prefix . 'transformation'] = array(); @@ -170,7 +170,7 @@ class Transformations { // get the transformation class name $class_name = explode(".php", $filename); - $class_name = 'PMA\\' . str_replace('/', '\\', $class_name[0]); + $class_name = 'PhpMyAdmin\\' . str_replace('/', '\\', mb_substr($class_name[0], 18)); return $class_name; } @@ -184,8 +184,8 @@ class Transformations */ public static function getDescription($file) { - $include_file = 'libraries/plugins/transformations/' . $file; - /* @var $class_name PMA\libraries\plugins\TransformationsInterface */ + $include_file = 'libraries/classes/Plugins/Transformations/' . $file; + /* @var $class_name PhpMyAdmin\Plugins\TransformationsInterface */ $class_name = self::getClassName($include_file); // include and instantiate the class include_once $include_file; @@ -201,8 +201,8 @@ class Transformations */ public static function getName($file) { - $include_file = 'libraries/plugins/transformations/' . $file; - /* @var $class_name PMA\libraries\plugins\TransformationsInterface */ + $include_file = 'libraries/classes/Plugins/Transformations/' . $file; + /* @var $class_name PhpMyAdmin\Plugins\TransformationsInterface */ $class_name = self::getClassName($include_file); // include and instantiate the class include_once $include_file; diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php index 3bbf0b41ca..5b0fd1cc29 100644 --- a/libraries/classes/Util.php +++ b/libraries/classes/Util.php @@ -10,7 +10,7 @@ namespace PhpMyAdmin; use PhpMyAdmin\Core; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Message; -use PMA\libraries\plugins\ImportPlugin; +use PhpMyAdmin\Plugins\ImportPlugin; use PhpMyAdmin\Response; use PhpMyAdmin\Sanitize; use PhpMyAdmin\SqlParser\Context; diff --git a/libraries/common.inc.php b/libraries/common.inc.php index b8d015f88c..db59f35865 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -36,7 +36,7 @@ use PhpMyAdmin\Core; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\ErrorHandler; use PhpMyAdmin\Message; -use PMA\libraries\plugins\AuthenticationPlugin; +use PhpMyAdmin\Plugins\AuthenticationPlugin; use PhpMyAdmin\DbList; use PhpMyAdmin\ThemeManager; use PhpMyAdmin\Tracker; @@ -649,7 +649,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { */ $auth_class = "Authentication" . ucfirst($cfg['Server']['auth_type']); if (! @file_exists( - './libraries/plugins/auth/' + './libraries/classes/Plugins/Auth/' . $auth_class . '.php' )) { Core::fatalError( @@ -660,7 +660,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { if (isset($_REQUEST['pma_password']) && strlen($_REQUEST['pma_password']) > 256) { $_REQUEST['pma_password'] = substr($_REQUEST['pma_password'], 0, 256); } - $fqnAuthClass = 'PMA\libraries\plugins\auth\\' . $auth_class; + $fqnAuthClass = 'PhpMyAdmin\Plugins\Auth\\' . $auth_class; // todo: add plugin manager $plugin_manager = null; /** @var AuthenticationPlugin $auth_plugin */ diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php index 493109564a..4fe39242da 100644 --- a/libraries/db_designer.lib.php +++ b/libraries/db_designer.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ use PhpMyAdmin\Message; -use PMA\libraries\plugins\SchemaPlugin; +use PhpMyAdmin\Plugins\SchemaPlugin; if (! defined('PHPMYADMIN')) { exit; @@ -109,7 +109,7 @@ function PMA_getHtmlForSchemaExport($db, $page) /* @var $export_list SchemaPlugin[] */ $export_list = PMA_getPlugins( "schema", - 'libraries/plugins/schema/', + 'libraries/classes/Plugins/Schema/', null ); diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index ac5ae6474e..7764b625f6 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -10,7 +10,7 @@ use PhpMyAdmin\Core; use PhpMyAdmin\Encoding; use PhpMyAdmin\Message; -use PMA\libraries\plugins\ExportPlugin; +use PhpMyAdmin\Plugins\ExportPlugin; use PhpMyAdmin\Response; use PhpMyAdmin\Table; use PhpMyAdmin\Template; @@ -1000,7 +1000,7 @@ function PMA_getExportDisplay( /* @var $export_list ExportPlugin[] */ $export_list = PMA_getPlugins( "export", - 'libraries/plugins/export/', + 'libraries/classes/Plugins/Export/', array( 'export_type' => $export_type, 'single_table' => isset($GLOBALS['single_table']) diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index a139309134..7ba314398e 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -13,7 +13,7 @@ use PhpMyAdmin\Charsets; use PhpMyAdmin\Core; use PhpMyAdmin\Encoding; use PhpMyAdmin\Message; -use PMA\libraries\plugins\ImportPlugin; +use PhpMyAdmin\Plugins\ImportPlugin; use PhpMyAdmin\Url; use PhpMyAdmin\Sanitize; @@ -63,7 +63,7 @@ function PMA_getHtmlForImportJS($upload_id) // hide form $html .= ' $("#upload_form_form").css("display", "none");'; - if ($_SESSION[$SESSION_KEY]["handler"] != 'PMA\libraries\plugins\import\upload\UploadNoplugin') { + if ($_SESSION[$SESSION_KEY]["handler"] != 'PhpMyAdmin\Plugins\Import\Upload\UploadNoplugin') { $html .= PMA_getHtmlForImportWithPlugin($upload_id); @@ -437,7 +437,7 @@ function PMA_getHtmlForImport( $html .= '
$where_clause) { if (!empty($mime_map[$column_name]) && !empty($mime_map[$column_name]['input_transformation']) ) { - $filename = 'libraries/plugins/transformations/' + $filename = 'libraries/classes/Plugins/Transformations/' . $mime_map[$column_name]['input_transformation']; if (is_file($filename)) { include_once $filename; diff --git a/test/classes/DisplayResultsTest.php b/test/classes/DisplayResultsTest.php index 29b00f4bdd..a58ba14409 100644 --- a/test/classes/DisplayResultsTest.php +++ b/test/classes/DisplayResultsTest.php @@ -10,7 +10,7 @@ */ use PhpMyAdmin\Core; use PhpMyAdmin\DisplayResults; -use PMA\libraries\plugins\transformations\Text_Plain_Link; +use PhpMyAdmin\Plugins\Transformations\Text_Plain_Link; require_once 'libraries/relation.lib.php'; require_once 'test/PMATestCase.php'; diff --git a/test/classes/TransformationsTest.php b/test/classes/TransformationsTest.php index 437800944d..e6799f8874 100644 --- a/test/classes/TransformationsTest.php +++ b/test/classes/TransformationsTest.php @@ -120,21 +120,21 @@ class TransformationsTest extends PHPUnit_Framework_TestCase 18 => 'Text/Plain: Substring', ), 'transformation_file' => array ( - 0 => 'output/Application_Octetstream_Download.php', - 1 => 'output/Application_Octetstream_Hex.php', - 2 => 'output/Image_JPEG_Inline.php', - 3 => 'output/Image_JPEG_Link.php', - 4 => 'output/Image_PNG_Inline.php', - 5 => 'output/Text_Octetstream_Sql.php', - 6 => 'output/Text_Plain_Binarytoip.php', - 7 => 'output/Text_Plain_Bool2Text.php', - 8 => 'output/Text_Plain_Dateformat.php', - 9 => 'output/Text_Plain_External.php', - 10 => 'output/Text_Plain_Formatted.php', - 11 => 'output/Text_Plain_Imagelink.php', - 12 => 'output/Text_Plain_Json.php', - 13 => 'output/Text_Plain_Sql.php', - 14 => 'output/Text_Plain_Xml.php', + 0 => 'Output/Application_Octetstream_Download.php', + 1 => 'Output/Application_Octetstream_Hex.php', + 2 => 'Output/Image_JPEG_Inline.php', + 3 => 'Output/Image_JPEG_Link.php', + 4 => 'Output/Image_PNG_Inline.php', + 5 => 'Output/Text_Octetstream_Sql.php', + 6 => 'Output/Text_Plain_Binarytoip.php', + 7 => 'Output/Text_Plain_Bool2Text.php', + 8 => 'Output/Text_Plain_Dateformat.php', + 9 => 'Output/Text_Plain_External.php', + 10 => 'Output/Text_Plain_Formatted.php', + 11 => 'Output/Text_Plain_Imagelink.php', + 12 => 'Output/Text_Plain_Json.php', + 13 => 'Output/Text_Plain_Sql.php', + 14 => 'Output/Text_Plain_Xml.php', 15 => 'Text_Plain_Link.php', 16 => 'Text_Plain_Longtoipv4.php', 17 => 'Text_Plain_PreApPend.php', @@ -154,13 +154,13 @@ class TransformationsTest extends PHPUnit_Framework_TestCase 'Text/Plain: Substring', ), 'input_transformation_file' => array( - 'input/Image_JPEG_Upload.php', - 'input/Text_Plain_FileUpload.php', - 'input/Text_Plain_Iptobinary.php', - 'input/Text_Plain_JsonEditor.php', - 'input/Text_Plain_RegexValidation.php', - 'input/Text_Plain_SqlEditor.php', - 'input/Text_Plain_XmlEditor.php', + 'Input/Image_JPEG_Upload.php', + 'Input/Text_Plain_FileUpload.php', + 'Input/Text_Plain_Iptobinary.php', + 'Input/Text_Plain_JsonEditor.php', + 'Input/Text_Plain_RegexValidation.php', + 'Input/Text_Plain_SqlEditor.php', + 'Input/Text_Plain_XmlEditor.php', 'Text_Plain_Link.php', 'Text_Plain_Longtoipv4.php', 'Text_Plain_PreApPend.php', diff --git a/test/classes/plugin/auth/AuthenticationConfigTest.php b/test/classes/plugin/auth/AuthenticationConfigTest.php index 841c535109..32c3e8cfc8 100644 --- a/test/classes/plugin/auth/AuthenticationConfigTest.php +++ b/test/classes/plugin/auth/AuthenticationConfigTest.php @@ -1,18 +1,18 @@ object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie') ->disableOriginalConstructor() ->setMethods(array('cookieDecrypt')) ->getMock(); @@ -569,7 +568,7 @@ class AuthenticationCookieTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authCheck (mocking blowfish functions) + * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::authCheck (mocking blowfish functions) * * @return void */ @@ -589,7 +588,7 @@ class AuthenticationCookieTest extends PMATestCase $GLOBALS['cfg']['LoginCookieValidity'] = 1440; // mock for blowfish function - $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie') ->disableOriginalConstructor() ->setMethods(array('cookieDecrypt')) ->getMock(); @@ -614,7 +613,7 @@ class AuthenticationCookieTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authCheck (mocking the object itself) + * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::authCheck (mocking the object itself) * * @return void */ @@ -633,7 +632,7 @@ class AuthenticationCookieTest extends PMATestCase $GLOBALS['cfg']['LoginCookieValidity'] = 0; $_SESSION['browser_access_time']['default'] = -1; // mock for blowfish function - $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie') ->disableOriginalConstructor() ->setMethods(array('authFails')) ->getMock(); @@ -651,7 +650,7 @@ class AuthenticationCookieTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authSetUser + * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::authSetUser * * @return void */ @@ -707,7 +706,7 @@ class AuthenticationCookieTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authSetUser (check for headers redirect) + * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::authSetUser (check for headers redirect) * * @return void */ @@ -743,13 +742,13 @@ class AuthenticationCookieTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authFails + * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::authFails * * @return void */ public function testAuthFailsNoPass() { - $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie') ->disableOriginalConstructor() ->setMethods(array('auth')) ->getMock(); @@ -775,7 +774,7 @@ class AuthenticationCookieTest extends PMATestCase public function testAuthFailsDeny() { - $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie') ->disableOriginalConstructor() ->setMethods(array('auth')) ->getMock(); @@ -800,7 +799,7 @@ class AuthenticationCookieTest extends PMATestCase public function testAuthFailsActivity() { - $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie') ->disableOriginalConstructor() ->setMethods(array('auth')) ->getMock(); @@ -826,7 +825,7 @@ class AuthenticationCookieTest extends PMATestCase public function testAuthFailsDBI() { - $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie') ->disableOriginalConstructor() ->setMethods(array('auth')) ->getMock(); @@ -860,7 +859,7 @@ class AuthenticationCookieTest extends PMATestCase public function testAuthFailsErrno() { - $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie') ->disableOriginalConstructor() ->setMethods(array('auth')) ->getMock(); @@ -892,14 +891,14 @@ class AuthenticationCookieTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\auth\AuthenticationConfig::_getEncryptionSecret + * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::_getEncryptionSecret * * @return void */ public function testGetEncryptionSecretEmpty() { $method = new \ReflectionMethod( - 'PMA\libraries\plugins\auth\AuthenticationCookie', + 'PhpMyAdmin\Plugins\Auth\AuthenticationCookie', '_getEncryptionSecret' ); $method->setAccessible(true); @@ -921,14 +920,14 @@ class AuthenticationCookieTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\auth\AuthenticationConfig::_getEncryptionSecret + * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::_getEncryptionSecret * * @return void */ public function testGetEncryptionSecretConfigured() { $method = new \ReflectionMethod( - 'PMA\libraries\plugins\auth\AuthenticationCookie', + 'PhpMyAdmin\Plugins\Auth\AuthenticationCookie', '_getEncryptionSecret' ); $method->setAccessible(true); @@ -944,7 +943,7 @@ class AuthenticationCookieTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\auth\AuthenticationConfig::cookieEncrypt + * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::cookieEncrypt * * @return void */ @@ -959,7 +958,7 @@ class AuthenticationCookieTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\auth\AuthenticationConfig::cookieEncrypt + * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::cookieEncrypt * * @return void */ @@ -970,7 +969,7 @@ class AuthenticationCookieTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\auth\AuthenticationConfig::cookieEncrypt + * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::cookieEncrypt * * @return void */ @@ -984,7 +983,7 @@ class AuthenticationCookieTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\auth\AuthenticationConfig::cookieDecrypt + * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::cookieDecrypt * * @return void */ @@ -1001,7 +1000,7 @@ class AuthenticationCookieTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\auth\AuthenticationConfig::cookieDecrypt + * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::cookieDecrypt * * @return void */ @@ -1012,7 +1011,7 @@ class AuthenticationCookieTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\auth\AuthenticationConfig::cookieDecrypt + * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::cookieDecrypt * * @return void */ @@ -1026,7 +1025,7 @@ class AuthenticationCookieTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\auth\AuthenticationConfig::cookieDecrypt + * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::cookieDecrypt * * @return void */ @@ -1087,7 +1086,7 @@ class AuthenticationCookieTest extends PMATestCase 'server' => 'b 2' ); $method = new \ReflectionMethod( - 'PMA\libraries\plugins\auth\AuthenticationCookie', + 'PhpMyAdmin\Plugins\Auth\AuthenticationCookie', '_getSessionEncryptionSecret' ); $method->setAccessible(true); diff --git a/test/classes/plugin/auth/AuthenticationHttpTest.php b/test/classes/plugin/auth/AuthenticationHttpTest.php index e331f54b80..64237a6f08 100644 --- a/test/classes/plugin/auth/AuthenticationHttpTest.php +++ b/test/classes/plugin/auth/AuthenticationHttpTest.php @@ -1,18 +1,18 @@ object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationHttp') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationHttp') ->disableOriginalConstructor() ->setMethods(array('authForm')) ->getMock(); diff --git a/test/classes/plugin/auth/AuthenticationSignonTest.php b/test/classes/plugin/auth/AuthenticationSignonTest.php index 921c291778..5704045522 100644 --- a/test/classes/plugin/auth/AuthenticationSignonTest.php +++ b/test/classes/plugin/auth/AuthenticationSignonTest.php @@ -1,18 +1,18 @@ object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationSignon') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationSignon') ->disableOriginalConstructor() ->setMethods(array('auth')) ->getMock(); @@ -294,7 +294,7 @@ class AuthenticationSignonTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authFails + * Test for PhpMyAdmin\Plugins\Auth\AuthenticationSignon::authFails * * @return void */ @@ -303,7 +303,7 @@ class AuthenticationSignonTest extends PMATestCase $GLOBALS['cfg']['Server']['SignonSession'] = 'newSession'; $_COOKIE['newSession'] = '42'; - $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationSignon') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationSignon') ->disableOriginalConstructor() ->setMethods(array('auth')) ->getMock(); @@ -323,7 +323,7 @@ class AuthenticationSignonTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authFails + * Test for PhpMyAdmin\Plugins\Auth\AuthenticationSignon::authFails * * @return void */ @@ -332,7 +332,7 @@ class AuthenticationSignonTest extends PMATestCase $GLOBALS['cfg']['Server']['SignonSession'] = 'newSession'; $_COOKIE['newSession'] = '42'; - $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationSignon') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationSignon') ->disableOriginalConstructor() ->setMethods(array('auth')) ->getMock(); @@ -353,7 +353,7 @@ class AuthenticationSignonTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authFails + * Test for PhpMyAdmin\Plugins\Auth\AuthenticationSignon::authFails * * @return void */ @@ -362,7 +362,7 @@ class AuthenticationSignonTest extends PMATestCase $GLOBALS['cfg']['Server']['SignonSession'] = 'newSession'; $_COOKIE['newSession'] = '42'; - $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationSignon') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationSignon') ->disableOriginalConstructor() ->setMethods(array('auth')) ->getMock(); @@ -390,7 +390,7 @@ class AuthenticationSignonTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authFails + * Test for PhpMyAdmin\Plugins\Auth\AuthenticationSignon::authFails * * @return void */ @@ -399,7 +399,7 @@ class AuthenticationSignonTest extends PMATestCase $GLOBALS['cfg']['Server']['SignonSession'] = 'newSession'; $_COOKIE['newSession'] = '42'; - $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationSignon') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationSignon') ->disableOriginalConstructor() ->setMethods(array('auth')) ->getMock(); diff --git a/test/classes/plugin/export/ExportCodegenTest.php b/test/classes/plugin/export/ExportCodegenTest.php index 87a51ef212..688fd8ae15 100644 --- a/test/classes/plugin/export/ExportCodegenTest.php +++ b/test/classes/plugin/export/ExportCodegenTest.php @@ -1,18 +1,18 @@ setAccessible(true); $method->invoke($this->object, null); - $attrCgFormats = new ReflectionProperty('PMA\libraries\plugins\export\ExportCodegen', '_cgFormats'); + $attrCgFormats = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportCodegen', '_cgFormats'); $attrCgFormats->setAccessible(true); - $attrCgHandlers = new ReflectionProperty('PMA\libraries\plugins\export\ExportCodegen', '_cgHandlers'); + $attrCgHandlers = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportCodegen', '_cgHandlers'); $attrCgHandlers->setAccessible(true); $this->assertEquals( @@ -78,17 +78,17 @@ class ExportCodegenTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportCodegen::setProperties + * Test for PhpMyAdmin\Plugins\Export\ExportCodegen::setProperties * * @return void */ public function testSetProperties() { - $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportCodegen', 'setProperties'); + $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportCodegen', 'setProperties'); $method->setAccessible(true); $method->invoke($this->object, null); - $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportCodegen', 'properties'); + $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportCodegen', 'properties'); $attrProperties->setAccessible(true); $properties = $attrProperties->getValue($this->object); @@ -183,7 +183,7 @@ class ExportCodegenTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportCodegen::exportHeader + * Test for PhpMyAdmin\Plugins\Export\ExportCodegen::exportHeader * * @return void */ @@ -195,7 +195,7 @@ class ExportCodegenTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportCodegen::exportFooter + * Test for PhpMyAdmin\Plugins\Export\ExportCodegen::exportFooter * * @return void */ @@ -207,7 +207,7 @@ class ExportCodegenTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportCodegen::exportDBHeader + * Test for PhpMyAdmin\Plugins\Export\ExportCodegen::exportDBHeader * * @return void */ @@ -219,7 +219,7 @@ class ExportCodegenTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportCodegen::exportDBFooter + * Test for PhpMyAdmin\Plugins\Export\ExportCodegen::exportDBFooter * * @return void */ @@ -231,7 +231,7 @@ class ExportCodegenTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportCodegen::exportData + * Test for PhpMyAdmin\Plugins\Export\ExportCodegen::exportData * * @return void */ @@ -287,7 +287,7 @@ class ExportCodegenTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportCodegen::cgMakeIdentifier + * Test for PhpMyAdmin\Plugins\Export\ExportCodegen::cgMakeIdentifier * * @return void */ @@ -310,7 +310,7 @@ class ExportCodegenTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportCodegen::_handleNHibernateCSBody + * Test for PhpMyAdmin\Plugins\Export\ExportCodegen::_handleNHibernateCSBody * * @return void */ @@ -336,7 +336,7 @@ class ExportCodegenTest extends PMATestCase ->will($this->returnValue(null)); $GLOBALS['dbi'] = $dbi; - $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportCodegen', '_handleNHibernateCSBody'); + $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportCodegen', '_handleNHibernateCSBody'); $method->setAccessible(true); $result = $method->invoke($this->object, 'db', 'table', "\n"); @@ -375,7 +375,7 @@ class ExportCodegenTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportCodegen::_handleNHibernateXMLBody + * Test for PhpMyAdmin\Plugins\Export\ExportCodegen::_handleNHibernateXMLBody * * @return void */ @@ -406,7 +406,7 @@ class ExportCodegenTest extends PMATestCase ->will($this->returnValue(null)); $GLOBALS['dbi'] = $dbi; - $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportCodegen', '_handleNHibernateXMLBody'); + $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportCodegen', '_handleNHibernateXMLBody'); $method->setAccessible(true); $result = $method->invoke($this->object, 'db', 'table', "\n"); @@ -431,14 +431,14 @@ class ExportCodegenTest extends PMATestCase /** * Test for - * - PMA\libraries\plugins\export\ExportCodegen::_getCgFormats - * - PMA\libraries\plugins\export\ExportCodegen::_setCgFormats + * - PhpMyAdmin\Plugins\Export\ExportCodegen::_getCgFormats + * - PhpMyAdmin\Plugins\Export\ExportCodegen::_setCgFormats * * @return void */ public function testSetGetCgFormats() { - $reflection = new ReflectionClass('PMA\libraries\plugins\export\ExportCodegen'); + $reflection = new ReflectionClass('PhpMyAdmin\Plugins\Export\ExportCodegen'); $getter = $reflection->getMethod('_getCgFormats'); $setter = $reflection->getMethod('_setCgFormats'); @@ -456,14 +456,14 @@ class ExportCodegenTest extends PMATestCase /** * Test for - * - PMA\libraries\plugins\export\ExportCodegen::_getCgHandlers - * - PMA\libraries\plugins\export\ExportCodegen::_setCgHandlers + * - PhpMyAdmin\Plugins\Export\ExportCodegen::_getCgHandlers + * - PhpMyAdmin\Plugins\Export\ExportCodegen::_setCgHandlers * * @return void */ public function testSetGetCgHandlers() { - $reflection = new ReflectionClass('PMA\libraries\plugins\export\ExportCodegen'); + $reflection = new ReflectionClass('PhpMyAdmin\Plugins\Export\ExportCodegen'); $getter = $reflection->getMethod('_getCgHandlers'); $setter = $reflection->getMethod('_setCgHandlers'); diff --git a/test/classes/plugin/export/ExportCsvTest.php b/test/classes/plugin/export/ExportCsvTest.php index cb07536007..23a5312870 100644 --- a/test/classes/plugin/export/ExportCsvTest.php +++ b/test/classes/plugin/export/ExportCsvTest.php @@ -1,18 +1,18 @@ setAccessible(true); $method->invoke($this->object, null); - $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportCsv', 'properties'); + $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportCsv', 'properties'); $attrProperties->setAccessible(true); $properties = $attrProperties->getValue($this->object); @@ -243,7 +243,7 @@ class ExportCsvTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportCsv::exportHeader + * Test for PhpMyAdmin\Plugins\Export\ExportCsv::exportHeader * * @return void */ @@ -420,7 +420,7 @@ class ExportCsvTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportCsv::exportFooter + * Test for PhpMyAdmin\Plugins\Export\ExportCsv::exportFooter * * @return void */ @@ -432,7 +432,7 @@ class ExportCsvTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportCsv::exportDBHeader + * Test for PhpMyAdmin\Plugins\Export\ExportCsv::exportDBHeader * * @return void */ @@ -444,7 +444,7 @@ class ExportCsvTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportCsv::exportDBFooter + * Test for PhpMyAdmin\Plugins\Export\ExportCsv::exportDBFooter * * @return void */ @@ -456,7 +456,7 @@ class ExportCsvTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportCsv::exportDBCreate + * Test for PhpMyAdmin\Plugins\Export\ExportCsv::exportDBCreate * * @return void */ @@ -468,7 +468,7 @@ class ExportCsvTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportCsv::exportData + * Test for PhpMyAdmin\Plugins\Export\ExportCsv::exportData * * @return void */ diff --git a/test/classes/plugin/export/ExportExcelTest.php b/test/classes/plugin/export/ExportExcelTest.php index 97f1341a4d..f2880efaf1 100644 --- a/test/classes/plugin/export/ExportExcelTest.php +++ b/test/classes/plugin/export/ExportExcelTest.php @@ -1,18 +1,18 @@ setAccessible(true); $method->invoke($this->object, null); - $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportExcel', 'properties'); + $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportExcel', 'properties'); $attrProperties->setAccessible(true); $properties = $attrProperties->getValue($this->object); diff --git a/test/classes/plugin/export/ExportHtmlwordTest.php b/test/classes/plugin/export/ExportHtmlwordTest.php index 320ba463aa..5d117fa2e5 100644 --- a/test/classes/plugin/export/ExportHtmlwordTest.php +++ b/test/classes/plugin/export/ExportHtmlwordTest.php @@ -1,11 +1,11 @@ setAccessible(true); $method->invoke($this->object, null); - $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportHtmlword', 'properties'); + $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportHtmlword', 'properties'); $attrProperties->setAccessible(true); $properties = $attrProperties->getValue($this->object); @@ -205,7 +205,7 @@ class ExportHtmlwordTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportHtmlword::exportHeader + * Test for PhpMyAdmin\Plugins\Export\ExportHtmlword::exportHeader * * @return void */ @@ -262,7 +262,7 @@ class ExportHtmlwordTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportHtmlword::exportFooter + * Test for PhpMyAdmin\Plugins\Export\ExportHtmlword::exportFooter * * @return void */ @@ -281,7 +281,7 @@ class ExportHtmlwordTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportHtmlword::exportDBHeader + * Test for PhpMyAdmin\Plugins\Export\ExportHtmlword::exportDBHeader * * @return void */ @@ -300,7 +300,7 @@ class ExportHtmlwordTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportHtmlword::exportDBFooter + * Test for PhpMyAdmin\Plugins\Export\ExportHtmlword::exportDBFooter * * @return void */ @@ -312,7 +312,7 @@ class ExportHtmlwordTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportHtmlword::exportDBCreate + * Test for PhpMyAdmin\Plugins\Export\ExportHtmlword::exportDBCreate * * @return void */ @@ -324,7 +324,7 @@ class ExportHtmlwordTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportHtmlword::exportData + * Test for PhpMyAdmin\Plugins\Export\ExportHtmlword::exportData * * @return void */ @@ -394,13 +394,13 @@ class ExportHtmlwordTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportHtmlword::getTableDefStandIn + * Test for PhpMyAdmin\Plugins\Export\ExportHtmlword::getTableDefStandIn * * @return void */ public function testGetTableDefStandIn() { - $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportHtmlword') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportHtmlword') ->setMethods(array('formatOneColumnDefinition')) ->getMock(); @@ -450,13 +450,13 @@ class ExportHtmlwordTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportHtmlword::getTableDef + * Test for PhpMyAdmin\Plugins\Export\ExportHtmlword::getTableDef * * @return void */ public function testGetTableDef() { - $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportHtmlword') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportHtmlword') ->setMethods(array('formatOneColumnDefinition')) ->getMock(); @@ -723,7 +723,7 @@ class ExportHtmlwordTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportHtmlword::getTriggers + * Test for PhpMyAdmin\Plugins\Export\ExportHtmlword::getTriggers * * @return void */ @@ -749,7 +749,7 @@ class ExportHtmlwordTest extends PMATestCase $GLOBALS['dbi'] = $dbi; - $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportHtmlword', 'getTriggers'); + $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportHtmlword', 'getTriggers'); $method->setAccessible(true); $result = $method->invoke($this->object, 'database', 'table'); @@ -763,7 +763,7 @@ class ExportHtmlwordTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportHtmlword::exportStructure + * Test for PhpMyAdmin\Plugins\Export\ExportHtmlword::exportStructure * * @return void */ @@ -779,7 +779,7 @@ class ExportHtmlwordTest extends PMATestCase ->with('db', 'tbl') ->will($this->returnValue(1)); - $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportHtmlword') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportHtmlword') ->setMethods(array('getTableDef', 'getTriggers', 'getTableDefStandIn')) ->getMock(); @@ -859,14 +859,14 @@ class ExportHtmlwordTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportHtmlword::formatOneColumnDefinition + * Test for PhpMyAdmin\Plugins\Export\ExportHtmlword::formatOneColumnDefinition * * @return void */ public function testFormatOneColumnDefinition() { $method = new ReflectionMethod( - 'PMA\libraries\plugins\export\ExportHtmlword', 'formatOneColumnDefinition' + 'PhpMyAdmin\Plugins\Export\ExportHtmlword', 'formatOneColumnDefinition' ); $method->setAccessible(true); diff --git a/test/classes/plugin/export/ExportJsonTest.php b/test/classes/plugin/export/ExportJsonTest.php index 8150456539..5efd94df76 100644 --- a/test/classes/plugin/export/ExportJsonTest.php +++ b/test/classes/plugin/export/ExportJsonTest.php @@ -1,18 +1,18 @@ setAccessible(true); $method->invoke($this->object, null); - $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportJson', 'properties'); + $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportJson', 'properties'); $attrProperties->setAccessible(true); $properties = $attrProperties->getValue($this->object); @@ -129,7 +129,7 @@ class ExportJsonTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportJson::exportHeader + * Test for PhpMyAdmin\Plugins\Export\ExportJson::exportHeader * * @return void */ @@ -150,7 +150,7 @@ class ExportJsonTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportJson::exportFooter + * Test for PhpMyAdmin\Plugins\Export\ExportJson::exportFooter * * @return void */ @@ -166,7 +166,7 @@ class ExportJsonTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportJson::exportDBHeader + * Test for PhpMyAdmin\Plugins\Export\ExportJson::exportDBHeader * * @return void */ @@ -184,7 +184,7 @@ class ExportJsonTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportJson::exportDBFooter + * Test for PhpMyAdmin\Plugins\Export\ExportJson::exportDBFooter * * @return void */ @@ -196,7 +196,7 @@ class ExportJsonTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportJson::exportDBCreate + * Test for PhpMyAdmin\Plugins\Export\ExportJson::exportDBCreate * * @return void */ @@ -208,7 +208,7 @@ class ExportJsonTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportJson::exportData + * Test for PhpMyAdmin\Plugins\Export\ExportJson::exportData * * @return void */ diff --git a/test/classes/plugin/export/ExportLatexTest.php b/test/classes/plugin/export/ExportLatexTest.php index 046fc33c3f..146731264f 100644 --- a/test/classes/plugin/export/ExportLatexTest.php +++ b/test/classes/plugin/export/ExportLatexTest.php @@ -1,11 +1,11 @@ setAccessible(true); $method->invoke($this->object, null); - $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportLatex', 'properties'); + $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportLatex', 'properties'); $attrProperties->setAccessible(true); $properties = $attrProperties->getValue($this->object); @@ -464,7 +464,7 @@ class ExportLatexTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportLatex::exportHeader + * Test for PhpMyAdmin\Plugins\Export\ExportLatex::exportHeader * * @return void */ @@ -487,7 +487,7 @@ class ExportLatexTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportLatex::exportFooter + * Test for PhpMyAdmin\Plugins\Export\ExportLatex::exportFooter * * @return void */ @@ -499,7 +499,7 @@ class ExportLatexTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportLatex::exportDBHeader + * Test for PhpMyAdmin\Plugins\Export\ExportLatex::exportDBHeader * * @return void */ @@ -517,7 +517,7 @@ class ExportLatexTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportLatex::exportDBFooter + * Test for PhpMyAdmin\Plugins\Export\ExportLatex::exportDBFooter * * @return void */ @@ -529,7 +529,7 @@ class ExportLatexTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportLatex::exportDBCreate + * Test for PhpMyAdmin\Plugins\Export\ExportLatex::exportDBCreate * * @return void */ @@ -541,7 +541,7 @@ class ExportLatexTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportLatex::exportData + * Test for PhpMyAdmin\Plugins\Export\ExportLatex::exportData * * @return void */ @@ -655,13 +655,13 @@ class ExportLatexTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportLatex::exportStructure + * Test for PhpMyAdmin\Plugins\Export\ExportLatex::exportStructure * * @return void */ public function testExportStructure() { - // $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportHtmlword') + // $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportHtmlword') // ->setMethods(array('formatOneColumnDefinition')) // ->getMock(); @@ -973,7 +973,7 @@ class ExportLatexTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportLatex::texEscape + * Test for PhpMyAdmin\Plugins\Export\ExportLatex::texEscape * * @return void */ diff --git a/test/classes/plugin/export/ExportMediawikiTest.php b/test/classes/plugin/export/ExportMediawikiTest.php index 7cc415bde4..bbc251e00e 100644 --- a/test/classes/plugin/export/ExportMediawikiTest.php +++ b/test/classes/plugin/export/ExportMediawikiTest.php @@ -1,18 +1,18 @@ setAccessible(true); $method->invoke($this->object, null); - $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportMediawiki', 'properties'); + $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportMediawiki', 'properties'); $attrProperties->setAccessible(true); $properties = $attrProperties->getValue($this->object); @@ -193,7 +193,7 @@ class ExportMediawikiTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportMediawiki::exportHeader + * Test for PhpMyAdmin\Plugins\Export\ExportMediawiki::exportHeader * * @return void */ @@ -205,7 +205,7 @@ class ExportMediawikiTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportMediawiki::exportFooter + * Test for PhpMyAdmin\Plugins\Export\ExportMediawiki::exportFooter * * @return void */ @@ -217,7 +217,7 @@ class ExportMediawikiTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportMediawiki::exportDBHeader + * Test for PhpMyAdmin\Plugins\Export\ExportMediawiki::exportDBHeader * * @return void */ @@ -229,7 +229,7 @@ class ExportMediawikiTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportMediawiki::exportDBFooter + * Test for PhpMyAdmin\Plugins\Export\ExportMediawiki::exportDBFooter * * @return void */ @@ -241,7 +241,7 @@ class ExportMediawikiTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportMediawiki::exportDBCreate + * Test for PhpMyAdmin\Plugins\Export\ExportMediawiki::exportDBCreate * * @return void */ @@ -343,7 +343,7 @@ class ExportMediawikiTest extends PMATestCase */ } /** - * Test for PMA\libraries\plugins\export\ExportMediawiki::exportData + * Test for PhpMyAdmin\Plugins\Export\ExportMediawiki::exportData * * @return void */ diff --git a/test/classes/plugin/export/ExportOdsTest.php b/test/classes/plugin/export/ExportOdsTest.php index 3ce45b9a0d..fea5537eae 100644 --- a/test/classes/plugin/export/ExportOdsTest.php +++ b/test/classes/plugin/export/ExportOdsTest.php @@ -1,20 +1,18 @@ setAccessible(true); $method->invoke($this->object, null); - $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportOds', 'properties'); + $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportOds', 'properties'); $attrProperties->setAccessible(true); $properties = $attrProperties->getValue($this->object); @@ -169,7 +167,7 @@ class ExportOdsTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportOds::exportHeader + * Test for PhpMyAdmin\Plugins\Export\ExportOds::exportHeader * * @return void */ @@ -185,7 +183,7 @@ class ExportOdsTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportOds::exportFooter + * Test for PhpMyAdmin\Plugins\Export\ExportOds::exportFooter * * @return void */ @@ -222,7 +220,7 @@ class ExportOdsTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportOds::exportDBHeader + * Test for PhpMyAdmin\Plugins\Export\ExportOds::exportDBHeader * * @return void */ @@ -234,7 +232,7 @@ class ExportOdsTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportOds::exportDBFooter + * Test for PhpMyAdmin\Plugins\Export\ExportOds::exportDBFooter * * @return void */ @@ -246,7 +244,7 @@ class ExportOdsTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportOds::exportDBCreate + * Test for PhpMyAdmin\Plugins\Export\ExportOds::exportDBCreate * * @return void */ @@ -258,7 +256,7 @@ class ExportOdsTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportOds::exportData + * Test for PhpMyAdmin\Plugins\Export\ExportOds::exportData * * @return void */ @@ -383,7 +381,7 @@ class ExportOdsTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportOds::exportData + * Test for PhpMyAdmin\Plugins\Export\ExportOds::exportData * * @return void */ diff --git a/test/classes/plugin/export/ExportOdtTest.php b/test/classes/plugin/export/ExportOdtTest.php index 1aa201d635..1253ba6398 100644 --- a/test/classes/plugin/export/ExportOdtTest.php +++ b/test/classes/plugin/export/ExportOdtTest.php @@ -1,21 +1,19 @@ setAccessible(true); $method->invoke($this->object, null); - $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportOdt', 'properties'); + $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportOdt', 'properties'); $attrProperties->setAccessible(true); $properties = $attrProperties->getValue($this->object); @@ -306,7 +304,7 @@ class ExportOdtTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportOdt::exportHeader + * Test for PhpMyAdmin\Plugins\Export\ExportOdt::exportHeader * * @return void */ @@ -327,7 +325,7 @@ class ExportOdtTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportOdt::exportFooter + * Test for PhpMyAdmin\Plugins\Export\ExportOdt::exportFooter * * @return void */ @@ -354,7 +352,7 @@ class ExportOdtTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportOdt::exportDBHeader + * Test for PhpMyAdmin\Plugins\Export\ExportOdt::exportDBHeader * * @return void */ @@ -378,7 +376,7 @@ class ExportOdtTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportOdt::exportDBFooter + * Test for PhpMyAdmin\Plugins\Export\ExportOdt::exportDBFooter * * @return void */ @@ -390,7 +388,7 @@ class ExportOdtTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportOdt::exportDBCreate + * Test for PhpMyAdmin\Plugins\Export\ExportOdt::exportDBCreate * * @return void */ @@ -402,7 +400,7 @@ class ExportOdtTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportOdt::exportData + * Test for PhpMyAdmin\Plugins\Export\ExportOdt::exportData * * @return void */ @@ -498,7 +496,7 @@ class ExportOdtTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportOdt::exportData + * Test for PhpMyAdmin\Plugins\Export\ExportOdt::exportData * * @return void */ @@ -623,7 +621,7 @@ class ExportOdtTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportOdt::getTableDefStandIn + * Test for PhpMyAdmin\Plugins\Export\ExportOdt::getTableDefStandIn * * @return void */ @@ -640,7 +638,7 @@ class ExportOdtTest extends PMATestCase $GLOBALS['dbi'] = $dbi; - $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportOdt') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportOdt') ->disableOriginalConstructor() ->setMethods(array('formatOneColumnDefinition')) ->getMock(); @@ -672,13 +670,13 @@ class ExportOdtTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportOdt::getTableDef + * Test for PhpMyAdmin\Plugins\Export\ExportOdt::getTableDef * * @return void */ public function testGetTableDef() { - $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportOdt') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportOdt') ->setMethods(array('formatOneColumnDefinition')) ->getMock(); @@ -866,7 +864,7 @@ class ExportOdtTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportOdt::getTriggers + * Test for PhpMyAdmin\Plugins\Export\ExportOdt::getTriggers * * @return void */ @@ -892,7 +890,7 @@ class ExportOdtTest extends PMATestCase $GLOBALS['dbi'] = $dbi; - $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportOdt', 'getTriggers'); + $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportOdt', 'getTriggers'); $method->setAccessible(true); $result = $method->invoke($this->object, 'database', 'tawith('db', 't&bl') ->will($this->returnValue(1)); - $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportOdt') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportOdt') ->setMethods(array('getTableDef', 'getTriggers', 'getTableDefStandIn')) ->getMock(); @@ -1031,14 +1029,14 @@ class ExportOdtTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportOdt::formatOneColumnDefinition + * Test for PhpMyAdmin\Plugins\Export\ExportOdt::formatOneColumnDefinition * * @return void */ public function testFormatOneColumnDefinition() { $method = new ReflectionMethod( - 'PMA\libraries\plugins\export\ExportOdt', 'formatOneColumnDefinition' + 'PhpMyAdmin\Plugins\Export\ExportOdt', 'formatOneColumnDefinition' ); $method->setAccessible(true); diff --git a/test/classes/plugin/export/ExportPdfTest.php b/test/classes/plugin/export/ExportPdfTest.php index 9bc4676326..a61cc90f29 100644 --- a/test/classes/plugin/export/ExportPdfTest.php +++ b/test/classes/plugin/export/ExportPdfTest.php @@ -1,19 +1,19 @@ setAccessible(true); $method->invoke($this->object, null); - $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportPdf', 'properties'); + $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportPdf', 'properties'); $attrProperties->setAccessible(true); $properties = $attrProperties->getValue($this->object); @@ -175,13 +175,13 @@ class ExportPdfTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportPdf::exportHeader + * Test for PhpMyAdmin\Plugins\Export\ExportPdf::exportHeader * * @return void */ public function testExportHeader() { - $pdf = $this->getMockBuilder('PMA\libraries\plugins\export\helpers\Pdf') + $pdf = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\Helpers\Pdf') ->disableOriginalConstructor() ->getMock(); @@ -194,7 +194,7 @@ class ExportPdfTest extends PMATestCase $pdf->expects($this->once()) ->method('setTopMargin'); - $attrPdf = new ReflectionProperty('PMA\libraries\plugins\export\ExportPdf', '_pdf'); + $attrPdf = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportPdf', '_pdf'); $attrPdf->setAccessible(true); $attrPdf->setValue($this->object, $pdf); @@ -204,20 +204,20 @@ class ExportPdfTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportPdf::exportFooter + * Test for PhpMyAdmin\Plugins\Export\ExportPdf::exportFooter * * @return void */ public function testExportFooter() { - $pdf = $this->getMockBuilder('PMA\libraries\plugins\export\helpers\Pdf') + $pdf = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\Helpers\Pdf') ->disableOriginalConstructor() ->getMock(); $pdf->expects($this->once()) ->method('getPDFData'); - $attrPdf = new ReflectionProperty('PMA\libraries\plugins\export\ExportPdf', '_pdf'); + $attrPdf = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportPdf', '_pdf'); $attrPdf->setAccessible(true); $attrPdf->setValue($this->object, $pdf); @@ -227,7 +227,7 @@ class ExportPdfTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportPdf::exportDBHeader + * Test for PhpMyAdmin\Plugins\Export\ExportPdf::exportDBHeader * * @return void */ @@ -239,7 +239,7 @@ class ExportPdfTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportPdf::exportDBFooter + * Test for PhpMyAdmin\Plugins\Export\ExportPdf::exportDBFooter * * @return void */ @@ -251,7 +251,7 @@ class ExportPdfTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportPdf::exportDBCreate + * Test for PhpMyAdmin\Plugins\Export\ExportPdf::exportDBCreate * * @return void */ @@ -263,13 +263,13 @@ class ExportPdfTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportPdf::exportData + * Test for PhpMyAdmin\Plugins\Export\ExportPdf::exportData * * @return void */ public function testExportData() { - $pdf = $this->getMockBuilder('PMA\libraries\plugins\export\helpers\Pdf') + $pdf = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\Helpers\Pdf') ->disableOriginalConstructor() ->getMock(); @@ -287,7 +287,7 @@ class ExportPdfTest extends PMATestCase ->method('mysqlReport') ->with('SELECT'); - $attrPdf = new ReflectionProperty('PMA\libraries\plugins\export\ExportPdf', '_pdf'); + $attrPdf = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportPdf', '_pdf'); $attrPdf->setAccessible(true); $attrPdf->setValue($this->object, $pdf); @@ -300,39 +300,39 @@ class ExportPdfTest extends PMATestCase /** * Test for - * - PMA\libraries\plugins\export\ExportPdf::_setPdf - * - PMA\libraries\plugins\export\ExportPdf::_getPdf + * - PhpMyAdmin\Plugins\Export\ExportPdf::_setPdf + * - PhpMyAdmin\Plugins\Export\ExportPdf::_getPdf * * @return void */ public function testSetGetPdf() { - $setter = new ReflectionMethod('PMA\libraries\plugins\export\ExportPdf', '_setPdf'); + $setter = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportPdf', '_setPdf'); $setter->setAccessible(true); $setter->invoke($this->object, new Pdf); - $getter = new ReflectionMethod('PMA\libraries\plugins\export\ExportPdf', '_getPdf'); + $getter = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportPdf', '_getPdf'); $getter->setAccessible(true); $this->assertInstanceOf( - 'PMA\libraries\plugins\export\helpers\Pdf', + 'PhpMyAdmin\Plugins\Export\Helpers\Pdf', $getter->invoke($this->object) ); } /** * Test for - * - PMA\libraries\plugins\export\ExportPdf::_setPdfReportTitle - * - PMA\libraries\plugins\export\ExportPdf::_getPdfReportTitle + * - PhpMyAdmin\Plugins\Export\ExportPdf::_setPdfReportTitle + * - PhpMyAdmin\Plugins\Export\ExportPdf::_getPdfReportTitle * * @return void */ public function testSetGetPdfTitle() { - $setter = new ReflectionMethod('PMA\libraries\plugins\export\ExportPdf', '_setPdfReportTitle'); + $setter = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportPdf', '_setPdfReportTitle'); $setter->setAccessible(true); $setter->invoke($this->object, "title"); - $getter = new ReflectionMethod('PMA\libraries\plugins\export\ExportPdf', '_getPdfReportTitle'); + $getter = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportPdf', '_getPdfReportTitle'); $getter->setAccessible(true); $this->assertEquals( 'title', diff --git a/test/classes/plugin/export/ExportPhparrayTest.php b/test/classes/plugin/export/ExportPhparrayTest.php index 2c603c59c8..5da7d6ee3f 100644 --- a/test/classes/plugin/export/ExportPhparrayTest.php +++ b/test/classes/plugin/export/ExportPhparrayTest.php @@ -1,18 +1,18 @@ setAccessible(true); $method->invoke($this->object, null); - $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportPhparray', 'properties'); + $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportPhparray', 'properties'); $attrProperties->setAccessible(true); $properties = $attrProperties->getValue($this->object); @@ -123,7 +123,7 @@ class ExportPhparrayTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportPhparray::exportHeader + * Test for PhpMyAdmin\Plugins\Export\ExportPhparray::exportHeader * * @return void */ @@ -144,7 +144,7 @@ class ExportPhparrayTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportPhparray::exportFooter + * Test for PhpMyAdmin\Plugins\Export\ExportPhparray::exportFooter * * @return void */ @@ -156,7 +156,7 @@ class ExportPhparrayTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportPhparray::exportDBHeader + * Test for PhpMyAdmin\Plugins\Export\ExportPhparray::exportDBHeader * * @return void */ @@ -177,7 +177,7 @@ class ExportPhparrayTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportPhparray::exportDBFooter + * Test for PhpMyAdmin\Plugins\Export\ExportPhparray::exportDBFooter * * @return void */ @@ -189,7 +189,7 @@ class ExportPhparrayTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportPhparray::exportDBCreate + * Test for PhpMyAdmin\Plugins\Export\ExportPhparray::exportDBCreate * * @return void */ @@ -201,7 +201,7 @@ class ExportPhparrayTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportPhparray::exportData + * Test for PhpMyAdmin\Plugins\Export\ExportPhparray::exportData * * @return void */ diff --git a/test/classes/plugin/export/ExportSqlTest.php b/test/classes/plugin/export/ExportSqlTest.php index 0036b2e457..6cbcf9b81b 100644 --- a/test/classes/plugin/export/ExportSqlTest.php +++ b/test/classes/plugin/export/ExportSqlTest.php @@ -1,11 +1,11 @@ setAccessible(true); $method->invoke($this->object, null); - $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportSql', 'properties'); + $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportSql', 'properties'); $attrProperties->setAccessible(true); $properties = $attrProperties->getValue($this->object); @@ -316,7 +316,7 @@ class ExportSqlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportSql::exportRoutines + * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportRoutines * * @return void */ @@ -366,13 +366,13 @@ class ExportSqlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportSql::_exportComment + * Test for PhpMyAdmin\Plugins\Export\ExportSql::_exportComment * * @return void */ public function testExportComment() { - $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportSql', '_exportComment'); + $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportSql', '_exportComment'); $method->setAccessible(true); $GLOBALS['crlf'] = '##'; @@ -404,13 +404,13 @@ class ExportSqlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportSql::_possibleCRLF + * Test for PhpMyAdmin\Plugins\Export\ExportSql::_possibleCRLF * * @return void */ public function testPossibleCRLF() { - $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportSql', '_possibleCRLF'); + $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportSql', '_possibleCRLF'); $method->setAccessible(true); $GLOBALS['crlf'] = '##'; @@ -442,7 +442,7 @@ class ExportSqlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportSql::exportFooter + * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportFooter * * @return void */ @@ -476,7 +476,7 @@ class ExportSqlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportSql::exportHeader + * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportHeader * * @return void */ @@ -553,7 +553,7 @@ class ExportSqlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportSql::exportDBCreate + * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportDBCreate * * @return void */ @@ -643,7 +643,7 @@ class ExportSqlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportSql::exportDBHeader + * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportDBHeader * * @return void */ @@ -682,7 +682,7 @@ class ExportSqlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportSql::exportEvents + * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportEvents * * @return void */ @@ -748,7 +748,7 @@ class ExportSqlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportSql::exportDBFooter + * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportDBFooter * * @return void */ @@ -780,7 +780,7 @@ class ExportSqlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportSql::getTableDefStandIn + * Test for PhpMyAdmin\Plugins\Export\ExportSql::getTableDefStandIn * * @return void */ @@ -820,7 +820,7 @@ class ExportSqlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportSql::_getTableDefForView + * Test for PhpMyAdmin\Plugins\Export\ExportSql::_getTableDefForView * * @return void */ @@ -856,7 +856,7 @@ class ExportSqlTest extends PMATestCase $GLOBALS['dbi'] = $dbi; $GLOBALS['sql_compatibility'] = 'MSSQL'; - $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportSql', '_getTableDefForView'); + $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportSql', '_getTableDefForView'); $method->setAccessible(true); $result = $method->invoke( $this->object, 'db', 'view', "\n" @@ -910,7 +910,7 @@ class ExportSqlTest extends PMATestCase /** - * Test for PMA\libraries\plugins\export\ExportSql::getTableDef + * Test for PhpMyAdmin\Plugins\Export\ExportSql::getTableDef * * @return void * @group medium @@ -1078,7 +1078,7 @@ class ExportSqlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportSql::getTableDef + * Test for PhpMyAdmin\Plugins\Export\ExportSql::getTableDef * * @return void */ @@ -1162,7 +1162,7 @@ class ExportSqlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportSql::_getTableComments + * Test for PhpMyAdmin\Plugins\Export\ExportSql::_getTableComments * * @return void */ @@ -1207,7 +1207,7 @@ class ExportSqlTest extends PMATestCase $GLOBALS['dbi'] = $dbi; - $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportSql', '_getTableComments'); + $method = new ReflectionMethod('PhpMyAdmin\Plugins\Export\ExportSql', '_getTableComments'); $method->setAccessible(true); $result = $method->invoke( $this->object, 'db', '', "\n", true, true @@ -1229,7 +1229,7 @@ class ExportSqlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportSql::exportStructure + * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportStructure * * @return void * @group medium @@ -1254,7 +1254,7 @@ class ExportSqlTest extends PMATestCase ) ); - $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportSql') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportSql') ->setMethods(array('getTableDef', 'getTriggers', 'getTableDefStandIn')) ->getMock(); @@ -1402,7 +1402,7 @@ class ExportSqlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportSql::exportData + * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportData * * @return void * @group medium @@ -1550,7 +1550,7 @@ class ExportSqlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportSql::exportData + * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportData * * @return void * @group medium @@ -1659,7 +1659,7 @@ class ExportSqlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportSql::exportData + * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportData * * @return void */ @@ -1715,7 +1715,7 @@ class ExportSqlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportSql::exportData + * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportData * * @return void */ @@ -1764,7 +1764,7 @@ class ExportSqlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportSql::_makeCreateTableMSSQLCompatible + * Test for PhpMyAdmin\Plugins\Export\ExportSql::_makeCreateTableMSSQLCompatible * * @return void */ @@ -1789,7 +1789,7 @@ class ExportSqlTest extends PMATestCase " \" double NOT NULL DEFAULT '213'\n"; $method = new ReflectionMethod( - 'PMA\libraries\plugins\export\ExportSql', '_makeCreateTableMSSQLCompatible' + 'PhpMyAdmin\Plugins\Export\ExportSql', '_makeCreateTableMSSQLCompatible' ); $method->setAccessible(true); $result = $method->invoke( @@ -1821,7 +1821,7 @@ class ExportSqlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportSql::initAlias + * Test for PhpMyAdmin\Plugins\Export\ExportSql::initAlias * * @return void */ @@ -1863,7 +1863,7 @@ class ExportSqlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportSql::getAlias + * Test for PhpMyAdmin\Plugins\Export\ExportSql::getAlias * * @return void */ @@ -1908,7 +1908,7 @@ class ExportSqlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportSql::replaceWithAlias + * Test for PhpMyAdmin\Plugins\Export\ExportSql::replaceWithAlias * * @return void */ diff --git a/test/classes/plugin/export/ExportTexytextTest.php b/test/classes/plugin/export/ExportTexytextTest.php index 61aafb9f3c..6986cdb6c7 100644 --- a/test/classes/plugin/export/ExportTexytextTest.php +++ b/test/classes/plugin/export/ExportTexytextTest.php @@ -1,11 +1,11 @@ setAccessible(true); $method->invoke($this->object, null); - $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportTexytext', 'properties'); + $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportTexytext', 'properties'); $attrProperties->setAccessible(true); $properties = $attrProperties->getValue($this->object); @@ -166,7 +166,7 @@ class ExportTexytextTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportTexytext::exportHeader + * Test for PhpMyAdmin\Plugins\Export\ExportTexytext::exportHeader * * @return void */ @@ -178,7 +178,7 @@ class ExportTexytextTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportTexytext::exportFooter + * Test for PhpMyAdmin\Plugins\Export\ExportTexytext::exportFooter * * @return void */ @@ -190,7 +190,7 @@ class ExportTexytextTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportTexytext::exportDBHeader + * Test for PhpMyAdmin\Plugins\Export\ExportTexytext::exportDBHeader * * @return void */ @@ -205,7 +205,7 @@ class ExportTexytextTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportTexytext::exportDBFooter + * Test for PhpMyAdmin\Plugins\Export\ExportTexytext::exportDBFooter * * @return void */ @@ -217,7 +217,7 @@ class ExportTexytextTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportTexytext::exportDBCreate + * Test for PhpMyAdmin\Plugins\Export\ExportTexytext::exportDBCreate * * @return void */ @@ -229,7 +229,7 @@ class ExportTexytextTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportTexytext::exportData + * Test for PhpMyAdmin\Plugins\Export\ExportTexytext::exportData * * @return void */ @@ -292,7 +292,7 @@ class ExportTexytextTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportTexytext::getTableDefStandIn + * Test for PhpMyAdmin\Plugins\Export\ExportTexytext::getTableDefStandIn * * @return void */ @@ -329,7 +329,7 @@ class ExportTexytextTest extends PMATestCase $GLOBALS['dbi'] = $dbi; - $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportTexytext') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportTexytext') ->disableOriginalConstructor() ->setMethods(array('formatOneColumnDefinition')) ->getMock(); @@ -353,13 +353,13 @@ class ExportTexytextTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportTexytext::getTableDef + * Test for PhpMyAdmin\Plugins\Export\ExportTexytext::getTableDef * * @return void */ public function testGetTableDef() { - $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportTexytext') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportTexytext') ->setMethods(array('formatOneColumnDefinition')) ->getMock(); $GLOBALS['controllink'] = null; @@ -457,7 +457,7 @@ class ExportTexytextTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportTexytext::getTriggers + * Test for PhpMyAdmin\Plugins\Export\ExportTexytext::getTriggers * * @return void */ @@ -498,7 +498,7 @@ class ExportTexytextTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportTexytext::exportStructure + * Test for PhpMyAdmin\Plugins\Export\ExportTexytext::exportStructure * * @return void */ @@ -514,7 +514,7 @@ class ExportTexytextTest extends PMATestCase ->with('db', 't&bl') ->will($this->returnValue(1)); - $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportTexytext') + $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportTexytext') ->setMethods(array('getTableDef', 'getTriggers', 'getTableDefStandIn')) ->getMock(); @@ -601,7 +601,7 @@ class ExportTexytextTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportTexytext::formatOneColumnDefinition + * Test for PhpMyAdmin\Plugins\Export\ExportTexytext::formatOneColumnDefinition * * @return void */ diff --git a/test/classes/plugin/export/ExportXmlTest.php b/test/classes/plugin/export/ExportXmlTest.php index 1733a75129..11eb64d575 100644 --- a/test/classes/plugin/export/ExportXmlTest.php +++ b/test/classes/plugin/export/ExportXmlTest.php @@ -1,11 +1,11 @@ setAccessible(true); $method->invoke($this->object, null); - $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportXml', 'properties'); + $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportXml', 'properties'); $attrProperties->setAccessible(true); $properties = $attrProperties->getValue($this->object); @@ -196,7 +196,7 @@ class ExportXmlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportXml::exportHeader + * Test for PhpMyAdmin\Plugins\Export\ExportXml::exportHeader * * @return void * @group medium @@ -377,7 +377,7 @@ class ExportXmlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportXml::exportFooter + * Test for PhpMyAdmin\Plugins\Export\ExportXml::exportFooter * * @return void */ @@ -392,7 +392,7 @@ class ExportXmlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportXml::exportDBHeader + * Test for PhpMyAdmin\Plugins\Export\ExportXml::exportDBHeader * * @return void */ @@ -419,7 +419,7 @@ class ExportXmlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportXml::exportDBFooter + * Test for PhpMyAdmin\Plugins\Export\ExportXml::exportDBFooter * * @return void */ @@ -446,7 +446,7 @@ class ExportXmlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportXml::exportDBCreate + * Test for PhpMyAdmin\Plugins\Export\ExportXml::exportDBCreate * * @return void */ @@ -458,7 +458,7 @@ class ExportXmlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportXml::exportData + * Test for PhpMyAdmin\Plugins\Export\ExportXml::exportData * * @return void */ diff --git a/test/classes/plugin/export/ExportYamlTest.php b/test/classes/plugin/export/ExportYamlTest.php index b681a5d974..5c27b01a6b 100644 --- a/test/classes/plugin/export/ExportYamlTest.php +++ b/test/classes/plugin/export/ExportYamlTest.php @@ -1,11 +1,11 @@ setAccessible(true); $method->invoke($this->object, null); - $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportYaml', 'properties'); + $attrProperties = new ReflectionProperty('PhpMyAdmin\Plugins\Export\ExportYaml', 'properties'); $attrProperties->setAccessible(true); $properties = $attrProperties->getValue($this->object); @@ -121,7 +121,7 @@ class ExportYamlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportYaml::exportHeader + * Test for PhpMyAdmin\Plugins\Export\ExportYaml::exportHeader * * @return void */ @@ -140,7 +140,7 @@ class ExportYamlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportYaml::exportFooter + * Test for PhpMyAdmin\Plugins\Export\ExportYaml::exportFooter * * @return void */ @@ -155,7 +155,7 @@ class ExportYamlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportYaml::exportDBHeader + * Test for PhpMyAdmin\Plugins\Export\ExportYaml::exportDBHeader * * @return void */ @@ -167,7 +167,7 @@ class ExportYamlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportYaml::exportDBFooter + * Test for PhpMyAdmin\Plugins\Export\ExportYaml::exportDBFooter * * @return void */ @@ -179,7 +179,7 @@ class ExportYamlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportYaml::exportDBCreate + * Test for PhpMyAdmin\Plugins\Export\ExportYaml::exportDBCreate * * @return void */ @@ -191,7 +191,7 @@ class ExportYamlTest extends PMATestCase } /** - * Test for PMA\libraries\plugins\export\ExportYaml::exportData + * Test for PhpMyAdmin\Plugins\Export\ExportYaml::exportData * * @return void */ diff --git a/test/classes/plugin/export/helpers/TablePropertyTest.php b/test/classes/plugin/export/helpers/TablePropertyTest.php index 7bb29e23a7..f447934b4d 100644 --- a/test/classes/plugin/export/helpers/TablePropertyTest.php +++ b/test/classes/plugin/export/helpers/TablePropertyTest.php @@ -1,17 +1,17 @@ $export_type, 'single_table' => isset($single_table) diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php index ac5d55338a..8282dd3ff9 100644 --- a/test/libraries/PMA_insert_edit_test.php +++ b/test/libraries/PMA_insert_edit_test.php @@ -2872,7 +2872,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase md5('col') => 'val' ); $column_mime = array( - 'input_transformation' => 'input/Image_JPEG_Upload.php', + 'input_transformation' => 'Input/Image_JPEG_Upload.php', 'input_transformation_options' => '150' ); From 6e53b22991506bac0e6272a932193ae95c8f6340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Thu, 20 Jul 2017 12:08:58 -0300 Subject: [PATCH 09/12] Move properties 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 --- .../classes/Plugins/Export/ExportCodegen.php | 10 ++-- .../classes/Plugins/Export/ExportCsv.php | 12 ++-- .../classes/Plugins/Export/ExportExcel.php | 14 ++--- .../classes/Plugins/Export/ExportHtmlword.php | 12 ++-- .../classes/Plugins/Export/ExportJson.php | 10 ++-- .../classes/Plugins/Export/ExportLatex.php | 12 ++-- .../Plugins/Export/ExportMediawiki.php | 12 ++-- .../classes/Plugins/Export/ExportOds.php | 12 ++-- .../classes/Plugins/Export/ExportOdt.php | 12 ++-- .../classes/Plugins/Export/ExportPdf.php | 10 ++-- .../classes/Plugins/Export/ExportPhparray.php | 8 +-- .../classes/Plugins/Export/ExportSql.php | 20 +++---- .../classes/Plugins/Export/ExportTexytext.php | 12 ++-- .../classes/Plugins/Export/ExportXml.php | 10 ++-- .../classes/Plugins/Export/ExportYaml.php | 8 +-- libraries/classes/Plugins/Export/README | 8 +-- libraries/classes/Plugins/ExportPlugin.php | 6 +- .../Plugins/Import/AbstractImportCsv.php | 12 ++-- .../classes/Plugins/Import/ImportCsv.php | 4 +- .../classes/Plugins/Import/ImportLdi.php | 4 +- .../Plugins/Import/ImportMediawiki.php | 2 +- .../classes/Plugins/Import/ImportOds.php | 8 +-- .../classes/Plugins/Import/ImportShp.php | 2 +- .../classes/Plugins/Import/ImportSql.php | 10 ++-- .../classes/Plugins/Import/ImportXml.php | 2 +- libraries/classes/Plugins/Import/README | 8 +-- libraries/classes/Plugins/ImportPlugin.php | 4 +- .../classes/Plugins/Schema/SchemaDia.php | 8 +-- .../classes/Plugins/Schema/SchemaEps.php | 10 ++-- .../classes/Plugins/Schema/SchemaPdf.php | 10 ++-- .../classes/Plugins/Schema/SchemaSvg.php | 8 +-- libraries/classes/Plugins/SchemaPlugin.php | 10 ++-- .../Groups/OptionsPropertyMainGroup.php | 33 +++++++++++ .../Groups/OptionsPropertyRootGroup.php | 33 +++++++++++ .../Groups}/OptionsPropertySubgroup.php | 16 +++--- .../Options/Items/BoolPropertyItem.php | 33 +++++++++++ .../Options/Items/DocPropertyItem.php | 33 +++++++++++ .../Options/Items}/HiddenPropertyItem.php | 12 ++-- .../Items}/MessageOnlyPropertyItem.php | 12 ++-- .../Options/Items}/NumberPropertyItem.php | 12 ++-- .../Options/Items/RadioPropertyItem.php | 33 +++++++++++ .../Options/Items}/SelectPropertyItem.php | 12 ++-- .../Options/Items/TextPropertyItem.php | 33 +++++++++++ .../Options}/OptionsPropertyGroup.php | 4 +- .../Options}/OptionsPropertyItem.php | 6 +- .../Options}/OptionsPropertyOneItem.php | 2 +- .../Plugins}/ExportPluginProperties.php | 8 +-- .../Plugins}/ImportPluginProperties.php | 8 +-- .../Plugins}/PluginPropertyItem.php | 10 ++-- .../Plugins}/SchemaPluginProperties.php | 8 +-- .../Properties}/PropertyItem.php | 12 ++-- libraries/plugin_interface.lib.php | 40 ++++++------- .../groups/OptionsPropertyMainGroup.php | 33 ----------- .../groups/OptionsPropertyRootGroup.php | 33 ----------- .../options/items/BoolPropertyItem.php | 33 ----------- .../options/items/DocPropertyItem.php | 33 ----------- .../options/items/RadioPropertyItem.php | 33 ----------- .../options/items/TextPropertyItem.php | 33 ----------- .../plugin/export/ExportCodegenTest.php | 10 ++-- test/classes/plugin/export/ExportCsvTest.php | 22 ++++---- .../classes/plugin/export/ExportExcelTest.php | 16 +++--- .../plugin/export/ExportHtmlwordTest.php | 14 ++--- test/classes/plugin/export/ExportJsonTest.php | 8 +-- .../classes/plugin/export/ExportLatexTest.php | 38 ++++++------- .../plugin/export/ExportMediawikiTest.php | 14 ++--- test/classes/plugin/export/ExportOdsTest.php | 12 ++-- test/classes/plugin/export/ExportOdtTest.php | 22 ++++---- test/classes/plugin/export/ExportPdfTest.php | 12 ++-- .../plugin/export/ExportPhparrayTest.php | 8 +-- test/classes/plugin/export/ExportSqlTest.php | 56 +++++++++---------- .../plugin/export/ExportTexytextTest.php | 14 ++--- test/classes/plugin/export/ExportXmlTest.php | 24 ++++---- test/classes/plugin/export/ExportYamlTest.php | 8 +-- test/classes/properties/PropertyItemTest.php | 8 +-- .../options/OptionsPropertyGroupTest.php | 26 ++++----- .../options/OptionsPropertyItemTest.php | 20 +++---- .../options/OptionsPropertyOneItemTest.php | 26 ++++----- .../groups/OptionsPropertyMainGroupTest.php | 8 +-- .../groups/OptionsPropertyRootGroupTest.php | 8 +-- .../groups/OptionsPropertySubgroupTest.php | 12 ++-- .../options/items/PropertyItemsTest.php | 36 ++++++------ .../plugins/ExportPluginPropertiesTest.php | 12 ++-- .../plugins/ImportPluginPropertiesTest.php | 16 +++--- .../plugins/PluginPropertyItemTest.php | 8 +-- 84 files changed, 653 insertions(+), 653 deletions(-) create mode 100644 libraries/classes/Properties/Options/Groups/OptionsPropertyMainGroup.php create mode 100644 libraries/classes/Properties/Options/Groups/OptionsPropertyRootGroup.php rename libraries/{properties/options/groups => classes/Properties/Options/Groups}/OptionsPropertySubgroup.php (61%) create mode 100644 libraries/classes/Properties/Options/Items/BoolPropertyItem.php create mode 100644 libraries/classes/Properties/Options/Items/DocPropertyItem.php rename libraries/{properties/options/items => classes/Properties/Options/Items}/HiddenPropertyItem.php (50%) rename libraries/{properties/options/items => classes/Properties/Options/Items}/MessageOnlyPropertyItem.php (50%) rename libraries/{properties/options/items => classes/Properties/Options/Items}/NumberPropertyItem.php (50%) create mode 100644 libraries/classes/Properties/Options/Items/RadioPropertyItem.php rename libraries/{properties/options/items => classes/Properties/Options/Items}/SelectPropertyItem.php (50%) create mode 100644 libraries/classes/Properties/Options/Items/TextPropertyItem.php rename libraries/{properties/options => classes/Properties/Options}/OptionsPropertyGroup.php (93%) rename libraries/{properties/options => classes/Properties/Options}/OptionsPropertyItem.php (93%) rename libraries/{properties/options => classes/Properties/Options}/OptionsPropertyOneItem.php (98%) rename libraries/{properties/plugins => classes/Properties/Plugins}/ExportPluginProperties.php (78%) rename libraries/{properties/plugins => classes/Properties/Plugins}/ImportPluginProperties.php (61%) rename libraries/{properties/plugins => classes/Properties/Plugins}/PluginPropertyItem.php (90%) rename libraries/{properties/plugins => classes/Properties/Plugins}/SchemaPluginProperties.php (73%) rename libraries/{properties => classes/Properties}/PropertyItem.php (61%) delete mode 100644 libraries/properties/options/groups/OptionsPropertyMainGroup.php delete mode 100644 libraries/properties/options/groups/OptionsPropertyRootGroup.php delete mode 100644 libraries/properties/options/items/BoolPropertyItem.php delete mode 100644 libraries/properties/options/items/DocPropertyItem.php delete mode 100644 libraries/properties/options/items/RadioPropertyItem.php delete mode 100644 libraries/properties/options/items/TextPropertyItem.php diff --git a/libraries/classes/Plugins/Export/ExportCodegen.php b/libraries/classes/Plugins/Export/ExportCodegen.php index 96b78fdcf7..96c7bb9199 100644 --- a/libraries/classes/Plugins/Export/ExportCodegen.php +++ b/libraries/classes/Plugins/Export/ExportCodegen.php @@ -10,11 +10,11 @@ namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\Plugins\ExportPlugin; use PhpMyAdmin\Plugins\Export\Helpers\TableProperty; -use PMA\libraries\properties\plugins\ExportPluginProperties; -use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; -use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; -use PMA\libraries\properties\options\items\HiddenPropertyItem; -use PMA\libraries\properties\options\items\SelectPropertyItem; +use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; +use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem; +use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem; use PhpMyAdmin\Util; /** diff --git a/libraries/classes/Plugins/Export/ExportCsv.php b/libraries/classes/Plugins/Export/ExportCsv.php index 5d3d8a5426..490cd380f6 100644 --- a/libraries/classes/Plugins/Export/ExportCsv.php +++ b/libraries/classes/Plugins/Export/ExportCsv.php @@ -11,12 +11,12 @@ namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Plugins\ExportPlugin; -use PMA\libraries\properties\plugins\ExportPluginProperties; -use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; -use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; -use PMA\libraries\properties\options\items\BoolPropertyItem; -use PMA\libraries\properties\options\items\HiddenPropertyItem; -use PMA\libraries\properties\options\items\TextPropertyItem; +use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; +use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; +use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem; +use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; /** * Handles the export for the CSV format diff --git a/libraries/classes/Plugins/Export/ExportExcel.php b/libraries/classes/Plugins/Export/ExportExcel.php index 2fa11547d6..fa4622ad0b 100644 --- a/libraries/classes/Plugins/Export/ExportExcel.php +++ b/libraries/classes/Plugins/Export/ExportExcel.php @@ -8,13 +8,13 @@ */ namespace PhpMyAdmin\Plugins\Export; -use PMA\libraries\properties\plugins\ExportPluginProperties; -use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; -use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; -use PMA\libraries\properties\options\items\BoolPropertyItem; -use PMA\libraries\properties\options\items\HiddenPropertyItem; -use PMA\libraries\properties\options\items\SelectPropertyItem; -use PMA\libraries\properties\options\items\TextPropertyItem; +use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; +use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; +use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem; +use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem; +use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; /** * Handles the export for the CSV-Excel format diff --git a/libraries/classes/Plugins/Export/ExportHtmlword.php b/libraries/classes/Plugins/Export/ExportHtmlword.php index a9c658bf16..991acaa27d 100644 --- a/libraries/classes/Plugins/Export/ExportHtmlword.php +++ b/libraries/classes/Plugins/Export/ExportHtmlword.php @@ -10,12 +10,12 @@ namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Plugins\ExportPlugin; -use PMA\libraries\properties\plugins\ExportPluginProperties; -use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; -use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; -use PMA\libraries\properties\options\items\BoolPropertyItem; -use PMA\libraries\properties\options\items\RadioPropertyItem; -use PMA\libraries\properties\options\items\TextPropertyItem; +use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; +use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; +use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem; +use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\Transformations; use PhpMyAdmin\Util; diff --git a/libraries/classes/Plugins/Export/ExportJson.php b/libraries/classes/Plugins/Export/ExportJson.php index fed539acdf..bf160b60f5 100644 --- a/libraries/classes/Plugins/Export/ExportJson.php +++ b/libraries/classes/Plugins/Export/ExportJson.php @@ -10,11 +10,11 @@ namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Plugins\ExportPlugin; -use PMA\libraries\properties\plugins\ExportPluginProperties; -use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; -use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; -use PMA\libraries\properties\options\items\BoolPropertyItem; -use PMA\libraries\properties\options\items\HiddenPropertyItem; +use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; +use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; +use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem; /** * Handles the export for the JSON format diff --git a/libraries/classes/Plugins/Export/ExportLatex.php b/libraries/classes/Plugins/Export/ExportLatex.php index 17862c8aa6..83554b45b0 100644 --- a/libraries/classes/Plugins/Export/ExportLatex.php +++ b/libraries/classes/Plugins/Export/ExportLatex.php @@ -10,12 +10,12 @@ namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Plugins\ExportPlugin; -use PMA\libraries\properties\plugins\ExportPluginProperties; -use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; -use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; -use PMA\libraries\properties\options\items\BoolPropertyItem; -use PMA\libraries\properties\options\items\RadioPropertyItem; -use PMA\libraries\properties\options\items\TextPropertyItem; +use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; +use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; +use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem; +use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\Transformations; use PhpMyAdmin\Util; diff --git a/libraries/classes/Plugins/Export/ExportMediawiki.php b/libraries/classes/Plugins/Export/ExportMediawiki.php index ea30f14eec..3a622e3e2e 100644 --- a/libraries/classes/Plugins/Export/ExportMediawiki.php +++ b/libraries/classes/Plugins/Export/ExportMediawiki.php @@ -10,12 +10,12 @@ namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Plugins\ExportPlugin; -use PMA\libraries\properties\plugins\ExportPluginProperties; -use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; -use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; -use PMA\libraries\properties\options\groups\OptionsPropertySubgroup; -use PMA\libraries\properties\options\items\BoolPropertyItem; -use PMA\libraries\properties\options\items\RadioPropertyItem; +use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup; +use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; +use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem; use PhpMyAdmin\Util; /** diff --git a/libraries/classes/Plugins/Export/ExportOds.php b/libraries/classes/Plugins/Export/ExportOds.php index 74e671be13..dbab500693 100644 --- a/libraries/classes/Plugins/Export/ExportOds.php +++ b/libraries/classes/Plugins/Export/ExportOds.php @@ -11,12 +11,12 @@ namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\OpenDocument; use PhpMyAdmin\Plugins\ExportPlugin; -use PMA\libraries\properties\plugins\ExportPluginProperties; -use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; -use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; -use PMA\libraries\properties\options\items\BoolPropertyItem; -use PMA\libraries\properties\options\items\HiddenPropertyItem; -use PMA\libraries\properties\options\items\TextPropertyItem; +use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; +use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; +use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem; +use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; /** * Handles the export for the ODS class diff --git a/libraries/classes/Plugins/Export/ExportOdt.php b/libraries/classes/Plugins/Export/ExportOdt.php index a3e2661ff7..d146c80f30 100644 --- a/libraries/classes/Plugins/Export/ExportOdt.php +++ b/libraries/classes/Plugins/Export/ExportOdt.php @@ -11,12 +11,12 @@ namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\OpenDocument; use PhpMyAdmin\Plugins\ExportPlugin; -use PMA\libraries\properties\plugins\ExportPluginProperties; -use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; -use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; -use PMA\libraries\properties\options\items\BoolPropertyItem; -use PMA\libraries\properties\options\items\RadioPropertyItem; -use PMA\libraries\properties\options\items\TextPropertyItem; +use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; +use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; +use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem; +use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\Transformations; use PhpMyAdmin\Util; diff --git a/libraries/classes/Plugins/Export/ExportPdf.php b/libraries/classes/Plugins/Export/ExportPdf.php index 089342bd44..66024f037e 100644 --- a/libraries/classes/Plugins/Export/ExportPdf.php +++ b/libraries/classes/Plugins/Export/ExportPdf.php @@ -10,11 +10,11 @@ namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\Plugins\ExportPlugin; use PhpMyAdmin\Plugins\Export\Helpers\Pdf; -use PMA\libraries\properties\plugins\ExportPluginProperties; -use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; -use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; -use PMA\libraries\properties\options\items\RadioPropertyItem; -use PMA\libraries\properties\options\items\TextPropertyItem; +use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; +use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem; +use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; /** * Skip the plugin if TCPDF is not available. diff --git a/libraries/classes/Plugins/Export/ExportPhparray.php b/libraries/classes/Plugins/Export/ExportPhparray.php index d99dee8372..9ad272f37b 100644 --- a/libraries/classes/Plugins/Export/ExportPhparray.php +++ b/libraries/classes/Plugins/Export/ExportPhparray.php @@ -11,10 +11,10 @@ namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Plugins\ExportPlugin; -use PMA\libraries\properties\plugins\ExportPluginProperties; -use PMA\libraries\properties\options\items\HiddenPropertyItem; -use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; -use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; +use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; +use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; use PhpMyAdmin\Util; /** diff --git a/libraries/classes/Plugins/Export/ExportSql.php b/libraries/classes/Plugins/Export/ExportSql.php index 6ea9d5f753..52daf04d5d 100644 --- a/libraries/classes/Plugins/Export/ExportSql.php +++ b/libraries/classes/Plugins/Export/ExportSql.php @@ -11,16 +11,16 @@ namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\Charsets; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Plugins\ExportPlugin; -use PMA\libraries\properties\plugins\ExportPluginProperties; -use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; -use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; -use PMA\libraries\properties\options\groups\OptionsPropertySubgroup; -use PMA\libraries\properties\options\items\BoolPropertyItem; -use PMA\libraries\properties\options\items\MessageOnlyPropertyItem; -use PMA\libraries\properties\options\items\NumberPropertyItem; -use PMA\libraries\properties\options\items\RadioPropertyItem; -use PMA\libraries\properties\options\items\SelectPropertyItem; -use PMA\libraries\properties\options\items\TextPropertyItem; +use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup; +use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; +use PhpMyAdmin\Properties\Options\Items\MessageOnlyPropertyItem; +use PhpMyAdmin\Properties\Options\Items\NumberPropertyItem; +use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem; +use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem; +use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\SqlParser\Components\CreateDefinition; use PhpMyAdmin\SqlParser\Context; use PhpMyAdmin\SqlParser\Parser; diff --git a/libraries/classes/Plugins/Export/ExportTexytext.php b/libraries/classes/Plugins/Export/ExportTexytext.php index 522d8cf369..b039e0ef94 100644 --- a/libraries/classes/Plugins/Export/ExportTexytext.php +++ b/libraries/classes/Plugins/Export/ExportTexytext.php @@ -10,12 +10,12 @@ namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Plugins\ExportPlugin; -use PMA\libraries\properties\plugins\ExportPluginProperties; -use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; -use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; -use PMA\libraries\properties\options\items\BoolPropertyItem; -use PMA\libraries\properties\options\items\RadioPropertyItem; -use PMA\libraries\properties\options\items\TextPropertyItem; +use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; +use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; +use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem; +use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\Transformations; use PhpMyAdmin\Util; diff --git a/libraries/classes/Plugins/Export/ExportXml.php b/libraries/classes/Plugins/Export/ExportXml.php index 38e6d4ab2b..d23b3abc26 100644 --- a/libraries/classes/Plugins/Export/ExportXml.php +++ b/libraries/classes/Plugins/Export/ExportXml.php @@ -10,11 +10,11 @@ namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Plugins\ExportPlugin; -use PMA\libraries\properties\plugins\ExportPluginProperties; -use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; -use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; -use PMA\libraries\properties\options\items\BoolPropertyItem; -use PMA\libraries\properties\options\items\HiddenPropertyItem; +use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; +use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; +use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem; use PhpMyAdmin\Util; if (strlen($GLOBALS['db']) === 0) { /* Can't do server export */ diff --git a/libraries/classes/Plugins/Export/ExportYaml.php b/libraries/classes/Plugins/Export/ExportYaml.php index 03d027c6e6..6745b5a746 100644 --- a/libraries/classes/Plugins/Export/ExportYaml.php +++ b/libraries/classes/Plugins/Export/ExportYaml.php @@ -11,10 +11,10 @@ namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Plugins\ExportPlugin; -use PMA\libraries\properties\plugins\ExportPluginProperties; -use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; -use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; -use PMA\libraries\properties\options\items\HiddenPropertyItem; +use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; +use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem; /** * Handles the export for the YAML format diff --git a/libraries/classes/Plugins/Export/README b/libraries/classes/Plugins/Export/README index 5c8e05f903..a05dc8a47c 100644 --- a/libraries/classes/Plugins/Export/README +++ b/libraries/classes/Plugins/Export/README @@ -67,7 +67,7 @@ class Export[Name] extends PhpMyAdmin\Plugins\ExportPlugin */ protected function setProperties() { - $exportPluginProperties = new PMA\libraries\properties\plugins\ExportPluginProperties(); + $exportPluginProperties = new PhpMyAdmin\Properties\Plugins\ExportPluginProperties(); $exportPluginProperties->setText('[name]'); // the name of your plug-in $exportPluginProperties->setExtension('[ext]'); // extension this plug-in can handle $exportPluginProperties->setOptionsText(__('Options')); @@ -75,12 +75,12 @@ class Export[Name] extends PhpMyAdmin\Plugins\ExportPlugin // create the root group that will be the options field for // $exportPluginProperties // this will be shown as "Format specific options" - $exportSpecificOptions = new PMA\libraries\properties\options\groups\OptionsPropertyRootGroup( + $exportSpecificOptions = new PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup( "Format Specific Options" ); // general options main group - $generalOptions = new PMA\libraries\properties\options\groups\OptionsPropertyMainGroup( + $generalOptions = new PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup( "general_opts" ); @@ -92,7 +92,7 @@ class Export[Name] extends PhpMyAdmin\Plugins\ExportPlugin // size - size of text element // len - maximal size of input // values - possible values of the item - $leaf = new PMA\libraries\properties\options\items\RadioPropertyItem( + $leaf = new PhpMyAdmin\Properties\Options\Items\RadioPropertyItem( "structure_or_data" ); $leaf->setValues( diff --git a/libraries/classes/Plugins/ExportPlugin.php b/libraries/classes/Plugins/ExportPlugin.php index 42df63f60d..0d2622468c 100644 --- a/libraries/classes/Plugins/ExportPlugin.php +++ b/libraries/classes/Plugins/ExportPlugin.php @@ -8,7 +8,7 @@ namespace PhpMyAdmin\Plugins; -use PMA\libraries\properties\plugins\ExportPluginProperties; +use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; /** * Provides a common interface that will have to be implemented by all of the @@ -21,10 +21,10 @@ use PMA\libraries\properties\plugins\ExportPluginProperties; abstract class ExportPlugin { /** - * PMA\libraries\properties\plugins\ExportPluginProperties object containing + * PhpMyAdmin\Properties\Plugins\ExportPluginProperties object containing * the specific export plugin type properties * - * @var \PMA\libraries\properties\plugins\ExportPluginProperties + * @var \PhpMyAdmin\Properties\Plugins\ExportPluginProperties */ protected $properties; /** diff --git a/libraries/classes/Plugins/Import/AbstractImportCsv.php b/libraries/classes/Plugins/Import/AbstractImportCsv.php index 0e3d9e5021..25cdcbc943 100644 --- a/libraries/classes/Plugins/Import/AbstractImportCsv.php +++ b/libraries/classes/Plugins/Import/AbstractImportCsv.php @@ -8,12 +8,12 @@ */ namespace PhpMyAdmin\Plugins\Import; -use PMA\libraries\properties\options\items\BoolPropertyItem; -use PMA\libraries\properties\plugins\ImportPluginProperties; -use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; -use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; +use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; +use PhpMyAdmin\Properties\Plugins\ImportPluginProperties; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; use PhpMyAdmin\Plugins\ImportPlugin; -use PMA\libraries\properties\options\items\TextPropertyItem; +use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; /** * Super class of the import plugins for the CSV format @@ -27,7 +27,7 @@ abstract class AbstractImportCsv extends ImportPlugin * Sets the import plugin properties. * Called in the constructor. * - * @return \PMA\libraries\properties\options\groups\OptionsPropertyMainGroup PMA\libraries\properties\options\groups\OptionsPropertyMainGroup object of the plugin + * @return \PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup object of the plugin */ protected function setProperties() { diff --git a/libraries/classes/Plugins/Import/ImportCsv.php b/libraries/classes/Plugins/Import/ImportCsv.php index e9ab2de685..fbd830b664 100644 --- a/libraries/classes/Plugins/Import/ImportCsv.php +++ b/libraries/classes/Plugins/Import/ImportCsv.php @@ -10,8 +10,8 @@ namespace PhpMyAdmin\Plugins\Import; use PhpMyAdmin\Message; -use PMA\libraries\properties\options\items\BoolPropertyItem; -use PMA\libraries\properties\options\items\TextPropertyItem; +use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; +use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\Util; /** diff --git a/libraries/classes/Plugins/Import/ImportLdi.php b/libraries/classes/Plugins/Import/ImportLdi.php index 24a3bd0822..77e79bafd8 100644 --- a/libraries/classes/Plugins/Import/ImportLdi.php +++ b/libraries/classes/Plugins/Import/ImportLdi.php @@ -10,8 +10,8 @@ namespace PhpMyAdmin\Plugins\Import; use PhpMyAdmin\Message; use PhpMyAdmin\Plugins\Import\AbstractImportCsv; -use PMA\libraries\properties\options\items\BoolPropertyItem; -use PMA\libraries\properties\options\items\TextPropertyItem; +use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; +use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\Util; if (!defined('PHPMYADMIN')) { diff --git a/libraries/classes/Plugins/Import/ImportMediawiki.php b/libraries/classes/Plugins/Import/ImportMediawiki.php index de9a0fa28c..ccf64ee48f 100644 --- a/libraries/classes/Plugins/Import/ImportMediawiki.php +++ b/libraries/classes/Plugins/Import/ImportMediawiki.php @@ -10,7 +10,7 @@ namespace PhpMyAdmin\Plugins\Import; use PhpMyAdmin\Message; use PhpMyAdmin\Plugins\ImportPlugin; -use PMA\libraries\properties\plugins\ImportPluginProperties; +use PhpMyAdmin\Properties\Plugins\ImportPluginProperties; /** * Handles the import for the MediaWiki format diff --git a/libraries/classes/Plugins/Import/ImportOds.php b/libraries/classes/Plugins/Import/ImportOds.php index d5ed6a3800..e6e378a772 100644 --- a/libraries/classes/Plugins/Import/ImportOds.php +++ b/libraries/classes/Plugins/Import/ImportOds.php @@ -12,10 +12,10 @@ namespace PhpMyAdmin\Plugins\Import; use PhpMyAdmin\Message; use PhpMyAdmin\Plugins\ImportPlugin; -use PMA\libraries\properties\plugins\ImportPluginProperties; -use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; -use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; -use PMA\libraries\properties\options\items\BoolPropertyItem; +use PhpMyAdmin\Properties\Plugins\ImportPluginProperties; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; +use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; use SimpleXMLElement; /** diff --git a/libraries/classes/Plugins/Import/ImportShp.php b/libraries/classes/Plugins/Import/ImportShp.php index 25123274be..67c719753d 100644 --- a/libraries/classes/Plugins/Import/ImportShp.php +++ b/libraries/classes/Plugins/Import/ImportShp.php @@ -15,7 +15,7 @@ use PhpMyAdmin\Gis\GisPoint; use PhpMyAdmin\Gis\GisPolygon; use PhpMyAdmin\Message; use PhpMyAdmin\Plugins\ImportPlugin; -use PMA\libraries\properties\plugins\ImportPluginProperties; +use PhpMyAdmin\Properties\Plugins\ImportPluginProperties; use PhpMyAdmin\Sanitize; use PhpMyAdmin\ZipExtension; diff --git a/libraries/classes/Plugins/Import/ImportSql.php b/libraries/classes/Plugins/Import/ImportSql.php index 7c718d6c15..db92dd37ec 100644 --- a/libraries/classes/Plugins/Import/ImportSql.php +++ b/libraries/classes/Plugins/Import/ImportSql.php @@ -9,11 +9,11 @@ namespace PhpMyAdmin\Plugins\Import; use PhpMyAdmin\Plugins\ImportPlugin; -use PMA\libraries\properties\plugins\ImportPluginProperties; -use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; -use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; -use PMA\libraries\properties\options\items\BoolPropertyItem; -use PMA\libraries\properties\options\items\SelectPropertyItem; +use PhpMyAdmin\Properties\Plugins\ImportPluginProperties; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; +use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; +use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem; use PhpMyAdmin\SqlParser\Utils\BufferedQuery; /** diff --git a/libraries/classes/Plugins/Import/ImportXml.php b/libraries/classes/Plugins/Import/ImportXml.php index 6694341a97..5c04a43bf1 100644 --- a/libraries/classes/Plugins/Import/ImportXml.php +++ b/libraries/classes/Plugins/Import/ImportXml.php @@ -12,7 +12,7 @@ namespace PhpMyAdmin\Plugins\Import; use PhpMyAdmin\Message; use PhpMyAdmin\Plugins\ImportPlugin; -use PMA\libraries\properties\plugins\ImportPluginProperties; +use PhpMyAdmin\Properties\Plugins\ImportPluginProperties; use PhpMyAdmin\Util; use SimpleXMLElement; diff --git a/libraries/classes/Plugins/Import/README b/libraries/classes/Plugins/Import/README index 022b02da62..1064040c53 100644 --- a/libraries/classes/Plugins/Import/README +++ b/libraries/classes/Plugins/Import/README @@ -44,7 +44,7 @@ class Import[Name] extends ImportPlugin */ protected function setProperties() { - $importPluginProperties = new PMA\libraries\properties\plugins\ImportPluginProperties(); + $importPluginProperties = new PhpMyAdmin\Properties\Plugins\ImportPluginProperties(); $importPluginProperties->setText('[name]'); // the name of your plug-in $importPluginProperties->setExtension('[ext]'); // extension this plug-in can handle $importPluginProperties->setOptionsText(__('Options')); @@ -53,12 +53,12 @@ class Import[Name] extends ImportPlugin // $importPluginProperties // this will be shown as "Format specific options" $importSpecificOptions = new - PMA\libraries\properties\options\groups\OptionsPropertyRootGroup( + PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup( "Format Specific Options" ); // general options main group - $generalOptions = new PMA\libraries\properties\options\groups\OptionsPropertyMainGroup( + $generalOptions = new PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup( "general_opts" ); @@ -70,7 +70,7 @@ class Import[Name] extends ImportPlugin // size - size of text element // len - maximal size of input // values - possible values of the item - $leaf = new PMA\libraries\properties\options\items\RadioPropertyItem( + $leaf = new PhpMyAdmin\Properties\Options\Items\RadioPropertyItem( "structure_or_data" ); $leaf->setValues( diff --git a/libraries/classes/Plugins/ImportPlugin.php b/libraries/classes/Plugins/ImportPlugin.php index 725f7dcbff..42ed2286f4 100644 --- a/libraries/classes/Plugins/ImportPlugin.php +++ b/libraries/classes/Plugins/ImportPlugin.php @@ -8,7 +8,7 @@ namespace PhpMyAdmin\Plugins; -use PMA\libraries\properties\plugins\ImportPluginProperties; +use PhpMyAdmin\Properties\Plugins\ImportPluginProperties; /** * Provides a common interface that will have to be implemented by all of the @@ -38,7 +38,7 @@ abstract class ImportPlugin /** * Gets the import specific format plugin properties * - * @return \PMA\libraries\properties\plugins\ImportPluginProperties + * @return \PhpMyAdmin\Properties\Plugins\ImportPluginProperties */ public function getProperties() { diff --git a/libraries/classes/Plugins/Schema/SchemaDia.php b/libraries/classes/Plugins/Schema/SchemaDia.php index b9398da9a7..02dd75af1e 100644 --- a/libraries/classes/Plugins/Schema/SchemaDia.php +++ b/libraries/classes/Plugins/Schema/SchemaDia.php @@ -8,12 +8,12 @@ */ namespace PhpMyAdmin\Plugins\Schema; -use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; -use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; use PhpMyAdmin\Plugins\SchemaPlugin; use PhpMyAdmin\Plugins\Schema\Dia\DiaRelationSchema; -use PMA\libraries\properties\plugins\SchemaPluginProperties; -use PMA\libraries\properties\options\items\SelectPropertyItem; +use PhpMyAdmin\Properties\Plugins\SchemaPluginProperties; +use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem; /** * Handles the schema export for the Dia format diff --git a/libraries/classes/Plugins/Schema/SchemaEps.php b/libraries/classes/Plugins/Schema/SchemaEps.php index 6df6f0a92b..1df342f043 100644 --- a/libraries/classes/Plugins/Schema/SchemaEps.php +++ b/libraries/classes/Plugins/Schema/SchemaEps.php @@ -8,13 +8,13 @@ */ namespace PhpMyAdmin\Plugins\Schema; -use PMA\libraries\properties\options\items\BoolPropertyItem; -use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; -use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; +use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; use PhpMyAdmin\Plugins\Schema\Eps\EpsRelationSchema; use PhpMyAdmin\Plugins\SchemaPlugin; -use PMA\libraries\properties\plugins\SchemaPluginProperties; -use PMA\libraries\properties\options\items\SelectPropertyItem; +use PhpMyAdmin\Properties\Plugins\SchemaPluginProperties; +use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem; /** * Handles the schema export for the EPS format diff --git a/libraries/classes/Plugins/Schema/SchemaPdf.php b/libraries/classes/Plugins/Schema/SchemaPdf.php index 1f39269a73..0c12fb4573 100644 --- a/libraries/classes/Plugins/Schema/SchemaPdf.php +++ b/libraries/classes/Plugins/Schema/SchemaPdf.php @@ -8,13 +8,13 @@ */ namespace PhpMyAdmin\Plugins\Schema; -use PMA\libraries\properties\options\items\BoolPropertyItem; -use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; -use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; +use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; use PhpMyAdmin\Plugins\Schema\Pdf\PdfRelationSchema; use PhpMyAdmin\Plugins\SchemaPlugin; -use PMA\libraries\properties\plugins\SchemaPluginProperties; -use PMA\libraries\properties\options\items\SelectPropertyItem; +use PhpMyAdmin\Properties\Plugins\SchemaPluginProperties; +use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem; /** * Handles the schema export for the PDF format diff --git a/libraries/classes/Plugins/Schema/SchemaSvg.php b/libraries/classes/Plugins/Schema/SchemaSvg.php index c04ec3ba5b..fce8104269 100644 --- a/libraries/classes/Plugins/Schema/SchemaSvg.php +++ b/libraries/classes/Plugins/Schema/SchemaSvg.php @@ -8,12 +8,12 @@ */ namespace PhpMyAdmin\Plugins\Schema; -use PMA\libraries\properties\options\items\BoolPropertyItem; -use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; -use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; +use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; use PhpMyAdmin\Plugins\SchemaPlugin; use PhpMyAdmin\Plugins\Schema\Svg\SvgRelationSchema; -use PMA\libraries\properties\plugins\SchemaPluginProperties; +use PhpMyAdmin\Properties\Plugins\SchemaPluginProperties; /** * Handles the schema export for the SVG format diff --git a/libraries/classes/Plugins/SchemaPlugin.php b/libraries/classes/Plugins/SchemaPlugin.php index 398185fa5e..7be1959e01 100644 --- a/libraries/classes/Plugins/SchemaPlugin.php +++ b/libraries/classes/Plugins/SchemaPlugin.php @@ -8,9 +8,9 @@ namespace PhpMyAdmin\Plugins; -use PMA\libraries\properties\options\items\BoolPropertyItem; -use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; -use PMA\libraries\properties\plugins\SchemaPluginProperties; +use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; +use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; +use PhpMyAdmin\Properties\Plugins\SchemaPluginProperties; /** * Provides a common interface that will have to be implemented by all of the @@ -23,7 +23,7 @@ use PMA\libraries\properties\plugins\SchemaPluginProperties; abstract class SchemaPlugin { /** - * PMA\libraries\properties\plugins\SchemaPluginProperties object containing + * PhpMyAdmin\Properties\Plugins\SchemaPluginProperties object containing * the specific schema export plugin type properties * * @var SchemaPluginProperties @@ -60,7 +60,7 @@ abstract class SchemaPlugin /** * Adds export options common to all plugins. * - * @param \PMA\libraries\properties\options\groups\OptionsPropertyMainGroup $propertyGroup property group + * @param \PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup $propertyGroup property group * * @return void */ diff --git a/libraries/classes/Properties/Options/Groups/OptionsPropertyMainGroup.php b/libraries/classes/Properties/Options/Groups/OptionsPropertyMainGroup.php new file mode 100644 index 0000000000..d976da5aa0 --- /dev/null +++ b/libraries/classes/Properties/Options/Groups/OptionsPropertyMainGroup.php @@ -0,0 +1,33 @@ +'; } @@ -403,7 +403,7 @@ function PMA_getHtmlForProperty( $ret = null; $property_class = get_class($propertyItem); switch ($property_class) { - case 'PMA\libraries\properties\options\items\BoolPropertyItem': + case 'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem': $ret .= '
  • ' . "\n"; $ret .= 'getName() . '">' . PMA_getString($propertyItem->getText()) . ''; break; - case 'PMA\libraries\properties\options\items\DocPropertyItem': - echo 'PMA\libraries\properties\options\items\DocPropertyItem'; + case 'PhpMyAdmin\Properties\Options\Items\DocPropertyItem': + echo 'PhpMyAdmin\Properties\Options\Items\DocPropertyItem'; break; - case 'PMA\libraries\properties\options\items\HiddenPropertyItem': + case 'PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem': $ret .= '
    • '; break; - case 'PMA\libraries\properties\options\items\MessageOnlyPropertyItem': + case 'PhpMyAdmin\Properties\Options\Items\MessageOnlyPropertyItem': $ret .= '
  • ' . "\n"; $ret .= '

    ' . PMA_getString($propertyItem->getText()) . '

    '; break; - case 'PMA\libraries\properties\options\items\RadioPropertyItem': + case 'PhpMyAdmin\Properties\Options\Items\RadioPropertyItem': $default = PMA_pluginGetDefault( $section, $plugin_name . '_' . $propertyItem->getName() @@ -464,7 +464,7 @@ function PMA_getHtmlForProperty( . PMA_getString($val) . '
    • '; } break; - case 'PMA\libraries\properties\options\items\SelectPropertyItem': + case 'PhpMyAdmin\Properties\Options\Items\SelectPropertyItem': $ret .= '
  • ' . "\n"; $ret .= '
  • ' . "\n"; $ret .= '