Skip to content

Commit ee807ab

Browse files
norkunasnorkunas
authored
Merge pull request #380 from Chris53897/feature/new-1
chore: remove unused + bump dev dependencies
2 parents 18d7aae + 157976f commit ee807ab

File tree

6 files changed

+53
-113
lines changed

6 files changed

+53
-113
lines changed

‎.php-cs-fixer.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
$finder = (new PhpCsFixer\Finder())
44
->in(__DIR__)
55
->exclude(__DIR__.'/vendor')
6+
->notPath('phpstan-baseline.php')
67
;
78

89
return (new PhpCsFixer\Config())

‎composer.json‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,38 +27,35 @@
2727
"doctrine/orm": "^2.20 || ^3.0",
2828
"fakerphp/faker": "^1.20",
2929
"friendsofphp/php-cs-fixer": "^3.13",
30-
"geocoder-php/algolia-places-provider": "^0.4",
30+
"geocoder-php/algolia-places-provider": "^0.5",
3131
"geocoder-php/arcgis-online-provider": "^4.4",
3232
"geocoder-php/bing-maps-provider": "^4.3",
3333
"geocoder-php/cache-provider": "^4.4.0",
3434
"geocoder-php/chain-provider": "^4.5",
3535
"geocoder-php/free-geoip-provider": "^4.5",
3636
"geocoder-php/geo-plugin-provider": "^4.3",
3737
"geocoder-php/geoip2-provider": "^4.3",
38-
"geocoder-php/geoips-provider": "^4.0",
3938
"geocoder-php/geonames-provider": "^4.4",
4039
"geocoder-php/google-maps-places-provider": "^1.4",
4140
"geocoder-php/google-maps-provider": "^4.7",
42-
"geocoder-php/here-provider": "^0.7",
43-
"geocoder-php/host-ip-provider": "^4.4",
41+
"geocoder-php/here-provider": "^0.8",
42+
"geocoder-php/host-ip-provider": "^4.5",
4443
"geocoder-php/ip-info-db-provider": "^4.3",
45-
"geocoder-php/ip-info-provider": "^0.4",
46-
"geocoder-php/ipstack-provider": "^0.4",
44+
"geocoder-php/ip-info-provider": "^0.5",
45+
"geocoder-php/ipstack-provider": "^0.5",
4746
"geocoder-php/locationiq-provider": "^1.4",
4847
"geocoder-php/mapbox-provider": "^1.4",
4948
"geocoder-php/mapquest-provider": "^4.3",
50-
"geocoder-php/mapzen-provider": "^4.0",
51-
"geocoder-php/maxmind-binary-provider": "^4.3",
52-
"geocoder-php/maxmind-provider": "^4.4",
53-
"geocoder-php/nominatim-provider": "^5.6",
54-
"geocoder-php/open-cage-provider": "^4.6",
55-
"geocoder-php/openrouteservice-provider": "^1.3",
56-
"geocoder-php/pickpoint-provider": "^4.3",
57-
"geocoder-php/tomtom-provider": "^4.4",
58-
"geocoder-php/yandex-provider": "^4.5",
59-
"geoip/geoip": "~1.17",
49+
"geocoder-php/maxmind-binary-provider": "^4.4",
50+
"geocoder-php/maxmind-provider": "^4.5",
51+
"geocoder-php/nominatim-provider": "^5.8",
52+
"geocoder-php/open-cage-provider": "^4.7",
53+
"geocoder-php/openrouteservice-provider": "^1.4",
54+
"geocoder-php/pickpoint-provider": "^4.4",
55+
"geocoder-php/tomtom-provider": "^4.5",
56+
"geocoder-php/yandex-provider": "^4.6",
6057
"nyholm/nsa": "^1.3",
61-
"nyholm/psr7": "^1.5",
58+
"nyholm/psr7": "^1.8",
6259
"nyholm/symfony-bundle-test": "^2.0 || ^3.0",
6360
"phpstan/phpstan": "^1.9.2",
6461
"psr/http-client": "^1.0",

‎doc/services.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ Here is a list of all provider factories and their options.
1616
| `Bazinga\GeocoderBundle\ProviderFactory\ChainFactory` | services
1717
| `Bazinga\GeocoderBundle\ProviderFactory\FreeGeoIpFactory` | http_client, base_url
1818
| `Bazinga\GeocoderBundle\ProviderFactory\GeoIP2Factory` | provider, database_filename, user_id, license_key, webservice_options, locales, provider_service
19-
| `Bazinga\GeocoderBundle\ProviderFactory\GeoipFactory` |
20-
| `Bazinga\GeocoderBundle\ProviderFactory\GeoIPsFactory` | http_client, api_key
2119
| `Bazinga\GeocoderBundle\ProviderFactory\GeonamesFactory` | http_client, username
2220
| `Bazinga\GeocoderBundle\ProviderFactory\GeoPluginFactory` | http_client
2321
| `Bazinga\GeocoderBundle\ProviderFactory\GoogleMapsFactory` | http_client, api_key, region

‎phpstan-baseline.php‎

Lines changed: 38 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,211 +1,197 @@
1-
<?php
2-
3-
declare(strict_types=1);
1+
<?php declare(strict_types = 1);
42

53
$ignoreErrors = [];
64
$ignoreErrors[] = [
75
// identifier: argument.type
86
'message' => '#^Parameter \\#1 \\$name of method Geocoder\\\\ProviderAggregator\\:\\:using\\(\\) expects string, mixed given\\.$#',
97
'count' => 1,
10-
'path' => __DIR__.'/src/Command/GeocodeCommand.php',
8+
'path' => __DIR__ . '/src/Command/GeocodeCommand.php',
119
];
1210
$ignoreErrors[] = [
1311
// identifier: argument.type
1412
'message' => '#^Parameter \\#1 \\$string of function strtolower expects string, string\\|null given\\.$#',
1513
'count' => 1,
16-
'path' => __DIR__.'/src/Command/GeocodeCommand.php',
14+
'path' => __DIR__ . '/src/Command/GeocodeCommand.php',
1715
];
1816
$ignoreErrors[] = [
1917
// identifier: argument.type
2018
'message' => '#^Parameter \\#1 \\$text of static method Geocoder\\\\Query\\\\GeocodeQuery\\:\\:create\\(\\) expects string, mixed given\\.$#',
2119
'count' => 1,
22-
'path' => __DIR__.'/src/Command/GeocodeCommand.php',
20+
'path' => __DIR__ . '/src/Command/GeocodeCommand.php',
21+
];
22+
$ignoreErrors[] = [
23+
// identifier: argument.type
24+
'message' => '#^Parameter \\#3 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#',
25+
'count' => 1,
26+
'path' => __DIR__ . '/src/Command/GeocodeCommand.php',
2327
];
2428
$ignoreErrors[] = [
2529
// identifier: foreach.nonIterable
2630
'message' => '#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#',
2731
'count' => 3,
28-
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
32+
'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php',
2933
];
3034
$ignoreErrors[] = [
3135
// identifier: offsetAccess.nonOffsetAccessible
3236
'message' => '#^Cannot access offset \'aliases\' on mixed\\.$#',
3337
'count' => 1,
34-
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
38+
'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php',
3539
];
3640
$ignoreErrors[] = [
3741
// identifier: offsetAccess.nonOffsetAccessible
3842
'message' => '#^Cannot access offset \'enabled\' on mixed\\.$#',
3943
'count' => 1,
40-
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
44+
'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php',
4145
];
4246
$ignoreErrors[] = [
4347
// identifier: offsetAccess.nonOffsetAccessible
4448
'message' => '#^Cannot access offset \'factory\' on mixed\\.$#',
4549
'count' => 5,
46-
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
50+
'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php',
4751
];
4852
$ignoreErrors[] = [
4953
// identifier: offsetAccess.nonOffsetAccessible
5054
'message' => '#^Cannot access offset \'id\' on mixed\\.$#',
5155
'count' => 1,
52-
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
56+
'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php',
5357
];
5458
$ignoreErrors[] = [
5559
// identifier: offsetAccess.nonOffsetAccessible
5660
'message' => '#^Cannot access offset \'options\' on mixed\\.$#',
5761
'count' => 4,
58-
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
62+
'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php',
5963
];
6064
$ignoreErrors[] = [
6165
// identifier: offsetAccess.nonOffsetAccessible
6266
'message' => '#^Cannot access offset \'reference\' on mixed\\.$#',
6367
'count' => 2,
64-
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
68+
'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php',
6569
];
6670
$ignoreErrors[] = [
6771
// identifier: staticMethod.nonObject
6872
'message' => '#^Cannot call static method validate\\(\\) on mixed\\.$#',
6973
'count' => 1,
70-
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
74+
'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php',
7175
];
7276
$ignoreErrors[] = [
7377
// identifier: cast.string
7478
'message' => '#^Cannot cast mixed to string\\.$#',
7579
'count' => 1,
76-
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
80+
'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php',
7781
];
7882
$ignoreErrors[] = [
7983
// identifier: argument.type
8084
'message' => '#^Parameter \\#1 \\$alias of method Symfony\\\\Component\\\\DependencyInjection\\\\ContainerBuilder\\:\\:setAlias\\(\\) expects string, mixed given\\.$#',
8185
'count' => 1,
82-
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
86+
'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php',
8387
];
8488
$ignoreErrors[] = [
8589
// identifier: argument.type
8690
'message' => '#^Parameter \\#1 \\$callback of function array_map expects \\(callable\\(mixed\\)\\: mixed\\)\\|null, Closure\\(string\\)\\: Symfony\\\\Component\\\\DependencyInjection\\\\Reference given\\.$#',
8791
'count' => 1,
88-
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
92+
'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php',
8993
];
9094
$ignoreErrors[] = [
9195
// identifier: argument.type
9296
'message' => '#^Parameter \\#1 \\$factoryServiceId of static method Bazinga\\\\GeocoderBundle\\\\DependencyInjection\\\\Compiler\\\\FactoryValidatorPass\\:\\:addFactoryServiceId\\(\\) expects string, mixed given\\.$#',
9397
'count' => 1,
94-
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
98+
'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php',
9599
];
96100
$ignoreErrors[] = [
97101
// identifier: argument.type
98102
'message' => '#^Parameter \\#1 \\$id of class Symfony\\\\Component\\\\DependencyInjection\\\\Reference constructor expects string, mixed given\\.$#',
99103
'count' => 1,
100-
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
104+
'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php',
101105
];
102106
$ignoreErrors[] = [
103107
// identifier: argument.type
104108
'message' => '#^Parameter \\#1 \\$id of method Symfony\\\\Component\\\\DependencyInjection\\\\ContainerBuilder\\:\\:getDefinition\\(\\) expects string, mixed given\\.$#',
105109
'count' => 1,
106-
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
110+
'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php',
107111
];
108112
$ignoreErrors[] = [
109113
// identifier: argument.type
110114
'message' => '#^Parameter \\#1 \\$object_or_class of function class_implements expects object\\|string, mixed given\\.$#',
111115
'count' => 1,
112-
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
116+
'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php',
113117
];
114118
$ignoreErrors[] = [
115119
// identifier: argument.type
116120
'message' => '#^Parameter \\#1 \\$options of method Bazinga\\\\GeocoderBundle\\\\DependencyInjection\\\\BazingaGeocoderExtension\\:\\:findReferences\\(\\) expects array\\<int\\|string, mixed\\>, mixed given\\.$#',
117121
'count' => 2,
118-
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
122+
'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php',
119123
];
120124
$ignoreErrors[] = [
121125
// identifier: argument.type
122126
'message' => '#^Parameter \\#1 \\$string of function ltrim expects string, mixed given\\.$#',
123127
'count' => 1,
124-
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
128+
'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php',
125129
];
126130
$ignoreErrors[] = [
127131
// identifier: argument.type
128132
'message' => '#^Parameter \\#2 \\$config of method Bazinga\\\\GeocoderBundle\\\\DependencyInjection\\\\BazingaGeocoderExtension\\:\\:configureProviderPlugins\\(\\) expects array\\<int\\|string, mixed\\>, mixed given\\.$#',
129133
'count' => 1,
130-
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
134+
'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php',
131135
];
132136
$ignoreErrors[] = [
133137
// identifier: argument.type
134138
'message' => '#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#',
135139
'count' => 1,
136-
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
140+
'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php',
137141
];
138142
$ignoreErrors[] = [
139143
// identifier: encapsedStringPart.nonString
140144
'message' => '#^Part \\$providerName \\(mixed\\) of encapsed string cannot be cast to string\\.$#',
141145
'count' => 1,
142-
'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php',
146+
'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php',
143147
];
144148
$ignoreErrors[] = [
145149
// identifier: method.nonObject
146150
'message' => '#^Cannot call method getLatitude\\(\\) on Geocoder\\\\Model\\\\Coordinates\\|null\\.$#',
147151
'count' => 1,
148-
'path' => __DIR__.'/src/Doctrine/ORM/GeocoderListener.php',
152+
'path' => __DIR__ . '/src/Doctrine/ORM/GeocoderListener.php',
149153
];
150154
$ignoreErrors[] = [
151155
// identifier: method.nonObject
152156
'message' => '#^Cannot call method getLongitude\\(\\) on Geocoder\\\\Model\\\\Coordinates\\|null\\.$#',
153157
'count' => 1,
154-
'path' => __DIR__.'/src/Doctrine/ORM/GeocoderListener.php',
158+
'path' => __DIR__ . '/src/Doctrine/ORM/GeocoderListener.php',
155159
];
156160
$ignoreErrors[] = [
157161
// identifier: argument.type
158162
'message' => '#^Parameter \\#1 \\$text of method Geocoder\\\\Query\\\\GeocodeQuery\\:\\:withText\\(\\) expects string, string\\|null given\\.$#',
159163
'count' => 1,
160-
'path' => __DIR__.'/src/Plugin/FakeIpPlugin.php',
164+
'path' => __DIR__ . '/src/Plugin/FakeIpPlugin.php',
161165
];
162166
$ignoreErrors[] = [
163167
// identifier: argument.type
164168
'message' => '#^Parameter \\#2 \\$replace of function str_replace expects array\\|string, string\\|null given\\.$#',
165169
'count' => 1,
166-
'path' => __DIR__.'/src/Plugin/FakeIpPlugin.php',
170+
'path' => __DIR__ . '/src/Plugin/FakeIpPlugin.php',
167171
];
168172
$ignoreErrors[] = [
169173
// identifier: argument.type
170174
'message' => '#^Parameter \\#1 \\$accountId of class GeoIp2\\\\WebService\\\\Client constructor expects int, int\\|null given\\.$#',
171175
'count' => 1,
172-
'path' => __DIR__.'/src/ProviderFactory/GeoIP2Factory.php',
176+
'path' => __DIR__ . '/src/ProviderFactory/GeoIP2Factory.php',
173177
];
174178
$ignoreErrors[] = [
175179
// identifier: argument.type
176180
'message' => '#^Parameter \\#1 \\$filename of class GeoIp2\\\\Database\\\\Reader constructor expects string, string\\|null given\\.$#',
177181
'count' => 1,
178-
'path' => __DIR__.'/src/ProviderFactory/GeoIP2Factory.php',
182+
'path' => __DIR__ . '/src/ProviderFactory/GeoIP2Factory.php',
179183
];
180184
$ignoreErrors[] = [
181185
// identifier: argument.type
182186
'message' => '#^Parameter \\#1 \\$geoIpProvider of class Geocoder\\\\Provider\\\\GeoIP2\\\\GeoIP2Adapter constructor expects GeoIp2\\\\ProviderInterface, GeoIp2\\\\ProviderInterface\\|null given\\.$#',
183187
'count' => 1,
184-
'path' => __DIR__.'/src/ProviderFactory/GeoIP2Factory.php',
188+
'path' => __DIR__ . '/src/ProviderFactory/GeoIP2Factory.php',
185189
];
186190
$ignoreErrors[] = [
187191
// identifier: argument.type
188192
'message' => '#^Parameter \\#2 \\$licenseKey of class GeoIp2\\\\WebService\\\\Client constructor expects string, string\\|null given\\.$#',
189193
'count' => 1,
190-
'path' => __DIR__.'/src/ProviderFactory/GeoIP2Factory.php',
191-
];
192-
$ignoreErrors[] = [
193-
// identifier: class.notFound
194-
'message' => '#^Class Geocoder\\\\Provider\\\\Geoip\\\\Geoip not found\\.$#',
195-
'count' => 1,
196-
'path' => __DIR__.'/src/ProviderFactory/GeoipFactory.php',
197-
];
198-
$ignoreErrors[] = [
199-
// identifier: class.notFound
200-
'message' => '#^Instantiated class Geocoder\\\\Provider\\\\Geoip\\\\Geoip not found\\.$#',
201-
'count' => 1,
202-
'path' => __DIR__.'/src/ProviderFactory/GeoipFactory.php',
203-
];
204-
$ignoreErrors[] = [
205-
// identifier: return.type
206-
'message' => '#^Method Bazinga\\\\GeocoderBundle\\\\ProviderFactory\\\\GeoipFactory\\:\\:getProvider\\(\\) should return Geocoder\\\\Provider\\\\Provider but returns Geocoder\\\\Provider\\\\Geoip\\\\Geoip\\.$#',
207-
'count' => 1,
208-
'path' => __DIR__.'/src/ProviderFactory/GeoipFactory.php',
194+
'path' => __DIR__ . '/src/ProviderFactory/GeoIP2Factory.php',
209195
];
210196

211197
return ['parameters' => ['ignoreErrors' => $ignoreErrors]];

‎src/ProviderFactory/GeoipFactory.php‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎tests/Functional/config/provider/geoip.yml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)