Skip to content

Commit 1994bac

Browse files
committed
Merge branch '5.2.x' into 5.1.x-merge-up-into-5.2.x_DU7yTzD2
2 parents 0952d9a + 23e43a9 commit 1994bac

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ updates:
66
interval: "weekly"
77
labels:
88
- "CI"
9+
target-branch: "5.1.x"

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"require-dev": {
4242
"composer/semver": "^3.4",
4343
"doctrine/coding-standard": "^11.0",
44-
"doctrine/data-fixtures": "^1.7",
44+
"doctrine/data-fixtures": "^1.8 || ^2.0",
4545
"phpstan/phpstan": "^2.0",
4646
"phpunit/phpunit": "^9.5.5",
4747
"symfony/browser-kit": "^6.4 || ^7.0",
@@ -53,7 +53,7 @@
5353
"symfony/yaml": "^6.4 || ^7.0"
5454
},
5555
"conflict": {
56-
"doctrine/data-fixtures": "<1.3"
56+
"doctrine/data-fixtures": "<1.8 || >=3"
5757
},
5858
"suggest": {
5959
"doctrine/data-fixtures": "Load data fixtures"

src/Command/LoadDataFixturesDoctrineODMCommand.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,6 @@ public function log($level, $message, array $context = []): void
9595
{
9696
$this->output->writeln(sprintf(' <comment>></comment> <info>%s</info>', $message));
9797
}
98-
99-
/** @deprecated to be removed when dropping support for doctrine/data-fixtures <1.8 */
100-
public function __invoke(string $message): void
101-
{
102-
$this->log(0, $message);
103-
}
10498
});
10599
$executor->execute($fixtures, $input->getOption('append'));
106100

0 commit comments

Comments
 (0)