Security update for Core, with self-updated composer

[yaffs-website] / web / core / modules / views / tests / src / Unit / EntityViewsDataTest.php

diff --git a/web/core/modules/views/tests/src/Unit/EntityViewsDataTest.php b/web/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
index 195e3d4e9f8e2d94a64af0b7c481fea322e774f4..99bf037a088ae23dc9b90d053668eb067cb61e28 100644 (file)
--- a/web/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
+++ b/web/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
@@ -9,7 +9,6 @@ namespace Drupal\Tests\views\Unit;
 
 use Drupal\Core\Config\Entity\ConfigEntityType;
 use Drupal\Core\Entity\ContentEntityType;
-use Drupal\Core\Entity\EntityType;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\Sql\DefaultTableMapping;
 use Drupal\Core\Field\BaseFieldDefinition;
@@ -243,8 +242,7 @@ class EntityViewsDataTest extends UnitTestCase {
       ->set('revision_table', 'entity_test_mulrev_revision')
       ->set('revision_data_table', NULL)
       ->set('id', 'entity_test_mulrev')
-      ->setKey('revision', 'revision_id')
-    ;
+      ->setKey('revision', 'revision_id');
     $this->viewsData->setEntityType($entity_type);
 
     $data = $this->viewsData->getViewsData();
@@ -279,8 +277,7 @@ class EntityViewsDataTest extends UnitTestCase {
       ->set('revision_data_table', 'entity_test_mulrev_property_revision')
       ->set('id', 'entity_test_mulrev')
       ->set('translatable', TRUE)
-      ->setKey('revision', 'revision_id')
-    ;
+      ->setKey('revision', 'revision_id');
     $this->viewsData->setEntityType($entity_type);
 
     $data = $this->viewsData->getViewsData();
@@ -299,7 +296,9 @@ class EntityViewsDataTest extends UnitTestCase {
     $this->assertCount(1, $revision_field_data['table']['join']);
     $this->assertEquals([
       'entity_test_mul_property_data' => [
-        'left_field' => 'revision_id', 'field' => 'revision_id', 'type' => 'INNER'
+        'left_field' => 'revision_id',
+        'field' => 'revision_id',
+        'type' => 'INNER',
       ],
     ], $revision_field_data['table']['join']);
 
@@ -307,7 +306,9 @@ class EntityViewsDataTest extends UnitTestCase {
     $this->assertCount(1, $revision_base_data['table']['join']);
     $this->assertEquals([
       'entity_test_mulrev_property_revision' => [
-        'left_field' => 'revision_id', 'field' => 'revision_id', 'type' => 'INNER'
+        'left_field' => 'revision_id',
+        'field' => 'revision_id',
+        'type' => 'INNER',
       ],
     ], $revision_base_data['table']['join']);
 
@@ -323,8 +324,7 @@ class EntityViewsDataTest extends UnitTestCase {
       ->set('revision_data_table', 'entity_test_mulrev_property_revision')
       ->set('id', 'entity_test_mulrev')
       ->set('translatable', TRUE)
-      ->setKey('revision', 'revision_id')
-    ;
+      ->setKey('revision', 'revision_id');
     $this->viewsData->setEntityType($entity_type);
 
     $data = $this->viewsData->getViewsData();
@@ -343,7 +343,9 @@ class EntityViewsDataTest extends UnitTestCase {
     $this->assertCount(1, $revision_field_data['table']['join']);
     $this->assertEquals([
       'entity_test_mulrev_field_data' => [
-        'left_field' => 'revision_id', 'field' => 'revision_id', 'type' => 'INNER'
+        'left_field' => 'revision_id',
+        'field' => 'revision_id',
+        'type' => 'INNER',
       ],
     ], $revision_field_data['table']['join']);
 
@@ -351,7 +353,9 @@ class EntityViewsDataTest extends UnitTestCase {
     $this->assertCount(1, $revision_base_data['table']['join']);
     $this->assertEquals([
       'entity_test_mulrev_property_revision' => [
-        'left_field' => 'revision_id', 'field' => 'revision_id', 'type' => 'INNER'
+        'left_field' => 'revision_id',
+        'field' => 'revision_id',
+        'type' => 'INNER',
       ],
     ], $revision_base_data['table']['join']);
     $this->assertFalse(isset($data['data_table']));
@@ -533,10 +537,11 @@ class EntityViewsDataTest extends UnitTestCase {
       'left_field' => 'id',
       'field' => 'entity_id',
       'extra' => [[
-        'field' => 'deleted',
-        'value' => 0,
-        'numeric' => TRUE,
-      ]],
+          'field' => 'deleted',
+          'value' => 0,
+          'numeric' => TRUE,
+        ],
+      ],
     ], $data['entity_test__string']['table']['join']['entity_test']);
   }
 
@@ -548,8 +553,7 @@ class EntityViewsDataTest extends UnitTestCase {
       ->set('data_table', 'entity_test_mul_property_data')
       ->set('base_table', 'entity_test_mul')
       ->set('id', 'entity_test_mul')
-      ->setKey('bundle', 'type')
-    ;
+      ->setKey('bundle', 'type');
     $base_field_definitions = $this->setupBaseFields(EntityTestMul::baseFieldDefinitions($this->baseEntityType));
     $base_field_definitions['type'] = BaseFieldDefinition::create('entity_reference')
       ->setLabel('entity test type')
@@ -604,7 +608,7 @@ class EntityViewsDataTest extends UnitTestCase {
 
     $table_mapping->expects($this->any())
       ->method('getFieldTableName')
-      ->willReturnCallback(function($field) {
+      ->willReturnCallback(function ($field) {
         if ($field == 'uuid') {
           return 'entity_test_mul';
         }
@@ -688,10 +692,11 @@ class EntityViewsDataTest extends UnitTestCase {
       'left_field' => 'id',
       'field' => 'entity_id',
       'extra' => [[
-        'field' => 'deleted',
-        'value' => 0,
-        'numeric' => TRUE,
-      ]],
+          'field' => 'deleted',
+          'value' => 0,
+          'numeric' => TRUE,
+        ],
+      ],
     ], $data['entity_test_mul__string']['table']['join']['entity_test_mul']);
   }
 
@@ -777,7 +782,7 @@ class EntityViewsDataTest extends UnitTestCase {
 
     $table_mapping->expects($this->any())
       ->method('getFieldTableName')
-      ->willReturnCallback(function($field) {
+      ->willReturnCallback(function ($field) {
         if ($field == 'uuid') {
           return 'entity_test_mulrev';
         }
@@ -873,10 +878,11 @@ class EntityViewsDataTest extends UnitTestCase {
       'left_field' => 'id',
       'field' => 'entity_id',
       'extra' => [[
-        'field' => 'deleted',
-        'value' => 0,
-        'numeric' => TRUE,
-      ]],
+          'field' => 'deleted',
+          'value' => 0,
+          'numeric' => TRUE,
+        ],
+      ],
     ], $data['entity_test_mulrev__string']['table']['join']['entity_test_mulrev_property_data']);
 
     $this->assertStringField($data['entity_test_mulrev_revision__string']['string']);
@@ -885,10 +891,11 @@ class EntityViewsDataTest extends UnitTestCase {
       'left_field' => 'revision_id',
       'field' => 'entity_id',
       'extra' => [[
-        'field' => 'deleted',
-        'value' => 0,
-        'numeric' => TRUE,
-      ]],
+          'field' => 'deleted',
+          'value' => 0,
+          'numeric' => TRUE,
+        ],
+      ],
     ], $data['entity_test_mulrev_revision__string']['table']['join']['entity_test_mulrev_property_revision']);
   }
 
@@ -1087,7 +1094,7 @@ class TestEntityViewsData extends EntityViewsData {
 
 }
 
-class TestEntityType extends EntityType {
+class TestEntityType extends ContentEntityType {
 
   /**
    * Sets a specific entity key.