Upgrade phpmyadmin/shapefile
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
This commit is contained in:
Maurício Meneghini Fauth
parent
7bd2394f33
commit
720de704f8
80
composer.lock
generated
80
composer.lock
generated
@ -384,12 +384,12 @@
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/phpmyadmin/shapefile.git",
|
||||
"reference": "f825d8f2c38f74742d9a8b727e7c5fd760c76893"
|
||||
"reference": "d8550bac097b653fa00bb149a654c06be2ae5896"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/phpmyadmin/shapefile/zipball/f825d8f2c38f74742d9a8b727e7c5fd760c76893",
|
||||
"reference": "f825d8f2c38f74742d9a8b727e7c5fd760c76893",
|
||||
"url": "https://api.github.com/repos/phpmyadmin/shapefile/zipball/d8550bac097b653fa00bb149a654c06be2ae5896",
|
||||
"reference": "d8550bac097b653fa00bb149a654c06be2ae5896",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -446,7 +446,7 @@
|
||||
"issues": "https://github.com/phpmyadmin/shapefile/issues",
|
||||
"source": "https://github.com/phpmyadmin/shapefile"
|
||||
},
|
||||
"time": "2024-08-01T00:05:18+00:00"
|
||||
"time": "2024-10-10T19:33:38+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phpmyadmin/sql-parser",
|
||||
@ -4442,16 +4442,16 @@
|
||||
},
|
||||
{
|
||||
"name": "phpstan/phpstan",
|
||||
"version": "1.12.5",
|
||||
"version": "1.12.6",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/phpstan/phpstan.git",
|
||||
"reference": "7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17"
|
||||
"reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17",
|
||||
"reference": "7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17",
|
||||
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc4d2f145a88ea7141ae698effd64d9df46527ae",
|
||||
"reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -4496,7 +4496,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2024-09-26T12:45:22+00:00"
|
||||
"time": "2024-10-06T15:03:59+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phpstan/phpstan-deprecation-rules",
|
||||
@ -5020,16 +5020,16 @@
|
||||
},
|
||||
{
|
||||
"name": "phpunit/phpunit",
|
||||
"version": "10.5.35",
|
||||
"version": "10.5.36",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||
"reference": "7ac8b4e63f456046dcb4c9787da9382831a1874b"
|
||||
"reference": "aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7ac8b4e63f456046dcb4c9787da9382831a1874b",
|
||||
"reference": "7ac8b4e63f456046dcb4c9787da9382831a1874b",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870",
|
||||
"reference": "aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -5101,7 +5101,7 @@
|
||||
"support": {
|
||||
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
|
||||
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
|
||||
"source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.35"
|
||||
"source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.36"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -5117,7 +5117,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2024-09-19T10:52:21+00:00"
|
||||
"time": "2024-10-08T15:36:51+00:00"
|
||||
},
|
||||
{
|
||||
"name": "pragmarx/google2fa",
|
||||
@ -5454,12 +5454,12 @@
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Roave/SecurityAdvisories.git",
|
||||
"reference": "6f63660a573ec1e6d48d54ff7c44dfb1e303f30d"
|
||||
"reference": "6fc16d8c05a872bf86eb0a1684d89b9bcb93d636"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/6f63660a573ec1e6d48d54ff7c44dfb1e303f30d",
|
||||
"reference": "6f63660a573ec1e6d48d54ff7c44dfb1e303f30d",
|
||||
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/6fc16d8c05a872bf86eb0a1684d89b9bcb93d636",
|
||||
"reference": "6fc16d8c05a872bf86eb0a1684d89b9bcb93d636",
|
||||
"shasum": ""
|
||||
},
|
||||
"conflict": {
|
||||
@ -5560,7 +5560,7 @@
|
||||
"concrete5/core": "<8.5.8|>=9,<9.1",
|
||||
"contao-components/mediaelement": ">=2.14.2,<2.21.1",
|
||||
"contao/comments-bundle": ">=2,<4.13.40|>=5.0.0.0-RC1-dev,<5.3.4",
|
||||
"contao/contao": ">=3,<3.5.37|>=4,<4.4.56|>=4.5,<4.9.40|>=4.10,<4.11.7|>=4.13,<4.13.21|>=5.1,<5.1.4",
|
||||
"contao/contao": "<=5.4.1",
|
||||
"contao/core": "<3.5.39",
|
||||
"contao/core-bundle": "<4.13.49|>=5,<5.3.15|>=5.4,<5.4.3",
|
||||
"contao/listing-bundle": ">=3,<=3.5.30|>=4,<4.4.8",
|
||||
@ -5583,6 +5583,7 @@
|
||||
"derhansen/fe_change_pwd": "<2.0.5|>=3,<3.0.3",
|
||||
"derhansen/sf_event_mgt": "<4.3.1|>=5,<5.1.1|>=7,<7.4",
|
||||
"desperado/xml-bundle": "<=0.1.7",
|
||||
"dev-lancer/minecraft-motd-parser": "<=1.0.5",
|
||||
"devgroup/dotplant": "<2020.09.14-dev",
|
||||
"directmailteam/direct-mail": "<6.0.3|>=7,<7.0.3|>=8,<9.5.2",
|
||||
"doctrine/annotations": "<1.2.7",
|
||||
@ -5597,9 +5598,9 @@
|
||||
"dolibarr/dolibarr": "<19.0.2",
|
||||
"dompdf/dompdf": "<2.0.4",
|
||||
"doublethreedigital/guest-entries": "<3.1.2",
|
||||
"drupal/core": ">=6,<6.38|>=7,<7.96|>=8,<=11.0.4",
|
||||
"drupal/core-recommended": ">=8,<=11.0.4",
|
||||
"drupal/drupal": ">=5,<5.11|>=6,<6.38|>=7,<7.80|>=8,<=11.0.4",
|
||||
"drupal/core": ">=6,<6.38|>=7,<7.96|>=8,<10.2.9|>=10.3,<10.3.6|>=11,<11.0.5",
|
||||
"drupal/core-recommended": ">=8,<10.2.9|>=10.3,<10.3.6|>=11,<11.0.5",
|
||||
"drupal/drupal": ">=5,<5.11|>=6,<6.38|>=7,<7.80|>=8,<10.2.9|>=10.3,<10.3.6|>=11,<11.0.5",
|
||||
"duncanmcclean/guest-entries": "<3.1.2",
|
||||
"dweeves/magmi": "<=0.7.24",
|
||||
"ec-cube/ec-cube": "<2.4.4|>=2.11,<=2.17.1|>=3,<=3.0.18.0-patch4|>=4,<=4.1.2",
|
||||
@ -5765,13 +5766,15 @@
|
||||
"klaviyo/magento2-extension": ">=1,<3",
|
||||
"knplabs/knp-snappy": "<=1.4.2",
|
||||
"kohana/core": "<3.3.3",
|
||||
"krayin/laravel-crm": "<1.2.2",
|
||||
"krayin/laravel-crm": "<=1.3",
|
||||
"kreait/firebase-php": ">=3.2,<3.8.1",
|
||||
"kumbiaphp/kumbiapp": "<=1.1.1",
|
||||
"la-haute-societe/tcpdf": "<6.2.22",
|
||||
"laminas/laminas-diactoros": "<2.18.1|==2.19|==2.20|==2.21|==2.22|==2.23|>=2.24,<2.24.2|>=2.25,<2.25.2",
|
||||
"laminas/laminas-form": "<2.17.1|>=3,<3.0.2|>=3.1,<3.1.1",
|
||||
"laminas/laminas-http": "<2.14.2",
|
||||
"lara-zeus/artemis": ">=1,<=1.0.6",
|
||||
"lara-zeus/dynamic-dashboard": ">=3,<=3.0.1",
|
||||
"laravel/fortify": "<1.11.1",
|
||||
"laravel/framework": "<6.20.44|>=7,<7.30.6|>=8,<8.75",
|
||||
"laravel/laravel": ">=5.4,<5.4.22",
|
||||
@ -5787,9 +5790,9 @@
|
||||
"librenms/librenms": "<2017.08.18",
|
||||
"liftkit/database": "<2.13.2",
|
||||
"lightsaml/lightsaml": "<1.3.5",
|
||||
"limesurvey/limesurvey": "<3.27.19",
|
||||
"limesurvey/limesurvey": "<6.5.12",
|
||||
"livehelperchat/livehelperchat": "<=3.91",
|
||||
"livewire/livewire": ">2.2.4,<2.2.6|>=3.3.5,<3.4.9",
|
||||
"livewire/livewire": "<2.12.7|>=3.0.0.0-beta1,<3.5.2",
|
||||
"lms/routes": "<2.1.1",
|
||||
"localizationteam/l10nmgr": "<7.4|>=8,<8.7|>=9,<9.2",
|
||||
"luyadev/yii-helpers": "<1.2.1",
|
||||
@ -5807,6 +5810,7 @@
|
||||
"mautic/core": "<4.4.13|>=5,<5.1.1",
|
||||
"mautic/core-lib": ">=1.0.0.0-beta,<4.4.13|>=5.0.0.0-alpha,<5.1.1",
|
||||
"mdanter/ecc": "<2",
|
||||
"mediawiki/cargo": "<3.6.1",
|
||||
"mediawiki/core": "<1.36.2",
|
||||
"mediawiki/matomo": "<2.4.3",
|
||||
"mediawiki/semantic-media-wiki": "<4.0.2",
|
||||
@ -5863,7 +5867,7 @@
|
||||
"nzo/url-encryptor-bundle": ">=4,<4.3.2|>=5,<5.0.1",
|
||||
"october/backend": "<1.1.2",
|
||||
"october/cms": "<1.0.469|==1.0.469|==1.0.471|==1.1.1",
|
||||
"october/october": "<=3.4.4",
|
||||
"october/october": "<=3.6.4",
|
||||
"october/rain": "<1.0.472|>=1.1,<1.1.2",
|
||||
"october/system": "<1.0.476|>=1.1,<1.1.12|>=2,<2.2.34|>=3,<3.5.15",
|
||||
"omeka/omeka-s": "<4.0.3",
|
||||
@ -5915,7 +5919,7 @@
|
||||
"phpmyfaq/phpmyfaq": "<3.2.5|==3.2.5",
|
||||
"phpoffice/common": "<0.2.9",
|
||||
"phpoffice/phpexcel": "<1.8",
|
||||
"phpoffice/phpspreadsheet": "<1.29.1|>=2,<2.1.1|>=2.2,<2.2.1",
|
||||
"phpoffice/phpspreadsheet": "<1.29.2|>=2,<2.1.1|>=2.2,<2.3",
|
||||
"phpseclib/phpseclib": "<2.0.47|>=3,<3.0.36",
|
||||
"phpservermon/phpservermon": "<3.6",
|
||||
"phpsysinfo/phpsysinfo": "<3.4.3",
|
||||
@ -6043,7 +6047,7 @@
|
||||
"subhh/libconnect": "<7.0.8|>=8,<8.1",
|
||||
"sukohi/surpass": "<1",
|
||||
"sulu/form-bundle": ">=2,<2.5.3",
|
||||
"sulu/sulu": "<1.6.44|>=2,<2.4.17|>=2.5,<2.5.13",
|
||||
"sulu/sulu": "<1.6.44|>=2,<2.6.5",
|
||||
"sumocoders/framework-user-bundle": "<1.4",
|
||||
"superbig/craft-audit": "<3.0.2",
|
||||
"swag/paypal": "<5.4.4",
|
||||
@ -6115,13 +6119,13 @@
|
||||
"topthink/thinkphp": "<=3.2.3",
|
||||
"torrentpier/torrentpier": "<=2.4.3",
|
||||
"tpwd/ke_search": "<4.0.3|>=4.1,<4.6.6|>=5,<5.0.2",
|
||||
"tribalsystems/zenario": "<9.5.60602",
|
||||
"tribalsystems/zenario": "<=9.7.61188",
|
||||
"truckersmp/phpwhois": "<=4.3.1",
|
||||
"ttskch/pagination-service-provider": "<1",
|
||||
"twbs/bootstrap": "<=3.4.1|>=4,<=4.6.2",
|
||||
"twig/twig": "<1.44.8|>=2,<2.16.1|>=3,<3.11.1|>=3.12,<3.14",
|
||||
"typo3/cms": "<9.5.29|>=10,<10.4.35|>=11,<11.5.23|>=12,<12.2",
|
||||
"typo3/cms-backend": "<4.1.14|>=4.2,<4.2.15|>=4.3,<4.3.7|>=4.4,<4.4.4|>=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1",
|
||||
"typo3/cms-backend": "<4.1.14|>=4.2,<4.2.15|>=4.3,<4.3.7|>=4.4,<4.4.4|>=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<10.4.46|>=11,<11.5.40|>=12,<12.4.21|>=13,<13.3.1",
|
||||
"typo3/cms-core": "<=8.7.56|>=9,<=9.5.47|>=10,<=10.4.44|>=11,<=11.5.36|>=12,<=12.4.14|>=13,<=13.1",
|
||||
"typo3/cms-extbase": "<6.2.24|>=7,<7.6.8|==8.1.1",
|
||||
"typo3/cms-fluid": "<4.3.4|>=4.4,<4.4.1",
|
||||
@ -6274,7 +6278,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2024-09-30T18:06:02+00:00"
|
||||
"time": "2024-10-10T00:18:21+00:00"
|
||||
},
|
||||
{
|
||||
"name": "sebastian/cli-parser",
|
||||
@ -8154,16 +8158,16 @@
|
||||
},
|
||||
{
|
||||
"name": "tecnickcom/tcpdf",
|
||||
"version": "6.7.5",
|
||||
"version": "6.7.6",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/tecnickcom/TCPDF.git",
|
||||
"reference": "951eabf0338ec2522bd0d5d9c79b08a3a3d36b36"
|
||||
"reference": "4cf1ab192e87e6916d20f93077b2bdfa96a2f848"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/951eabf0338ec2522bd0d5d9c79b08a3a3d36b36",
|
||||
"reference": "951eabf0338ec2522bd0d5d9c79b08a3a3d36b36",
|
||||
"url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/4cf1ab192e87e6916d20f93077b2bdfa96a2f848",
|
||||
"reference": "4cf1ab192e87e6916d20f93077b2bdfa96a2f848",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -8214,7 +8218,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/tecnickcom/TCPDF/issues",
|
||||
"source": "https://github.com/tecnickcom/TCPDF/tree/6.7.5"
|
||||
"source": "https://github.com/tecnickcom/TCPDF/tree/6.7.6"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -8222,7 +8226,7 @@
|
||||
"type": "custom"
|
||||
}
|
||||
],
|
||||
"time": "2024-04-20T17:25:10+00:00"
|
||||
"time": "2024-10-06T10:54:28+00:00"
|
||||
},
|
||||
{
|
||||
"name": "theseer/tokenizer",
|
||||
@ -8578,7 +8582,7 @@
|
||||
"ext-sodium": "*",
|
||||
"ext-xml": "*"
|
||||
},
|
||||
"platform-dev": [],
|
||||
"platform-dev": {},
|
||||
"platform-overrides": {
|
||||
"php": "8.2.99"
|
||||
},
|
||||
|
||||
@ -24,6 +24,7 @@ use PhpMyAdmin\Message;
|
||||
use PhpMyAdmin\Plugins\ImportPlugin;
|
||||
use PhpMyAdmin\Properties\Plugins\ImportPluginProperties;
|
||||
use PhpMyAdmin\Sanitize;
|
||||
use PhpMyAdmin\ShapeFile\ShapeType;
|
||||
use PhpMyAdmin\ZipExtension;
|
||||
use ZipArchive;
|
||||
|
||||
@ -99,7 +100,7 @@ class ImportShp extends ImportPlugin
|
||||
|
||||
$compression = $importHandle->getCompression();
|
||||
|
||||
$shp = new ShapeFileImport(1);
|
||||
$shp = new ShapeFileImport(ShapeType::Point);
|
||||
// If the zip archive has more than one file,
|
||||
// get the correct content to the buffer from .shp file.
|
||||
if (
|
||||
@ -183,23 +184,18 @@ class ImportShp extends ImportPlugin
|
||||
}
|
||||
|
||||
switch ($shp->shapeType) {
|
||||
// ESRI Null Shape
|
||||
case 0:
|
||||
case ShapeType::Null:
|
||||
break;
|
||||
// ESRI Point
|
||||
case 1:
|
||||
case ShapeType::Point:
|
||||
$gisType = 'point';
|
||||
break;
|
||||
// ESRI PolyLine
|
||||
case 3:
|
||||
case ShapeType::PolyLine:
|
||||
$gisType = 'multilinestring';
|
||||
break;
|
||||
// ESRI Polygon
|
||||
case 5:
|
||||
case ShapeType::Polygon:
|
||||
$gisType = 'multipolygon';
|
||||
break;
|
||||
// ESRI MultiPoint
|
||||
case 8:
|
||||
case ShapeType::MultiPoint:
|
||||
$gisType = 'multipoint';
|
||||
break;
|
||||
default:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
