Skip to content

Commit a3a7997

Browse files
authored
Merge pull request #112 from samsonasik/drop-support-doctrine-orm-module-41
Drop support of doctrine-orm-module 4.1, use ^6.3.0
2 parents 0048b55 + af54da0 commit a3a7997

3 files changed

Lines changed: 42 additions & 2 deletions

File tree

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@
4949
},
5050
"conflict": {
5151
"doctrine/dbal": "<3.0",
52-
"doctrine/doctrine-orm-module": "<4.1",
52+
"doctrine/doctrine-orm-module": "<6.3.0",
5353
"laminas/laminas-mvc": "<3.8",
5454
"laminas/laminas-servicemanager": "<3.10",
5555
"mezzio/mezzio": "<3.20.1",
5656
"laminas/laminas-mvc-console": "*"
5757
},
5858
"require-dev": {
5959
"doctrine/dbal": "^3.9.3",
60-
"doctrine/doctrine-orm-module": "^4.2.1 || ^5.3",
60+
"doctrine/doctrine-orm-module": "^6.3.0",
6161
"kahlan/kahlan": "^6.1",
6262
"laminas/laminas-cli": "^1.11",
6363
"laminas/laminas-coding-standard": "^3.0",
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace ErrorHeroModule\Spec\Fixture;
6+
7+
use Laminas\Cache\ConfigProvider as LaminasCacheConfigProvider;
8+
use Laminas\Cache\Storage\Adapter\Filesystem\AdapterPluginManagerDelegatorFactory as FilesystemAdapterPluginManagerDelegatorFactory;
9+
use Laminas\Cache\Storage\Adapter\Memory\AdapterPluginManagerDelegatorFactory as MemoryAdapterPluginManagerDelegatorFactory;
10+
use Laminas\Cache\Storage\AdapterPluginManager;
11+
12+
final class LaminasCacheModule
13+
{
14+
/** @return array<string, mixed> */
15+
public function getConfig(): array
16+
{
17+
$configProvider = new LaminasCacheConfigProvider();
18+
19+
// laminas-cache exposes its ServiceManager wiring under the `dependencies` key.
20+
// Laminas MVC consumes `service_manager`, so we map it here.
21+
//
22+
// Also include the installed adapter packages' delegators so the AdapterPluginManager
23+
// knows how to create the configured adapters (e.g. Memory, Filesystem).
24+
$serviceManagerConfig = $configProvider->getDependencyConfig();
25+
$serviceManagerConfig['delegators'][AdapterPluginManager::class] ??= [];
26+
$serviceManagerConfig['delegators'][AdapterPluginManager::class] = array_values(array_unique(array_merge(
27+
$serviceManagerConfig['delegators'][AdapterPluginManager::class],
28+
[
29+
MemoryAdapterPluginManagerDelegatorFactory::class,
30+
FilesystemAdapterPluginManagerDelegatorFactory::class,
31+
]
32+
)));
33+
34+
return [
35+
'service_manager' => $serviceManagerConfig,
36+
];
37+
}
38+
}

spec/Integration/IntegrationViaErrorPreviewConsoleCommandWithDoctrineORMModuleSpec.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Doctrine\ORM\EntityManager;
66
use ErrorHeroModule\Command\Preview\ErrorPreviewConsoleCommand;
7+
use ErrorHeroModule\Spec\Fixture\LaminasCacheModule;
78
use Laminas\Mvc\Application;
89
use Symfony\Component\Console\Tester\CommandTester;
910

@@ -14,6 +15,7 @@
1415
$application = Application::init([
1516
'modules' => [
1617
'Laminas\Router',
18+
LaminasCacheModule::class,
1719
'DoctrineModule',
1820
'DoctrineORMModule',
1921
'ErrorHeroModule',

0 commit comments

Comments
 (0)