8000 Merge branch '3.4' into 4.4 · symfony/symfony@4a8f11c · GitHub
[go: up one dir, main page]

Skip to content

Commit 4a8f11c

Browse files
Merge branch '3.4' into 4.4
* 3.4: Fix Redis tests [DoctrineBridge] Bump doctrine/data-fixtures.
2 parents b7c6d20 + 700f68f commit 4a8f11c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
"doctrine/annotations": "~1.0",
105105
"doctrine/cache": "~1.6",
106106
"doctrine/collections": "~1.0",
107-
"doctrine/data-fixtures": "1.0.*",
107+
"doctrine/data-fixtures": "^1.1",
108108
"doctrine/dbal": "~2.4",
109109
"doctrine/orm": "~2.4,>=2.4.5",
110110
"doctrine/reflection": "~1.0",

src/Symfony/Bridge/Doctrine/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"doctrine/annotations": "~1.7",
4343
"doctrine/cache": "~1.6",
4444
"doctrine/collections": "~1.0",
45-
"doctrine/data-fixtures": "1.0.*",
45+
"doctrine/data-fixtures": "^1.1",
4646
"doctrine/dbal": "~2.4",
4747
"doctrine/orm": "^2.6.3",
4848
"doctrine/reflection": "~1.0"

0 commit comments

Comments
 (0)
0