Skip to content

Commit d679dc7

Browse files
committed
try fixing CI
1 parent 8c2533f commit d679dc7

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

src/Bundle/DunglasDoctrineJsonOdmBundle.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
namespace Dunglas\DoctrineJsonOdm\Bundle;
1111

12-
use Doctrine\DBAL\Types\JsonbType;
1312
use Doctrine\DBAL\Types\Type;
1413
use Dunglas\DoctrineJsonOdm\Type\JsonbDocumentType;
1514
use Dunglas\DoctrineJsonOdm\Type\JsonDocumentType;
@@ -28,7 +27,7 @@ public function __construct()
2827
Type::addType('json_document', JsonDocumentType::class);
2928
}
3029

31-
if (class_exists(JsonbType::class) && !Type::hasType('jsonb_document')) {
30+
if (class_exists(\Doctrine\DBAL\Types\JsonbType::class) && !Type::hasType('jsonb_document')) {
3231
Type::addType('jsonb_document', JsonbDocumentType::class);
3332
}
3433
}

tests/Fixtures/AppKernel.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
* with this source code in the file LICENSE.
88
*/
99

10-
use Doctrine\Bundle\DoctrineBundle\Attribute\AsDoctrineListener;
1110
use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
12-
use Doctrine\DBAL\Types\JsonbType;
1311
use Dunglas\DoctrineJsonOdm\Bundle\DunglasDoctrineJsonOdmBundle;
1412
use Dunglas\DoctrineJsonOdm\Tests\Fixtures\TestBundle\DependencyInjection\MakeServicesPublicPass;
1513
use Dunglas\DoctrineJsonOdm\Tests\Fixtures\TestBundle\TestBundle;
@@ -62,7 +60,7 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
6260
];
6361

6462
// Add Jsonb entity mapping only when jsonb_document type is available
65-
if (class_exists(JsonbType::class)) {
63+
if (class_exists(\Doctrine\DBAL\Types\JsonbType::class)) {
6664
$ormMappings['TestBundleJsonb'] = [
6765
'is_bundle' => false,
6866
'type' => 'attribute',
@@ -77,7 +75,7 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
7775
'mappings' => $ormMappings,
7876
];
7977

80-
if (class_exists(AsDoctrineListener::class)) {
78+
if (class_exists(\Doctrine\Bundle\DoctrineBundle\Attribute\AsDoctrineListener::class)) {
8179
$ormConfig[\PHP_VERSION_ID >= 80400 ? 'enable_native_lazy_objects' : 'enable_lazy_ghost_objects'] = true;
8280
}
8381

tests/FunctionalTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
namespace Dunglas\DoctrineJsonOdm\Tests;
1111

12-
use Doctrine\DBAL\Types\JsonbType;
1312
use Dunglas\DoctrineJsonOdm\Tests\Fixtures\TestBundle\Document\Attribute;
1413
use Dunglas\DoctrineJsonOdm\Tests\Fixtures\TestBundle\Document\Attributes;
1514
use Dunglas\DoctrineJsonOdm\Tests\Fixtures\TestBundle\Document\Bar;
@@ -251,7 +250,7 @@ public function testStoreAndRetrieveUid(): void
251250

252251
public function testStoreAndRetrieveJsonbDocument(): void
253252
{
254-
if (!class_exists(JsonbType::class)) {
253+
if (!class_exists(\Doctrine\DBAL\Types\JsonbType::class)) {
255254
$this->markTestSkipped('Doctrine DBAL 4.3.0+ is required for jsonb_document type.');
256255
}
257256

@@ -281,7 +280,7 @@ public function testStoreAndRetrieveJsonbDocument(): void
281280

282281
public function testNullIsStoredAsNullJsonb(): void
283282
{
284-
if (!class_exists(JsonbType::class)) {
283+
if (!class_exists(\Doctrine\DBAL\Types\JsonbType::class)) {
285284
$this->markTestSkipped('Doctrine DBAL 4.3.0+ is required for jsonb_document type.');
286285
}
287286

0 commit comments

Comments
 (0)