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] 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(); } /**