public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge branch '2.4'

pull/11063/head
Jordi Boggiano 2022-09-14 10:51:03 +02:00
parent c9973cf5a8 21045b942e
commit 29d8eaf45d
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
3 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
phpstan/baseline.neon
View File

@ -3062,7 +3062,7 @@ parameters:
- -
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#" message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 19 count: 8
path: ../src/Composer/Package/Loader/ValidatingArrayLoader.php path: ../src/Composer/Package/Loader/ValidatingArrayLoader.php
- -
@ -3095,11 +3095,6 @@ parameters:
count: 1 count: 1
path: ../src/Composer/Package/Loader/ValidatingArrayLoader.php path: ../src/Composer/Package/Loader/ValidatingArrayLoader.php
-
message: "#^Only booleans are allowed in a negated boolean, DateTime\\|null given\\.$#"
count: 1
path: ../src/Composer/Package/Loader/ValidatingArrayLoader.php
- -
message: "#^Only booleans are allowed in a negated boolean, int\\<0, max\\> given\\.$#" message: "#^Only booleans are allowed in a negated boolean, int\\<0, max\\> given\\.$#"
count: 1 count: 1
@ -3107,7 +3102,7 @@ parameters:
- -
message: "#^Only booleans are allowed in a negated boolean, string\\|false given\\.$#" message: "#^Only booleans are allowed in a negated boolean, string\\|false given\\.$#"
count: 2 count: 1
path: ../src/Composer/Package/Loader/ValidatingArrayLoader.php path: ../src/Composer/Package/Loader/ValidatingArrayLoader.php
- -
@ -3117,16 +3112,6 @@ parameters:
- -
message: "#^Only booleans are allowed in an if condition, string\\|null given\\.$#" message: "#^Only booleans are allowed in an if condition, string\\|null given\\.$#"
count: 2
path: ../src/Composer/Package/Loader/ValidatingArrayLoader.php
-
message: "#^Parameter \\#2 \\$subject of static method Composer\\\\Pcre\\\\Preg\\:\\:isMatch\\(\\) expects string, float\\|int\\|string given\\.$#"
count: 1
path: ../src/Composer/Package/Loader/ValidatingArrayLoader.php
-
message: "#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#"
count: 1 count: 1
path: ../src/Composer/Package/Loader/ValidatingArrayLoader.php path: ../src/Composer/Package/Loader/ValidatingArrayLoader.php

2
src/Composer/Package/Loader/ArrayLoader.php
View File

@ -271,7 +271,7 @@ class ArrayLoader implements LoaderInterface
} }
if (!empty($config['keywords']) && \is_array($config['keywords'])) { if (!empty($config['keywords']) && \is_array($config['keywords'])) {
$package->setKeywords($config['keywords']); $package->setKeywords(array_map('strval', $config['keywords']));
} }
if (!empty($config['license'])) { if (!empty($config['license'])) {

28
src/Composer/Package/Loader/ValidatingArrayLoader.php
View File

@ -47,7 +47,7 @@ class ValidatingArrayLoader implements LoaderInterface
public function __construct(LoaderInterface $loader, bool $strictName = true, ?VersionParser $parser = null, int $flags = 0) public function __construct(LoaderInterface $loader, bool $strictName = true, ?VersionParser $parser = null, int $flags = 0)
{ {
$this->loader = $loader; $this->loader = $loader;
$this->versionParser = $parser ?: new VersionParser(); $this->versionParser = $parser ?? new VersionParser();
$this->flags = $flags; $this->flags = $flags;
if ($strictName !== true) { // @phpstan-ignore-line if ($strictName !== true) { // @phpstan-ignore-line
@ -69,7 +69,7 @@ class ValidatingArrayLoader implements LoaderInterface
$this->errors[] = 'name : '.$err; $this->errors[] = 'name : '.$err;
} }
if (!empty($this->config['version'])) { if (isset($this->config['version'])) {
if (!is_scalar($this->config['version'])) { if (!is_scalar($this->config['version'])) {
$this->validateString('version'); $this->validateString('version');
} else { } else {
@ -85,7 +85,7 @@ class ValidatingArrayLoader implements LoaderInterface
} }
} }
if (!empty($this->config['config']['platform'])) { if (isset($this->config['config']['platform'])) {
foreach ((array) $this->config['config']['platform'] as $key => $platform) { foreach ((array) $this->config['config']['platform'] as $key => $platform) {
if (false === $platform) { if (false === $platform) {
continue; continue;
@ -121,7 +121,7 @@ class ValidatingArrayLoader implements LoaderInterface
$releaseDate = null; $releaseDate = null;
$this->validateString('time'); $this->validateString('time');
if (!empty($this->config['time'])) { if (isset($this->config['time'])) {
try { try {
$releaseDate = new \DateTime($this->config['time'], new \DateTimeZone('UTC')); $releaseDate = new \DateTime($this->config['time'], new \DateTimeZone('UTC'));
} catch (\Exception $e) { } catch (\Exception $e) {
@ -131,7 +131,7 @@ class ValidatingArrayLoader implements LoaderInterface
} }
// check for license validity on newly updated branches // check for license validity on newly updated branches
if (isset($this->config['license']) && (!$releaseDate || $releaseDate->getTimestamp() >= strtotime('-8days'))) { if (isset($this->config['license']) && (null === $releaseDate || $releaseDate->getTimestamp() >= strtotime('-8days'))) {
if (is_array($this->config['license']) || is_string($this->config['license'])) { if (is_array($this->config['license']) || is_string($this->config['license'])) {
$licenses = (array) $this->config['license']; $licenses = (array) $this->config['license'];
@ -160,7 +160,7 @@ class ValidatingArrayLoader implements LoaderInterface
} }
} }
if ($this->validateArray('authors') && !empty($this->config['authors'])) { if ($this->validateArray('authors')) {
foreach ($this->config['authors'] as $key => $author) { foreach ($this->config['authors'] as $key => $author) {
if (!is_array($author)) { if (!is_array($author)) {
$this->errors[] = 'authors.'.$key.' : should be an array, '.gettype($author).' given'; $this->errors[] = 'authors.'.$key.' : should be an array, '.gettype($author).' given';
@ -177,15 +177,15 @@ class ValidatingArrayLoader implements LoaderInterface
$this->warnings[] = 'authors.'.$key.'.homepage : invalid value ('.$author['homepage'].'), must be an http/https URL'; $this->warnings[] = 'authors.'.$key.'.homepage : invalid value ('.$author['homepage'].'), must be an http/https URL';
unset($this->config['authors'][$key]['homepage']); unset($this->config['authors'][$key]['homepage']);
} }
if (isset($author['email']) && !filter_var($author['email'], FILTER_VALIDATE_EMAIL)) { if (isset($author['email']) && false === filter_var($author['email'], FILTER_VALIDATE_EMAIL)) {
$this->warnings[] = 'authors.'.$key.'.email : invalid value ('.$author['email'].'), must be a valid email address'; $this->warnings[] = 'authors.'.$key.'.email : invalid value ('.$author['email'].'), must be a valid email address';
unset($this->config['authors'][$key]['email']); unset($this->config['authors'][$key]['email']);
} }
if (empty($this->config['authors'][$key])) { if (\count($this->config['authors'][$key]) === 0) {
unset($this->config['authors'][$key]); unset($this->config['authors'][$key]);
} }
} }
if (empty($this->config['authors'])) { if (\count($this->config['authors']) === 0) {
unset($this->config['authors']); unset($this->config['authors']);
} }
} }
@ -301,7 +301,7 @@ class ValidatingArrayLoader implements LoaderInterface
} }
} }
if ($this->validateArray('suggest') && !empty($this->config['suggest'])) { if ($this->validateArray('suggest') && isset($this->config['suggest'])) {
foreach ($this->config['suggest'] as $package => $description) { foreach ($this->config['suggest'] as $package => $description) {
if (!is_string($description)) { if (!is_string($description)) {
$this->errors[] = 'suggest.'.$package.' : invalid value, must be a string describing why the package is suggested'; $this->errors[] = 'suggest.'.$package.' : invalid value, must be a string describing why the package is suggested';
@ -310,14 +310,14 @@ class ValidatingArrayLoader implements LoaderInterface
} }
} }
if ($this->validateString('minimum-stability') && !empty($this->config['minimum-stability'])) { if ($this->validateString('minimum-stability') && isset($this->config['minimum-stability'])) {
if (!isset(BasePackage::$stabilities[strtolower($this->config['minimum-stability'])]) && $this->config['minimum-stability'] !== 'RC') { if (!isset(BasePackage::$stabilities[strtolower($this->config['minimum-stability'])]) && $this->config['minimum-stability'] !== 'RC') {
$this->errors[] = 'minimum-stability : invalid value ('.$this->config['minimum-stability'].'), must be one of '.implode(', ', array_keys(BasePackage::$stabilities)); $this->errors[] = 'minimum-stability : invalid value ('.$this->config['minimum-stability'].'), must be one of '.implode(', ', array_keys(BasePackage::$stabilities));
unset($this->config['minimum-stability']); unset($this->config['minimum-stability']);
} }
} }
if ($this->validateArray('autoload') && !empty($this->config['autoload'])) { if ($this->validateArray('autoload') && isset($this->config['autoload'])) {
$types = ['psr-0', 'psr-4', 'classmap', 'files', 'exclude-from-classmap']; $types = ['psr-0', 'psr-4', 'classmap', 'files', 'exclude-from-classmap'];
foreach ($this->config['autoload'] as $type => $typeConfig) { foreach ($this->config['autoload'] as $type => $typeConfig) {
if (!in_array($type, $types)) { if (!in_array($type, $types)) {
@ -334,7 +334,7 @@ class ValidatingArrayLoader implements LoaderInterface
} }
} }
if (!empty($this->config['autoload']['psr-4']) && !empty($this->config['target-dir'])) { if (isset($this->config['autoload']['psr-4']) && isset($this->config['target-dir'])) {
$this->errors[] = 'target-dir : this can not be used together with the autoload.psr-4 setting, remove target-dir to upgrade to psr-4'; $this->errors[] = 'target-dir : this can not be used together with the autoload.psr-4 setting, remove target-dir to upgrade to psr-4';
// Unset the psr-4 setting, since unsetting target-dir might // Unset the psr-4 setting, since unsetting target-dir might
// interfere with other settings. // interfere with other settings.
@ -571,7 +571,7 @@ class ValidatingArrayLoader implements LoaderInterface
continue; continue;
} }
if ($regex && !Preg::isMatch('{^'.$regex.'$}u', $value)) { if ($regex && !Preg::isMatch('{^'.$regex.'$}u', (string) $value)) {
$this->warnings[] = $property.'.'.$key.' : invalid value ('.$value.'), must match '.$regex; $this->warnings[] = $property.'.'.$key.' : invalid value ('.$value.'), must match '.$regex;
unset($this->config[$property][$key]); unset($this->config[$property][$key]);
$pass = false; $pass = false;