Skip to content

Commit

Permalink
[Maintenance] Add support for doctrine/orm 3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
lchrusciel committed Jul 29, 2024
1 parent 10bd0e8 commit d82376f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
build:
runs-on: "ubuntu-latest"

name: "PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, PHPUnit ${{ matrix.phpunit }}, PHP-Matcher ${{ matrix.php-matcher }}"
name: "PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, PHPUnit ${{ matrix.phpunit }}, PHP-Matcher ${{ matrix.php-matcher }}, Doctrine ORM ${{ matrix.orm }}"

strategy:
fail-fast: false
Expand All @@ -24,6 +24,7 @@ jobs:
symfony: [6.4.*, 7.0.*]
phpunit: [^9.0, ^10.0, ^11.0]
php-matcher: [^6.0]
orm: [^2.5, ^3.0]
exclude:
- php: 8.1
symfony: 7.0.*
Expand Down Expand Up @@ -51,6 +52,10 @@ jobs:
name: "Restrict coduo/php-matcher version"
run: "composer require \"coduo/php-matcher:${{ matrix.php-matcher }}\" --no-update --no-scripts"

-
name: "Restrict doctrine/orm version"
run: "composer require \"doctrine/orm:${{ matrix.orm }}\" --no-update --no-scripts"

-
name: "Restrict phpunit/phpunit version"
run: "composer require \"phpunit/phpunit:${{ matrix.phpunit }}\" --no-update --no-scripts"
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"openlss/lib-array2xml": "^1.0",
"doctrine/data-fixtures": "^1.2",
"doctrine/doctrine-bundle": "^2.0",
"doctrine/orm": "^2.5",
"doctrine/orm": "^2.5 || ^3.0",
"nelmio/alice": "^3.6",
"phpspec/php-diff": "^1.1",
"phpunit/phpunit": "^9.0 || ^10.0 || ^11.0",
Expand Down
3 changes: 0 additions & 3 deletions src/ApiTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,6 @@ public function setUpDatabase(): void
$entityManager = $container->get('doctrine.orm.entity_manager');
Assert::notNull($entityManager);

$this->entityManager = $entityManager;
$this->entityManager->getConnection()->connect();

/** @var LoaderInterface $fixtureLoader */
$fixtureLoader = $container->get('fidry_alice_data_fixtures.loader.doctrine');
$this->fixtureLoader = $fixtureLoader;
Expand Down

0 comments on commit d82376f

Please sign in to comment.