popen streams have been merged in upstream Slim

This commit is contained in:
Pierre Rudloff 2016-05-26 18:27:30 +02:00
parent 3370695e9e
commit c10115f9af
2 changed files with 21 additions and 45 deletions

View file

@ -7,7 +7,7 @@
"require": { "require": {
"smarty/smarty": "~3.1.29", "smarty/smarty": "~3.1.29",
"rg3/youtube-dl": "2016.04.13", "rg3/youtube-dl": "2016.04.13",
"slim/slim": "1838.x-dev as 3.3.0", "slim/slim": "3.x-dev",
"mathmarques/smarty-view": "~1.1.0", "mathmarques/smarty-view": "~1.1.0",
"symfony/yaml": "~3.0.0", "symfony/yaml": "~3.0.0",
"symfony/process": "~3.0.0", "symfony/process": "~3.0.0",
@ -50,9 +50,6 @@
"ffmpeg" "ffmpeg"
] ]
} }
}, {
"type": "vcs",
"url": "https://github.com/llvdl/Slim.git"
}], }],
"authors": [{ "authors": [{
"name": "Pierre Rudloff", "name": "Pierre Rudloff",

61
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", "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"
], ],
"hash": "6e64354dc4d656c303e0cd83b4ccfda6", "hash": "e173fa909efaf932dcbc99c365645eaf",
"content-hash": "4418cbfe45cf745f1f170c49746bfdfd", "content-hash": "54da2bfd3a8f04d66a1cd4465ec0a261",
"packages": [ "packages": [
{ {
"name": "container-interop/container-interop", "name": "container-interop/container-interop",
@ -479,16 +479,16 @@
}, },
{ {
"name": "slim/slim", "name": "slim/slim",
"version": "1838.x-dev", "version": "3.x-dev",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/llvdl/Slim.git", "url": "https://github.com/slimphp/Slim.git",
"reference": "388272244ab335f2309448e881fb838abed425f1" "reference": "30cfe3c07dac28ec1129c0577e64b90ba11a54c4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/llvdl/Slim/zipball/388272244ab335f2309448e881fb838abed425f1", "url": "https://api.github.com/repos/slimphp/Slim/zipball/30cfe3c07dac28ec1129c0577e64b90ba11a54c4",
"reference": "388272244ab335f2309448e881fb838abed425f1", "reference": "30cfe3c07dac28ec1129c0577e64b90ba11a54c4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -511,41 +511,30 @@
"Slim\\": "Slim" "Slim\\": "Slim"
} }
}, },
"scripts": { "notification-url": "https://packagist.org/downloads/",
"test": [
"@phpunit",
"@phpcs"
],
"phpunit": [
"php vendor/bin/phpunit"
],
"phpcs": [
"php vendor/bin/phpcs"
]
},
"license": [ "license": [
"MIT" "MIT"
], ],
"authors": [ "authors": [
{
"name": "Josh Lockhart",
"email": "hello@joshlockhart.com",
"homepage": "https://joshlockhart.com"
},
{
"name": "Andrew Smith",
"email": "a.smith@silentworks.co.uk",
"homepage": "http://silentworks.co.uk"
},
{ {
"name": "Rob Allen", "name": "Rob Allen",
"email": "rob@akrabat.com", "email": "rob@akrabat.com",
"homepage": "http://akrabat.com" "homepage": "http://akrabat.com"
}, },
{
"name": "Josh Lockhart",
"email": "hello@joshlockhart.com",
"homepage": "https://joshlockhart.com"
},
{ {
"name": "Gabriel Manricks", "name": "Gabriel Manricks",
"email": "gmanricks@me.com", "email": "gmanricks@me.com",
"homepage": "http://gabrielmanricks.com" "homepage": "http://gabrielmanricks.com"
},
{
"name": "Andrew Smith",
"email": "a.smith@silentworks.co.uk",
"homepage": "http://silentworks.co.uk"
} }
], ],
"description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs", "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs",
@ -556,10 +545,7 @@
"micro", "micro",
"router" "router"
], ],
"support": { "time": "2016-05-26 08:20:33"
"source": "https://github.com/llvdl/Slim/tree/1838"
},
"time": "2016-05-19 08:36:13"
}, },
{ {
"name": "smarty/smarty", "name": "smarty/smarty",
@ -839,14 +825,7 @@
"time": "2016-04-25 11:17:47" "time": "2016-04-25 11:17:47"
} }
], ],
"aliases": [ "aliases": [],
{
"alias": "3.3.0",
"alias_normalized": "3.3.0.0",
"version": "1838.9999999.9999999.9999999-dev",
"package": "slim/slim"
}
],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": {
"slim/slim": 20, "slim/slim": 20,