Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 0 additions & 3 deletions src/Test/MakerTestDetails.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
11 changes: 5 additions & 6 deletions src/Test/MakerTestEnvironment.php
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
Expand Down Expand Up @@ -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
Expand Down