Commit f0f1da16 authored by catch's avatar catch
Browse files

Revert "Issue #3362083 by mondrake, smustgrave, longwave, Wim Leers:... 

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

This reverts commit 95136ba4.
parent 95136ba4

core/tests/Drupal/BuildTests/Composer/Component/ComponentsIsolatedBuildTest.php

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
 * @group Component

 *

 * @coversNothing

 *

 * @requires externalCommand composer

 */

class ComponentsIsolatedBuildTest extends ComposerBuildTestBase {

core/tests/Drupal/BuildTests/Composer/Component/ComponentsTaggedReleaseTest.php

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
 * @group Component

 *

 * @coversNothing

 *

 * @requires externalCommand composer

 */

class ComponentsTaggedReleaseTest extends ComposerBuildTestBase {

core/tests/Drupal/BuildTests/Composer/ComposerValidateTest.php

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


/**

 * @group Composer

 * @requires externalCommand composer

 */

class ComposerValidateTest extends BuildTestBase {

core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
 *

 * @group #slow

 * @group Template

 *

 * @requires externalCommand composer

 */

class ComposerProjectTemplatesTest extends ComposerBuildTestBase {

core/tests/Drupal/BuildTests/Framework/BuildTestBase.php

+10 −2
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
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;
@@ -53,7 +52,7 @@ 
 */

abstract class BuildTestBase extends TestCase {



  use RequiresComposerTrait;

  use ExternalCommandRequirementsTrait;

  use PhpUnitWarnings;

  use PhpUnitCompatibilityTrait;
@@ -150,11 +149,20 @@ 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.