diff --git a/src/Plugin/Field/FieldWidget/ParagraphsWidget.php b/src/Plugin/Field/FieldWidget/ParagraphsWidget.php index 2514da5..f7ee110 100644 --- a/src/Plugin/Field/FieldWidget/ParagraphsWidget.php +++ b/src/Plugin/Field/FieldWidget/ParagraphsWidget.php @@ -1781,7 +1781,7 @@ class ParagraphsWidget extends WidgetBase { } // Add information into delta mapping for the new element. - $original_deltas_size = count($widget_state['original_deltas']); + $original_deltas_size = count($widget_state['original_deltas'] ?? []); $new_original_deltas[$new_delta] = $original_deltas_size; $user_input[$original_deltas_size]['_weight'] = $new_delta; diff --git a/tests/src/Functional/Migrate/MigrateUiParagraphsTestBase.php b/tests/src/Functional/Migrate/MigrateUiParagraphsTestBase.php index 0a34a22..8490451 100644 --- a/tests/src/Functional/Migrate/MigrateUiParagraphsTestBase.php +++ b/tests/src/Functional/Migrate/MigrateUiParagraphsTestBase.php @@ -409,7 +409,9 @@ abstract class MigrateUiParagraphsTestBase extends MigrateUpgradeTestBase { $session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.'); $driver = $connection_options['driver']; - $connection_options['prefix'] = $connection_options['prefix']['default']; + if (floatval(\Drupal::VERSION) < 9.3) { + $connection_options['prefix'] = $connection_options['prefix']['default']; + } // Use the driver connection form to get the correct options out of the // database settings. This supports all of the databases we test against. diff --git a/tests/src/Functional/WidgetLegacy/ParagraphsAdministrationTest.php b/tests/src/Functional/WidgetLegacy/ParagraphsAdministrationTest.php index b40a554..b4c4478 100644 --- a/tests/src/Functional/WidgetLegacy/ParagraphsAdministrationTest.php +++ b/tests/src/Functional/WidgetLegacy/ParagraphsAdministrationTest.php @@ -247,10 +247,14 @@ class ParagraphsAdministrationTest extends ParagraphsTestBase { $this->assertSession()->pageTextContains('article Test article has been created.'); $node = $this->drupalGetNodeByTitle('Test article'); - $img1_url = file_create_url(\Drupal::token()->replace('public://[date:custom:Y]-[date:custom:m]/' . $files[0]->filename)); - $img2_url = file_create_url(\Drupal::token()->replace('public://[date:custom:Y]-[date:custom:m]/' . $files[1]->filename)); - $img1_size = filesize($files[0]->uri); - $img2_size = filesize($files[1]->uri); + if (floatval(\Drupal::VERSION) >= 9.3) { + $img1_url = \Drupal::service('file_url_generator')->generateString(\Drupal::token()->replace('public://[date:custom:Y]-[date:custom:m]/' . $files[0]->filename)); + $img2_url = \Drupal::service('file_url_generator')->generateString(\Drupal::token()->replace('public://[date:custom:Y]-[date:custom:m]/' . $files[1]->filename)); + } + else { + $img1_url = file_create_url(\Drupal::token()->replace('public://[date:custom:Y]-[date:custom:m]/' . $files[0]->filename)); + $img2_url = file_create_url(\Drupal::token()->replace('public://[date:custom:Y]-[date:custom:m]/' . $files[1]->filename)); + } $img1_mime = \Drupal::service('file.mime_type.guesser')->guess($files[0]->uri); $img2_mime = \Drupal::service('file.mime_type.guesser')->guess($files[1]->uri); diff --git a/tests/src/Functional/WidgetStable/ParagraphsAdministrationTest.php b/tests/src/Functional/WidgetStable/ParagraphsAdministrationTest.php index 6f4a147..6181c7a 100644 --- a/tests/src/Functional/WidgetStable/ParagraphsAdministrationTest.php +++ b/tests/src/Functional/WidgetStable/ParagraphsAdministrationTest.php @@ -254,8 +254,6 @@ class ParagraphsAdministrationTest extends ParagraphsTestBase { $img1_url = file_create_url(\Drupal::token()->replace('public://[date:custom:Y]-[date:custom:m]/' . $files[0]->filename)); $img2_url = file_create_url(\Drupal::token()->replace('public://[date:custom:Y]-[date:custom:m]/' . $files[1]->filename)); } - $img1_size = filesize($files[0]->uri); - $img2_size = filesize($files[1]->uri); $img1_mime = \Drupal::service('file.mime_type.guesser')->guess($files[0]->uri); $img2_mime = \Drupal::service('file.mime_type.guesser')->guess($files[1]->uri); diff --git a/tests/src/FunctionalJavascript/LoginAdminTrait.php b/tests/src/FunctionalJavascript/LoginAdminTrait.php index baf3032..6ddd332 100644 --- a/tests/src/FunctionalJavascript/LoginAdminTrait.php +++ b/tests/src/FunctionalJavascript/LoginAdminTrait.php @@ -28,6 +28,7 @@ trait LoginAdminTrait { 'administer node form display', 'administer paragraph fields', 'administer paragraph form display', + 'bypass node access', ]; if ($reset_permissions) {