Merge pull request #227 from localgovdrupal/2.x

release 2.13.2
localgovdrupal · Jun 11, 2024 · 06a39dd · 06a39dd
2 parents fc933f9 + d25de0e
commit 06a39dd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,6 @@
         "drupal/media_library_edit": "^3.0",
         "drupal/metatag": "^1.14",
         "drupal/pathauto": "^1.8",
-        "drupal/redirect": "^1.6",
         "drupal/role_delegation": "^1.1",
         "drupal/token": "^1.7"
     },
@@ -21,9 +20,6 @@
     },
     "extra": {
         "enable-patching": true,
-        "patches": {
-            "drupal/redirect": {
-                "Validation issue on adding url redirect: https://www.drupal.org/project/redirect/issues/3057250": "https://www.drupal.org/files/issues/2022-09-01/3057250-53.patch"}},
         "composer-exit-on-patch-failure": true,
         "patchLevel": {
             "drupal/core": "-p2"

diff --git a/modules/localgov_media/localgov_media.module b/modules/localgov_media/localgov_media.module
@@ -13,7 +13,7 @@ use Drupal\user\Entity\Role;
  * Implements hook_modules_installed().
  */
 function localgov_media_modules_installed($modules, $is_syncing) {
-  if (!$is_syncing && in_array('localgov_media', $modules)) {
+  if (!$is_syncing && in_array('localgov_media', $modules, TRUE)) {
 
     // Install all optional config now rather than deferring it to later.
     $config_path = \Drupal::service('extension.list.module')->getPath('localgov_media') . '/config/optional';

diff --git a/modules/localgov_roles/tests/src/Kernel/ModuleRolesTest.php b/modules/localgov_roles/tests/src/Kernel/ModuleRolesTest.php
@@ -29,7 +29,7 @@ class ModuleRolesTest extends KernelTestBase {
    * {@inheritdoc}
    */
   public function setUp(): void {
-    parent::setup();
+    parent::setUp();
 
     $this->installConfig([
       'user',

diff --git a/tests/src/Kernel/FieldRenameHelperTest.php b/tests/src/Kernel/FieldRenameHelperTest.php
@@ -50,7 +50,7 @@ class FieldRenameHelperTest extends KernelTestBase {
    * {@inheritdoc}
    */
   public function setUp(): void {
-    parent::setup();
+    parent::setUp();
 
     $this->installEntitySchema('user');
     $this->installEntitySchema('node');
@@ -175,14 +175,14 @@ public function testRenameField() {
     // Assert the entity form displays preserve the field groups.
     $form_display = EntityFormDisplay::load('node.test_type.default');
     $form_groups = $form_display->getThirdPartySettings('field_group');
-    $this->assertEquals(TRUE, in_array('renamed_test_field', $form_groups['test_group']['children']));
-    $this->assertEquals(TRUE, in_array('another_renamed_test_field', $form_groups['another_test_group']['children']));
+    $this->assertEquals(TRUE, in_array('renamed_test_field', $form_groups['test_group']['children'], TRUE));
+    $this->assertEquals(TRUE, in_array('another_renamed_test_field', $form_groups['another_test_group']['children'], TRUE));
 
     // Assert the entity view displays preserve the field groups.
     $view_display = EntityViewDisplay::load('node.test_type.default');
     $view_groups = $view_display->getThirdPartySettings('field_group');
-    $this->assertEquals(TRUE, in_array('renamed_test_field', $view_groups['test_group']['children']));
-    $this->assertEquals(TRUE, in_array('another_renamed_test_field', $view_groups['another_test_group']['children']));
+    $this->assertEquals(TRUE, in_array('renamed_test_field', $view_groups['test_group']['children'], TRUE));
+    $this->assertEquals(TRUE, in_array('another_renamed_test_field', $view_groups['another_test_group']['children'], TRUE));
 
     // Assert the field config is preserved.
     $form_component = $form_display->getComponent('renamed_test_field');