summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathaniel Catchpole2018-07-13 13:25:42 (GMT)
committerNathaniel Catchpole2018-07-13 13:25:42 (GMT)
commit5e4ce076324abfbb783f00b6158b04a922b64ed5 (patch)
treeb08fbc898408fbed7346af2cd966351e9004253d
parentb55ed6bd46f0dd189c25cbd842ac9495baf41d67 (diff)
Issue #2981556 by alexpott: Properly deprecate EntityCacheTagsTestBase and remove incorrect references
-rw-r--r--core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php4
-rw-r--r--core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php4
2 files changed, 6 insertions, 2 deletions
diff --git a/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
index d215df5..517e1c6 100644
--- a/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
+++ b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
@@ -14,11 +14,15 @@ use Drupal\system\Tests\Cache\PageCacheTagsTestBase;
use Drupal\user\Entity\Role;
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.
*
* @deprecated Scheduled for removal in Drupal 9.0.0.
* Use \Drupal\Tests\system\Functional\Entity\EntityCacheTagsTestBase instead.
+ *
+ * @see https://www.drupal.org/node/2946549
*/
abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
diff --git a/core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php b/core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php
index c043a24..447afbf 100644
--- a/core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php
+++ b/core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php
@@ -153,7 +153,7 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
* @return string[]
* 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) {
return [];
@@ -167,7 +167,7 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
* @return array
* 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) {
return [];