Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsgiehl <stefan@piwik.org>2015-01-19 00:01:00 +0300
committersgiehl <stefan@piwik.org>2015-01-19 00:01:00 +0300
commit20c994ca4110eb1478d356d3582f211821d5ad6f (patch)
tree949b5c9888487393da6b1d1fa051214cc2659272
parentadcf4f0e8642287ceeb28ca0e07dda9a9efad00d (diff)
update device-detector to latest beta
-rw-r--r--composer.json2
-rw-r--r--composer.lock21
2 files changed, 13 insertions, 10 deletions
diff --git a/composer.json b/composer.json
index 87a6b2b0d7..e77510dc4a 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
"symfony/console": "~2.6",
"tedivm/jshrink": "~0.5.1",
"mustangostang/spyc": "~0.5.0",
- "piwik/device-detector": "~2.0",
+ "piwik/device-detector": "~3.0-b1",
"piwik/decompress": "~0.1.1",
"piwik/network": "~0.1.0",
"piwik/cache": "~0.2",
diff --git a/composer.lock b/composer.lock
index 2b34d06512..87a568a713 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": "09ced245f00415f5fe13703565767884",
+ "hash": "2177a4784abbcf6361c92c7ed6595f5f",
"packages": [
{
"name": "container-interop/container-interop",
@@ -584,24 +584,27 @@
},
{
"name": "piwik/device-detector",
- "version": "2.8",
+ "version": "3.0-b1",
"source": {
"type": "git",
"url": "https://github.com/piwik/device-detector.git",
- "reference": "228a3b3ea17b67305a972b4e00c25f0926d3e016"
+ "reference": "7272d267c2b305f7bd106a464f7b5050ffda6652"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/piwik/device-detector/zipball/228a3b3ea17b67305a972b4e00c25f0926d3e016",
- "reference": "228a3b3ea17b67305a972b4e00c25f0926d3e016",
+ "url": "https://api.github.com/repos/piwik/device-detector/zipball/7272d267c2b305f7bd106a464f7b5050ffda6652",
+ "reference": "7272d267c2b305f7bd106a464f7b5050ffda6652",
"shasum": ""
},
"require": {
"mustangostang/spyc": "*",
- "php": ">=5.3.1"
+ "php": ">=5.3.2"
},
"require-dev": {
- "phpunit/phpunit": "4.0.*"
+ "phpunit/phpunit": "4.1.*"
+ },
+ "suggest": {
+ "doctrine/cache": "Can directly be used for caching purpose"
},
"type": "library",
"autoload": {
@@ -627,7 +630,7 @@
"parser",
"useragent"
],
- "time": "2015-01-01 16:13:46"
+ "time": "2015-01-18 20:47:30"
},
{
"name": "piwik/ini",
@@ -2145,12 +2148,12 @@
],
"minimum-stability": "stable",
"stability-flags": {
+ "piwik/device-detector": 10,
"mnapoli/php-di": 20,
"doctrine/cache": 20,
"facebook/xhprof": 20
},
"prefer-stable": false,
- "prefer-lowest": false,
"platform": {
"php": ">=5.3.3"
},