diff --git a/README.md b/README.md
index 1dce76295b1ba59407afc98ee7c6f4068210d761..ecc734c1daa09ba3cc7e8f9778abbd5a172a65ed 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,8 @@ php-http/guzzle6-adapter dependency (see issue #3283651).
 
 ### How to seamlessly upgrade to Drupal 10 & Geocoder 4.x ... ###
 
-When preparing for an upgrade to Drupal 10 we recommend that you widen your composer version constraints to allow either 3.x or 4.x.
+When preparing for an upgrade to Drupal 10 we recommend that you widen
+your composer version constraints to allow either 3.x or 4.x.
 Edit composer.json the following way:
 
 ```
@@ -467,9 +468,10 @@ In Geocoder 2.x `\Drupal\geocoder\ProviderPluginManager::getPlugins()` was the
 main way of retrieving the provider plugins. It was returning the plugin
 definitions with the provider configuration mixed into it.
 
-Since Geocdoer 3.x this data model has been replaced by the new `GeocoderProvider`
-config entity. Now this method returns the list of plugin definitions, making it
-the same result as calling ProviderPluginManager::getDefinitions().
+Since Geocdoer 3.x this data model has been replaced by the new
+`GeocoderProvider` config entity. Now this method returns the list of
+plugin definitions, making it the same result as
+calling ProviderPluginManager::getDefinitions().
 
 It is recommended to no longer use this method but instead use one of these
 two alternatives:
diff --git a/geocoder.module b/geocoder.module
index 087dabe570822363995e6504a3365568bd85119e..de28a88fb3603b4c10a8cd47f45c729cf85755f8 100644
--- a/geocoder.module
+++ b/geocoder.module
@@ -5,7 +5,7 @@
  * Geocoder Module.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 use Drupal\Core\Routing\RouteMatchInterface;
 
diff --git a/geocoder.post_update.php b/geocoder.post_update.php
index 54e49e9683de0c907175b1b71872d906b2780561..d3baad7b67e0ec5804cd3ea4d7158094913ac2fc 100644
--- a/geocoder.post_update.php
+++ b/geocoder.post_update.php
@@ -5,7 +5,7 @@
  * Post update functions for Geocoder.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 use Drupal\Core\Entity\EntityStorageException;
 use Drupal\geocoder\Entity\GeocoderProvider;
diff --git a/modules/geocoder_address/src/Plugin/Field/FieldFormatter/AddressGeocodeFormatter.php b/modules/geocoder_address/src/Plugin/Field/FieldFormatter/AddressGeocodeFormatter.php
index e9d9d813008e95be25b8cb1e9a44393dea41c8ef..8cde782ec43435107d867468ee7bf7247cdd7157 100644
--- a/modules/geocoder_address/src/Plugin/Field/FieldFormatter/AddressGeocodeFormatter.php
+++ b/modules/geocoder_address/src/Plugin/Field/FieldFormatter/AddressGeocodeFormatter.php
@@ -82,7 +82,7 @@ class AddressGeocodeFormatter extends GeocodeFormatter {
     RendererInterface $renderer,
     LinkGeneratorInterface $link_generator,
     EntityTypeManagerInterface $entity_type_manager,
-    AddressService $address_service
+    AddressService $address_service,
   ) {
     parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings, $geocoder, $provider_plugin_manager, $dumper_plugin_manager, $renderer, $link_generator, $entity_type_manager);
     $this->addressService = $address_service;
diff --git a/modules/geocoder_field/geocoder_field.post_update.php b/modules/geocoder_field/geocoder_field.post_update.php
index 1b6fc049e320f9f77d5541a7ecd4dd1e84a63c87..0204958f3c8dcdd78eff7d6932e69e1f0c409bfe 100644
--- a/modules/geocoder_field/geocoder_field.post_update.php
+++ b/modules/geocoder_field/geocoder_field.post_update.php
@@ -5,7 +5,7 @@
  * Post update functions for Geocoder Field.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 use Drupal\field\Entity\FieldConfig;
 
diff --git a/modules/geocoder_field/src/Geocoder/Provider/File.php b/modules/geocoder_field/src/Geocoder/Provider/File.php
index 84c27e96c6838a6ec590a1e99d69c4ab8280ec2d..df66d55fb5686c9f0acd504a12283fb7860c7239 100644
--- a/modules/geocoder_field/src/Geocoder/Provider/File.php
+++ b/modules/geocoder_field/src/Geocoder/Provider/File.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\geocoder_field\Geocoder\Provider;
 
diff --git a/modules/geocoder_field/src/GeocoderFieldPluginManager.php b/modules/geocoder_field/src/GeocoderFieldPluginManager.php
index 7dfd93245cec8591f68c1cf0e0f20a1d06c032e5..f76f9a1b9383105969fc209d19b753d05b78fa26 100644
--- a/modules/geocoder_field/src/GeocoderFieldPluginManager.php
+++ b/modules/geocoder_field/src/GeocoderFieldPluginManager.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\geocoder_field;
 
@@ -50,7 +50,7 @@ class GeocoderFieldPluginManager extends DefaultPluginManager {
     CacheBackendInterface $cache_backend,
     ModuleHandlerInterface $module_handler,
     PreprocessorPluginManager $preprocessor_plugin_manager,
-    EntityFieldManagerInterface $entity_field_manager
+    EntityFieldManagerInterface $entity_field_manager,
   ) {
     parent::__construct('Plugin/Geocoder/Field', $namespaces, $module_handler, GeocoderFieldPluginInterface::class, GeocoderField::class);
     $this->alterInfo('geocode_field_info');
diff --git a/modules/geocoder_field/src/Plugin/Field/FieldFormatter/FileGeocodeFormatter.php b/modules/geocoder_field/src/Plugin/Field/FieldFormatter/FileGeocodeFormatter.php
index fb4ea8cc7c3cbd27b2513a8687c4e1d1ecf4c0da..e403c4f6ffb92721afdd1ec2f8e1bb445cce5216 100644
--- a/modules/geocoder_field/src/Plugin/Field/FieldFormatter/FileGeocodeFormatter.php
+++ b/modules/geocoder_field/src/Plugin/Field/FieldFormatter/FileGeocodeFormatter.php
@@ -92,7 +92,7 @@ class FileGeocodeFormatter extends GeocodeFormatterBase {
     RendererInterface $renderer,
     LinkGeneratorInterface $link_generator,
     EntityTypeManagerInterface $entity_type_manager,
-    PreprocessorPluginManager $preprocessor_manager
+    PreprocessorPluginManager $preprocessor_manager,
   ) {
     parent::__construct(
       $plugin_id,
diff --git a/modules/geocoder_field/src/Plugin/Field/GeocodeFormatterBase.php b/modules/geocoder_field/src/Plugin/Field/GeocodeFormatterBase.php
index 7fae6ca1fb14861767c9e7ef3d5489599ce3fb0a..abd120d481e550bb5a2d3b002f5b6934fa4a3262 100644
--- a/modules/geocoder_field/src/Plugin/Field/GeocodeFormatterBase.php
+++ b/modules/geocoder_field/src/Plugin/Field/GeocodeFormatterBase.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\geocoder_field\Plugin\Field;
 
@@ -121,7 +121,7 @@ abstract class GeocodeFormatterBase extends FormatterBase implements ContainerFa
     DumperPluginManager $dumper_plugin_manager,
     RendererInterface $renderer,
     LinkGeneratorInterface $link_generator,
-    EntityTypeManagerInterface $entity_type_manager
+    EntityTypeManagerInterface $entity_type_manager,
   ) {
     parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings);
     $this->geocoder = $geocoder;
diff --git a/modules/geocoder_field/src/Plugin/Geocoder/Field/DefaultField.php b/modules/geocoder_field/src/Plugin/Geocoder/Field/DefaultField.php
index ba3c21c5f0ae21ec545c93250f452c063a933b92..5aa9eec9c0c092d2b3f90e9ee8627724aed7755f 100644
--- a/modules/geocoder_field/src/Plugin/Geocoder/Field/DefaultField.php
+++ b/modules/geocoder_field/src/Plugin/Geocoder/Field/DefaultField.php
@@ -128,7 +128,7 @@ class DefaultField extends PluginBase implements GeocoderFieldPluginInterface, C
     ProviderPluginManager $provider_plugin_manager,
     RendererInterface $renderer,
     LinkGeneratorInterface $link_generator,
-    EntityTypeManagerInterface $entity_type_manager
+    EntityTypeManagerInterface $entity_type_manager,
   ) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->config = $config_factory->get('geocoder.settings');
diff --git a/modules/geocoder_geofield/src/Geocoder/Dumper/Geometry.php b/modules/geocoder_geofield/src/Geocoder/Dumper/Geometry.php
index f30f256d5992993b04a079eebc80452d61cc1256..e53487d43929e12ec69f727fbf44c85a446e1789 100644
--- a/modules/geocoder_geofield/src/Geocoder/Dumper/Geometry.php
+++ b/modules/geocoder_geofield/src/Geocoder/Dumper/Geometry.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\geocoder_geofield\Geocoder\Dumper;
 
diff --git a/modules/geocoder_geofield/src/Geocoder/Provider/GeometryProviderInterface.php b/modules/geocoder_geofield/src/Geocoder/Provider/GeometryProviderInterface.php
index e9c09aa7028eace9f89040ba58eeb56a47d30054..6117c39122f87e5f28f061745a882b9b7159a602 100644
--- a/modules/geocoder_geofield/src/Geocoder/Provider/GeometryProviderInterface.php
+++ b/modules/geocoder_geofield/src/Geocoder/Provider/GeometryProviderInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\geocoder_geofield\Geocoder\Provider;
 
diff --git a/modules/geocoder_geofield/src/Plugin/Field/FieldFormatter/GeoPhpGeocodeFormatter.php b/modules/geocoder_geofield/src/Plugin/Field/FieldFormatter/GeoPhpGeocodeFormatter.php
index 4ed606049fcfe105e112c385374b9d9df67a21db..5586f3fb759b5ae84ff37fca985c8c8f0ac76396 100644
--- a/modules/geocoder_geofield/src/Plugin/Field/FieldFormatter/GeoPhpGeocodeFormatter.php
+++ b/modules/geocoder_geofield/src/Plugin/Field/FieldFormatter/GeoPhpGeocodeFormatter.php
@@ -77,7 +77,7 @@ abstract class GeoPhpGeocodeFormatter extends FileGeocodeFormatter {
     LinkGeneratorInterface $link_generator,
     EntityTypeManagerInterface $entity_type_manager,
     PreprocessorPluginManager $preprocessor_manager,
-    GeoPHPInterface $geophp_wrapper
+    GeoPHPInterface $geophp_wrapper,
   ) {
     parent::__construct(
       $plugin_id,
diff --git a/modules/geocoder_geofield/src/Plugin/Field/FieldFormatter/ReverseGeocodeGeofieldFormatter.php b/modules/geocoder_geofield/src/Plugin/Field/FieldFormatter/ReverseGeocodeGeofieldFormatter.php
index 8fc5a17a0801433961d5ee0abee499b86d9ea337..a9764869b9b3ca8f701e85604ab851677ad73ad9 100644
--- a/modules/geocoder_geofield/src/Plugin/Field/FieldFormatter/ReverseGeocodeGeofieldFormatter.php
+++ b/modules/geocoder_geofield/src/Plugin/Field/FieldFormatter/ReverseGeocodeGeofieldFormatter.php
@@ -82,7 +82,7 @@ class ReverseGeocodeGeofieldFormatter extends GeocodeFormatter {
     RendererInterface $renderer,
     LinkGeneratorInterface $link_generator,
     EntityTypeManagerInterface $entity_type_manager,
-    GeoPHPInterface $geophp_wrapper
+    GeoPHPInterface $geophp_wrapper,
   ) {
     parent::__construct(
       $plugin_id,
diff --git a/src/ConfigurableProviderUsingHandlerBase.php b/src/ConfigurableProviderUsingHandlerBase.php
index 3b37d3ed4ee6c01b0dbd907b68277cdac0111ce8..ede49ca7fe31a3089d685fad79727783dc2f530d 100644
--- a/src/ConfigurableProviderUsingHandlerBase.php
+++ b/src/ConfigurableProviderUsingHandlerBase.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\geocoder;
 
diff --git a/src/ConfigurableProviderUsingHandlerWithAdapterBase.php b/src/ConfigurableProviderUsingHandlerWithAdapterBase.php
index 71c9345cba1c8d3a5ca67e92ea64b0be8d6565d5..526a39e25f93597f5e52647199b081f1f8397000 100644
--- a/src/ConfigurableProviderUsingHandlerWithAdapterBase.php
+++ b/src/ConfigurableProviderUsingHandlerWithAdapterBase.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\geocoder;
 
diff --git a/src/Controller/GeocoderApiEnpoints.php b/src/Controller/GeocoderApiEnpoints.php
index c7c910eaeafe3c9cdbcb6b442835bfc9eefabf81..81d39c3c727847c3d4ab392ebc81a8ff5f165ccf 100644
--- a/src/Controller/GeocoderApiEnpoints.php
+++ b/src/Controller/GeocoderApiEnpoints.php
@@ -206,7 +206,7 @@ class GeocoderApiEnpoints extends ControllerBase {
     EntityTypeManagerInterface $entity_type_manager,
     Geocoder $geocoder,
     DumperPluginManager $dumper_plugin_manager,
-    FormatterPluginManager $geocoder_formatter_plugin_manager
+    FormatterPluginManager $geocoder_formatter_plugin_manager,
   ) {
     $this->config = $config_factory->get('geocoder.settings');
     $this->entityTypeManager = $entity_type_manager;
diff --git a/src/Entity/GeocoderProvider.php b/src/Entity/GeocoderProvider.php
index e0601eaa338f93b7a825628e0f0d54369ac58136..7fd8aea286d80be49a3541a066ddac608166eaff 100644
--- a/src/Entity/GeocoderProvider.php
+++ b/src/Entity/GeocoderProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\geocoder\Entity;
 
diff --git a/src/Form/GeocoderProviderAddForm.php b/src/Form/GeocoderProviderAddForm.php
index e05730372012b57bdb124ce89c502fc8df8c0c0d..34fad554731eca095baa85c1f5ed146624ba0bd7 100644
--- a/src/Form/GeocoderProviderAddForm.php
+++ b/src/Form/GeocoderProviderAddForm.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\geocoder\Form;
 
diff --git a/src/Form/GeocoderProviderCreationForm.php b/src/Form/GeocoderProviderCreationForm.php
index f31fcd60477d7b65a418f535ce9dc6d97f996181..a8d232bd21c9e54091ce9fbd6b526f6d2f1a25af 100644
--- a/src/Form/GeocoderProviderCreationForm.php
+++ b/src/Form/GeocoderProviderCreationForm.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\geocoder\Form;
 
diff --git a/src/Form/GeocoderProviderEditForm.php b/src/Form/GeocoderProviderEditForm.php
index af5223b76daf144f7906fad136a8595dd89eb673..2420e42beb34e7c04ead55e4d68f7f4cc2704fcf 100644
--- a/src/Form/GeocoderProviderEditForm.php
+++ b/src/Form/GeocoderProviderEditForm.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\geocoder\Form;
 
diff --git a/src/Form/GeocoderProviderFormBase.php b/src/Form/GeocoderProviderFormBase.php
index bc399a94d9f923be7787311a0f5a56fdc8552c3b..cfca7711db5c8721e91e1fc80bb710920ef1bff1 100644
--- a/src/Form/GeocoderProviderFormBase.php
+++ b/src/Form/GeocoderProviderFormBase.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\geocoder\Form;
 
diff --git a/src/Geocoder.php b/src/Geocoder.php
index 8bd4a7e03b29e0eb56096d57e9f6e3c0f3c1ce6f..b9fa8d70b2b20b68496252460dd87f6070211d8f 100644
--- a/src/Geocoder.php
+++ b/src/Geocoder.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\geocoder;
 
diff --git a/src/GeocoderProviderInterface.php b/src/GeocoderProviderInterface.php
index bf41da2dcde2341c2bdb93df2940ffefe267aab7..814e92b4e3c808a3de30e973772c88edd9b8b956 100644
--- a/src/GeocoderProviderInterface.php
+++ b/src/GeocoderProviderInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\geocoder;
 
diff --git a/src/GeocoderProviderListBuilder.php b/src/GeocoderProviderListBuilder.php
index eeddafd690bd2be7a1be02dc05acc482764fb613..97056a75576f8d3dcdd2ab24e826c4c6e03d5d52 100644
--- a/src/GeocoderProviderListBuilder.php
+++ b/src/GeocoderProviderListBuilder.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\geocoder;
 
diff --git a/src/Plugin/Geocoder/Dumper/AddressText.php b/src/Plugin/Geocoder/Dumper/AddressText.php
index dd3672d2646b95e21927078c7dbbbb8230288e05..23c5605df97a964989893f67f42f9aa4b84ed4bd 100644
--- a/src/Plugin/Geocoder/Dumper/AddressText.php
+++ b/src/Plugin/Geocoder/Dumper/AddressText.php
@@ -49,7 +49,7 @@ class AddressText extends DumperBase {
     array $configuration,
     $plugin_id,
     $plugin_definition,
-    FormatterPluginManager $geocoder_formatter_plugin_manager
+    FormatterPluginManager $geocoder_formatter_plugin_manager,
   ) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->geocoderFormatterPluginManager = $geocoder_formatter_plugin_manager;
diff --git a/src/Plugin/GeocoderProviderPluginCollection.php b/src/Plugin/GeocoderProviderPluginCollection.php
index 15aa51ff554311255070ce9ee41bdd783a0c01af..feb26e236dceca3f76307f3c6d5fcea070190a10 100644
--- a/src/Plugin/GeocoderProviderPluginCollection.php
+++ b/src/Plugin/GeocoderProviderPluginCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\geocoder\Plugin;
 
diff --git a/src/ProviderPluginManager.php b/src/ProviderPluginManager.php
index 76a3f83d3f6c10fc85e0db601f36442d2d4ed225..eca1810ad1ea9de867e57f3ce662ece06294da32 100644
--- a/src/ProviderPluginManager.php
+++ b/src/ProviderPluginManager.php
@@ -2,12 +2,12 @@
 
 namespace Drupal\geocoder;
 
+use Drupal\Component\Serialization\Yaml;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Render\RendererInterface;
-use Drupal\Component\Serialization\Yaml;
 use Drupal\Core\StringTranslation\PluralTranslatableMarkup;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\StringTranslation\TranslationInterface;
@@ -79,7 +79,7 @@ class ProviderPluginManager extends GeocoderPluginManagerBase {
     RendererInterface $renderer,
     LinkGeneratorInterface $link_generator,
     EntityTypeManagerInterface $entity_type_manager,
-    MessengerInterface $messenger
+    MessengerInterface $messenger,
   ) {
     parent::__construct('Plugin/Geocoder/Provider', $namespaces, $module_handler, ProviderInterface::class, GeocoderProvider::class);
     $this->alterInfo('geocoder_provider_info');
diff --git a/src/Traits/ConfigurableProviderTrait.php b/src/Traits/ConfigurableProviderTrait.php
index feec640524cd347c1ac075a45a44ab5221ecd332..df833f544fd6f0f1131f97eda49682fb95bc6bb7 100644
--- a/src/Traits/ConfigurableProviderTrait.php
+++ b/src/Traits/ConfigurableProviderTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\geocoder\Traits;