diff --git a/.travis.yml b/.travis.yml index 9f514fb..3ffe9d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: php install: - - composer install --no-dev + - composer install before_install: - composer selfupdate after_success: diff --git a/composer.json b/composer.json index 635283f..b6c5a26 100644 --- a/composer.json +++ b/composer.json @@ -6,20 +6,20 @@ "type": "project", "require": { "smarty/smarty": "~3.1.29", - "rg3/youtube-dl": "~2016.09.08", "slim/slim": "~3.5.0", "mathmarques/smarty-view": "~1.1.0", "symfony/yaml": "~3.1.0", "symfony/process": "~3.1.0", "ptachoire/process-builder-chain": "~1.2.0", - "ffmpeg/ffmpeg": "dev-release", "rudloff/smarty-plugin-noscheme": "~0.1.0", "rudloff/rtmpdump-bin": "~2.3" }, "require-dev": { "symfony/var-dumper": "~3.1.0", "squizlabs/php_codesniffer": "~2.7.0", - "phpunit/phpunit": "~5.5.2" + "phpunit/phpunit": "~5.5.2", + "ffmpeg/ffmpeg": "dev-release", + "rg3/youtube-dl": "~2016.09.08" }, "extra": { "paas": { diff --git a/composer.lock b/composer.lock index 541e11f..70bb48c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "02cf80c6d4373a564269fea77fcd50a5", - "content-hash": "efbcfe87c3855d9559551638e85519f3", + "hash": "186f884cc6378240af71c2f966772e91", + "content-hash": "f247f0e474ec96305a224fdce94e0dae", "packages": [ { "name": "container-interop/container-interop", @@ -34,20 +34,6 @@ "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", "time": "2014-12-30 15:22:37" }, - { - "name": "ffmpeg/ffmpeg", - "version": "dev-release", - "dist": { - "type": "xz", - "url": "http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz", - "reference": null, - "shasum": null - }, - "bin": [ - "ffmpeg" - ], - "type": "library" - }, { "name": "jeremykendall/php-domain-parser", "version": "3.0.0", @@ -399,16 +385,6 @@ "description": "Add ability to chain symfony processes", "time": "2016-04-10 08:33:20" }, - { - "name": "rg3/youtube-dl", - "version": "2016.09.08", - "source": { - "type": "git", - "url": "https://github.com/rg3/youtube-dl.git", - "reference": "2016.09.08" - }, - "type": "library" - }, { "name": "rudloff/rtmpdump-bin", "version": "2.3", @@ -757,6 +733,20 @@ ], "time": "2015-06-14 21:17:01" }, + { + "name": "ffmpeg/ffmpeg", + "version": "dev-release", + "dist": { + "type": "xz", + "url": "http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz", + "reference": null, + "shasum": null + }, + "bin": [ + "ffmpeg" + ], + "type": "library" + }, { "name": "myclabs/deep-copy", "version": "1.5.4", @@ -1393,6 +1383,16 @@ ], "time": "2016-10-09 07:01:45" }, + { + "name": "rg3/youtube-dl", + "version": "2016.09.08", + "source": { + "type": "git", + "url": "https://github.com/rg3/youtube-dl.git", + "reference": "2016.09.08" + }, + "type": "library" + }, { "name": "sebastian/code-unit-reverse-lookup", "version": "1.0.0",