Skip to content

Commit 1f6016e

Browse files
committed
Updated Rector to commit 41de61755c1f982ec554b6037a724abe708bfa27
rectorphp/rector-src@41de617 Add possibility to add multiple phpstan configs (#4798)
1 parent 2ec1804 commit 1f6016e

File tree

7 files changed

+35
-18
lines changed

7 files changed

+35
-18
lines changed

packages/Config/RectorConfig.php

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,25 @@ public function importShortClasses(bool $importShortClasses = \true) : void
111111
SimpleParameterProvider::setParameter(Option::IMPORT_SHORT_CLASSES, $importShortClasses);
112112
}
113113
/**
114-
* Set PHPStan custom config to load extensions and custom configuration to Rector.
115-
* By default, the "phpstan.neon" path is used.
114+
* Add PHPStan custom config to load extensions and custom configuration to Rector.
116115
*/
117116
public function phpstanConfig(string $filePath) : void
118117
{
119118
Assert::fileExists($filePath);
120-
SimpleParameterProvider::setParameter(Option::PHPSTAN_FOR_RECTOR_PATH, $filePath);
119+
$paths = SimpleParameterProvider::provideArrayParameter(Option::PHPSTAN_FOR_RECTOR_PATHS);
120+
$paths[] = $filePath;
121+
SimpleParameterProvider::setParameter(Option::PHPSTAN_FOR_RECTOR_PATHS, $paths);
122+
}
123+
/**
124+
* Add PHPStan custom configs to load extensions and custom configuration to Rector.
125+
*
126+
* @param string[] $filePaths
127+
*/
128+
public function phpstanConfigs(array $filePaths) : void
129+
{
130+
foreach ($filePaths as $filePath) {
131+
$this->phpstanConfig($filePath);
132+
}
121133
}
122134
/**
123135
* @param class-string<ConfigurableRectorInterface&RectorInterface> $rectorClass

packages/NodeTypeResolver/DependencyInjection/PHPStanServicesFactory.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Rector\Core\Configuration\Parameter\SimpleParameterProvider;
1717
use Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocatorProvider\DynamicSourceLocatorProvider;
1818
use RectorPrefix202308\Symfony\Component\Filesystem\Filesystem;
19+
use RectorPrefix202308\Webmozart\Assert\Assert;
1920
/**
2021
* Factory so Symfony app can use services from PHPStan container
2122
*
@@ -119,8 +120,12 @@ public function createDynamicSourceLocatorProvider() : DynamicSourceLocatorProvi
119120
private function resolveAdditionalConfigFiles() : array
120121
{
121122
$additionalConfigFiles = [];
122-
if (SimpleParameterProvider::hasParameter(Option::PHPSTAN_FOR_RECTOR_PATH)) {
123-
$additionalConfigFiles[] = SimpleParameterProvider::provideStringParameter(Option::PHPSTAN_FOR_RECTOR_PATH);
123+
if (SimpleParameterProvider::hasParameter(Option::PHPSTAN_FOR_RECTOR_PATHS)) {
124+
$paths = SimpleParameterProvider::provideArrayParameter(Option::PHPSTAN_FOR_RECTOR_PATHS);
125+
foreach ($paths as $path) {
126+
Assert::string($path);
127+
$additionalConfigFiles[] = $path;
128+
}
124129
}
125130
$additionalConfigFiles[] = __DIR__ . '/../../../config/phpstan/static-reflection.neon';
126131
$additionalConfigFiles[] = __DIR__ . '/../../../config/phpstan/better-infer.neon';

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 = 'a6532a2f295056321924f67b110e79411b95aa50';
22+
public const PACKAGE_VERSION = '41de61755c1f982ec554b6037a724abe708bfa27';
2323
/**
2424
* @api
2525
* @var string
2626
*/
27-
public const RELEASE_DATE = '2023-08-16 18:11:20';
27+
public const RELEASE_DATE = '2023-08-16 23:46:58';
2828
/**
2929
* @var int
3030
*/

src/Configuration/Option.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ final class Option
124124
* @internal Use @see \Rector\Config\RectorConfig::phpstanConfig() instead
125125
* @var string
126126
*/
127-
public const PHPSTAN_FOR_RECTOR_PATH = 'phpstan_for_rector_path';
127+
public const PHPSTAN_FOR_RECTOR_PATHS = 'phpstan_for_rector_paths';
128128
/**
129129
* @var string
130130
*/

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 ComposerAutoloaderInitefab334373889163798290c927ac1463::getLoader();
25+
return ComposerAutoloaderInita98ab5d27d114088f46189c43c1c70f3::getLoader();

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 ComposerAutoloaderInitefab334373889163798290c927ac1463
5+
class ComposerAutoloaderInita98ab5d27d114088f46189c43c1c70f3
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('ComposerAutoloaderInitefab334373889163798290c927ac1463', 'loadClassLoader'), true, true);
25+
spl_autoload_register(array('ComposerAutoloaderInita98ab5d27d114088f46189c43c1c70f3', 'loadClassLoader'), true, true);
2626
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
27-
spl_autoload_unregister(array('ComposerAutoloaderInitefab334373889163798290c927ac1463', 'loadClassLoader'));
27+
spl_autoload_unregister(array('ComposerAutoloaderInita98ab5d27d114088f46189c43c1c70f3', 'loadClassLoader'));
2828

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

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

35-
$filesToLoad = \Composer\Autoload\ComposerStaticInitefab334373889163798290c927ac1463::$files;
35+
$filesToLoad = \Composer\Autoload\ComposerStaticInita98ab5d27d114088f46189c43c1c70f3::$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 & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Composer\Autoload;
66

7-
class ComposerStaticInitefab334373889163798290c927ac1463
7+
class ComposerStaticInita98ab5d27d114088f46189c43c1c70f3
88
{
99
public static $files = array (
1010
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -2637,9 +2637,9 @@ class ComposerStaticInitefab334373889163798290c927ac1463
26372637
public static function getInitializer(ClassLoader $loader)
26382638
{
26392639
return \Closure::bind(function () use ($loader) {
2640-
$loader->prefixLengthsPsr4 = ComposerStaticInitefab334373889163798290c927ac1463::$prefixLengthsPsr4;
2641-
$loader->prefixDirsPsr4 = ComposerStaticInitefab334373889163798290c927ac1463::$prefixDirsPsr4;
2642-
$loader->classMap = ComposerStaticInitefab334373889163798290c927ac1463::$classMap;
2640+
$loader->prefixLengthsPsr4 = ComposerStaticInita98ab5d27d114088f46189c43c1c70f3::$prefixLengthsPsr4;
2641+
$loader->prefixDirsPsr4 = ComposerStaticInita98ab5d27d114088f46189c43c1c70f3::$prefixDirsPsr4;
2642+
$loader->classMap = ComposerStaticInita98ab5d27d114088f46189c43c1c70f3::$classMap;
26432643

26442644
}, null, ClassLoader::class);
26452645
}

0 commit comments

Comments
 (0)