Commit 95136ba4 authored by catch's avatar catch
Browse files

Issue #3362083 by mondrake, smustgrave, longwave, Wim Leers: '@requires...

Issue #3362083 by mondrake, smustgrave, longwave, Wim Leers: '@requires externalCommand' is not parsed in PHPUnit 10

(cherry picked from commit 6b2110cf)
parent 5c295724
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@
 * @group Component
 *
 * @coversNothing
 *
 * @requires externalCommand composer
 */
class ComponentsIsolatedBuildTest extends ComposerBuildTestBase {

+0 −2
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@
 * @group Component
 *
 * @coversNothing
 *
 * @requires externalCommand composer
 */
class ComponentsTaggedReleaseTest extends ComposerBuildTestBase {

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@

/**
 * @group Composer
 * @requires externalCommand composer
 */
class ComposerValidateTest extends BuildTestBase {

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@
 *
 * @group #slow
 * @group Template
 *
 * @requires externalCommand composer
 */
class ComposerProjectTemplatesTest extends ComposerBuildTestBase {

+2 −10
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@
use Drupal\Tests\DrupalTestBrowser;
use Drupal\Tests\PhpUnitCompatibilityTrait;
use Drupal\Tests\Traits\PhpUnitWarnings;
use Drupal\TestTools\Extension\RequiresComposerTrait;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Filesystem\Filesystem as SymfonyFilesystem;
use Symfony\Component\Finder\Finder;
@@ -52,7 +53,7 @@
 */
abstract class BuildTestBase extends TestCase {

  use ExternalCommandRequirementsTrait;
  use RequiresComposerTrait;
  use PhpUnitWarnings;
  use PhpUnitCompatibilityTrait;

@@ -149,20 +150,11 @@ abstract class BuildTestBase extends TestCase {
   */
  private PhpExecutableFinder $phpFinder;

  /**
   * {@inheritdoc}
   */
  public static function setUpBeforeClass(): void {
    parent::setUpBeforeClass();
    static::checkClassCommandRequirements();
  }

  /**
   * {@inheritdoc}
   */
  protected function setUp(): void {
    parent::setUp();
    static::checkMethodCommandRequirements($this->getName());
    $this->phpFinder = new PhpExecutableFinder();
    // Set up the workspace directory.
    // @todo Glean working directory from env vars, etc.
Loading