Merge branch 'dev'

Insolita · Oct 24, 2020 · 11a4788 · 11a4788
2 parents 0d46f93 + 404296e
commit 11a4788
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 23 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php-versions: ['7.2', '7.3', '7.4', '8.0']
+        php-versions: ['7.2', '7.3', '7.4']
 
     steps:
     - uses: actions/checkout@v2
@@ -25,6 +25,7 @@ jobs:
       uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
       with:
         php-version: ${{ matrix.php-versions }}
+        extensions: mbstring, intl
         tools: composer:v2
 
     - name: Get composer cache directory

diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+2.2.0
+  - Fix dev dependencies for composer2.0 compatibility
+  - code typehint fixes
+
 2.1.1
   - Improve json output format
   - code style fixes

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Project scanner for detect unused composer dependencies
 
-[![Build Status](https://travis-ci.org/Insolita/unused-scanner.svg?branch=master)](https://travis-ci.org/Insolita/unused-scanner)
+![unused-scanner](https://github.com/Insolita/unused-scanner/workflows/unused-scanner/badge.svg?branch=master)
 
 ### Versions
 

diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         "nesbot/carbon":  ">=1.22"
     } ,
     "require-dev":       {
-        "phpunit/phpunit": "^7.0|^8.0",
+        "phpunit/phpunit": "^7.0|^8.0|^9.0",
         "symfony/thanks": "^1.2"
     } ,
     "bin":               [