Revert "fix: #2339921 Undefined variable: groups in... (f6db08c6) · Commits · project / drupal

core/.phpstan-baseline.php

+6 −0

Original line number	Diff line number	Diff line
		@@ -40525,6 +40525,12 @@
		'count' => 1,
		'path' => __DIR__ . '/modules/views/src/Plugin/views/filter/FilterPluginBase.php',
		];
		$ignoreErrors[] = [
		'message' => '#^Variable \\$groups might not be defined\\.$#',
		'identifier' => 'variable.undefined',
		'count' => 1,
		'path' => __DIR__ . '/modules/views/src/Plugin/views/filter/FilterPluginBase.php',
		];
		$ignoreErrors[] = [
		'message' => '#^Method Drupal\\\\views\\\\Plugin\\\\views\\\\filter\\\\GroupByNumeric\\:\\:adminLabel\$\$ has no return type specified\\.$#',
		'identifier' => 'missingType.return',

core/modules/views/src/Plugin/views/filter/FilterPluginBase.php

+3 −4

Original line number	Diff line number	Diff line
		@@ -990,7 +990,6 @@ protected function buildGroupOptions() {
		* filter.
		*/
		public function groupForm(&$form, FormStateInterface $form_state) {
		$groups = [];
		if (!empty($this->options['group_info']['optional']) && !$this->multipleExposedInput()) {
		$groups = ['All' => $this->t('- Any -')];
		}
		@@ -1502,7 +1501,7 @@ public function convertExposedInput(&$input, $selected_group_id = NULL) {
		$selected_group = $selected_group_id;
		}
		else {
		$selected_group = $input[$this->options['group_info']['identifier']] ?? NULL;
		$selected_group = $input[$this->options['group_info']['identifier']];
		}
		if ($selected_group == 'All' && !empty($this->options['group_info']['optional'])) {
		return NULL;
		@@ -1616,10 +1615,10 @@ public function acceptExposedInput($input) {

		if (!empty($this->options['expose']['identifier'])) {
		if ($this->options['is_grouped']) {
		$value = $input[$this->options['group_info']['identifier']] ?? NULL;
		$value = $input[$this->options['group_info']['identifier']];
		}
		else {
		$value = $input[$this->options['expose']['identifier']] ?? NULL;
		$value = $input[$this->options['expose']['identifier']];
		}

		// Various ways to check for the absence of non-required input.

core/modules/views/tests/modules/views_test_config/test_views/views.view.test_empty_group_form.yml

deleted100644 → 0

+0 −160

Original line number	Diff line number	Diff line
		langcode: en
		status: true
		dependencies:
		module:
		- node
		id: test_empty_group_form
		label: test_empty_group_form
		module: node
		description: ''
		tag: default
		base_table: node_field_data
		base_field: nid
		display:
		default:
		id: default
		display_title: Default
		display_plugin: default
		position: 0
		display_options:
		title: Content
		fields:
		title:
		id: title
		table: node_field_data
		field: title
		entity_type: node
		entity_field: title
		plugin_id: field
		label: Title
		exclude: false
		alter:
		alter_text: false
		element_class: ''
		element_default_classes: true
		empty: ''
		hide_empty: false
		empty_zero: false
		hide_alter_empty: true
		type: string
		settings:
		link_to_entity: true
		pager:
		type: none
		options:
		offset: 0
		exposed_form:
		type: basic
		options:
		submit_button: Filter
		reset_button: true
		reset_button_label: Reset
		exposed_sorts_label: 'Sort by'
		expose_sort_order: true
		sort_asc_label: Asc
		sort_desc_label: Desc
		access:
		type: none
		options: { }
		cache:
		type: tag
		empty: { }
		sorts: { }
		arguments: { }
		filters:
		status:
		id: status
		table: node_field_data
		field: status
		relationship: none
		group_type: group
		admin_label: ''
		entity_type: node
		entity_field: status
		plugin_id: boolean
		operator: '='
		value: '1'
		group: 1
		exposed: true
		expose:
		operator_id: ''
		label: Status
		description: ''
		use_operator: false
		operator: status_op
		operator_limit_selection: false
		operator_list: { }
		identifier: status
		required: false
		remember: false
		multiple: false
		remember_roles:
		authenticated: authenticated
		is_grouped: true
		group_info:
		label: 'Published status'
		description: ''
		identifier: status
		optional: false
		widget: select
		multiple: false
		remember: false
		default_group: All
		default_group_multiple: { }
		group_items: { }
		filter_groups:
		operator: AND
		groups:
		1: AND
		style:
		type: default
		options:
		grouping: { }
		row_class: ''
		default_row_class: true
		row:
		type: fields
		query:
		type: views_query
		relationships: { }
		show_admin_links: false
		display_extenders: { }
		cache_metadata:
		max-age: -1
		contexts:
		- 'languages:language_content'
		- 'languages:language_interface'
		- url
		- 'user.node_grants:view'
		tags: { }
		page_1:
		id: page_1
		display_title: Page
		display_plugin: page
		position: 1
		display_options:
		display_extenders: { }
		path: test-empty-groups
		menu:
		type: none
		title: Content
		description: ''
		weight: -10
		expanded: false
		menu_name: admin
		parent: ''
		context: '0'
		tab_options:
		type: normal
		title: Content
		description: 'Find and manage content'
		weight: -10
		menu_name: admin
		cache_metadata:
		max-age: -1
		contexts:
		- 'languages:language_content'
		- 'languages:language_interface'
		- url
		- 'user.node_grants:view'
		tags: { }

core/modules/views/tests/src/Functional/FilterGroupFormTest.php

deleted100644 → 0

+0 −42

Original line number	Diff line number	Diff line
		<?php

		declare(strict_types=1);

		namespace Drupal\Tests\views\Functional;

		use PHPUnit\Framework\Attributes\Group;
		use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;

		/**
		* Tests the filter group form.
		*/
		#[Group('views')]
		#[RunTestsInSeparateProcesses]
		class FilterGroupFormTest extends ViewTestBase {

		/**
		* Views used by this test.
		*
		* @var array
		*/
		public static array $testViews = ['test_empty_group_form'];

		/**
		* {@inheritdoc}
		*/
		protected $defaultTheme = 'stark';

		/**
		* {@inheritdoc}
		*/
		protected static $modules = ['node'];

		/**
		* Tests a view with a grouped filter with empty options.
		*/
		public function testFilterGroupFormEmpty(): void {
		$this->drupalGet('/test-empty-groups');
		$this->assertSession()->statusCodeEquals(200);
		}

		}