octoleo
/
rector
mirror of https://github.com/rectorphp/rector.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit f8e04774ad 

f8e04774ad Fixing scoped build (#1143)
This commit is contained in:
Tomas Votruba 2021-11-04 15:30:20 +00:00
parent 8db8a4be7b
commit 504a41770d
3233 changed files with 16825 additions and 13790 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/e2e.yaml vendored
View File

@ -18,6 +18,7 @@ jobs:
php_version: ['7.1', '7.2', '7.3', '7.4', '8.0']
directory:
- 'e2e/attributes'
- 'e2e/define-constant'
- 'e2e/dont-execute-code'
- 'e2e/finalize'
- 'e2e/parse-php7-code'

2
bin/rector
View File

@ -1,5 +1,5 @@
#!/usr/bin/env php
<?php
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
require_once __DIR__ . '/rector.php';

22
bin/rector.php
View File

@ -1,9 +1,9 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use RectorPrefix20211103\Nette\Utils\Json;
use RectorPrefix20211104\Nette\Utils\Json;
use Rector\ChangesReporting\Output\JsonOutputFormatter;
use Rector\Core\Bootstrap\RectorConfigsResolver;
use Rector\Core\Configuration\Option;
@ -11,9 +11,9 @@ use Rector\Core\Console\ConsoleApplication;
use Rector\Core\Console\Style\SymfonyStyleFactory;
use Rector\Core\DependencyInjection\RectorContainerFactory;
use Rector\Core\Kernel\RectorKernel;
use RectorPrefix20211103\Symfony\Component\Console\Command\Command;
use RectorPrefix20211103\Symfony\Component\Console\Input\ArgvInput;
use RectorPrefix20211103\Symplify\PackageBuilder\Reflection\PrivatesCaller;
use RectorPrefix20211104\Symfony\Component\Console\Command\Command;
use RectorPrefix20211104\Symfony\Component\Console\Input\ArgvInput;
use RectorPrefix20211104\Symplify\PackageBuilder\Reflection\PrivatesCaller;
// @ intentionally: continue anyway
@\ini_set('memory_limit', '-1');
// Performance boost
@ -22,7 +22,7 @@ use RectorPrefix20211103\Symplify\PackageBuilder\Reflection\PrivatesCaller;
\gc_disable();
\define('__RECTOR_RUNNING__', \true);
// Require Composer autoload.php
$autoloadIncluder = new \RectorPrefix20211103\AutoloadIncluder();
$autoloadIncluder = new \RectorPrefix20211104\AutoloadIncluder();
$autoloadIncluder->includeDependencyOrRepositoryVendorAutoloadIfExists();
// load extracted PHPStan with its own preload.php
$extractedPhpstanAutoload = __DIR__ . '/../vendor/phpstan/phpstan-extracted/vendor/autoload.php';
@ -45,18 +45,18 @@ try {
$container = $rectorContainerFactory->createFromBootstrapConfigs($bootstrapConfigs);
} catch (\Throwable $throwable) {
// for json output
$argvInput = new \RectorPrefix20211103\Symfony\Component\Console\Input\ArgvInput();
$argvInput = new \RectorPrefix20211104\Symfony\Component\Console\Input\ArgvInput();
$outputFormat = $argvInput->getParameterOption('--' . \Rector\Core\Configuration\Option::OUTPUT_FORMAT);
// report fatal error in json format
if ($outputFormat === \Rector\ChangesReporting\Output\JsonOutputFormatter::NAME) {
echo \RectorPrefix20211103\Nette\Utils\Json::encode(['fatal_errors' => [$throwable->getMessage()]]);
echo \RectorPrefix20211104\Nette\Utils\Json::encode(['fatal_errors' => [$throwable->getMessage()]]);
} else {
// report fatal errors in console format
$symfonyStyleFactory = new \Rector\Core\Console\Style\SymfonyStyleFactory(new \RectorPrefix20211103\Symplify\PackageBuilder\Reflection\PrivatesCaller());
$symfonyStyleFactory = new \Rector\Core\Console\Style\SymfonyStyleFactory(new \RectorPrefix20211104\Symplify\PackageBuilder\Reflection\PrivatesCaller());
$symfonyStyle = $symfonyStyleFactory->create();
$symfonyStyle->error($throwable->getMessage());
}
exit(\RectorPrefix20211103\Symfony\Component\Console\Command\Command::FAILURE);
exit(\RectorPrefix20211104\Symfony\Component\Console\Command\Command::FAILURE);
}
/** @var ConsoleApplication $application */
$application = $container->get(\Rector\Core\Console\ConsoleApplication::class);
@ -111,4 +111,4 @@ final class AutoloadIncluder
require_once $filePath;
}
}
\class_alias('RectorPrefix20211103\\AutoloadIncluder', 'AutoloadIncluder', \false);
\class_alias('RectorPrefix20211104\\AutoloadIncluder', 'AutoloadIncluder', \false);

2
config/config.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Core\Bootstrap\ExtensionConfigResolver;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;

2
config/parameters.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Caching\ValueObject\Storage\MemoryCacheStorage;
use Rector\Core\Configuration\Option;

2
config/services-packages.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
return static function (\Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator $containerConfigurator) : void {

2
config/services-rules.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Core\Configuration\Option;
use Rector\PSR4\Composer\PSR4NamespaceMatcher;

108
config/services.php
View File

@ -1,14 +1,14 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use RectorPrefix20211103\Composer\Semver\VersionParser;
use RectorPrefix20211103\Doctrine\Inflector\Inflector;
use RectorPrefix20211103\Doctrine\Inflector\Rules\English\InflectorFactory;
use RectorPrefix20211103\Ergebnis\Json\Printer\Printer;
use RectorPrefix20211103\Ergebnis\Json\Printer\PrinterInterface;
use RectorPrefix20211103\Idiosyncratic\EditorConfig\EditorConfig;
use RectorPrefix20211104\Composer\Semver\VersionParser;
use RectorPrefix20211104\Doctrine\Inflector\Inflector;
use RectorPrefix20211104\Doctrine\Inflector\Rules\English\InflectorFactory;
use RectorPrefix20211104\Ergebnis\Json\Printer\Printer;
use RectorPrefix20211104\Ergebnis\Json\Printer\PrinterInterface;
use RectorPrefix20211104\Idiosyncratic\EditorConfig\EditorConfig;
use PhpParser\BuilderFactory;
use PhpParser\Lexer;
use PhpParser\NodeFinder;
@ -32,70 +32,70 @@ use Rector\Core\Console\ConsoleApplication;
use Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory;
use Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocator\IntermediateSourceLocator;
use Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocatorProvider\DynamicSourceLocatorProvider;
use RectorPrefix20211103\Symfony\Component\Console\Application;
use RectorPrefix20211103\Symfony\Component\Console\Style\SymfonyStyle;
use RectorPrefix20211104\Symfony\Component\Console\Application;
use RectorPrefix20211104\Symfony\Component\Console\Style\SymfonyStyle;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use function RectorPrefix20211103\Symfony\Component\DependencyInjection\Loader\Configurator\service;
use RectorPrefix20211103\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
use RectorPrefix20211103\Symplify\PackageBuilder\Console\Command\CommandNaming;
use RectorPrefix20211103\Symplify\PackageBuilder\Console\Style\SymfonyStyleFactory;
use RectorPrefix20211103\Symplify\PackageBuilder\Parameter\ParameterProvider;
use RectorPrefix20211103\Symplify\PackageBuilder\Php\TypeChecker;
use RectorPrefix20211103\Symplify\PackageBuilder\Reflection\PrivatesAccessor;
use RectorPrefix20211103\Symplify\PackageBuilder\Reflection\PrivatesCaller;
use RectorPrefix20211103\Symplify\PackageBuilder\Strings\StringFormatConverter;
use RectorPrefix20211103\Symplify\SmartFileSystem\FileSystemFilter;
use RectorPrefix20211103\Symplify\SmartFileSystem\FileSystemGuard;
use RectorPrefix20211103\Symplify\SmartFileSystem\Finder\FinderSanitizer;
use RectorPrefix20211103\Symplify\SmartFileSystem\Json\JsonFileSystem;
use RectorPrefix20211103\Symplify\SmartFileSystem\SmartFileSystem;
use function RectorPrefix20211104\Symfony\Component\DependencyInjection\Loader\Configurator\service;
use RectorPrefix20211104\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
use RectorPrefix20211104\Symplify\PackageBuilder\Console\Command\CommandNaming;
use RectorPrefix20211104\Symplify\PackageBuilder\Console\Style\SymfonyStyleFactory;
use RectorPrefix20211104\Symplify\PackageBuilder\Parameter\ParameterProvider;
use RectorPrefix20211104\Symplify\PackageBuilder\Php\TypeChecker;
use RectorPrefix20211104\Symplify\PackageBuilder\Reflection\PrivatesAccessor;
use RectorPrefix20211104\Symplify\PackageBuilder\Reflection\PrivatesCaller;
use RectorPrefix20211104\Symplify\PackageBuilder\Strings\StringFormatConverter;
use RectorPrefix20211104\Symplify\SmartFileSystem\FileSystemFilter;
use RectorPrefix20211104\Symplify\SmartFileSystem\FileSystemGuard;
use RectorPrefix20211104\Symplify\SmartFileSystem\Finder\FinderSanitizer;
use RectorPrefix20211104\Symplify\SmartFileSystem\Json\JsonFileSystem;
use RectorPrefix20211104\Symplify\SmartFileSystem\SmartFileSystem;
return static function (\Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator $containerConfigurator) : void {
$services = $containerConfigurator->services();
$services->defaults()->public()->autowire()->autoconfigure();
$services->load('Rector\\Core\\', __DIR__ . '/../src')->exclude([__DIR__ . '/../src/Rector', __DIR__ . '/../src/Exception', __DIR__ . '/../src/DependencyInjection/CompilerPass', __DIR__ . '/../src/DependencyInjection/Loader', __DIR__ . '/../src/Kernel', __DIR__ . '/../src/ValueObject', __DIR__ . '/../src/Bootstrap', __DIR__ . '/../src/Enum', __DIR__ . '/../src/PhpParser/Node/CustomNode', __DIR__ . '/../src/PhpParser/ValueObject', __DIR__ . '/../src/functions', __DIR__ . '/../src/constants.php', __DIR__ . '/../src/PhpParser/NodeVisitor/CreatedByRuleNodeVisitor.php']);
$services->alias(\RectorPrefix20211103\Symfony\Component\Console\Application::class, \Rector\Core\Console\ConsoleApplication::class);
$services->set(\RectorPrefix20211103\Symplify\SmartFileSystem\FileSystemGuard::class);
$services->set(\RectorPrefix20211103\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser::class);
$services->alias(\RectorPrefix20211104\Symfony\Component\Console\Application::class, \Rector\Core\Console\ConsoleApplication::class);
$services->set(\RectorPrefix20211104\Symplify\SmartFileSystem\FileSystemGuard::class);
$services->set(\RectorPrefix20211104\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser::class);
$services->set(\PhpParser\ParserFactory::class);
$services->set(\PhpParser\BuilderFactory::class);
$services->set(\PhpParser\NodeVisitor\CloningVisitor::class);
$services->set(\PhpParser\NodeFinder::class);
$services->set(\PHPStan\Parser\Parser::class)->factory([\RectorPrefix20211103\Symfony\Component\DependencyInjection\Loader\Configurator\service(\Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory::class), 'createPHPStanParser']);
$services->set(\PhpParser\Lexer::class)->factory([\RectorPrefix20211103\Symfony\Component\DependencyInjection\Loader\Configurator\service(\Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory::class), 'createEmulativeLexer']);
$services->set(\PHPStan\Parser\Parser::class)->factory([\RectorPrefix20211104\Symfony\Component\DependencyInjection\Loader\Configurator\service(\Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory::class), 'createPHPStanParser']);
$services->set(\PhpParser\Lexer::class)->factory([\RectorPrefix20211104\Symfony\Component\DependencyInjection\Loader\Configurator\service(\Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory::class), 'createEmulativeLexer']);
// symplify/package-builder
$services->set(\RectorPrefix20211103\Symplify\PackageBuilder\Reflection\PrivatesAccessor::class);
$services->set(\RectorPrefix20211103\Symplify\PackageBuilder\Reflection\PrivatesCaller::class);
$services->set(\RectorPrefix20211103\Symplify\SmartFileSystem\Finder\FinderSanitizer::class);
$services->set(\RectorPrefix20211103\Symplify\SmartFileSystem\FileSystemFilter::class);
$services->set(\RectorPrefix20211103\Symplify\PackageBuilder\Parameter\ParameterProvider::class)->arg('$container', \RectorPrefix20211103\Symfony\Component\DependencyInjection\Loader\Configurator\service('service_container'));
$services->set(\RectorPrefix20211103\Symplify\PackageBuilder\Console\Command\CommandNaming::class);
$services->set(\RectorPrefix20211103\Symplify\SmartFileSystem\SmartFileSystem::class);
$services->set(\RectorPrefix20211103\Symplify\PackageBuilder\Strings\StringFormatConverter::class);
$services->set(\RectorPrefix20211103\Symplify\PackageBuilder\Console\Style\SymfonyStyleFactory::class);
$services->set(\RectorPrefix20211103\Symfony\Component\Console\Style\SymfonyStyle::class)->factory([\RectorPrefix20211103\Symfony\Component\DependencyInjection\Loader\Configurator\service(\RectorPrefix20211103\Symplify\PackageBuilder\Console\Style\SymfonyStyleFactory::class), 'create']);
$services->set(\RectorPrefix20211103\Symplify\SmartFileSystem\Json\JsonFileSystem::class);
$services->set(\RectorPrefix20211104\Symplify\PackageBuilder\Reflection\PrivatesAccessor::class);
$services->set(\RectorPrefix20211104\Symplify\PackageBuilder\Reflection\PrivatesCaller::class);
$services->set(\RectorPrefix20211104\Symplify\SmartFileSystem\Finder\FinderSanitizer::class);
$services->set(\RectorPrefix20211104\Symplify\SmartFileSystem\FileSystemFilter::class);
$services->set(\RectorPrefix20211104\Symplify\PackageBuilder\Parameter\ParameterProvider::class)->arg('$container', \RectorPrefix20211104\Symfony\Component\DependencyInjection\Loader\Configurator\service('service_container'));
$services->set(\RectorPrefix20211104\Symplify\PackageBuilder\Console\Command\CommandNaming::class);
$services->set(\RectorPrefix20211104\Symplify\SmartFileSystem\SmartFileSystem::class);
$services->set(\RectorPrefix20211104\Symplify\PackageBuilder\Strings\StringFormatConverter::class);
$services->set(\RectorPrefix20211104\Symplify\PackageBuilder\Console\Style\SymfonyStyleFactory::class);
$services->set(\RectorPrefix20211104\Symfony\Component\Console\Style\SymfonyStyle::class)->factory([\RectorPrefix20211104\Symfony\Component\DependencyInjection\Loader\Configurator\service(\RectorPrefix20211104\Symplify\PackageBuilder\Console\Style\SymfonyStyleFactory::class), 'create']);
$services->set(\RectorPrefix20211104\Symplify\SmartFileSystem\Json\JsonFileSystem::class);
$services->set(\PhpParser\NodeVisitor\NodeConnectingVisitor::class);
$services->set(\RectorPrefix20211103\Doctrine\Inflector\Rules\English\InflectorFactory::class);
$services->set(\RectorPrefix20211103\Doctrine\Inflector\Inflector::class)->factory([\RectorPrefix20211103\Symfony\Component\DependencyInjection\Loader\Configurator\service(\RectorPrefix20211103\Doctrine\Inflector\Rules\English\InflectorFactory::class), 'build']);
$services->set(\RectorPrefix20211103\Composer\Semver\VersionParser::class);
$services->set(\RectorPrefix20211103\Symplify\PackageBuilder\Php\TypeChecker::class);
$services->set(\RectorPrefix20211104\Doctrine\Inflector\Rules\English\InflectorFactory::class);
$services->set(\RectorPrefix20211104\Doctrine\Inflector\Inflector::class)->factory([\RectorPrefix20211104\Symfony\Component\DependencyInjection\Loader\Configurator\service(\RectorPrefix20211104\Doctrine\Inflector\Rules\English\InflectorFactory::class), 'build']);
$services->set(\RectorPrefix20211104\Composer\Semver\VersionParser::class);
$services->set(\RectorPrefix20211104\Symplify\PackageBuilder\Php\TypeChecker::class);
// phpdoc parser
$services->set(\PHPStan\PhpDocParser\Lexer\Lexer::class);
$services->alias(\PHPStan\PhpDocParser\Parser\PhpDocParser::class, \Rector\BetterPhpDocParser\PhpDocParser\BetterPhpDocParser::class);
// cache
$services->set(\PHPStan\Dependency\DependencyResolver::class)->factory([\RectorPrefix20211103\Symfony\Component\DependencyInjection\Loader\Configurator\service(\Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory::class), 'createDependencyResolver']);
$services->set(\PHPStan\File\FileHelper::class)->factory([\RectorPrefix20211103\Symfony\Component\DependencyInjection\Loader\Configurator\service(\Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory::class), 'createFileHelper']);
$services->set(\Rector\Caching\Cache::class)->factory([\RectorPrefix20211103\Symfony\Component\DependencyInjection\Loader\Configurator\service(\Rector\Caching\CacheFactory::class), 'create']);
$services->set(\PHPStan\Dependency\DependencyResolver::class)->factory([\RectorPrefix20211104\Symfony\Component\DependencyInjection\Loader\Configurator\service(\Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory::class), 'createDependencyResolver']);
$services->set(\PHPStan\File\FileHelper::class)->factory([\RectorPrefix20211104\Symfony\Component\DependencyInjection\Loader\Configurator\service(\Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory::class), 'createFileHelper']);
$services->set(\Rector\Caching\Cache::class)->factory([\RectorPrefix20211104\Symfony\Component\DependencyInjection\Loader\Configurator\service(\Rector\Caching\CacheFactory::class), 'create']);
// type resolving
$services->set(\Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocator\IntermediateSourceLocator::class);
$services->alias(\PHPStan\PhpDocParser\Parser\TypeParser::class, \Rector\BetterPhpDocParser\PhpDocParser\BetterTypeParser::class);
// PHPStan services
$services->set(\PHPStan\Reflection\ReflectionProvider::class)->factory([\RectorPrefix20211103\Symfony\Component\DependencyInjection\Loader\Configurator\service(\Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory::class), 'createReflectionProvider']);
$services->set(\PHPStan\Analyser\NodeScopeResolver::class)->factory([\RectorPrefix20211103\Symfony\Component\DependencyInjection\Loader\Configurator\service(\Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory::class), 'createNodeScopeResolver']);
$services->set(\PHPStan\Analyser\ScopeFactory::class)->factory([\RectorPrefix20211103\Symfony\Component\DependencyInjection\Loader\Configurator\service(\Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory::class), 'createScopeFactory']);
$services->set(\PHPStan\PhpDoc\TypeNodeResolver::class)->factory([\RectorPrefix20211103\Symfony\Component\DependencyInjection\Loader\Configurator\service(\Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory::class), 'createTypeNodeResolver']);
$services->set(\Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocatorProvider\DynamicSourceLocatorProvider::class)->factory([\RectorPrefix20211103\Symfony\Component\DependencyInjection\Loader\Configurator\service(\Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory::class), 'createDynamicSourceLocatorProvider']);
$services->set(\RectorPrefix20211103\Ergebnis\Json\Printer\Printer::class);
$services->alias(\RectorPrefix20211103\Ergebnis\Json\Printer\PrinterInterface::class, \RectorPrefix20211103\Ergebnis\Json\Printer\Printer::class);
$services->set(\RectorPrefix20211103\Idiosyncratic\EditorConfig\EditorConfig::class);
$services->set(\PHPStan\Reflection\ReflectionProvider::class)->factory([\RectorPrefix20211104\Symfony\Component\DependencyInjection\Loader\Configurator\service(\Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory::class), 'createReflectionProvider']);
$services->set(\PHPStan\Analyser\NodeScopeResolver::class)->factory([\RectorPrefix20211104\Symfony\Component\DependencyInjection\Loader\Configurator\service(\Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory::class), 'createNodeScopeResolver']);
$services->set(\PHPStan\Analyser\ScopeFactory::class)->factory([\RectorPrefix20211104\Symfony\Component\DependencyInjection\Loader\Configurator\service(\Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory::class), 'createScopeFactory']);
$services->set(\PHPStan\PhpDoc\TypeNodeResolver::class)->factory([\RectorPrefix20211104\Symfony\Component\DependencyInjection\Loader\Configurator\service(\Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory::class), 'createTypeNodeResolver']);
$services->set(\Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocatorProvider\DynamicSourceLocatorProvider::class)->factory([\RectorPrefix20211104\Symfony\Component\DependencyInjection\Loader\Configurator\service(\Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory::class), 'createDynamicSourceLocatorProvider']);
$services->set(\RectorPrefix20211104\Ergebnis\Json\Printer\Printer::class);
$services->alias(\RectorPrefix20211104\Ergebnis\Json\Printer\PrinterInterface::class, \RectorPrefix20211104\Ergebnis\Json\Printer\Printer::class);
$services->set(\RectorPrefix20211104\Idiosyncratic\EditorConfig\EditorConfig::class);
};

2
config/set/action-injection-to-constructor-injection.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\DependencyInjection\Rector\Class_\ActionInjectionToConstructorInjectionRector;
use Rector\DependencyInjection\Rector\Variable\ReplaceVariableByPropertyFetchRector;

2
config/set/carbon-2.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Carbon\Rector\MethodCall\ChangeCarbonSingularMethodCallToPluralRector;
use Rector\Carbon\Rector\MethodCall\ChangeDiffForHumansArgsRector;

2
config/set/code-quality-strict.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector;
use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;

2
config/set/code-quality.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\CodeQuality\Rector\Array_\ArrayThisCallToThisMethodCallRector;
use Rector\CodeQuality\Rector\Array_\CallableThisArrayToAnonymousFunctionRector;

2
config/set/coding-style-advanced.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\CodingStyle\Rector\MethodCall\UseMessageVariableForSprintfInSymfonyStyleRector;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;

2
config/set/coding-style.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\CodingStyle\Rector\Assign\ManualJsonStringToJsonEncodeArrayRector;
use Rector\CodingStyle\Rector\Assign\PHPStormVarAnnotationRector;

2
config/set/dead-code.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\CodeQuality\Rector\Return_\SimplifyUselessVariableRector;
use Rector\DeadCode\Rector\Array_\RemoveDuplicatedArrayKeyRector;

2
config/set/defluent.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
// @see https://ocramius.github.io/blog/fluent-interfaces-are-evil/

2
config/set/downgrade-php53.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Core\Configuration\Option;
use Rector\Core\ValueObject\PhpVersion;

2
config/set/downgrade-php54.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Core\Configuration\Option;
use Rector\Core\ValueObject\PhpVersion;

2
config/set/downgrade-php70.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Core\Configuration\Option;
use Rector\Core\ValueObject\PhpVersion;

2
config/set/downgrade-php71.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Core\Configuration\Option;
use Rector\Core\ValueObject\PhpVersion;

2
config/set/downgrade-php72.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Core\Configuration\Option;
use Rector\Core\ValueObject\PhpVersion;

2
config/set/downgrade-php73.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Core\Configuration\Option;
use Rector\Core\ValueObject\PhpVersion;

2
config/set/downgrade-php74.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Core\Configuration\Option;
use Rector\Core\ValueObject\PhpVersion;

2
config/set/downgrade-php80.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Core\Configuration\Option;
use Rector\Core\ValueObject\PhpVersion;

2
config/set/downgrade-php81.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Core\Configuration\Option;
use Rector\Core\ValueObject\PhpVersion;

2
config/set/early-return.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector;
use Rector\EarlyReturn\Rector\Foreach_\ReturnAfterToEarlyOnBreakRector;

2
config/set/flysystem-20.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
use Rector\Renaming\ValueObject\MethodCallRename;

2
config/set/framework-extra-bundle-40.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Symfony\Rector\ClassMethod\RemoveServiceFromSensioRouteRector;
use Rector\Symfony\Rector\ClassMethod\ReplaceSensioRouteAnnotationWithSymfonyRector;

2
config/set/framework-extra-bundle-50.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Symfony\Rector\ClassMethod\TemplateAnnotationToThisRenderRector;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;

2
config/set/gmagick_to_imagick.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
use Rector\Renaming\Rector\Name\RenameClassRector;

2
config/set/guzzle50.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
use Rector\Renaming\ValueObject\MethodCallRename;

2
config/set/league-event-30.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use PHPStan\Type\ObjectWithoutClassType;
use PHPStan\Type\StringType;

2
config/set/level/down-to-php56.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Set\ValueObject\DowngradeLevelSetList;
use Rector\Set\ValueObject\DowngradeSetList;

2
config/set/level/down-to-php70.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Set\ValueObject\DowngradeLevelSetList;
use Rector\Set\ValueObject\DowngradeSetList;

2
config/set/level/down-to-php71.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Set\ValueObject\DowngradeLevelSetList;
use Rector\Set\ValueObject\DowngradeSetList;

2
config/set/level/down-to-php72.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Set\ValueObject\DowngradeLevelSetList;
use Rector\Set\ValueObject\DowngradeSetList;

2
config/set/level/down-to-php73.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Set\ValueObject\DowngradeLevelSetList;
use Rector\Set\ValueObject\DowngradeSetList;

2
config/set/level/down-to-php74.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Set\ValueObject\DowngradeLevelSetList;
use Rector\Set\ValueObject\DowngradeSetList;

2
config/set/level/down-to-php80.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Set\ValueObject\DowngradeSetList;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;

2
config/set/level/up-to-php54.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Core\Configuration\Option;
use Rector\Core\ValueObject\PhpVersion;

2
config/set/level/up-to-php55.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Core\Configuration\Option;
use Rector\Core\ValueObject\PhpVersion;

2
config/set/level/up-to-php56.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Core\Configuration\Option;
use Rector\Core\ValueObject\PhpVersion;

2
config/set/level/up-to-php70.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Core\Configuration\Option;
use Rector\Core\ValueObject\PhpVersion;

2
config/set/level/up-to-php71.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Core\Configuration\Option;
use Rector\Core\ValueObject\PhpVersion;

2
config/set/level/up-to-php72.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Core\Configuration\Option;
use Rector\Core\ValueObject\PhpVersion;

2
config/set/level/up-to-php73.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Core\Configuration\Option;
use Rector\Core\ValueObject\PhpVersion;

2
config/set/level/up-to-php74.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Core\Configuration\Option;
use Rector\Core\ValueObject\PhpVersion;

2
config/set/level/up-to-php80.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Core\Configuration\Option;
use Rector\Core\ValueObject\PhpVersion;

2
config/set/level/up-to-php81.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Core\Configuration\Option;
use Rector\Core\ValueObject\PhpVersion;

2
config/set/monolog20.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
use Rector\Renaming\ValueObject\MethodCallRename;

2
config/set/mysql-to-mysqli.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Arguments\Rector\FuncCall\SwapFuncCallArgumentsRector;
use Rector\Arguments\ValueObject\SwapFuncCallArguments;

2
config/set/naming.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Naming\Rector\Assign\RenameVariableToMatchMethodCallReturnTypeRector;
use Rector\Naming\Rector\Class_\RenamePropertyToMatchTypeRector;

2
config/set/order.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Order\Rector\Class_\OrderPrivateMethodsByUseRector;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;

2
config/set/phalcon40.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Renaming\Rector\ConstFetch\RenameConstantRector;
use Rector\Renaming\Rector\MethodCall\RenameMethodRector;

2
config/set/php52.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Php52\Rector\Property\VarToPublicPropertyRector;
use Rector\Php52\Rector\Switch_\ContinueToBreakInSwitchRector;

2
config/set/php53.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Php53\Rector\FuncCall\DirNameFileConstantToDirConstantRector;
use Rector\Php53\Rector\Ternary\TernaryToElvisRector;

2
config/set/php54.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Php54\Rector\Break_\RemoveZeroBreakContinueRector;
use Rector\Php54\Rector\FuncCall\RemoveReferenceFromCallRector;

2
config/set/php55.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Php55\Rector\Class_\ClassConstantToSelfClassRector;
use Rector\Php55\Rector\FuncCall\PregReplaceEModifierRector;

2
config/set/php56.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Php56\Rector\FuncCall\PowToExpRector;
use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector;

2
config/set/php70.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Php70\Rector\Assign\ListSplitStringRector;
use Rector\Php70\Rector\Assign\ListSwapArrayOrderRector;

2
config/set/php71.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Php71\Rector\Assign\AssignArrayToStringRector;
use Rector\Php71\Rector\BinaryOp\BinaryOpBetweenNumberAndStringRector;

2
config/set/php72.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Php72\Rector\Assign\ListEachRector;
use Rector\Php72\Rector\Assign\ReplaceEachAssignmentWithKeyCurrentRector;

2
config/set/php73.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Php52\Rector\Switch_\ContinueToBreakInSwitchRector;
use Rector\Php73\Rector\BooleanOr\IsCountableRector;

2
config/set/php74.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Php74\Rector\ArrayDimFetch\CurlyToSquareBracketArrayStringRector;
use Rector\Php74\Rector\Assign\NullCoalescingOperatorRector;

2
config/set/php80.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Arguments\Rector\ClassMethod\ArgumentAdderRector;
use Rector\Arguments\Rector\FuncCall\FunctionArgumentDefaultValueReplacerRector;

2
config/set/php81.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Php81\Rector\Class_\MyCLabsClassToEnumRector;
use Rector\Php81\Rector\Class_\SpatieEnumClassToEnumRector;

2
config/set/phpspec-to-phpunit.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\PhpSpecToPHPUnit\Rector\Class_\AddMockPropertiesRector;
use Rector\PhpSpecToPHPUnit\Rector\Class_\PhpSpecClassToPHPUnitClassRector;

2
config/set/phpspec30.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
use Rector\Renaming\Rector\Name\RenameClassRector;

2
config/set/phpspec40.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use PHPStan\Type\ArrayType;
use PHPStan\Type\MixedType;

2
config/set/privatization.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Privatization\Rector\Class_\ChangeLocalPropertyToVariableRector;
use Rector\Privatization\Rector\Class_\ChangeReadOnlyVariableWithDefaultValueToConstantRector;

2
config/set/psr-4.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\PSR4\Rector\FileWithoutNamespace\NormalizeNamespaceByPSR4ComposerAutoloadRector;
use Rector\PSR4\Rector\Namespace_\MultipleClassFileToPsr4ClassesRector;

2
config/set/safe07.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\Renaming\Rector\FuncCall\RenameFunctionRector;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;

2
config/set/type-declaration-strict.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector;

2
config/set/type-declaration.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\TypeDeclaration\Rector\ClassMethod\AddArrayParamDocTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\AddArrayReturnDocTypeRector;

2
config/set/unwrap-compat.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace RectorPrefix20211103;
namespace RectorPrefix20211104;
use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfFunctionExistsRector;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;

4
e2e/define-constant/composer.json Normal file
View File

@ -0,0 +1,4 @@
{
"autoload": {
}
}

11
e2e/define-constant/rector.php Normal file
View File

@ -0,0 +1,11 @@
<?php
declare(strict_types=1);
use Rector\Core\Configuration\Option;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
return static function (ContainerConfigurator $containerConfigurator): void {
$parameters = $containerConfigurator->parameters();
$parameters->set(Option::PATHS, [__DIR__ . '/src']);
};

5
e2e/define-constant/src/DefineConstant.php Normal file
View File

@ -0,0 +1,5 @@
<?php
if (! defined('APPPATH')) {
define('APPPATH', realpath(rtrim($paths->appDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
}

4
packages/BetterPhpDocParser/Comment/CommentsMerger.php
View File

@ -6,14 +6,14 @@ namespace Rector\BetterPhpDocParser\Comment;
use PhpParser\Comment;
use PhpParser\Node;
use Rector\NodeTypeResolver\Node\AttributeKey;
use RectorPrefix20211103\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
use RectorPrefix20211104\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
final class CommentsMerger
{
/**
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
*/
private $simpleCallableNodeTraverser;
public function __construct(\RectorPrefix20211103\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser $simpleCallableNodeTraverser)
public function __construct(\RectorPrefix20211104\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser $simpleCallableNodeTraverser)
{
$this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser;
}

4
packages/BetterPhpDocParser/Contract/BasePhpDocNodeVisitorInterface.php
View File

@ -3,7 +3,7 @@
declare (strict_types=1);
namespace Rector\BetterPhpDocParser\Contract;
use RectorPrefix20211103\Symplify\SimplePhpDocParser\Contract\PhpDocNodeVisitorInterface;
interface BasePhpDocNodeVisitorInterface extends \RectorPrefix20211103\Symplify\SimplePhpDocParser\Contract\PhpDocNodeVisitorInterface
use RectorPrefix20211104\Symplify\SimplePhpDocParser\Contract\PhpDocNodeVisitorInterface;
interface BasePhpDocNodeVisitorInterface extends \RectorPrefix20211104\Symplify\SimplePhpDocParser\Contract\PhpDocNodeVisitorInterface
{
}

10
packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php
View File

@ -28,7 +28,7 @@ use Rector\ChangesReporting\Collector\RectorChangeCollector;
use Rector\Core\Configuration\CurrentNodeProvider;
use Rector\Core\Exception\NotImplementedYetException;
use Rector\StaticTypeMapper\StaticTypeMapper;
use RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeTraverser;
use RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeTraverser;
/**
* @template TNode as \PHPStan\PhpDocParser\Ast\Node
* @see \Rector\Tests\BetterPhpDocParser\PhpDocInfo\PhpDocInfo\PhpDocInfoTest
@ -274,20 +274,20 @@ final class PhpDocInfo
*/
public function removeByType(string $typeToRemove) : void
{
$phpDocNodeTraverser = new \RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeTraverser();
$phpDocNodeTraverser = new \RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeTraverser();
$phpDocNodeTraverser->traverseWithCallable($this->phpDocNode, '', function (\PHPStan\PhpDocParser\Ast\Node $node) use($typeToRemove) : ?int {
if ($node instanceof \PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode && \is_a($node->value, $typeToRemove, \true)) {
if ($typeToRemove === \PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode::class && $node->name !== '@var') {
return null;
}
$this->markAsChanged();
return \RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeTraverser::NODE_REMOVE;
return \RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeTraverser::NODE_REMOVE;
}
if (!\is_a($node, $typeToRemove, \true)) {
return null;
}
$this->markAsChanged();
return \RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeTraverser::NODE_REMOVE;
return \RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeTraverser::NODE_REMOVE;
});
}
/**
@ -395,7 +395,7 @@ final class PhpDocInfo
return \true;
}
// has a single node with missing start_end
$phpDocNodeTraverser = new \RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeTraverser();
$phpDocNodeTraverser = new \RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeTraverser();
$changedPhpDocNodeVisitor = new \Rector\BetterPhpDocParser\PhpDocNodeVisitor\ChangedPhpDocNodeVisitor();
$phpDocNodeTraverser->addPhpDocNodeVisitor($changedPhpDocNodeVisitor);
$phpDocNodeTraverser->traverse($this->phpDocNode);

4
packages/BetterPhpDocParser/PhpDocInfo/TokenIteratorFactory.php
View File

@ -6,7 +6,7 @@ namespace Rector\BetterPhpDocParser\PhpDocInfo;
use PHPStan\PhpDocParser\Lexer\Lexer;
use PHPStan\PhpDocParser\Parser\TokenIterator;
use Rector\BetterPhpDocParser\ValueObject\Parser\BetterTokenIterator;
use RectorPrefix20211103\Symplify\PackageBuilder\Reflection\PrivatesAccessor;
use RectorPrefix20211104\Symplify\PackageBuilder\Reflection\PrivatesAccessor;
final class TokenIteratorFactory
{
/**
@ -21,7 +21,7 @@ final class TokenIteratorFactory
* @var \Symplify\PackageBuilder\Reflection\PrivatesAccessor
*/
private $privatesAccessor;
public function __construct(\PHPStan\PhpDocParser\Lexer\Lexer $lexer, \RectorPrefix20211103\Symplify\PackageBuilder\Reflection\PrivatesAccessor $privatesAccessor)
public function __construct(\PHPStan\PhpDocParser\Lexer\Lexer $lexer, \RectorPrefix20211104\Symplify\PackageBuilder\Reflection\PrivatesAccessor $privatesAccessor)
{
$this->lexer = $lexer;
$this->privatesAccessor = $privatesAccessor;

4
packages/BetterPhpDocParser/PhpDocManipulator/PhpDocClassRenamer.php
View File

@ -3,7 +3,7 @@
declare (strict_types=1);
namespace Rector\BetterPhpDocParser\PhpDocManipulator;
use RectorPrefix20211103\Nette\Utils\Strings;
use RectorPrefix20211104\Nette\Utils\Strings;
use PhpParser\Node;
use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
@ -81,7 +81,7 @@ final class PhpDocClassRenamer
$doctrineAnnotationTagValueNode->changeSilentValue($newClass);
continue;
}
$newContent = \RectorPrefix20211103\Nette\Utils\Strings::replace($className, '#\\b' . \preg_quote($oldClass, '#') . '\\b#', $newClass);
$newContent = \RectorPrefix20211104\Nette\Utils\Strings::replace($className, '#\\b' . \preg_quote($oldClass, '#') . '\\b#', $newClass);
if ($newContent === $className) {
continue;
}

8
packages/BetterPhpDocParser/PhpDocManipulator/PhpDocTagRemover.php
View File

@ -7,7 +7,7 @@ use PHPStan\PhpDocParser\Ast\Node;
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
use RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeTraverser;
use RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeTraverser;
final class PhpDocTagRemover
{
public function removeByName(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo $phpDocInfo, string $name) : void
@ -33,17 +33,17 @@ final class PhpDocTagRemover
public function removeTagValueFromNode(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo $phpDocInfo, \PHPStan\PhpDocParser\Ast\Node $desiredNode) : void
{
$phpDocNode = $phpDocInfo->getPhpDocNode();
$phpDocNodeTraverser = new \RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeTraverser();
$phpDocNodeTraverser = new \RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeTraverser();
$phpDocNodeTraverser->traverseWithCallable($phpDocNode, '', function ($node) use($desiredNode, $phpDocInfo) : ?int {
if ($node instanceof \PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode && $node->value === $desiredNode) {
$phpDocInfo->markAsChanged();
return \RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeTraverser::NODE_REMOVE;
return \RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeTraverser::NODE_REMOVE;
}
if ($node !== $desiredNode) {
return null;
}
$phpDocInfo->markAsChanged();
return \RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeTraverser::NODE_REMOVE;
return \RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeTraverser::NODE_REMOVE;
});
}
private function areAnnotationNamesEqual(string $firstAnnotationName, string $secondAnnotationName) : bool

4
packages/BetterPhpDocParser/PhpDocNodeFinder/PhpDocNodeByTypeFinder.php
View File

@ -5,7 +5,7 @@ namespace Rector\BetterPhpDocParser\PhpDocNodeFinder;
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode;
use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode;
use RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeTraverser;
use RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeTraverser;
/**
* @template TNode as \PHPStan\PhpDocParser\Ast\Node
*/
@ -17,7 +17,7 @@ final class PhpDocNodeByTypeFinder
*/
public function findByType(\PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode $phpDocNode, string $desiredType) : array
{
$phpDocNodeTraverser = new \RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeTraverser();
$phpDocNodeTraverser = new \RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeTraverser();
$foundNodes = [];
$phpDocNodeTraverser->traverseWithCallable($phpDocNode, '', function ($node) use(&$foundNodes, $desiredType) {
if (!\is_a($node, $desiredType, \true)) {

14
packages/BetterPhpDocParser/PhpDocNodeMapper.php
View File

@ -7,9 +7,9 @@ use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode;
use Rector\BetterPhpDocParser\Contract\BasePhpDocNodeVisitorInterface;
use Rector\BetterPhpDocParser\DataProvider\CurrentTokenIteratorProvider;
use Rector\BetterPhpDocParser\ValueObject\Parser\BetterTokenIterator;
use RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeTraverser;
use RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\CloningPhpDocNodeVisitor;
use RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\ParentConnectingPhpDocNodeVisitor;
use RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeTraverser;
use RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\CloningPhpDocNodeVisitor;
use RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\ParentConnectingPhpDocNodeVisitor;
/**
* @see \Rector\Tests\BetterPhpDocParser\PhpDocNodeMapperTest
*/
@ -34,7 +34,7 @@ final class PhpDocNodeMapper
/**
* @param BasePhpDocNodeVisitorInterface[] $phpDocNodeVisitors
*/
public function __construct(\Rector\BetterPhpDocParser\DataProvider\CurrentTokenIteratorProvider $currentTokenIteratorProvider, \RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\ParentConnectingPhpDocNodeVisitor $parentConnectingPhpDocNodeVisitor, \RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\CloningPhpDocNodeVisitor $cloningPhpDocNodeVisitor, array $phpDocNodeVisitors)
public function __construct(\Rector\BetterPhpDocParser\DataProvider\CurrentTokenIteratorProvider $currentTokenIteratorProvider, \RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\ParentConnectingPhpDocNodeVisitor $parentConnectingPhpDocNodeVisitor, \RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\CloningPhpDocNodeVisitor $cloningPhpDocNodeVisitor, array $phpDocNodeVisitors)
{
$this->currentTokenIteratorProvider = $currentTokenIteratorProvider;
$this->parentConnectingPhpDocNodeVisitor = $parentConnectingPhpDocNodeVisitor;
@ -44,13 +44,13 @@ final class PhpDocNodeMapper
public function transform(\PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode $phpDocNode, \Rector\BetterPhpDocParser\ValueObject\Parser\BetterTokenIterator $betterTokenIterator) : void
{
$this->currentTokenIteratorProvider->setBetterTokenIterator($betterTokenIterator);
$parentPhpDocNodeTraverser = new \RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeTraverser();
$parentPhpDocNodeTraverser = new \RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeTraverser();
$parentPhpDocNodeTraverser->addPhpDocNodeVisitor($this->parentConnectingPhpDocNodeVisitor);
$parentPhpDocNodeTraverser->traverse($phpDocNode);
$cloningPhpDocNodeTraverser = new \RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeTraverser();
$cloningPhpDocNodeTraverser = new \RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeTraverser();
$cloningPhpDocNodeTraverser->addPhpDocNodeVisitor($this->cloningPhpDocNodeVisitor);
$cloningPhpDocNodeTraverser->traverse($phpDocNode);
$phpDocNodeTraverser = new \RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeTraverser();
$phpDocNodeTraverser = new \RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeTraverser();
foreach ($this->phpDocNodeVisitors as $phpDocNodeVisitor) {
$phpDocNodeTraverser->addPhpDocNodeVisitor($phpDocNodeVisitor);
}

6
packages/BetterPhpDocParser/PhpDocNodeTraverser/ChangedPhpDocNodeTraverserFactory.php
View File

@ -4,7 +4,7 @@ declare (strict_types=1);
namespace Rector\BetterPhpDocParser\PhpDocNodeTraverser;
use Rector\BetterPhpDocParser\PhpDocNodeVisitor\ChangedPhpDocNodeVisitor;
use RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeTraverser;
use RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeTraverser;
final class ChangedPhpDocNodeTraverserFactory
{
/**
@ -15,9 +15,9 @@ final class ChangedPhpDocNodeTraverserFactory
{
$this->changedPhpDocNodeVisitor = $changedPhpDocNodeVisitor;
}
public function create() : \RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeTraverser
public function create() : \RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeTraverser
{
$changedPhpDocNodeTraverser = new \RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeTraverser();
$changedPhpDocNodeTraverser = new \RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeTraverser();
$changedPhpDocNodeTraverser->addPhpDocNodeVisitor($this->changedPhpDocNodeVisitor);
return $changedPhpDocNodeTraverser;
}

4
packages/BetterPhpDocParser/PhpDocNodeVisitor/ArrayTypePhpDocNodeVisitor.php
View File

@ -8,8 +8,8 @@ use PHPStan\PhpDocParser\Ast\Type\ArrayTypeNode;
use Rector\BetterPhpDocParser\Attributes\AttributeMirrorer;
use Rector\BetterPhpDocParser\Contract\BasePhpDocNodeVisitorInterface;
use Rector\BetterPhpDocParser\ValueObject\Type\SpacingAwareArrayTypeNode;
use RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
final class ArrayTypePhpDocNodeVisitor extends \RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor implements \Rector\BetterPhpDocParser\Contract\BasePhpDocNodeVisitorInterface
use RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
final class ArrayTypePhpDocNodeVisitor extends \RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor implements \Rector\BetterPhpDocParser\Contract\BasePhpDocNodeVisitorInterface
{
/**
* @var \Rector\BetterPhpDocParser\Attributes\AttributeMirrorer

4
packages/BetterPhpDocParser/PhpDocNodeVisitor/CallableTypePhpDocNodeVisitor.php
View File

@ -8,8 +8,8 @@ use PHPStan\PhpDocParser\Ast\Type\CallableTypeNode;
use Rector\BetterPhpDocParser\Attributes\AttributeMirrorer;
use Rector\BetterPhpDocParser\Contract\BasePhpDocNodeVisitorInterface;
use Rector\BetterPhpDocParser\ValueObject\Type\SpacingAwareCallableTypeNode;
use RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
final class CallableTypePhpDocNodeVisitor extends \RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor implements \Rector\BetterPhpDocParser\Contract\BasePhpDocNodeVisitorInterface
use RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
final class CallableTypePhpDocNodeVisitor extends \RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor implements \Rector\BetterPhpDocParser\Contract\BasePhpDocNodeVisitorInterface
{
/**
* @var \Rector\BetterPhpDocParser\Attributes\AttributeMirrorer

4
packages/BetterPhpDocParser/PhpDocNodeVisitor/ChangedPhpDocNodeVisitor.php
View File

@ -5,8 +5,8 @@ namespace Rector\BetterPhpDocParser\PhpDocNodeVisitor;
use PHPStan\PhpDocParser\Ast\Node;
use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
use RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
final class ChangedPhpDocNodeVisitor extends \RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor
use RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
final class ChangedPhpDocNodeVisitor extends \RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor
{
/**
* @var bool

4
packages/BetterPhpDocParser/PhpDocNodeVisitor/IntersectionTypeNodePhpDocNodeVisitor.php
View File

@ -8,8 +8,8 @@ use PHPStan\PhpDocParser\Ast\Type\IntersectionTypeNode;
use Rector\BetterPhpDocParser\Attributes\AttributeMirrorer;
use Rector\BetterPhpDocParser\Contract\BasePhpDocNodeVisitorInterface;
use Rector\BetterPhpDocParser\ValueObject\Type\BracketsAwareIntersectionTypeNode;
use RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
final class IntersectionTypeNodePhpDocNodeVisitor extends \RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor implements \Rector\BetterPhpDocParser\Contract\BasePhpDocNodeVisitorInterface
use RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
final class IntersectionTypeNodePhpDocNodeVisitor extends \RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor implements \Rector\BetterPhpDocParser\Contract\BasePhpDocNodeVisitorInterface
{
/**
* @var \Rector\BetterPhpDocParser\Attributes\AttributeMirrorer

4
packages/BetterPhpDocParser/PhpDocNodeVisitor/ParamPhpDocNodeVisitor.php
View File

@ -8,8 +8,8 @@ use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
use Rector\BetterPhpDocParser\Attributes\AttributeMirrorer;
use Rector\BetterPhpDocParser\Contract\BasePhpDocNodeVisitorInterface;
use Rector\BetterPhpDocParser\ValueObject\PhpDoc\VariadicAwareParamTagValueNode;
use RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
final class ParamPhpDocNodeVisitor extends \RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor implements \Rector\BetterPhpDocParser\Contract\BasePhpDocNodeVisitorInterface
use RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
final class ParamPhpDocNodeVisitor extends \RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor implements \Rector\BetterPhpDocParser\Contract\BasePhpDocNodeVisitorInterface
{
/**
* @var \Rector\BetterPhpDocParser\Attributes\AttributeMirrorer

4
packages/BetterPhpDocParser/PhpDocNodeVisitor/TemplatePhpDocNodeVisitor.php
View File

@ -14,8 +14,8 @@ use Rector\BetterPhpDocParser\ValueObject\PhpDoc\SpacingAwareTemplateTagValueNod
use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
use Rector\BetterPhpDocParser\ValueObject\StartAndEnd;
use Rector\Core\Exception\ShouldNotHappenException;
use RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
final class TemplatePhpDocNodeVisitor extends \RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor implements \Rector\BetterPhpDocParser\Contract\BasePhpDocNodeVisitorInterface
use RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
final class TemplatePhpDocNodeVisitor extends \RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor implements \Rector\BetterPhpDocParser\Contract\BasePhpDocNodeVisitorInterface
{
/**
* @var \Rector\BetterPhpDocParser\DataProvider\CurrentTokenIteratorProvider

4
packages/BetterPhpDocParser/PhpDocNodeVisitor/UnionTypeNodePhpDocNodeVisitor.php
View File

@ -13,8 +13,8 @@ use Rector\BetterPhpDocParser\ValueObject\Parser\BetterTokenIterator;
use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
use Rector\BetterPhpDocParser\ValueObject\StartAndEnd;
use Rector\BetterPhpDocParser\ValueObject\Type\BracketsAwareUnionTypeNode;
use RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
final class UnionTypeNodePhpDocNodeVisitor extends \RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor implements \Rector\BetterPhpDocParser\Contract\BasePhpDocNodeVisitorInterface
use RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
final class UnionTypeNodePhpDocNodeVisitor extends \RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor implements \Rector\BetterPhpDocParser\Contract\BasePhpDocNodeVisitorInterface
{
/**
* @var \Rector\BetterPhpDocParser\DataProvider\CurrentTokenIteratorProvider

4
packages/BetterPhpDocParser/PhpDocParser/BetterPhpDocParser.php
View File

@ -18,7 +18,7 @@ use Rector\BetterPhpDocParser\ValueObject\Parser\BetterTokenIterator;
use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
use Rector\BetterPhpDocParser\ValueObject\StartAndEnd;
use Rector\Core\Exception\ShouldNotHappenException;
use RectorPrefix20211103\Symplify\PackageBuilder\Reflection\PrivatesCaller;
use RectorPrefix20211104\Symplify\PackageBuilder\Reflection\PrivatesCaller;
/**
* @see \Rector\Tests\BetterPhpDocParser\PhpDocParser\TagValueNodeReprint\TagValueNodeReprintTest
*/
@ -41,7 +41,7 @@ final class BetterPhpDocParser extends \PHPStan\PhpDocParser\Parser\PhpDocParser
$this->tokenIteratorFactory = $tokenIteratorFactory;
$this->doctrineAnnotationDecorator = $doctrineAnnotationDecorator;
parent::__construct($typeParser, $constExprParser);
$this->privatesCaller = new \RectorPrefix20211103\Symplify\PackageBuilder\Reflection\PrivatesCaller();
$this->privatesCaller = new \RectorPrefix20211104\Symplify\PackageBuilder\Reflection\PrivatesCaller();
}
/**
* @param \PHPStan\PhpDocParser\Parser\TokenIterator $tokenIterator

2
packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser/PlainValueParser.php
View File

@ -17,7 +17,7 @@ use Rector\BetterPhpDocParser\ValueObject\Parser\BetterTokenIterator;
use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
use Rector\Core\Configuration\CurrentNodeProvider;
use Rector\Core\Exception\ShouldNotHappenException;
use RectorPrefix20211103\Symfony\Contracts\Service\Attribute\Required;
use RectorPrefix20211104\Symfony\Contracts\Service\Attribute\Required;
final class PlainValueParser
{
/**

6
packages/BetterPhpDocParser/Printer/DocBlockInliner.php
View File

@ -3,7 +3,7 @@
declare (strict_types=1);
namespace Rector\BetterPhpDocParser\Printer;
use RectorPrefix20211103\Nette\Utils\Strings;
use RectorPrefix20211104\Nette\Utils\Strings;
final class DocBlockInliner
{
/**
@ -18,7 +18,7 @@ final class DocBlockInliner
private const NEWLINE_MIDDLE_DOC_REGEX = "#\n \\* #";
public function inline(string $docContent) : string
{
$docContent = \RectorPrefix20211103\Nette\Utils\Strings::replace($docContent, self::NEWLINE_MIDDLE_DOC_REGEX, ' ');
return \RectorPrefix20211103\Nette\Utils\Strings::replace($docContent, self::NEWLINE_CLOSING_DOC_REGEX, ' */');
$docContent = \RectorPrefix20211104\Nette\Utils\Strings::replace($docContent, self::NEWLINE_MIDDLE_DOC_REGEX, ' ');
return \RectorPrefix20211104\Nette\Utils\Strings::replace($docContent, self::NEWLINE_CLOSING_DOC_REGEX, ' */');
}
}

12
packages/BetterPhpDocParser/Printer/PhpDocInfoPrinter.php
View File

@ -3,7 +3,7 @@
declare (strict_types=1);
namespace Rector\BetterPhpDocParser\Printer;
use RectorPrefix20211103\Nette\Utils\Strings;
use RectorPrefix20211104\Nette\Utils\Strings;
use PhpParser\Node\Stmt\InlineHTML;
use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocChildNode;
@ -21,7 +21,7 @@ use Rector\BetterPhpDocParser\PhpDocNodeVisitor\ChangedPhpDocNodeVisitor;
use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
use Rector\BetterPhpDocParser\ValueObject\StartAndEnd;
use Rector\Core\Exception\ShouldNotHappenException;
use RectorPrefix20211103\Symplify\SimplePhpDocParser\PhpDocNodeTraverser;
use RectorPrefix20211104\Symplify\SimplePhpDocParser\PhpDocNodeTraverser;
/**
* @see \Rector\Tests\BetterPhpDocParser\PhpDocInfo\PhpDocInfoPrinter\PhpDocInfoPrinterTest
*/
@ -140,7 +140,7 @@ final class PhpDocInfoPrinter
$this->currentTokenPosition = 0;
$phpDocString = $this->printPhpDocNode($phpDocNode);
// hotfix of extra space with callable ()
return \RectorPrefix20211103\Nette\Utils\Strings::replace($phpDocString, self::CALLABLE_REGEX, 'callable(');
return \RectorPrefix20211104\Nette\Utils\Strings::replace($phpDocString, self::CALLABLE_REGEX, 'callable(');
}
public function getCurrentPhpDocInfo() : \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo
{
@ -163,11 +163,11 @@ final class PhpDocInfoPrinter
}
$output = $this->printEnd($output);
// fix missing start
if (!\RectorPrefix20211103\Nette\Utils\Strings::match($output, self::DOCBLOCK_START_REGEX) && $output) {
if (!\RectorPrefix20211104\Nette\Utils\Strings::match($output, self::DOCBLOCK_START_REGEX) && $output) {
$output = '/**' . $output;
}
// fix missing end
if (\RectorPrefix20211103\Nette\Utils\Strings::match($output, self::OPENING_DOCBLOCK_REGEX) && $output && !\RectorPrefix20211103\Nette\Utils\Strings::match($output, self::CLOSING_DOCBLOCK_REGEX)) {
if (\RectorPrefix20211104\Nette\Utils\Strings::match($output, self::OPENING_DOCBLOCK_REGEX) && $output && !\RectorPrefix20211104\Nette\Utils\Strings::match($output, self::CLOSING_DOCBLOCK_REGEX)) {
$output .= ' */';
}
return $output;
@ -189,7 +189,7 @@ final class PhpDocInfoPrinter
if ($phpDocChildNode->value instanceof \Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode && $shouldReprintChildNode) {
$printedNode = (string) $phpDocChildNode;
// remove extra space between tags
$printedNode = \RectorPrefix20211103\Nette\Utils\Strings::replace($printedNode, self::TAG_AND_SPACE_REGEX, '$1(');
$printedNode = \RectorPrefix20211104\Nette\Utils\Strings::replace($printedNode, self::TAG_AND_SPACE_REGEX, '$1(');
return self::NEWLINE_WITH_ASTERISK . ($printedNode === '' ? '' : ' ' . $printedNode);
}
}

4
packages/BetterPhpDocParser/ValueObject/Parser/BetterTokenIterator.php
View File

@ -5,7 +5,7 @@ namespace Rector\BetterPhpDocParser\ValueObject\Parser;
use PHPStan\PhpDocParser\Parser\TokenIterator;
use Rector\Core\Exception\ShouldNotHappenException;
use RectorPrefix20211103\Symplify\PackageBuilder\Reflection\PrivatesAccessor;
use RectorPrefix20211104\Symplify\PackageBuilder\Reflection\PrivatesAccessor;
final class BetterTokenIterator extends \PHPStan\PhpDocParser\Parser\TokenIterator
{
/**
@ -25,7 +25,7 @@ final class BetterTokenIterator extends \PHPStan\PhpDocParser\Parser\TokenIterat
*/
public function __construct(array $tokens, int $index = 0)
{
$this->privatesAccessor = new \RectorPrefix20211103\Symplify\PackageBuilder\Reflection\PrivatesAccessor();
$this->privatesAccessor = new \RectorPrefix20211104\Symplify\PackageBuilder\Reflection\PrivatesAccessor();
if ($tokens === []) {
$this->privatesAccessor->setPrivateProperty($this, self::TOKENS, []);
$this->privatesAccessor->setPrivateProperty($this, self::INDEX, 0);

8
packages/BetterPhpDocParser/ValueObject/PhpDoc/DoctrineAnnotation/AbstractValuesAwareNode.php
View File

@ -3,7 +3,7 @@
declare (strict_types=1);
namespace Rector\BetterPhpDocParser\ValueObject\PhpDoc\DoctrineAnnotation;
use RectorPrefix20211103\Nette\Utils\Strings;
use RectorPrefix20211104\Nette\Utils\Strings;
use PHPStan\PhpDocParser\Ast\Node;
use PHPStan\PhpDocParser\Ast\NodeAttributes;
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagValueNode;
@ -84,7 +84,7 @@ abstract class AbstractValuesAwareNode implements \PHPStan\PhpDocParser\Ast\PhpD
{
// is quoted?
if (isset($this->values[$key]) && \is_string($this->values[$key])) {
$isQuoted = (bool) \RectorPrefix20211103\Nette\Utils\Strings::match($this->values[$key], self::UNQUOTED_VALUE_REGEX);
$isQuoted = (bool) \RectorPrefix20211104\Nette\Utils\Strings::match($this->values[$key], self::UNQUOTED_VALUE_REGEX);
if ($isQuoted) {
$value = '"' . $value . '"';
}
@ -111,7 +111,7 @@ abstract class AbstractValuesAwareNode implements \PHPStan\PhpDocParser\Ast\PhpD
public function changeSilentValue($value) : void
{
// is quoted?
$isQuoted = (bool) \RectorPrefix20211103\Nette\Utils\Strings::match($this->values[0], self::UNQUOTED_VALUE_REGEX);
$isQuoted = (bool) \RectorPrefix20211104\Nette\Utils\Strings::match($this->values[0], self::UNQUOTED_VALUE_REGEX);
if ($isQuoted) {
$value = '"' . $value . '"';
}
@ -171,7 +171,7 @@ abstract class AbstractValuesAwareNode implements \PHPStan\PhpDocParser\Ast\PhpD
if (!\is_string($value)) {
return $value;
}
$matches = \RectorPrefix20211103\Nette\Utils\Strings::match($value, self::UNQUOTED_VALUE_REGEX);
$matches = \RectorPrefix20211104\Nette\Utils\Strings::match($value, self::UNQUOTED_VALUE_REGEX);
if ($matches === null) {
return $value;
}

Some files were not shown because too many files have changed in this diff Show More