Skip to content

Commit 1ef4542

Browse files
authored
Merge branch 'master' into feature/fix-warning-for-tests
2 parents 40e7654 + 01c44f0 commit 1ef4542

File tree

87 files changed

+179
-179
lines changed

Some content is hidden

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

87 files changed

+179
-179
lines changed

.github/workflows/dependency-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
- name: 'Checkout Repository'
1818
uses: actions/checkout@v4
1919
- name: 'Dependency Review'
20-
uses: actions/dependency-review-action@v3
20+
uses: actions/dependency-review-action@v4

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
"phpstan/extension-installer": "^1.3",
4242
"phpstan/phpstan": "^1.10",
4343
"phpstan/phpstan-phpunit": "^1.3",
44-
"phpunit/phpunit": "^9.5",
45-
"symfony/http-client": "^5.4 || ^6.3",
46-
"symfony/stopwatch": "~2.5 || ~5.0"
44+
"phpunit/phpunit": "^9.6",
45+
"symfony/http-client": "^5.4 || ^6.4 || ^7.0",
46+
"symfony/stopwatch": "^5.4 || ^6.4 || ^7.0"
4747
},
4848
"suggest": {
4949
"ext-geoip": "Enabling the geoip extension allows you to use the MaxMindProvider.",

src/Common/.github/workflows/component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
matrix:
1616
php-version: ['8.0', '8.1', '8.2']
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- name: Use PHP ${{ matrix.php-version }}
2020
uses: shivammathur/setup-php@v2
2121
with:

src/Common/Collection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function isEmpty(): bool;
3535
/**
3636
* @return Location[]
3737
*/
38-
public function slice(int $offset, int $length = null);
38+
public function slice(int $offset, ?int $length = null);
3939

4040
public function has(int $index): bool;
4141

src/Common/Geocoder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ interface Geocoder extends Provider
3434
/**
3535
* Geocodes a given value.
3636
*
37-
* @throws \Geocoder\Exception\Exception
37+
* @throws Exception\Exception
3838
*/
3939
public function geocode(string $value): Collection;
4040

4141
/**
4242
* Reverses geocode given latitude and longitude values.
4343
*
44-
* @throws \Geocoder\Exception\Exception
44+
* @throws Exception\Exception
4545
*/
4646
public function reverse(float $latitude, float $longitude): Collection;
4747
}

src/Common/Model/Address.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ class Address implements Location
7777
final public function __construct(
7878
string $providedBy,
7979
AdminLevelCollection $adminLevels,
80-
Coordinates $coordinates = null,
81-
Bounds $bounds = null,
82-
string $streetNumber = null,
83-
string $streetName = null,
84-
string $postalCode = null,
85-
string $locality = null,
86-
string $subLocality = null,
87-
Country $country = null,
88-
string $timezone = null
80+
?Coordinates $coordinates = null,
81+
?Bounds $bounds = null,
82+
?string $streetNumber = null,
83+
?string $streetName = null,
84+
?string $postalCode = null,
85+
?string $locality = null,
86+
?string $subLocality = null,
87+
?Country $country = null,
88+
?string $timezone = null
8989
) {
9090
$this->providedBy = $providedBy;
9191
$this->adminLevels = $adminLevels;

src/Common/Model/AddressBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public function setCoordinates($latitude, $longitude): self
152152
return $this;
153153
}
154154

155-
public function addAdminLevel(int $level, string $name, string $code = null): self
155+
public function addAdminLevel(int $level, string $name, ?string $code = null): self
156156
{
157157
$this->adminLevels[] = new AdminLevel($level, $name, $code);
158158

src/Common/Model/AddressCollection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function isEmpty(): bool
5959
/**
6060
* @return Location[]
6161
*/
62-
public function slice(int $offset, int $length = null)
62+
public function slice(int $offset, ?int $length = null)
6363
{
6464
return array_slice($this->locations, $offset, $length);
6565
}

src/Common/Model/AdminLevel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ final class AdminLevel
3232
*/
3333
private $code;
3434

35-
public function __construct(int $level, string $name, string $code = null)
35+
public function __construct(int $level, string $name, ?string $code = null)
3636
{
3737
$this->level = $level;
3838
$this->name = $name;

src/Common/Model/AdminLevelCollection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function first(): AdminLevel
7777
/**
7878
* @return AdminLevel[]
7979
*/
80-
public function slice(int $offset, int $length = null): array
80+
public function slice(int $offset, ?int $length = null): array
8181
{
8282
return array_slice($this->adminLevels, $offset, $length, true);
8383
}

0 commit comments

Comments
 (0)