Skip to content

Commit a245230

Browse files
committed
Removed circular dependency with extensions
1 parent 5b8a023 commit a245230

3 files changed

+2
-36
lines changed

composer.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,7 @@
4747
"phpunit/phpunit": "^11.4",
4848
"fakerphp/faker": "^1.23",
4949
"laravel/framework": "^10.0 || ^11.0",
50-
"orchestra/testbench": "^9.5",
51-
"beberlei/doctrineextensions": "^1.5",
52-
"laravel-doctrine/extensions": "2.0.x-dev",
53-
"gedmo/doctrine-extensions": "^3.17"
50+
"orchestra/testbench": "^9.5"
5451
},
5552
"conflict": {
5653
"laravel/lumen": "*"

tests/Feature/DoctrineServiceProviderCustomFunctionsTest.php

+1-12
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
namespace LaravelDoctrineTest\ORM\Feature;
66

77
use Doctrine\Persistence\ManagerRegistry;
8-
use DoctrineExtensions\Query\Mysql\Ascii;
9-
use DoctrineExtensions\Query\Mysql\Cos;
10-
use DoctrineExtensions\Query\Mysql\Date;
118
use Illuminate\Config\Repository;
129
use Illuminate\Foundation\Application;
1310
use LaravelDoctrineTest\ORM\TestCase;
@@ -24,15 +21,7 @@ protected function defineEnvironment($app): void
2421
{
2522
// Setup default database to use sqlite :memory:
2623
tap($app['config'], static function (Repository $config): void {
27-
$config->set('doctrine.custom_datetime_functions', [
28-
'DATE' => Date::class,
29-
]);
30-
$config->set('doctrine.custom_numeric_functions', [
31-
'COS' => Cos::class,
32-
]);
33-
$config->set('doctrine.custom_string_functions', [
34-
'ASCII' => Ascii::class,
35-
]);
24+
// Custom functions are tested in the extensions repository
3625
});
3726
}
3827

tests/Feature/DoctrineServiceProviderExtensionTest.php

-20
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@
66

77
use Illuminate\Config\Repository;
88
use Illuminate\Foundation\Application;
9-
use LaravelDoctrine\Extensions\Blameable\BlameableExtension;
10-
use LaravelDoctrine\Extensions\IpTraceable\IpTraceableExtension;
11-
use LaravelDoctrine\Extensions\Loggable\LoggableExtension;
12-
use LaravelDoctrine\Extensions\Sluggable\SluggableExtension;
13-
use LaravelDoctrine\Extensions\SoftDeletes\SoftDeleteableExtension;
14-
use LaravelDoctrine\Extensions\Sortable\SortableExtension;
15-
use LaravelDoctrine\Extensions\Timestamps\TimestampableExtension;
16-
use LaravelDoctrine\Extensions\Translatable\TranslatableExtension;
17-
use LaravelDoctrine\Extensions\Tree\TreeExtension;
189
use LaravelDoctrineTest\ORM\TestCase;
1910

2011
use function tap;
@@ -29,17 +20,6 @@ protected function defineEnvironment($app): void
2920
{
3021
// Setup default database to use sqlite :memory:
3122
tap($app['config'], static function (Repository $config): void {
32-
$config->set('doctrine.extensions', [
33-
TimestampableExtension::class,
34-
SoftDeleteableExtension::class,
35-
SluggableExtension::class,
36-
SortableExtension::class,
37-
TreeExtension::class,
38-
LoggableExtension::class,
39-
BlameableExtension::class,
40-
IpTraceableExtension::class,
41-
TranslatableExtension::class,
42-
]);
4323
});
4424
}
4525

0 commit comments

Comments
 (0)