Skip to content
Merged
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
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"symplify/phpstan-extensions": "^12.0",
"symplify/phpstan-rules": "^14.9",
"tomasvotruba/class-leak": "^2.1",
"tomasvotruba/unused-public": "^2.1",
"tracy/tracy": "^2.11"
},
"autoload": {
Expand Down
1 change: 1 addition & 0 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ parameters:
level: 8

paths:
- monitor.php
- bin
- src
- tests
Expand Down
5 changes: 3 additions & 2 deletions src/Compare/Comparator/PHPStanExtensionsComparator.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace Rector\Monitor\Compare\Comparator;

use Rector\Monitor\Compare\Contract\ComparatorInterface;
use Rector\Monitor\Compare\Enum\PackageNames;
use Rector\Monitor\Compare\ValueObject\ProjectMetadata;
use Symfony\Component\Console\Style\SymfonyStyle;

Expand All @@ -26,8 +27,8 @@ public function compare(

$this->symfonyStyle->title('PHPStan extensions differences');

$monorepoPHPStanPackageNames = $monorepoProjectMetadata->getPackagesMatchingName('phpstan');
$mergePHPStanPackageNames = $mergeProjectMetadata->getPackagesMatchingName('phpstan');
$monorepoPHPStanPackageNames = $monorepoProjectMetadata->getPackagesByNames(PackageNames::PHPSTAN_EXTENSIONS);
$mergePHPStanPackageNames = $mergeProjectMetadata->getPackagesByNames(PackageNames::PHPSTAN_EXTENSIONS);

$monorepoExtraPackages = array_diff($monorepoPHPStanPackageNames, $mergePHPStanPackageNames);
$mergeExtraPackages = array_diff($mergePHPStanPackageNames, $monorepoPHPStanPackageNames);
Expand Down
23 changes: 23 additions & 0 deletions src/Compare/Enum/PackageNames.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?php

declare(strict_types=1);

namespace Rector\Monitor\Compare\Enum;

final class PackageNames
{
/**
* @var string[]
*/
public const PHPSTAN_EXTENSIONS = [
'phpstan/phpstan-doctrine',
'phpstan/phpstan-deprecation-rules',
'phpstan/phpstan-symfony',
'phpstan/phpstan-phpunit',
'symplify/phpstan-extensions',
'symplify/phpstan-rules',
'rector/type-perfect',
'tomasvotruba/unused-public',
'tomasvotruba/ctor',
];
}
19 changes: 10 additions & 9 deletions src/Compare/ValueObject/ProjectMetadata.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,27 @@ public function getComposerJson(): array
}

/**
* @return string[]
* @param string[] $packageNames
* @return array<string, string>
*/
public function getPackagesMatchingName(string $matchingName): array
public function getPackagesByNames(array $packageNames): array
{
Assert::allString($packageNames);

$composerJson = $this->getComposerJson();

$requirePackages = array_merge($composerJson['require'] ?? [], $composerJson['require-dev'] ?? []);

$matchingPackageNames = [];
foreach (array_keys($requirePackages) as $packageName) {
if (! str_contains((string) $packageName, $matchingName)) {
$packagesByNames = [];
foreach ($packageNames as $packageName) {
if (! isset($requirePackages[$packageName])) {
continue;
}

$matchingPackageNames[] = $packageName;
$packagesByNames[$packageName] = $requirePackages[$packageName];
}

Assert::allString($matchingPackageNames);

return $matchingPackageNames;
return $packagesByNames;
}

public function getName(): string
Expand Down
1 change: 1 addition & 0 deletions src/Config/MonitorConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ public function addRepositories(array $repositories): self
}

/**
* @api to be used
* @param string[] $packageNames
*/
public function disallowPackages(array $packageNames): self
Expand Down
24 changes: 0 additions & 24 deletions src/ValueObject/ComposerJson.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,30 +42,6 @@ public function getPackageVersion(string $packageName): ?string
return $this->getBothRequires()[$packageName] ?? null;
}

/**
* @return string[]
*/
public function getRequiredRepositories(): array
{
$repositories = [];

$repositoriesData = $this->composerJson['repositories'] ?? [];
foreach ($repositoriesData as $repositoryData) {
if (! isset($repositoryData['url'])) {
continue;
}

// not a git repository reference
if (! str_ends_with((string) $repositoryData['url'], '.git')) {
continue;
}

$repositories[] = $repositoryData['url'];
}

return $repositories;
}

/**
* @return array<string, string>
*/
Expand Down
28 changes: 14 additions & 14 deletions src/ValueObject/RepositoryCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,20 @@ public function getComposerRequiredPackageNames(): array
return $this->filterOutExtensions($uniquePackageNames);
}

/**
* @return string[]
*/
public function getRepositoryNames(): array
{
$repositoryNames = [];
foreach ($this->repositories as $repository) {
$composerJson = $repository->getComposerJson();

$repositoryNames[] = $composerJson->getRepositoryName();
}

return $repositoryNames;
}
// /**
// * @return string[]
// */
// public function getRepositoryNames(): array
// {
// $repositoryNames = [];
// foreach ($this->repositories as $repository) {
// $composerJson = $repository->getComposerJson();
//
// $repositoryNames[] = $composerJson->getRepositoryName();
// }
//
// return $repositoryNames;
// }

/**
* @return string[]
Expand Down