Merge branch 'master' into feature/allow-phpunit-10-11

Author: Chris53897

.github/dependabot.yml

@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "monthly"
+  - package-ecosystem: "composer" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "monthly"

.github/workflows/php.yml

@@ -12,9 +12,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3']
+        php-version: ['8.2', '8.3', '8.4', '8.5']
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Use PHP ${{ matrix.php-version }}
       uses: shivammathur/setup-php@v2
       with:
@@ -31,13 +31,9 @@ jobs:
     runs-on: ubuntu-latest
     name: PHPStan
     steps:
-    - uses: actions/checkout@v4
-    - name: Use PHP 8.3
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: 8.3
-        extensions: curl
+    - uses: actions/checkout@v5
+    - uses: shivammathur/setup-php@v2
     - name: Install dependencies
       run: composer install --no-progress
     - name: Run PHPStan
-      run: composer run-script analyse
+      run: composer run-script analyse

composer.json

@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": ">=8.2",
         "nyholm/psr7": "^1.0",
         "php-http/curl-client": "^2.2",
         "php-http/mock-client": "^1.2",
@@ -25,7 +25,7 @@
     },
     "require-dev": {
         "geocoder-php/nominatim-provider": "^5.3",
-        "phpstan/phpstan": "^1.10"
+        "phpstan/phpstan": "^1.10 || ^2.0"
     },
     "autoload": {
         "psr-4": {

src/BaseTestCase.php

@@ -31,7 +31,7 @@ abstract protected function getCacheDir();
     /**
      * Get a real HTTP client. If a cache dir is set to a path it will use cached responses.
      */
-    protected function getHttpClient(string $apiKey = null): ClientInterface
+    protected function getHttpClient(?string $apiKey = null): ClientInterface
     {
         if (null !== $cacheDir = $this->getCacheDir()) {
             return new CachedResponseClient(new HttplugClient(), $cacheDir, $apiKey);
@@ -43,7 +43,7 @@ protected function getHttpClient(string $apiKey = null): ClientInterface
     /**
      * Get a mocked HTTP client that never do calls over the internet. Use this is you want to control the response data.
      */
-    protected function getMockedHttpClient(string $body = null, int $statusCode = 200): ClientInterface
+    protected function getMockedHttpClient(?string $body = null, int $statusCode = 200): ClientInterface
     {
         $client = new MockedHttpClient();
         $client->addResponse(new Response($statusCode, [], $body));

src/ProviderIntegrationTest.php

@@ -215,7 +215,7 @@ public function testGeocodeIpv6(): void
      * @param string                    $message
      */
     #[DataProvider('exceptionDataProvider')]
-    public function testExceptions($query, string $exceptionClass, ResponseInterface $response = null, string $message = ''): void
+    public function testExceptions($query, string $exceptionClass, ?ResponseInterface $response = null, string $message = ''): void
     {
         if (isset($this->skippedTests[__FUNCTION__])) {
             $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
@@ -313,7 +313,6 @@ private function assertWellFormattedResult(Collection $result): void
                 'Location::getAdminLevels MUST always return a AdminLevelCollection'
             );
             $arrayData = $location->toArray();
-            $this->assertTrue(is_array($arrayData), 'Location::toArray MUST return an array.');
             $this->assertNotEmpty($arrayData, 'Location::toArray cannot be empty.');
 
             // Verify coordinates