dan/ffmpeg-mappable-media
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #10 from pulse00/master

Browse source 
Changed monolog dependency
This commit is contained in:
Romain Neutron 2012-10-11 07:25:05 -07:00
commit 5ea1d6a8e1
2 changed files with 26 additions and 734 deletions
Download patch file Download diff file Expand all files Collapse all files

2
composer.json
View file

@ -19,7 +19,7 @@
"require": {
"php": ">=5.3.3",
"symfony/process": ">=2.0,<=2.2",
"monolog/monolog": "1.0.*"
"monolog/monolog": "1.*"
},
"minimum-stability": "dev",
"require-dev": {

758
composer.lock generated
View file

@ -1,26 +1,39 @@
{
"hash": "7a1ae4210db9e27bb700dc1c0de19417",
"hash": "d37af7413f445f2222f52e6e12cae78a",
"packages": [
{
"name": "monolog/monolog",
"version": "1.0.2",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog",
"reference": "1.0.2"
"reference": "09b3a80cfaf3e323e348a5e817afeee98d5e6b48"
},
"dist": {
"type": "zip",
"url": "https://github.com/Seldaek/monolog/zipball/1.0.2",
"reference": "1.0.2",
"url": "https://github.com/Seldaek/monolog/zipball/09b3a80cfaf3e323e348a5e817afeee98d5e6b48",
"reference": "09b3a80cfaf3e323e348a5e817afeee98d5e6b48",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
"time": "2011-10-24 09:39:02",
"require-dev": {
"mlehner/gelf-php": "1.0.*"
},
"suggest": {
"mlehner/gelf-php": "Allow sending log messages to a GrayLog2 server",
"ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
"ext-mongo": "Allow sending log messages to a MongoDB server"
},
"time": "1347983448",
"type": "library",
"installation-source": "dist",
"extra": {
"branch-alias": {
"dev-master": "1.3.x-dev"
}
},
"installation-source": "source",
"autoload": {
"psr-0": {
"Monolog": "src/"
@ -51,18 +64,18 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/Process",
"reference": "2965a0340c138d7b47e74ed6c44402d946f0bbd2"
"reference": "fc5b082e436161427e29652e3316d7def5f7a64f"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/Process/zipball/2965a0340c138d7b47e74ed6c44402d946f0bbd2",
"reference": "2965a0340c138d7b47e74ed6c44402d946f0bbd2",
"url": "https://github.com/symfony/Process/zipball/fc5b082e436161427e29652e3316d7def5f7a64f",
"reference": "fc5b082e436161427e29652e3316d7def5f7a64f",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "1349363877",
"time": "1349553363",
"type": "library",
"extra": {
"branch-alias": {
@ -92,728 +105,7 @@
"homepage": "http://symfony.com"
}
],
"packages-dev": [
{
"name": "fabpot/php-cs-fixer",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/fabpot/PHP-CS-Fixer.git",
"reference": "24df86b1a29a9f6151e495615123308542bcfb05"
},
"dist": {
"type": "zip",
"url": "https://github.com/fabpot/PHP-CS-Fixer/zipball/24df86b1a29a9f6151e495615123308542bcfb05",
"reference": "24df86b1a29a9f6151e495615123308542bcfb05",
"shasum": ""
},
"require": {
"symfony/console": "2.1.*",
"symfony/filesystem": "2.1.*",
"symfony/finder": "2.1.*",
"php": ">=5.3.3"
},
"time": "1349504510",
"bin": [
"php-cs-fixer"
],
"type": "application",
"installation-source": "source",
"autoload": {
"psr-0": {
"Symfony\\CS": "."
}
},
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
}
],
"description": "A script to automatically fix Symfony Coding Standard"
},
{
"name": "nikic/php-parser",
"version": "v0.9.2",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser",
"reference": "v0.9.2"
},
"dist": {
"type": "zip",
"url": "https://github.com/nikic/PHP-Parser/zipball/v0.9.2",
"reference": "v0.9.2",
"shasum": ""
},
"require": {
"php": ">=5.2"
},
"time": "2012-07-07 20:23:25",
"type": "library",
"installation-source": "dist",
"autoload": {
"psr-0": {
"PHPParser": "lib/"
}
},
"license": [
"BSD"
],
"authors": [
{
"name": "Nikita Popov"
}
],
"description": "A PHP parser written in PHP",
"keywords": [
"php",
"parser"
]
},
{
"name": "pimple/pimple",
"version": "dev-master",
"source": {
"type": "git",
"url": "git://github.com/fabpot/Pimple.git",
"reference": "b9f27b8dc18c08f00627dec02359b46a24791dc3"
},
"dist": {
"type": "zip",
"url": "https://github.com/fabpot/Pimple/zipball/b9f27b8dc18c08f00627dec02359b46a24791dc3",
"reference": "b9f27b8dc18c08f00627dec02359b46a24791dc3",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
"time": "1347278988",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"installation-source": "source",
"autoload": {
"psr-0": {
"Pimple": "lib/"
}
},
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
}
],
"description": "Pimple is a simple Dependency Injection Container for PHP 5.3",
"homepage": "http://pimple.sensiolabs.org",
"keywords": [
"dependency injection",
"container"
]
},
{
"name": "sami/sami",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/fabpot/Sami",
"reference": "35e7ae109e17277baa0ef066f9448078b5aca5e0"
},
"dist": {
"type": "zip",
"url": "https://github.com/fabpot/Sami/zipball/35e7ae109e17277baa0ef066f9448078b5aca5e0",
"reference": "35e7ae109e17277baa0ef066f9448078b5aca5e0",
"shasum": ""
},
"require": {
"php": ">=5.3.0",
"pimple/pimple": "1.0.*",
"twig/twig": "1.*",
"nikic/php-parser": "0.9.*",
"symfony/console": ">=2.1,<3.0-dev",
"symfony/finder": ">=2.1,<3.0-dev",
"symfony/filesystem": ">=2.1,<3.0-dev",
"symfony/yaml": ">=2.1,<3.0-dev",
"symfony/process": ">=2.1,<3.0-dev"
},
"time": "1349357674",
"bin": [
"sami.php"
],
"type": "application",
"installation-source": "source",
"autoload": {
"psr-0": {
"Sami": "."
}
},
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
}
],
"description": "Sami, an API documentation generator",
"homepage": "http://sami.sensiolabs.org",
"keywords": [
"phpdoc"
]
},
{
"name": "silex/silex",
"version": "dev-master",
"source": {
"type": "git",
"url": "git://github.com/fabpot/Silex.git",
"reference": "fc82b4255ef081dd7d464c5320ca93a902f9190f"
},
"dist": {
"type": "zip",
"url": "https://github.com/fabpot/Silex/zipball/fc82b4255ef081dd7d464c5320ca93a902f9190f",
"reference": "fc82b4255ef081dd7d464c5320ca93a902f9190f",
"shasum": ""
},
"require": {
"symfony/event-dispatcher": "2.1.*",
"symfony/http-foundation": "2.1.*",
"symfony/http-kernel": "2.1.*",
"symfony/routing": "2.1.*",
"php": ">=5.3.3",
"pimple/pimple": "1.*"
},
"require-dev": {
"symfony/form": "2.1.*",
"symfony/translation": "2.1.*",
"symfony/twig-bridge": "2.1.*",
"symfony/validator": "2.1.*",
"symfony/monolog-bridge": "2.1.*",
"symfony/browser-kit": "2.1.*",
"symfony/css-selector": "2.1.*",
"symfony/finder": "2.1.*",
"symfony/process": "2.1.*",
"symfony/security": "2.1.*",
"monolog/monolog": ">=1.0.0,<1.2-dev",
"symfony/config": "2.1.*",
"symfony/locale": "2.1.*",
"twig/twig": ">=1.8.0,<2.0-dev",
"swiftmailer/swiftmailer": "4.2.*",
"doctrine/dbal": ">=2.2.0,<2.4.0-dev"
},
"suggest": {
"symfony/browser-kit": "2.1.*",
"symfony/css-selector": "2.1.*",
"symfony/dom-crawler": "2.1.*"
},
"time": "1349013590",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"installation-source": "source",
"autoload": {
"psr-0": {
"Silex": "src/"
}
},
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Igor Wiedler",
"email": "igor@wiedler.ch",
"homepage": "http://wiedler.ch/igor/"
}
],
"description": "The PHP micro-framework based on the Symfony2 Components",
"homepage": "http://silex.sensiolabs.org",
"keywords": [
"microframework"
]
},
{
"name": "symfony/console",
"version": "2.1.x-dev",
"target-dir": "Symfony/Component/Console",
"source": {
"type": "git",
"url": "https://github.com/symfony/Console",
"reference": "1b4f8c7fb257aebf9abd52093e720a3e73458877"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/Console/zipball/1b4f8c7fb257aebf9abd52093e720a3e73458877",
"reference": "1b4f8c7fb257aebf9abd52093e720a3e73458877",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "1349363877",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "source",
"autoload": {
"psr-0": {
"Symfony\\Component\\Console": ""
}
},
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
}
],
"description": "Symfony Console Component",
"homepage": "http://symfony.com"
},
{
"name": "symfony/event-dispatcher",
"version": "2.1.x-dev",
"target-dir": "Symfony/Component/EventDispatcher",
"source": {
"type": "git",
"url": "https://github.com/symfony/EventDispatcher",
"reference": "fb273317c0505ba657aa3d727530d36ae671fb82"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/EventDispatcher/zipball/fb273317c0505ba657aa3d727530d36ae671fb82",
"reference": "fb273317c0505ba657aa3d727530d36ae671fb82",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"symfony/dependency-injection": "2.1.*"
},
"suggest": {
"symfony/dependency-injection": "2.1.*",
"symfony/http-kernel": "2.1.*"
},
"time": "1349363877",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "source",
"autoload": {
"psr-0": {
"Symfony\\Component\\EventDispatcher": ""
}
},
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
}
],
"description": "Symfony EventDispatcher Component",
"homepage": "http://symfony.com"
},
{
"name": "symfony/filesystem",
"version": "2.1.x-dev",
"target-dir": "Symfony/Component/Filesystem",
"source": {
"type": "git",
"url": "https://github.com/symfony/Filesystem",
"reference": "de224eb984501c189e7c5827f38dc47789cdb840"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/Filesystem/zipball/de224eb984501c189e7c5827f38dc47789cdb840",
"reference": "de224eb984501c189e7c5827f38dc47789cdb840",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "1349363877",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "source",
"autoload": {
"psr-0": {
"Symfony\\Component\\Filesystem": ""
}
},
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
}
],
"description": "Symfony Filesystem Component",
"homepage": "http://symfony.com"
},
{
"name": "symfony/finder",
"version": "2.1.x-dev",
"target-dir": "Symfony/Component/Finder",
"source": {
"type": "git",
"url": "https://github.com/symfony/Finder",
"reference": "3566ba9c000c40fb409de1ebdc6e390a14248c3c"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/Finder/zipball/3566ba9c000c40fb409de1ebdc6e390a14248c3c",
"reference": "3566ba9c000c40fb409de1ebdc6e390a14248c3c",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "1349363877",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "source",
"autoload": {
"psr-0": {
"Symfony\\Component\\Finder": ""
}
},
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
}
],
"description": "Symfony Finder Component",
"homepage": "http://symfony.com"
},
{
"name": "symfony/http-foundation",
"version": "2.1.x-dev",
"target-dir": "Symfony/Component/HttpFoundation",
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpFoundation",
"reference": "64fe72c44346dc6ee0a51075e7722ee0af1388ca"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/HttpFoundation/zipball/64fe72c44346dc6ee0a51075e7722ee0af1388ca",
"reference": "64fe72c44346dc6ee0a51075e7722ee0af1388ca",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "1349363877",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "source",
"autoload": {
"psr-0": {
"Symfony\\Component\\HttpFoundation": "",
"SessionHandlerInterface": "Symfony/Component/HttpFoundation/Resources/stubs"
}
},
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
}
],
"description": "Symfony HttpFoundation Component",
"homepage": "http://symfony.com"
},
{
"name": "symfony/http-kernel",
"version": "2.1.x-dev",
"target-dir": "Symfony/Component/HttpKernel",
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpKernel",
"reference": "970a66bcaca90d160b3cc920c87c275147a7142b"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/HttpKernel/zipball/970a66bcaca90d160b3cc920c87c275147a7142b",
"reference": "970a66bcaca90d160b3cc920c87c275147a7142b",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"symfony/event-dispatcher": "2.1.*",
"symfony/http-foundation": "2.1.*"
},
"require-dev": {
"symfony/browser-kit": "2.1.*",
"symfony/class-loader": "2.1.*",
"symfony/config": "2.1.*",
"symfony/console": "2.1.*",
"symfony/dependency-injection": "2.1.*",
"symfony/finder": "2.1.*",
"symfony/process": "2.1.*",
"symfony/routing": "2.1.*"
},
"suggest": {
"symfony/browser-kit": "2.1.*",
"symfony/class-loader": "2.1.*",
"symfony/config": "2.1.*",
"symfony/console": "2.1.*",
"symfony/dependency-injection": "2.1.*",
"symfony/finder": "2.1.*"
},
"time": "1349363877",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "source",
"autoload": {
"psr-0": {
"Symfony\\Component\\HttpKernel": ""
}
},
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
}
],
"description": "Symfony HttpKernel Component",
"homepage": "http://symfony.com"
},
{
"name": "symfony/routing",
"version": "2.1.x-dev",
"target-dir": "Symfony/Component/Routing",
"source": {
"type": "git",
"url": "https://github.com/symfony/Routing",
"reference": "0443e2f9a10f49cac77128eb7f11d055fcf4db9d"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/Routing/zipball/0443e2f9a10f49cac77128eb7f11d055fcf4db9d",
"reference": "0443e2f9a10f49cac77128eb7f11d055fcf4db9d",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"symfony/config": "2.1.*",
"symfony/yaml": "2.1.*",
"symfony/http-kernel": "2.1.*",
"doctrine/common": ">=2.2,<2.4-dev"
},
"suggest": {
"doctrine/common": ">=2.2,<2.4-dev",
"symfony/config": "2.1.*",
"symfony/yaml": "2.1.*"
},
"time": "1349363877",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "source",
"autoload": {
"psr-0": {
"Symfony\\Component\\Routing": ""
}
},
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
}
],
"description": "Symfony Routing Component",
"homepage": "http://symfony.com"
},
{
"name": "symfony/yaml",
"version": "dev-master",
"target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
"url": "https://github.com/symfony/Yaml",
"reference": "f965c71d0edb97cef36c556f2bda25298fce7e69"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/Yaml/zipball/f965c71d0edb97cef36c556f2bda25298fce7e69",
"reference": "f965c71d0edb97cef36c556f2bda25298fce7e69",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "1348817656",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.2-dev"
}
},
"installation-source": "source",
"autoload": {
"psr-0": {
"Symfony\\Component\\Yaml\\": ""
}
},
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
}
],
"description": "Symfony Yaml Component",
"homepage": "http://symfony.com"
},
{
"name": "twig/twig",
"version": "dev-master",
"source": {
"type": "git",
"url": "git://github.com/fabpot/Twig.git",
"reference": "5d7baaf767ec3b8f6599738e7c98bde6c25cf7c1"
},
"dist": {
"type": "zip",
"url": "https://github.com/fabpot/Twig/zipball/5d7baaf767ec3b8f6599738e7c98bde6c25cf7c1",
"reference": "5d7baaf767ec3b8f6599738e7c98bde6c25cf7c1",
"shasum": ""
},
"require": {
"php": ">=5.2.4"
},
"time": "1349508092",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.10-dev"
}
},
"installation-source": "source",
"autoload": {
"psr-0": {
"Twig_": "lib/"
}
},
"license": [
"BSD-3"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Armin Ronacher",
"email": "armin.ronacher@active-4.com"
}
],
"description": "Twig, the flexible, fast, and secure template language for PHP",
"homepage": "http://twig.sensiolabs.org",
"keywords": [
"templating"
]
}
],
"packages-dev": null,
"aliases": [
],