1
0
mirror of https://github.com/danog/psalm.git synced 2024-11-30 04:39:00 +01:00

Merge pull request #7632 from sasezaki/composer-require-check

Adjust for composer-require-checker check.
This commit is contained in:
orklah 2022-02-11 22:58:18 +01:00 committed by GitHub
commit 6c2484df25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions

View File

@ -4,7 +4,8 @@
"static", "self", "parent",
"array", "string", "int", "float", "bool", "iterable", "callable", "void", "object",
"igbinary_serialize", "igbinary_unserialize", "PHP_PARSER_VERSION", "PSALM_VERSION", "runkit_object_id",
"sapi_windows_cp_is_utf8", "ReflectionUnionType"
"sapi_windows_cp_is_utf8", "ReflectionUnionType",
"Composer\\Autoload\\ClassLoader"
],
"php-core-extensions" : [
"Core",

View File

@ -7,7 +7,7 @@ use Composer\Semver\Constraint\Constraint;
use Composer\Semver\VersionParser;
use DOMAttr;
use DOMDocument;
use DomElement;
use DOMElement;
use InvalidArgumentException;
use JsonException;
use LogicException;
@ -764,7 +764,6 @@ class Config
$psalm_nodes = $dom_document->getElementsByTagName('psalm');
/** @var DomElement|null */
$psalm_node = $psalm_nodes->item(0);
if (!$psalm_node) {
@ -853,7 +852,7 @@ class Config
}
private static function processDeprecatedElement(
DomElement $deprecated_element_xml,
DOMElement $deprecated_element_xml,
string $file_contents,
self $config,
string $config_path

View File

@ -3,7 +3,7 @@
namespace Psalm\Internal\PluginManager;
use DOMDocument;
use DomElement;
use DOMElement;
use Psalm\Config;
use RuntimeException;
@ -53,7 +53,7 @@ class ConfigFile
public function removePlugin(string $plugin_class): void
{
$config_xml = $this->readXml();
/** @var DomElement */
/** @var DOMElement */
$psalm_root = $config_xml->getElementsByTagName('psalm')[0];
$plugins_elements = $psalm_root->getElementsByTagName('plugins');
if (!$plugins_elements->length) {
@ -61,7 +61,7 @@ class ConfigFile
return;
}
/** @var DomElement */
/** @var DOMElement */
$plugins_element = $plugins_elements->item(0);
$plugin_elements = $plugins_element->getElementsByTagName('pluginClass');
@ -84,7 +84,7 @@ class ConfigFile
public function addPlugin(string $plugin_class): void
{
$config_xml = $this->readXml();
/** @var DomElement */
/** @var DOMElement */
$psalm_root = $config_xml->getElementsByTagName('psalm')->item(0);
$plugins_elements = $psalm_root->getElementsByTagName('plugins');
if (!$plugins_elements->length) {
@ -93,7 +93,7 @@ class ConfigFile
$psalm_root->appendChild($plugins_element);
}
} else {
/** @var DomElement */
/** @var DOMElement */
$plugins_element = $plugins_elements->item(0);
}