genuineparts/alltube
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/stream

Browse source 
Conflicts:
	composer.json
	composer.lock
	controllers/FrontController.php
This commit is contained in:
Pierre Rudloff 2016-09-11 18:58:58 +02:00
commit dd67495ccb
18 changed files with 481 additions and 372 deletions
Download patch file Download diff file Expand all files Collapse all files

80
composer.lock generated
View file

@ -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": "45458ad3758a4bfcdcff81c70a53e796",
"content-hash": "2ee8e0ffa53778d2a2eaa5de447573e8",
"hash": "086ca596eeeb4c2a0e5d27976b21e4d2",
"content-hash": "ec541955f4eb561e1b37b3bbb081af09",
"packages": [
{
"name": "container-interop/container-interop",
@ -347,16 +347,16 @@
},
{
"name": "mathmarques/smarty-view",
"version": "1.1.0",
"version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/mathmarques/Smarty-View.git",
"reference": "66f4d28c564c0363eda18d3f5b85a4241b1c4ad1"
"reference": "c8f8501a0be4c290e1165fcb9e5064952ef6969d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mathmarques/Smarty-View/zipball/66f4d28c564c0363eda18d3f5b85a4241b1c4ad1",
"reference": "66f4d28c564c0363eda18d3f5b85a4241b1c4ad1",
"url": "https://api.github.com/repos/mathmarques/Smarty-View/zipball/c8f8501a0be4c290e1165fcb9e5064952ef6969d",
"reference": "c8f8501a0be4c290e1165fcb9e5064952ef6969d",
"shasum": ""
},
"require": {
@ -393,7 +393,7 @@
"template",
"view"
],
"time": "2016-03-31 00:41:59"
"time": "2016-08-25 19:04:49"
},
{
"name": "nikic/fast-route",
@ -572,11 +572,11 @@
},
{
"name": "rg3/youtube-dl",
"version": "2016.08.12",
"version": "2016.09.08",
"source": {
"type": "git",
"url": "https://github.com/rg3/youtube-dl.git",
"reference": "2016.08.12"
"reference": "2016.09.08"
},
"type": "library"
},
@ -776,16 +776,16 @@
},
{
"name": "symfony/process",
"version": "v3.1.3",
"version": "v3.1.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "04c2dfaae4ec56a5c677b0c69fac34637d815758"
"reference": "e64e93041c80e77197ace5ab9385dedb5a143697"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/04c2dfaae4ec56a5c677b0c69fac34637d815758",
"reference": "04c2dfaae4ec56a5c677b0c69fac34637d815758",
"url": "https://api.github.com/repos/symfony/process/zipball/e64e93041c80e77197ace5ab9385dedb5a143697",
"reference": "e64e93041c80e77197ace5ab9385dedb5a143697",
"shasum": ""
},
"require": {
@ -821,20 +821,20 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
"time": "2016-07-28 11:13:48"
"time": "2016-08-16 14:58:24"
},
{
"name": "symfony/yaml",
"version": "v3.1.3",
"version": "v3.1.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "1819adf2066880c7967df7180f4f662b6f0567ac"
"reference": "f291ed25eb1435bddbe8a96caaef16469c2a092d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/1819adf2066880c7967df7180f4f662b6f0567ac",
"reference": "1819adf2066880c7967df7180f4f662b6f0567ac",
"url": "https://api.github.com/repos/symfony/yaml/zipball/f291ed25eb1435bddbe8a96caaef16469c2a092d",
"reference": "f291ed25eb1435bddbe8a96caaef16469c2a092d",
"shasum": ""
},
"require": {
@ -870,7 +870,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2016-07-17 14:02:08"
"time": "2016-09-02 02:12:52"
}
],
"packages-dev": [
@ -930,16 +930,16 @@
},
{
"name": "myclabs/deep-copy",
"version": "1.5.1",
"version": "1.5.2",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
"reference": "a8773992b362b58498eed24bf85005f363c34771"
"reference": "da8529775f14f4fdae33f916eb0cf65f6afbddbc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/a8773992b362b58498eed24bf85005f363c34771",
"reference": "a8773992b362b58498eed24bf85005f363c34771",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/da8529775f14f4fdae33f916eb0cf65f6afbddbc",
"reference": "da8529775f14f4fdae33f916eb0cf65f6afbddbc",
"shasum": ""
},
"require": {
@ -968,7 +968,7 @@
"object",
"object graph"
],
"time": "2015-11-20 12:04:31"
"time": "2016-09-06 16:07:05"
},
{
"name": "phpdocumentor/reflection-common",
@ -1424,16 +1424,16 @@
},
{
"name": "phpunit/phpunit",
"version": "5.4.8",
"version": "5.5.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "3132365e1430c091f208e120b8845d39c25f20e6"
"reference": "3e6e88e56c912133de6e99b87728cca7ed70c5f5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3132365e1430c091f208e120b8845d39c25f20e6",
"reference": "3132365e1430c091f208e120b8845d39c25f20e6",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6e88e56c912133de6e99b87728cca7ed70c5f5",
"reference": "3e6e88e56c912133de6e99b87728cca7ed70c5f5",
"shasum": ""
},
"require": {
@ -1472,7 +1472,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "5.4.x-dev"
"dev-master": "5.5.x-dev"
}
},
"autoload": {
@ -1498,20 +1498,20 @@
"testing",
"xunit"
],
"time": "2016-07-26 14:48:00"
"time": "2016-08-26 07:11:44"
},
{
"name": "phpunit/phpunit-mock-objects",
"version": "3.2.4",
"version": "3.2.7",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
"reference": "4e83390f64e7ce04fcaec2ce95cd72823b431d19"
"reference": "546898a2c0c356ef2891b39dd7d07f5d82c8ed0a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/4e83390f64e7ce04fcaec2ce95cd72823b431d19",
"reference": "4e83390f64e7ce04fcaec2ce95cd72823b431d19",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/546898a2c0c356ef2891b39dd7d07f5d82c8ed0a",
"reference": "546898a2c0c356ef2891b39dd7d07f5d82c8ed0a",
"shasum": ""
},
"require": {
@ -1557,7 +1557,7 @@
"mock",
"xunit"
],
"time": "2016-08-17 09:33:51"
"time": "2016-09-06 16:07:45"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@ -2211,16 +2211,16 @@
},
{
"name": "symfony/var-dumper",
"version": "v3.1.3",
"version": "v3.1.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "076235b750137518408f1bc17a8e69b43211836a"
"reference": "62ee73706c421654a4c840028954510277f7dfc8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/076235b750137518408f1bc17a8e69b43211836a",
"reference": "076235b750137518408f1bc17a8e69b43211836a",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/62ee73706c421654a4c840028954510277f7dfc8",
"reference": "62ee73706c421654a4c840028954510277f7dfc8",
"shasum": ""
},
"require": {
@ -2270,7 +2270,7 @@
"debug",
"dump"
],
"time": "2016-07-26 08:04:17"
"time": "2016-08-31 09:05:42"
},
{
"name": "webmozart/assert",