From 91b2327cca160909a15facfb990f4f5a8ddd6a69 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Tue, 22 Jun 2021 16:16:08 +0100
Subject: [PATCH] Issue #2902540 by guilhermevp, Spokje, longwave, quietone,
mfernea: Fix 'Drupal.NamingConventions.ValidGlobal' coding standard
---
.../field/tests/modules/field_test/field_test.module | 3 +--
core/phpcs.xml.dist | 1 +
.../Drupal/KernelTests/Core/Entity/EntityQueryTest.php | 6 ++++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/core/modules/field/tests/modules/field_test/field_test.module b/core/modules/field/tests/modules/field_test/field_test.module
index 2ec952dd196a..ec567dc139f3 100644
--- a/core/modules/field/tests/modules/field_test/field_test.module
+++ b/core/modules/field/tests/modules/field_test/field_test.module
@@ -169,8 +169,7 @@ function field_test_query_efq_table_prefixing_test_alter(&$query) {
* @see \Drupal\system\Tests\Entity\EntityQueryTest::testMetaData()
*/
function field_test_query_efq_metadata_test_alter(&$query) {
- global $efq_test_metadata;
- $efq_test_metadata = $query->getMetadata('foo');
+ field_test_memorize(__FUNCTION__, $query->getMetadata('foo'));
}
/**
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 86c639f99fe1..661496624d70 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -163,6 +163,7 @@
</properties>
</rule>
<rule ref="Drupal.NamingConventions.ValidClassName"/>
+ <rule ref="Drupal.NamingConventions.ValidGlobal"/>
<rule ref="Generic.NamingConventions.ConstructorName"/>
<rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
<rule ref="Generic.PHP.DeprecatedFunctions"/>
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php
index c1af0b9120a1..ffbf5a59d31e 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php
@@ -768,14 +768,16 @@ protected function assertBundleOrder($order) {
* The tags and metadata should propagate to the SQL query object.
*/
public function testMetaData() {
+ field_test_memorize();
+
$query = $this->storage->getQuery()->accessCheck(FALSE);
$query
->addTag('efq_metadata_test')
->addMetaData('foo', 'bar')
->execute();
- global $efq_test_metadata;
- $this->assertEquals('bar', $efq_test_metadata, 'Tag and metadata propagated to the SQL query object.');
+ $mem = field_test_memorize();
+ $this->assertEquals('bar', $mem['field_test_query_efq_metadata_test_alter'][0], 'Tag and metadata propagated to the SQL query object.');
}
/**
--
GitLab