Skip to content

Commit c31cd83

Browse files
guanguansguanguans
committed
refactor: Improve code quality and consistency in rector.php
- Refactor autoload function handling to ensure class map retrieval - Remove unused rules and skip logic for better clarity - Enhance time calculation in RequestBasicCollector to handle unknown durations - Use 'blank' helper function for consistency in TestCommand validation
1 parent b61cb12 commit c31cd83

File tree

3 files changed

+43
-78
lines changed

3 files changed

+43
-78
lines changed

‎rector.php‎

Lines changed: 37 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@
1313
* @see https://github.com/guanguans/laravel-exception-notify
1414
*/
1515

16+
use Composer\Autoload\ClassLoader;
1617
use Ergebnis\Rector\Rules\Arrays\SortAssociativeArrayByKeyRector;
1718
use Guanguans\LaravelExceptionNotify\Support\Rectors\HydratePipeFuncCallToStaticCallRector;
1819
use Guanguans\LaravelExceptionNotify\Support\Rectors\ToInternalExceptionRector;
20+
use Illuminate\Support\Collection;
1921
use Illuminate\Support\Str;
2022
use Rector\CodeQuality\Rector\If_\ExplicitBoolCompareRector;
2123
use Rector\CodeQuality\Rector\LogicalAnd\LogicalToBooleanRector;
@@ -26,6 +28,7 @@
2628
use Rector\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector;
2729
use Rector\CodingStyle\Rector\Stmt\NewlineAfterStatementRector;
2830
use Rector\Config\RectorConfig;
31+
use Rector\Contract\Rector\ConfigurableRectorInterface;
2932
use Rector\DeadCode\Rector\ClassLike\RemoveAnnotationRector;
3033
use Rector\EarlyReturn\Rector\Return_\ReturnBinaryOrToEarlyReturnRector;
3134
use Rector\PHPUnit\Set\PHPUnitSetList;
@@ -35,6 +38,11 @@
3538
use Rector\Transform\ValueObject\FuncCallToStaticCall;
3639
use Rector\Transform\ValueObject\StaticCallToFuncCall;
3740
use Rector\ValueObject\PhpVersion;
41+
use RectorLaravel\Rector\Class_\ModelCastsPropertyToCastsMethodRector;
42+
use RectorLaravel\Rector\Empty_\EmptyToBlankAndFilledFuncRector;
43+
use RectorLaravel\Rector\FuncCall\HelperFuncCallToFacadeClassRector;
44+
use RectorLaravel\Rector\FuncCall\TypeHintTappableCallRector;
45+
use RectorLaravel\Rector\StaticCall\DispatchToHelperFunctionsRector;
3846
use RectorLaravel\Set\LaravelSetList;
3947

4048
return RectorConfig::configure()
@@ -49,7 +57,7 @@
4957
->withSkip([
5058
'**/__snapshots__/*',
5159
'**/Fixtures/*',
52-
__FILE__,
60+
// __FILE__,
5361
])
5462
->withCache(__DIR__.'/.build/rector/')
5563
->withParallel()
@@ -76,13 +84,14 @@
7684
)
7785
->withSets([
7886
PHPUnitSetList::PHPUNIT_90,
87+
LaravelSetList::LARAVEL_90,
7988
...collect((new ReflectionClass(LaravelSetList::class))->getConstants(ReflectionClassConstant::IS_PUBLIC))
80-
->filter(
89+
->reject(
8190
static fn (
8291
string $constant,
8392
string $name
84-
): bool => !\in_array($name, ['LARAVEL_STATIC_TO_INJECTION', 'LARAVEL_STATIC_TO_INJECTION'], true)
85-
&& ('LARAVEL_90' === $name || !preg_match('/^LARAVEL_\d{2,3}$/', $name))
93+
): bool => \in_array($name, ['LARAVEL_STATIC_TO_INJECTION', 'LARAVEL_'], true)
94+
|| preg_match('/^LARAVEL_\d{2,3}$/', $name)
8695
)
8796
// ->dd()
8897
->values()
@@ -95,76 +104,21 @@
95104
StaticClosureRector::class,
96105
HydratePipeFuncCallToStaticCallRector::class,
97106
ToInternalExceptionRector::class,
98-
])
99-
->withRules([
100-
// // RectorLaravel\Rector\Assign\CallOnAppArrayAccessToStandaloneAssignRector::class,
101-
// // RectorLaravel\Rector\Cast\DatabaseExpressionCastsToMethodCallRector::class,
102-
RectorLaravel\Rector\ClassMethod\AddParentBootToModelClassMethodRector::class,
103-
RectorLaravel\Rector\ClassMethod\AddParentRegisterToEventServiceProviderRector::class,
104-
RectorLaravel\Rector\ClassMethod\MigrateToSimplifiedAttributeRector::class,
105-
RectorLaravel\Rector\Class_\AddExtendsAnnotationToModelFactoriesRector::class,
106-
RectorLaravel\Rector\Class_\AddMockConsoleOutputFalseToConsoleTestsRector::class,
107-
RectorLaravel\Rector\Class_\AnonymousMigrationsRector::class,
108-
// RectorLaravel\Rector\Class_\ModelCastsPropertyToCastsMethodRector::class,
109-
RectorLaravel\Rector\Class_\PropertyDeferToDeferrableProviderToRector::class,
110-
RectorLaravel\Rector\Class_\RemoveModelPropertyFromFactoriesRector::class,
111-
// // RectorLaravel\Rector\Class_\ReplaceExpectsMethodsInTestsRector::class,
112-
// // RectorLaravel\Rector\Class_\UnifyModelDatesWithCastsRector::class,
113-
// RectorLaravel\Rector\Empty_\EmptyToBlankAndFilledFuncRector::class,
114-
RectorLaravel\Rector\Expr\AppEnvironmentComparisonToParameterRector::class,
115-
RectorLaravel\Rector\Expr\SubStrToStartsWithOrEndsWithStaticMethodCallRector\SubStrToStartsWithOrEndsWithStaticMethodCallRector::class,
116-
// // RectorLaravel\Rector\FuncCall\DispatchNonShouldQueueToDispatchSyncRector::class,
117-
// // RectorLaravel\Rector\FuncCall\FactoryFuncCallToStaticCallRector::class,
118-
// RectorLaravel\Rector\FuncCall\HelperFuncCallToFacadeClassRector::class,
119-
RectorLaravel\Rector\FuncCall\NotFilledBlankFuncCallToBlankFilledFuncCallRector::class,
120-
RectorLaravel\Rector\FuncCall\NowFuncWithStartOfDayMethodCallToTodayFuncRector::class,
121-
RectorLaravel\Rector\FuncCall\RemoveDumpDataDeadCodeRector::class,
122-
RectorLaravel\Rector\FuncCall\RemoveRedundantValueCallsRector::class,
123-
RectorLaravel\Rector\FuncCall\RemoveRedundantWithCallsRector::class,
124-
RectorLaravel\Rector\FuncCall\SleepFuncToSleepStaticCallRector::class,
125-
RectorLaravel\Rector\FuncCall\ThrowIfAndThrowUnlessExceptionsToUseClassStringRector::class,
126-
RectorLaravel\Rector\If_\AbortIfRector::class,
127-
RectorLaravel\Rector\If_\ReportIfRector::class,
128-
// RectorLaravel\Rector\If_\ThrowIfRector::class,
129-
RectorLaravel\Rector\MethodCall\AssertStatusToAssertMethodRector::class,
130-
RectorLaravel\Rector\MethodCall\ChangeQueryWhereDateValueWithCarbonRector::class,
131-
// // RectorLaravel\Rector\MethodCall\DatabaseExpressionToStringToMethodCallRector::class,
132-
RectorLaravel\Rector\MethodCall\EloquentWhereRelationTypeHintingParameterRector::class,
133-
RectorLaravel\Rector\MethodCall\EloquentWhereTypeHintClosureParameterRector::class,
134-
// // RectorLaravel\Rector\MethodCall\FactoryApplyingStatesRector::class,
135-
RectorLaravel\Rector\MethodCall\JsonCallToExplicitJsonCallRector::class,
136-
// RectorLaravel\Rector\MethodCall\LumenRoutesStringActionToUsesArrayRector::class,
137-
// RectorLaravel\Rector\MethodCall\LumenRoutesStringMiddlewareToArrayRector::class,
138-
RectorLaravel\Rector\MethodCall\RedirectBackToBackHelperRector::class,
139-
RectorLaravel\Rector\MethodCall\RedirectRouteToToRouteHelperRector::class,
140-
RectorLaravel\Rector\MethodCall\RefactorBlueprintGeometryColumnsRector::class,
141-
// // RectorLaravel\Rector\MethodCall\ReplaceWithoutJobsEventsAndNotificationsWithFacadeFakeRector::class,
142-
RectorLaravel\Rector\MethodCall\UseComponentPropertyWithinCommandsRector::class,
143-
RectorLaravel\Rector\MethodCall\ValidationRuleArrayStringValueToArrayRector::class,
144-
// // RectorLaravel\Rector\Namespace_\FactoryDefinitionRector::class,
145-
RectorLaravel\Rector\New_\AddGuardToLoginEventRector::class,
146-
RectorLaravel\Rector\PropertyFetch\ReplaceFakerInstanceWithHelperRector::class,
147-
// RectorLaravel\Rector\StaticCall\DispatchToHelperFunctionsRector::class,
148-
// RectorLaravel\Rector\StaticCall\MinutesToSecondsInCacheRector::class,
149-
RectorLaravel\Rector\StaticCall\Redirect301ToPermanentRedirectRector::class,
150-
// // RectorLaravel\Rector\StaticCall\ReplaceAssertTimesSendWithAssertSentTimesRector::class,
151-
])
152-
->withRules([
153-
// // RectorLaravel\Rector\ClassMethod\AddArgumentDefaultValueRector::class,
154-
// // RectorLaravel\Rector\FuncCall\ArgumentFuncCallToMethodCallRector::class,
155-
// RectorLaravel\Rector\MethodCall\EloquentOrderByToLatestOrOldestRector::class,
156-
// RectorLaravel\Rector\MethodCall\ReplaceServiceContainerCallArgRector::class,
157-
// RectorLaravel\Rector\PropertyFetch\OptionalToNullsafeOperatorRector::class,
158-
// // RectorLaravel\Rector\StaticCall\EloquentMagicMethodToQueryBuilderRector::class,
159-
// RectorLaravel\Rector\StaticCall\RouteActionCallableRector::class,
160-
])
161-
->withConfiguredRule(RectorLaravel\Rector\MethodCall\EloquentOrderByToLatestOrOldestRector::class, [
162-
])
163-
->withConfiguredRule(RectorLaravel\Rector\MethodCall\ReplaceServiceContainerCallArgRector::class, [
164-
])
165-
->withConfiguredRule(RectorLaravel\Rector\PropertyFetch\OptionalToNullsafeOperatorRector::class, [
166-
])
167-
->withConfiguredRule(RectorLaravel\Rector\StaticCall\RouteActionCallableRector::class, [
107+
...collect(spl_autoload_functions())
108+
->pipe(static fn (Collection $splAutoloadFunctions): Collection => collect(
109+
$splAutoloadFunctions
110+
->firstOrFail(
111+
static fn (mixed $loader): bool => \is_array($loader) && $loader[0] instanceof ClassLoader
112+
)[0]
113+
->getClassMap()
114+
))
115+
->keys()
116+
->filter(static fn (string $class): bool => str_starts_with($class, 'RectorLaravel\Rector'))
117+
->filter(static fn (string $class): bool => (new ReflectionClass($class))->isInstantiable())
118+
// ->filter(static fn (string $class): bool => is_subclass_of($class, ConfigurableRectorInterface::class))
119+
->values()
120+
// ->dd()
121+
->all(),
168122
])
169123
->withConfiguredRule(RemoveAnnotationRector::class, [
170124
'codeCoverageIgnore',
@@ -181,10 +135,10 @@
181135
->withConfiguredRule(
182136
RenameFunctionRector::class,
183137
[
184-
'Pest\Faker\fake' => 'fake',
185-
'Pest\Faker\faker' => 'faker',
186138
// 'faker' => 'fake',
187139
'Guanguans\Notify\Foundation\Support\rescue' => 'Guanguans\LaravelExceptionNotify\Support\rescue',
140+
'Pest\Faker\fake' => 'fake',
141+
'Pest\Faker\faker' => 'faker',
188142
'rescue' => 'Guanguans\LaravelExceptionNotify\Support\rescue',
189143
'test' => 'it',
190144
] + array_reduce(
@@ -213,6 +167,13 @@ static function (array $carry, string $func): array {
213167
ReturnBinaryOrToEarlyReturnRector::class,
214168
WrapEncapsedVariableInCurlyBracesRector::class,
215169
])
170+
->withSkip([
171+
DispatchToHelperFunctionsRector::class,
172+
EmptyToBlankAndFilledFuncRector::class,
173+
HelperFuncCallToFacadeClassRector::class,
174+
ModelCastsPropertyToCastsMethodRector::class,
175+
TypeHintTappableCallRector::class,
176+
])
216177
->withSkip([
217178
StaticArrowFunctionRector::class => $staticClosureSkipPaths = [
218179
__DIR__.'/tests',

‎src/Collectors/RequestBasicCollector.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ public function collect(): array
3030
'duration' => (function (): string {
3131
$startTime = \defined('LARAVEL_START')
3232
? LARAVEL_START
33-
: $this->request->server('REQUEST_TIME_FLOAT', $_SERVER['REQUEST_TIME_FLOAT']);
33+
: $this->request->server('REQUEST_TIME_FLOAT');
34+
35+
if (blank($startTime)) {
36+
return 'Unknown';
37+
}
3438

3539
return human_milliseconds((microtime(true) - $startTime) * 1000);
3640
})(),

‎src/Commands/TestCommand.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function handle(ExceptionNotifyManager $exceptionNotifyManager): int
3939
return self::INVALID;
4040
}
4141

42-
if (empty(config('exception-notify.defaults'))) {
42+
if (blank(config('exception-notify.defaults'))) {
4343
$this->output->warning('The exception-notify default channels is empty. Please configure it first.');
4444

4545
return self::INVALID;

0 commit comments

Comments
 (0)