danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-27 12:55:26 +01:00
Code Issues Projects Releases Wiki Activity

Use composer class loader for source project to avoid plugin overwriting

Browse Source 
cc @weirdan
This commit is contained in:
Matthew Brown 2018-11-25 10:41:22 -05:00
parent 047b096227
commit 8eca864e98
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Psalm/Config.php
View File

@ -800,11 +800,25 @@ class Config
$plugin_class_name = $plugin_class_entry['class'];
$plugin_config = $plugin_class_entry['config'];
try {
if (!class_exists($plugin_class_name, true)) {
throw new \UnexpectedValueException($plugin_class_name . ' is not a known class');
if ($this->composer_class_loader) {
$plugin_class_path = $this->composer_class_loader->findFile($plugin_class_name);
if (!$plugin_class_path) {
throw new \UnexpectedValueException($plugin_class_name . ' is not a known class');
}
/** @psalm-suppress UnresolvableInclude */
require_once($plugin_class_path);
} else {
if (!class_exists($plugin_class_name, true)) {
throw new \UnexpectedValueException($plugin_class_name . ' is not a known class');
}
}
/** @var Plugin\PluginEntryPointInterface $plugin_object */
/**
* @psalm-suppress InvalidStringClass
* @var Plugin\PluginEntryPointInterface $plugin_object
*/
$plugin_object = new $plugin_class_name;
$plugin_object($socket, $plugin_config);
} catch (\Throwable $e) {