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

Jump to bottom

Improve type inference for Plugin Managers #165

Merged
merged 14 commits into from
Jul 10, 2022
Merged

Improve type inference for Plugin Managers #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2211cc3
Adds a stub for psr container
gsteel Jun 13, 2022
0620925
Improve type inference for plugin manager
gsteel Jun 13, 2022
6cc94b3
Updates Service Manager and stdLib to versions with type improvements
gsteel Jun 13, 2022
a4aebf4
Updates locked dependencies and bumps `laminas-servicemanager` to 3.14.0
gsteel Jul 8, 2022
1125985
Remove tests relevant to service manager v2 as it is no longer instal…
gsteel Jul 8, 2022
62899d9
Relax constraint on template parameter got `get()` so that non-object…
gsteel Jul 8, 2022
1856d16
extract templated instance type to a psalm-type so it can be imported…
gsteel Jul 8, 2022
9d4fc2c
Improve type inference for other plugin managers and the plugin metho…
gsteel Jul 8, 2022
7a2fadc
Update tests to refer to helpers by FQCN where appropriate
gsteel Jul 8, 2022
2b6b4c8
Update psalm baseline with fixed errors
gsteel Jul 8, 2022
22850b2
Ignore false-negative phpcs violations
gsteel Jul 8, 2022
7028b2a
Ignore platform requirements on 8.0 because we are stuck with laminas…
gsteel Jul 8, 2022
0133bae
Remove return types from the stub, favouring annotations which fits e…
gsteel Jul 8, 2022
fc209b8
Lock phpdoc-parser to 1.5.1 due to an incompatibility with slevomat c…
gsteel Jul 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .laminas-ci.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"intl"
],
"ignore_php_platform_requirements": {
"8.0": true,
"8.1": true
gsteel marked this conversation as resolved.
Show resolved Hide resolved
}
}
24 changes: 24 additions & 0 deletions .psr-container.php.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php

declare(strict_types=1);

namespace Psr\Container {
/**
* Provides automatic type inference for Psalm when retrieving a service from a container using a FQCN
*/
interface ContainerInterface
{
/**
* @param string|class-string $id
* @return bool
*/
public function has(string $id);

/**
* @template T
* @psalm-param string|class-string<T> $id
* @psalm-return ($id is class-string ? T : mixed)
*/
public function get(string $id);
}
}
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"laminas/laminas-escaper": "^2.5",
"laminas/laminas-eventmanager": "^3.4",
"laminas/laminas-json": "^3.3",
"laminas/laminas-servicemanager": "^3.10",
"laminas/laminas-stdlib": "^3.6",
"laminas/laminas-servicemanager": "^3.14.0",
"laminas/laminas-stdlib": "^3.10.1",
"psr/container": "^1 || ^2"
},
"require-dev": {
Expand Down