Use PhpUnit 8.5 when testing with nightly

maxhelias · Jul 13, 2020 · 2d99350 · 2d99350
1 parent afbf69b
commit 2d99350
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,6 +24,7 @@ env:
 
 before_install:
   - ([[ $TRAVIS_PHP_VERSION = nightly ]] && composer config platform.php 7.4.99 || true)
+  - [[ $TRAVIS_PHP_VERSION = nightly ]] && export SYMFONY_PHPUNIT_VERSION=8.5
   - composer validate
 
 install:

diff --git a/src/Command/RequireCommand.php b/src/Command/RequireCommand.php
@@ -53,7 +53,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $ret = parent::execute($input, $output) ?? 0;
 
-        if (0 !== $ret || $input->getOption('no-unpack') || $input->getOption('no-update')) {
+        if (0 !== $ret || $input->getOption('no-update')) {
             return $ret;
         }
 

diff --git a/src/Command/UnpackCommand.php b/src/Command/UnpackCommand.php
@@ -115,11 +115,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $lockData['content-hash'] = $locker->getContentHash(file_get_contents($json->getPath()));
         $lockFile = new JsonFile(substr($json->getPath(), 0, -4).'lock', null, $io);
 
-        if (!$input->getOption('dry-run')) {
+        $dryRun = $input->hasOption('dry-run') && !$input->getOption('dry-run');
+        if ($dryRun) {
             $lockFile->write($lockData);
         }
 
-        if ($input->getOption('no-install')) {
+        if ($input->hasOption('no-install') && $input->getOption('no-install')) {
             return 0;
         }
 
@@ -132,7 +133,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $composer->setLocker($locker);
         $install = Installer::create($io, $composer);
         $install
-            ->setDryRun($input->getOption('dry-run') ?? false)
+            ->setDryRun($dryRun)
             ->setDevMode(true)
             ->setDumpAutoloader(false)
             ->setRunScripts(false)