From bd6045f0246d9217cad1212ffd0f400965e19e4e Mon Sep 17 00:00:00 2001
From: Julien Chanseaume <julien.chanseaume@gmail.com>
Date: Sat, 3 May 2014 11:38:30 +0200
Subject: [PATCH] added new dependency to composer.lock

---
 composer.json | 56 ++++++++++++++++++-------------------
 composer.lock | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 101 insertions(+), 31 deletions(-)

diff --git a/composer.json b/composer.json
index 2a7200d57..37f3a0b15 100644
--- a/composer.json
+++ b/composer.json
@@ -1,42 +1,36 @@
 {
-    "name" : "thelia/thelia",
-    "description" : "Thelia is an ecommerce CMS.",
-    "license" : "LGPL-3.0+",
-    "homepage" : "http://thelia.net/",
-    "support" : {
-        "forum" : "http://thelia.net/forum",
-        "wiki" : "http://doc.thelia.net"
+    "name": "thelia/thelia",
+    "description": "Thelia is an ecommerce CMS.",
+    "license": "LGPL-3.0+",
+    "homepage": "http://thelia.net/",
+    "support": {
+        "forum": "http://thelia.net/forum",
+        "wiki": "http://doc.thelia.net"
     },
-    "require":{
+    "require": {
         "php": ">=5.4",
         "ircmaxell/password-compat": "1.0.*",
         "propel/propel": "dev-master",
-        "psr/log" : "1.0",
+        "psr/log": "1.0",
         "symfony/class-loader": "2.2.*",
-        "symfony/config" : "2.2.*",
-        "symfony/console" : "2.2.*",
-        "symfony/dependency-injection" : "2.2.*",
-        "symfony/event-dispatcher" : "2.2.*",
-        "symfony/http-kernel" : "2.2.*",
-        "symfony/routing" : "2.2.*",
-        "symfony/filesystem" : "2.2.*",
-        "symfony/yaml" : "2.2.*",
-        "symfony/translation" : "2.2.*",
-
+        "symfony/config": "2.2.*",
+        "symfony/console": "2.2.*",
+        "symfony/dependency-injection": "2.2.*",
+        "symfony/event-dispatcher": "2.2.*",
+        "symfony/http-kernel": "2.2.*",
+        "symfony/routing": "2.2.*",
+        "symfony/filesystem": "2.2.*",
+        "symfony/yaml": "2.2.*",
+        "symfony/translation": "2.2.*",
         "symfony-cmf/routing": "1.0.0",
-
         "symfony/form": "2.2.*",
         "symfony/validator": "2.3.*",
-
         "smarty/smarty": "v3.1.14",
         "kriswallsmith/assetic": "1.2.*@dev",
         "leafo/lessphp": "0.4.*",
         "ptachoire/cssembed": "1.0.*",
-
         "doctrine/cache": "v1.3.0",
-
         "simplepie/simplepie": "dev-master",
-
         "imagine/imagine": "0.*",
         "symfony/icu": "1.0",
         "swiftmailer/swiftmailer": "5.0.*",
@@ -44,20 +38,20 @@
         "ensepar/html2pdf": "1.0.1",
         "symfony/finder": "~2.2"
     },
-    "require-dev" : {
+    "require-dev": {
         "phpunit/phpunit": "3.7.*",
         "fzaninotto/faker": "dev-master",
         "maximebf/debugbar": "dev-master"
     },
     "minimum-stability": "stable",
-    "config" : {
-        "vendor-dir" : "core/vendor",
-        "bin-dir" : "bin"
+    "config": {
+        "vendor-dir": "core/vendor",
+        "bin-dir": "bin"
     },
     "autoload": {
         "psr-0": {
             "": "local/modules/",
-            "Thelia" : "core/lib/"
+            "Thelia": "core/lib/"
         }
     },
     "extra": {
@@ -81,7 +75,9 @@
                     "reference": "tags/Smarty_3_1_14/distribution/"
                 },
                 "autoload": {
-                    "classmap": ["libs/"]
+                    "classmap": [
+                        "libs/"
+                    ]
                 }
             }
         }
diff --git a/composer.lock b/composer.lock
index 47290ff45..d7da926ba 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3,8 +3,82 @@
         "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": "5091d03a67414e4ed7aef32a8c737503",
+    "hash": "d1e1c31ed8e38f2282ab431898cf8b08",
     "packages": [
+        {
+            "name": "doctrine/cache",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/cache.git",
+                "reference": "e16d7adf45664a50fa86f515b6d5e7f670130449"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/e16d7adf45664a50fa86f515b6d5e7f670130449",
+                "reference": "e16d7adf45664a50fa86f515b6d5e7f670130449",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "conflict": {
+                "doctrine/common": ">2.2,<2.4"
+            },
+            "require-dev": {
+                "phpunit/phpunit": ">=3.7",
+                "satooshi/php-coveralls": "~0.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Doctrine\\Common\\Cache\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jonathan H. Wage",
+                    "email": "jonwage@gmail.com",
+                    "homepage": "http://www.jwage.com/",
+                    "role": "Creator"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com",
+                    "homepage": "http://www.instaclick.com"
+                },
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com",
+                    "homepage": "http://jmsyst.com",
+                    "role": "Developer of wrapped JMSSerializerBundle"
+                }
+            ],
+            "description": "Caching library offering an object-oriented API for many cache backends",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "cache",
+                "caching"
+            ],
+            "time": "2013-10-25 19:04:14"
+        },
         {
             "name": "ensepar/html2pdf",
             "version": "1.0.1",