Skip to content

Commit dcde631

Browse files
committed
Compatibility with data-fixtures 2.0
1 parent 4aab68e commit dcde631

File tree

4 files changed

+26
-19
lines changed

4 files changed

+26
-19
lines changed

.github/workflows/php.yml

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,26 @@ jobs:
99
strategy:
1010
matrix:
1111
include:
12-
- { php-version: '7.3', orm-version: '2.7' }
13-
- { php-version: '7.4', orm-version: '2.7' }
14-
- { php-version: '8.0', orm-version: '2.7' }
15-
- { php-version: '8.1', orm-version: '2.7' }
16-
- { php-version: '8.2', orm-version: '2.7' }
17-
- { php-version: '8.3', orm-version: '2.7' }
18-
19-
- { php-version: '8.1', orm-version: '3.0' }
20-
- { php-version: '8.2', orm-version: '3.0' }
21-
- { php-version: '8.3', orm-version: '3.0' }
12+
- { php-version: '7.3', orm-version: '2.7', fixtures-version: '1.4' }
13+
- { php-version: '7.4', orm-version: '2.7', fixtures-version: '1.4' }
14+
- { php-version: '8.0', orm-version: '2.7', fixtures-version: '1.4' }
15+
- { php-version: '8.1', orm-version: '2.7', fixtures-version: '1.4' }
16+
- { php-version: '8.2', orm-version: '2.7', fixtures-version: '1.4' }
17+
- { php-version: '8.3', orm-version: '2.7', fixtures-version: '1.4' }
18+
- { php-version: '8.4', orm-version: '2.7', fixtures-version: '1.4' }
19+
20+
- { php-version: '8.1', orm-version: '3.0', fixtures-version: '1.4' }
21+
- { php-version: '8.2', orm-version: '3.0', fixtures-version: '1.4' }
22+
- { php-version: '8.4', orm-version: '3.0', fixtures-version: '1.4' }
23+
24+
- { php-version: '8.1', orm-version: '2.7', fixtures-version: '2.0' }
25+
- { php-version: '8.2', orm-version: '2.7', fixtures-version: '2.0' }
26+
- { php-version: '8.3', orm-version: '2.7', fixtures-version: '2.0' }
27+
- { php-version: '8.4', orm-version: '2.7', fixtures-version: '2.0' }
28+
29+
- { php-version: '8.1', orm-version: '3.0', fixtures-version: '2.0' }
30+
- { php-version: '8.2', orm-version: '3.0', fixtures-version: '2.0' }
31+
- { php-version: '8.4', orm-version: '3.0', fixtures-version: '2.0' }
2232

2333
name: PHP ${{ matrix.php-version }} / ORM ${{ matrix.orm-version }}
2434
steps:
@@ -40,7 +50,10 @@ jobs:
4050
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
4151
restore-keys: ${{ runner.os }}-composer-
4252

43-
- run: composer require --dev "doctrine/orm:^${{ matrix.orm-version }}" --no-update
53+
- run: |
54+
composer require --dev --no-update \
55+
"doctrine/orm:^${{ matrix.orm-version }}" \
56+
"doctrine/data-fixtures:^${{ matrix.fixtures-version }}"
4457
4558
- run: composer install
4659

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
],
1515
"require": {
1616
"php": "^7.3|^8.0",
17-
"doctrine/data-fixtures": "^1.4",
17+
"doctrine/data-fixtures": "^1.4|^2.0",
1818
"doctrine/instantiator": "^1.3|^2.0",
1919
"doctrine/persistence": "^1.3|^2.0|^3.0"
2020
},

tests/Fixtures/PostSelfReferenceFixtureStub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ protected function getObjects(): iterable
4646
yield [
4747
'title' => 'Second title',
4848
'parent' => function (PostStub $o, self $fixture) {
49-
return $fixture->getReference('posts-Default title');
49+
return $fixture->getReference('posts-Default title', PostStub::class);
5050
},
5151
];
5252
}

tests/Stubs/ObjectManagerStub.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@
1313

1414
namespace Tests\Orbitale\Component\ArrayFixture\Stubs;
1515

16-
use Doctrine\DBAL\LockMode;
17-
use Doctrine\ORM\EntityRepository;
18-
use Doctrine\ORM\Mapping\ClassMetadataFactory;
19-
use Doctrine\ORM\Mapping\ClassMetadata;
20-
use Doctrine\Persistence\ObjectManager;
21-
2216
if (PHP_VERSION_ID < 80100) {
2317
require_once __DIR__.'/ObjectManagerStub_php80.php';
2418
} else {

0 commit comments

Comments
 (0)