Merge pull request #69 from pascalbaljetmedia/laravel-5.6

Laravel 5.6
protonemedia · Feb 20, 2018 · 76b58a8 · 76b58a8
2 parents c001cac + f1cb8a7
commit 76b58a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,7 @@ env:
 before_install:
   - sudo apt-get update
   - travis_retry composer self-update
+  - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
 
 install:
   - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction

diff --git a/composer.json b/composer.json
@@ -21,8 +21,8 @@
         "illuminate/filesystem": "5.6.*",
         "illuminate/log": "5.6.*",
         "league/flysystem": "~1.0",
-        "php-ffmpeg/php-ffmpeg": "~0.6",
-        "symfony/process": "~2.1|~3.0"
+        "pbmedia/php-ffmpeg": "~0.14.0",
+        "symfony/process": "~4.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.0",