Skip to content

Commit baf4489

Browse files
TomasVotrubaTomasVotruba
committed
Updated Rector to commit 4ef31e92b88053cf22ca1f379fc92ecc3d45f371
rectorphp/rector-src@4ef31e9 Remove deprecated TemplateResolverInterface, RectorServiceConfigurator (#3351)
1 parent f923fd0 commit baf4489

8 files changed

Lines changed: 34 additions & 79 deletions

File tree

‎src/Application/VersionResolver.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ final class VersionResolver
1919
* @api
2020
* @var string
2121
*/
22-
public const PACKAGE_VERSION = '43dd2efc5d663bc16327911fe31c6f6ecf60e753';
22+
public const PACKAGE_VERSION = '4ef31e92b88053cf22ca1f379fc92ecc3d45f371';
2323
/**
2424
* @api
2525
* @var string
2626
*/
27-
public const RELEASE_DATE = '2023-02-06 19:19:06';
27+
public const RELEASE_DATE = '2023-02-06 19:24:14';
2828
/**
2929
* @var int
3030
*/

‎src/Configuration/Option.php‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ final class Option
1616
*/
1717
public const AUTOLOAD_FILE = 'autoload-file';
1818
/**
19-
* @deprecated Use @see \Rector\Config\RectorConfig::bootstrapFiles() instead
19+
* @internal Use @see \Rector\Config\RectorConfig::bootstrapFiles() instead
2020
* @var string
2121
*/
2222
public const BOOTSTRAP_FILES = 'bootstrap_files';
@@ -37,32 +37,32 @@ final class Option
3737
*/
3838
public const NO_PROGRESS_BAR = 'no-progress-bar';
3939
/**
40-
* @deprecated Use @see \Rector\Config\RectorConfig::phpVersion() instead
40+
* @internal Use @see \Rector\Config\RectorConfig::phpVersion() instead
4141
* @var string
4242
*/
4343
public const PHP_VERSION_FEATURES = 'php_version_features';
4444
/**
45-
* @deprecated Use @see \Rector\Config\RectorConfig::importNames() instead
45+
* @internal Use @see \Rector\Config\RectorConfig::importNames() instead
4646
* @var string
4747
*/
4848
public const AUTO_IMPORT_NAMES = 'auto_import_names';
4949
/**
50-
* @deprecated Use @see \Rector\Config\RectorConfig::importNames() instead
50+
* @internal Use @see \Rector\Config\RectorConfig::importNames() instead
5151
* @var string
5252
*/
5353
public const AUTO_IMPORT_DOC_BLOCK_NAMES = 'auto_import_doc_block_names';
5454
/**
55-
* @deprecated Use @see \Rector\Config\RectorConfig::importShortClasses() instead
55+
* @internal Use @see \Rector\Config\RectorConfig::importShortClasses() instead
5656
* @var string
5757
*/
5858
public const IMPORT_SHORT_CLASSES = 'import_short_classes';
5959
/**
60-
* @deprecated Use @see \Rector\Config\RectorConfig::symfonyContainerXml() instead
60+
* @internal Use @see \Rector\Config\RectorConfig::symfonyContainerXml() instead
6161
* @var string
6262
*/
6363
public const SYMFONY_CONTAINER_XML_PATH_PARAMETER = 'symfony_container_xml_path';
6464
/**
65-
* @deprecated Use @see \Rector\Config\RectorConfig::symfonyContainerPhp()
65+
* @internal Use @see \Rector\Config\RectorConfig::symfonyContainerPhp()
6666
* @var string
6767
*/
6868
public const SYMFONY_CONTAINER_PHP_PATH_PARAMETER = 'symfony_container_php_path';
@@ -71,43 +71,43 @@ final class Option
7171
*/
7272
public const CLEAR_CACHE = 'clear-cache';
7373
/**
74-
* @deprecated Use @see \Rector\Config\RectorConfig::parallel() instead
74+
* @internal Use @see \Rector\Config\RectorConfig::parallel() instead
7575
* @var string
7676
*/
7777
public const PARALLEL = 'parallel';
7878
/**
79-
* @deprecated Use @see \Rector\Config\RectorConfig::paths() instead
79+
* @internal Use @see \Rector\Config\RectorConfig::paths() instead
8080
* @var string
8181
*/
8282
public const PATHS = 'paths';
8383
/**
84-
* @deprecated Use @see \Rector\Config\RectorConfig::autoloadPaths() instead
84+
* @internal Use @see \Rector\Config\RectorConfig::autoloadPaths() instead
8585
* @var string
8686
*/
8787
public const AUTOLOAD_PATHS = 'autoload_paths';
8888
/**
89-
* @deprecated Use @see \Rector\Config\RectorConfig::skip() instead
89+
* @internal Use @see \Rector\Config\RectorConfig::skip() instead
9090
* @var string
9191
*/
9292
public const SKIP = 'skip';
9393
/**
94-
* @deprecated Use RectorConfig::fileExtensions() instead
94+
* @internal Use RectorConfig::fileExtensions() instead
9595
* @var string
9696
*/
9797
public const FILE_EXTENSIONS = 'file_extensions';
9898
/**
99-
* @deprecated Use RectorConfig::nestedChainMethodCallLimit() instead
99+
* @internal Use RectorConfig::nestedChainMethodCallLimit() instead
100100
* @var string
101101
*/
102102
public const NESTED_CHAIN_METHOD_CALL_LIMIT = 'nested_chain_method_call_limit';
103103
/**
104-
* @deprecated Use RectorConfig::cacheDirectory() instead
104+
* @internal Use RectorConfig::cacheDirectory() instead
105105
* @var string
106106
*/
107107
public const CACHE_DIR = 'cache_dir';
108108
/**
109109
* Cache backend. Most of the time we cache in files, but in ephemeral environment (e.g. CI), a faster `MemoryCacheStorage` can be usefull.
110-
* @deprecated Use RectorConfig::cacheClass() instead
110+
* @internal Use RectorConfig::cacheClass() instead
111111
*
112112
* @var class-string<CacheStorageInterface>
113113
* @internal
@@ -126,7 +126,7 @@ final class Option
126126
*/
127127
public const CONFIG = 'config';
128128
/**
129-
* @deprecated Use @see \Rector\Config\RectorConfig::phpstanConfig() instead
129+
* @internal Use @see \Rector\Config\RectorConfig::phpstanConfig() instead
130130
* @var string
131131
*/
132132
public const PHPSTAN_FOR_RECTOR_PATH = 'phpstan_for_rector_path';
@@ -147,17 +147,17 @@ final class Option
147147
*/
148148
public const PARALLEL_PORT = 'port';
149149
/**
150-
* @deprecated Use @see \Rector\Config\RectorConfig::parallel() instead with pass int $jobSize parameter
150+
* @internal Use @see \Rector\Config\RectorConfig::parallel() instead with pass int $jobSize parameter
151151
* @var string
152152
*/
153153
public const PARALLEL_JOB_SIZE = 'parallel-job-size';
154154
/**
155-
* @deprecated Use @see \Rector\Config\RectorConfig::parallel() instead with pass int $maxNumberOfProcess parameter
155+
* @internal Use @see \Rector\Config\RectorConfig::parallel() instead with pass int $maxNumberOfProcess parameter
156156
* @var string
157157
*/
158158
public const PARALLEL_MAX_NUMBER_OF_PROCESSES = 'parallel-max-number-of-processes';
159159
/**
160-
* @deprecated Use @see \Rector\Config\RectorConfig::parallel() instead with pass int $seconds parameter
160+
* @internal Use @see \Rector\Config\RectorConfig::parallel() instead with pass int $seconds parameter
161161
* @var string
162162
*/
163163
public const PARALLEL_TIMEOUT_IN_SECONDS = 'parallel-timeout-in-seconds';
@@ -166,12 +166,12 @@ final class Option
166166
*/
167167
public const MEMORY_LIMIT = 'memory-limit';
168168
/**
169-
* @deprecated Use @see \Rector\Config\RectorConfig::indent() method
169+
* @internal Use @see \Rector\Config\RectorConfig::indent() method
170170
* @var string
171171
*/
172172
public const INDENT_CHAR = 'indent-char';
173173
/**
174-
* @deprecated Use @see \Rector\Config\RectorConfig::indent() method
174+
* @internal Use @see \Rector\Config\RectorConfig::indent() method
175175
* @var string
176176
*/
177177
public const INDENT_SIZE = 'indent-size';

‎src/Contract/Template/TemplateResolverInterface.php‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎src/DependencyInjection/Loader/Configurator/RectorServiceConfigurator.php‎

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,11 @@
33
declare (strict_types=1);
44
namespace Rector\Core\DependencyInjection\Loader\Configurator;
55

6-
use Rector\Core\Configuration\ValueObjectInliner;
7-
use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
8-
use RectorPrefix202302\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
96
use RectorPrefix202302\Symfony\Component\DependencyInjection\Loader\Configurator\ServiceConfigurator;
107
/**
118
* @api
12-
* Same as Symfony service configurator, with extra "configure()" method for easier DX
9+
* Same as Symfony service configurator
1310
*/
1411
final class RectorServiceConfigurator extends ServiceConfigurator
1512
{
16-
/**
17-
* @deprecated Use @see \Rector\Config\RectorConfig instead
18-
* @param mixed[] $configuration
19-
*/
20-
public function configure(array $configuration) : self
21-
{
22-
$this->ensureClassIsConfigurable($this->id);
23-
// 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
24-
\array_walk_recursive($configuration, static function (&$value) {
25-
if (\is_object($value)) {
26-
$value = ValueObjectInliner::inline($value);
27-
}
28-
return $value;
29-
});
30-
$this->call('configure', [$configuration]);
31-
return $this;
32-
}
33-
private function ensureClassIsConfigurable(?string $class) : void
34-
{
35-
if ($class === null) {
36-
throw new InvalidConfigurationException('The class is missing');
37-
}
38-
if (!\is_a($class, ConfigurableRectorInterface::class, \true)) {
39-
$errorMessage = \sprintf('The service "%s" is not configurable. Make it implement "%s" or remove "configure()" call.', $class, ConfigurableRectorInterface::class);
40-
throw new InvalidConfigurationException($errorMessage);
41-
}
42-
}
4313
}

‎vendor/autoload.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222

2323
require_once __DIR__ . '/composer/autoload_real.php';
2424

25-
return ComposerAutoloaderInit0981c60dbbbe9cbbd670a2dacb4bcce4::getLoader();
25+
return ComposerAutoloaderInit9fea5958f2b1662b9650f5dfbb2db631::getLoader();

‎vendor/composer/autoload_classmap.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1381,7 +1381,6 @@
13811381
'Rector\\Core\\Contract\\Rector\\PhpRectorInterface' => $baseDir . '/src/Contract/Rector/PhpRectorInterface.php',
13821382
'Rector\\Core\\Contract\\Rector\\RectorInterface' => $baseDir . '/src/Contract/Rector/RectorInterface.php',
13831383
'Rector\\Core\\Contract\\Rector\\ScopeAwarePhpRectorInterface' => $baseDir . '/src/Contract/Rector/ScopeAwarePhpRectorInterface.php',
1384-
'Rector\\Core\\Contract\\Template\\TemplateResolverInterface' => $baseDir . '/src/Contract/Template/TemplateResolverInterface.php',
13851384
'Rector\\Core\\DependencyInjection\\Collector\\ConfigureCallValuesCollector' => $baseDir . '/src/DependencyInjection/Collector/ConfigureCallValuesCollector.php',
13861385
'Rector\\Core\\DependencyInjection\\CompilerPass\\AutowireArrayParameterCompilerPass' => $baseDir . '/src/DependencyInjection/CompilerPass/AutowireArrayParameterCompilerPass.php',
13871386
'Rector\\Core\\DependencyInjection\\CompilerPass\\AutowireRectorCompilerPass' => $baseDir . '/src/DependencyInjection/CompilerPass/AutowireRectorCompilerPass.php',

‎vendor/composer/autoload_real.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// autoload_real.php @generated by Composer
44

5-
class ComposerAutoloaderInit0981c60dbbbe9cbbd670a2dacb4bcce4
5+
class ComposerAutoloaderInit9fea5958f2b1662b9650f5dfbb2db631
66
{
77
private static $loader;
88

@@ -22,17 +22,17 @@ public static function getLoader()
2222
return self::$loader;
2323
}
2424

25-
spl_autoload_register(array('ComposerAutoloaderInit0981c60dbbbe9cbbd670a2dacb4bcce4', 'loadClassLoader'), true, true);
25+
spl_autoload_register(array('ComposerAutoloaderInit9fea5958f2b1662b9650f5dfbb2db631', 'loadClassLoader'), true, true);
2626
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
27-
spl_autoload_unregister(array('ComposerAutoloaderInit0981c60dbbbe9cbbd670a2dacb4bcce4', 'loadClassLoader'));
27+
spl_autoload_unregister(array('ComposerAutoloaderInit9fea5958f2b1662b9650f5dfbb2db631', 'loadClassLoader'));
2828

2929
require __DIR__ . '/autoload_static.php';
30-
call_user_func(\Composer\Autoload\ComposerStaticInit0981c60dbbbe9cbbd670a2dacb4bcce4::getInitializer($loader));
30+
call_user_func(\Composer\Autoload\ComposerStaticInit9fea5958f2b1662b9650f5dfbb2db631::getInitializer($loader));
3131

3232
$loader->setClassMapAuthoritative(true);
3333
$loader->register(true);
3434

35-
$filesToLoad = \Composer\Autoload\ComposerStaticInit0981c60dbbbe9cbbd670a2dacb4bcce4::$files;
35+
$filesToLoad = \Composer\Autoload\ComposerStaticInit9fea5958f2b1662b9650f5dfbb2db631::$files;
3636
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
3737
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
3838
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

‎vendor/composer/autoload_static.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Composer\Autoload;
66

7-
class ComposerStaticInit0981c60dbbbe9cbbd670a2dacb4bcce4
7+
class ComposerStaticInit9fea5958f2b1662b9650f5dfbb2db631
88
{
99
public static $files = array (
1010
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -1626,7 +1626,6 @@ class ComposerStaticInit0981c60dbbbe9cbbd670a2dacb4bcce4
16261626
'Rector\\Core\\Contract\\Rector\\PhpRectorInterface' => __DIR__ . '/../..' . '/src/Contract/Rector/PhpRectorInterface.php',
16271627
'Rector\\Core\\Contract\\Rector\\RectorInterface' => __DIR__ . '/../..' . '/src/Contract/Rector/RectorInterface.php',
16281628
'Rector\\Core\\Contract\\Rector\\ScopeAwarePhpRectorInterface' => __DIR__ . '/../..' . '/src/Contract/Rector/ScopeAwarePhpRectorInterface.php',
1629-
'Rector\\Core\\Contract\\Template\\TemplateResolverInterface' => __DIR__ . '/../..' . '/src/Contract/Template/TemplateResolverInterface.php',
16301629
'Rector\\Core\\DependencyInjection\\Collector\\ConfigureCallValuesCollector' => __DIR__ . '/../..' . '/src/DependencyInjection/Collector/ConfigureCallValuesCollector.php',
16311630
'Rector\\Core\\DependencyInjection\\CompilerPass\\AutowireArrayParameterCompilerPass' => __DIR__ . '/../..' . '/src/DependencyInjection/CompilerPass/AutowireArrayParameterCompilerPass.php',
16321631
'Rector\\Core\\DependencyInjection\\CompilerPass\\AutowireRectorCompilerPass' => __DIR__ . '/../..' . '/src/DependencyInjection/CompilerPass/AutowireRectorCompilerPass.php',
@@ -3081,9 +3080,9 @@ class ComposerStaticInit0981c60dbbbe9cbbd670a2dacb4bcce4
30813080
public static function getInitializer(ClassLoader $loader)
30823081
{
30833082
return \Closure::bind(function () use ($loader) {
3084-
$loader->prefixLengthsPsr4 = ComposerStaticInit0981c60dbbbe9cbbd670a2dacb4bcce4::$prefixLengthsPsr4;
3085-
$loader->prefixDirsPsr4 = ComposerStaticInit0981c60dbbbe9cbbd670a2dacb4bcce4::$prefixDirsPsr4;
3086-
$loader->classMap = ComposerStaticInit0981c60dbbbe9cbbd670a2dacb4bcce4::$classMap;
3083+
$loader->prefixLengthsPsr4 = ComposerStaticInit9fea5958f2b1662b9650f5dfbb2db631::$prefixLengthsPsr4;
3084+
$loader->prefixDirsPsr4 = ComposerStaticInit9fea5958f2b1662b9650f5dfbb2db631::$prefixDirsPsr4;
3085+
$loader->classMap = ComposerStaticInit9fea5958f2b1662b9650f5dfbb2db631::$classMap;
30873086

30883087
}, null, ClassLoader::class);
30893088
}

0 commit comments

Comments
 (0)