Skip to content

Commit 9e20cea

Browse files
committed
minor #805 Moved Doctrine Fixtures bundle to dev and test only (javiereguiluz)
This PR was merged into the master branch. Discussion ---------- Moved Doctrine Fixtures bundle to dev and test only This is the same PR as #738 created by @ptrm04. The original PR has conflicts in `composer.*` files and those are always hard to solve. Commits ------- f46f849 Moved Doctrine Fixtures bundle to dev and test only
2 parents 0442eae + f46f849 commit 9e20cea

File tree

4 files changed

+129
-129
lines changed

4 files changed

+129
-129
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"php": "^7.1.3",
99
"ext-pdo_sqlite": "*",
1010
"doctrine/doctrine-bundle": "^1.6.10",
11-
"doctrine/doctrine-fixtures-bundle": "^3.0",
1211
"doctrine/doctrine-migrations-bundle": "^1.3",
1312
"doctrine/orm": "^2.5.11",
1413
"erusev/parsedown": "^1.6",
@@ -32,6 +31,7 @@
3231
},
3332
"require-dev": {
3433
"dama/doctrine-test-bundle": "^5.0",
34+
"doctrine/doctrine-fixtures-bundle": "^3.0",
3535
"friendsofphp/php-cs-fixer": "^2.7",
3636
"symfony/browser-kit": "^4.1@beta",
3737
"symfony/css-selector": "^4.1@beta",

composer.lock

Lines changed: 122 additions & 122 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/bundles.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
66
Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle::class => ['all' => true],
77
Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
8-
Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['all' => true],
98
Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
109
Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
1110
Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class => ['all' => true],
@@ -16,4 +15,5 @@
1615
Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
1716
DAMA\DoctrineTestBundle\DAMADoctrineTestBundle::class => ['test' => true],
1817
Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],
18+
Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
1919
];

symfony.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"version": "v2.8.1"
2222
},
2323
"doctrine/data-fixtures": {
24-
"version": "v1.2.2"
24+
"version": "v1.3.1"
2525
},
2626
"doctrine/dbal": {
2727
"version": "v2.6.2"
@@ -39,12 +39,12 @@
3939
"version": "1.3.2"
4040
},
4141
"doctrine/doctrine-fixtures-bundle": {
42-
"version": "2.4",
42+
"version": "3.0",
4343
"recipe": {
44-
"repo": "github.com/symfony/recipes-contrib",
44+
"repo": "github.com/symfony/recipes",
4545
"branch": "master",
46-
"version": "2.4",
47-
"ref": "f2c3a6246cb5f36176f870bdc2e5f5b3cf6c454c"
46+
"version": "3.0",
47+
"ref": "2ea6070ecf365f9a801ccaed4b31d4a3b7af5693"
4848
}
4949
},
5050
"doctrine/doctrine-migrations-bundle": {

0 commit comments

Comments
 (0)