Add the compatibility with Composer 1.9

fxpio · Aug 8, 2019 · a5679e4 · a5679e4
1 parent ee835cf
commit a5679e4
Show file tree

Hide file tree

Showing 4 changed files with 250 additions and 136 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,42 +16,56 @@ matrix:
           env: COMPOSER_VERSION="1.7.*"
         - php: 5.5
           env: COMPOSER_VERSION="1.8.*"
+        - php: 5.5
+          env: COMPOSER_VERSION="1.9.*"
         - php: 5.6
           env: COMPOSER_VERSION="1.6.*"
         - php: 5.6
           env: COMPOSER_VERSION="1.7.*"
         - php: 5.6
           env: COMPOSER_VERSION="1.8.*"
+        - php: 5.6
+          env: COMPOSER_VERSION="1.9.*"
         - php: 7.0
           env: COMPOSER_VERSION="1.6.*"
         - php: 7.0
           env: COMPOSER_VERSION="1.7.*"
         - php: 7.0
           env: COMPOSER_VERSION="1.8.*"
+        - php: 7.0
+          env: COMPOSER_VERSION="1.9.*"
         - php: 7.1
           env: COMPOSER_VERSION="1.6.*"
         - php: 7.1
           env: COMPOSER_VERSION="1.7.*"
         - php: 7.1
           env: COMPOSER_VERSION="1.8.*"
+        - php: 7.1
+          env: COMPOSER_VERSION="1.9.*"
         - php: 7.2
           env: COMPOSER_VERSION="1.6.*"
         - php: 7.2
           env: COMPOSER_VERSION="1.7.*"
         - php: 7.2
           env: COMPOSER_VERSION="1.8.*"
+        - php: 7.2
+          env: COMPOSER_VERSION="1.9.*"
         - php: 7.3
           env: COMPOSER_VERSION="1.6.*"
         - php: 7.3
           env: COMPOSER_VERSION="1.7.*"
         - php: 7.3
           env: COMPOSER_VERSION="1.8.*"
+        - php: 7.3
+          env: COMPOSER_VERSION="1.9.*"
         - php: nightly
           env: COMPOSER_VERSION="1.6.*"
         - php: nightly
           env: COMPOSER_VERSION="1.7.*"
         - php: nightly
           env: COMPOSER_VERSION="1.8.*"
+        - php: nightly
+          env: COMPOSER_VERSION="1.9.*"
 
     allow_failures:
         - php: nightly
@@ -60,7 +74,7 @@ matrix:
 
 before_script:
     - composer self-update
-    - composer global require --prefer-source phpunit/phpunit:"^4.8 || ^5.7.0 || ^6.5.0" php-coveralls/php-coveralls:^2.1.0
+    - composer global require --prefer-source phpunit/phpunit:"^4.8 || ^5.7.0 || ^6.5.0 || ^7.5.0" php-coveralls/php-coveralls:^2.1.0
     - if [ "$COMPOSER_VERSION" == "" ]; then composer install --prefer-source; fi;
     - if [ "$COMPOSER_VERSION" != "" ]; then composer require "composer/composer:${COMPOSER_VERSION}" --no-update; fi;
     - if [ "$COMPOSER_VERSION" != "" ]; then composer update --prefer-source; fi;

diff --git a/Repository/AbstractAssetVcsRepository.php b/Repository/AbstractAssetVcsRepository.php
@@ -171,7 +171,7 @@ protected function initRootIdentifier(VcsDriverInterface $driver)
                 }
             }
         } catch (\Exception $e) {
-            if ($this->verbose) {
+            if ($this->io->isVerbose()) {
                 $this->io->write('<error>Skipped parsing '.$driver->getRootIdentifier().', '.$e->getMessage().'</error>');
             }
         }

diff --git a/Repository/AssetVcsRepository.php b/Repository/AssetVcsRepository.php
@@ -86,7 +86,7 @@ protected function initTags(VcsDriverInterface $driver)
             $this->initTag($driver, $packageName, $tag, $identifier);
         }
 
-        if (!$this->verbose) {
+        if (!$this->io->isVerbose()) {
             $this->io->overwrite('', false);
         }
     }
@@ -106,7 +106,7 @@ protected function initTag(VcsDriverInterface $driver, $packageName, $tag, $iden
         }
 
         if (!$parsedTag = Validator::validateTag($tag, $this->assetType, $this->versionParser)) {
-            if ($this->verbose) {
+            if ($this->io->isVerbose()) {
                 $this->io->write('<warning>Skipped tag '.$tag.', invalid tag name</warning>');
             }
 
@@ -164,7 +164,7 @@ protected function initBranches(VcsDriverInterface $driver)
             $this->preInitBranchLazyPackage($driver, $branch, $identifier);
         }
 
-        if (!$this->verbose) {
+        if (!$this->io->isVerbose()) {
             $this->io->overwrite('', false);
         }
     }