danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-30 04:39:00 +01:00
Code Issues Projects Releases Wiki Activity

reinstate extra.psalm "namespace"

Browse Source 
Existing plugins have been updated as well (skeleton, doctrine-collections)

Also fixed path to echo-checker plugin so that it's once again directly
installable from the psalm distribution.
This commit is contained in:
Bruce Weirdan 2018-11-14 09:05:12 +02:00 committed by Matthew Brown
parent c86f8e1aef
commit 3fb0a2f336
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -76,7 +76,7 @@
"repositories": [
{
"type": "path",
"url": "examples/composer-based/echo-checker"
"url": "examples/plugins/composer-based/echo-checker"
}
]
}

10
src/Psalm/PluginManager/ComposerLock.php
View File

@ -16,7 +16,7 @@ class ComposerLock
/**
* @param mixed $package
* @psalm-assert-if-true array{type:'psalm-plugin',name:string,extra:array{pluginClass:string}}
* @psalm-assert-if-true array{type:'psalm-plugin',name:string,extra:array{psalm:array{pluginClass:string}}}
* $package
*/
public function isPlugin($package): bool
@ -26,8 +26,8 @@ class ComposerLock
&& is_string($package['name'])
&& isset($package['type'])
&& $package['type'] === 'psalm-plugin'
&& isset($package['extra']['pluginClass'])
&& is_string($package['extra']['pluginClass']);
&& isset($package['extra']['psalm']['pluginClass'])
&& is_string($package['extra']['psalm']['pluginClass']);
}
/**
@ -38,7 +38,7 @@ class ComposerLock
$pluginPackages = $this->getAllPluginPackages();
$ret = [];
foreach ($pluginPackages as $package) {
$ret[$package['name']] = $package['extra']['pluginClass'];
$ret[$package['name']] = $package['extra']['psalm']['pluginClass'];
}
return $ret;
}
@ -60,7 +60,7 @@ class ComposerLock
}
/**
* @return array<mixed,array{name:string,type:string,extra:array{pluginClass:string}}>
* @return array<mixed,array{name:string,type:string,extra:array{psalm:array{pluginClass:string}}}>
*/
private function getAllPluginPackages(): array
{