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

Update dependency vimeo/psalm to v5 #103

Merged
merged 3 commits into from
Dec 1, 2022
Merged

Update dependency vimeo/psalm to v5 #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3ab9b3
Update dependency vimeo/psalm to v5
renovate[bot] Nov 30, 2022
150e106
Reset psalm baseline
gsteel Dec 1, 2022
dba3554
Fix minor psalm issues in tests
gsteel Dec 1, 2022
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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"phpunit/phpunit": "^9.5.11",
"psalm/plugin-phpunit": "^0.18.0",
"roave/security-advisories": "dev-master",
"vimeo/psalm": "^4.17"
"vimeo/psalm": "^5.0"
},
"autoload": {
"psr-4": {
Expand Down
125 changes: 35 additions & 90 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 22 additions & 11 deletions psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="4.29.0@7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3">
<files psalm-version="5.0.0@4e177bf0c9f03c17d2fbfd83b7cc9c47605274d8">
<file src="config/pipeline.php">
<UnusedClosureParam occurrences="2">
<code>$container</code>
Expand Down Expand Up @@ -56,17 +56,20 @@
<code>$this-&gt;config['require-dev']</code>
<code>$word</code>
</MixedArgument>
<MixedArrayAccess occurrences="19">
<MixedArrayAccess occurrences="24">
<code>$option['name']</code>
<code>$option['name']</code>
<code>$packageData['version']</code>
<code>$packageData['whitelist']</code>
<code>$question['options'][$answer][$this-&gt;installType]</code>
<code>$question['options'][$answer]['packages']</code>
<code>$this-&gt;composerDefinition['autoload']['psr-4']</code>
<code>$this-&gt;composerDefinition['autoload']['psr-4']['MezzioInstaller\\']</code>
<code>$this-&gt;composerDefinition['autoload-dev']['psr-4']</code>
<code>$this-&gt;composerDefinition['autoload-dev']['psr-4']['MezzioInstallerTest\\']</code>
<code>$this-&gt;composerDefinition['extra']['branch-alias']</code>
<code>$this-&gt;composerDefinition['extra']['laminas']</code>
<code>$this-&gt;composerDefinition['extra']['laminas']['component-whitelist']</code>
<code>$this-&gt;composerDefinition['extra']['optional-packages']</code>
<code>$this-&gt;composerDefinition['require'][$packageName]</code>
<code>$this-&gt;composerDefinition['require-dev'][$devDependency]</code>
Expand All @@ -75,12 +78,17 @@
<code>$this-&gt;composerDefinition['scripts']['pre-update-cmd']</code>
<code>$this-&gt;config['application'][$this-&gt;installType]</code>
<code>$this-&gt;config['application'][$this-&gt;installType]</code>
<code>$this-&gt;config['application'][$this-&gt;installType]['packages']</code>
<code>$this-&gt;config['application'][$this-&gt;installType]['resources']</code>
<code>$this-&gt;config['packages'][$packageName]</code>
</MixedArrayAccess>
<MixedArrayAssignment occurrences="7">
<MixedArrayAssignment occurrences="10">
<code>$this-&gt;composerDefinition['autoload']['psr-4']</code>
<code>$this-&gt;composerDefinition['autoload']['psr-4']['App\\']</code>
<code>$this-&gt;composerDefinition['extra']['laminas']</code>
<code>$this-&gt;composerDefinition['extra']['laminas']['component-whitelist']</code>
<code>$this-&gt;composerDefinition['extra']['optional-packages']</code>
<code>$this-&gt;composerDefinition['extra']['optional-packages'][$questionName]</code>
<code>$this-&gt;composerDefinition['require'][$packageName]</code>
<code>$this-&gt;composerDefinition['require-dev'][$packageName]</code>
<code>$this-&gt;composerDefinition['scripts']['cs-check']</code>
Expand Down Expand Up @@ -154,8 +162,10 @@
<code>$config['questions']['container']</code>
<code>$config['questions']['error-handler']</code>
</MixedArgument>
<MixedArrayAccess occurrences="4">
<MixedArrayAccess occurrences="6">
<code>$config['dependencies']</code>
<code>$config['dependencies']['factories']</code>
<code>$config['dependencies']['factories'][ErrorResponseGenerator::class]</code>
<code>$config['questions']['container']</code>
<code>$config['questions']['container']</code>
<code>$config['questions']['error-handler']</code>
Expand Down Expand Up @@ -269,7 +279,8 @@
</UnresolvableInclude>
</file>
<file src="test/MezzioInstallerTest/PromptForOptionalPackagesTest.php">
<InvalidArgument occurrences="1">
<InvalidArgument occurrences="2">
<code>testPromptForOptionalPackage</code>
<code>testPromptForOptionalPackage</code>
</InvalidArgument>
<InvalidReturnType occurrences="1"/>
Expand Down Expand Up @@ -304,8 +315,10 @@
<code>$config['questions']['container']</code>
<code>$config['questions']['router']</code>
</MixedArgument>
<MixedArrayAccess occurrences="6">
<MixedArrayAccess occurrences="8">
<code>$config['dependencies']</code>
<code>$config['dependencies'][$dependencyKey]</code>
<code>$config['dependencies'][$dependencyKey][Router\RouterInterface::class]</code>
<code>$config['questions']['container']</code>
<code>$config['questions']['router']</code>
<code>$expectedRoute['allowed_methods']</code>
Expand All @@ -321,17 +334,15 @@
</MixedInferredReturnType>
</file>
<file src="test/MezzioInstallerTest/TemplateRenderersTest.php">
<ArgumentTypeCoercion occurrences="1">
<code>$expectedTemplateRenderer</code>
</ArgumentTypeCoercion>
<InvalidReturnType occurrences="1"/>
<MixedArgument occurrences="3">
<code>$config['questions']['container']</code>
<code>$config['questions']['router']</code>
<code>$config['questions']['template-engine']</code>
</MixedArgument>
<MixedArrayAccess occurrences="4">
<MixedArrayAccess occurrences="6">
<code>$config['dependencies']</code>
<code>$config['dependencies']['factories']</code>
<code>$config['dependencies']['factories'][Middleware\ErrorHandler::class]</code>
<code>$config['questions']['container']</code>
<code>$config['questions']['router']</code>
<code>$config['questions']['template-engine']</code>
Expand Down
15 changes: 9 additions & 6 deletions test/MezzioInstallerTest/TemplateRenderersTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ class TemplateRenderersTest extends OptionalPackagesTestCase
/** @var OptionalPackages */
private $installer;

/** @var string[] */
private $templateConfigProviders = [
/** @var array<class-string, class-string> */
private array $templateConfigProviders = [
Mezzio\Plates\PlatesRenderer::class => Mezzio\Plates\ConfigProvider::class,
Mezzio\Twig\TwigRenderer::class => Mezzio\Twig\ConfigProvider::class,
Mezzio\LaminasView\LaminasViewRenderer::class => Mezzio\LaminasView\ConfigProvider::class,
Expand All @@ -48,6 +48,7 @@ protected function tearDown(): void
/**
* @runInSeparateProcess
* @dataProvider templateRendererProvider
* @param class-string $expectedTemplateRenderer
*/
public function testTemplateRenderer(
string $installType,
Expand Down Expand Up @@ -113,13 +114,13 @@ public function testTemplateRenderer(
* @psalm-return Generator<string, array{
* 0: OptionalPackages::INSTALL_*,
* 1: int,
* 2, int,
* 3, int,
* 4, int,
* 2: int,
* 3: int,
* 4: int,
* 5: class-string<Mezzio\Template\TemplateRendererInterface>
* }>
*/
public function templateRendererProvider(): Generator
public static function templateRendererProvider(): Generator
{
// phpcs:disable Generic.Files.LineLength.TooLong
// Minimal framework installation test cases; no templates installed.
Expand Down Expand Up @@ -166,8 +167,10 @@ public function injectRouterConfigProvider(): void
file_put_contents($configFile, $contents);
}

/** @param class-string $rendererClass */
public function injectConfigProvider(string $rendererClass): void
{
self::assertArrayHasKey($rendererClass, $this->templateConfigProviders);
$configFile = $this->projectRoot . '/config/config.php';
$contents = file_get_contents($configFile);
$contents = preg_replace(
Expand Down