servers
/
alltube
mirror of https://github.com/Rudloff/alltube.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge commit 'c21be3c' into develop

This commit is contained in:
Pierre Rudloff 2017-04-15 20:19:35 +02:00
parent c44f22fa58 c21be3c904
commit ed44c68a31
1 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
composer.lock generated
View File

@ -341,16 +341,16 @@
},
{
"name": "league/uri",
"version": "4.1.1",
"version": "4.2.2",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/uri.git",
"reference": "0cbce9fe7d9808690ebda67b110ad96bcae9daee"
"reference": "a2e73bad7e60c3bc61b649680fb8b46876e342e3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/uri/zipball/0cbce9fe7d9808690ebda67b110ad96bcae9daee",
"reference": "0cbce9fe7d9808690ebda67b110ad96bcae9daee",
"url": "https://api.github.com/repos/thephpleague/uri/zipball/a2e73bad7e60c3bc61b649680fb8b46876e342e3",
"reference": "a2e73bad7e60c3bc61b649680fb8b46876e342e3",
"shasum": ""
},
"require": {
@ -362,19 +362,23 @@
"psr/http-message": "^1.0"
},
"require-dev": {
"fabpot/php-cs-fixer": "^1.9",
"phpunit/phpunit": "^4.0"
"friendsofphp/php-cs-fixer": "^1.9",
"phpunit/phpunit": "^4.0",
"zendframework/zend-diactoros": "^1.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.1-dev"
"dev-master": "4.2.x-dev"
}
},
"autoload": {
"psr-4": {
"League\\Uri\\": "src"
}
},
"files": [
"src/functions_include.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@ -388,12 +392,12 @@
}
],
"description": "URI manipulation library",
"homepage": "http://url.thephpleague.com",
"homepage": "http://uri.thephpleague.com",
"keywords": [
"data",
"data-uri",
"ftp",
"http",
"https",
"parse_url",
"psr-7",
"rfc3986",
@ -401,7 +405,7 @@
"url",
"ws"
],
"time": "2016-03-24T08:38:29+00:00"
"time": "2016-12-12T11:36:42+00:00"
},
{
"name": "mathmarques/smarty-view",
@ -707,20 +711,20 @@
},
{
"name": "rudloff/smarty-plugin-noscheme",
"version": "0.1.1",
"version": "0.1.2",
"source": {
"type": "git",
"url": "https://github.com/Rudloff/smarty-plugin-noscheme.git",
"reference": "7b64350bd255690e44db497e50bb5edc5e87d5e6"
"reference": "927e6a43cb30f864a34edf454dcb0f60f0bbf093"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Rudloff/smarty-plugin-noscheme/zipball/7b64350bd255690e44db497e50bb5edc5e87d5e6",
"reference": "7b64350bd255690e44db497e50bb5edc5e87d5e6",
"url": "https://api.github.com/repos/Rudloff/smarty-plugin-noscheme/zipball/927e6a43cb30f864a34edf454dcb0f60f0bbf093",
"reference": "927e6a43cb30f864a34edf454dcb0f60f0bbf093",
"shasum": ""
},
"require": {
"league/uri": "~4.1.1"
"league/uri": "~4.2.2"
},
"require-dev": {
"symfony/var-dumper": "~3.0.1"
@ -744,7 +748,7 @@
}
],
"description": "Smarty modifier that removes the scheme in URLs",
"time": "2016-04-09T00:40:13+00:00"
"time": "2017-04-15T18:14:00+00:00"
},
{
"name": "slim/slim",
@ -871,16 +875,16 @@
},
{
"name": "symfony/process",
"version": "v3.2.6",
"version": "v3.2.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "68bfa8c83f24c0ac04ea7193bcdcda4519f41892"
"reference": "57fdaa55827ae14d617550ebe71a820f0a5e2282"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/68bfa8c83f24c0ac04ea7193bcdcda4519f41892",
"reference": "68bfa8c83f24c0ac04ea7193bcdcda4519f41892",
"url": "https://api.github.com/repos/symfony/process/zipball/57fdaa55827ae14d617550ebe71a820f0a5e2282",
"reference": "57fdaa55827ae14d617550ebe71a820f0a5e2282",
"shasum": ""
},
"require": {
@ -916,20 +920,20 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
"time": "2017-03-04T12:23:14+00:00"
"time": "2017-03-27T18:07:02+00:00"
},
{
"name": "symfony/yaml",
"version": "v3.2.6",
"version": "v3.2.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a"
"reference": "62b4cdb99d52cb1ff253c465eb1532a80cebb621"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/093e416ad096355149e265ea2e4cc1f9ee40ab1a",
"reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a",
"url": "https://api.github.com/repos/symfony/yaml/zipball/62b4cdb99d52cb1ff253c465eb1532a80cebb621",
"reference": "62b4cdb99d52cb1ff253c465eb1532a80cebb621",
"shasum": ""
},
"require": {
@ -971,7 +975,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2017-03-07T16:47:02+00:00"
"time": "2017-03-20T09:45:15+00:00"
}
],
"packages-dev": [
@ -1089,16 +1093,16 @@
},
{
"name": "myclabs/deep-copy",
"version": "1.6.0",
"version": "1.6.1",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
"reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe"
"reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/5a5a9fc8025a08d8919be87d6884d5a92520cefe",
"reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102",
"reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102",
"shasum": ""
},
"require": {
@ -1127,7 +1131,7 @@
"object",
"object graph"
],
"time": "2017-01-26T22:05:40+00:00"
"time": "2017-04-12T18:52:22+00:00"
},
{
"name": "phpdocumentor/reflection-common",
@ -1589,16 +1593,16 @@
},
{
"name": "phpunit/phpunit",
"version": "5.7.18",
"version": "5.7.19",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "c6884c0d4b8a7277de7ae3c9e597aff138c6365f"
"reference": "69c4f49ff376af2692bad9cebd883d17ebaa98a1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c6884c0d4b8a7277de7ae3c9e597aff138c6365f",
"reference": "c6884c0d4b8a7277de7ae3c9e597aff138c6365f",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/69c4f49ff376af2692bad9cebd883d17ebaa98a1",
"reference": "69c4f49ff376af2692bad9cebd883d17ebaa98a1",
"shasum": ""
},
"require": {
@ -1667,7 +1671,7 @@
"testing",
"xunit"
],
"time": "2017-04-02T15:44:48+00:00"
"time": "2017-04-03T02:22:27+00:00"
},
{
"name": "phpunit/phpunit-mock-objects",
@ -2391,16 +2395,16 @@
},
{
"name": "symfony/var-dumper",
"version": "v3.2.6",
"version": "v3.2.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "4100f347aff890bc16b0b4b42843b599db257b2d"
"reference": "81dce20f69a8b40427e1f4e6462178df87cafc03"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/4100f347aff890bc16b0b4b42843b599db257b2d",
"reference": "4100f347aff890bc16b0b4b42843b599db257b2d",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/81dce20f69a8b40427e1f4e6462178df87cafc03",
"reference": "81dce20f69a8b40427e1f4e6462178df87cafc03",
"shasum": ""
},
"require": {
@ -2453,7 +2457,7 @@
"debug",
"dump"
],
"time": "2017-02-20T13:45:48+00:00"
"time": "2017-03-12T16:07:05+00:00"
},
{
"name": "webmozart/assert",