Skip to content

Commit 51c84b8

Browse files
authored
Merge branch 'main' into meili-bot/bump-version
2 parents 0e93d3a + fbda397 commit 51c84b8

File tree

4 files changed

+26
-9
lines changed

4 files changed

+26
-9
lines changed

.github/workflows/tests.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ jobs:
4141
sf-version: '6.2.*'
4242
- php-version: '8.3'
4343
sf-version: '6.3.*'
44+
- php-version: '8.3'
45+
sf-version: '6.4.*'
46+
- php-version: '8.3'
47+
sf-version: '7.0.*'
4448

4549
name: integration-tests (PHP ${{ matrix.php-version }}) (Symfony ${{ matrix.sf-version }})
4650
steps:

bors.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
status = [
2+
'integration-tests (PHP 7.4) (Symfony 4.4.*)',
23
'integration-tests (PHP 7.4) (Symfony 5.4.*)',
34
'integration-tests (PHP 8.0) (Symfony 6.0.*)',
45
'integration-tests (PHP 8.1) (Symfony 6.1.*)',
56
'integration-tests (PHP 8.2) (Symfony 6.2.*)',
67
'integration-tests (PHP 8.3) (Symfony 6.3.*)',
8+
'integration-tests (PHP 8.3) (Symfony 6.4.*)',
9+
'integration-tests (PHP 8.3) (Symfony 7.0.*)',
710
'Code style'
811
]
912
# 1 hour timeout

composer.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,28 @@
2222
"ext-json": "*",
2323
"doctrine/doctrine-bundle": "^2.4",
2424
"meilisearch/meilisearch-php": "^1.0.0",
25-
"symfony/filesystem": "^4.4 || ^5.0 || ^6.0",
25+
"symfony/filesystem": "^4.4 || ^5.0 || ^6.0 || ^7.0",
2626
"symfony/polyfill-php80": "^1.27",
27-
"symfony/property-access": "^4.4 || ^5.0 || ^6.0",
28-
"symfony/serializer": "^4.4 || ^5.0 || ^6.0"
27+
"symfony/property-access": "^4.4 || ^5.0 || ^6.0 || ^7.0",
28+
"symfony/serializer": "^4.4 || ^5.0 || ^6.0 || ^7.0"
2929
},
3030
"require-dev": {
3131
"doctrine/annotations": "^2.0",
3232
"doctrine/orm": "^2.9",
33-
"phpmd/phpmd": "^2.13",
34-
"matthiasnoback/symfony-dependency-injection-test": "^4.3",
33+
"matthiasnoback/symfony-dependency-injection-test": "^4.3 || ^5.0",
3534
"nyholm/psr7": "^1.5.1",
3635
"php-cs-fixer/shim": "^3.14",
36+
"phpmd/phpmd": "^2.13",
3737
"phpstan/extension-installer": "^1.2",
3838
"phpstan/phpstan": "^1.10.6",
3939
"phpstan/phpstan-doctrine": "^1.3.33",
4040
"phpstan/phpstan-phpunit": "^1.3.10",
4141
"phpstan/phpstan-symfony": "^1.2.23",
4242
"phpunit/php-code-coverage": "^9.2.26",
43-
"symfony/doctrine-bridge": "^4.4 || ^5.0 || ^6.0",
44-
"symfony/http-client": "^4.4 || ^5.0 || ^6.0",
45-
"symfony/phpunit-bridge": "^4.4 || ^5.0 || ^6.0",
46-
"symfony/yaml": "^4.4 || ^5.0 || ^6.0"
43+
"symfony/doctrine-bridge": "^4.4 || ^5.0 || ^6.0 || ^7.0",
44+
"symfony/http-client": "^4.4 || ^5.0 || ^6.0 || ^7.0",
45+
"symfony/phpunit-bridge": "^4.4 || ^5.0 || ^6.0 || ^7.0",
46+
"symfony/yaml": "^4.4 || ^5.0 || ^6.0 || ^7.0"
4747
},
4848
"autoload": {
4949
"psr-4": {

tests/Kernel.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
use Doctrine\Bundle\DoctrineBundle\ConnectionFactory;
88
use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
9+
use Doctrine\ORM\Configuration;
910
use Meilisearch\Bundle\MeilisearchBundle;
1011
use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
1112
use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
@@ -40,5 +41,14 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
4041
],
4142
]);
4243
}
44+
45+
// @phpstan-ignore-next-line
46+
if (method_exists(Configuration::class, 'setLazyGhostObjectEnabled') && Kernel::VERSION_ID >= 60100) {
47+
$container->prependExtensionConfig('doctrine', [
48+
'orm' => [
49+
'enable_lazy_ghost_objects' => true,
50+
],
51+
]);
52+
}
4353
}
4454
}

0 commit comments

Comments
 (0)