From 047968613cfe04aedf11b01bea6b5127d8242159 Mon Sep 17 00:00:00 2001 From: Vlad Veselov Date: Mon, 5 Jan 2015 11:37:14 -0500 Subject: [PATCH] MAGETWO-32346: [GITHUB] Replace Symfony2/Yaml in composer #871 - update composer.lock with "composer update symfony/yaml" --- composer.json | 1 - composer.lock | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index b30cc8775b2c0..027f9ba73d516 100644 --- a/composer.json +++ b/composer.json @@ -143,7 +143,6 @@ "magento/framework": "self.version", "magento/project-setup": "0.1.0", "oyejorge/less.php": "1.7.0", - "symfony/yaml": "2.3.x-dev", "trentrichardson/jquery-timepicker-addon": "1.4.3", "components/handlebars.js": "1.3.0", "colinmollenhour/cache-backend-redis": "dev-master#193d377b7fb2e88595578b282fa01a62d1185abc", diff --git a/composer.lock b/composer.lock index d2fc6da7fe7b8..2c0bffca2825e 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": "d3a510fb8a6b17c084148509d02478d4", + "hash": "09c73c1f1d5d4b40621ae2be993e8ad7", "packages": [ { "name": "composer/composer", @@ -3025,6 +3025,53 @@ "description": "Symfony Stopwatch Component", "homepage": "http://symfony.com", "time": "2014-12-02 20:19:20" + }, + { + "name": "symfony/yaml", + "version": "v2.6.1", + "target-dir": "Symfony/Component/Yaml", + "source": { + "type": "git", + "url": "https://github.com/symfony/Yaml.git", + "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/3346fc090a3eb6b53d408db2903b241af51dcb20", + "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Yaml\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony Yaml Component", + "homepage": "http://symfony.com", + "time": "2014-12-02 20:19:20" } ], "aliases": [],