From a60bce3b23fc6bd7da8937748b6bc111c2b58b22 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Thu, 1 Oct 2015 21:31:48 +0300 Subject: [PATCH] Symfony stable 2.7.x branch. --- composer.json | 2 +- composer.lock | 23 +++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index 347e575..d5f5f3f 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ }, "require": { "php": ">=5.3.3", - "symfony/symfony": "2.7.x-dev", + "symfony/symfony": "2.7.*", "doctrine/orm": "~2.2,>=2.2.3,<2.5", "doctrine/dbal": "<2.5", "doctrine/doctrine-bundle": "~1.4", diff --git a/composer.lock b/composer.lock index 8ebdb2d..5baf850 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "3ea840c67fb58fde0c60ae6cf30da8c0", - "content-hash": "1344636f00611d01247e8c129d44e2f0", + "hash": "2730cf99a45485bcd85fb5e0eed3a41c", + "content-hash": "0da9c81dcc1cb8e886339580c46ccda9", "packages": [ { "name": "doctrine/annotations", @@ -1730,23 +1730,23 @@ }, { "name": "symfony/symfony", - "version": "2.7.x-dev", + "version": "v2.7.5", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "7493c2bef54fb818c5304bdd9d2194890b839422" + "reference": "619528a274647cffc1792063c3ea04c4fa8266a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/4b0e4c4ee0a1e4f8a934d919de1c318c48643969", - "reference": "7493c2bef54fb818c5304bdd9d2194890b839422", + "url": "https://api.github.com/repos/symfony/symfony/zipball/619528a274647cffc1792063c3ea04c4fa8266a0", + "reference": "619528a274647cffc1792063c3ea04c4fa8266a0", "shasum": "" }, "require": { - "doctrine/common": "~2.3", + "doctrine/common": "~2.4", "php": ">=5.3.9", "psr/log": "~1.0", - "twig/twig": "~1.18" + "twig/twig": "~1.20|~2.0" }, "replace": { "symfony/asset": "self.version", @@ -1796,9 +1796,9 @@ }, "require-dev": { "doctrine/data-fixtures": "1.0.*", - "doctrine/dbal": "~2.2", + "doctrine/dbal": "~2.4", "doctrine/doctrine-bundle": "~1.2", - "doctrine/orm": "~2.2,>=2.2.3", + "doctrine/orm": "~2.4,>=2.4.5", "egulias/email-validator": "~1.2", "ircmaxell/password-compat": "~1.0", "monolog/monolog": "~1.11", @@ -1848,7 +1848,7 @@ "keywords": [ "framework" ], - "time": "2015-05-30 17:16:04" + "time": "2015-09-25 11:16:52" }, { "name": "twig/extensions", @@ -2126,7 +2126,6 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "symfony/symfony": 20, "doctrine/migrations": 20 }, "prefer-stable": false,