Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove ServiceManager inheritance for AbstractPluginManager #179

Merged
merged 17 commits into from
May 2, 2023
Merged

Remove ServiceManager inheritance for AbstractPluginManager #179

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
74604b4
refactor: `AbstractPluginManager` now uses `ServiceManager` to provid…
boesing Feb 23, 2023
beb8ae5
qa: bump `psr/container` to a minimum of v1.1
boesing Feb 23, 2023
eb9cfce
qa: remove `laminas/laminas-dependency-plugin`
boesing Feb 23, 2023
1833d2e
qa: remove some unnecessary codepaths and add some more types
boesing Feb 23, 2023
8730086
qa: remove `PluginManagerInterface#configure`
boesing Mar 9, 2023
b026176
feature: move `AbstractPluginManager#validate` to `AbstractSingleInst…
boesing Mar 9, 2023
ee7cfc5
qa: re-implement `ServiceManager` properties (and mark deprecated) to…
boesing Mar 9, 2023
5fb1be3
qa: remove `ServiceLocatorInterface#configure`
boesing Mar 9, 2023
e0efceb
qa: remove obsolete psalm-type imports
boesing Mar 9, 2023
8a51b5f
refactor: remove `Config` and `ConfigInterface`
boesing Apr 6, 2023
4845306
qa: optimize a whole bunch of type-inference
boesing Apr 20, 2023
cf04c17
qa: disable some codestandard checks
boesing Apr 20, 2023
0ccd68b
qa: remove `laminas-code` shims for PHP 8.1
boesing Apr 20, 2023
827be21
qa: bump psalm
boesing Apr 25, 2023
9f7d6d7
qa: remove redundant `has` method
boesing Apr 27, 2023
8f14d75
qa: adapt changes to `CommonPluginManagerTrait`
boesing May 2, 2023
8469e6d
qa: bump psalm to stable release
boesing May 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .laminas-ci.json
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions benchmarks/BenchAsset/AbstractFactoryFoo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
class AbstractFactoryFoo implements AbstractFactoryInterface
{
/** {@inheritDoc} */
public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
public function __invoke(ContainerInterface $container, string $requestedName, ?array $options = null): mixed
{
if ($requestedName === 'foo') {
return new Foo($options);
Expand All @@ -19,7 +19,7 @@ public function __invoke(ContainerInterface $container, $requestedName, ?array $
}

/** {@inheritDoc} */
public function canCreate(ContainerInterface $container, $requestedName)
public function canCreate(ContainerInterface $container, string $requestedName): bool
{
return $requestedName === 'foo';
}
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/BenchAsset/FactoryFoo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
class FactoryFoo implements FactoryInterface
{
/** {@inheritDoc} */
public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
public function __invoke(ContainerInterface $container, string $requestedName, ?array $options = null): mixed
{
return new Foo($options);
}
Expand Down
27 changes: 14 additions & 13 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,19 @@
},
"config": {
"platform": {
"php": "8.0.99"
"php": "8.1.99"
},
"sort-packages": true,
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
"composer/package-versions-deprecated": true,
"laminas/laminas-dependency-plugin": true
"composer/package-versions-deprecated": true
}
},
"require": {
"php": "~8.0.0 || ~8.1.0 || ~8.2.0",
"php": "~8.1.0 || ~8.2.0",
"brick/varexporter": "^0.3.8",
"laminas/laminas-stdlib": "^3.2.1",
"psr/container": "^1.0"
"psr/container": "^1.1"
},
"extra": {
"laminas": {
Expand All @@ -48,16 +47,15 @@
"composer/package-versions-deprecated": "^1.11.99.5",
"laminas/laminas-cli": "^1.8",
"laminas/laminas-coding-standard": "~2.5.0",
"laminas/laminas-container-config-test": "^0.8",
"laminas/laminas-dependency-plugin": "^2.2",
"laminas/laminas-container-config-test": "dev-qa/service-manager-v4",
"lctrs/psalm-psr-container-plugin": "^1.9",
"mikey179/vfsstream": "^1.6.11@alpha",
"ocramius/proxy-manager": "^2.14.1",
"friendsofphp/proxy-manager-lts": "^1",
boesing marked this conversation as resolved.
Show resolved Hide resolved
"phpbench/phpbench": "^1.2.7",
"phpunit/phpunit": "^9.5.26",
"psalm/plugin-phpunit": "^0.18.0",
"symfony/console": "^6.0",
"vimeo/psalm": "^5.0.0"
"vimeo/psalm": "5.x-dev"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • needs to be switched back once psalm releases the next minor

},
"provide": {
"psr/container-implementation": "^1.0"
Expand All @@ -68,17 +66,14 @@
},
"suggest": {
"laminas/laminas-cli": "To consume CLI commands provided by this component",
"ocramius/proxy-manager": "ProxyManager ^2.1.1 to handle lazy initialization of services"
"friendsofphp/proxy-manager-lts": "To handle lazy initialization of services"
},
"autoload": {
"psr-4": {
"Laminas\\ServiceManager\\": "src/"
}
},
"autoload-dev": {
"files": [
"test/autoload.php"
],
"psr-4": {
"LaminasTest\\ServiceManager\\": "test/",
"LaminasBench\\ServiceManager\\": "benchmarks/"
Expand All @@ -99,5 +94,11 @@
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
"static-analysis" : "psalm --shepherd --stats"
},
"repositories": {
"container-integration-tests": {
"type": "git",
"url": "https://github.com/boesing/laminas-container-config-test"
}
}
}
Loading