diff --git a/modules/parameters_ui/src/Controller/ParametersUiController.php b/modules/parameters_ui/src/Controller/ParametersUiController.php index 8392851..6763d7a 100644 --- a/modules/parameters_ui/src/Controller/ParametersUiController.php +++ b/modules/parameters_ui/src/Controller/ParametersUiController.php @@ -201,7 +201,7 @@ class ParametersUiController extends ControllerBase { * @param string|null $bundle * (optional) The entity bundle. */ - public function parameterAddForm(string $parameters_parameter_type, ?string $parameters_parameter_name= NULL, ?ParametersCollectionInterface $parameters_collection = NULL, ?string $parameters_collection_id = NULL, ?string $entity_type_id = NULL, ?string $bundle = NULL): array { + public function parameterAddForm(string $parameters_parameter_type, ?string $parameters_parameter_name = NULL, ?ParametersCollectionInterface $parameters_collection = NULL, ?string $parameters_collection_id = NULL, ?string $entity_type_id = NULL, ?string $bundle = NULL): array { if (($parameters_collection === NULL) && ($parameters_collection_id === NULL) && ($entity_type_id === NULL)) { throw new NotFoundHttpException(); } @@ -287,6 +287,8 @@ class ParametersUiController extends ControllerBase { * * @param string $parameters_parameter_name * The machine name of the parameter. + * @param \Drupal\parameters\Entity\ParametersCollectionInterface $parameters_collection + * The parameters collection. * @param string|null $parameters_collection_id * (optional) The collection ID. * @param string|null $entity_type_id @@ -294,7 +296,7 @@ class ParametersUiController extends ControllerBase { * @param string|null $bundle * (optional) The entity bundle. */ - public function parameterDeleteForm(string $parameters_parameter_name, ?ParametersCollectionInterface $parameters_collection = NULL, ?string $parameters_collection_id = NULL, ?string $entity_type_id = NULL, ?string $bundle = NULL): array { + public function parameterDeleteForm(string $parameters_parameter_name, ParametersCollectionInterface $parameters_collection = NULL, ?string $parameters_collection_id = NULL, ?string $entity_type_id = NULL, ?string $bundle = NULL): array { if (($parameters_collection === NULL) && ($parameters_collection_id === NULL) && ($entity_type_id === NULL)) { throw new NotFoundHttpException(); } @@ -333,7 +335,7 @@ class ParametersUiController extends ControllerBase { * @param \Drupal\parameters\Entity\ParametersCollectionStorage $storage * The storage. */ - public function setCollectionStorage(EntityStorageInterface $storage): void { + public function setCollectionStorage(ParametersCollectionStorage $storage): void { $this->collectionStorage = $storage; } @@ -358,7 +360,8 @@ class ParametersUiController extends ControllerBase { */ protected function loadCollection(string $id): ?ParametersCollectionInterface { // Currently the Parameters UI does not support translations. - return $this->collectionStorage->loadOverrideFree($id);; + return $this->collectionStorage->loadOverrideFree($id); + ; } } diff --git a/modules/parameters_ui/src/Form/ParameterDeleteForm.php b/modules/parameters_ui/src/Form/ParameterDeleteForm.php index 14fc346..e362525 100644 --- a/modules/parameters_ui/src/Form/ParameterDeleteForm.php +++ b/modules/parameters_ui/src/Form/ParameterDeleteForm.php @@ -110,7 +110,7 @@ class ParameterDeleteForm extends ParameterForm { */ public function validateForm(array &$form, FormStateInterface $form_state) { if (!$this->collection->access('delete')) { - $form_state->setError($form, $this->t('You don\'t have permission to manage this configuration.')); + $form_state->setError($form, $this->t("You don't have permission to manage this configuration.")); } } diff --git a/modules/parameters_ui/src/Form/ParameterForm.php b/modules/parameters_ui/src/Form/ParameterForm.php index 16a42b9..687f7f9 100644 --- a/modules/parameters_ui/src/Form/ParameterForm.php +++ b/modules/parameters_ui/src/Form/ParameterForm.php @@ -279,7 +279,7 @@ class ParameterForm implements FormInterface, ContainerInjectionInterface { */ public function validateForm(array &$form, FormStateInterface $form_state) { if (!$this->collection->access('update')) { - $form_state->setError($form, $this->t('You don\'t have permission to manage this configuration.')); + $form_state->setError($form, $this->t("You don't have permission to manage this configuration.")); } if ($triggering_element = &$form_state->getTriggeringElement()) { @@ -310,7 +310,11 @@ class ParameterForm implements FormInterface, ContainerInjectionInterface { $parameter = $this->parameter; $config = []; - $config['name'] = $form_state->getValue('name', $form_state->getValue(['config', 'parameter_name'], $config['name'] ?? '')); + $config['name'] = $form_state->getValue('name', + $form_state->getValue(['config', 'parameter_name'], + $config['name'] ?? '' + ) + ); $config['label'] = $form_state->getValue('label', $config['label'] ?? ''); $config['description'] = $form_state->getValue('description', $config['description'] ?? ''); $config['weight'] = $form_state->getValue(['config', 'weight'], $config['weight'] ?? 0); @@ -391,7 +395,9 @@ class ParameterForm implements FormInterface, ContainerInjectionInterface { foreach ($parameter->getThirdPartyProviders() as $provider) { $parameters_array[$parameter_name]['third_party_settings'][$provider] = $parameter->getThirdPartySettings($provider); } - if (($form_state->getValue(['config', 'parameter_name'], '') !== '') && $form_state->getValue(['config', 'parameter_name']) !== $parameter_name) { + if (($form_state->getValue(['config', 'parameter_name'], '') !== '') + && + $form_state->getValue(['config', 'parameter_name']) !== $parameter_name) { unset($parameters_array[$form_state->getValue(['config', 'parameter_name'], '')]); } $collection->setParameters($parameters_array); diff --git a/modules/parameters_ui/src/Form/ParametersCollectionAddForm.php b/modules/parameters_ui/src/Form/ParametersCollectionAddForm.php index 2e9062a..3ae54a1 100644 --- a/modules/parameters_ui/src/Form/ParametersCollectionAddForm.php +++ b/modules/parameters_ui/src/Form/ParametersCollectionAddForm.php @@ -53,7 +53,7 @@ class ParametersCollectionAddForm implements FormInterface { */ public function validateForm(array &$form, FormStateInterface $form_state) {} - /** + /** * {@inheritdoc} */ public function submitForm(array &$form, FormStateInterface $form_state) { diff --git a/modules/parameters_ui/src/Form/ParametersCollectionForm.php b/modules/parameters_ui/src/Form/ParametersCollectionForm.php index d98bf13..1d6f275 100644 --- a/modules/parameters_ui/src/Form/ParametersCollectionForm.php +++ b/modules/parameters_ui/src/Form/ParametersCollectionForm.php @@ -2,7 +2,6 @@ namespace Drupal\parameters_ui\Form; -use Drupal\Component\Plugin\PluginManagerInterface; use Drupal\Component\Utility\Html; use Drupal\Core\Access\AccessibleInterface; use Drupal\Core\Entity\EntityForm; @@ -23,7 +22,7 @@ class ParametersCollectionForm extends EntityForm { * * @var \Drupal\parameters\Plugin\ParameterManager */ - protected PluginManagerInterface $parameterManager; + protected ParameterManager $parameterManager; /** * Constructs a new ParametersCollectionForm object. @@ -33,7 +32,7 @@ class ParametersCollectionForm extends EntityForm { * @param \Drupal\Core\Routing\RouteMatchInterface $route_match * The route match. */ - public function __construct(PluginManagerInterface $parameter_manager, RouteMatchInterface $route_match) { + public function __construct(ParameterManager $parameter_manager, RouteMatchInterface $route_match) { $this->parameterManager = $parameter_manager; $this->routeMatch = $route_match; } @@ -221,13 +220,19 @@ class ParametersCollectionForm extends EntityForm { ], '#title' => $this->t('Add parameter'), '#url' => $is_field_ui ? Url::fromRoute("entity.parameters.parameter.{$parts[0]}.add", [ - 'entity_type_id' => $parts[0], - $bundle_type_id => $parts[1], - 'parameters_parameter_type' => $form_state->getValue(['add_parameter', 'type']), - ], $query_options) : Url::fromRoute("parameters.parameter.add", [ - 'parameters_collection' => $collection->id(), - 'parameters_parameter_type' => $form_state->getValue(['add_parameter', 'type']), - ], $query_options), + 'entity_type_id' => $parts[0], + $bundle_type_id => $parts[1], + 'parameters_parameter_type' => $form_state->getValue([ + 'add_parameter', + 'type', + ]), + ], $query_options) : Url::fromRoute("parameters.parameter.add", [ + 'parameters_collection' => $collection->id(), + 'parameters_parameter_type' => $form_state->getValue([ + 'add_parameter', + 'type', + ]), + ], $query_options), ]; } else { diff --git a/modules/parameters_ui/src/Form/ParametersCollectionLockForm.php b/modules/parameters_ui/src/Form/ParametersCollectionLockForm.php index 3e8d7bc..1f75174 100644 --- a/modules/parameters_ui/src/Form/ParametersCollectionLockForm.php +++ b/modules/parameters_ui/src/Form/ParametersCollectionLockForm.php @@ -4,7 +4,6 @@ namespace Drupal\parameters_ui\Form; use Drupal\Core\Entity\EntityConfirmFormBase; use Drupal\Core\Form\FormStateInterface; -use Drupal\Core\Url; /** * Provides a form to lock a parameters collection. diff --git a/modules/parameters_ui/src/Form/ParametersCollectionUnlockForm.php b/modules/parameters_ui/src/Form/ParametersCollectionUnlockForm.php index e5b4965..60a609d 100644 --- a/modules/parameters_ui/src/Form/ParametersCollectionUnlockForm.php +++ b/modules/parameters_ui/src/Form/ParametersCollectionUnlockForm.php @@ -4,7 +4,6 @@ namespace Drupal\parameters_ui\Form; use Drupal\Core\Entity\EntityConfirmFormBase; use Drupal\Core\Form\FormStateInterface; -use Drupal\Core\Url; /** * Provides a form to unlock a parameters collection. diff --git a/modules/parameters_ui/src/ParametersUiListBuilder.php b/modules/parameters_ui/src/ParametersUiListBuilder.php index f6c0d71..901ad02 100755 --- a/modules/parameters_ui/src/ParametersUiListBuilder.php +++ b/modules/parameters_ui/src/ParametersUiListBuilder.php @@ -77,7 +77,7 @@ class ParametersUiListBuilder extends ConfigEntityListBuilder { $operations = []; $operations['edit'] = [ - 'title' => t('Edit'), + 'title' => $this->t('Edit'), 'weight' => 10, 'url' => Url::fromRoute("entity.parameters_collection.edit_form", [ 'parameters_collection' => $collection->id(), diff --git a/parameters.install b/parameters.install index 0f7b2b6..9185450 100644 --- a/parameters.install +++ b/parameters.install @@ -7,9 +7,9 @@ use Drupal\parameters\Entity\ParametersCollection; - /** - * Implements hook_uninstall(). - */ +/** + * Implements hook_uninstall(). + */ function parameters_uninstall($is_syncing) { foreach (ParametersCollection::loadMultiple() as $collection) { $collection->setLocked(FALSE)->delete(); diff --git a/src/Entity/ParametersCollectionStorage.php b/src/Entity/ParametersCollectionStorage.php index b352b0d..cbb6c60 100644 --- a/src/Entity/ParametersCollectionStorage.php +++ b/src/Entity/ParametersCollectionStorage.php @@ -37,7 +37,7 @@ class ParametersCollectionStorage extends ConfigEntityStorage { /** * Get all available collections as select options. * - * return \Drupal\Core\StringTranslation\TranslatableMarkup[] + * Return \Drupal\Core\StringTranslation\TranslatableMarkup[] * The options. */ public static function options(): array { diff --git a/src/EventSubscriber/ParametersConfigOverrideSubscriber.php b/src/EventSubscriber/ParametersConfigOverrideSubscriber.php index e32d45c..664b864 100644 --- a/src/EventSubscriber/ParametersConfigOverrideSubscriber.php +++ b/src/EventSubscriber/ParametersConfigOverrideSubscriber.php @@ -14,21 +14,31 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface; */ class ParametersConfigOverrideSubscriber implements EventSubscriberInterface { + /** + * {@inheritdoc} + */ public function onOverrideSave($event) { $this->applyChanges($event, 'config_override_save'); } + /** + * {@inheritdoc} + */ public function onOverrideDelete($event) { $this->applyChanges($event, 'config_override_delete'); } + /** + * {@inheritdoc} + */ protected function applyChanges($event, string $op): void { if (!($event instanceof LanguageConfigOverrideCrudEvent)) { return; } $config_name = $event->getLanguageConfigOverride()->getName(); - [$provider, $type, $id] = array_merge(explode('.', $config_name, 3), ['', '']); + [$provider, $type, $id] = array_merge(explode('.', + $config_name, 3), ['', '']); if (!($provider === 'parameters' && $type === 'collection')) { return; } diff --git a/src/Exception/ParameterNotFoundException.php b/src/Exception/ParameterNotFoundException.php index 5d51f7d..fe330ff 100644 --- a/src/Exception/ParameterNotFoundException.php +++ b/src/Exception/ParameterNotFoundException.php @@ -24,7 +24,7 @@ class ParameterNotFoundException extends \InvalidArgumentException { * @param \Throwable|null $previous * (optional) The previous throwable used for the exception chaining. */ - public function __construct(string $parameter_name, int $code = 0, ?\Throwable $previous = null) { + public function __construct(string $parameter_name, int $code = 0, ?\Throwable $previous = NULL) { parent::__construct(sprintf("No parameter found for machine name %s.", $parameter_name), $code, $previous); $this->parameterName = $parameter_name; } diff --git a/src/Normalizer/Legacy/ParametersContentEntityNormalizer.php b/src/Normalizer/Legacy/ParametersContentEntityNormalizer.php index 938cf62..e90341d 100644 --- a/src/Normalizer/Legacy/ParametersContentEntityNormalizer.php +++ b/src/Normalizer/Legacy/ParametersContentEntityNormalizer.php @@ -125,7 +125,9 @@ final class ParametersContentEntityNormalizer extends ContentEntityNormalizer { // One exception is made for users that have ID 0 (anonymous) and // ID 1 (admin). if ($target_is_content) { - if ($target_entity_type->id() === 'user' && isset($field_value['target_id']) && in_array($field_value['target_id'], [0, 1])) { + if ($target_entity_type->id() === 'user' + && isset($field_value['target_id']) + && in_array($field_value['target_id'], [0, 1])) { unset($field_value['target_uuid']); } elseif (!empty($field_value['target_uuid'])) { @@ -154,7 +156,8 @@ final class ParametersContentEntityNormalizer extends ContentEntityNormalizer { unset($values['created'], $values['changed']); $entity_keys = $entity_type->getKeys(); // Remove IDs and timestamps. - foreach (array_intersect_key($entity_keys, array_flip(['id', 'revision', 'created', 'changed'])) as $k_1) { + foreach (array_intersect_key($entity_keys, + array_flip(['id', 'revision', 'created', 'changed'])) as $k_1) { unset($values[$k_1]); } foreach ($values as $k_1 => $v_1) { diff --git a/src/Normalizer/ParametersContentEntityNormalizer.php b/src/Normalizer/ParametersContentEntityNormalizer.php index 075a8f7..9fff00e 100644 --- a/src/Normalizer/ParametersContentEntityNormalizer.php +++ b/src/Normalizer/ParametersContentEntityNormalizer.php @@ -125,7 +125,9 @@ final class ParametersContentEntityNormalizer extends ContentEntityNormalizer { // One exception is made for users that have ID 0 (anonymous) and // ID 1 (admin). if ($target_is_content) { - if ($target_entity_type->id() === 'user' && isset($field_value['target_id']) && in_array($field_value['target_id'], [0, 1])) { + if ($target_entity_type->id() === 'user' + && isset($field_value['target_id']) + && in_array($field_value['target_id'], [0, 1])) { unset($field_value['target_uuid']); } elseif (!empty($field_value['target_uuid'])) { @@ -154,7 +156,10 @@ final class ParametersContentEntityNormalizer extends ContentEntityNormalizer { unset($values['created'], $values['changed'], $values['revision_timestamp']); $entity_keys = $entity_type->getKeys(); // Remove IDs and timestamps. - foreach (array_intersect_key($entity_keys, array_flip(['id', 'revision', 'created', 'changed', 'revision_timestamp'])) as $k_1) { + foreach (array_intersect_key($entity_keys, + array_flip( + ['id', 'revision', 'created', 'changed', 'revision_timestamp'] + )) as $k_1) { unset($values[$k_1]); } foreach ($values as $k_1 => $v_1) { diff --git a/src/ParameterRepository.php b/src/ParameterRepository.php index 466744d..6678d97 100644 --- a/src/ParameterRepository.php +++ b/src/ParameterRepository.php @@ -12,7 +12,6 @@ use Drupal\parameters\Event\ParameterEvents; use Drupal\parameters\Exception\ParameterNotFoundException; use Drupal\parameters\Plugin\ParameterPluginCollection; use Drupal\parameters\Plugin\ParameterInterface; -use Drupal\parameters\Plugin\ParameterManager; use Drupal\parameters\Plugin\PropertyParameterInterface; use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; @@ -78,7 +77,7 @@ class ParameterRepository { * @param bool $autolock * Whether auto-locking is enabled. */ - public function __construct(PluginManagerInterface $plugin_manager, EntityTypeManagerInterface $entity_type_manager, EventDispatcherInterface $event_dispatcher, bool $autolock) { + public function __construct(ParameterManager $plugin_manager, EntityTypeManagerInterface $entity_type_manager, EventDispatcherInterface $event_dispatcher, bool $autolock) { $this->pluginManager = $plugin_manager; $this->collectionStorage = $entity_type_manager->getStorage(ParametersCollectionInterface::ENTITY_TYPE_ID); $this->eventDispatcher = $event_dispatcher; @@ -165,7 +164,7 @@ class ParameterRepository { /** * Get the contained parts of a parameter name. * - * return string[] + * Return string[] * The contained parts. */ protected function getNameParts(string $name): array { diff --git a/src/Plugin/Parameter/Bundles.php b/src/Plugin/Parameter/Bundles.php index 3b1946f..b2474ff 100644 --- a/src/Plugin/Parameter/Bundles.php +++ b/src/Plugin/Parameter/Bundles.php @@ -137,14 +137,14 @@ class Bundles extends ParameterBase implements PropertyParameterInterface, Depen * @param \Drupal\parameters\Plugin\ParameterManager $manager * The parameter plugin manager. */ - public function setParameterManager(PluginManagerInterface $manager) { + public function setParameterManager(ParameterManager $manager) { $this->parameterManager = $manager; } /** * {@inheritdoc} */ - public function getCacheTags(){ + public function getCacheTags() { $entity_type = $this->entityTypeManager->getDefinition($this->pluginDefinition['entity_type']); $bundle_entity_type = $this->entityTypeManager->getDefinition($entity_type->getBundleEntityType()); return $bundle_entity_type->getListCacheTags(); @@ -248,7 +248,7 @@ class Bundles extends ParameterBase implements PropertyParameterInterface, Depen } if (is_array($value)) { $scalar_only = TRUE; - array_walk_recursive($value, function($v) use (&$scalar_only) { + array_walk_recursive($value, function ($v) use (&$scalar_only) { if (!is_scalar($v) && !is_null($v)) { $scalar_only = FALSE; } @@ -266,7 +266,7 @@ class Bundles extends ParameterBase implements PropertyParameterInterface, Depen $value = $bundle_config->toArray(); $scalar_only = TRUE; - array_walk_recursive($value, function($v) use (&$scalar_only) { + array_walk_recursive($value, function ($v) use (&$scalar_only) { if (!is_scalar($v) && !is_null($v)) { $scalar_only = FALSE; } @@ -336,7 +336,8 @@ class Bundles extends ParameterBase implements PropertyParameterInterface, Depen $output = ''; if ($selected = $this->configuration['selected']) { $num_items = count($selected); - [$subset, $num_rest] = $num_items > 4 ? [array_slice($selected, 0, 3), ($num_items - 3)] : [$selected, 0]; + [$subset, $num_rest] = $num_items > 4 ? + [array_slice($selected, 0, 3), ($num_items - 3)] : [$selected, 0]; $output .= 'selected:'; $output .= '
'; $output .= ''; diff --git a/src/Plugin/Parameter/Content.php b/src/Plugin/Parameter/Content.php index 9346aa5..5d96347 100644 --- a/src/Plugin/Parameter/Content.php +++ b/src/Plugin/Parameter/Content.php @@ -124,7 +124,7 @@ class Content extends ParameterBase implements EntityParameterInterface, Propert /** * The lock service. * - * var \Drupal\Core\Lock\LockBackendInterface + * @var \Drupal\Core\Lock\LockBackendInterface */ protected LockBackendInterface $lock; @@ -558,7 +558,8 @@ class Content extends ParameterBase implements EntityParameterInterface, Propert $values['pass'] = [[ 'value' => $entity->getPassword(), 'pre_hashed' => TRUE, - ]]; + ], + ]; } $this->configuration['values'] = $values; @@ -714,8 +715,8 @@ class Content extends ParameterBase implements EntityParameterInterface, Propert /** * Submit callback for elements of the user account form. * - * @param array &$element - * The element being processed. + * @param array $form + * The form. * @param \Drupal\Core\Form\FormStateInterface $form_state * The form state. */ @@ -751,7 +752,7 @@ class Content extends ParameterBase implements EntityParameterInterface, Propert } $roles = []; - foreach ($form_state->getValue('roles', []) as $rk => $rv) { + foreach ($form_state->getValue('roles', []) as $rv) { if ($rv && $rv !== RoleInterface::AUTHENTICATED_ID) { $roles[] = $rv; } @@ -811,7 +812,7 @@ class Content extends ParameterBase implements EntityParameterInterface, Propert * @param \Drupal\parameters\Plugin\ParameterManager $manager * The parameter plugin manager. */ - public function setParameterManager(PluginManagerInterface $manager) { + public function setParameterManager(ParameterManager $manager) { $this->parameterManager = $manager; } @@ -1153,7 +1154,7 @@ class Content extends ParameterBase implements EntityParameterInterface, Propert $load_by_uuid_and_langcode = function (ContentEntityInterface $entity) { $loaded = $this->entityRepository->loadEntityByUuid($entity->getEntityTypeId(), $entity->uuid()); if ($loaded && ($entity->language()->getId() !== $loaded->language()->getId()) && ($loaded instanceof TranslatableInterface)) { - $loaded = $loaded->hasTranslation($entity->language()->getId()) ? $loaded->getTranslation($entity->language()->getId()) : NULL; + $loaded = $loaded->hasTranslation($entity->language()->getId()) ? $loaded->getTranslation($entity->language()->getId()) : NULL; } return $loaded; }; @@ -1235,7 +1236,8 @@ class Content extends ParameterBase implements EntityParameterInterface, Propert $values['pass'] = [[ 'value' => $entity->getPassword(), 'pre_hashed' => TRUE, - ]]; + ], + ]; } $this->configuration['values'] = $values; diff --git a/src/Plugin/Parameter/Fields.php b/src/Plugin/Parameter/Fields.php index b67e5e7..66889f2 100644 --- a/src/Plugin/Parameter/Fields.php +++ b/src/Plugin/Parameter/Fields.php @@ -247,7 +247,7 @@ class Fields extends ParameterBase implements PropertyParameterInterface, Depend * @param \Drupal\parameters\Plugin\ParameterManager $manager * The parameter plugin manager. */ - public function setParameterManager(PluginManagerInterface $manager) { + public function setParameterManager(ParameterManager $manager) { $this->parameterManager = $manager; } @@ -264,7 +264,7 @@ class Fields extends ParameterBase implements PropertyParameterInterface, Depend /** * {@inheritdoc} */ - public function getCacheTags(){ + public function getCacheTags() { $entity_type = $this->entityTypeManager->getDefinition($this->pluginDefinition['entity_type']); $bundle_entity_type = NULL !== $entity_type->getBundleEntityType() ? $this->entityTypeManager->getDefinition($entity_type->getBundleEntityType()) : NULL; $tags = $bundle_entity_type ? $bundle_entity_type->getListCacheTags() : []; @@ -427,7 +427,7 @@ class Fields extends ParameterBase implements PropertyParameterInterface, Depend } if (is_array($value)) { $scalar_only = TRUE; - array_walk_recursive($value, function($v) use (&$scalar_only) { + array_walk_recursive($value, function ($v) use (&$scalar_only) { if (!is_scalar($v) && !is_null($v)) { $scalar_only = FALSE; } @@ -445,7 +445,7 @@ class Fields extends ParameterBase implements PropertyParameterInterface, Depend $value = $field_config->toArray(); $scalar_only = TRUE; - array_walk_recursive($value, function($v) use (&$scalar_only) { + array_walk_recursive($value, function ($v) use (&$scalar_only) { if (!is_scalar($v) && !is_null($v)) { $scalar_only = FALSE; } @@ -534,7 +534,8 @@ class Fields extends ParameterBase implements PropertyParameterInterface, Depend } if ($selected = $this->configuration['selected']) { $num_items = count($selected); - [$subset, $num_rest] = $num_items > 4 ? [array_slice($selected, 0, 3), ($num_items - 3)] : [$selected, 0]; + [$subset, $num_rest] = $num_items > 4 ? + [array_slice($selected, 0, 3), ($num_items - 3)] : [$selected, 0]; $output .= 'selected:'; $output .= '
'; $output .= ''; diff --git a/src/Plugin/Parameter/Http.php b/src/Plugin/Parameter/Http.php index fcc05a0..4e57a96 100644 --- a/src/Plugin/Parameter/Http.php +++ b/src/Plugin/Parameter/Http.php @@ -2,6 +2,7 @@ namespace Drupal\parameters\Plugin\Parameter; +use GuzzleHttp\Utils; use Drupal\Component\Plugin\PluginManagerInterface; use Drupal\Component\Serialization\Yaml as SerializationYaml; use Drupal\Component\Utility\Html; @@ -70,7 +71,7 @@ class Http extends ParameterBase implements PropertyParameterInterface, Cacheabl /** * The lock service. * - * var \Drupal\Core\Lock\LockBackendInterface + * @var \Drupal\Core\Lock\LockBackendInterface */ protected LockBackendInterface $lock; @@ -111,7 +112,7 @@ class Http extends ParameterBase implements PropertyParameterInterface, Cacheabl $client_config = [ 'headers' => [ - 'User-Agent' => 'Drupal/' . \Drupal::VERSION . ' (+https://www.drupal.org/) ' . \GuzzleHttp\Utils::defaultUserAgent() . ' Parameters/1', + 'User-Agent' => 'Drupal/' . \Drupal::VERSION . ' (+https://www.drupal.org/) ' . Utils::defaultUserAgent() . ' Parameters/1', ], ]; $client = $container->get('http_client_factory')->fromOptions($client_config); @@ -257,7 +258,7 @@ class Http extends ParameterBase implements PropertyParameterInterface, Cacheabl * @param \GuzzleHttp\ClientInterface $client * The client. */ - public function setHttpClient($client) { + public function setHttpClient(ClientInterface $client) { $this->client = $client; } @@ -299,7 +300,7 @@ class Http extends ParameterBase implements PropertyParameterInterface, Cacheabl if ($data = $this->readCache($use_cache, $uri, $bubbleable_metadata)) { if (['___error' => TRUE] === $data) { - $this->logger->error(t('The endpoint @url seems to be faulty. Please see previous logged error messages for more information. This error message would disappear on its own, in case the endpoint has recovered.', + $this->logger->error($this->t('The endpoint @url seems to be faulty. Please see previous logged error messages for more information. This error message would disappear on its own, in case the endpoint has recovered.', ['@url' => $uri])); $faulty = TRUE; return FALSE; @@ -320,7 +321,7 @@ class Http extends ParameterBase implements PropertyParameterInterface, Cacheabl sleep(1); self::$lockWait[$lid]++; if (self::$lockWait[$lid] > 3) { - $this->logger->warning(t('Lock wait exceeded for endpoint @uri. Now trying to fetch data from it. This may cause more traffic than needed.', ['@url' => $uri])); + $this->logger->warning($this->t('Lock wait exceeded for endpoint @uri. Now trying to fetch data from it. This may cause more traffic than needed.', ['@url' => $uri])); } else { return $this->getData($url, $bubbleable_metadata, $throw_exception, $use_cache); @@ -332,7 +333,7 @@ class Http extends ParameterBase implements PropertyParameterInterface, Cacheabl $response = $this->client->request('GET', $uri); } catch (GuzzleException $e) { - $this->logger->error(t('Failed to fetch data from @url. Exception message: @message', + $this->logger->error($this->t('Failed to fetch data from @url. Exception message: @message', ['@url' => $uri, '@message' => $e->getMessage()])); if ($throw_exception) { throw $e; @@ -341,7 +342,7 @@ class Http extends ParameterBase implements PropertyParameterInterface, Cacheabl } if (!($response->getStatusCode() == 200)) { - $message = t('Failed to fetch data from @url. Returned status code was: @status', + $message = $this->t('Failed to fetch data from @url. Returned status code was: @status', ['@url' => $uri, '@status' => $response->getStatusCode()]); $this->logger->error($message); if ($throw_exception) { @@ -354,7 +355,7 @@ class Http extends ParameterBase implements PropertyParameterInterface, Cacheabl $body = trim($response->getBody()->getContents()); } catch (\RuntimeException $e) { - $this->logger->error(t('Failed to read response body contents from @url. Exception message: @message', + $this->logger->error($this->t('Failed to read response body contents from @url. Exception message: @message', ['@url' => $uri, '@message' => $e->getMessage()])); if ($throw_exception) { throw $e; @@ -684,7 +685,7 @@ class Http extends ParameterBase implements PropertyParameterInterface, Cacheabl * @param \Drupal\parameters\Plugin\ParameterManager $manager * The parameter plugin manager. */ - public function setParameterManager(PluginManagerInterface $manager) { + public function setParameterManager(ParameterManager $manager) { $this->parameterManager = $manager; } diff --git a/src/Plugin/Parameter/Increment.php b/src/Plugin/Parameter/Increment.php index b245f38..598f247 100644 --- a/src/Plugin/Parameter/Increment.php +++ b/src/Plugin/Parameter/Increment.php @@ -26,7 +26,7 @@ class Increment extends ParameterBase { /** * The lock service. * - * var \Drupal\Core\Lock\LockBackendInterface + * @var \Drupal\Core\Lock\LockBackendInterface */ protected LockBackendInterface $lock; diff --git a/src/Plugin/Parameter/NullObject.php b/src/Plugin/Parameter/NullObject.php index 205565f..57fa9f1 100644 --- a/src/Plugin/Parameter/NullObject.php +++ b/src/Plugin/Parameter/NullObject.php @@ -35,6 +35,9 @@ class NullObject extends PluginBase implements ParameterInterface { return TRUE; } + /** + * {@inheritdoc} + */ public function getPreview(): string { return ''; } diff --git a/src/Plugin/Parameter/Reference.php b/src/Plugin/Parameter/Reference.php index 72a3f07..bfd036a 100644 --- a/src/Plugin/Parameter/Reference.php +++ b/src/Plugin/Parameter/Reference.php @@ -263,7 +263,7 @@ class Reference extends ParameterBase implements PropertyParameterInterface, Dep * @param \Drupal\parameters\Entity\ParametersCollectionStorage $storage * The parameters collection storage. */ - public function setCollectionStorage(EntityStorageInterface $storage): void { + public function setCollectionStorage(ParametersCollectionStorage $storage): void { $this->collectionStorage = $storage; } diff --git a/src/Plugin/Parameter/Roles.php b/src/Plugin/Parameter/Roles.php index 8170f24..d6bc5a3 100644 --- a/src/Plugin/Parameter/Roles.php +++ b/src/Plugin/Parameter/Roles.php @@ -141,14 +141,14 @@ class Roles extends ParameterBase implements PropertyParameterInterface, Depende * @param \Drupal\parameters\Plugin\ParameterManager $manager * The parameter plugin manager. */ - public function setParameterManager(PluginManagerInterface $manager) { + public function setParameterManager(ParameterManager $manager) { $this->parameterManager = $manager; } /** * {@inheritdoc} */ - public function getCacheTags(){ + public function getCacheTags() { return $this->entityTypeManager->getDefinition('user_role')->getListCacheTags(); } @@ -269,7 +269,11 @@ class Roles extends ParameterBase implements PropertyParameterInterface, Depende $selected = array_combine($selected, $selected); $configs = $storage->loadMultiple($selected); - $missing = array_diff_key($selected, [RoleInterface::ANONYMOUS_ID => 1, RoleInterface::AUTHENTICATED_ID => 1] + $configs); + $missing = array_diff_key($selected, + [ + RoleInterface::ANONYMOUS_ID => 1, + RoleInterface::AUTHENTICATED_ID => 1, + ] + $configs); if (!empty($missing)) { return $this->t('Following @type configs are missing: @missing', [ @@ -295,7 +299,8 @@ class Roles extends ParameterBase implements PropertyParameterInterface, Depende $output = ''; if ($selected = $this->configuration['selected']) { $num_items = count($selected); - [$subset, $num_rest] = $num_items > 4 ? [array_slice($selected, 0, 3), ($num_items - 3)] : [$selected, 0]; + [$subset, $num_rest] = $num_items > 4 ? + [array_slice($selected, 0, 3), ($num_items - 3)] : [$selected, 0]; $output .= 'selected:'; $output .= '
'; $output .= ''; diff --git a/src/Plugin/Parameter/Types.php b/src/Plugin/Parameter/Types.php index fb6743f..1f30905 100644 --- a/src/Plugin/Parameter/Types.php +++ b/src/Plugin/Parameter/Types.php @@ -130,7 +130,7 @@ class Types extends ParameterBase implements PropertyParameterInterface, Depende * @param \Drupal\parameters\Plugin\ParameterManager $manager * The parameter plugin manager. */ - public function setParameterManager(PluginManagerInterface $manager) { + public function setParameterManager(ParameterManager $manager) { $this->parameterManager = $manager; } @@ -254,7 +254,8 @@ class Types extends ParameterBase implements PropertyParameterInterface, Depende $output = ''; if ($selected = $this->configuration['selected']) { $num_items = count($selected); - [$subset, $num_rest] = $num_items > 4 ? [array_slice($selected, 0, 3), ($num_items - 3)] : [$selected, 0]; + [$subset, $num_rest] = $num_items > 4 ? + [array_slice($selected, 0, 3), ($num_items - 3)] : [$selected, 0]; $output .= 'selected:'; $output .= '
'; $output .= ''; diff --git a/src/Plugin/Parameter/Yaml.php b/src/Plugin/Parameter/Yaml.php index 3c5797a..e17b8da 100644 --- a/src/Plugin/Parameter/Yaml.php +++ b/src/Plugin/Parameter/Yaml.php @@ -130,7 +130,7 @@ class Yaml extends ParameterBase implements PropertyParameterInterface { * @param \Drupal\parameters\Plugin\ParameterManager $manager * The parameter plugin manager. */ - public function setParameterManager(PluginManagerInterface $manager) { + public function setParameterManager(ParameterManager $manager) { $this->parameterManager = $manager; } diff --git a/src/Plugin/ParameterManager.php b/src/Plugin/ParameterManager.php index c40ef81..3124d38 100644 --- a/src/Plugin/ParameterManager.php +++ b/src/Plugin/ParameterManager.php @@ -69,7 +69,7 @@ class ParameterManager extends DefaultPluginManager { */ protected function findDefinitions() { $definitions = parent::findDefinitions(); - uasort($definitions, function($a, $b) { + uasort($definitions, function ($a, $b) { $a_weight = $a['weight'] ?? 0; $b_weight = $b['weight'] ?? 0; return $a_weight !== $b_weight ? $a_weight - $b_weight : strnatcmp((string) ($a['label'] ?? ''), (string) ($b['label'] ?? '')); diff --git a/tests/src/Kernel/ParametersTokenTest.php b/tests/src/Kernel/ParametersTokenTest.php index e622808..6d8fb6b 100644 --- a/tests/src/Kernel/ParametersTokenTest.php +++ b/tests/src/Kernel/ParametersTokenTest.php @@ -186,8 +186,10 @@ class ParametersTokenTest extends KernelTestBase { $this->assertEquals('49', $token->replace('[node:parameter:maximum_capacity]', ['node' => $page])); $this->assertEquals('49', $token->replace('[parameter:maximum_capacity]', ['node' => $page])); - $this->assertEquals('101', $token->replace('[parameter:maximum_capacity]', ['page' => $page, 'article' => $article])); - $this->assertEquals('101', $token->replace('[parameter:maximum_capacity]', ['article' => $article, 'page' => $page])); + $this->assertEquals('101', $token->replace('[parameter:maximum_capacity]', + ['page' => $page, 'article' => $article])); + $this->assertEquals('101', $token->replace('[parameter:maximum_capacity]', + ['article' => $article, 'page' => $page])); $this->assertEquals('-2', $token->replace('[parameter:node.article:maximum_capacity]', ['node' => $page])); $this->assertEquals('49', $token->replace('[parameter:node.page:maximum_capacity]', ['node' => $page]));