From 7d20798f54580e05d1e8a30fbe3cce54dbcf6949 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Tue, 16 Jan 2024 15:34:08 +0700 Subject: [PATCH 1/5] [Config] Restore default values for RectorConfig->parallel() config similar to original <=0.18.x version --- src/Config/RectorConfig.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Config/RectorConfig.php b/src/Config/RectorConfig.php index 4e621e67160..ee55754432e 100644 --- a/src/Config/RectorConfig.php +++ b/src/Config/RectorConfig.php @@ -79,7 +79,7 @@ public function disableParallel(): void * Defaults in sync with https://phpstan.org/config-reference#parallel-processing * as we run PHPStan as well */ - public function parallel(int $processTimeout = 120, int $maxNumberOfProcess = 32, int $jobSize = 20): void + public function parallel(int $processTimeout = 120, int $maxNumberOfProcess = 16, int $jobSize = 15): void { SimpleParameterProvider::setParameter(Option::PARALLEL, true); SimpleParameterProvider::setParameter(Option::PARALLEL_JOB_TIMEOUT_IN_SECONDS, $processTimeout); From 2d44b070be9cdd7396afcb099b7049e4aa47512b Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Tue, 16 Jan 2024 15:36:48 +0700 Subject: [PATCH 2/5] remove comment --- src/Config/RectorConfig.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Config/RectorConfig.php b/src/Config/RectorConfig.php index ee55754432e..e5db560e305 100644 --- a/src/Config/RectorConfig.php +++ b/src/Config/RectorConfig.php @@ -75,10 +75,6 @@ public function disableParallel(): void SimpleParameterProvider::setParameter(Option::PARALLEL, false); } - /** - * Defaults in sync with https://phpstan.org/config-reference#parallel-processing - * as we run PHPStan as well - */ public function parallel(int $processTimeout = 120, int $maxNumberOfProcess = 16, int $jobSize = 15): void { SimpleParameterProvider::setParameter(Option::PARALLEL, true); From 0d817ae12916947c969bc723928967c0bc963b47 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Tue, 16 Jan 2024 15:43:46 +0700 Subject: [PATCH 3/5] regenerate docs --- rules/Php81/Rector/Class_/SpatieEnumClassToEnumRector.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/rules/Php81/Rector/Class_/SpatieEnumClassToEnumRector.php b/rules/Php81/Rector/Class_/SpatieEnumClassToEnumRector.php index 133a317315d..84c65582081 100644 --- a/rules/Php81/Rector/Class_/SpatieEnumClassToEnumRector.php +++ b/rules/Php81/Rector/Class_/SpatieEnumClassToEnumRector.php @@ -13,6 +13,10 @@ use Rector\Rector\AbstractRector; use Rector\ValueObject\PhpVersionFeature; use Rector\VersionBonding\Contract\MinPhpVersionInterface; +<<<<<<< HEAD +======= +use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; +>>>>>>> 3b6a960c85 (regenerate docs) use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -29,7 +33,11 @@ final class SpatieEnumClassToEnumRector extends AbstractRector implements MinPhp /** * @var string */ +<<<<<<< HEAD public const TO_UPPER_SNAKE_CASE = 'toUpperSnakeCase'; +======= + public const TO_UPPER_SNAKE_CASE = 'to_upper_snake_case'; +>>>>>>> 3b6a960c85 (regenerate docs) public function __construct( private readonly EnumFactory $enumFactory From 6a3623377b848d42c9b0740ebc8a4eb2f42252de Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 16 Jan 2024 08:45:03 +0000 Subject: [PATCH 4/5] [ci-review] Rector Rectify --- rules/Php81/Rector/Class_/SpatieEnumClassToEnumRector.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/rules/Php81/Rector/Class_/SpatieEnumClassToEnumRector.php b/rules/Php81/Rector/Class_/SpatieEnumClassToEnumRector.php index 84c65582081..133a317315d 100644 --- a/rules/Php81/Rector/Class_/SpatieEnumClassToEnumRector.php +++ b/rules/Php81/Rector/Class_/SpatieEnumClassToEnumRector.php @@ -13,10 +13,6 @@ use Rector\Rector\AbstractRector; use Rector\ValueObject\PhpVersionFeature; use Rector\VersionBonding\Contract\MinPhpVersionInterface; -<<<<<<< HEAD -======= -use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; ->>>>>>> 3b6a960c85 (regenerate docs) use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -33,11 +29,7 @@ final class SpatieEnumClassToEnumRector extends AbstractRector implements MinPhp /** * @var string */ -<<<<<<< HEAD public const TO_UPPER_SNAKE_CASE = 'toUpperSnakeCase'; -======= - public const TO_UPPER_SNAKE_CASE = 'to_upper_snake_case'; ->>>>>>> 3b6a960c85 (regenerate docs) public function __construct( private readonly EnumFactory $enumFactory From a2caee54d273a4cd82d7137dcf25b3a4ab22573f Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Tue, 16 Jan 2024 17:24:26 +0700 Subject: [PATCH 5/5] update jobsize to 16 --- src/Config/RectorConfig.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Config/RectorConfig.php b/src/Config/RectorConfig.php index e5db560e305..0b3e06c5f13 100644 --- a/src/Config/RectorConfig.php +++ b/src/Config/RectorConfig.php @@ -75,7 +75,7 @@ public function disableParallel(): void SimpleParameterProvider::setParameter(Option::PARALLEL, false); } - public function parallel(int $processTimeout = 120, int $maxNumberOfProcess = 16, int $jobSize = 15): void + public function parallel(int $processTimeout = 120, int $maxNumberOfProcess = 16, int $jobSize = 16): void { SimpleParameterProvider::setParameter(Option::PARALLEL, true); SimpleParameterProvider::setParameter(Option::PARALLEL_JOB_TIMEOUT_IN_SECONDS, $processTimeout);