Verified Commit 614ff9d2 authored by Dave Long's avatar Dave Long
Browse files

Issue #3418379 by mondrake, Spokje: Deprecate...

Issue #3418379 by mondrake, Spokje: Deprecate Drupal\Tests\TestRequirementsTrait::checkRequirements and ::checkModuleRequirements
parent d67efd43
Loading
Loading
Loading
Loading
Loading
+18 −18
Original line number Diff line number Diff line
@@ -147,45 +147,45 @@ protected function setUp(): void {

  /**
   * {@inheritdoc}
   *
   * @requires module irrelevant_for_this_test
   */
  public function testGetIndividual() {}
  public function testGetIndividual() {
    $this->markTestSkipped('Irrelevant for this test');
  }

  /**
   * {@inheritdoc}
   *
   * @requires module irrelevant_for_this_test
   */
  public function testPostIndividual() {}
  public function testPostIndividual() {
    $this->markTestSkipped('Irrelevant for this test');
  }

  /**
   * {@inheritdoc}
   *
   * @requires module irrelevant_for_this_test
   */
  public function testPatchIndividual() {}
  public function testPatchIndividual() {
    $this->markTestSkipped('Irrelevant for this test');
  }

  /**
   * {@inheritdoc}
   *
   * @requires module irrelevant_for_this_test
   */
  public function testDeleteIndividual() {}
  public function testDeleteIndividual() {
    $this->markTestSkipped('Irrelevant for this test');
  }

  /**
   * {@inheritdoc}
   *
   * @requires module irrelevant_for_this_test
   */
  public function testCollection() {}
  public function testCollection() {
    $this->markTestSkipped('Irrelevant for this test');
  }

  /**
   * {@inheritdoc}
   *
   * @requires module irrelevant_for_this_test
   */
  public function testRelationships() {}
  public function testRelationships() {
    $this->markTestSkipped('Irrelevant for this test');
  }

  /**
   * {@inheritdoc}
+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@
/**
 * @group Test
 * @group FunctionalTests
 * @group legacy
 *
 * @coversDefaultClass \Drupal\Tests\BrowserTestBase
 */
@@ -25,6 +26,7 @@ class BrowserTestBaseTest extends KernelTestBase {
   * @covers ::checkModuleRequirements
   */
  public function testMethodRequiresModule() {
    $this->expectDeprecation('Drupal\Tests\TestRequirementsTrait::checkModuleRequirements() is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3418480');
    require __DIR__ . '/../../../../fixtures/BrowserMissingDependentModuleMethodTest.php';

    // @phpstan-ignore-next-line
@@ -53,6 +55,7 @@ public function testMethodRequiresModule() {
   * @covers ::checkModuleRequirements
   */
  public function testRequiresModule() {
    $this->expectDeprecation('Drupal\Tests\TestRequirementsTrait::checkModuleRequirements() is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3418480');
    require __DIR__ . '/../../../../fixtures/BrowserMissingDependentModuleTest.php';

    // @phpstan-ignore-next-line
+1 −1
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ private function getExtensionsForModules(array $modules) {
    $list = $discovery->scan('module');
    foreach ($modules as $name) {
      if (!isset($list[$name])) {
        throw new Exception("Unavailable module: '$name'. If this module needs to be downloaded separately, annotate the test class with '@requires module $name'.");
        throw new Exception("Unavailable module: '$name'. If this module needs to be downloaded for testing, include it in the 'require-dev' section of your composer.json file.");
      }
      $extensions[$name] = $list[$name];
    }
+8 −0
Original line number Diff line number Diff line
@@ -281,8 +281,12 @@ public function testLocalTimeZone() {
   *
   * @covers ::checkRequirements
   * @covers ::checkModuleRequirements
   *
   * @group legacy
   */
  public function testMethodRequiresModule() {
    $this->expectDeprecation('Drupal\Tests\TestRequirementsTrait::checkModuleRequirements() is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3418480');

    require __DIR__ . '/../../fixtures/KernelMissingDependentModuleMethodTest.php';

    // @phpstan-ignore-next-line
@@ -309,8 +313,12 @@ public function testMethodRequiresModule() {
   *
   * @covers ::checkRequirements
   * @covers ::checkModuleRequirements
   *
   * @group legacy
   */
  public function testRequiresModule() {
    $this->expectDeprecation('Drupal\Tests\TestRequirementsTrait::checkModuleRequirements() is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3418480');

    require __DIR__ . '/../../fixtures/KernelMissingDependentModuleTest.php';

    // @phpstan-ignore-next-line
+14 −0
Original line number Diff line number Diff line
@@ -35,8 +35,15 @@ protected static function getDrupalRoot() {
   * @throws \PHPUnit\Framework\SkippedTestError
   *   Thrown when the requirements are not met, and this test should be
   *   skipped. Callers should not catch this exception.
   *
   * @deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is
   *   no replacement.
   *
   * @see https://www.drupal.org/node/3418480
   */
  protected function checkRequirements() {
    @trigger_error(__METHOD__ . '() is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3418480', E_USER_DEPRECATED);

    if (!$this->getName(FALSE) || !method_exists($this, $this->getName(FALSE))) {
      return;
    }
@@ -80,8 +87,15 @@ protected function checkRequirements() {
   * @throws \PHPUnit\Framework\SkippedTestError
   *   Thrown when the requirements are not met, and this test should be
   *   skipped. Callers should not catch this exception.
   *
   * @deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is
   *   no replacement.
   *
   * @see https://www.drupal.org/node/3418480
   */
  private function checkModuleRequirements($root, array $annotations) {
    @trigger_error(__METHOD__ . '() is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3418480', E_USER_DEPRECATED);

    // Make a list of required modules.
    $required_modules = [];
    foreach ($annotations as $requirement) {
Loading