From 2defaa4e44067575b2c3965fda65f7c53e115d25 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Mon, 19 Mar 2018 13:20:22 +0000
Subject: [PATCH] Issue #2877030 by c.nish2k3, martin107, gaurav.kapoor,
Mile23, dawehner: Remove stale deprecated code
---
core/modules/system/src/Tests/Entity/EntityUnitTestBase.php | 4 +++-
.../Drupal/FunctionalJavascriptTests/JavascriptTestBase.php | 6 ++++--
core/tests/Drupal/KernelTests/KernelTestBase.php | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php b/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php
index 5d7dc6fd5d82..9997ca5650be 100644
--- a/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php
+++ b/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php
@@ -2,6 +2,8 @@
namespace Drupal\system\Tests\Entity;
+@trigger_error(__FILE__ . ' is deprecated in Drupal 8.1.0 and will be removed before Drupal 9.0.0. Use \Drupal\KernelTests\Core\Entity\EntityKernelTestBase instead.', E_USER_DEPRECATED);
+
use Drupal\simpletest\KernelTestBase;
use Drupal\Core\Entity\EntityInterface;
use Drupal\user\Entity\Role;
@@ -10,7 +12,7 @@
/**
* Defines an abstract test base for entity unit tests.
*
- * @deprecated in Drupal 8.1.x, will be removed before Drupal 8.2.x. Use
+ * @deprecated in Drupal 8.1.0, will be removed before Drupal 9.0.0. Use
* \Drupal\KernelTests\Core\Entity\EntityKernelTestBase instead.
*/
abstract class EntityUnitTestBase extends KernelTestBase {
diff --git a/core/tests/Drupal/FunctionalJavascriptTests/JavascriptTestBase.php b/core/tests/Drupal/FunctionalJavascriptTests/JavascriptTestBase.php
index 55b1284f708a..44b83c1633db 100644
--- a/core/tests/Drupal/FunctionalJavascriptTests/JavascriptTestBase.php
+++ b/core/tests/Drupal/FunctionalJavascriptTests/JavascriptTestBase.php
@@ -92,11 +92,12 @@ protected function getMinkDriverArgs() {
* @param string $message
* Optional message to show alongside the assertion.
*
- * @deprecated in Drupal 8.1.x, will be removed before Drupal 8.3.x. Use
+ * @deprecated in Drupal 8.1.0, will be removed before Drupal 9.0.0. Use
* \Behat\Mink\Element\NodeElement::isVisible() instead.
*/
protected function assertElementVisible($css_selector, $message = '') {
$this->assertTrue($this->getSession()->getDriver()->isVisible($this->cssSelectToXpath($css_selector)), $message);
+ @trigger_error('The ' . __METHOD__ . ' method is deprecated since version 8.1.0 and will be removed in 9.0.0. Use \Behat\Mink\Element\NodeElement::isVisible() instead.', E_USER_DEPRECATED);
}
/**
@@ -107,11 +108,12 @@ protected function assertElementVisible($css_selector, $message = '') {
* @param string $message
* Optional message to show alongside the assertion.
*
- * @deprecated in Drupal 8.1.x, will be removed before Drupal 8.3.x. Use
+ * @deprecated in Drupal 8.1.0, will be removed before Drupal 9.0.0. Use
* \Behat\Mink\Element\NodeElement::isVisible() instead.
*/
protected function assertElementNotVisible($css_selector, $message = '') {
$this->assertFalse($this->getSession()->getDriver()->isVisible($this->cssSelectToXpath($css_selector)), $message);
+ @trigger_error('The ' . __METHOD__ . ' method is deprecated since version 8.1.0 and will be removed in 9.0.0. Use \Behat\Mink\Element\NodeElement::isVisible() instead.', E_USER_DEPRECATED);
}
/**
diff --git a/core/tests/Drupal/KernelTests/KernelTestBase.php b/core/tests/Drupal/KernelTests/KernelTestBase.php
index 69cce6cd0061..4eeed6e6b209 100644
--- a/core/tests/Drupal/KernelTests/KernelTestBase.php
+++ b/core/tests/Drupal/KernelTests/KernelTestBase.php
@@ -1025,7 +1025,7 @@ protected function isTestInIsolation() {
* Test authors should follow the provided instructions and adjust their tests
* accordingly.
*
- * @deprecated in Drupal 8.0.x, will be removed before Drupal 8.2.0.
+ * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
*/
public function __get($name) {
if (in_array($name, [
--
GitLab