Skip to content

Commit ced7ab3

Browse files
committed
apply code quality rector set
1 parent f9d4cdb commit ced7ab3

7 files changed

+20
-16
lines changed

rector.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@
22

33
declare(strict_types=1);
44

5+
use Rector\CodeQuality\Rector\Array_\CallableThisArrayToAnonymousFunctionRector;
6+
use Rector\CodeQuality\Rector\If_\ExplicitBoolCompareRector;
7+
use Rector\CodingStyle\Rector\ClassMethod\UnSpreadOperatorRector;
58
use Rector\Core\Configuration\Option;
69
use Rector\Core\ValueObject\PhpVersion;
710
use Rector\Set\ValueObject\SetList;
811
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
912

1013
return static function (ContainerConfigurator $containerConfigurator): void {
14+
$containerConfigurator->import(SetList::CODE_QUALITY);
1115
$containerConfigurator->import(SetList::CODE_QUALITY_STRICT);
1216
$containerConfigurator->import(SetList::CODING_STYLE);
1317
$containerConfigurator->import(SetList::ORDER);
@@ -24,4 +28,10 @@
2428

2529
$parameters->set(Option::AUTO_IMPORT_NAMES, true);
2630
$parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_80);
31+
32+
$parameters->set(Option::SKIP, [
33+
CallableThisArrayToAnonymousFunctionRector::class,
34+
ExplicitBoolCompareRector::class,
35+
UnSpreadOperatorRector::class,
36+
]);
2737
};

spec/Integration/IntegrationViaErrorPreviewControllerForCannotConnecttoDBSpec.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
Console::overrideIsConsole(false);
1414

15-
$application = Application::init([
15+
return Application::init([
1616
'modules' => [
1717
'Laminas\Router',
1818
'Laminas\Db',
@@ -26,8 +26,6 @@
2626
],
2727
]);
2828

29-
return $application;
30-
3129
});
3230

3331
describe('/error-preview', function() {

spec/Integration/IntegrationViaErrorPreviewControllerForIdempotentSpec.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
Console::overrideIsConsole(false);
1717

18-
$application = Application::init([
18+
return Application::init([
1919
'modules' => [
2020
'Laminas\Router',
2121
'Laminas\Db',
@@ -29,8 +29,6 @@
2929
],
3030
]);
3131

32-
return $application;
33-
3432
});
3533

3634
given('tableGateway', function () {

spec/Integration/IntegrationViaErrorPreviewControllerForXmlHttpRequestSpec.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
Console::overrideIsConsole(false);
1616

17-
$application = Application::init([
17+
return Application::init([
1818
'modules' => [
1919
'Laminas\Router',
2020
'Laminas\Db',
@@ -28,8 +28,6 @@
2828
],
2929
]);
3030

31-
return $application;
32-
3331
});
3432

3533
describe('/error-preview', function() {

spec/Integration/IntegrationViaErrorPreviewControllerForXmlHttpRequestWithNonJsonMessageSpec.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
Console::overrideIsConsole(false);
1616

17-
$application = Application::init([
17+
return Application::init([
1818
'modules' => [
1919
'Laminas\Router',
2020
'Laminas\Db',
@@ -28,8 +28,6 @@
2828
],
2929
]);
3030

31-
return $application;
32-
3331
});
3432

3533
describe('/error-preview', function() {

src/HeroTrait.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
use function error_get_last;
1414
use function error_reporting;
15-
use function func_get_args;
1615
use function ini_set;
1716
use function is_array;
1817
use function ob_end_flush;
@@ -31,10 +30,13 @@ trait HeroTrait
3130
/** @var string */
3231
private $result = '';
3332

34-
public function phpError(): void
33+
/**
34+
* @param mixed $args
35+
*/
36+
public function phpError(...$args): void
3537
{
3638
if ($this instanceof Mvc) {
37-
Assert::count($args = func_get_args(), 1);
39+
Assert::count($args, 1);
3840
Assert::isInstanceOf($this->mvcEvent = $args[0], MvcEvent::class);
3941
}
4042

src/Middleware/Mezzio.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ private function showDefaultView(): Response|HtmlResponse
9797
&& $request->getHeaderLine('X-Requested-With') === 'XmlHttpRequest';
9898

9999
if (
100-
$isXmlHttpRequest === true &&
100+
$isXmlHttpRequest &&
101101
isset($this->errorHeroModuleConfig['display-settings']['ajax']['message'])
102102
) {
103103
return $this->responseByConfigMessage('ajax');

0 commit comments

Comments
 (0)