From f46f8490c88ca052c97f19f01d48685ea95e8aa5 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Fri, 25 May 2018 16:07:14 +0200 Subject: [PATCH] Moved Doctrine Fixtures bundle to dev and test only --- composer.json | 2 +- composer.lock | 254 ++++++++++++++++++++++----------------------- config/bundles.php | 2 +- symfony.lock | 10 +- 4 files changed, 134 insertions(+), 134 deletions(-) diff --git a/composer.json b/composer.json index e90044156..9b7bff781 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,6 @@ "php": "^7.1.3", "ext-pdo_sqlite": "*", "doctrine/doctrine-bundle": "^1.6.10", - "doctrine/doctrine-fixtures-bundle": "^3.0", "doctrine/doctrine-migrations-bundle": "^1.3", "doctrine/orm": "^2.5.11", "erusev/parsedown": "^1.6", @@ -32,6 +31,7 @@ }, "require-dev": { "dama/doctrine-test-bundle": "^5.0", + "doctrine/doctrine-fixtures-bundle": "^3.0", "friendsofphp/php-cs-fixer": "^2.7", "symfony/browser-kit": "^4.1@beta", "symfony/css-selector": "^4.1@beta", diff --git a/composer.lock b/composer.lock index af1f6698b..2f7104d23 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "dc763e25778cb093a89e4b44eefae568", + "content-hash": "5574b48b5b8d31e4a5f5ca3b5945edd1", "packages": [ { "name": "composer/ca-bundle", @@ -344,66 +344,6 @@ ], "time": "2017-08-31T08:43:38+00:00" }, - { - "name": "doctrine/data-fixtures", - "version": "v1.3.1", - "source": { - "type": "git", - "url": "https://github.com/doctrine/data-fixtures.git", - "reference": "3a1e2c3c600e615a2dffe56d4ca0875cc5233e0a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/3a1e2c3c600e615a2dffe56d4ca0875cc5233e0a", - "reference": "3a1e2c3c600e615a2dffe56d4ca0875cc5233e0a", - "shasum": "" - }, - "require": { - "doctrine/common": "~2.2", - "php": "^7.1" - }, - "conflict": { - "doctrine/phpcr-odm": "<1.3.0" - }, - "require-dev": { - "doctrine/dbal": "^2.5.4", - "doctrine/orm": "^2.5.4", - "phpunit/phpunit": "^7.0" - }, - "suggest": { - "alcaeus/mongo-php-adapter": "For using MongoDB ODM with PHP 7", - "doctrine/mongodb-odm": "For loading MongoDB ODM fixtures", - "doctrine/orm": "For loading ORM fixtures", - "doctrine/phpcr-odm": "For loading PHPCR ODM fixtures" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Doctrine\\Common\\DataFixtures\\": "lib/Doctrine/Common/DataFixtures" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - } - ], - "description": "Data Fixtures for all Doctrine Object Managers", - "homepage": "http://www.doctrine-project.org", - "keywords": [ - "database" - ], - "time": "2018-03-20T09:06:36+00:00" - }, { "name": "doctrine/dbal", "version": "v2.7.1", @@ -652,67 +592,6 @@ ], "time": "2018-03-27T09:22:12+00:00" }, - { - "name": "doctrine/doctrine-fixtures-bundle", - "version": "3.0.2", - "source": { - "type": "git", - "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", - "reference": "7fc29d2b18c61ed99826b21fbfd1ff9969cc2e7f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/7fc29d2b18c61ed99826b21fbfd1ff9969cc2e7f", - "reference": "7fc29d2b18c61ed99826b21fbfd1ff9969cc2e7f", - "shasum": "" - }, - "require": { - "doctrine/data-fixtures": "~1.0", - "doctrine/doctrine-bundle": "~1.0", - "php": ">=5.5.9|^7.0", - "symfony/doctrine-bridge": "~2.7|~3.0|~4.0", - "symfony/framework-bundle": "^3.3|^4.0" - }, - "require-dev": { - "symfony/phpunit-bridge": "^3.3" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "3.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Doctrine\\Bundle\\FixturesBundle\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Doctrine Project", - "homepage": "http://www.doctrine-project.org" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Symfony DoctrineFixturesBundle", - "homepage": "http://www.doctrine-project.org", - "keywords": [ - "Fixture", - "persistence" - ], - "time": "2017-12-04T20:26:38+00:00" - }, { "name": "doctrine/doctrine-migrations-bundle", "version": "v1.3.1", @@ -2313,16 +2192,16 @@ }, { "name": "symfony/doctrine-bridge", - "version": "v4.1.0-BETA1", + "version": "v4.1.0-BETA2", "source": { "type": "git", "url": "https://github.com/symfony/doctrine-bridge.git", - "reference": "c0fbf796d319880591b810e96725ef2848273350" + "reference": "09bac59f007e5da22bea0d9d03da3ec7e91748bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/c0fbf796d319880591b810e96725ef2848273350", - "reference": "c0fbf796d319880591b810e96725ef2848273350", + "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/09bac59f007e5da22bea0d9d03da3ec7e91748bc", + "reference": "09bac59f007e5da22bea0d9d03da3ec7e91748bc", "shasum": "" }, "require": { @@ -2389,7 +2268,7 @@ ], "description": "Symfony Doctrine Bridge", "homepage": "https://symfony.com", - "time": "2018-05-07T07:14:12+00:00" + "time": "2018-05-21T11:08:00+00:00" }, { "name": "symfony/event-dispatcher", @@ -4625,6 +4504,127 @@ ], "time": "2018-02-25T14:57:01+00:00" }, + { + "name": "doctrine/data-fixtures", + "version": "v1.3.1", + "source": { + "type": "git", + "url": "https://github.com/doctrine/data-fixtures.git", + "reference": "3a1e2c3c600e615a2dffe56d4ca0875cc5233e0a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/3a1e2c3c600e615a2dffe56d4ca0875cc5233e0a", + "reference": "3a1e2c3c600e615a2dffe56d4ca0875cc5233e0a", + "shasum": "" + }, + "require": { + "doctrine/common": "~2.2", + "php": "^7.1" + }, + "conflict": { + "doctrine/phpcr-odm": "<1.3.0" + }, + "require-dev": { + "doctrine/dbal": "^2.5.4", + "doctrine/orm": "^2.5.4", + "phpunit/phpunit": "^7.0" + }, + "suggest": { + "alcaeus/mongo-php-adapter": "For using MongoDB ODM with PHP 7", + "doctrine/mongodb-odm": "For loading MongoDB ODM fixtures", + "doctrine/orm": "For loading ORM fixtures", + "doctrine/phpcr-odm": "For loading PHPCR ODM fixtures" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\DataFixtures\\": "lib/Doctrine/Common/DataFixtures" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + } + ], + "description": "Data Fixtures for all Doctrine Object Managers", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "database" + ], + "time": "2018-03-20T09:06:36+00:00" + }, + { + "name": "doctrine/doctrine-fixtures-bundle", + "version": "3.0.2", + "source": { + "type": "git", + "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", + "reference": "7fc29d2b18c61ed99826b21fbfd1ff9969cc2e7f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/7fc29d2b18c61ed99826b21fbfd1ff9969cc2e7f", + "reference": "7fc29d2b18c61ed99826b21fbfd1ff9969cc2e7f", + "shasum": "" + }, + "require": { + "doctrine/data-fixtures": "~1.0", + "doctrine/doctrine-bundle": "~1.0", + "php": ">=5.5.9|^7.0", + "symfony/doctrine-bridge": "~2.7|~3.0|~4.0", + "symfony/framework-bundle": "^3.3|^4.0" + }, + "require-dev": { + "symfony/phpunit-bridge": "^3.3" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Bundle\\FixturesBundle\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Doctrine Project", + "homepage": "http://www.doctrine-project.org" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony DoctrineFixturesBundle", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "Fixture", + "persistence" + ], + "time": "2017-12-04T20:26:38+00:00" + }, { "name": "friendsofphp/php-cs-fixer", "version": "v2.11.1", diff --git a/config/bundles.php b/config/bundles.php index 985f76945..c14dbcc70 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -5,7 +5,6 @@ Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true], Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle::class => ['all' => true], Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true], - Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['all' => true], Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true], Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true], Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class => ['all' => true], @@ -16,4 +15,5 @@ Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true], DAMA\DoctrineTestBundle\DAMADoctrineTestBundle::class => ['test' => true], Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true], + Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true], ]; diff --git a/symfony.lock b/symfony.lock index 783ea94d8..b3c5e4db3 100644 --- a/symfony.lock +++ b/symfony.lock @@ -21,7 +21,7 @@ "version": "v2.8.1" }, "doctrine/data-fixtures": { - "version": "v1.2.2" + "version": "v1.3.1" }, "doctrine/dbal": { "version": "v2.6.2" @@ -39,12 +39,12 @@ "version": "1.3.2" }, "doctrine/doctrine-fixtures-bundle": { - "version": "2.4", + "version": "3.0", "recipe": { - "repo": "github.com/symfony/recipes-contrib", + "repo": "github.com/symfony/recipes", "branch": "master", - "version": "2.4", - "ref": "f2c3a6246cb5f36176f870bdc2e5f5b3cf6c454c" + "version": "3.0", + "ref": "2ea6070ecf365f9a801ccaed4b31d4a3b7af5693" } }, "doctrine/doctrine-migrations-bundle": {