Merge branch 'master' into patch-1

Author: Chris53897

.editorconfig

@@ -8,5 +8,18 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{yml,yaml}]
+[.github/**/*.{yml,yaml}]
 indent_size = 2
+
+[*.{yml,yaml}]
+trim_trailing_whitespace = false
+
+[**.md]
+indent_size = unset
+indent_style = unset
+
+[*.json]
+insert_final_newline = false
+
+[*.{neon,neon.dist}]
+indent_style = tab

.github/workflows/ci.yml

@@ -62,21 +62,15 @@ jobs:
       max-parallel: 10
       fail-fast: false
       matrix:
-        php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
-        sf_version: [ '5.4.*', '6.4.*', '7.2.*', '7.3.*' ]
+        php: [ '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
+        sf_version: [ '6.4.*', '7.2.*', '7.3.*' ]
         exclude:
-          - php: '7.4'
-            sf_version: '6.4.*'
           - php: '8.0'
             sf_version: '6.4.*'
-          - php: '7.4'
-            sf_version: '7.2.*'
           - php: '8.0'
             sf_version: '7.2.*'
           - php: '8.1'
             sf_version: '7.2.*'
-          - php: '7.4'
-            sf_version: '7.3.*'
           - php: '8.0'
             sf_version: '7.3.*'
           - php: '8.1'

.gitignore

@@ -1,5 +1,6 @@
 composer.lock
 phpunit.xml
+/config/reference.php
 vendor/
 .php-cs-fixer.cache
 .phpunit.result.cache

.php-cs-fixer.php

@@ -9,6 +9,7 @@
     ->setRules([
         '@Symfony' => true,
         'no_superfluous_phpdoc_tags' => false,
+        'phpdoc_to_comment' => ['ignored_tags' => ['var']], // phpstan errors pops up without this
     ])
     ->setFinder($finder)
 ;

composer.json

@@ -14,19 +14,17 @@
     }
   ],
   "require": {
-    "php": "^7.4 || ^8.0",
+    "php": "^8.1",
     "geocoder-php/plugin": "^1.5",
-    "php-http/curl-client": "^2.3",
     "php-http/discovery": "^1.14",
     "symfony/console": "^5.4 || ^6.4 || ^7.0",
     "symfony/framework-bundle": "^5.4 || ^6.4 || ^7.0",
     "symfony/options-resolver": "^5.4 || ^6.4 || ^7.0",
     "willdurand/geocoder": "^4.6|^5.0"
   },
   "require-dev": {
-    "doctrine/annotations": "^1.11.1 || ^2.0",
     "doctrine/doctrine-bundle": "^2.3",
-    "doctrine/orm": "^2.8 || ^3.0",
+    "doctrine/orm": "^2.20 || ^3.0",
     "fakerphp/faker": "^1.20",
     "friendsofphp/php-cs-fixer": "^3.13",
     "geocoder-php/algolia-places-provider": "^0.4",
@@ -62,21 +60,17 @@
     "nyholm/nsa": "^1.3",
     "nyholm/psr7": "^1.5",
     "nyholm/symfony-bundle-test": "^2.0 || ^3.0",
-    "php-http/message": "^1.13",
-    "php-http/mock-client": "^1.6",
     "phpstan/phpstan": "^1.9.2",
     "psr/http-client": "^1.0",
     "psr/simple-cache": "^1.0 || ^2.0",
     "symfony/cache": "^5.4 || ^6.4 || ^7.0",
     "symfony/config": "^5.4 || ^6.4 || ^7.0",
+    "symfony/http-client": "^5.4 || ^6.4 || ^7.0",
     "symfony/phpunit-bridge": "^5.4 || ^6.4 || ^7.0",
     "symfony/validator": "^5.4 || ^6.4 || ^7.0",
     "symfony/var-exporter": "^5.4 || ^6.4 || ^7.0",
     "symfony/yaml": "^5.4 || ^6.4 || ^7.0"
   },
-  "conflict": {
-    "geocoder-php/nominatim-provider": "<5.0"
-  },
   "autoload": {
     "psr-4": {
       "Bazinga\\GeocoderBundle\\": "src/"
@@ -88,7 +82,7 @@
     }
   },
   "scripts": {
-    "test": "vendor/bin/simple-phpunit --testsuite main"
+    "test": "SYMFONY_DEPRECATIONS_HELPER=ignoreFile='./tests/baseline-ignore' vendor/bin/simple-phpunit --testsuite main"
   },
   "config": {
     "allow-plugins": {
@@ -101,7 +95,7 @@
   "prefer-stable": true,
   "extra": {
     "branch-alias": {
-      "dev-master": "5.0-dev"
+      "dev-master": "6.0-dev"
     }
   }
 }

config/profiling.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Bazinga\GeocoderBundle\DataCollector\GeocoderDataCollector;
+
+return static function (ContainerConfigurator $container) {
+    $services = $container->services();
+
+    $services->set(GeocoderDataCollector::class)
+        ->tag('data_collector', ['template' => '@BazingaGeocoder/Collector/geocoder.html.twig', 'id' => 'geocoder']);
+};

config/profiling.yml

@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Bazinga\GeocoderBundle\Command\GeocodeCommand;
+use Bazinga\GeocoderBundle\Plugin\FakeIpPlugin;
+use Bazinga\GeocoderBundle\Validator\Constraint\AddressValidator;
+use Geocoder\Dumper\Dumper;
+use Geocoder\Dumper\GeoArray;
+use Geocoder\Dumper\GeoJson;
+use Geocoder\Dumper\Gpx;
+use Geocoder\Dumper\Kml;
+use Geocoder\Dumper\Wkb;
+use Geocoder\Dumper\Wkt;
+use Geocoder\ProviderAggregator;
+
+return static function (ContainerConfigurator $container) {
+    $services = $container->services();
+    $services->instanceof(Dumper::class)
+        ->public();
+
+    $services
+        ->set(GeoArray::class)
+        ->set(GeoJson::class)
+        ->set(Gpx::class)
+        ->set(Kml::class)
+        ->set(Wkb::class)
+        ->set(Wkt::class)
+
+        ->load('Bazinga\\GeocoderBundle\\ProviderFactory\\', __DIR__.'/../src/ProviderFactory')
+            ->autowire()
+            ->autoconfigure()
+
+        ->set(ProviderAggregator::class)
+
+        ->set(FakeIpPlugin::class)
+            ->args([null, null, false])
+
+        ->set(GeocodeCommand::class)
+            ->args([
+                service(ProviderAggregator::class),
+            ])
+            ->tag('console.command')
+
+        ->set(AddressValidator::class)
+            ->args([
+                service(ProviderAggregator::class),
+            ])
+            ->tag('validator.constraint_validator')
+    ;
+};

config/services.php

@@ -10,26 +10,18 @@ First of all, update your entity:
 
 ```php
 
-use Bazinga\GeocoderBundle\Mapping\Annotations as Geocoder;
+use Bazinga\GeocoderBundle\Mapping\Attributes as Geocoder;
 
-/**
- * @Geocoder\Geocodeable
- */
+#[Geocoder\Geocodeable()]
 class User
 {
-    /**
-     * @Geocoder\Address
-     */
+    #[Geocoder\Address()]
     private $address;
 
-    /**
-     * @Geocoder\Latitude
-     */
+    #[Geocoder\Latitude()]
     private $latitude;
 
-    /**
-     * @Geocoder\Longitude
-     */
+    #[Geocoder\Longitude()]
     private $longitude;
 }
 ```
@@ -38,47 +30,36 @@ Instead of annotating a property, you can also annotate a getter:
 
 ```php
 
-use Bazinga\GeocoderBundle\Mapping\Annotations as Geocoder;
+use Bazinga\GeocoderBundle\Mapping\Attributes as Geocoder;
 
-/**
- * @Geocoder\Geocodeable
- */
+#[Geocoder\Geocodeable()]
 class User
 {
-    /**
-     * @Geocoder\Latitude
-     */
+    #[Geocoder\Latitude()]
     private $latitude;
 
-    /**
-     * @Geocoder\Longitude
-     */
+    #[Geocoder\Longitude()]
     private $longitude;
 
-    /**
-     * @Geocoder\Address
-     */
+    #[Geocoder\Address()]
     public function getAddress(): string
     {
         // Your code...
     }
 }
 ```
 
-Secondly, register the Doctrine event listener and its dependencies in your `config/services.yaml` file.
+Secondly, register the Doctrine event listener and its dependencies in your `config/services.yaml` or `config/services.php` file.
 You have to indicate which provider to use to reverse geocode the address. Here we use `acme` provider we declared in bazinga_geocoder configuration earlier.
 
 ```yaml
-    Bazinga\GeocoderBundle\Mapping\Driver\AnnotationDriver:
-        class: Bazinga\GeocoderBundle\Mapping\Driver\AnnotationDriver
-        arguments:
-            - '@annotations.reader'
+    Bazinga\GeocoderBundle\Mapping\Driver\AttributeDriver: ~
 
     Bazinga\GeocoderBundle\Doctrine\ORM\GeocoderListener:
         class: Bazinga\GeocoderBundle\Doctrine\ORM\GeocoderListener
         arguments:
             - '@bazinga_geocoder.provider.acme'
-            - '@Bazinga\GeocoderBundle\Mapping\Driver\AnnotationDriver'
+            - '@Bazinga\GeocoderBundle\Mapping\Driver\AttributeDriver'
         tags:
             - { name: doctrine.event_listener, event: onFlush }
 ```
@@ -96,40 +77,3 @@ $em->flush();
 echo $user->getLatitude(); // will output 52.516325
 echo $user->getLongitude(); // will output 13.377264
 ```
-
-## PHP 8
-
-If you are using PHP 8, you can use [Attributes](https://www.php.net/manual/en/language.attributes.overview.php) in your entity:
-
-```php
-
-use Bazinga\GeocoderBundle\Mapping\Annotations as Geocoder;
-
-#[Geocoder\Geocodeable()]
-class User
-{
-    #[Geocoder\Address()]
-    private $address;
-
-    #[Geocoder\Latitude()]
-    private $latitude;
-
-    #[Geocoder\Longitude()]
-    private $longitude;
-}
-```
-
-Then update your service configuration to register the `AttributeDriver`:
-
-```yaml
-    Bazinga\GeocoderBundle\Mapping\Driver\AttributeDriver:
-        class: Bazinga\GeocoderBundle\Mapping\Driver\AttributeDriver
-
-    Bazinga\GeocoderBundle\Doctrine\ORM\GeocoderListener:
-        class: Bazinga\GeocoderBundle\Doctrine\ORM\GeocoderListener
-        arguments:
-            - '@bazinga_geocoder.provider.acme'
-            - '@Bazinga\GeocoderBundle\Mapping\Driver\AttributeDriver'
-        tags:
-            - { name: doctrine.event_listener, event: onFlush }
-```