diff options
author | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-12-17 07:57:37 +0300 |
---|---|---|
committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-12-17 07:59:14 +0300 |
commit | 524565eb40d8c20080d345be80610ccdea11d8af (patch) | |
tree | e88043f856dde04ce4a43e1b5e904b1dbe2ad7bc /composer.lock | |
parent | c8c433b9d3afeaca87c3d85b184a2b29f5002d38 (diff) | |
parent | 719114577f0a5a7962e37a250db3a8d76a1809b8 (diff) |
Merge branch 'master' into log-refactoring-1
Conflicts:
composer.json
composer.lock
config/global.php
core/Container/StaticContainer.php
Diffstat (limited to 'composer.lock')
-rw-r--r-- | composer.lock | 216 |
1 files changed, 106 insertions, 110 deletions
diff --git a/composer.lock b/composer.lock index 12cb16dd69..7cc262d96d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "ed64c8df41ea550e2c0b78424573310e", + "hash": "27a92c6a859979be2d9fb4df337c8655", "packages": [ { "name": "container-interop/container-interop", @@ -269,12 +269,12 @@ "source": { "type": "git", "url": "https://github.com/mnapoli/PHP-DI.git", - "reference": "d7f54f3c1b3523493eb5f4b5ca38bcfd74d96169" + "reference": "4676e15f7f014185864fd5f8f0b3cdbd678067d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mnapoli/PHP-DI/zipball/d7f54f3c1b3523493eb5f4b5ca38bcfd74d96169", - "reference": "d7f54f3c1b3523493eb5f4b5ca38bcfd74d96169", + "url": "https://api.github.com/repos/mnapoli/PHP-DI/zipball/4676e15f7f014185864fd5f8f0b3cdbd678067d0", + "reference": "4676e15f7f014185864fd5f8f0b3cdbd678067d0", "shasum": "" }, "require": { @@ -317,7 +317,7 @@ "dependency injection", "di" ], - "time": "2014-12-11 22:24:18" + "time": "2014-12-17 04:49:43" }, { "name": "mnapoli/phpdocreader", @@ -505,6 +505,53 @@ "time": "2013-11-11 18:29:08" }, { + "name": "piwik/cache", + "version": "0.2.1", + "source": { + "type": "git", + "url": "https://github.com/piwik/component-cache.git", + "reference": "1cbe0012f703b5462e87520ebcf76bdca89026e8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/piwik/component-cache/zipball/1cbe0012f703b5462e87520ebcf76bdca89026e8", + "reference": "1cbe0012f703b5462e87520ebcf76bdca89026e8", + "shasum": "" + }, + "require": { + "doctrine/cache": "~1.3", + "php": ">=5.3.2" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Piwik\\Cache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0" + ], + "authors": [ + { + "name": "The Piwik Team", + "email": "hello@piwik.org", + "homepage": "http://piwik.org/the-piwik-team/" + } + ], + "description": "PHP caching library based on Doctrine cache", + "keywords": [ + "array", + "cache", + "file", + "redis" + ], + "time": "2014-12-16 01:47:11" + }, + { "name": "piwik/decompress", "version": "0.1.1", "source": { @@ -658,17 +705,17 @@ }, { "name": "symfony/console", - "version": "v2.6.1", + "version": "v2.5.6", "target-dir": "Symfony/Component/Console", "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "ef825fd9f809d275926547c9e57cbf14968793e8" + "reference": "6f177fca24200a5b97aef5ce7a5c98124a0f0db0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/ef825fd9f809d275926547c9e57cbf14968793e8", - "reference": "ef825fd9f809d275926547c9e57cbf14968793e8", + "url": "https://api.github.com/repos/symfony/Console/zipball/6f177fca24200a5b97aef5ce7a5c98124a0f0db0", + "reference": "6f177fca24200a5b97aef5ce7a5c98124a0f0db0", "shasum": "" }, "require": { @@ -676,18 +723,16 @@ }, "require-dev": { "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.1", - "symfony/process": "~2.1" + "symfony/event-dispatcher": "~2.1" }, "suggest": { "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/process": "" + "symfony/event-dispatcher": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.5-dev" } }, "autoload": { @@ -711,7 +756,7 @@ ], "description": "Symfony Console Component", "homepage": "http://symfony.com", - "time": "2014-12-02 20:19:20" + "time": "2014-10-05 13:57:04" }, { "name": "symfony/monolog-bridge", @@ -1115,16 +1160,16 @@ }, { "name": "phpseclib/phpseclib", - "version": "0.3.9", + "version": "0.3.8", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "c6e88ca6e81bc5a2d7161658e16a95b7ef8d6ad1" + "reference": "5085202f1f37769aae59f9711c423f28159c9b29" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c6e88ca6e81bc5a2d7161658e16a95b7ef8d6ad1", - "reference": "c6e88ca6e81bc5a2d7161658e16a95b7ef8d6ad1", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/5085202f1f37769aae59f9711c423f28159c9b29", + "reference": "5085202f1f37769aae59f9711c423f28159c9b29", "shasum": "" }, "require": { @@ -1209,20 +1254,20 @@ "x.509", "x509" ], - "time": "2014-11-10 03:08:59" + "time": "2014-09-13 02:42:45" }, { "name": "phpunit/php-code-coverage", - "version": "2.0.13", + "version": "2.0.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5" + "reference": "53603b3c995f5aab6b59c8e08c3a663d2cc810b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5", - "reference": "0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/53603b3c995f5aab6b59c8e08c3a663d2cc810b7", + "reference": "53603b3c995f5aab6b59c8e08c3a663d2cc810b7", "shasum": "" }, "require": { @@ -1274,7 +1319,7 @@ "testing", "xunit" ], - "time": "2014-12-03 06:41:44" + "time": "2014-08-31 06:33:04" }, { "name": "phpunit/php-file-iterator", @@ -1460,16 +1505,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.4.0", + "version": "4.3.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "bbe7bcb83b6ec1a9eaabbe1b70d4795027c53ee0" + "reference": "23e4e0310f037aae873cc81b8658dbbb82878f71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bbe7bcb83b6ec1a9eaabbe1b70d4795027c53ee0", - "reference": "bbe7bcb83b6ec1a9eaabbe1b70d4795027c53ee0", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/23e4e0310f037aae873cc81b8658dbbb82878f71", + "reference": "23e4e0310f037aae873cc81b8658dbbb82878f71", "shasum": "" }, "require": { @@ -1486,9 +1531,8 @@ "phpunit/phpunit-mock-objects": "~2.3", "sebastian/comparator": "~1.0", "sebastian/diff": "~1.1", - "sebastian/environment": "~1.1", + "sebastian/environment": "~1.0", "sebastian/exporter": "~1.0", - "sebastian/global-state": "~1.0", "sebastian/version": "~1.0", "symfony/yaml": "~2.0" }, @@ -1501,7 +1545,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.4.x-dev" + "dev-master": "4.3.x-dev" } }, "autoload": { @@ -1510,6 +1554,10 @@ ] }, "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "", + "../../symfony/yaml/" + ], "license": [ "BSD-3-Clause" ], @@ -1521,13 +1569,13 @@ } ], "description": "The PHP Unit Testing framework.", - "homepage": "https://phpunit.de/", + "homepage": "http://www.phpunit.de/", "keywords": [ "phpunit", "testing", "xunit" ], - "time": "2014-12-05 06:49:03" + "time": "2014-10-22 11:43:12" }, { "name": "phpunit/phpunit-mock-objects", @@ -1586,16 +1634,16 @@ }, { "name": "sebastian/comparator", - "version": "1.1.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "c484a80f97573ab934e37826dba0135a3301b26a" + "reference": "e54a01c0da1b87db3c5a3c4c5277ddf331da4aef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/c484a80f97573ab934e37826dba0135a3301b26a", - "reference": "c484a80f97573ab934e37826dba0135a3301b26a", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/e54a01c0da1b87db3c5a3c4c5277ddf331da4aef", + "reference": "e54a01c0da1b87db3c5a3c4c5277ddf331da4aef", "shasum": "" }, "require": { @@ -1609,7 +1657,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { @@ -1646,7 +1694,7 @@ "compare", "equality" ], - "time": "2014-11-16 21:32:38" + "time": "2014-05-11 23:00:21" }, { "name": "sebastian/diff", @@ -1702,16 +1750,16 @@ }, { "name": "sebastian/environment", - "version": "1.2.1", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7" + "reference": "0d9bf79554d2a999da194a60416c15cf461eb67d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e6c71d918088c251b181ba8b3088af4ac336dd7", - "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/0d9bf79554d2a999da194a60416c15cf461eb67d", + "reference": "0d9bf79554d2a999da194a60416c15cf461eb67d", "shasum": "" }, "require": { @@ -1748,7 +1796,7 @@ "environment", "hhvm" ], - "time": "2014-10-25 08:00:45" + "time": "2014-10-22 06:38:05" }, { "name": "sebastian/exporter", @@ -1816,57 +1864,6 @@ "time": "2014-09-10 00:51:36" }, { - "name": "sebastian/global-state", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01", - "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.2" - }, - "suggest": { - "ext-uopz": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Snapshotting of global state", - "homepage": "http://www.github.com/sebastianbergmann/global-state", - "keywords": [ - "global state" - ], - "time": "2014-10-06 09:23:50" - }, - { "name": "sebastian/version", "version": "1.0.3", "source": { @@ -1903,17 +1900,17 @@ }, { "name": "symfony/event-dispatcher", - "version": "v2.6.1", + "version": "v2.5.6", "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "720fe9bca893df7ad1b4546649473b5afddf0216" + "reference": "804eb28dbbfba9ffdab21fe2066744906cea2212" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/720fe9bca893df7ad1b4546649473b5afddf0216", - "reference": "720fe9bca893df7ad1b4546649473b5afddf0216", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/804eb28dbbfba9ffdab21fe2066744906cea2212", + "reference": "804eb28dbbfba9ffdab21fe2066744906cea2212", "shasum": "" }, "require": { @@ -1922,8 +1919,7 @@ "require-dev": { "psr/log": "~1.0", "symfony/config": "~2.0", - "symfony/dependency-injection": "~2.6", - "symfony/expression-language": "~2.6", + "symfony/dependency-injection": "~2.0,<2.6.0", "symfony/stopwatch": "~2.2" }, "suggest": { @@ -1933,7 +1929,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.5-dev" } }, "autoload": { @@ -1957,21 +1953,21 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "http://symfony.com", - "time": "2014-12-02 20:19:20" + "time": "2014-10-01 15:43:05" }, { "name": "symfony/yaml", - "version": "v2.6.1", + "version": "v2.5.6", "target-dir": "Symfony/Component/Yaml", "source": { "type": "git", "url": "https://github.com/symfony/Yaml.git", - "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20" + "reference": "2d9f527449cabfa8543dd7fa3a466d6ae83d6726" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/3346fc090a3eb6b53d408db2903b241af51dcb20", - "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/2d9f527449cabfa8543dd7fa3a466d6ae83d6726", + "reference": "2d9f527449cabfa8543dd7fa3a466d6ae83d6726", "shasum": "" }, "require": { @@ -1980,7 +1976,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.5-dev" } }, "autoload": { @@ -2004,7 +2000,7 @@ ], "description": "Symfony Yaml Component", "homepage": "http://symfony.com", - "time": "2014-12-02 20:19:20" + "time": "2014-10-01 05:50:18" } ], "aliases": [], |