Merge pull request #375 from ergebnis/feature/composer

Enhancement: Require composer/composer:^1.10.0
ergebnis · Mar 11, 2020 · 9f8cd4e · 9f8cd4e
2 parents be25bae + 28d1178
commit 9f8cd4e
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 20 deletions.
diff --git a/.github/workflows/continuous-deployment.yml b/.github/workflows/continuous-deployment.yml
@@ -8,7 +8,7 @@ on:
       - "**"
 
 env:
-  COMPOSER_VERSION: "1.9.3"
+  COMPOSER_VERSION: "1.10.0"
   REQUIRED_PHP_EXTENSIONS: "mbstring"
 
 jobs:

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -9,7 +9,7 @@ on:
       - "master"
 
 env:
-  COMPOSER_VERSION: "1.9.3"
+  COMPOSER_VERSION: "1.10.0"
   REQUIRED_PHP_EXTENSIONS: "mbstring"
 
 jobs:

diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
     "localheinz/diff": "^1.0.1"
   },
   "require-dev": {
-    "composer/composer": "^1.7.0",
+    "composer/composer": "^1.10.0",
     "ergebnis/license": "~0.1.0",
     "ergebnis/php-cs-fixer-config": "^2.1.0",
     "ergebnis/phpstan-rules": "~0.14.3",

diff --git a/composer.lock b/composer.lock
diff --git a/test/Fixture/json/valid/lock/present/lock/fresh-before/json/already-normalized/composer.lock b/test/Fixture/json/valid/lock/present/lock/fresh-before/json/already-normalized/composer.lock
diff --git a/...lid/lock/present/lock/fresh-before/json/not-yet-normalized/lock/fresh-after/composer.lock b/...lid/lock/present/lock/fresh-before/json/not-yet-normalized/lock/fresh-after/composer.lock
diff --git a/...lock/present/lock/fresh-before/json/not-yet-normalized/lock/not-fresh-after/composer.lock b/...lock/present/lock/fresh-before/json/not-yet-normalized/lock/not-fresh-after/composer.lock
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ on: @@
           - "**"
     env:
-      COMPOSER_VERSION: "1.9.3"
+      COMPOSER_VERSION: "1.10.0"
       REQUIRED_PHP_EXTENSIONS: "mbstring"
     jobs:
@@ Expand Down @@