Skip to content

Commit 5d4923d

Browse files
jbelienjbelien
authored
Enable PHP 8.0 support (2) (#1104)
1 parent afce72d commit 5d4923d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+705
-992
lines changed

‎src/Provider/AlgoliaPlaces/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
},
2323
"require-dev": {
2424
"geocoder-php/provider-integration-tests": "^1.1",
25-
"php-http/curl-client": "^1.7",
25+
"php-http/curl-client": "^2.2",
2626
"php-http/message": "^1.0",
2727
"phpunit/phpunit": "^9.5"
2828
},

‎src/Provider/AlgoliaPlaces/phpunit.xml.dist

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
3-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
5-
backupGlobals="false"
6-
colors="true"
7-
bootstrap="vendor/autoload.php"
8-
>
9-
<php>
10-
<server name="ALGOLIA_API_KEY" value="" />
11-
<server name="ALGOLIA_APP_ID" value="" />
12-
<server name="USE_CACHED_RESPONSES" value="true" />
13-
</php>
14-
<testsuites>
15-
<testsuite name="Geocoder Test Suite">
16-
<directory>./Tests/</directory>
17-
</testsuite>
18-
</testsuites>
19-
20-
<filter>
21-
<whitelist>
22-
<directory>./</directory>
23-
<exclude>
24-
<directory>./Tests</directory>
25-
<directory>./vendor</directory>
26-
</exclude>
27-
</whitelist>
28-
</filter>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
3+
<coverage>
4+
<include>
5+
<directory>./</directory>
6+
</include>
7+
<exclude>
8+
<directory>./Tests</directory>
9+
<directory>./vendor</directory>
10+
</exclude>
11+
</coverage>
12+
<php>
13+
<server name="ALGOLIA_API_KEY" value=""/>
14+
<server name="ALGOLIA_APP_ID" value=""/>
15+
<server name="USE_CACHED_RESPONSES" value="true"/>
16+
</php>
17+
<testsuites>
18+
<testsuite name="Geocoder Test Suite">
19+
<directory>./Tests/</directory>
20+
</testsuite>
21+
</testsuites>
2922
</phpunit>

‎src/Provider/ArcGISOnline/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
"require-dev": {
2323
"geocoder-php/provider-integration-tests": "^1.0",
24-
"php-http/curl-client": "^1.7",
24+
"php-http/curl-client": "^2.2",
2525
"php-http/message": "^1.0",
2626
"phpunit/phpunit": "^9.5"
2727
},

‎src/Provider/ArcGISOnline/phpunit.xml.dist

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
3-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
5-
backupGlobals="false"
6-
colors="true"
7-
bootstrap="vendor/autoload.php"
8-
>
9-
<php>
10-
<server name="ARCGIS_TOKEN" value="YOUR_ARCGIS_TOKEN" />
11-
<server name="USE_CACHED_RESPONSES" value="true" />
12-
</php>
13-
14-
<testsuites>
15-
<testsuite name="Geocoder Test Suite">
16-
<directory>./Tests/</directory>
17-
</testsuite>
18-
</testsuites>
19-
20-
<filter>
21-
<whitelist>
22-
<directory>./</directory>
23-
<exclude>
24-
<directory>./Tests</directory>
25-
<directory>./vendor</directory>
26-
</exclude>
27-
</whitelist>
28-
</filter>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
3+
<coverage>
4+
<include>
5+
<directory>./</directory>
6+
</include>
7+
<exclude>
8+
<directory>./Tests</directory>
9+
<directory>./vendor</directory>
10+
</exclude>
11+
</coverage>
12+
<php>
13+
<server name="ARCGIS_TOKEN" value="YOUR_ARCGIS_TOKEN"/>
14+
<server name="USE_CACHED_RESPONSES" value="true"/>
15+
</php>
16+
<testsuites>
17+
<testsuite name="Geocoder Test Suite">
18+
<directory>./Tests/</directory>
19+
</testsuite>
20+
</testsuites>
2921
</phpunit>

‎src/Provider/AzureMaps/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
},
2121
"require-dev": {
2222
"geocoder-php/provider-integration-tests": "^1.0",
23-
"php-http/curl-client": "^1.7",
23+
"php-http/curl-client": "^2.2",
2424
"php-http/message": "^1.0",
2525
"phpunit/phpunit": "^9.5"
2626
},

‎src/Provider/AzureMaps/phpunit.xml.dist

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
3-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
5-
backupGlobals="false"
6-
colors="true"
7-
bootstrap="vendor/autoload.php"
8-
>
9-
<php>
10-
<server name="AZURE_MAPS_SUBSCRIPTION_KEY" value="YOUR_AZURE_MAPS_SUBSCRIPTION_KEY" />
11-
<server name="USE_CACHED_RESPONSES" value="true" />
12-
</php>
13-
14-
<testsuites>
15-
<testsuite name="Geocoder Test Suite">
16-
<directory>./Tests/</directory>
17-
</testsuite>
18-
</testsuites>
19-
20-
<filter>
21-
<whitelist>
22-
<directory>./</directory>
23-
<exclude>
24-
<directory>./Tests</directory>
25-
<directory>./vendor</directory>
26-
</exclude>
27-
</whitelist>
28-
</filter>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
3+
<coverage>
4+
<include>
5+
<directory>./</directory>
6+
</include>
7+
<exclude>
8+
<directory>./Tests</directory>
9+
<directory>./vendor</directory>
10+
</exclude>
11+
</coverage>
12+
<php>
13+
<server name="AZURE_MAPS_SUBSCRIPTION_KEY" value="YOUR_AZURE_MAPS_SUBSCRIPTION_KEY"/>
14+
<server name="USE_CACHED_RESPONSES" value="true"/>
15+
</php>
16+
<testsuites>
17+
<testsuite name="Geocoder Test Suite">
18+
<directory>./Tests/</directory>
19+
</testsuite>
20+
</testsuites>
2921
</phpunit>

‎src/Provider/BingMaps/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
"require-dev": {
2323
"geocoder-php/provider-integration-tests": "^1.0",
24-
"php-http/curl-client": "^1.7",
24+
"php-http/curl-client": "^2.2",
2525
"php-http/message": "^1.0",
2626
"phpunit/phpunit": "^9.5"
2727
},

‎src/Provider/BingMaps/phpunit.xml.dist

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
3-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
5-
backupGlobals="false"
6-
colors="true"
7-
bootstrap="vendor/autoload.php"
8-
>
9-
<php>
10-
<server name="BINGMAPS_API_KEY" value="YOUR_API_KEY" />
11-
<server name="USE_CACHED_RESPONSES" value="true" />
12-
</php>
13-
14-
<testsuites>
15-
<testsuite name="Geocoder Test Suite">
16-
<directory>./Tests/</directory>
17-
</testsuite>
18-
</testsuites>
19-
20-
<filter>
21-
<whitelist>
22-
<directory>./</directory>
23-
<exclude>
24-
<directory>./Tests</directory>
25-
<directory>./vendor</directory>
26-
</exclude>
27-
</whitelist>
28-
</filter>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
3+
<coverage>
4+
<include>
5+
<directory>./</directory>
6+
</include>
7+
<exclude>
8+
<directory>./Tests</directory>
9+
<directory>./vendor</directory>
10+
</exclude>
11+
</coverage>
12+
<php>
13+
<server name="BINGMAPS_API_KEY" value="YOUR_API_KEY"/>
14+
<server name="USE_CACHED_RESPONSES" value="true"/>
15+
</php>
16+
<testsuites>
17+
<testsuite name="Geocoder Test Suite">
18+
<directory>./Tests/</directory>
19+
</testsuite>
20+
</testsuites>
2921
</phpunit>

‎src/Provider/Cache/phpunit.xml.dist

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
3-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
5-
backupGlobals="false"
6-
colors="true"
7-
bootstrap="vendor/autoload.php"
8-
>
9-
10-
<testsuites>
11-
<testsuite name="Geocoder Test Suite">
12-
<directory>./Tests/</directory>
13-
</testsuite>
14-
</testsuites>
15-
16-
<filter>
17-
<whitelist>
18-
<directory>./</directory>
19-
<exclude>
20-
<directory>./Tests</directory>
21-
<directory>./vendor</directory>
22-
</exclude>
23-
</whitelist>
24-
</filter>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
3+
<coverage>
4+
<include>
5+
<directory>./</directory>
6+
</include>
7+
<exclude>
8+
<directory>./Tests</directory>
9+
<directory>./vendor</directory>
10+
</exclude>
11+
</coverage>
12+
<testsuites>
13+
<testsuite name="Geocoder Test Suite">
14+
<directory>./Tests/</directory>
15+
</testsuite>
16+
</testsuites>
2517
</phpunit>

‎src/Provider/Chain/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
"require-dev": {
2323
"nyholm/nsa": "^1.1",
24-
"php-http/curl-client": "^1.7",
24+
"php-http/curl-client": "^2.2",
2525
"php-http/message": "^1.0",
2626
"phpunit/phpunit": "^9.5"
2727
},

‎src/Provider/Chain/phpunit.xml.dist

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
3-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
5-
backupGlobals="false"
6-
colors="true"
7-
bootstrap="vendor/autoload.php"
8-
>
9-
<php>
10-
<ini name="error_reporting" value="-1" />
11-
</php>
12-
13-
<testsuites>
14-
<testsuite name="Geocoder Test Suite">
15-
<directory>./Tests/</directory>
16-
</testsuite>
17-
</testsuites>
18-
19-
<filter>
20-
<whitelist>
21-
<directory>./</directory>
22-
<exclude>
23-
<directory>./Tests</directory>
24-
<directory>./vendor</directory>
25-
</exclude>
26-
</whitelist>
27-
</filter>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
3+
<coverage>
4+
<include>
5+
<directory>./</directory>
6+
</include>
7+
<exclude>
8+
<directory>./Tests</directory>
9+
<directory>./vendor</directory>
10+
</exclude>
11+
</coverage>
12+
<php>
13+
<ini name="error_reporting" value="-1"/>
14+
</php>
15+
<testsuites>
16+
<testsuite name="Geocoder Test Suite">
17+
<directory>./Tests/</directory>
18+
</testsuite>
19+
</testsuites>
2820
</phpunit>

‎src/Provider/FreeGeoIp/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
"require-dev": {
2323
"geocoder-php/provider-integration-tests": "^1.0",
24-
"php-http/curl-client": "^1.7",
24+
"php-http/curl-client": "^2.2",
2525
"php-http/message": "^1.0",
2626
"phpunit/phpunit": "^9.5"
2727
},

‎src/Provider/FreeGeoIp/phpunit.xml.dist

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
3-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
5-
backupGlobals="false"
6-
colors="true"
7-
bootstrap="vendor/autoload.php"
8-
>
9-
<php>
10-
<server name="USE_CACHED_RESPONSES" value="true" />
11-
</php>
12-
13-
<testsuites>
14-
<testsuite name="Geocoder Test Suite">
15-
<directory>./Tests/</directory>
16-
</testsuite>
17-
</testsuites>
18-
19-
<filter>
20-
<whitelist>
21-
<directory>./</directory>
22-
<exclude>
23-
<directory>./Tests</directory>
24-
<directory>./vendor</directory>
25-
</exclude>
26-
</whitelist>
27-
</filter>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
3+
<coverage>
4+
<include>
5+
<directory>./</directory>
6+
</include>
7+
<exclude>
8+
<directory>./Tests</directory>
9+
<directory>./vendor</directory>
10+
</exclude>
11+
</coverage>
12+
<php>
13+
<server name="USE_CACHED_RESPONSES" value="true"/>
14+
</php>
15+
<testsuites>
16+
<testsuite name="Geocoder Test Suite">
17+
<directory>./Tests/</directory>
18+
</testsuite>
19+
</testsuites>
2820
</phpunit>

0 commit comments

Comments
 (0)