Skip to content

Commit 28eef30

Browse files
driehledriehle
authored
Merge pull request #851 from driehle/dependency-cleanup
Removed unneeded dependencies from composer.json
2 parents 9f0b62a + 320b124 commit 28eef30

File tree

3 files changed

+6
-111
lines changed

3 files changed

+6
-111
lines changed

‎composer.json‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
"homepage": "http://www.doctrine-project.org/",
3838
"require": {
3939
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
40-
"composer-runtime-api": "^2.0",
41-
"composer/semver": "^3.0",
40+
"composer-runtime-api": "^2.0.0",
41+
"composer/semver": "^3.0.0",
4242
"doctrine/annotations": "^2.0.0",
4343
"doctrine/cache": "^2.1.0",
4444
"doctrine/collections": "^2.0.0",
@@ -52,7 +52,6 @@
5252
"laminas/laminas-cache-storage-adapter-memory": "^2.1.0",
5353
"laminas/laminas-eventmanager": "^3.5.0",
5454
"laminas/laminas-form": "^3.4.1",
55-
"laminas/laminas-modulemanager": "^2.12.0",
5655
"laminas/laminas-mvc": "^3.3.5",
5756
"laminas/laminas-paginator": "^2.13.0",
5857
"laminas/laminas-servicemanager": "^3.17.0",
@@ -65,16 +64,13 @@
6564
"doctrine/coding-standard": "^12.0.0",
6665
"doctrine/mongodb-odm": "^2.7.1",
6766
"doctrine/orm": "^2.20.1",
68-
"jangregor/phpstan-prophecy": "^2",
69-
"laminas/laminas-i18n": "^2.29.0",
70-
"laminas/laminas-log": "^2.17.1",
71-
"laminas/laminas-serializer": "^2.17.0",
67+
"jangregor/phpstan-prophecy": "^2.0.0",
68+
"laminas/laminas-modulemanager": "^2.12.0",
7269
"laminas/laminas-session": "^2.22.1",
7370
"phpdocumentor/guides-cli": "^1.5.0",
7471
"phpstan/phpstan": "^2.0.4",
7572
"phpstan/phpstan-phpunit": "^2.0.3",
76-
"phpunit/phpunit": "^10.5.40",
77-
"predis/predis": "^1.1.10"
73+
"phpunit/phpunit": "^10.5.40"
7874
},
7975
"conflict": {
8076
"doctrine/orm": "2.12.0"

‎src/Module.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44

55
namespace DoctrineModule;
66

7-
use Laminas\ModuleManager\Feature\ConfigProviderInterface;
8-
97
/**
108
* Base module for integration of Doctrine projects with Laminas applications
119
*/
12-
final class Module implements ConfigProviderInterface
10+
final class Module
1311
{
1412
/** @return array<string, mixed> */
1513
public function getConfig(): array

‎tests/Service/CacheFactoryTest.php‎

Lines changed: 0 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -4,56 +4,18 @@
44

55
namespace DoctrineModuleTest\Service;
66

7-
use Composer\InstalledVersions;
8-
use Composer\Semver\VersionParser;
9-
use Doctrine\Common\Cache\ArrayCache;
10-
use Doctrine\Common\Cache\ChainCache;
11-
use Doctrine\Common\Cache\PredisCache;
127
use DoctrineModule\Cache\LaminasStorageCache;
138
use DoctrineModule\Service\CacheFactory;
149
use Laminas\Cache\ConfigProvider;
1510
use Laminas\Cache\Storage\Adapter\Memory;
1611
use Laminas\ServiceManager\ServiceManager;
1712
use PHPUnit\Framework\TestCase as BaseTestCase;
18-
use Predis\ClientInterface;
19-
20-
use function assert;
2113

2214
/**
2315
* Test for {@see \DoctrineModule\Service\CacheFactory}
2416
*/
2517
class CacheFactoryTest extends BaseTestCase
2618
{
27-
/** @covers \DoctrineModule\Service\CacheFactory::__invoke */
28-
public function testWillSetNamespace(): void
29-
{
30-
if (! InstalledVersions::satisfies(new VersionParser(), 'doctrine/cache', '^1.0.0')) {
31-
$this->markTestSkipped('This test requires doctrine/cache:^1.0, which is not installed.');
32-
}
33-
34-
$factory = new CacheFactory('foo');
35-
$serviceManager = new ServiceManager();
36-
$serviceManager->setService(
37-
'config',
38-
[
39-
'doctrine' => [
40-
'cache' => [
41-
'foo' => [
42-
'class' => ArrayCache::class,
43-
'namespace' => 'bar',
44-
],
45-
],
46-
],
47-
],
48-
);
49-
50-
$service = $factory->__invoke($serviceManager, ArrayCache::class);
51-
assert($service instanceof ArrayCache);
52-
53-
$this->assertInstanceOf(ArrayCache::class, $service);
54-
$this->assertSame('bar', $service->getNamespace());
55-
}
56-
5719
/**
5820
* @covers \DoctrineModule\Service\CacheFactory::__invoke
5921
* @group 547
@@ -85,65 +47,4 @@ public function testCreateLaminasCache(): void
8547

8648
$this->assertInstanceOf(LaminasStorageCache::class, $cache);
8749
}
88-
89-
public function testCreatePredisCache(): void
90-
{
91-
if (! InstalledVersions::satisfies(new VersionParser(), 'doctrine/cache', '^1.0.0')) {
92-
$this->markTestSkipped('This test requires doctrine/cache:^1.0, which is not installed.');
93-
}
94-
95-
$factory = new CacheFactory('predis');
96-
$serviceManager = new ServiceManager();
97-
$serviceManager->setService(
98-
'config',
99-
[
100-
'doctrine' => [
101-
'cache' => [
102-
'predis' => [
103-
'class' => PredisCache::class,
104-
'instance' => 'my_predis_alias',
105-
'namespace' => 'DoctrineModule',
106-
],
107-
],
108-
],
109-
],
110-
);
111-
$serviceManager->setService(
112-
'my_predis_alias',
113-
$this->createMock(ClientInterface::class),
114-
);
115-
$cache = $factory->__invoke($serviceManager, PredisCache::class);
116-
117-
$this->assertInstanceOf(PredisCache::class, $cache);
118-
}
119-
120-
public function testUseServiceFactory(): void
121-
{
122-
if (! InstalledVersions::satisfies(new VersionParser(), 'doctrine/cache', '^1.0.0')) {
123-
$this->markTestSkipped('This test requires doctrine/cache:^1.0, which is not installed.');
124-
}
125-
126-
$factory = new CacheFactory('chain');
127-
$serviceManager = new ServiceManager();
128-
$serviceManager->setService(
129-
'config',
130-
[
131-
'doctrine' => [
132-
'cache' => [
133-
'chain' => [
134-
'class' => ChainCache::class,
135-
],
136-
],
137-
],
138-
],
139-
);
140-
141-
$mock = $this->createMock(ChainCache::class);
142-
143-
$serviceManager->setFactory(ChainCache::class, static fn () => $mock);
144-
145-
$cache = $factory->__invoke($serviceManager, ChainCache::class);
146-
147-
$this->assertSame($mock, $cache);
148-
}
14950
}

0 commit comments

Comments
 (0)