From 6819888c24843e771893608ad80e6f1bea3c2cef Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Mon, 5 Oct 2015 04:36:09 +0300 Subject: [PATCH] DoctrineMigrationsBundle composer.json fix. --- composer.json | 5 ++-- composer.lock | 75 +++++++++++++++++++++++++++------------------------ 2 files changed, 42 insertions(+), 38 deletions(-) diff --git a/composer.json b/composer.json index 474c990..7f95de5 100644 --- a/composer.json +++ b/composer.json @@ -19,14 +19,13 @@ "sensio/distribution-bundle": "~3.0,>=3.0.12", "sensio/framework-extra-bundle": "~3.0,>=3.0.2", "incenteev/composer-parameter-handler": "~2.0", - "doctrine/migrations": "1.0.*@dev", - "doctrine/doctrine-migrations-bundle": "2.1.*@dev", "doctrine/doctrine-fixtures-bundle": "2.2.*", "theodordiaconu/geshi": "dev-master", "theodordiaconu/geshi-bundle" : "dev-master", "braincrafted/bootstrap-bundle": "dev-master", "twbs/bootstrap": "3.3.*@dev", - "components/jquery": "dev-master" + "components/jquery": "dev-master", + "doctrine/doctrine-migrations-bundle": "^1.0" }, "require-dev": { "sensio/generator-bundle": "~2.3" diff --git a/composer.lock b/composer.lock index 41a821e..960fbf9 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": "06492598a20c478faba66c1691e8490c", + "hash": "afd173c98886e151c9bdd8b8e9fe6ea2", + "content-hash": "8a8693220ed1993aefa0c00bab3f3e1a", "packages": [ { "name": "braincrafted/bootstrap-bundle", @@ -728,34 +729,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": "6a1bd731dbdd4ad952a3b246a8f38c9c12f52e62" + "reference": "93ec729e3f2f1bb882904cce9d2c1dde6f139ec8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/6a1bd731dbdd4ad952a3b246a8f38c9c12f52e62", - "reference": "6a1bd731dbdd4ad952a3b246a8f38c9c12f52e62", + "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.1" + "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/", @@ -783,7 +783,7 @@ "migrations", "schema" ], - "time": "2015-02-16 13:24:46" + "time": "2015-09-29 10:07:00" }, { "name": "doctrine/inflector", @@ -908,40 +908,47 @@ }, { "name": "doctrine/migrations", - "version": "dev-master", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/migrations.git", - "reference": "a4f14d3a3d397104e557ec65d1a4e43bb86e4ddf" + "reference": "d196ddc229f50c66c5a015c158adb78a2dfb4351" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/migrations/zipball/a4f14d3a3d397104e557ec65d1a4e43bb86e4ddf", - "reference": "a4f14d3a3d397104e557ec65d1a4e43bb86e4ddf", + "url": "https://api.github.com/repos/doctrine/migrations/zipball/d196ddc229f50c66c5a015c158adb78a2dfb4351", + "reference": "d196ddc229f50c66c5a015c158adb78a2dfb4351", "shasum": "" }, "require": { - "doctrine/dbal": "~2.0", - "php": ">=5.3.2" + "doctrine/dbal": "~2.2", + "php": ">=5.4.0", + "symfony/console": "~2.3", + "symfony/yaml": "~2.3" }, "require-dev": { + "doctrine/coding-standard": "dev-master", "doctrine/orm": "2.*", - "phpunit/phpunit": "~4.0", - "symfony/console": "2.*", - "symfony/yaml": "2.*" + "johnkary/phpunit-speedtrap": "~1.0@dev", + "mockery/mockery": "^0.9.4", + "phpunit/phpunit": "~4.7", + "satooshi/php-coveralls": "0.6.*" }, "suggest": { "symfony/console": "to run the migration from the console" }, + "bin": [ + "bin/doctrine-migrations" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "v1.1.x-dev" } }, "autoload": { - "psr-0": { - "Doctrine\\DBAL\\Migrations": "lib" + "psr-4": { + "Doctrine\\DBAL\\Migrations\\": "lib/Doctrine/DBAL/Migrations" } }, "notification-url": "https://packagist.org/downloads/", @@ -964,7 +971,7 @@ "database", "migrations" ], - "time": "2015-05-02 06:20:23" + "time": "2015-09-29 11:13:06" }, { "name": "doctrine/orm", @@ -1543,12 +1550,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": "" }, @@ -1608,12 +1615,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": "" }, @@ -1667,12 +1674,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": "" }, @@ -1729,7 +1736,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/2aeaa22e3171b5e1f10f2cc2a7ff7f6608b65f9d", + "url": "https://api.github.com/repos/symfony/symfony/zipball/d1f50c5deecd6830ca30062e21b32c722272ca62", "reference": "2aeaa22e3171b5e1f10f2cc2a7ff7f6608b65f9d", "shasum": "" }, @@ -1931,7 +1938,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twbs/bootstrap/zipball/7b9f204cb4b8fa5cb06b2a9233324997c093f629", + "url": "https://api.github.com/repos/twbs/bootstrap/zipball/d53525cc3e24ef2e2d841468836c3d7712214f0a", "reference": "7b9f204cb4b8fa5cb06b2a9233324997c093f629", "shasum": "" }, @@ -2136,8 +2143,6 @@ "minimum-stability": "stable", "stability-flags": { "symfony/symfony": 20, - "doctrine/migrations": 20, - "doctrine/doctrine-migrations-bundle": 20, "theodordiaconu/geshi": 20, "theodordiaconu/geshi-bundle": 20, "braincrafted/bootstrap-bundle": 20,