Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2981556 by alexpott: Properly deprecate EntityCacheTagsTestBase and remove incorrect references

merge-requests/1654/head
Nathaniel Catchpole 2018-07-13 14:25:42 +01:00
parent b55ed6bd46
commit 5e4ce07632
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
View File

@ -14,11 +14,15 @@ use Drupal\system\Tests\Cache\PageCacheTagsTestBase;
use Drupal\user\Entity\Role; use Drupal\user\Entity\Role;
use Drupal\user\RoleInterface; use Drupal\user\RoleInterface;
@trigger_error(__NAMESPACE__ . '\EntityCacheTagsTestBase is deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.0. Instead, use \Drupal\Tests\system\Functional\Entity\EntityCacheTagsTestBase. See https://www.drupal.org/node/2946549.', E_USER_DEPRECATED);
/** /**
* Provides helper methods for Entity cache tags tests. * Provides helper methods for Entity cache tags tests.
* *
* @deprecated Scheduled for removal in Drupal 9.0.0. * @deprecated Scheduled for removal in Drupal 9.0.0.
* Use \Drupal\Tests\system\Functional\Entity\EntityCacheTagsTestBase instead. * Use \Drupal\Tests\system\Functional\Entity\EntityCacheTagsTestBase instead.
*
* @see https://www.drupal.org/node/2946549
*/ */
abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase { abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {

4
core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php
View File

@ -153,7 +153,7 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
* @return string[] * @return string[]
* An array of the additional cache contexts. * An array of the additional cache contexts.
* *
* @see \Drupal\system\Tests\Entity\EntityCacheTagsTestBase::createEntity() * @see \Drupal\Tests\system\Functional\Entity\EntityCacheTagsTestBase::createEntity()
*/ */
protected function getAdditionalCacheContextsForEntity(EntityInterface $entity) { protected function getAdditionalCacheContextsForEntity(EntityInterface $entity) {
return []; return [];
@ -167,7 +167,7 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
* @return array * @return array
* An array of the additional cache tags. * An array of the additional cache tags.
* *
* @see \Drupal\system\Tests\Entity\EntityCacheTagsTestBase::createEntity() * @see \Drupal\Tests\system\Functional\Entity\EntityCacheTagsTestBase::createEntity()
*/ */
protected function getAdditionalCacheTagsForEntity(EntityInterface $entity) { protected function getAdditionalCacheTagsForEntity(EntityInterface $entity) {
return []; return [];