fixes #28

narrowspark · Aug 3, 2018 · 9092214 · 9092214
1 parent d6f5122
commit 9092214
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 74 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,7 +24,14 @@ before_install:
 
 install:
   - composer global require hirak/prestissimo
-  - $COMPOSER_UP
+  - |
+    if [[ "$SETUP" = "high" ]]; then
+      $COMPOSER_UP
+    elif [[ "$SETUP" = "lowest" ]]; then
+      $COMPOSER_UP --prefer-lowest --prefer-stable;
+    else
+      $COMPOSER_UP
+    fi
 
 before_script:
   - wget https://cdn.rawgit.com/prisis/43a2a7b137998ac92e24ee4daaa8e296/raw/681b89b8e156750de46558ead661509c468fb9a2/try_catch.sh -P ./build/travis
@@ -34,10 +41,19 @@ script:
   - ./build/travis/script.sh
 
 jobs:
+  fast_finish: true
+  allow_failures:
+    - php: nightly
   include:
     - stage: Test
       php: 7.2
-      env: PHPUNIT=true REMOVE_XDEBUG=true
+      env: PHPUNIT=true SETUP=high REMOVE_XDEBUG=true
+    - stage: Test
+      php: 7.2
+      env: PHPUNIT=true SETUP=lowest REMOVE_XDEBUG=true
+    - stage: Test
+      php: nightly
+      env: PHPUNIT=true SETUP=high REMOVE_XDEBUG=true
 
     - stage: Coding standard
       php: 7.2

diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "composer-plugin-api": "^1.0"
     },
     "require-dev": {
-        "composer/composer": "^1.6.0",
+        "composer/composer": "^1.6.0 || ^1.7.0",
         "mockery/mockery": "^1.0.0",
         "narrowspark/coding-standard": "^1.1.0",
         "narrowspark/testing-helper": "^6.0.0",

diff --git a/composer.lock b/composer.lock
diff --git a/tests/Automatic/AutomaticTest.php b/tests/Automatic/AutomaticTest.php
@@ -19,6 +19,7 @@
 use Composer\Plugin\PluginManager;
 use Composer\Repository\RepositoryManager;
 use Composer\Repository\WritableRepositoryInterface;
+use Composer\Util\RemoteFilesystem;
 use Narrowspark\Automatic\Automatic;
 use Narrowspark\Automatic\Common\Traits\GetGenericPropertyReaderTrait;
 use Narrowspark\Automatic\Configurator;
@@ -155,9 +156,11 @@ public function testActivate(): void
             ->with(\Mockery::type(RepositoryManager::class))
             ->once();
 
-        $this->ioMock->shouldReceive('writeError')
-            ->once()
-            ->with('Composer >=1.7 not found, downloads will happen in sequence', true, IOInterface::DEBUG);
+        if (! \method_exists(RemoteFilesystem::class, 'getRemoteContents')) {
+            $this->ioMock->shouldReceive('writeError')
+                ->once()
+                ->with('Composer >=1.7 not found, downloads will happen in sequence', true, IOInterface::DEBUG);
+        }
 
         $inputMock = $this->mock(InputInterface::class);
         $inputMock->shouldReceive('getFirstArgument')

diff --git a/tests/Automatic/Installer/QuestionInstallationManagerTest.php b/tests/Automatic/Installer/QuestionInstallationManagerTest.php
@@ -13,6 +13,7 @@
 use Composer\Repository\RepositoryManager;
 use Composer\Repository\WritableRepositoryInterface;
 use Composer\Semver\VersionParser;
+use Composer\Util\RemoteFilesystem;
 use Mockery\MockInterface;
 use Narrowspark\Automatic\Common\Contract\Exception\InvalidArgumentException;
 use Narrowspark\Automatic\Common\Contract\Exception\RuntimeException;

diff --git a/tests/Automatic/Prefetcher/ParallelDownloaderTest.php b/tests/Automatic/Prefetcher/ParallelDownloaderTest.php
@@ -3,6 +3,7 @@
 namespace Narrowspark\Automatic\Test\Prefetcher;
 
 use Composer\IO\IOInterface;
+use Composer\Util\RemoteFilesystem;
 use Narrowspark\Automatic\Prefetcher\ParallelDownloader;
 use Narrowspark\Automatic\Test\Traits\ArrangeComposerClasses;
 use Narrowspark\TestingHelper\Phpunit\MockeryTestCase;
@@ -28,9 +29,11 @@ protected function setUp(): void
 
         $this->arrangeComposerClasses();
 
-        $this->ioMock->shouldReceive('writeError')
-            ->once()
-            ->with('Composer >=1.7 not found, downloads will happen in sequence', true, IOInterface::DEBUG);
+        if (! \method_exists(RemoteFilesystem::class, 'getRemoteContents')) {
+            $this->ioMock->shouldReceive('writeError')
+                ->once()
+                ->with('Composer >=1.7 not found, downloads will happen in sequence', true, IOInterface::DEBUG);
+        }
 
         $this->parallelDownloader = new ParallelDownloader($this->ioMock, $this->configMock);
     }

diff --git a/tests/Automatic/Traits/ArrangeComposerClasses.php b/tests/Automatic/Traits/ArrangeComposerClasses.php
@@ -5,6 +5,7 @@
 use Composer\Composer;
 use Composer\Config;
 use Composer\IO\IOInterface;
+use Composer\Util\RemoteFilesystem;
 use Narrowspark\Automatic\Lock;
 use Symfony\Component\Console\Input\InputInterface;
 
@@ -55,8 +56,17 @@ protected function arrangePackagist(): void
             ->andReturn(false);
         $this->ioMock->shouldReceive('writeError')
             ->with('Downloading https://packagist.org/packages.json', true, IOInterface::DEBUG);
-        $this->ioMock->shouldReceive('writeError')
-            ->once()
-            ->with('Writing ' . $this->composerCachePath . '/repo/https---packagist.org/packages.json into cache', true, IOInterface::DEBUG);
+
+        if (! \method_exists(RemoteFilesystem::class, 'getRemoteContents')) {
+            $this->ioMock->shouldReceive('writeError')
+                ->once()
+                ->with('Writing ' . $this->composerCachePath . '/repo/https---packagist.org/packages.json into cache', true, IOInterface::DEBUG);
+        } else {
+            $this->ioMock->shouldReceive('writeError')
+                ->with('Downloading https://repo.packagist.org/packages.json', true, IOInterface::DEBUG);
+            $this->ioMock->shouldReceive('writeError')
+                ->once()
+                ->with('Writing ' . $this->composerCachePath . '/repo/https---repo.packagist.org/packages.json into cache', true, IOInterface::DEBUG);
+        }
     }
 }