Fix the invalid Composer JSON files

Closes #212 Also ensure the proper dependencies are used when updating Box in the CI.
box-project · May 19, 2018 · 882f2bb · 882f2bb
1 parent 1351392
commit 882f2bb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -37,6 +37,10 @@ before_install:
     if [ -n "$SYMFONY_VERSION" ]; then
         composer require --no-update "symfony/lts:${SYMFONY_VERSION}"
     fi
+  - |
+    if [ "DEPLOY" != "true" ]; then
+        composer config --unset platform.php
+    fi
 
 install:
   - |

diff --git a/composer.json b/composer.json
@@ -48,7 +48,7 @@
         "composer/composer": "^1.6",
         "composer/xdebug-handler": "^1.1.0",
         "herrera-io/annotations": "~1.0",
-        "humbug/php-scoper": "^1.0@dev",
+        "humbug/php-scoper": "dev-master#c0384b6",
         "justinrainbow/json-schema": "^5.2",
         "nikic/iter": "^1.6",
         "phpseclib/phpseclib": "~2.0",

diff --git a/composer.lock b/composer.lock