Merge branch 'release-1.2.1'

This commit is contained in:
Pierre Rudloff 2018-08-31 10:37:23 +02:00
commit 692681cd5d
3 changed files with 66 additions and 63 deletions

View file

@ -22,7 +22,7 @@
"squizlabs/php_codesniffer": "~3.2.2", "squizlabs/php_codesniffer": "~3.2.2",
"phpunit/phpunit": "~6.5.2", "phpunit/phpunit": "~6.5.2",
"doctrine/instantiator": "~1.0.0", "doctrine/instantiator": "~1.0.0",
"ffmpeg/ffmpeg": "4.0", "ffmpeg/ffmpeg": "4.0.2",
"rg3/youtube-dl": "2018.06.02", "rg3/youtube-dl": "2018.06.02",
"heroku/heroku-buildpack-php": "*", "heroku/heroku-buildpack-php": "*",
"anam/phantomjs-linux-x86-binary": "~2.1.1" "anam/phantomjs-linux-x86-binary": "~2.1.1"
@ -50,9 +50,9 @@
"type": "package", "type": "package",
"package": { "package": {
"name": "ffmpeg/ffmpeg", "name": "ffmpeg/ffmpeg",
"version": "4.0", "version": "4.0.2",
"dist": { "dist": {
"url": "https://johnvansickle.com/ffmpeg/releases/ffmpeg-4.0-64bit-static.tar.xz", "url": "https://johnvansickle.com/ffmpeg/releases/ffmpeg-4.0.2-64bit-static.tar.xz",
"type": "xz" "type": "xz"
}, },
"bin": [ "bin": [

121
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "0373d67592f91e34e33a0c094c7d74d5", "content-hash": "97e79d42b6efffd556ad9245d94f4ecc",
"packages": [ "packages": [
{ {
"name": "aura/session", "name": "aura/session",
@ -70,16 +70,16 @@
}, },
{ {
"name": "barracudanetworks/archivestream-php", "name": "barracudanetworks/archivestream-php",
"version": "1.0.5", "version": "1.0.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/barracudanetworks/ArchiveStream-php.git", "url": "https://github.com/barracudanetworks/ArchiveStream-php.git",
"reference": "1bf98097d1e9b137fd40081f26abb0a17b097ef7" "reference": "87540ce2b53257e2fd6505f4b261dc22b82d77c6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/barracudanetworks/ArchiveStream-php/zipball/1bf98097d1e9b137fd40081f26abb0a17b097ef7", "url": "https://api.github.com/repos/barracudanetworks/ArchiveStream-php/zipball/87540ce2b53257e2fd6505f4b261dc22b82d77c6",
"reference": "1bf98097d1e9b137fd40081f26abb0a17b097ef7", "reference": "87540ce2b53257e2fd6505f4b261dc22b82d77c6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -106,7 +106,7 @@
"tar", "tar",
"zip" "zip"
], ],
"time": "2017-01-13T14:52:38+00:00" "time": "2018-08-10T13:58:33+00:00"
}, },
{ {
"name": "container-interop/container-interop", "name": "container-interop/container-interop",
@ -1143,25 +1143,28 @@
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
"version": "v1.8.0", "version": "v1.9.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git", "url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae" "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae", "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
"reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae", "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.3"
}, },
"suggest": {
"ext-ctype": "For best performance"
},
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.8-dev" "dev-master": "1.9-dev"
} }
}, },
"autoload": { "autoload": {
@ -1194,20 +1197,20 @@
"polyfill", "polyfill",
"portable" "portable"
], ],
"time": "2018-04-30T19:57:29+00:00" "time": "2018-08-06T14:22:27+00:00"
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v3.4.11", "version": "v3.4.14",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/process.git", "url": "https://github.com/symfony/process.git",
"reference": "4cbf2db9abcb01486a21b7a059e03a62fae63187" "reference": "0414db29bd770ec5a4152683e655f55efd4fa60f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/4cbf2db9abcb01486a21b7a059e03a62fae63187", "url": "https://api.github.com/repos/symfony/process/zipball/0414db29bd770ec5a4152683e655f55efd4fa60f",
"reference": "4cbf2db9abcb01486a21b7a059e03a62fae63187", "reference": "0414db29bd770ec5a4152683e655f55efd4fa60f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1243,20 +1246,20 @@
], ],
"description": "Symfony Process Component", "description": "Symfony Process Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-05-16T08:49:21+00:00" "time": "2018-07-26T11:19:56+00:00"
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "v3.4.11", "version": "v3.4.14",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/yaml.git", "url": "https://github.com/symfony/yaml.git",
"reference": "c5010cc1692ce1fa328b1fb666961eb3d4a85bb0" "reference": "810af2d35fc72b6cf5c01116806d2b65ccaaf2e2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/c5010cc1692ce1fa328b1fb666961eb3d4a85bb0", "url": "https://api.github.com/repos/symfony/yaml/zipball/810af2d35fc72b6cf5c01116806d2b65ccaaf2e2",
"reference": "c5010cc1692ce1fa328b1fb666961eb3d4a85bb0", "reference": "810af2d35fc72b6cf5c01116806d2b65ccaaf2e2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1302,7 +1305,7 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-05-03T23:18:14+00:00" "time": "2018-07-26T11:19:56+00:00"
}, },
{ {
"name": "zonuexe/http-accept-language", "name": "zonuexe/http-accept-language",
@ -1445,10 +1448,10 @@
}, },
{ {
"name": "ffmpeg/ffmpeg", "name": "ffmpeg/ffmpeg",
"version": "4.0", "version": "4.0.2",
"dist": { "dist": {
"type": "xz", "type": "xz",
"url": "https://johnvansickle.com/ffmpeg/releases/ffmpeg-4.0-64bit-static.tar.xz", "url": "https://johnvansickle.com/ffmpeg/releases/ffmpeg-4.0.2-64bit-static.tar.xz",
"reference": null, "reference": null,
"shasum": null "shasum": null
}, },
@ -1459,16 +1462,16 @@
}, },
{ {
"name": "heroku/heroku-buildpack-php", "name": "heroku/heroku-buildpack-php",
"version": "v136", "version": "v143",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/heroku/heroku-buildpack-php.git", "url": "https://github.com/heroku/heroku-buildpack-php.git",
"reference": "2840e48240769316777d6548409aa75fef16de09" "reference": "1cdd477661d3da7434efe5fedcb42d7b42503b8d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/2840e48240769316777d6548409aa75fef16de09", "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/1cdd477661d3da7434efe5fedcb42d7b42503b8d",
"reference": "2840e48240769316777d6548409aa75fef16de09", "reference": "1cdd477661d3da7434efe5fedcb42d7b42503b8d",
"shasum": "" "shasum": ""
}, },
"bin": [ "bin": [
@ -1499,7 +1502,7 @@
"nginx", "nginx",
"php" "php"
], ],
"time": "2018-05-24T20:47:48+00:00" "time": "2018-08-17T16:27:37+00:00"
}, },
{ {
"name": "myclabs/deep-copy", "name": "myclabs/deep-copy",
@ -1802,16 +1805,16 @@
}, },
{ {
"name": "phpspec/prophecy", "name": "phpspec/prophecy",
"version": "1.7.6", "version": "1.8.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpspec/prophecy.git", "url": "https://github.com/phpspec/prophecy.git",
"reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712" "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712", "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
"reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712", "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1823,12 +1826,12 @@
}, },
"require-dev": { "require-dev": {
"phpspec/phpspec": "^2.5|^3.2", "phpspec/phpspec": "^2.5|^3.2",
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5" "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.7.x-dev" "dev-master": "1.8.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -1861,7 +1864,7 @@
"spy", "spy",
"stub" "stub"
], ],
"time": "2018-04-18T13:57:24+00:00" "time": "2018-08-05T17:53:17+00:00"
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
@ -2073,16 +2076,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "6.5.8", "version": "6.5.11",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b" "reference": "7bab54cb366076023bbf457a2a0d513332cd40f2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4f21a3c6b97c42952fd5c2837bb354ec0199b97b", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7bab54cb366076023bbf457a2a0d513332cd40f2",
"reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b", "reference": "7bab54cb366076023bbf457a2a0d513332cd40f2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2100,7 +2103,7 @@
"phpunit/php-file-iterator": "^1.4.3", "phpunit/php-file-iterator": "^1.4.3",
"phpunit/php-text-template": "^1.2.1", "phpunit/php-text-template": "^1.2.1",
"phpunit/php-timer": "^1.0.9", "phpunit/php-timer": "^1.0.9",
"phpunit/phpunit-mock-objects": "^5.0.5", "phpunit/phpunit-mock-objects": "^5.0.9",
"sebastian/comparator": "^2.1", "sebastian/comparator": "^2.1",
"sebastian/diff": "^2.0", "sebastian/diff": "^2.0",
"sebastian/environment": "^3.1", "sebastian/environment": "^3.1",
@ -2153,20 +2156,20 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2018-04-10T11:38:34+00:00" "time": "2018-08-07T07:05:35+00:00"
}, },
{ {
"name": "phpunit/phpunit-mock-objects", "name": "phpunit/phpunit-mock-objects",
"version": "5.0.7", "version": "5.0.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
"reference": "3eaf040f20154d27d6da59ca2c6e28ac8fd56dce" "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3eaf040f20154d27d6da59ca2c6e28ac8fd56dce", "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/cd1cf05c553ecfec36b170070573e540b67d3f1f",
"reference": "3eaf040f20154d27d6da59ca2c6e28ac8fd56dce", "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2179,7 +2182,7 @@
"phpunit/phpunit": "<6.0" "phpunit/phpunit": "<6.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^6.5" "phpunit/phpunit": "^6.5.11"
}, },
"suggest": { "suggest": {
"ext-soap": "*" "ext-soap": "*"
@ -2212,7 +2215,7 @@
"mock", "mock",
"xunit" "xunit"
], ],
"time": "2018-05-29T13:50:43+00:00" "time": "2018-08-09T05:50:03+00:00"
}, },
{ {
"name": "rg3/youtube-dl", "name": "rg3/youtube-dl",
@ -2837,16 +2840,16 @@
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
"version": "v1.8.0", "version": "v1.9.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git", "url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "3296adf6a6454a050679cde90f95350ad604b171" "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171", "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8",
"reference": "3296adf6a6454a050679cde90f95350ad604b171", "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2858,7 +2861,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.8-dev" "dev-master": "1.9-dev"
} }
}, },
"autoload": { "autoload": {
@ -2892,20 +2895,20 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2018-04-26T10:06:28+00:00" "time": "2018-08-06T14:22:27+00:00"
}, },
{ {
"name": "symfony/var-dumper", "name": "symfony/var-dumper",
"version": "v3.4.11", "version": "v3.4.14",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/var-dumper.git", "url": "https://github.com/symfony/var-dumper.git",
"reference": "0e6545672d8c9ce70dd472adc2f8b03155a46f73" "reference": "f62a394bd3de96f2f5e8f4c7d685035897fb3cb3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/0e6545672d8c9ce70dd472adc2f8b03155a46f73", "url": "https://api.github.com/repos/symfony/var-dumper/zipball/f62a394bd3de96f2f5e8f4c7d685035897fb3cb3",
"reference": "0e6545672d8c9ce70dd472adc2f8b03155a46f73", "reference": "f62a394bd3de96f2f5e8f4c7d685035897fb3cb3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2961,7 +2964,7 @@
"debug", "debug",
"dump" "dump"
], ],
"time": "2018-04-26T12:42:15+00:00" "time": "2018-07-26T11:19:56+00:00"
}, },
{ {
"name": "theseer/tokenizer", "name": "theseer/tokenizer",

View file

@ -1,7 +1,7 @@
{ {
"name": "alltube", "name": "alltube",
"description": "HTML GUI for youtube-dl", "description": "HTML GUI for youtube-dl",
"version": "1.2.0", "version": "1.2.1",
"author": "Pierre Rudloff", "author": "Pierre Rudloff",
"bugs": "https://github.com/Rudloff/alltube/issues", "bugs": "https://github.com/Rudloff/alltube/issues",
"dependencies": { "dependencies": {