Merge pull request #236 from openeuropa/EWPP-4839

EWPP-4739: Update label of szech-republic option to 'Czechia'.
openeuropa · Dec 6, 2024 · 880db61 · 880db61
2 parents 4ec0246 + c5229bd
commit 880db61
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/modules/oe_paragraphs_illustrations_lists/oe_paragraphs_illustrations_lists.module b/modules/oe_paragraphs_illustrations_lists/oe_paragraphs_illustrations_lists.module
@@ -28,7 +28,7 @@ use Drupal\oe_paragraphs_illustrations_lists\Event\RatioOptionsEvent;
  *
  * @see options_allowed_values()
  */
-function _oe_paragraphs_illustrations_lists_allowed_values_ratios(FieldStorageDefinitionInterface $definition, FieldableEntityInterface $entity = NULL, &$cacheable = TRUE): array {
+function _oe_paragraphs_illustrations_lists_allowed_values_ratios(FieldStorageDefinitionInterface $definition, ?FieldableEntityInterface $entity = NULL, &$cacheable = TRUE): array {
   $event = new RatioOptionsEvent();
 
   \Drupal::service('event_dispatcher')->dispatch($event, RatioOptionsEvent::class);
@@ -51,7 +51,7 @@ function _oe_paragraphs_illustrations_lists_allowed_values_ratios(FieldStorageDe
  *
  * @see options_allowed_values()
  */
-function _oe_paragraphs_illustrations_lists_allowed_values_columns(FieldStorageDefinitionInterface $definition, FieldableEntityInterface $entity = NULL, &$cacheable = TRUE): array {
+function _oe_paragraphs_illustrations_lists_allowed_values_columns(FieldStorageDefinitionInterface $definition, ?FieldableEntityInterface $entity = NULL, &$cacheable = TRUE): array {
   $event = new ColumnOptionsEvent();
 
   \Drupal::service('event_dispatcher')->dispatch($event, ColumnOptionsEvent::class);

diff --git a/oe_paragraphs.module b/oe_paragraphs.module
@@ -54,7 +54,7 @@ function oe_paragraphs_entity_base_field_info(EntityTypeInterface $entity_type):
  *
  * @see options_allowed_values()
  */
-function _oe_paragraphs_allowed_values_icons(FieldStorageDefinitionInterface $definition, FieldableEntityInterface $entity = NULL, &$cacheable = TRUE) {
+function _oe_paragraphs_allowed_values_icons(FieldStorageDefinitionInterface $definition, ?FieldableEntityInterface $entity = NULL, &$cacheable = TRUE) {
   $event = new IconOptionsEvent();
 
   $event_dispatcher = \Drupal::service('event_dispatcher');
@@ -78,7 +78,7 @@ function _oe_paragraphs_allowed_values_icons(FieldStorageDefinitionInterface $de
  *
  * @see options_allowed_values()
  */
-function _oe_paragraphs_allowed_values_flags(FieldStorageDefinitionInterface $definition, FieldableEntityInterface $entity = NULL, &$cacheable = TRUE): array {
+function _oe_paragraphs_allowed_values_flags(FieldStorageDefinitionInterface $definition, ?FieldableEntityInterface $entity = NULL, &$cacheable = TRUE): array {
   $event = new FlagOptionsEvent();
 
   \Drupal::service('event_dispatcher')->dispatch($event, FlagOptionsEvent::class);

diff --git a/src/EventSubscriber/OptionsSubscriber.php b/src/EventSubscriber/OptionsSubscriber.php
@@ -107,7 +107,7 @@ public function getFlagOptions(FlagOptionsEvent $event): void {
       'bulgaria' => $this->t('Bulgaria'),
       'croatia' => $this->t('Croatia'),
       'cyprus' => $this->t('Cyprus'),
-      'czech-republic' => $this->t('Czech republic'),
+      'czech-republic' => $this->t('Czechia'),
       'denmark' => $this->t('Denmark'),
       'estonia' => $this->t('Estonia'),
       'EU' => $this->t('EU'),

diff --git a/tests/Traits/FieldsTrait.php b/tests/Traits/FieldsTrait.php
@@ -82,7 +82,7 @@ protected function getMultipleCardinalityFieldTable(string $field, int $position
    * @return \Behat\Mink\Element\NodeElement|null
    *   The field if found, NULL otherwise.
    */
-  protected function findField(string $label, NodeElement $container = NULL): ?NodeElement {
+  protected function findField(string $label, ?NodeElement $container = NULL): ?NodeElement {
     $container = $container ?? $this->getSession()->getPage();
 
     // Try to find the field with the standard method.

diff --git a/tests/src/Functional/ParagraphsTestBase.php b/tests/src/Functional/ParagraphsTestBase.php
@@ -4,9 +4,9 @@
 
 namespace Drupal\Tests\oe_paragraphs\Functional;
 
+use Drupal\Tests\BrowserTestBase;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\Tests\BrowserTestBase;
 
 /**
  * Base class to test paragraphs.