Skip to content
Snippets Groups Projects
Commit 988da2be authored by Pravin Gaikwad's avatar Pravin Gaikwad
Browse files

Fix phpcs warnings.

parent 7f5fedb2
No related branches found
No related tags found
1 merge request!54Automated Project Update Bot fixes from run 11-188815.
Showing
with 27 additions and 25 deletions
...@@ -11,7 +11,8 @@ php-http/guzzle6-adapter dependency (see issue #3283651). ...@@ -11,7 +11,8 @@ php-http/guzzle6-adapter dependency (see issue #3283651).
### How to seamlessly upgrade to Drupal 10 & Geocoder 4.x ... ### ### 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: Edit composer.json the following way:
``` ```
...@@ -467,9 +468,10 @@ In Geocoder 2.x `\Drupal\geocoder\ProviderPluginManager::getPlugins()` was the ...@@ -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 main way of retrieving the provider plugins. It was returning the plugin
definitions with the provider configuration mixed into it. definitions with the provider configuration mixed into it.
Since Geocdoer 3.x this data model has been replaced by the new `GeocoderProvider` Since Geocdoer 3.x this data model has been replaced by the new
config entity. Now this method returns the list of plugin definitions, making it `GeocoderProvider` config entity. Now this method returns the list of
the same result as calling ProviderPluginManager::getDefinitions(). 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 It is recommended to no longer use this method but instead use one of these
two alternatives: two alternatives:
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* Geocoder Module. * Geocoder Module.
*/ */
declare(strict_types = 1); declare(strict_types=1);
use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\Routing\RouteMatchInterface;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* Post update functions for Geocoder. * Post update functions for Geocoder.
*/ */
declare(strict_types = 1); declare(strict_types=1);
use Drupal\Core\Entity\EntityStorageException; use Drupal\Core\Entity\EntityStorageException;
use Drupal\geocoder\Entity\GeocoderProvider; use Drupal\geocoder\Entity\GeocoderProvider;
......
...@@ -82,7 +82,7 @@ class AddressGeocodeFormatter extends GeocodeFormatter { ...@@ -82,7 +82,7 @@ class AddressGeocodeFormatter extends GeocodeFormatter {
RendererInterface $renderer, RendererInterface $renderer,
LinkGeneratorInterface $link_generator, LinkGeneratorInterface $link_generator,
EntityTypeManagerInterface $entity_type_manager, 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); 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; $this->addressService = $address_service;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* Post update functions for Geocoder Field. * Post update functions for Geocoder Field.
*/ */
declare(strict_types = 1); declare(strict_types=1);
use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldConfig;
......
<?php <?php
declare(strict_types = 1); declare(strict_types=1);
namespace Drupal\geocoder_field\Geocoder\Provider; namespace Drupal\geocoder_field\Geocoder\Provider;
......
<?php <?php
declare(strict_types = 1); declare(strict_types=1);
namespace Drupal\geocoder_field; namespace Drupal\geocoder_field;
...@@ -50,7 +50,7 @@ class GeocoderFieldPluginManager extends DefaultPluginManager { ...@@ -50,7 +50,7 @@ class GeocoderFieldPluginManager extends DefaultPluginManager {
CacheBackendInterface $cache_backend, CacheBackendInterface $cache_backend,
ModuleHandlerInterface $module_handler, ModuleHandlerInterface $module_handler,
PreprocessorPluginManager $preprocessor_plugin_manager, PreprocessorPluginManager $preprocessor_plugin_manager,
EntityFieldManagerInterface $entity_field_manager EntityFieldManagerInterface $entity_field_manager,
) { ) {
parent::__construct('Plugin/Geocoder/Field', $namespaces, $module_handler, GeocoderFieldPluginInterface::class, GeocoderField::class); parent::__construct('Plugin/Geocoder/Field', $namespaces, $module_handler, GeocoderFieldPluginInterface::class, GeocoderField::class);
$this->alterInfo('geocode_field_info'); $this->alterInfo('geocode_field_info');
......
...@@ -92,7 +92,7 @@ class FileGeocodeFormatter extends GeocodeFormatterBase { ...@@ -92,7 +92,7 @@ class FileGeocodeFormatter extends GeocodeFormatterBase {
RendererInterface $renderer, RendererInterface $renderer,
LinkGeneratorInterface $link_generator, LinkGeneratorInterface $link_generator,
EntityTypeManagerInterface $entity_type_manager, EntityTypeManagerInterface $entity_type_manager,
PreprocessorPluginManager $preprocessor_manager PreprocessorPluginManager $preprocessor_manager,
) { ) {
parent::__construct( parent::__construct(
$plugin_id, $plugin_id,
......
<?php <?php
declare(strict_types = 1); declare(strict_types=1);
namespace Drupal\geocoder_field\Plugin\Field; namespace Drupal\geocoder_field\Plugin\Field;
...@@ -121,7 +121,7 @@ abstract class GeocodeFormatterBase extends FormatterBase implements ContainerFa ...@@ -121,7 +121,7 @@ abstract class GeocodeFormatterBase extends FormatterBase implements ContainerFa
DumperPluginManager $dumper_plugin_manager, DumperPluginManager $dumper_plugin_manager,
RendererInterface $renderer, RendererInterface $renderer,
LinkGeneratorInterface $link_generator, 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); parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings);
$this->geocoder = $geocoder; $this->geocoder = $geocoder;
......
...@@ -128,7 +128,7 @@ class DefaultField extends PluginBase implements GeocoderFieldPluginInterface, C ...@@ -128,7 +128,7 @@ class DefaultField extends PluginBase implements GeocoderFieldPluginInterface, C
ProviderPluginManager $provider_plugin_manager, ProviderPluginManager $provider_plugin_manager,
RendererInterface $renderer, RendererInterface $renderer,
LinkGeneratorInterface $link_generator, LinkGeneratorInterface $link_generator,
EntityTypeManagerInterface $entity_type_manager EntityTypeManagerInterface $entity_type_manager,
) { ) {
parent::__construct($configuration, $plugin_id, $plugin_definition); parent::__construct($configuration, $plugin_id, $plugin_definition);
$this->config = $config_factory->get('geocoder.settings'); $this->config = $config_factory->get('geocoder.settings');
......
<?php <?php
declare(strict_types = 1); declare(strict_types=1);
namespace Drupal\geocoder_geofield\Geocoder\Dumper; namespace Drupal\geocoder_geofield\Geocoder\Dumper;
......
<?php <?php
declare(strict_types = 1); declare(strict_types=1);
namespace Drupal\geocoder_geofield\Geocoder\Provider; namespace Drupal\geocoder_geofield\Geocoder\Provider;
......
...@@ -77,7 +77,7 @@ abstract class GeoPhpGeocodeFormatter extends FileGeocodeFormatter { ...@@ -77,7 +77,7 @@ abstract class GeoPhpGeocodeFormatter extends FileGeocodeFormatter {
LinkGeneratorInterface $link_generator, LinkGeneratorInterface $link_generator,
EntityTypeManagerInterface $entity_type_manager, EntityTypeManagerInterface $entity_type_manager,
PreprocessorPluginManager $preprocessor_manager, PreprocessorPluginManager $preprocessor_manager,
GeoPHPInterface $geophp_wrapper GeoPHPInterface $geophp_wrapper,
) { ) {
parent::__construct( parent::__construct(
$plugin_id, $plugin_id,
......
...@@ -82,7 +82,7 @@ class ReverseGeocodeGeofieldFormatter extends GeocodeFormatter { ...@@ -82,7 +82,7 @@ class ReverseGeocodeGeofieldFormatter extends GeocodeFormatter {
RendererInterface $renderer, RendererInterface $renderer,
LinkGeneratorInterface $link_generator, LinkGeneratorInterface $link_generator,
EntityTypeManagerInterface $entity_type_manager, EntityTypeManagerInterface $entity_type_manager,
GeoPHPInterface $geophp_wrapper GeoPHPInterface $geophp_wrapper,
) { ) {
parent::__construct( parent::__construct(
$plugin_id, $plugin_id,
......
<?php <?php
declare(strict_types = 1); declare(strict_types=1);
namespace Drupal\geocoder; namespace Drupal\geocoder;
......
<?php <?php
declare(strict_types = 1); declare(strict_types=1);
namespace Drupal\geocoder; namespace Drupal\geocoder;
......
...@@ -206,7 +206,7 @@ class GeocoderApiEnpoints extends ControllerBase { ...@@ -206,7 +206,7 @@ class GeocoderApiEnpoints extends ControllerBase {
EntityTypeManagerInterface $entity_type_manager, EntityTypeManagerInterface $entity_type_manager,
Geocoder $geocoder, Geocoder $geocoder,
DumperPluginManager $dumper_plugin_manager, DumperPluginManager $dumper_plugin_manager,
FormatterPluginManager $geocoder_formatter_plugin_manager FormatterPluginManager $geocoder_formatter_plugin_manager,
) { ) {
$this->config = $config_factory->get('geocoder.settings'); $this->config = $config_factory->get('geocoder.settings');
$this->entityTypeManager = $entity_type_manager; $this->entityTypeManager = $entity_type_manager;
......
<?php <?php
declare(strict_types = 1); declare(strict_types=1);
namespace Drupal\geocoder\Entity; namespace Drupal\geocoder\Entity;
......
<?php <?php
declare(strict_types = 1); declare(strict_types=1);
namespace Drupal\geocoder\Form; namespace Drupal\geocoder\Form;
......
<?php <?php
declare(strict_types = 1); declare(strict_types=1);
namespace Drupal\geocoder\Form; namespace Drupal\geocoder\Form;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment