Skip to content

Commit ce3779b

Browse files
committed
Update phpstan
1 parent 07dd84a commit ce3779b

File tree

4 files changed

+73
-28
lines changed

4 files changed

+73
-28
lines changed

composer.lock

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

phpstan-baseline.neon

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,36 @@ parameters:
6060
count: 1
6161
path: src/Package/SymlinkDumper.php
6262

63+
-
64+
message: '#^Parameter \#1 \$conflict of method App\\Entity\\Version\:\:addConflictLink\(\) expects App\\Entity\\ConflictLink, App\\Entity\\ConflictLink\|App\\Entity\\DevRequireLink\|App\\Entity\\ProvideLink\|App\\Entity\\ReplaceLink\|App\\Entity\\RequireLink given\.$#'
65+
identifier: argument.type
66+
count: 1
67+
path: src/Package/Updater.php
68+
69+
-
70+
message: '#^Parameter \#1 \$devRequire of method App\\Entity\\Version\:\:addDevRequireLink\(\) expects App\\Entity\\DevRequireLink, App\\Entity\\ConflictLink\|App\\Entity\\DevRequireLink\|App\\Entity\\ProvideLink\|App\\Entity\\ReplaceLink\|App\\Entity\\RequireLink given\.$#'
71+
identifier: argument.type
72+
count: 1
73+
path: src/Package/Updater.php
74+
75+
-
76+
message: '#^Parameter \#1 \$provide of method App\\Entity\\Version\:\:addProvideLink\(\) expects App\\Entity\\ProvideLink, App\\Entity\\ConflictLink\|App\\Entity\\DevRequireLink\|App\\Entity\\ProvideLink\|App\\Entity\\ReplaceLink\|App\\Entity\\RequireLink given\.$#'
77+
identifier: argument.type
78+
count: 1
79+
path: src/Package/Updater.php
80+
81+
-
82+
message: '#^Parameter \#1 \$replace of method App\\Entity\\Version\:\:addReplaceLink\(\) expects App\\Entity\\ReplaceLink, App\\Entity\\ConflictLink\|App\\Entity\\DevRequireLink\|App\\Entity\\ProvideLink\|App\\Entity\\ReplaceLink\|App\\Entity\\RequireLink given\.$#'
83+
identifier: argument.type
84+
count: 1
85+
path: src/Package/Updater.php
86+
87+
-
88+
message: '#^Parameter \#1 \$require of method App\\Entity\\Version\:\:addRequireLink\(\) expects App\\Entity\\RequireLink, App\\Entity\\ConflictLink\|App\\Entity\\DevRequireLink\|App\\Entity\\ProvideLink\|App\\Entity\\ReplaceLink\|App\\Entity\\RequireLink given\.$#'
89+
identifier: argument.type
90+
count: 1
91+
path: src/Package/Updater.php
92+
6393
-
6494
message: '#^Parameter \#1 \$ids of method App\\Entity\\PackageRepository\:\:getPackagesWithVersions\(\) expects list\<int\>\|null, array\<int\<0, max\>, int\> given\.$#'
6595
identifier: argument.type

src/Controller/ApiController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public function createPackageAction(Request $request, ProviderManager $providerM
128128
$githubUserMigrationWorker->setupWebHook($user->getGithubToken(), $package);
129129
}
130130
} catch (\Exception $e) {
131-
$this->logger->critical($e->getMessage(), ['exception', $e]);
131+
$this->logger->critical('Unable to create package', ['exception' => $e]);
132132

133133
return new JsonResponse(['status' => 'error', 'message' => 'Error saving package'], 500);
134134
}

src/Package/Updater.php

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,13 @@
1212

1313
namespace App\Package;
1414

15+
use App\Entity\ConflictLink;
1516
use App\Entity\Dependent;
17+
use App\Entity\DevRequireLink;
1618
use App\Entity\PackageFreezeReason;
19+
use App\Entity\ProvideLink;
20+
use App\Entity\ReplaceLink;
21+
use App\Entity\RequireLink;
1722
use App\HtmlSanitizer\ReadmeImageSanitizer;
1823
use App\HtmlSanitizer\ReadmeLinkSanitizer;
1924
use App\Util\HttpDownloaderOptionsFactory;
@@ -63,24 +68,34 @@ class Updater
6368

6469
private const SUPPORTED_LINK_TYPES = [
6570
'require' => [
66-
'method' => 'getRequires',
67-
'entity' => 'RequireLink',
71+
'composer-getter' => 'getRequires',
72+
'getter' => 'getRequire',
73+
'setter' => 'addRequireLink',
74+
'entity' => RequireLink::class,
6875
],
6976
'conflict' => [
70-
'method' => 'getConflicts',
71-
'entity' => 'ConflictLink',
77+
'composer-getter' => 'getConflicts',
78+
'getter' => 'getConflict',
79+
'setter' => 'addConflictLink',
80+
'entity' => ConflictLink::class,
7281
],
7382
'provide' => [
74-
'method' => 'getProvides',
75-
'entity' => 'ProvideLink',
83+
'composer-getter' => 'getProvides',
84+
'getter' => 'getProvide',
85+
'setter' => 'addProvideLink',
86+
'entity' => ProvideLink::class,
7687
],
7788
'replace' => [
78-
'method' => 'getReplaces',
79-
'entity' => 'ReplaceLink',
89+
'composer-getter' => 'getReplaces',
90+
'getter' => 'getReplace',
91+
'setter' => 'addReplaceLink',
92+
'entity' => ReplaceLink::class,
8093
],
8194
'devRequire' => [
82-
'method' => 'getDevRequires',
83-
'entity' => 'DevRequireLink',
95+
'composer-getter' => 'getDevRequires',
96+
'getter' => 'getDevRequire',
97+
'setter' => 'addDevRequireLink',
98+
'entity' => DevRequireLink::class,
8499
],
85100
];
86101

@@ -510,9 +525,9 @@ private function updateInformation(IOInterface $io, VersionRepository $versionRe
510525
}
511526

512527
// handle links
513-
foreach (self::SUPPORTED_LINK_TYPES as $linkType => $opts) {
528+
foreach (self::SUPPORTED_LINK_TYPES as $opts) {
514529
$links = [];
515-
foreach ($data->{$opts['method']}() as $link) {
530+
foreach ($data->{$opts['composer-getter']}() as $link) {
516531
$constraint = $link->getPrettyConstraint();
517532
if (false !== strpos($constraint, ',') && false !== strpos($constraint, '@')) {
518533
$constraint = Preg::replaceCallbackStrictGroups('{([><]=?\s*[^@]+?)@([a-z]+)}i', static function ($matches) {
@@ -527,10 +542,10 @@ private function updateInformation(IOInterface $io, VersionRepository $versionRe
527542
$links[$link->getTarget()] = $constraint;
528543
}
529544

530-
foreach ($version->{'get'.$linkType}() as $link) {
545+
foreach ($version->{$opts['getter']}() as $link) {
531546
// clear links that have changed/disappeared (for updates)
532547
if (!isset($links[$link->getPackageName()]) || $links[$link->getPackageName()] !== $link->getPackageVersion()) {
533-
$version->{'get'.$linkType}()->removeElement($link);
548+
$version->{$opts['getter']}()->removeElement($link);
534549
$em->remove($link);
535550
} else {
536551
// clear those that are already set
@@ -539,11 +554,11 @@ private function updateInformation(IOInterface $io, VersionRepository $versionRe
539554
}
540555

541556
foreach ($links as $linkPackageName => $linkPackageVersion) {
542-
$class = 'App\Entity\\'.$opts['entity'];
557+
$class = $opts['entity'];
543558
$link = new $class;
544559
$link->setPackageName((string) $linkPackageName);
545560
$link->setPackageVersion($linkPackageVersion);
546-
$version->{'add'.$linkType.'Link'}($link);
561+
$version->{$opts['setter']}($link);
547562
$link->setVersion($version);
548563
$em->persist($link);
549564
}

0 commit comments

Comments
 (0)