diff --git a/.travis.yml b/.travis.yml index b8bff24f9..94249c448 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,9 +18,9 @@ matrix: fast_finish: true include: - php: 7.3 - - php: 7.1 + - php: 7.2 env: MAKER_TEST_VERSION=stable-dev - - php: 7.1 + - php: 7.2 env: MAKER_TEST_VERSION=dev before_install: diff --git a/src/Test/MakerTestDetails.php b/src/Test/MakerTestDetails.php index f1bbb298c..2d39f5431 100644 --- a/src/Test/MakerTestDetails.php +++ b/src/Test/MakerTestDetails.php @@ -47,9 +47,6 @@ final class MakerTestDetails private $guardAuthenticators = []; /** - * @param MakerInterface $maker - * @param array $inputs - * * @return static */ public static function createTest(MakerInterface $maker, array $inputs) diff --git a/src/Test/MakerTestEnvironment.php b/src/Test/MakerTestEnvironment.php index ff2f428e9..47370b0dc 100644 --- a/src/Test/MakerTestEnvironment.php +++ b/src/Test/MakerTestEnvironment.php @@ -199,11 +199,11 @@ private function preMake() public function runMaker() { - $this->preMake(); - // Lets remove cache $this->fs->remove($this->path.'/var/cache'); + $this->preMake(); + // We don't need ansi coloring in tests! $testProcess = MakerTestProcess::create( sprintf('php bin/console %s %s --no-ansi', $this->testDetails->getMaker()::getCommandName(), $this->testDetails->getArgumentsString()), @@ -350,12 +350,11 @@ private function buildFlexSkeleton() // fetch a few packages needed for testing MakerTestProcess::create('composer require phpunit browser-kit symfony/css-selector --prefer-dist --no-progress --no-suggest', $this->flexPath) ->run(); - $this->fs->remove($this->flexPath.'/vendor/symfony/phpunit-bridge'); if ('\\' !== \DIRECTORY_SEPARATOR) { - $this->fs->symlink('../../../../../../vendor/symfony/phpunit-bridge', './vendor/symfony/phpunit-bridge'); - } else { - $this->fs->mirror(\dirname(__DIR__, 2).'/vendor/symfony/phpunit-bridge', $this->flexPath.'/vendor/symfony/phpunit-bridge'); + $this->fs->remove($this->flexPath.'/vendor/symfony/phpunit-bridge'); + + $this->fs->symlink($rootPath.'/vendor/symfony/phpunit-bridge', $this->flexPath.'/vendor/symfony/phpunit-bridge'); } // temporarily ignoring indirect deprecations - see #237