diff --git a/composer.json b/composer.json index d5f5f3f..796d57b 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,6 @@ "sensio/framework-extra-bundle": "~3.0,>=3.0.2", "incenteev/composer-parameter-handler": "~2.0", "misd/guzzle-bundle": "~1.0", - "doctrine/migrations": "1.0.*@dev", "ob/highcharts-bundle": "^1.2", "doctrine/doctrine-migrations-bundle": "^1.0" }, diff --git a/composer.lock b/composer.lock index 5baf850..76f84ae 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": "2730cf99a45485bcd85fb5e0eed3a41c", - "content-hash": "0da9c81dcc1cb8e886339580c46ccda9", + "hash": "4fe9c0fca61b1bf505886a29726aac87", + "content-hash": "7a96c16b3360dea55a684da6fa90d8fe", "packages": [ { "name": "doctrine/annotations", @@ -690,45 +690,47 @@ }, { "name": "doctrine/migrations", - "version": "dev-master", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/migrations.git", - "reference": "abb87d84ed21fd30c27bd3b52252a495a36d32fb" + "reference": "d196ddc229f50c66c5a015c158adb78a2dfb4351" }, "dist": { "type": "zip", "url": "https://api.github.com/repos/doctrine/migrations/zipball/d196ddc229f50c66c5a015c158adb78a2dfb4351", - "reference": "abb87d84ed21fd30c27bd3b52252a495a36d32fb", + "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" }, - "conflict": { - "doctrine/orm": "<2.4" - }, "require-dev": { "doctrine/coding-standard": "dev-master", "doctrine/orm": "2.*", - "phpunit/phpunit": "~4.0", + "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/", @@ -751,7 +753,7 @@ "database", "migrations" ], - "time": "2015-05-26 15:30:26" + "time": "2015-09-29 11:13:06" }, { "name": "doctrine/orm", @@ -2125,9 +2127,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "doctrine/migrations": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": {