From 329a1a47f64b3f7688c6aee9f9230be33c8d4a4e Mon Sep 17 00:00:00 2001
From: sgiehl <stefan@piwik.org>
Date: Thu, 3 Apr 2014 16:33:16 +0200
Subject: [PATCH] updated composer files
---
composer.json | 4 +-
composer.lock | 129 ++++++++++++++++++++++++++++++++++++++++++++------
2 files changed, 117 insertions(+), 16 deletions(-)
diff --git a/composer.json b/composer.json
index 28afb9f9e9..8c3fc620d8 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
"leafo/lessphp": "~0.3",
"symfony/console": ">=v2.3.5",
"tedivm/jshrink": "v0.5.1",
- "mustangostang/spyc": "*",
- "piwik/device-detector": "dev-master"
+ "mustangostang/spyc": "0.5.*",
+ "piwik/device-detector": "*"
}
}
diff --git a/composer.lock b/composer.lock
index e78d8c034b..ffd24281c0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3,7 +3,7 @@
"This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
],
- "hash": "bc71546c9c93af3b73fa804b0f21aa3c",
+ "hash": "69246584e6b57bfbc8d39799cd3b9213",
"packages": [
{
"name": "leafo/lessphp",
@@ -46,19 +46,110 @@
"homepage": "http://leafo.net/lessphp/",
"time": "2013-08-09 17:09:19"
},
+ {
+ "name": "mustangostang/spyc",
+ "version": "0.5.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/mustangostang/spyc.git",
+ "reference": "dc4785b4d7227fd9905e086d499fb8abfadf9977"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/mustangostang/spyc/zipball/dc4785b4d7227fd9905e086d499fb8abfadf9977",
+ "reference": "dc4785b4d7227fd9905e086d499fb8abfadf9977",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.1"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "0.5.x-dev"
+ }
+ },
+ "autoload": {
+ "files": [
+ "Spyc.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT License"
+ ],
+ "authors": [
+ {
+ "name": "mustangostang",
+ "email": "vlad.andersen@gmail.com"
+ }
+ ],
+ "description": "A simple YAML loader/dumper class for PHP",
+ "homepage": "https://github.com/mustangostang/spyc/",
+ "keywords": [
+ "spyc",
+ "yaml",
+ "yml"
+ ],
+ "time": "2013-02-21 10:52:01"
+ },
+ {
+ "name": "piwik/device-detector",
+ "version": "1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/piwik/device-detector.git",
+ "reference": "ea7c5d8b76def0d8345a4eba59c5f98ec0109de6"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/piwik/device-detector/zipball/ea7c5d8b76def0d8345a4eba59c5f98ec0109de6",
+ "reference": "ea7c5d8b76def0d8345a4eba59c5f98ec0109de6",
+ "shasum": ""
+ },
+ "require": {
+ "mustangostang/spyc": "*",
+ "php": ">=5.3.1"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "DeviceDetector.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "GPL-3.0+"
+ ],
+ "authors": [
+ {
+ "name": "The Piwik Team",
+ "email": "hello@piwik.org",
+ "homepage": "http://piwik.org/the-piwik-team/"
+ }
+ ],
+ "description": "The Universal Device Detection library, that parses User Agents and detects devices (desktop, tablet, mobile, tv, cars, console, etc.), and detects browsers, operating systems, devices, brands and models.",
+ "homepage": "http://piwik.org",
+ "keywords": [
+ "devicedetection",
+ "parser",
+ "useragent"
+ ],
+ "time": "2014-04-03 08:59:48"
+ },
{
"name": "symfony/console",
- "version": "v2.4.1",
+ "version": "v2.4.2",
"target-dir": "Symfony/Component/Console",
"source": {
"type": "git",
"url": "https://github.com/symfony/Console.git",
- "reference": "4c1ed2ff514bd85ee186eebb010ccbdeeab05af7"
+ "reference": "940f217cbc3c8a33e5403e7c595495c4884400fe"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Console/zipball/4c1ed2ff514bd85ee186eebb010ccbdeeab05af7",
- "reference": "4c1ed2ff514bd85ee186eebb010ccbdeeab05af7",
+ "url": "https://api.github.com/repos/symfony/Console/zipball/940f217cbc3c8a33e5403e7c595495c4884400fe",
+ "reference": "940f217cbc3c8a33e5403e7c595495c4884400fe",
"shasum": ""
},
"require": {
@@ -88,7 +179,9 @@
"authors": [
{
"name": "Fabien Potencier",
- "email": "fabien@symfony.com"
+ "email": "fabien@symfony.com",
+ "homepage": "http://fabien.potencier.org",
+ "role": "Lead Developer"
},
{
"name": "Symfony Community",
@@ -97,7 +190,7 @@
],
"description": "Symfony Console Component",
"homepage": "http://symfony.com",
- "time": "2014-01-01 08:14:50"
+ "time": "2014-02-11 13:52:09"
},
{
"name": "tedivm/jshrink",
@@ -142,16 +235,16 @@
},
{
"name": "twig/twig",
- "version": "v1.15.0",
+ "version": "v1.15.1",
"source": {
"type": "git",
"url": "https://github.com/fabpot/Twig.git",
- "reference": "85e4ff98000157ff753d934b9f13659a953f5666"
+ "reference": "1fb5784662f438d7d96a541e305e28b812e2eeed"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fabpot/Twig/zipball/85e4ff98000157ff753d934b9f13659a953f5666",
- "reference": "85e4ff98000157ff753d934b9f13659a953f5666",
+ "url": "https://api.github.com/repos/fabpot/Twig/zipball/1fb5784662f438d7d96a541e305e28b812e2eeed",
+ "reference": "1fb5784662f438d7d96a541e305e28b812e2eeed",
"shasum": ""
},
"require": {
@@ -175,11 +268,19 @@
"authors": [
{
"name": "Fabien Potencier",
- "email": "fabien@symfony.com"
+ "email": "fabien@symfony.com",
+ "homepage": "http://fabien.potencier.org",
+ "role": "Lead Developer"
},
{
"name": "Armin Ronacher",
- "email": "armin.ronacher@active-4.com"
+ "email": "armin.ronacher@active-4.com",
+ "role": "Project Founder"
+ },
+ {
+ "name": "Twig Team",
+ "homepage": "https://github.com/fabpot/Twig/graphs/contributors",
+ "role": "Contributors"
}
],
"description": "Twig, the flexible, fast, and secure template language for PHP",
@@ -187,7 +288,7 @@
"keywords": [
"templating"
],
- "time": "2013-12-06 07:47:10"
+ "time": "2014-02-13 10:19:29"
}
],
"packages-dev": [
--
GitLab