Skip to content

Commit afce72d

Browse files
jbelienjbelien
authored
Enable PHP 8.0 support (1) (#1103)
* Upragde PHPUnit * Upgrade PHPUnit configuration * Upgrade Travis CI configuration * Update changelogs
1 parent 93939ac commit afce72d

File tree

49 files changed

+188
-145
lines changed

Some content is hidden

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

49 files changed

+188
-145
lines changed

‎src/Common/.travis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
language: php
22

3-
php: 7.2
3+
matrix:
4+
fast_finish: true
5+
include:
6+
- php: 7.3
7+
- php: 7.4
8+
- php: 8.0
49

510
install:
611
- composer update --prefer-stable --prefer-dist

‎src/Common/CHANGELOG.md

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22

33
The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
44

5+
## 4.4.0
6+
7+
### Added
8+
9+
- Add support for PHP 8.0
10+
11+
### Removed
12+
13+
- Drop support for PHP 7.2
14+
15+
### Changed
16+
17+
- Upgrade PHPUnit to version 9
18+
519
## 4.3.0
620

721
### Removed
@@ -17,7 +31,7 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
1731

1832
### Fixed
1933

20-
- Fix building ProviderNotRegistered exception message
34+
- Fix building ProviderNotRegistered exception message
2135

2236
## 4.2.1
2337

@@ -33,17 +47,17 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
3347

3448
### Fixed
3549

36-
- Bug in `StatefulGeocoder` where different locale or bounds did not have any effect.
50+
- Bug in `StatefulGeocoder` where different locale or bounds did not have any effect.
3751

3852
## 4.1.0
3953

4054
### Changed
4155

42-
- Make sure a `Country` never will be empty of data.
56+
- Make sure a `Country` never will be empty of data.
4357

4458
## 4.0.0
4559

46-
No changes since Beta 5.
60+
No changes since Beta 5.
4761

4862
## 4.0.0 - Beta 5
4963

@@ -60,40 +74,38 @@ No changes since Beta 5.
6074

6175
## 4.0.0 - Beta 3
6276

63-
### Added
77+
### Added
6478

65-
- The constructor of `ProvierAggregator` will accept a callable that can decide what providers should be used for a specific query.
79+
- The constructor of `ProvierAggregator` will accept a callable that can decide what providers should be used for a specific query.
6680

6781
### Changed
6882

6983
- `ProvierAggregator::getProvider` is now private
7084
- `ProvierAggregator::limit` was removed
7185
- `ProvierAggregator::getLimit` was removed
72-
- `ProvierAggregator::__constructor` changed the order of the parameters.
73-
- `ProvierAggregator` is not final.
74-
86+
- `ProvierAggregator::__constructor` changed the order of the parameters.
87+
- `ProvierAggregator` is not final.
7588

7689
## 4.0.0 - Beta 2
7790

7891
### Added
7992

80-
- PHP7 type hints.
93+
- PHP7 type hints.
8194
- `AbstractArrayDumper` and `AbstractDumper`
8295
- `LogicException` and `OutOfBounds`
8396
- `GeocodeQuery::__toString` and `ReverseQuery::__toString`
8497

8598
### Changed
8699

87-
- All Dumpers are now final.
88-
- All Exceptions are now final.
89-
- `AddressCollection` is now final.
90-
- `ProviderAggregator` is now final.
91-
- `StatefulGeocoder` is now final.
92-
- `TimedGeocoder` is now final.
100+
- All Dumpers are now final.
101+
- All Exceptions are now final.
102+
- `AddressCollection` is now final.
103+
- `ProviderAggregator` is now final.
104+
- `StatefulGeocoder` is now final.
105+
- `TimedGeocoder` is now final.
93106
- `ProviderAggregator::getName()` will return "provider_aggregator"
94107
- `TimedGeocoder::getName()` will return "timed_geocoder"
95108

96-
97109
## 4.0.0 - Beta1
98110

99-
First release of this library.
111+
First release of this library.

‎src/Common/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-
"phpunit/phpunit": "^7.5",
24+
"phpunit/phpunit": "^9.5",
2525
"symfony/stopwatch": "~2.5"
2626
},
2727
"suggest": {

‎src/Common/phpunit.xml.dist

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
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"
3+
backupGlobals="false"
4+
colors="true"
5+
bootstrap="vendor/autoload.php"
6+
>
7+
<coverage>
8+
<include>
9+
<directory>./</directory>
10+
</include>
11+
<exclude>
12+
<directory>./Tests</directory>
13+
<directory>./vendor</directory>
14+
</exclude>
15+
</coverage>
16+
<php>
17+
<ini name="error_reporting" value="-1"/>
18+
</php>
19+
<testsuites>
20+
<testsuite name="Geocoder Test Suite">
21+
<directory>./Tests/</directory>
22+
</testsuite>
23+
</testsuites>
2824
</phpunit>

‎src/Http/.travis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
language: php
22

3-
php: 7.2
3+
matrix:
4+
fast_finish: true
5+
include:
6+
- php: 7.3
7+
- php: 7.4
8+
- php: 8.0
49

510
install:
611
- composer update --prefer-stable --prefer-dist

‎src/Http/CHANGELOG.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22

33
The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
44

5+
## 4.4.0
6+
7+
### Added
8+
9+
- Add support for PHP 8.0
10+
11+
### Removed
12+
13+
- Drop support for PHP 7.2
14+
15+
### Changed
16+
17+
- Upgrade PHPUnit to version 9
18+
519
## 4.3.0
620

721
### Removed
@@ -19,14 +33,14 @@ got `AbstractHttpProvider::getUrlContents`, `AbstractHttpProvider::getRequest` a
1933

2034
## 4.0.0
2135

22-
No changes since beta 2.
36+
No changes since beta 2.
2337

2438
## 4.0.0-beta2
2539

2640
- Removed `AbstractHttpProvider::setMessageFactory`.
2741
- Removed `AbstractHttpProvider::getHttpClient`.
28-
- Make sure we have a `MessageFactory` in the constructor of `AbstractHttpProvider`.
42+
- Make sure we have a `MessageFactory` in the constructor of `AbstractHttpProvider`.
2943

3044
## 4.0.0-beta1
3145

32-
First release of this library.
46+
First release of this library.

‎src/Http/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"nyholm/psr7": "^1.0",
2828
"php-http/message": "^1.0",
2929
"php-http/mock-client": "^1.0",
30-
"phpunit/phpunit": "^7.5",
30+
"phpunit/phpunit": "^9.5",
3131
"symfony/stopwatch": "~2.5"
3232
},
3333
"extra": {

‎src/Http/phpunit.xml.dist

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
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"
3+
backupGlobals="false"
4+
colors="true"
5+
bootstrap="vendor/autoload.php"
6+
>
7+
<coverage>
8+
<include>
9+
<directory>./</directory>
10+
</include>
11+
<exclude>
12+
<directory>./Tests</directory>
13+
<directory>./vendor</directory>
14+
</exclude>
15+
</coverage>
16+
<php>
17+
<ini name="error_reporting" value="-1"/>
18+
</php>
19+
<testsuites>
20+
<testsuite name="Geocoder Test Suite">
21+
<directory>./Tests/</directory>
22+
</testsuite>
23+
</testsuites>
2824
</phpunit>

‎src/Plugin/.travis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
language: php
22

3-
php: 7.2
3+
matrix:
4+
fast_finish: true
5+
include:
6+
- php: 7.3
7+
- php: 7.4
8+
- php: 8.0
49

510
install:
611
- composer update --prefer-stable --prefer-dist

‎src/Plugin/CHANGELOG.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22

33
The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
44

5+
## 1.3.0
6+
7+
### Added
8+
9+
- Add support for PHP 8.0
10+
11+
### Removed
12+
13+
- Drop support for PHP 7.2
14+
15+
### Changed
16+
17+
- Upgrade PHPUnit to version 9
18+
519
## 1.2.0
620

721
### Removed
@@ -10,10 +24,10 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
1024

1125
## 1.1.0
1226

13-
### Added
27+
### Added
1428

15-
- Support for setting permission on the cache plugin.
29+
- Support for setting permission on the cache plugin.
1630

1731
## 1.0.0
1832

19-
First release of this library.
33+
First release of this library.

0 commit comments

Comments
 (0)