Skip to content

Commit a915f12

Browse files
committed
PHPStan fixes
1 parent b74baad commit a915f12

File tree

7 files changed

+5
-9
lines changed

7 files changed

+5
-9
lines changed

phpstan.neon

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ includes:
77
- vendor/phpstan/phpstan-symfony/extension.neon
88
- vendor/phpstan/phpstan-symfony/rules.neon
99
- vendor/phpstan/phpstan-webmozart-assert/extension.neon
10+
- vendor/composer/pcre/extension.neon
1011
- vendor/staabm/phpstan-dba/config/dba.neon
1112
- vendor/staabm/phpstan-todo-by/extension.neon
1213
- vendor/phpstan/phpstan-deprecation-rules/rules.neon

src/Controller/ApiController.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,6 @@ protected function findPackagesByUrl(User $user, string $url, string $urlRegex,
553553
$url === 'https://packagist.org/packages/'.$package->getName()
554554
|| (
555555
Preg::isMatch($urlRegex, $package->getRepository(), $candidate)
556-
&& isset($candidate['host'], $candidate['path'])
557-
&& isset($matched['host'], $matched['path'])
558556
&& strtolower($candidate['host']) === strtolower($matched['host'])
559557
&& strtolower($candidate['path']) === strtolower($matched['path'])
560558
)

src/Entity/PhpStatRepository.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,6 @@ private function getKeyInfo(Package $package, string $key): array
281281
throw new \LogicException('Expected keys for package id '.$package->getId().', got '.$key);
282282
}
283283

284-
assert(isset($match['package'], $match['version'], $match['phpversion'], $match['date']));
285-
286284
return [
287285
'type' => $match['platform'] === 'platform' ? PhpStat::TYPE_PLATFORM : PhpStat::TYPE_PHP,
288286
'version' => $match['version'],

src/Entity/User.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,10 @@ public function getId(): int
363363

364364
public function getUserIdentifier(): string
365365
{
366+
if ($this->usernameCanonical === '') {
367+
throw new \LogicException('usernameCanonical cannot be empty string');
368+
}
369+
366370
return $this->usernameCanonical;
367371
}
368372

src/Package/SymlinkDumper.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ public function __construct(
8181
* @var int 0 disabled, 9 maximum.
8282
*/
8383
private int $compress,
84-
/** @var AwsMetadata */
85-
private array $awsMetadata,
8684
private StatsDClient $statsd,
8785
private Logger $logger,
8886
) {

src/Package/V2Dumper.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ public function __construct(
4545
private Client $redis,
4646
private string $webDir,
4747
private string $buildDir,
48-
/** @var AwsMetadata */
49-
private array $awsMetadata,
5048
private StatsDClient $statsd,
5149
private ProviderManager $providerManager,
5250
private Logger $logger,

src/Util/UserAgentParser.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ class UserAgentParser
2626
public function __construct(?string $userAgent)
2727
{
2828
if ($userAgent && Preg::isMatch('#^Composer/(?P<composer>[a-z0-9.+-]+) \((?P<os>[^\s;]+)[^;]*?; (?P<osversion>[^;]*?); (?P<engine>HHVM|PHP) (?P<php>[0-9.]+)[^;]*(?:; (?P<http>streams|curl \d+\.\d+)[^;)]*)?(?:; Platform-PHP (?P<platform_php>[0-9.]+)[^;]*)?(?P<ci>; CI)?#i', $userAgent, $matches)) {
29-
assert(isset($matches['composer'], $matches['engine'], $matches['os'], $matches['php']));
3029
if ($matches['composer'] === 'source' || Preg::isMatch('{^[a-f0-9]{40}$}', $matches['composer'])) {
3130
$matches['composer'] = 'pre-1.8.5';
3231
}

0 commit comments

Comments
 (0)