Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Php] Fix filter cache on PolyfillPackagesProvider #5390

Merged
merged 3 commits into from
Dec 25, 2023
Merged

[Php] Fix filter cache on PolyfillPackagesProvider #5390

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6c5c9c
[Php] Fix filter cache on PolyfillPackagesProvider
samsonasik Dec 25, 2023
411ad35
fix phpstan
samsonasik Dec 25, 2023
9e85e0b
fix phptsan
samsonasik Dec 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/Php/PolyfillPackagesProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
final class PolyfillPackagesProvider
{
/**
* @var array<PolyfillPackage::*>
* @var null|array<PolyfillPackage::*>
*/
private array $cachedPolyfillPackages = [];
private null|array $cachedPolyfillPackages = null;

/**
* @return array<PolyfillPackage::*>
Expand All @@ -27,12 +27,14 @@ public function provide(): array
return SimpleParameterProvider::provideArrayParameter(Option::POLYFILL_PACKAGES);
}

$projectComposerJson = getcwd() . '/composer.json';
if (! file_exists($projectComposerJson)) {
return [];
// already cached, even only empty array
if ($this->cachedPolyfillPackages !== null) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here compare no null = already cached.

return $this->cachedPolyfillPackages;
}

if ($this->cachedPolyfillPackages !== []) {
$projectComposerJson = getcwd() . '/composer.json';
if (! file_exists($projectComposerJson)) {
$this->cachedPolyfillPackages = [];
return $this->cachedPolyfillPackages;
}

Expand All @@ -50,7 +52,7 @@ public function provide(): array
*/
private function filterPolyfillPackages(array $require): array
{
return array_filter($require, static fn (string $packageName): bool => ! str_starts_with(
return array_filter(array_keys($require), static fn (string $packageName): bool => str_starts_with(
Copy link
Member Author

@samsonasik samsonasik Dec 25, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here only key is needed, when we define in composer.json

"require": {
    "symfony/polyfill-php80" => "*"
}

then, filter the str_starts_with() one instead, so it get data:

array('symfony/polyfill-php80')

to compare with in_array() on PhpVersionedFilter

rector-src/packages/VersionBonding/PhpVersionedFilter.php

Lines 32 to 37 in 6ebab94

$polyfillPackageNames = $this->polyfillPackagesProvider->provide();
if (in_array($rector->providePolyfillPackage(), $polyfillPackageNames, true)) {
$activeRectors[] = $rector;
continue;
}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I created e2e test for it:

$packageName,
'symfony/polyfill-'
));
Expand Down
Loading