Updated Rector to commit b4fabbdeba

b4fabbdeba [Downgrade] Drop SAFE_TYPES and SAFE_TYPES_TO_METHODS constants, use UNSAFE_TYPES_TO_METHODS instead (#1449)
This commit is contained in:
Tomas Votruba 2021-12-10 14:05:16 +00:00
parent 7afaca31f5
commit 408e36b706
18 changed files with 51 additions and 96 deletions

View File

@ -4594,8 +4594,7 @@ return static function (ContainerConfigurator $containerConfigurator): void {
$services->set(DowngradeParameterTypeWideningRector::class)
->configure([
DowngradeParameterTypeWideningRector::SAFE_TYPES => [],
DowngradeParameterTypeWideningRector::SAFE_TYPES_TO_METHODS => [],
DowngradeParameterTypeWideningRector::UNSAFE_TYPES_TO_METHODS => [],
]);
};
```

View File

@ -27,28 +27,10 @@ use RectorPrefix20211210\Webmozart\Assert\Assert;
*/
final class DowngradeParameterTypeWideningRector extends \Rector\Core\Rector\AbstractRector implements \Rector\Core\Contract\Rector\ConfigurableRectorInterface
{
/**
* @deprecated Use self::UNSAFE_TYPES_TO_METHODS instead
* @var string
*/
public const SAFE_TYPES = 'safe_types';
/**
* @deprecated Use self::UNSAFE_TYPES_TO_METHODS instead
* @var string
*/
public const SAFE_TYPES_TO_METHODS = 'safe_types_to_methods';
/**
* @var string
*/
public const UNSAFE_TYPES_TO_METHODS = 'unsafe_types_to_methods';
/**
* @var string[]
*/
private $safeTypes = [];
/**
* @var array<string, string[]>
*/
private $safeTypesToMethods = [];
/**
* @var array<string, string[]>
*/
@ -123,7 +105,7 @@ final class SomeClass implements SomeInterface
}
}
CODE_SAMPLE
, [self::SAFE_TYPES => [], self::SAFE_TYPES_TO_METHODS => [], self::UNSAFE_TYPES_TO_METHODS => []])]);
, [self::UNSAFE_TYPES_TO_METHODS => []])]);
}
/**
* @return array<class-string<Node>>
@ -153,17 +135,6 @@ CODE_SAMPLE
*/
public function configure(array $configuration) : void
{
$safeTypes = $configuration[self::SAFE_TYPES] ?? [];
\RectorPrefix20211210\Webmozart\Assert\Assert::isArray($safeTypes);
\RectorPrefix20211210\Webmozart\Assert\Assert::allString($safeTypes);
$this->safeTypes = $safeTypes;
$safeTypesToMethods = $configuration[self::SAFE_TYPES_TO_METHODS] ?? [];
\RectorPrefix20211210\Webmozart\Assert\Assert::isArray($safeTypesToMethods);
foreach ($safeTypesToMethods as $key => $value) {
\RectorPrefix20211210\Webmozart\Assert\Assert::string($key);
\RectorPrefix20211210\Webmozart\Assert\Assert::allString($value);
}
$this->safeTypesToMethods = $safeTypesToMethods;
$unsafeTypesToMethods = $configuration[self::UNSAFE_TYPES_TO_METHODS] ?? [];
\RectorPrefix20211210\Webmozart\Assert\Assert::isArray($unsafeTypesToMethods);
foreach ($unsafeTypesToMethods as $key => $value) {
@ -230,27 +201,6 @@ CODE_SAMPLE
private function isSafeType(\PHPStan\Reflection\ClassReflection $classReflection, \PhpParser\Node\Stmt\ClassMethod $classMethod) : bool
{
$classReflectionName = $classReflection->getName();
foreach ($this->safeTypes as $safeType) {
if ($classReflection->isSubclassOf($safeType)) {
return \true;
}
// skip self too
if ($classReflectionName === $safeType) {
return \true;
}
}
foreach ($this->safeTypesToMethods as $safeType => $safeMethods) {
if (!$this->isNames($classMethod, $safeMethods)) {
continue;
}
if ($classReflection->isSubclassOf($safeType)) {
return \true;
}
// skip self too
if ($classReflectionName === $safeType) {
return \true;
}
}
foreach ($this->unsafeTypesToMethods as $unsafeType => $unsafeMethods) {
if (!$this->isNames($classMethod, $unsafeMethods)) {
continue;

View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '5d45598fbeabaecff18703d6865d5b7f3514608b';
public const PACKAGE_VERSION = 'b4fabbdebade5440ab2cc505426cd1d52cb446fc';
/**
* @var string
*/
public const RELEASE_DATE = '2021-12-10 14:11:45';
public const RELEASE_DATE = '2021-12-10 13:50:46';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20211210\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

View File

@ -31,7 +31,11 @@ final class ConfigurableCallValuesCollectingPhpFileLoader extends \RectorPrefix2
parent::load($resource, $type);
$this->collectConfigureCallsFromJustImportedConfigurableRectorDefinitions();
}
public function import($resource, string $type = null, $ignoreErrors = \false, string $sourceResource = null, $exclude = null) : void
/**
* @param string|null $type
* @param string|null $sourceResource
*/
public function import($resource, $type = null, $ignoreErrors = \false, $sourceResource = null, $exclude = null) : void
{
// this call collects root values
$this->collectConfigureCallsFromJustImportedConfigurableRectorDefinitions();

View File

@ -6,7 +6,7 @@ namespace Rector\Core\DependencyInjection\Loader\Configurator;
use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
use RectorPrefix20211210\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
use RectorPrefix20211210\Symfony\Component\DependencyInjection\Loader\Configurator\ServiceConfigurator;
use Symplify\SymfonyPhpConfig\ValueObjectInliner;
use RectorPrefix20211210\Symplify\SymfonyPhpConfig\ValueObjectInliner;
/**
* @api
* Same as Symfony service configurator, with extra "configure()" method for easier DX
@ -22,7 +22,7 @@ final class RectorServiceConfigurator extends \RectorPrefix20211210\Symfony\Comp
// decorate with value object inliner so Symfony understands, see https://getrector.org/blog/2020/09/07/how-to-inline-value-object-in-symfony-php-config
\array_walk_recursive($configuration, function (&$value) {
if (\is_object($value)) {
$value = \Symplify\SymfonyPhpConfig\ValueObjectInliner::inline($value);
$value = \RectorPrefix20211210\Symplify\SymfonyPhpConfig\ValueObjectInliner::inline($value);
}
return $value;
});

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInitd3a015248a046c6488ba7b9bd0822867::getLoader();
return ComposerAutoloaderInit9376101442cfdedff9d89618d681e8c3::getLoader();

View File

@ -1293,6 +1293,8 @@ return array(
'RectorPrefix20211210\\Symplify\\SmartFileSystem\\Normalizer\\PathNormalizer' => $vendorDir . '/symplify/smart-file-system/src/Normalizer/PathNormalizer.php',
'RectorPrefix20211210\\Symplify\\SmartFileSystem\\SmartFileInfo' => $vendorDir . '/symplify/smart-file-system/src/SmartFileInfo.php',
'RectorPrefix20211210\\Symplify\\SmartFileSystem\\SmartFileSystem' => $vendorDir . '/symplify/smart-file-system/src/SmartFileSystem.php',
'RectorPrefix20211210\\Symplify\\SymfonyPhpConfig\\Reflection\\ArgumentAndParameterFactory' => $vendorDir . '/symplify/symfony-php-config/src/Reflection/ArgumentAndParameterFactory.php',
'RectorPrefix20211210\\Symplify\\SymfonyPhpConfig\\ValueObjectInliner' => $vendorDir . '/symplify/symfony-php-config/src/ValueObjectInliner.php',
'RectorPrefix20211210\\Symplify\\SymplifyKernel\\Config\\Loader\\ParameterMergingLoaderFactory' => $vendorDir . '/symplify/symplify-kernel/src/Config/Loader/ParameterMergingLoaderFactory.php',
'RectorPrefix20211210\\Symplify\\SymplifyKernel\\ContainerBuilderFactory' => $vendorDir . '/symplify/symplify-kernel/src/ContainerBuilderFactory.php',
'RectorPrefix20211210\\Symplify\\SymplifyKernel\\Contract\\Config\\LoaderFactoryInterface' => $vendorDir . '/symplify/symplify-kernel/src/Contract/Config/LoaderFactoryInterface.php',
@ -3396,8 +3398,6 @@ return array(
'Symplify\\RuleDocGenerator\\ValueObject\\CodeSample\\ConfiguredCodeSample' => $vendorDir . '/symplify/rule-doc-generator-contracts/src/ValueObject/CodeSample/ConfiguredCodeSample.php',
'Symplify\\RuleDocGenerator\\ValueObject\\CodeSample\\ExtraFileCodeSample' => $vendorDir . '/symplify/rule-doc-generator-contracts/src/ValueObject/CodeSample/ExtraFileCodeSample.php',
'Symplify\\RuleDocGenerator\\ValueObject\\RuleDefinition' => $vendorDir . '/symplify/rule-doc-generator-contracts/src/ValueObject/RuleDefinition.php',
'Symplify\\SymfonyPhpConfig\\Reflection\\ArgumentAndParameterFactory' => $vendorDir . '/symplify/symfony-php-config/src/Reflection/ArgumentAndParameterFactory.php',
'Symplify\\SymfonyPhpConfig\\ValueObjectInliner' => $vendorDir . '/symplify/symfony-php-config/src/ValueObjectInliner.php',
'UnhandledMatchError' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php',
'ValueError' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/ValueError.php',
);

View File

@ -6,7 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
return array(
'Symplify\\SymfonyPhpConfig\\' => array($vendorDir . '/symplify/symfony-php-config/src'),
'Symplify\\RuleDocGenerator\\' => array($vendorDir . '/symplify/rule-doc-generator-contracts/src'),
'Ssch\\TYPO3Rector\\PHPStan\\' => array($vendorDir . '/ssch/typo3-rector/utils/phpstan/src'),
'Ssch\\TYPO3Rector\\' => array($vendorDir . '/ssch/typo3-rector/src'),
@ -25,6 +24,7 @@ return array(
'RectorPrefix20211210\\Webmozart\\Assert\\' => array($vendorDir . '/webmozart/assert/src'),
'RectorPrefix20211210\\Symplify\\VendorPatches\\' => array($vendorDir . '/symplify/vendor-patches/src'),
'RectorPrefix20211210\\Symplify\\SymplifyKernel\\' => array($vendorDir . '/symplify/symplify-kernel/src'),
'RectorPrefix20211210\\Symplify\\SymfonyPhpConfig\\' => array($vendorDir . '/symplify/symfony-php-config/src'),
'RectorPrefix20211210\\Symplify\\SmartFileSystem\\' => array($vendorDir . '/symplify/smart-file-system/src'),
'RectorPrefix20211210\\Symplify\\Skipper\\' => array($vendorDir . '/symplify/skipper/src'),
'RectorPrefix20211210\\Symplify\\SimplePhpDocParser\\' => array($vendorDir . '/symplify/simple-php-doc-parser/src'),

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitd3a015248a046c6488ba7b9bd0822867
class ComposerAutoloaderInit9376101442cfdedff9d89618d681e8c3
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInitd3a015248a046c6488ba7b9bd0822867
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitd3a015248a046c6488ba7b9bd0822867', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit9376101442cfdedff9d89618d681e8c3', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInitd3a015248a046c6488ba7b9bd0822867', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit9376101442cfdedff9d89618d681e8c3', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitd3a015248a046c6488ba7b9bd0822867::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit9376101442cfdedff9d89618d681e8c3::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInitd3a015248a046c6488ba7b9bd0822867
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInitd3a015248a046c6488ba7b9bd0822867::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit9376101442cfdedff9d89618d681e8c3::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequired3a015248a046c6488ba7b9bd0822867($fileIdentifier, $file);
composerRequire9376101442cfdedff9d89618d681e8c3($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequired3a015248a046c6488ba7b9bd0822867($fileIdentifier, $file)
function composerRequire9376101442cfdedff9d89618d681e8c3($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInitd3a015248a046c6488ba7b9bd0822867
class ComposerStaticInit9376101442cfdedff9d89618d681e8c3
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@ -26,7 +26,6 @@ class ComposerStaticInitd3a015248a046c6488ba7b9bd0822867
public static $prefixLengthsPsr4 = array (
'S' =>
array (
'Symplify\\SymfonyPhpConfig\\' => 26,
'Symplify\\RuleDocGenerator\\' => 26,
'Ssch\\TYPO3Rector\\PHPStan\\' => 25,
'Ssch\\TYPO3Rector\\' => 17,
@ -48,6 +47,7 @@ class ComposerStaticInitd3a015248a046c6488ba7b9bd0822867
'RectorPrefix20211210\\Webmozart\\Assert\\' => 38,
'RectorPrefix20211210\\Symplify\\VendorPatches\\' => 44,
'RectorPrefix20211210\\Symplify\\SymplifyKernel\\' => 45,
'RectorPrefix20211210\\Symplify\\SymfonyPhpConfig\\' => 47,
'RectorPrefix20211210\\Symplify\\SmartFileSystem\\' => 46,
'RectorPrefix20211210\\Symplify\\Skipper\\' => 38,
'RectorPrefix20211210\\Symplify\\SimplePhpDocParser\\' => 49,
@ -107,10 +107,6 @@ class ComposerStaticInitd3a015248a046c6488ba7b9bd0822867
);
public static $prefixDirsPsr4 = array (
'Symplify\\SymfonyPhpConfig\\' =>
array (
0 => __DIR__ . '/..' . '/symplify/symfony-php-config/src',
),
'Symplify\\RuleDocGenerator\\' =>
array (
0 => __DIR__ . '/..' . '/symplify/rule-doc-generator-contracts/src',
@ -185,6 +181,10 @@ class ComposerStaticInitd3a015248a046c6488ba7b9bd0822867
array (
0 => __DIR__ . '/..' . '/symplify/symplify-kernel/src',
),
'RectorPrefix20211210\\Symplify\\SymfonyPhpConfig\\' =>
array (
0 => __DIR__ . '/..' . '/symplify/symfony-php-config/src',
),
'RectorPrefix20211210\\Symplify\\SmartFileSystem\\' =>
array (
0 => __DIR__ . '/..' . '/symplify/smart-file-system/src',
@ -1683,6 +1683,8 @@ class ComposerStaticInitd3a015248a046c6488ba7b9bd0822867
'RectorPrefix20211210\\Symplify\\SmartFileSystem\\Normalizer\\PathNormalizer' => __DIR__ . '/..' . '/symplify/smart-file-system/src/Normalizer/PathNormalizer.php',
'RectorPrefix20211210\\Symplify\\SmartFileSystem\\SmartFileInfo' => __DIR__ . '/..' . '/symplify/smart-file-system/src/SmartFileInfo.php',
'RectorPrefix20211210\\Symplify\\SmartFileSystem\\SmartFileSystem' => __DIR__ . '/..' . '/symplify/smart-file-system/src/SmartFileSystem.php',
'RectorPrefix20211210\\Symplify\\SymfonyPhpConfig\\Reflection\\ArgumentAndParameterFactory' => __DIR__ . '/..' . '/symplify/symfony-php-config/src/Reflection/ArgumentAndParameterFactory.php',
'RectorPrefix20211210\\Symplify\\SymfonyPhpConfig\\ValueObjectInliner' => __DIR__ . '/..' . '/symplify/symfony-php-config/src/ValueObjectInliner.php',
'RectorPrefix20211210\\Symplify\\SymplifyKernel\\Config\\Loader\\ParameterMergingLoaderFactory' => __DIR__ . '/..' . '/symplify/symplify-kernel/src/Config/Loader/ParameterMergingLoaderFactory.php',
'RectorPrefix20211210\\Symplify\\SymplifyKernel\\ContainerBuilderFactory' => __DIR__ . '/..' . '/symplify/symplify-kernel/src/ContainerBuilderFactory.php',
'RectorPrefix20211210\\Symplify\\SymplifyKernel\\Contract\\Config\\LoaderFactoryInterface' => __DIR__ . '/..' . '/symplify/symplify-kernel/src/Contract/Config/LoaderFactoryInterface.php',
@ -3786,8 +3788,6 @@ class ComposerStaticInitd3a015248a046c6488ba7b9bd0822867
'Symplify\\RuleDocGenerator\\ValueObject\\CodeSample\\ConfiguredCodeSample' => __DIR__ . '/..' . '/symplify/rule-doc-generator-contracts/src/ValueObject/CodeSample/ConfiguredCodeSample.php',
'Symplify\\RuleDocGenerator\\ValueObject\\CodeSample\\ExtraFileCodeSample' => __DIR__ . '/..' . '/symplify/rule-doc-generator-contracts/src/ValueObject/CodeSample/ExtraFileCodeSample.php',
'Symplify\\RuleDocGenerator\\ValueObject\\RuleDefinition' => __DIR__ . '/..' . '/symplify/rule-doc-generator-contracts/src/ValueObject/RuleDefinition.php',
'Symplify\\SymfonyPhpConfig\\Reflection\\ArgumentAndParameterFactory' => __DIR__ . '/..' . '/symplify/symfony-php-config/src/Reflection/ArgumentAndParameterFactory.php',
'Symplify\\SymfonyPhpConfig\\ValueObjectInliner' => __DIR__ . '/..' . '/symplify/symfony-php-config/src/ValueObjectInliner.php',
'UnhandledMatchError' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php',
'ValueError' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/ValueError.php',
);
@ -3795,9 +3795,9 @@ class ComposerStaticInitd3a015248a046c6488ba7b9bd0822867
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitd3a015248a046c6488ba7b9bd0822867::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitd3a015248a046c6488ba7b9bd0822867::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitd3a015248a046c6488ba7b9bd0822867::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit9376101442cfdedff9d89618d681e8c3::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit9376101442cfdedff9d89618d681e8c3::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit9376101442cfdedff9d89618d681e8c3::$classMap;
}, null, ClassLoader::class);
}

View File

@ -5142,7 +5142,7 @@
"installation-source": "dist",
"autoload": {
"psr-4": {
"Symplify\\SymfonyPhpConfig\\": "src"
"RectorPrefix20211210\\Symplify\\SymfonyPhpConfig\\": "src"
}
},
"notification-url": "https:\/\/packagist.org\/downloads\/",

View File

@ -12,8 +12,8 @@ if (!class_exists('GenerateChangelogCommand', false) && !interface_exists('Gener
if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
spl_autoload_call('RectorPrefix20211210\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInitd3a015248a046c6488ba7b9bd0822867', false) && !interface_exists('ComposerAutoloaderInitd3a015248a046c6488ba7b9bd0822867', false) && !trait_exists('ComposerAutoloaderInitd3a015248a046c6488ba7b9bd0822867', false)) {
spl_autoload_call('RectorPrefix20211210\ComposerAutoloaderInitd3a015248a046c6488ba7b9bd0822867');
if (!class_exists('ComposerAutoloaderInit9376101442cfdedff9d89618d681e8c3', false) && !interface_exists('ComposerAutoloaderInit9376101442cfdedff9d89618d681e8c3', false) && !trait_exists('ComposerAutoloaderInit9376101442cfdedff9d89618d681e8c3', false)) {
spl_autoload_call('RectorPrefix20211210\ComposerAutoloaderInit9376101442cfdedff9d89618d681e8c3');
}
if (!class_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !interface_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !trait_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false)) {
spl_autoload_call('RectorPrefix20211210\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -81,9 +81,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20211210\print_node(...func_get_args());
}
}
if (!function_exists('composerRequired3a015248a046c6488ba7b9bd0822867')) {
function composerRequired3a015248a046c6488ba7b9bd0822867() {
return \RectorPrefix20211210\composerRequired3a015248a046c6488ba7b9bd0822867(...func_get_args());
if (!function_exists('composerRequire9376101442cfdedff9d89618d681e8c3')) {
function composerRequire9376101442cfdedff9d89618d681e8c3() {
return \RectorPrefix20211210\composerRequire9376101442cfdedff9d89618d681e8c3(...func_get_args());
}
}
if (!function_exists('scanPath')) {

View File

@ -62,7 +62,7 @@ abstract class FileLoader extends \RectorPrefix20211210\Symfony\Component\Config
* @throws FileLoaderImportCircularReferenceException
* @throws FileLocatorFileNotFoundException
*/
public function import($resource, string $type = null, bool $ignoreErrors = \false, string $sourceResource = null, $exclude = null)
public function import($resource, $type = null, $ignoreErrors = \false, $sourceResource = null, $exclude = null)
{
if (\is_string($resource) && \strlen($resource) !== ($i = \strcspn($resource, '*?{[')) && \strpos($resource, "\n") === \false) {
$excluded = [];

View File

@ -46,7 +46,7 @@ abstract class Loader implements \RectorPrefix20211210\Symfony\Component\Config\
*
* @return mixed
*/
public function import($resource, string $type = null)
public function import($resource, $type = null)
{
return $this->resolve($resource, $type)->load($resource, $type);
}

View File

@ -45,8 +45,10 @@ abstract class FileLoader extends \RectorPrefix20211210\Symfony\Component\Config
* {@inheritdoc}
*
* @param bool|string $ignoreErrors Whether errors should be ignored; pass "not_found" to ignore only when the loaded resource is not found
* @param string|null $type
* @param string|null $sourceResource
*/
public function import($resource, string $type = null, $ignoreErrors = \false, string $sourceResource = null, $exclude = null)
public function import($resource, $type = null, $ignoreErrors = \false, $sourceResource = null, $exclude = null)
{
$args = \func_get_args();
if ($ignoreNotFound = 'not_found' === $ignoreErrors) {

View File

@ -14,12 +14,12 @@
},
"autoload": {
"psr-4": {
"Symplify\\SymfonyPhpConfig\\": "src"
"RectorPrefix20211210\\Symplify\\SymfonyPhpConfig\\": "src"
}
},
"autoload-dev": {
"psr-4": {
"Symplify\\SymfonyPhpConfig\\Tests\\": "tests"
"RectorPrefix20211210\\Symplify\\SymfonyPhpConfig\\Tests\\": "tests"
}
},
"extra": {

View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace Symplify\SymfonyPhpConfig\Reflection;
namespace RectorPrefix20211210\Symplify\SymfonyPhpConfig\Reflection;
use RectorPrefix20211210\Symplify\PackageBuilder\Reflection\PrivatesAccessor;
final class ArgumentAndParameterFactory

View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace Symplify\SymfonyPhpConfig;
namespace RectorPrefix20211210\Symplify\SymfonyPhpConfig;
use ReflectionClass;
use ReflectionMethod;
@ -9,7 +9,7 @@ use RectorPrefix20211210\Symfony\Component\DependencyInjection\Definition;
use RectorPrefix20211210\Symfony\Component\DependencyInjection\Loader\Configurator\InlineServiceConfigurator;
use RectorPrefix20211210\Symfony\Component\DependencyInjection\Loader\Configurator\ReferenceConfigurator;
use RectorPrefix20211210\Symfony\Component\DependencyInjection\Loader\Configurator\ServicesConfigurator;
use Symplify\SymfonyPhpConfig\Reflection\ArgumentAndParameterFactory;
use RectorPrefix20211210\Symplify\SymfonyPhpConfig\Reflection\ArgumentAndParameterFactory;
/**
* @api
*/
@ -25,9 +25,9 @@ final class ValueObjectInliner
$propertyValues = self::resolvePropertyValues($reflectionClass, $object);
// create fake factory with private accessor, as properties are different
// @see https://symfony.com/doc/current/service_container/factories.html#passing-arguments-to-the-factory-method
$servicesConfigurator->set(\Symplify\SymfonyPhpConfig\Reflection\ArgumentAndParameterFactory::class);
$servicesConfigurator->set(\RectorPrefix20211210\Symplify\SymfonyPhpConfig\Reflection\ArgumentAndParameterFactory::class);
$argumentValues = self::resolveArgumentValues($reflectionClass, $object);
$servicesConfigurator->set($className)->factory([new \RectorPrefix20211210\Symfony\Component\DependencyInjection\Loader\Configurator\ReferenceConfigurator(\Symplify\SymfonyPhpConfig\Reflection\ArgumentAndParameterFactory::class), 'create'])->args([$className, $argumentValues, $propertyValues]);
$servicesConfigurator->set($className)->factory([new \RectorPrefix20211210\Symfony\Component\DependencyInjection\Loader\Configurator\ReferenceConfigurator(\RectorPrefix20211210\Symplify\SymfonyPhpConfig\Reflection\ArgumentAndParameterFactory::class), 'create'])->args([$className, $argumentValues, $propertyValues]);
return new \RectorPrefix20211210\Symfony\Component\DependencyInjection\Loader\Configurator\ReferenceConfigurator($className);
}
/**