Skip to content

Commit

Permalink
Merge pull request #457 from greg0ire/data-fixtures-2-compat
Browse files Browse the repository at this point in the history
Allow data-fixtures v2
  • Loading branch information
greg0ire authored Nov 28, 2024
2 parents b80a5a3 + 4eb7e37 commit ac54062
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
],
"require": {
"php": "^7.4 || ^8.0",
"doctrine/data-fixtures": "^1.3",
"doctrine/data-fixtures": "^1.5|^2.0",
"doctrine/doctrine-bundle": "^2.2",
"doctrine/orm": "^2.14.0 || ^3.0",
"doctrine/persistence": "^2.4|^3.0",
"symfony/config": "^5.4|^6.0|^7.0",
"symfony/console": "^5.4|^6.0|^7.0",
"symfony/dependency-injection": "^5.4|^6.0|^7.0",
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/doctrine-bridge": "^5.4|^6.0|^7.0",
"symfony/doctrine-bridge": "^5.4.48|^6.4.16|^7.1.9",
"symfony/http-kernel": "^5.4|^6.0|^7.0"
},
"require-dev": {
Expand Down
10 changes: 5 additions & 5 deletions tests/IntegrationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
use Doctrine\Bundle\FixturesBundle\Tests\Fixtures\FooBundle\DataFixtures\RequiredConstructorArgsFixtures;
use Doctrine\Bundle\FixturesBundle\Tests\Fixtures\FooBundle\DataFixtures\WithDeepDependenciesFixtures;
use Doctrine\Bundle\FixturesBundle\Tests\Fixtures\FooBundle\DataFixtures\WithDependenciesFixtures;
use Doctrine\Common\DataFixtures\Purger\ORMPurger;
use Doctrine\Common\DataFixtures\Purger\ORMPurgerInterface;
use Doctrine\Common\EventManager;
use Doctrine\DBAL\Connection;
use Doctrine\ORM\EntityManagerInterface;
Expand Down Expand Up @@ -304,7 +304,7 @@ public function testRunCommandWithDefaultPurger(): void
$container->set('doctrine', $registry);

$purgerFactory = $this->createMock(PurgerFactory::class);
$purger = $this->createMock(ORMPurger::class);
$purger = $this->createMock(ORMPurgerInterface::class);
$purgerFactory
->expects(self::once())
->method('createForEntityManager')
Expand Down Expand Up @@ -351,7 +351,7 @@ public function testRunCommandWithPurgeExclusions(): void
$container->set('doctrine', $registry);

$purgerFactory = $this->createMock(PurgerFactory::class);
$purger = $this->createMock(ORMPurger::class);
$purger = $this->createMock(ORMPurgerInterface::class);
$purgerFactory
->expects(self::once())
->method('createForEntityManager')
Expand Down Expand Up @@ -401,7 +401,7 @@ public function testRunCommandWithCustomPurgerAndCustomEntityManager(): void
$container->set('doctrine', $registry);

$purgerFactory = $this->createMock(PurgerFactory::class);
$purger = $this->createMock(ORMPurger::class);
$purger = $this->createMock(ORMPurgerInterface::class);
$purgerFactory
->expects(self::once())
->method('createForEntityManager')
Expand Down Expand Up @@ -448,7 +448,7 @@ public function testRunCommandWithPurgeMode(): void
$container->set('doctrine', $registry);

$purgerFactory = $this->createMock(PurgerFactory::class);
$purger = $this->createMock(ORMPurger::class);
$purger = $this->createMock(ORMPurgerInterface::class);
$purgerFactory
->expects(self::once())
->method('createForEntityManager')
Expand Down

0 comments on commit ac54062

Please sign in to comment.