Skip to content
Extraits de code Groupes Projets
Valider 41a0e0df rédigé par mattab's avatar mattab
Parcourir les fichiers

Use latest doctrine/cache including file cache edge cases fixes. Add the alias... 

Use latest doctrine/cache including file cache edge cases fixes. Add the alias repo to piwik composer.json so composer update will fetch this code.
parent 7f776304
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
composer.json
+ 5
− 0
Voir le fichier @ 41a0e0df
......@@ -47,6 +47,7 @@
"piwik/network": "~0.1.0",
"mnapoli/php-di": "5.0.x-dev",
"piwik/cache": "~0.2",
"doctrine/cache": "dev-filecache-race-condition-fix as 1.3.1",
"psr/log": "~1.0",
"monolog/monolog": "~1.11",
"symfony/monolog-bridge": "~2.6",
......@@ -85,6 +86,10 @@
"reference": "master"
}
}
},
{
"type": "git",
"url": "https://github.com/piwik/cache.git"
}
],
"scripts": {
......
composer.lock
+ 42
− 40
Voir le fichier @ 41a0e0df
......@@ -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": "4fd5467c0e86c5a365079c333d597e4a",
"hash": "eaa7dcd4b0c89c35cff039cd259a38c3",
"packages": [
{
"name": "container-interop/container-interop",
......@@ -103,17 +103,11 @@
},
{
"name": "doctrine/cache",
"version": "v1.3.1",
"version": "dev-filecache-race-condition-fix",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
"reference": "cf483685798a72c93bf4206e3dd6358ea07d64e7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/cf483685798a72c93bf4206e3dd6358ea07d64e7",
"reference": "cf483685798a72c93bf4206e3dd6358ea07d64e7",
"shasum": ""
"url": "https://github.com/piwik/cache.git",
"reference": "c5a6d2ade84241128fcf95eca386e07b11ffa347"
},
"require": {
"php": ">=5.3.2"
......@@ -123,6 +117,7 @@
},
"require-dev": {
"phpunit/phpunit": ">=3.7",
"predis/predis": "~0.8",
"satooshi/php-coveralls": "~0.6"
},
"type": "library",
......@@ -136,11 +131,14 @@
"Doctrine\\Common\\Cache\\": "lib/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com"
},
{
"name": "Roman Borschel",
"email": "roman@code-factory.org"
......@@ -149,10 +147,6 @@
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de"
},
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com"
},
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com"
......@@ -168,7 +162,7 @@
"cache",
"caching"
],
"time": "2014-09-17 14:24:04"
"time": "2014-12-28 23:29:42"
},
{
"name": "doctrine/lexer",
......@@ -506,20 +500,20 @@
},
{
"name": "piwik/cache",
"version": "0.2.2",
"version": "0.2.3",
"source": {
"type": "git",
"url": "https://github.com/piwik/component-cache.git",
"reference": "e6205408641cbf16b5043e0092e4414e3a4330ff"
"reference": "a08383ef0824bedb193c26393a83904355f94543"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/piwik/component-cache/zipball/e6205408641cbf16b5043e0092e4414e3a4330ff",
"reference": "e6205408641cbf16b5043e0092e4414e3a4330ff",
"url": "https://api.github.com/repos/piwik/component-cache/zipball/a08383ef0824bedb193c26393a83904355f94543",
"reference": "a08383ef0824bedb193c26393a83904355f94543",
"shasum": ""
},
"require": {
"doctrine/cache": "~1.3",
"doctrine/cache": "dev-filecache-race-condition-fix as 1.3.1",
"php": ">=5.3.2"
},
"require-dev": {
......@@ -549,7 +543,7 @@
"file",
"redis"
],
"time": "2014-12-17 22:49:09"
"time": "2014-12-29 00:00:08"
},
{
"name": "piwik/decompress",
......@@ -919,16 +913,16 @@
},
{
"name": "twig/twig",
"version": "v1.16.2",
"version": "v1.16.3",
"source": {
"type": "git",
"url": "https://github.com/fabpot/Twig.git",
"reference": "42f758d9fe2146d1f0470604fc05ee43580873fc"
"url": "https://github.com/twigphp/Twig.git",
"reference": "6dc11a1e8ecfc30e2c68aaeb218148409d8e68af"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fabpot/Twig/zipball/42f758d9fe2146d1f0470604fc05ee43580873fc",
"reference": "42f758d9fe2146d1f0470604fc05ee43580873fc",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/6dc11a1e8ecfc30e2c68aaeb218148409d8e68af",
"reference": "6dc11a1e8ecfc30e2c68aaeb218148409d8e68af",
"shasum": ""
},
"require": {
......@@ -963,7 +957,7 @@
},
{
"name": "Twig Team",
"homepage": "https://github.com/fabpot/Twig/graphs/contributors",
"homepage": "http://twig.sensiolabs.org/contributors",
"role": "Contributors"
}
],
......@@ -972,7 +966,7 @@
"keywords": [
"templating"
],
"time": "2014-10-17 12:53:44"
"time": "2014-12-25 19:58:19"
}
],
"packages-dev": [
......@@ -1318,16 +1312,16 @@
},
{
"name": "phpunit/php-code-coverage",
"version": "2.0.13",
"version": "2.0.14",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5"
"reference": "ca158276c1200cc27f5409a5e338486bc0b4fc94"
},
"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/ca158276c1200cc27f5409a5e338486bc0b4fc94",
"reference": "ca158276c1200cc27f5409a5e338486bc0b4fc94",
"shasum": ""
},
"require": {
......@@ -1379,7 +1373,7 @@
"testing",
"xunit"
],
"time": "2014-12-03 06:41:44"
"time": "2014-12-26 13:28:33"
},
{
"name": "phpunit/php-file-iterator",
......@@ -1565,16 +1559,16 @@
},
{
"name": "phpunit/phpunit",
"version": "4.4.0",
"version": "4.4.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "bbe7bcb83b6ec1a9eaabbe1b70d4795027c53ee0"
"reference": "6a5e49a86ce5e33b8d0657abe145057fc513543a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bbe7bcb83b6ec1a9eaabbe1b70d4795027c53ee0",
"reference": "bbe7bcb83b6ec1a9eaabbe1b70d4795027c53ee0",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6a5e49a86ce5e33b8d0657abe145057fc513543a",
"reference": "6a5e49a86ce5e33b8d0657abe145057fc513543a",
"shasum": ""
},
"require": {
......@@ -1632,7 +1626,7 @@
"testing",
"xunit"
],
"time": "2014-12-05 06:49:03"
"time": "2014-12-28 07:57:05"
},
{
"name": "phpunit/phpunit-mock-objects",
......@@ -2107,10 +2101,18 @@
"time": "2014-12-02 20:19:20"
}
],
"aliases": [],
"aliases": [
{
"alias": "1.3.1",
"alias_normalized": "1.3.1.0",
"version": "dev-filecache-race-condition-fix",
"package": "doctrine/cache"
}
],
"minimum-stability": "stable",
"stability-flags": {
"mnapoli/php-di": 20,
"doctrine/cache": 20,
"facebook/xhprof": 20
},
"prefer-stable": false,
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter