Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php

namespace Rector\Tests\DeadCode\Rector\FunctionLike\NarrowWideUnionReturnTypeRector\Fixture;

use Monolog\Logger;
use Monolog\LogRecord;

final class SkipConstantCompareFromVendor
{
public function createLogRecord(int $level): array|LogRecord
{
return Logger::API === 2
? ['level' => $level]
: new LogRecord();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"require": {
"monolog/monolog": "^2.0 || ^3.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,18 @@

declare(strict_types=1);

use Rector\Composer\ComposerJsonPackageVersionResolver;
use Rector\Config\RectorConfig;
use Rector\DeadCode\Rector\FunctionLike\NarrowWideUnionReturnTypeRector;
use Rector\ValueObject\PhpVersionFeature;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->singleton(
ComposerJsonPackageVersionResolver::class,
static fn (): ComposerJsonPackageVersionResolver => new ComposerJsonPackageVersionResolver(
__DIR__ . '/../Source/composer.json'
)
);
$rectorConfig->rule(NarrowWideUnionReturnTypeRector::class);
$rectorConfig->phpVersion(PhpVersionFeature::UNION_TYPES);
};
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\ArrowFunction;
use PhpParser\Node\Expr\ClassConstFetch;
use PhpParser\Node\Expr\Closure;
use PhpParser\Node\Expr\ConstFetch;
use PhpParser\Node\Expr\Ternary;
use PhpParser\Node\FunctionLike;
use PhpParser\Node\Name;
use PhpParser\Node\NullableType;
Expand All @@ -19,12 +21,14 @@
use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Type\NullType;
use PHPStan\Type\ObjectType;
use PHPStan\Type\Type;
use PHPStan\Type\TypeCombinator;
use PHPStan\Type\UnionType as PHPStanUnionType;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
use Rector\Composer\ComposerJsonPackageVersionResolver;
use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
use Rector\PhpParser\Node\BetterNodeFinder;
use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
Expand All @@ -49,7 +53,8 @@ public function __construct(
private readonly SilentVoidResolver $silentVoidResolver,
private readonly PhpDocTypeChanger $phpDocTypeChanger,
private readonly PhpDocInfoFactory $phpDocInfoFactory,
private readonly TypeFactory $typeFactory
private readonly TypeFactory $typeFactory,
private readonly ComposerJsonPackageVersionResolver $composerJsonPackageVersionResolver
) {
}

Expand Down Expand Up @@ -255,12 +260,54 @@ private function collectActualReturnTypes(array $returnStatements): array
continue;
}

$returnTypes[] = $this->nodeTypeResolver->getNativeType($returnStatement->expr);
$returnTypes = [...$returnTypes, ...$this->resolveNativeReturnTypes($returnStatement->expr)];
}

return $returnTypes;
}

/**
* @return Type[]
*/
private function resolveNativeReturnTypes(Expr $expr): array
{
if (! $expr instanceof Ternary || ! $this->hasVendorClassConstFetch($expr->cond)) {
return [$this->nodeTypeResolver->getNativeType($expr)];
}

$ifExpr = $expr->if instanceof Expr ? $expr->if : $expr->cond;

return [...$this->resolveNativeReturnTypes($ifExpr), ...$this->resolveNativeReturnTypes($expr->else)];
}

private function hasVendorClassConstFetch(Expr $expr): bool
{
$classConstFetches = $this->betterNodeFinder->findInstanceOf($expr, ClassConstFetch::class);

foreach ($classConstFetches as $classConstFetch) {
$classType = $this->nodeTypeResolver->getType($classConstFetch->class);
if (! $classType instanceof ObjectType) {
continue;
}

$classReflection = $classType->getClassReflection();
if (! $classReflection instanceof ClassReflection) {
continue;
}

$fileName = $classReflection->getFileName();
if ($fileName === null) {
continue;
}

if ($this->composerJsonPackageVersionResolver->hasPackageMultiMajorVersions($fileName)) {
Comment thread
TomasVotruba marked this conversation as resolved.
return true;
}
}

return false;
Comment thread
TomasVotruba marked this conversation as resolved.
}

/**
* @param Type[] $actualReturnTypes
* @return Type[]
Expand Down
137 changes: 137 additions & 0 deletions src/Composer/ComposerJsonPackageVersionResolver.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
<?php

declare(strict_types=1);

namespace Rector\Composer;

use Composer\Semver\VersionParser;
use Rector\FileSystem\JsonFileSystem;
use Rector\Skipper\FileSystem\PathNormalizer;
use UnexpectedValueException;

/**
* @see \Rector\Tests\Composer\ComposerJsonPackageVersionResolverTest
*/
final class ComposerJsonPackageVersionResolver
{
/**
* @var null|array<string, string>
*/
private ?array $packageVersionConstraints = null;

private readonly string $composerJsonFilePath;

public function __construct(?string $composerJsonFilePath = null)
{
$this->composerJsonFilePath = $composerJsonFilePath ?? getcwd() . '/composer.json';
}

public function hasPackageMultiMajorVersions(string $filePath): bool
{
$packageName = $this->resolvePackageName($filePath);
if ($packageName === null) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This should be cached to avoid repeated checks.

return false;
}

$versionConstraint = $this->resolvePackageVersionConstraints()[$packageName] ?? null;
if ($versionConstraint === null) {
return false;
}

$versionConstraintParts = preg_split('#\s*\|\|?\s*#', $versionConstraint);
if ($versionConstraintParts === false || count($versionConstraintParts) < 2) {
return false;
}

$majorVersions = [];
$versionParser = new VersionParser();

foreach ($versionConstraintParts as $versionConstraintPart) {
if (preg_match('#\d+#', $versionConstraintPart) !== 1) {
continue;
}

try {
$constraint = $versionParser->parseConstraints($versionConstraintPart);
} catch (UnexpectedValueException) {
continue;
}

$lowerMajorVersion = $this->resolveMajorVersion($constraint->getLowerBound()->getVersion());
if ($lowerMajorVersion === null) {
continue;
}

$majorVersions[$lowerMajorVersion] = true;
}

return count($majorVersions) > 1;
}

private function resolvePackageName(string $filePath): ?string
{
$normalizedFilePath = PathNormalizer::normalize($filePath);
$vendorPosition = strpos($normalizedFilePath, '/vendor/');

if ($vendorPosition === false) {
return null;
}

$vendorRelativePath = substr($normalizedFilePath, $vendorPosition + strlen('/vendor/'));
$pathParts = explode('/', $vendorRelativePath);

if (count($pathParts) < 2) {
return null;
}

return $pathParts[0] . '/' . $pathParts[1];
}

/**
* @return array<string, string>
*/
private function resolvePackageVersionConstraints(): array
{
if ($this->packageVersionConstraints !== null) {
return $this->packageVersionConstraints;
}

if (! file_exists($this->composerJsonFilePath)) {
return $this->packageVersionConstraints = [];
}

$composerJson = JsonFileSystem::readFilePath($this->composerJsonFilePath);
$packageVersionConstraints = [];

foreach (['require', 'require-dev'] as $requireKey) {
$requires = $composerJson[$requireKey] ?? [];
if (! is_array($requires)) {
continue;
}

foreach ($requires as $packageName => $versionConstraint) {
if (! is_string($packageName)) {
continue;
}

if (! is_string($versionConstraint)) {
continue;
}

$packageVersionConstraints[$packageName] = $versionConstraint;
}
}

return $this->packageVersionConstraints = $packageVersionConstraints;
}

private function resolveMajorVersion(string $version): ?int
{
$match = preg_match('#^(\d+)\.#', $version, $matches);
if ($match !== 1) {
return null;
}

return (int) $matches[1];
}
}
13 changes: 13 additions & 0 deletions stubs/Monolog/vendor/monolog/monolog/src/LogRecord.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php

declare(strict_types=1);

namespace Monolog;

if (class_exists('Monolog\LogRecord')) {
return;
}

class LogRecord
{
}
14 changes: 14 additions & 0 deletions stubs/Monolog/vendor/monolog/monolog/src/Logger.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

declare(strict_types=1);

namespace Monolog;

if (class_exists('Monolog\Logger')) {
return;
}

class Logger
{
public const API = 2;
}
34 changes: 34 additions & 0 deletions tests/Composer/ComposerJsonPackageVersionResolverTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?php

declare(strict_types=1);

namespace Rector\Tests\Composer;

use Iterator;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
use Rector\Composer\ComposerJsonPackageVersionResolver;

final class ComposerJsonPackageVersionResolverTest extends TestCase
{
#[DataProvider('provideData')]
public function test(string $composerJsonFilePath, bool $expected): void
{
$composerJsonPackageVersionResolver = new ComposerJsonPackageVersionResolver($composerJsonFilePath);

$hasPackageMultiMajorVersions = $composerJsonPackageVersionResolver->hasPackageMultiMajorVersions(
'/project/vendor/monolog/monolog/src/Logger.php'
);

$this->assertSame($expected, $hasPackageMultiMajorVersions);
}

/**
* @return Iterator<(array<int, bool>|array<int, string>)>
*/
public static function provideData(): Iterator
{
yield [__DIR__ . '/Fixture/ComposerJsonPackageVersionResolver/single_major.json', false];
yield [__DIR__ . '/Fixture/ComposerJsonPackageVersionResolver/multi_major.json', true];
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"require": {
"monolog/monolog": "^2.0 || ^3.0"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"require": {
"monolog/monolog": "^2.0"
}
}
Loading