Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare release of 5.0.0 for willdurand/geocoder #1209

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .github/workflows/component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,17 @@ jobs:
strategy:
fail-fast: false
matrix:
php-version: ['8.0', '8.1', '8.2', '8.3']
php-version: ['8.2', '8.3']
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please add '8.4' here and in the other places?

component: [Common, Http, Plugin]
include:
- php-version: '8.0'
component: Http
- php-version: '8.0'
component: Plugin
- php-version: '8.1'
component: Http
- php-version: '8.1'
component: Plugin

name: PHP ${{ matrix.php-version }} / ${{ matrix.component }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php-version: ['8.0', '8.1', '8.2', '8.3']
php-version: ['8.2', '8.3']
deps: ['low', 'high']
name: PHP ${{ matrix.php-version }} (${{ matrix.deps }})
steps:
Expand Down Expand Up @@ -63,5 +63,5 @@ jobs:
extensions: curl
- name: Install dependencies
run: composer install --no-progress
- name: Run PHPStan
- name: Run php-cs-fixer
run: composer run-script cs
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"homepage": "http://geocoder-php.org",
"require": {
"php": "^8.0",
"php": ">=8.2",
"igorw/get-in": "^1.0",
"php-http/discovery": "^1.17",
"php-http/promise": "^1.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Common/.github/workflows/component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php-version: ['8.0', '8.1', '8.2', '8.3']
php-version: ['8.2', '8.3']
steps:
- uses: actions/checkout@v4
- name: Use PHP ${{ matrix.php-version }}
Expand Down
5 changes: 5 additions & 0 deletions src/Common/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

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

## 5.0.0

- Drop support for PHP < 8.2
- Added return values on classes and interfaces

## 4.6.0

### Removed
Expand Down
2 changes: 1 addition & 1 deletion src/Common/Model/Address.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ final public function __construct(
?string $locality = null,
?string $subLocality = null,
?Country $country = null,
?string $timezone = null
?string $timezone = null,
) {
$this->providedBy = $providedBy;
$this->adminLevels = $adminLevels;
Expand Down
6 changes: 3 additions & 3 deletions src/Common/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}
],
"require": {
"php": "^8.0"
"php": ">=8.2"
},
"require-dev": {
"nyholm/nsa": "^1.1",
Expand All @@ -29,7 +29,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "4.1-dev"
"dev-master": "5.1-dev"
}
},
"autoload": {
Expand All @@ -49,4 +49,4 @@
"php-http/discovery": false
}
}
}
}
2 changes: 1 addition & 1 deletion src/Http/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"php-http/discovery": "^1.17",
"psr/http-client-implementation": "^1.0",
"psr/http-factory-implementation": "^1.0",
"willdurand/geocoder": "^4.0"
"willdurand/geocoder": "^4.0|^5.0"
},
"require-dev": {
"nyholm/psr7": "^1.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Plugin/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"php-http/promise": "^1.0",
"psr/log": "^1.0|^2.0|^3.0",
"psr/simple-cache": "^1.0|^2.0|^3.0",
"willdurand/geocoder": "^4.0"
"willdurand/geocoder": "^4.0|^5.0"
},
"require-dev": {
"cache/void-adapter": "^1.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Provider/ArcGISOnline/ArcGISOnline.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ final class ArcGISOnline extends AbstractHttpProvider implements Provider
public static function token(
ClientInterface $client,
string $token,
?string $sourceCountry = null
?string $sourceCountry = null,
) {
$provider = new self($client, $sourceCountry, $token);

Expand Down
2 changes: 1 addition & 1 deletion src/Provider/AzureMaps/AzureMaps.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public function __construct(
ClientInterface $client,
string $subscriptionKey,
array $options = [],
string $format = 'json'
string $format = 'json',
) {
parent::__construct($client);

Expand Down
2 changes: 1 addition & 1 deletion src/Provider/GoogleMaps/GoogleMaps.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public static function business(
?string $privateKey = null,
?string $region = null,
?string $apiKey = null,
?string $channel = null
?string $channel = null,
) {
$provider = new self($client, $region, $apiKey);
$provider->clientId = $clientId;
Expand Down
2 changes: 1 addition & 1 deletion src/Provider/Mapbox/Mapbox.php
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public function __construct(
ClientInterface $client,
string $accessToken,
?string $country = null,
string $geocodingMode = self::GEOCODING_MODE_PLACES
string $geocodingMode = self::GEOCODING_MODE_PLACES,
) {
parent::__construct($client);

Expand Down