' . t('The handler for this item is broken or missing. The following details are available:') . '
'; + $description_bottom = '' . t('Enabling the appropriate module may solve this issue. Otherwise, check to see if there is a module update available.') . '
'; + foreach ($types as $type => $class) { + foreach ($items as $item) { + $handler = $this->container->get('plugin.manager.views.' . $type) + ->getHandler($item); + $this->assertTrue($handler instanceof $class); + // Make sure details available at edit form. + $form = []; + $handler->buildOptionsForm($form, $form_state); + $this->assertEquals($description_top, $form['description']['description_top']['#markup']); + $this->assertEquals($description_bottom, $form['description']['description_bottom']['#markup']); + $details = []; + foreach ($item as $key => $value) { + $details[] = new FormattableMarkup('@key: @value', ['@key' => $key, '@value' => $value]); + } + $this->assertEquals($details, $form['description']['detail_list']['#items']); + } } $views_data = $this->viewsData(); @@ -77,61 +108,6 @@ class ModuleTest extends ViewsKernelTestBase { ]; $handler = $this->container->get('plugin.manager.views.filter')->getHandler($item, 'standard'); $this->assertInstanceOf(Standard::class, $handler); - - // @todo Reinstate these tests when the debug() in views_get_handler() is - // restored. - return; - - // Test non-existent tables/fields. - set_error_handler([$this, 'customErrorHandler']); - $item = [ - 'table' => 'views_test_data', - 'field' => 'field_invalid', - ]; - $this->container->get('plugin.manager.views.field')->getHandler($item); - $this->assertStringContainsString(new FormattableMarkup("Missing handler: @table @field @type", ['@table' => 'views_test_data', '@field' => 'field_invalid', '@type' => 'field']), $this->lastErrorMessage, 'An invalid field name throws a debug message.'); - unset($this->lastErrorMessage); - - $item = [ - 'table' => 'table_invalid', - 'field' => 'id', - ]; - $this->container->get('plugin.manager.views.filter')->getHandler($item); - $this->assertStringContainsString(new FormattableMarkup("Missing handler: @table @field @type", ['@table' => 'table_invalid', '@field' => 'id', '@type' => 'filter']), $this->lastErrorMessage, 'An invalid table name throws a debug message.'); - unset($this->lastErrorMessage); - - $item = [ - 'table' => 'table_invalid', - 'field' => 'id', - ]; - $this->container->get('plugin.manager.views.filter')->getHandler($item); - $this->assertStringContainsString(new FormattableMarkup("Missing handler: @table @field @type", ['@table' => 'table_invalid', '@field' => 'id', '@type' => 'filter']), $this->lastErrorMessage, 'An invalid table name throws a debug message.'); - unset($this->lastErrorMessage); - - restore_error_handler(); - } - - /** - * Defines an error handler which is used in the test. - * - * Because this is registered in set_error_handler(), it has to be public. - * - * @param int $error_level - * The level of the error raised. - * @param string $message - * The error message. - * @param string $filename - * The filename that the error was raised in. - * @param int $line - * The line number the error was raised at. - * @param array $context - * An array that points to the active symbol table at the point the error - * occurred. - * - * @see set_error_handler() - */ - public function customErrorHandler($error_level, $message, $filename, $line, $context) { - $this->lastErrorMessage = $message; } /** diff --git a/web/core/modules/views/tests/src/Kernel/ViewsConfigUpdaterTest.php b/web/core/modules/views/tests/src/Kernel/ViewsConfigUpdaterTest.php index d17e60ac..f8c416f9 100644 --- a/web/core/modules/views/tests/src/Kernel/ViewsConfigUpdaterTest.php +++ b/web/core/modules/views/tests/src/Kernel/ViewsConfigUpdaterTest.php @@ -19,6 +19,11 @@ class ViewsConfigUpdaterTest extends ViewsKernelTestBase { */ protected $configUpdater; + /** + * {@inheritdoc} + */ + public static $modules = ['views_config_entity_test']; + /** * {@inheritdoc} */ diff --git a/web/core/modules/views/tests/src/Unit/ViewsTest.php b/web/core/modules/views/tests/src/Unit/ViewsTest.php index f6dbaadb..f14adae2 100644 --- a/web/core/modules/views/tests/src/Unit/ViewsTest.php +++ b/web/core/modules/views/tests/src/Unit/ViewsTest.php @@ -2,6 +2,7 @@ namespace Drupal\Tests\views\Unit; +use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Tests\UnitTestCase; use Drupal\views\Views; @@ -72,6 +73,21 @@ class ViewsTest extends UnitTestCase { $this->assertEquals(spl_object_hash($view), spl_object_hash($executable->storage)); } + /** + * Tests the getView() method against a non-existent view. + * + * @covers ::getView + */ + public function testGetNonExistentView() { + $entity_type_manager = $this->prophesize(EntityTypeManagerInterface::class); + $storage = $this->prophesize(EntityStorageInterface::class); + $storage->load('test_view_non_existent')->willReturn(NULL); + $entity_type_manager->getStorage('view')->willReturn($storage->reveal()); + $this->container->set('entity_type.manager', $entity_type_manager->reveal()); + $executable_does_not_exist = Views::getView('test_view_non_existent'); + $this->assertNull($executable_does_not_exist); + } + /** * @covers ::getApplicableViews * diff --git a/web/core/modules/views/views.module b/web/core/modules/views/views.module index 398b670f..f9f2946c 100644 --- a/web/core/modules/views/views.module +++ b/web/core/modules/views/views.module @@ -624,6 +624,7 @@ function views_disable_view(View $view) { * @param array $element * An associative array containing the properties of the element. * Properties used: #substitutions, #children. + * * @return array * The $element with prepared variables ready for #theme 'form' * in views_form_views_form. @@ -777,6 +778,7 @@ function views_embed_view($name, $display_id = 'default') { * Everything after #views-tab- is the display ID, e.g. page_1. * @param ... * Any additional parameters will be passed as arguments. + * * @return array * An array containing an object for each view item. */ diff --git a/web/core/modules/views/views.theme.inc b/web/core/modules/views/views.theme.inc index ba955976..019899ad 100644 --- a/web/core/modules/views/views.theme.inc +++ b/web/core/modules/views/views.theme.inc @@ -664,20 +664,22 @@ function template_preprocess_views_view_table(&$variables) { // variables, although core templates now all use 'summary_element' instead. $variables['summary'] = $handler->options['summary']; $variables['description'] = $handler->options['description']; - $variables['summary_element'] = [ - '#type' => 'details', - '#title' => $handler->options['summary'], - // To ensure that the description is properly escaped during rendering, use - // an 'inline_template' to let Twig do its magic, instead of 'markup'. - 'description' => [ - '#type' => 'inline_template', - '#template' => '{{ description }}', - '#context' => [ - 'description' => $handler->options['description'], + if (!empty($handler->options['summary']) || !empty($handler->options['description'])) { + $variables['summary_element'] = [ + '#type' => 'details', + '#title' => $handler->options['summary'], + // To ensure that the description is properly escaped during rendering, + // use an 'inline_template' to let Twig do its magic, instead of 'markup'. + 'description' => [ + '#type' => 'inline_template', + '#template' => '{{ description }}', + '#context' => [ + 'description' => $handler->options['description'], + ], ], - ], - ]; - $variables['caption_needed'] |= !empty($variables['summary']) || !empty($variables['description']); + ]; + $variables['caption_needed'] = TRUE; + } $variables['responsive'] = FALSE; // If the table has headers and it should react responsively to columns hidden diff --git a/web/core/modules/views_ui/tests/src/Functional/AnalyzeTest.php b/web/core/modules/views_ui/tests/src/Functional/AnalyzeTest.php index 2ad5adc5..fcf0d850 100644 --- a/web/core/modules/views_ui/tests/src/Functional/AnalyzeTest.php +++ b/web/core/modules/views_ui/tests/src/Functional/AnalyzeTest.php @@ -35,7 +35,7 @@ class AnalyzeTest extends UITestBase { $this->drupalLogin($this->adminUser); $this->drupalGet('admin/structure/views/view/test_view/edit'); - $this->assertLink(t('Analyze view')); + $this->assertSession()->linkExists(t('Analyze view')); // This redirects the user to the analyze form. $this->clickLink(t('Analyze view')); diff --git a/web/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php b/web/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php index 6a5a75f0..7a356d00 100644 --- a/web/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php +++ b/web/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php @@ -53,7 +53,7 @@ class DefaultViewsTest extends UITestBase { // It should not be possible to revert the view yet. // @todo Figure out how to handle this with the new configuration system. - // $this->assertNoLink(t('Revert')); + // $this->assertSession()->linkNotExists(t('Revert')); // $revert_href = 'admin/structure/views/view/glossary/revert'; // $this->assertNoLinkByHref($revert_href); @@ -81,7 +81,7 @@ class DefaultViewsTest extends UITestBase { // It should now be possible to revert the view. Do that, and make sure the // view title we added above no longer is displayed. // $this->drupalGet('admin/structure/views'); - // $this->assertLink(t('Revert')); + // $this->assertSession()->linkExists(t('Revert')); // $this->assertLinkByHref($revert_href); // $this->drupalPostForm($revert_href, array(), t('Revert')); // $this->drupalGet('glossary'); diff --git a/web/core/modules/views_ui/tests/src/Functional/DisplayCRUDTest.php b/web/core/modules/views_ui/tests/src/Functional/DisplayCRUDTest.php index b24efd5e..f5100414 100644 --- a/web/core/modules/views_ui/tests/src/Functional/DisplayCRUDTest.php +++ b/web/core/modules/views_ui/tests/src/Functional/DisplayCRUDTest.php @@ -47,8 +47,8 @@ class DisplayCRUDTest extends UITestBase { $this->drupalPostForm(NULL, [], 'Add Page'); $this->assertLinkByHref($path_prefix . '/page_1', 0, 'Make sure after adding a display the new display appears in the UI'); - $this->assertNoLink('Master*', 'Make sure the master display is not marked as changed.'); - $this->assertLink('Page*', 0, 'Make sure the added display is marked as changed.'); + $this->assertSession()->linkNotExists('Master*', 'Make sure the master display is not marked as changed.'); + $this->assertSession()->linkExists('Page*', 0, 'Make sure the added display is marked as changed.'); $this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/page_1/path", ['path' => 'test/path'], t('Apply')); $this->drupalPostForm(NULL, [], t('Save')); diff --git a/web/core/modules/views_ui/tests/src/Functional/DisplayExtenderUITest.php b/web/core/modules/views_ui/tests/src/Functional/DisplayExtenderUITest.php index 9a4edbc3..5b01e7f5 100644 --- a/web/core/modules/views_ui/tests/src/Functional/DisplayExtenderUITest.php +++ b/web/core/modules/views_ui/tests/src/Functional/DisplayExtenderUITest.php @@ -38,7 +38,7 @@ class DisplayExtenderUITest extends UITestBase { $random_text = $this->randomMachineName(); $this->drupalPostForm($display_option_url, ['test_extender_test_option' => $random_text], t('Apply')); - $this->assertLink($random_text); + $this->assertSession()->linkExists($random_text); $this->drupalPostForm(NULL, [], t('Save')); $view = Views::getView($view->storage->id()); $view->initDisplay(); diff --git a/web/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php b/web/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php index e4ba28fa..d73df00a 100644 --- a/web/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php +++ b/web/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php @@ -57,7 +57,7 @@ class DisplayPathTest extends UITestBase { // Add a new page display and check the appearing text. $this->drupalPostForm(NULL, [], 'Add Page'); $this->assertText(t('No path is set'), 'The right text appears if no path was set.'); - $this->assertNoLink(t('View @display', ['@display' => 'page']), 'No view page link found on the page.'); + $this->assertSession()->linkNotExists(t('View @display', ['@display' => 'page']), 'No view page link found on the page.'); // Save a path and make sure the summary appears as expected. $random_path = $this->randomMachineName(); @@ -68,7 +68,7 @@ class DisplayPathTest extends UITestBase { $this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_1/path', ['path' => $random_path], t('Apply')); $this->assertText('/' . $random_path, 'The custom path appears in the summary.'); $display_link_text = t('View @display', ['@display' => 'Page']); - $this->assertLink($display_link_text, 0, 'view page link found on the page.'); + $this->assertSession()->linkExists($display_link_text, 0, 'view page link found on the page.'); $this->clickLink($display_link_text); $this->assertUrl($random_path); } @@ -159,7 +159,7 @@ class DisplayPathTest extends UITestBase { $this->assertUrl('admin/structure/views/view/test_view/edit/page_1'); $this->drupalGet('admin/structure/views/view/test_view'); - $this->assertLink(t('Tab: @title', ['@title' => 'Test tab title'])); + $this->assertSession()->linkExists(t('Tab: @title', ['@title' => 'Test tab title'])); // If it's a default tab, it should also have an additional settings link. $this->assertLinkByHref('admin/structure/views/nojs/display/test_view/page_1/tab_options'); diff --git a/web/core/modules/views_ui/tests/src/Functional/DisplayTest.php b/web/core/modules/views_ui/tests/src/Functional/DisplayTest.php index d2b03327..d3577f8a 100644 --- a/web/core/modules/views_ui/tests/src/Functional/DisplayTest.php +++ b/web/core/modules/views_ui/tests/src/Functional/DisplayTest.php @@ -173,7 +173,7 @@ class DisplayTest extends UITestBase { // The form redirects to the master display. $this->drupalGet($path); - $this->assertLink(t('Custom URL'), 0, 'The link option has custom URL as summary.'); + $this->assertSession()->linkExists(t('Custom URL'), 0, 'The link option has custom URL as summary.'); // Test the default link_url value for new display $this->drupalPostForm(NULL, [], t('Add Block')); diff --git a/web/core/modules/views_ui/tests/src/Functional/FilterUITest.php b/web/core/modules/views_ui/tests/src/Functional/FilterUITest.php index 6422bb48..dc43ab99 100644 --- a/web/core/modules/views_ui/tests/src/Functional/FilterUITest.php +++ b/web/core/modules/views_ui/tests/src/Functional/FilterUITest.php @@ -41,7 +41,10 @@ class FilterUITest extends UITestBase { * Tests that an option for a filter is saved as expected from the UI. */ public function testFilterInOperatorUi() { - $admin_user = $this->drupalCreateUser(['administer views', 'administer site configuration']); + $admin_user = $this->drupalCreateUser([ + 'administer views', + 'administer site configuration', + ]); $this->drupalLogin($admin_user); $path = 'admin/structure/views/nojs/handler/test_filter_in_operator_ui/default/filter/type'; @@ -64,12 +67,15 @@ class FilterUITest extends UITestBase { * Tests the filters from the UI. */ public function testFiltersUI() { - $admin_user = $this->drupalCreateUser(['administer views', 'administer site configuration']); + $admin_user = $this->drupalCreateUser([ + 'administer views', + 'administer site configuration', + ]); $this->drupalLogin($admin_user); $this->drupalGet('admin/structure/views/view/test_filter_groups'); - $this->assertLink('Content: ID (= 1)', 0, 'Content: ID (= 1) link appears correctly.'); + $this->assertSession()->linkExists('Content: ID (= 1)', 0, 'Content: ID (= 1) link appears correctly.'); // Tests that we can create a new filter group from UI. $this->drupalGet('admin/structure/views/nojs/rearrange-filter/test_filter_groups/page'); @@ -96,7 +102,10 @@ class FilterUITest extends UITestBase { * Tests the identifier settings and restrictions. */ public function testFilterIdentifier() { - $admin_user = $this->drupalCreateUser(['administer views', 'administer site configuration']); + $admin_user = $this->drupalCreateUser([ + 'administer views', + 'administer site configuration', + ]); $this->drupalLogin($admin_user); $path = 'admin/structure/views/nojs/handler/test_filter_in_operator_ui/default/filter/type'; diff --git a/web/core/modules/views_ui/tests/src/Functional/GroupByTest.php b/web/core/modules/views_ui/tests/src/Functional/GroupByTest.php index e79ff9d2..b393411d 100644 --- a/web/core/modules/views_ui/tests/src/Functional/GroupByTest.php +++ b/web/core/modules/views_ui/tests/src/Functional/GroupByTest.php @@ -42,7 +42,7 @@ class GroupByTest extends UITestBase { // Change the groupby type in the UI. $this->drupalPostForm($edit_groupby_url, ['options[group_type]' => 'count'], t('Apply')); - $this->assertLink('COUNT(Views test: ID)', 0, 'The count setting is displayed in the UI'); + $this->assertSession()->linkExists('COUNT(Views test: ID)', 0, 'The count setting is displayed in the UI'); $this->drupalPostForm(NULL, [], t('Save')); diff --git a/web/core/modules/views_ui/tests/src/Functional/RowUITest.php b/web/core/modules/views_ui/tests/src/Functional/RowUITest.php index 53c74ea4..bff992f5 100644 --- a/web/core/modules/views_ui/tests/src/Functional/RowUITest.php +++ b/web/core/modules/views_ui/tests/src/Functional/RowUITest.php @@ -52,7 +52,7 @@ class RowUITest extends UITestBase { $this->assertFieldByName('row_options[test_option]', $random_name, 'Make sure the custom settings form field has the expected value stored.'); $this->drupalPostForm($view_edit_url, [], t('Save')); - $this->assertLink(t('Test row plugin'), 0, 'Make sure the test row plugin is shown in the UI'); + $this->assertSession()->linkExists(t('Test row plugin'), 0, 'Make sure the test row plugin is shown in the UI'); $view = Views::getView($view_name); $view->initDisplay(); diff --git a/web/core/modules/views_ui/tests/src/Functional/SettingsTest.php b/web/core/modules/views_ui/tests/src/Functional/SettingsTest.php index 955a7c18..436c43bc 100644 --- a/web/core/modules/views_ui/tests/src/Functional/SettingsTest.php +++ b/web/core/modules/views_ui/tests/src/Functional/SettingsTest.php @@ -74,7 +74,7 @@ class SettingsTest extends UITestBase { $view['id'] = strtolower($this->randomMachineName()); $this->drupalPostForm('admin/structure/views/add', $view, t('Save and edit')); - $this->assertNoLink(t('Master')); + $this->assertSession()->linkNotExists(t('Master')); // Configure to always show the advanced settings. // @todo It doesn't seem to be a way to test this as this works just on js. diff --git a/web/core/modules/views_ui/tests/src/Functional/StyleUITest.php b/web/core/modules/views_ui/tests/src/Functional/StyleUITest.php index 0bd7e986..b85c65c5 100644 --- a/web/core/modules/views_ui/tests/src/Functional/StyleUITest.php +++ b/web/core/modules/views_ui/tests/src/Functional/StyleUITest.php @@ -51,7 +51,7 @@ class StyleUITest extends UITestBase { $this->assertFieldByName('style_options[test_option]', $random_name, 'Make sure the custom settings form field has the expected value stored.'); $this->drupalPostForm($view_edit_url, [], t('Save')); - $this->assertLink(t('Test style plugin'), 0, 'Make sure the test style plugin is shown in the UI'); + $this->assertSession()->linkExists(t('Test style plugin'), 0, 'Make sure the test style plugin is shown in the UI'); $view = Views::getView($view_name); $view->initDisplay(); diff --git a/web/core/modules/views_ui/tests/src/Functional/ViewEditTest.php b/web/core/modules/views_ui/tests/src/Functional/ViewEditTest.php index c5cef740..029ac924 100644 --- a/web/core/modules/views_ui/tests/src/Functional/ViewEditTest.php +++ b/web/core/modules/views_ui/tests/src/Functional/ViewEditTest.php @@ -29,7 +29,7 @@ class ViewEditTest extends UITestBase { */ public function testDeleteLink() { $this->drupalGet('admin/structure/views/view/test_view'); - $this->assertLink(t('Delete view'), 0, 'Ensure that the view delete link appears'); + $this->assertSession()->linkExists(t('Delete view'), 0, 'Ensure that the view delete link appears'); $view = $this->container->get('entity_type.manager')->getStorage('view')->load('test_view'); $this->assertInstanceOf(View::class, $view); @@ -59,7 +59,7 @@ class ViewEditTest extends UITestBase { // Change the machine name for the display from page_1 to test_1. $edit = ['display_id' => 'test_1']; $this->drupalPostForm('admin/structure/views/nojs/display/test_view/attachment_1/display_id', $edit, 'Apply'); - $this->assertLink(t('test_1')); + $this->assertSession()->linkExists(t('test_1')); // Save the view, and test the new ID has been saved. $this->drupalPostForm(NULL, [], 'Save'); @@ -73,7 +73,7 @@ class ViewEditTest extends UITestBase { $edit = ['display_id' => 'test_1']; $this->drupalPostForm('admin/structure/views/nojs/display/test_view/test_1/display_id', $edit, 'Apply'); $this->drupalPostForm(NULL, [], 'Save'); - $this->assertLink(t('test_1')); + $this->assertSession()->linkExists(t('test_1')); // Test the form validation with invalid IDs. $machine_name_edit_url = 'admin/structure/views/nojs/display/test_view/test_1/display_id'; @@ -103,7 +103,7 @@ class ViewEditTest extends UITestBase { // Test that the display ID has not been changed. $this->drupalGet('admin/structure/views/view/test_view/edit/test_1'); - $this->assertLink(t('test_1')); + $this->assertSession()->linkExists(t('test_1')); // Test that validation does not run on cancel. $this->drupalGet('admin/structure/views/view/test_view'); @@ -136,7 +136,7 @@ class ViewEditTest extends UITestBase { $langcode_url = 'admin/structure/views/nojs/display/' . $view_name . '/' . $display . '/rendering_language'; $this->assertNoLinkByHref($langcode_url); $assert_session->linkNotExistsExact(t('@type language selected for page', ['@type' => t('Content')])); - $this->assertNoLink(t('Content language of view row')); + $this->assertSession()->linkNotExists(t('Content language of view row')); } // Make the site multilingual and test the options again. @@ -153,12 +153,12 @@ class ViewEditTest extends UITestBase { if ($view_name == 'test_view') { $this->assertNoLinkByHref($langcode_url); $assert_session->linkNotExistsExact(t('@type language selected for page', ['@type' => t('Content')])); - $this->assertNoLink(t('Content language of view row')); + $this->assertSession()->linkNotExists(t('Content language of view row')); } else { $this->assertLinkByHref($langcode_url); $assert_session->linkNotExistsExact(t('@type language selected for page', ['@type' => t('Content')])); - $this->assertLink(t('Content language of view row')); + $this->assertSession()->linkExists(t('Content language of view row')); } $this->drupalGet($langcode_url); diff --git a/web/core/modules/views_ui/tests/src/Functional/ViewsListTest.php b/web/core/modules/views_ui/tests/src/Functional/ViewsListTest.php index d5ac50f7..ac4ebb46 100644 --- a/web/core/modules/views_ui/tests/src/Functional/ViewsListTest.php +++ b/web/core/modules/views_ui/tests/src/Functional/ViewsListTest.php @@ -50,7 +50,7 @@ class ViewsListTest extends UITestBase { // Check if we can access the main views admin page. $this->drupalGet('admin/structure/views'); $this->assertSession()->statusCodeEquals(200); - $this->assertLink(t('Add view')); + $this->assertSession()->linkExists(t('Add view')); // Check that there is a link to the content view without a destination // parameter. diff --git a/web/core/modules/views_ui/tests/src/Functional/ViewsUITourTest.php b/web/core/modules/views_ui/tests/src/Functional/ViewsUITourTest.php index 2dd089da..7c2d9d36 100644 --- a/web/core/modules/views_ui/tests/src/Functional/ViewsUITourTest.php +++ b/web/core/modules/views_ui/tests/src/Functional/ViewsUITourTest.php @@ -40,7 +40,10 @@ class ViewsUITourTest extends TourTestBase { protected function setUp() { parent::setUp(); - $this->adminUser = $this->drupalCreateUser(['administer views', 'access tour']); + $this->adminUser = $this->drupalCreateUser([ + 'administer views', + 'access tour', + ]); $this->drupalLogin($this->adminUser); } diff --git a/web/core/modules/views_ui/tests/src/Functional/XssTest.php b/web/core/modules/views_ui/tests/src/Functional/XssTest.php index 3e7fc34b..1af89e39 100644 --- a/web/core/modules/views_ui/tests/src/Functional/XssTest.php +++ b/web/core/modules/views_ui/tests/src/Functional/XssTest.php @@ -23,11 +23,13 @@ class XssTest extends UITestBase { public function testViewsUi() { $this->drupalGet('admin/structure/views/view/sa_contrib_2013_035'); - $this->assertEscaped('', 'Field admin label is properly escaped.'); + // Verify that the field admin label is properly escaped. + $this->assertEscaped(''); $this->drupalGet('admin/structure/views/nojs/handler/sa_contrib_2013_035/page_1/header/area'); - $this->assertEscaped('{{ title }} == ', 'Token label is properly escaped.'); - $this->assertEscaped('{{ title_1 }} == ', 'Token label is properly escaped.'); + // Verify that the token label is properly escaped. + $this->assertEscaped('{{ title }} == '); + $this->assertEscaped('{{ title_1 }} == '); } /** diff --git a/web/core/modules/views_ui/tests/src/FunctionalJavascript/ViewsListingTest.php b/web/core/modules/views_ui/tests/src/FunctionalJavascript/ViewsListingTest.php index f6a9976d..8d839e3c 100644 --- a/web/core/modules/views_ui/tests/src/FunctionalJavascript/ViewsListingTest.php +++ b/web/core/modules/views_ui/tests/src/FunctionalJavascript/ViewsListingTest.php @@ -133,6 +133,7 @@ class ViewsListingTest extends WebDriverTestBase { * Removes any non-visible elements from the passed array. * * @param array $elements + * * @return array */ protected function filterVisibleElements($elements) { diff --git a/web/core/modules/workspaces/src/ViewsQueryAlter.php b/web/core/modules/workspaces/src/ViewsQueryAlter.php index 485f51a8..2548db4e 100644 --- a/web/core/modules/workspaces/src/ViewsQueryAlter.php +++ b/web/core/modules/workspaces/src/ViewsQueryAlter.php @@ -378,6 +378,7 @@ class ViewsQueryAlter implements ContainerInjectionInterface { * * @return \Drupal\views\Plugin\views\join\JoinPluginInterface * An adjusted views join object to add to the query. + * * @throws \Drupal\Component\Plugin\Exception\PluginException */ protected function getRevisionTableJoin($relationship, $table, $field, $workspace_association_table, EntityTypeInterface $entity_type) { diff --git a/web/core/phpcs.xml.dist b/web/core/phpcs.xml.dist index 645e4e0f..623ef14c 100644 --- a/web/core/phpcs.xml.dist +++ b/web/core/phpcs.xml.dist @@ -59,7 +59,6 @@