From ca9afb83327e057aae5f0e12f3fd398a4b2be7e9 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Thu, 1 Oct 2026 14:22:14 +0200 Subject: [PATCH] Drop webmozart/assert in favor of entropy Assert --- composer.json | 3 +-- src/Analyzer/NeedsFinalizeAnalyzer.php | 2 +- src/Command/FeaturesCommand.php | 2 +- src/Command/GenerateSymfonySmokeTestsCommand.php | 2 +- src/Command/SplitSymfonyConfigToPerPackageCommand.php | 2 +- src/EntityClassResolver.php | 2 +- src/Finder/FilesFinder.php | 2 +- src/Finder/PhpFilesFinder.php | 2 +- src/Lines/Analyser.php | 2 +- src/Lines/Finder/MeasureFileFinder.php | 2 +- src/Lines/OutputFormatter/JsonOutputFormatter.php | 2 +- src/Lines/OutputFormatter/TextOutputFormatter.php | 2 +- src/MockedClassResolver.php | 2 +- .../NodeVisitor/EntityClassNameCollectingNodeVisitor.php | 2 +- src/PhpParser/NodeVisitor/FindClassConstFetchNodeVisitor.php | 2 +- .../NodeVisitor/FindNonPrivateClassConstNodeVisitor.php | 2 +- src/SmokeTestgen/TestTemplateResolver.php | 2 +- src/Testing/Command/DetectUnitTestsCommand.php | 2 +- src/ValueObject/ClassConstant.php | 2 +- 19 files changed, 19 insertions(+), 20 deletions(-) diff --git a/composer.json b/composer.json index 70e4208c0..2e2497051 100644 --- a/composer.json +++ b/composer.json @@ -9,8 +9,7 @@ "php": ">=8.4", "ext-tokenizer": "*", "entropy/entropy": "^0.4.23", - "nikic/php-parser": "^5.9", - "webmozart/assert": "^2.4" + "nikic/php-parser": "^5.9" }, "require-dev": { "phpstan/extension-installer": "^1.4", diff --git a/src/Analyzer/NeedsFinalizeAnalyzer.php b/src/Analyzer/NeedsFinalizeAnalyzer.php index 0f5dd10b2..991b8f088 100644 --- a/src/Analyzer/NeedsFinalizeAnalyzer.php +++ b/src/Analyzer/NeedsFinalizeAnalyzer.php @@ -4,11 +4,11 @@ namespace Rector\SwissKnife\Analyzer; +use Entropy\Validation\Assert; use PhpParser\NodeTraverser; use Rector\SwissKnife\PhpParser\CachedPhpParser; use Rector\SwissKnife\PhpParser\NodeTraverserFactory; use Rector\SwissKnife\PhpParser\NodeVisitor\NeedForFinalizeNodeVisitor; -use Webmozart\Assert\Assert; final readonly class NeedsFinalizeAnalyzer { diff --git a/src/Command/FeaturesCommand.php b/src/Command/FeaturesCommand.php index 47fe1232c..811f84dda 100644 --- a/src/Command/FeaturesCommand.php +++ b/src/Command/FeaturesCommand.php @@ -7,11 +7,11 @@ use Entropy\Console\Contract\CommandInterface; use Entropy\Console\Enum\ExitCode; use Entropy\Console\Output\OutputPrinter; +use Entropy\Validation\Assert; use Rector\SwissKnife\Lines\FeatureCounter\FeatureCounterAnalyzer; use Rector\SwissKnife\Lines\FeatureCounter\ResultPrinter; use Rector\SwissKnife\Lines\Finder\ProjectFilesFinder; use Rector\SwissKnife\Lines\OutputFormatter\JsonOutputFormatter; -use Webmozart\Assert\Assert; final readonly class FeaturesCommand implements CommandInterface { diff --git a/src/Command/GenerateSymfonySmokeTestsCommand.php b/src/Command/GenerateSymfonySmokeTestsCommand.php index d488a0ed9..9db622b46 100644 --- a/src/Command/GenerateSymfonySmokeTestsCommand.php +++ b/src/Command/GenerateSymfonySmokeTestsCommand.php @@ -9,12 +9,12 @@ use Entropy\Console\Output\OutputPrinter; use Entropy\Utils\FileSystem; use Entropy\Utils\Json; +use Entropy\Validation\Assert; use Rector\SwissKnife\SmokeTestgen\FileSystem\TestsDirectoryResolver; use Rector\SwissKnife\SmokeTestgen\Templating\TemplateDecorator; use Rector\SwissKnife\SmokeTestgen\TestTemplateResolver; use Rector\SwissKnife\SmokeTestgen\Utils\TestPathResolver; use RuntimeException; -use Webmozart\Assert\Assert; final readonly class GenerateSymfonySmokeTestsCommand implements CommandInterface { diff --git a/src/Command/SplitSymfonyConfigToPerPackageCommand.php b/src/Command/SplitSymfonyConfigToPerPackageCommand.php index 3b0e90742..386c95c97 100644 --- a/src/Command/SplitSymfonyConfigToPerPackageCommand.php +++ b/src/Command/SplitSymfonyConfigToPerPackageCommand.php @@ -8,6 +8,7 @@ use Entropy\Console\Enum\ExitCode; use Entropy\Console\Output\OutputPrinter; use Entropy\Utils\FileSystem; +use Entropy\Validation\Assert; use PhpParser\Node\Expr\MethodCall; use PhpParser\Node\Scalar\String_; use PhpParser\Node\Stmt; @@ -19,7 +20,6 @@ use Rector\SwissKnife\PhpParser\NodeFactory\SplitConfigClosureFactory; use Rector\SwissKnife\PhpParser\NodeVisitor\AddImportConfigMethodCallNodeVisitor; use Rector\SwissKnife\PhpParser\NodeVisitor\ExtractSymfonyExtensionCallNodeVisitor; -use Webmozart\Assert\Assert; final readonly class SplitSymfonyConfigToPerPackageCommand implements CommandInterface { diff --git a/src/EntityClassResolver.php b/src/EntityClassResolver.php index 44f0419d7..b0894478b 100644 --- a/src/EntityClassResolver.php +++ b/src/EntityClassResolver.php @@ -6,13 +6,13 @@ use Entropy\FileSystem\FileInfo; use Entropy\Utils\Regex; +use Entropy\Validation\Assert; use PhpParser\NodeTraverser; use Rector\SwissKnife\Finder\FilesFinder; use Rector\SwissKnife\Finder\PhpFilesFinder; use Rector\SwissKnife\PhpParser\CachedPhpParser; use Rector\SwissKnife\PhpParser\NodeTraverserFactory; use Rector\SwissKnife\PhpParser\NodeVisitor\EntityClassNameCollectingNodeVisitor; -use Webmozart\Assert\Assert; /** * @see \Rector\SwissKnife\Tests\EntityClassResolver\EntityClassResolverTest diff --git a/src/Finder/FilesFinder.php b/src/Finder/FilesFinder.php index 5f5dc74a3..750bbf2ea 100644 --- a/src/Finder/FilesFinder.php +++ b/src/Finder/FilesFinder.php @@ -6,7 +6,7 @@ use Entropy\FileSystem\FileFinder; use Entropy\FileSystem\FileInfo; -use Webmozart\Assert\Assert; +use Entropy\Validation\Assert; /** * @see \Rector\SwissKnife\Tests\Finder\FilesFinderTest diff --git a/src/Finder/PhpFilesFinder.php b/src/Finder/PhpFilesFinder.php index 07ab6796b..daeda016d 100644 --- a/src/Finder/PhpFilesFinder.php +++ b/src/Finder/PhpFilesFinder.php @@ -6,7 +6,7 @@ use Entropy\FileSystem\FileFinder; use Entropy\FileSystem\FileInfo; -use Webmozart\Assert\Assert; +use Entropy\Validation\Assert; /** * @see \Rector\SwissKnife\Tests\Finder\PhpFilesFinderTest diff --git a/src/Lines/Analyser.php b/src/Lines/Analyser.php index d6952e512..865113471 100644 --- a/src/Lines/Analyser.php +++ b/src/Lines/Analyser.php @@ -4,12 +4,12 @@ namespace Rector\SwissKnife\Lines; +use Entropy\Validation\Assert; use PhpParser\NodeTraverser; use PhpParser\Parser; use Rector\SwissKnife\Lines\NodeVisitor\CommentLineCountingNodeVisitor; use Rector\SwissKnife\Lines\NodeVisitor\StructureNodeVisitor; use Throwable; -use Webmozart\Assert\Assert; /** * @see \Rector\SwissKnife\Tests\Lines\AnalyserTest diff --git a/src/Lines/Finder/MeasureFileFinder.php b/src/Lines/Finder/MeasureFileFinder.php index 1cf6acb50..729abd065 100644 --- a/src/Lines/Finder/MeasureFileFinder.php +++ b/src/Lines/Finder/MeasureFileFinder.php @@ -6,7 +6,7 @@ use Entropy\FileSystem\FileFinder; use Entropy\FileSystem\FileInfo; -use Webmozart\Assert\Assert; +use Entropy\Validation\Assert; final class MeasureFileFinder { diff --git a/src/Lines/OutputFormatter/JsonOutputFormatter.php b/src/Lines/OutputFormatter/JsonOutputFormatter.php index 55dfde156..742b0a8ac 100644 --- a/src/Lines/OutputFormatter/JsonOutputFormatter.php +++ b/src/Lines/OutputFormatter/JsonOutputFormatter.php @@ -4,9 +4,9 @@ namespace Rector\SwissKnife\Lines\OutputFormatter; +use Entropy\Validation\Assert; use Rector\SwissKnife\Lines\FeatureCounter\ValueObject\FeatureCollector; use Rector\SwissKnife\Lines\Measurements; -use Webmozart\Assert\Assert; final class JsonOutputFormatter { diff --git a/src/Lines/OutputFormatter/TextOutputFormatter.php b/src/Lines/OutputFormatter/TextOutputFormatter.php index d01413b10..601066612 100644 --- a/src/Lines/OutputFormatter/TextOutputFormatter.php +++ b/src/Lines/OutputFormatter/TextOutputFormatter.php @@ -8,9 +8,9 @@ use Entropy\Console\ConsoleTable\ValueObject\TableView; use Entropy\Console\ConsoleTable\ViewRenderer; use Entropy\Console\Output\OutputPrinter; +use Entropy\Validation\Assert; use Rector\SwissKnife\Lines\Measurements; use Rector\SwissKnife\Lines\NumberFormat; -use Webmozart\Assert\Assert; final readonly class TextOutputFormatter { diff --git a/src/MockedClassResolver.php b/src/MockedClassResolver.php index a2195fc15..26b1fed4e 100644 --- a/src/MockedClassResolver.php +++ b/src/MockedClassResolver.php @@ -5,12 +5,12 @@ namespace Rector\SwissKnife; use Entropy\FileSystem\FileInfo; +use Entropy\Validation\Assert; use PhpParser\NodeTraverser; use Rector\SwissKnife\Finder\PhpFilesFinder; use Rector\SwissKnife\PhpParser\CachedPhpParser; use Rector\SwissKnife\PhpParser\NodeTraverserFactory; use Rector\SwissKnife\PhpParser\NodeVisitor\MockedClassNameCollectingNodeVisitor; -use Webmozart\Assert\Assert; final readonly class MockedClassResolver { diff --git a/src/PhpParser/NodeVisitor/EntityClassNameCollectingNodeVisitor.php b/src/PhpParser/NodeVisitor/EntityClassNameCollectingNodeVisitor.php index a672151c1..030def73d 100644 --- a/src/PhpParser/NodeVisitor/EntityClassNameCollectingNodeVisitor.php +++ b/src/PhpParser/NodeVisitor/EntityClassNameCollectingNodeVisitor.php @@ -4,12 +4,12 @@ namespace Rector\SwissKnife\PhpParser\NodeVisitor; +use Entropy\Validation\Assert; use PhpParser\Comment\Doc; use PhpParser\Node; use PhpParser\Node\Name; use PhpParser\Node\Stmt\Class_; use PhpParser\NodeVisitorAbstract; -use Webmozart\Assert\Assert; final class EntityClassNameCollectingNodeVisitor extends NodeVisitorAbstract { diff --git a/src/PhpParser/NodeVisitor/FindClassConstFetchNodeVisitor.php b/src/PhpParser/NodeVisitor/FindClassConstFetchNodeVisitor.php index c2523593b..69a898ae2 100644 --- a/src/PhpParser/NodeVisitor/FindClassConstFetchNodeVisitor.php +++ b/src/PhpParser/NodeVisitor/FindClassConstFetchNodeVisitor.php @@ -4,6 +4,7 @@ namespace Rector\SwissKnife\PhpParser\NodeVisitor; +use Entropy\Validation\Assert; use PhpParser\Node; use PhpParser\Node\Expr; use PhpParser\Node\Expr\ClassConstFetch; @@ -23,7 +24,6 @@ use Rector\SwissKnife\ValueObject\ClassConstantFetch\ParentClassConstantFetch; use Rector\SwissKnife\ValueObject\ClassConstantFetch\StaticClassConstantFetch; use ReflectionClass; -use Webmozart\Assert\Assert; final class FindClassConstFetchNodeVisitor extends NodeVisitorAbstract { diff --git a/src/PhpParser/NodeVisitor/FindNonPrivateClassConstNodeVisitor.php b/src/PhpParser/NodeVisitor/FindNonPrivateClassConstNodeVisitor.php index aaaf1433f..21a2d21e3 100644 --- a/src/PhpParser/NodeVisitor/FindNonPrivateClassConstNodeVisitor.php +++ b/src/PhpParser/NodeVisitor/FindNonPrivateClassConstNodeVisitor.php @@ -4,13 +4,13 @@ namespace Rector\SwissKnife\PhpParser\NodeVisitor; +use Entropy\Validation\Assert; use PhpParser\Node; use PhpParser\Node\Name; use PhpParser\Node\Stmt\Class_; use PhpParser\NodeVisitorAbstract; use Rector\SwissKnife\ValueObject\ClassConstant; use ReflectionClass; -use Webmozart\Assert\Assert; final class FindNonPrivateClassConstNodeVisitor extends NodeVisitorAbstract { diff --git a/src/SmokeTestgen/TestTemplateResolver.php b/src/SmokeTestgen/TestTemplateResolver.php index ec28e3b95..d2d66eaa7 100644 --- a/src/SmokeTestgen/TestTemplateResolver.php +++ b/src/SmokeTestgen/TestTemplateResolver.php @@ -4,9 +4,9 @@ namespace Rector\SwissKnife\SmokeTestgen; +use Entropy\Validation\Assert; use Rector\SwissKnife\SmokeTestgen\Contract\TestByPackageSubscriberInterface; use Rector\SwissKnife\SmokeTestgen\TestByPackageSubscriber\ServiceContainerTestByPackageSubscriber; -use Webmozart\Assert\Assert; final class TestTemplateResolver { diff --git a/src/Testing/Command/DetectUnitTestsCommand.php b/src/Testing/Command/DetectUnitTestsCommand.php index 960330de8..81b7559ec 100644 --- a/src/Testing/Command/DetectUnitTestsCommand.php +++ b/src/Testing/Command/DetectUnitTestsCommand.php @@ -8,9 +8,9 @@ use Entropy\Console\Enum\ExitCode; use Entropy\Console\Output\OutputPrinter; use Entropy\Utils\FileSystem; +use Entropy\Validation\Assert; use Rector\SwissKnife\Testing\Printer\PHPUnitXmlPrinter; use Rector\SwissKnife\Testing\UnitTestFilePathsFinder; -use Webmozart\Assert\Assert; final readonly class DetectUnitTestsCommand implements CommandInterface { diff --git a/src/ValueObject/ClassConstant.php b/src/ValueObject/ClassConstant.php index ede833bc4..fbcadf914 100644 --- a/src/ValueObject/ClassConstant.php +++ b/src/ValueObject/ClassConstant.php @@ -4,7 +4,7 @@ namespace Rector\SwissKnife\ValueObject; -use Webmozart\Assert\Assert; +use Entropy\Validation\Assert; final readonly class ClassConstant {