From 27d6ee85595b1a7b1c060e2202f00570c2b9fd68 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Thu, 1 Oct 2015 21:28:57 +0300 Subject: [PATCH] Doctrine Migrations Bundle composer.json fix. --- composer.json | 4 ++-- composer.lock | 41 ++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/composer.json b/composer.json index 058368b..347e575 100644 --- a/composer.json +++ b/composer.json @@ -21,8 +21,8 @@ "incenteev/composer-parameter-handler": "~2.0", "misd/guzzle-bundle": "~1.0", "doctrine/migrations": "1.0.*@dev", - "doctrine/doctrine-migrations-bundle": "2.1.*@dev", - "ob/highcharts-bundle": "^1.2" + "ob/highcharts-bundle": "^1.2", + "doctrine/doctrine-migrations-bundle": "^1.0" }, "require-dev": { "sensio/generator-bundle": "~2.3" diff --git a/composer.lock b/composer.lock index 8c38b7f..8ebdb2d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +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": "bfe197a5b9e16d562aba89cb97f380bf", + "hash": "3ea840c67fb58fde0c60ae6cf30da8c0", + "content-hash": "1344636f00611d01247e8c129d44e2f0", "packages": [ { "name": "doctrine/annotations", @@ -510,34 +511,33 @@ }, { "name": "doctrine/doctrine-migrations-bundle", - "version": "dev-master", - "target-dir": "Doctrine/Bundle/MigrationsBundle", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineMigrationsBundle.git", - "reference": "1e8cd4415bd2f893eb828216b529a75e8b61d579" + "reference": "93ec729e3f2f1bb882904cce9d2c1dde6f139ec8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/861d3564c03b3867845ffd87d9b19f49dc673c69", - "reference": "1e8cd4415bd2f893eb828216b529a75e8b61d579", + "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/93ec729e3f2f1bb882904cce9d2c1dde6f139ec8", + "reference": "93ec729e3f2f1bb882904cce9d2c1dde6f139ec8", "shasum": "" }, "require": { "doctrine/doctrine-bundle": "~1.0", - "doctrine/migrations": "~1.0@dev", + "doctrine/migrations": "~1.0", "php": ">=5.3.2", "symfony/framework-bundle": "~2.3|~3.0" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.1.x-dev" + "dev-master": "1.1-dev" } }, "autoload": { - "psr-0": { - "Doctrine\\Bundle\\MigrationsBundle": "" + "psr-4": { + "Doctrine\\Bundle\\MigrationsBundle\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -565,7 +565,7 @@ "migrations", "schema" ], - "time": "2015-05-06 08:32:15" + "time": "2015-09-29 10:07:00" }, { "name": "doctrine/inflector", @@ -698,7 +698,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/migrations/zipball/4e85ba638acf62e1afe735f94b0c51aa971f8773", + "url": "https://api.github.com/repos/doctrine/migrations/zipball/d196ddc229f50c66c5a015c158adb78a2dfb4351", "reference": "abb87d84ed21fd30c27bd3b52252a495a36d32fb", "shasum": "" }, @@ -1552,12 +1552,12 @@ "version": "v2.6.1", "source": { "type": "git", - "url": "https://github.com/symfony/AsseticBundle.git", + "url": "https://github.com/symfony/assetic-bundle.git", "reference": "422b0add2110f0cf9bc7a873a386ea053f4a89f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/422b0add2110f0cf9bc7a873a386ea053f4a89f0", + "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/422b0add2110f0cf9bc7a873a386ea053f4a89f0", "reference": "422b0add2110f0cf9bc7a873a386ea053f4a89f0", "shasum": "" }, @@ -1617,12 +1617,12 @@ "version": "v2.7.1", "source": { "type": "git", - "url": "https://github.com/symfony/MonologBundle.git", + "url": "https://github.com/symfony/monolog-bundle.git", "reference": "9320b6863404c70ebe111e9040dab96f251de7ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/9320b6863404c70ebe111e9040dab96f251de7ac", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/9320b6863404c70ebe111e9040dab96f251de7ac", "reference": "9320b6863404c70ebe111e9040dab96f251de7ac", "shasum": "" }, @@ -1676,12 +1676,12 @@ "version": "v2.3.8", "source": { "type": "git", - "url": "https://github.com/symfony/SwiftmailerBundle.git", + "url": "https://github.com/symfony/swiftmailer-bundle.git", "reference": "970b13d01871207e81d17b17ddda025e7e21e797" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/SwiftmailerBundle/zipball/970b13d01871207e81d17b17ddda025e7e21e797", + "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/970b13d01871207e81d17b17ddda025e7e21e797", "reference": "970b13d01871207e81d17b17ddda025e7e21e797", "shasum": "" }, @@ -1738,7 +1738,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/ae643240bb7d2c6b5b8bb789965ba5413476252d", + "url": "https://api.github.com/repos/symfony/symfony/zipball/4b0e4c4ee0a1e4f8a934d919de1c318c48643969", "reference": "7493c2bef54fb818c5304bdd9d2194890b839422", "shasum": "" }, @@ -2127,8 +2127,7 @@ "minimum-stability": "stable", "stability-flags": { "symfony/symfony": 20, - "doctrine/migrations": 20, - "doctrine/doctrine-migrations-bundle": 20 + "doctrine/migrations": 20 }, "prefer-stable": false, "prefer-lowest": false,