Update dependencies, use composer 2 everywhere

OndraM · Dec 3, 2020 · ed785f2 · ed785f2
1 parent a48b539
commit ed785f2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -65,6 +65,7 @@ jobs:
           with:
             php-version: '7.4'
             extensions: mbstring, intl
+            tools: composer:v2
 
         - name: Install dependencies
           run: composer update --no-interaction

diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
 language: php
+dist: focal
 
 php:
   - '7.4'
@@ -14,4 +15,4 @@ before_script:
   - unset TRAVIS # Unset the variable to not interfere with tests
 
 script:
-  - vendor/bin/phpunit --coverage-clover build/logs/clover.xml
+  - vendor/bin/phpunit --no-coverage
diff --git a/composer.json b/composer.json
@@ -37,11 +37,11 @@
     },
     "require-dev": {
         "ergebnis/composer-normalize": "^2.2",
-        "lmc/coding-standard": "^1.3 || ^2.0",
-        "php-parallel-lint/php-parallel-lint": "^1.1",
-        "phpstan/extension-installer": "^1.0.3",
-        "phpstan/phpstan": "^0.12.0",
-        "phpstan/phpstan-phpunit": "^0.12.1",
+        "lmc/coding-standard": "^1.3 || ^2.1",
+        "php-parallel-lint/php-parallel-lint": "^1.2",
+        "phpstan/extension-installer": "^1.0.5",
+        "phpstan/phpstan": "^0.12.58",
+        "phpstan/phpstan-phpunit": "^0.12.16",
         "phpunit/phpunit": "^7.1 || ^8.0 || ^9.0"
     },
     "config": {
@@ -61,20 +61,23 @@
         "all": [
             "@lint",
             "@analyze",
-            "./vendor/bin/phpunit --colors=always"
+            "@test"
         ],
         "analyze": [
-            "./vendor/bin/ecs check ./src/ ./tests/ --ansi",
-            "./vendor/bin/phpstan.phar analyze -c phpstan.neon --ansi"
+            "vendor/bin/ecs check ./src/ ./tests/ --ansi",
+            "vendor/bin/phpstan analyze -c phpstan.neon --ansi"
         ],
         "fix": [
             "@composer normalize",
-            "./vendor/bin/ecs check ./src/ ./tests/ --ansi --fix"
+            "vendor/bin/ecs check ./src/ ./tests/ --ansi --fix"
         ],
         "lint": [
             "vendor/bin/parallel-lint -j 10 -e php ./src ./tests dump-current.php",
             "@composer validate",
             "@composer normalize --dry-run"
+        ],
+        "test": [
+            "vendor/bin/phpunit --colors=always"
         ]
     }
 }