Merge branch 'master' into feature/geonames-premium-support

Author: AronNovak

.github/workflows/component.yml

@@ -29,7 +29,7 @@ jobs:
     name: PHP ${{ matrix.php-version }} / ${{ matrix.component }}
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Use PHP ${{ matrix.php-version }}
       uses: shivammathur/setup-php@v2

.github/workflows/dependency-review.yml

@@ -15,6 +15,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@v4

.github/workflows/php.yml

@@ -16,7 +16,7 @@ jobs:
         deps: ['low', 'high']
     name: PHP ${{ matrix.php-version }} (${{ matrix.deps }})
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Use PHP ${{ matrix.php-version }}
       uses: shivammathur/setup-php@v2
       with:
@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-latest
     name: PHPStan
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Use PHP 8.3
       uses: shivammathur/setup-php@v2
       with:
@@ -55,7 +55,7 @@ jobs:
     runs-on: ubuntu-latest
     name: PHP CS Fixer
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Use PHP 8.3
       uses: shivammathur/setup-php@v2
       with:

.github/workflows/provider.yml

@@ -52,7 +52,7 @@ jobs:
           - TomTom
           - Yandex
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Use PHP ${{ matrix.php-version }}
       uses: shivammathur/setup-php@v2
       with:

.github/workflows/subtree.yml

@@ -25,7 +25,7 @@ jobs:
           app-id: ${{ vars.SUBTREE_APP_ID }}
           private-key: ${{ secrets.SUBTREE_APP_PRIVATE_KEY }}
           owner: ${{ github.repository_owner }}
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           token: ${{ steps.app-token.outputs.token }}
           fetch-depth: 0
@@ -45,7 +45,7 @@ jobs:
           app-id: ${{ vars.SUBTREE_APP_ID }}
           private-key: ${{ secrets.SUBTREE_APP_PRIVATE_KEY }}
           owner: ${{ github.repository_owner }}
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           token: ${{ steps.app-token.outputs.token }}
           fetch-depth: 0
@@ -65,7 +65,7 @@ jobs:
           app-id: ${{ vars.SUBTREE_APP_ID }}
           private-key: ${{ secrets.SUBTREE_APP_PRIVATE_KEY }}
           owner: ${{ github.repository_owner }}
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           token: ${{ steps.app-token.outputs.token }}
           fetch-depth: 0
@@ -126,7 +126,7 @@ jobs:
           app-id: ${{ vars.SUBTREE_APP_ID }}
           private-key: ${{ secrets.SUBTREE_APP_PRIVATE_KEY }}
           owner: ${{ github.repository_owner }}
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           token: ${{ steps.app-token.outputs.token }}
           fetch-depth: 0

src/Common/Dumper/Gpx.php

@@ -31,15 +31,13 @@ public function dump(Location $location): string
     xmlns="http://www.topografix.com/GPX/1/0"
     xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd">
 
-GPX
-            , Geocoder::VERSION);
+GPX, Geocoder::VERSION);
 
         if (null !== $bounds = $location->getBounds()) {
             $gpx .= sprintf(<<<'GPX'
     <bounds minlat="%f" minlon="%f" maxlat="%f" maxlon="%f"/>
 
-GPX
-                , $bounds->getWest(), $bounds->getSouth(), $bounds->getEast(), $bounds->getNorth());
+GPX, $bounds->getWest(), $bounds->getSouth(), $bounds->getEast(), $bounds->getNorth());
         }
 
         $lat = null;
@@ -55,8 +53,7 @@ public function dump(Location $location): string
         <type><![CDATA[Address]]></type>
     </wpt>
 
-GPX
-            , $lat, $lon, $this->formatName($location));
+GPX, $lat, $lon, $this->formatName($location));
 
         $gpx .= <<<'GPX'
 </gpx>

src/Common/Tests/Dumper/GpxTest.php

@@ -48,8 +48,7 @@ public function testDump(): void
         <type><![CDATA[Address]]></type>
     </wpt>
 </gpx>
-GPX
-            , Geocoder::VERSION, '0', '0');
+GPX, Geocoder::VERSION, '0', '0');
 
         $result = $this->dumper->dump($address);
 
@@ -77,8 +76,7 @@ public function testDumpWithData(): void
         <type><![CDATA[Address]]></type>
     </wpt>
 </gpx>
-GPX
-            , Geocoder::VERSION, $address->getCoordinates()->getLatitude(), $address->getCoordinates()->getLongitude());
+GPX, Geocoder::VERSION, $address->getCoordinates()->getLatitude(), $address->getCoordinates()->getLongitude());
 
         $result = $this->dumper->dump($address);
 
@@ -114,8 +112,7 @@ public function testDumpWithBounds(): void
         <type><![CDATA[Address]]></type>
     </wpt>
 </gpx>
-GPX
-            , Geocoder::VERSION, $bounds['east'], '48.863151', $bounds['east'], '48.863151', $bounds['north'], $bounds['west']);
+GPX, Geocoder::VERSION, $bounds['east'], '48.863151', $bounds['east'], '48.863151', $bounds['north'], $bounds['west']);
 
         $this->assertNotNull($address->getBounds());
 
@@ -159,8 +156,7 @@ public function testDumpWithName(): void
         <type><![CDATA[Address]]></type>
     </wpt>
 </gpx>
-GPX
-            , Geocoder::VERSION, $bounds['east'], '48.863151', $bounds['east'], '48.863151', $bounds['north'], $bounds['west']);
+GPX, Geocoder::VERSION, $bounds['east'], '48.863151', $bounds['east'], '48.863151', $bounds['north'], $bounds['west']);
 
         $this->assertNotNull($address->getBounds());