Commit 91b2327c authored by catch's avatar catch
Browse files

Issue #2902540 by guilhermevp, Spokje, longwave, quietone, mfernea: Fix... 

Issue #2902540 by guilhermevp, Spokje, longwave, quietone, mfernea: Fix 'Drupal.NamingConventions.ValidGlobal' coding standard
parent c8649779

core/modules/field/tests/modules/field_test/field_test.module

+1 −2
Original line number Diff line number Diff line
@@ -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'));

}



/**

core/phpcs.xml.dist

+1 −0
Original line number Diff line number Diff line
@@ -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"/>

core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php

+4 −2
Original line number Diff line number Diff line
@@ -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.');

  }



  /**