Skip to content

Commit

Permalink
Merge branch '5.2.x' into 5.1.x-merge-up-into-5.2.x_DU7yTzD2
Browse files Browse the repository at this point in the history
  • Loading branch information
GromNaN committed Dec 18, 2024
2 parents 0952d9a + 23e43a9 commit 1994bac
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
1 change: 1 addition & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ updates:
interval: "weekly"
labels:
- "CI"
target-branch: "5.1.x"
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"require-dev": {
"composer/semver": "^3.4",
"doctrine/coding-standard": "^11.0",
"doctrine/data-fixtures": "^1.7",
"doctrine/data-fixtures": "^1.8 || ^2.0",
"phpstan/phpstan": "^2.0",
"phpunit/phpunit": "^9.5.5",
"symfony/browser-kit": "^6.4 || ^7.0",
Expand All @@ -53,7 +53,7 @@
"symfony/yaml": "^6.4 || ^7.0"
},
"conflict": {
"doctrine/data-fixtures": "<1.3"
"doctrine/data-fixtures": "<1.8 || >=3"
},
"suggest": {
"doctrine/data-fixtures": "Load data fixtures"
Expand Down
6 changes: 0 additions & 6 deletions src/Command/LoadDataFixturesDoctrineODMCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,6 @@ public function log($level, $message, array $context = []): void
{
$this->output->writeln(sprintf(' <comment>></comment> <info>%s</info>', $message));
}

/** @deprecated to be removed when dropping support for doctrine/data-fixtures <1.8 */
public function __invoke(string $message): void
{
$this->log(0, $message);
}
});
$executor->execute($fixtures, $input->getOption('append'));

Expand Down

0 comments on commit 1994bac

Please sign in to comment.