Skip to content

Commit b1e7ea0

Browse files
committed
drop php 7.3 support
1 parent 052b84f commit b1e7ea0

File tree

6 files changed

+11
-29
lines changed

6 files changed

+11
-29
lines changed

rector.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
1111

1212
return static function (ContainerConfigurator $containerConfigurator): void {
13-
$containerConfigurator->import(LevelSetList::UP_TO_PHP_73);
13+
$containerConfigurator->import(LevelSetList::UP_TO_PHP_74);
1414
$containerConfigurator->import(SetList::CODE_QUALITY);
1515
$containerConfigurator->import(SetList::NAMING);
1616
$containerConfigurator->import(SetList::TYPE_DECLARATION);
@@ -20,7 +20,6 @@
2020
$parameters->set(Option::PATHS, [__DIR__ . '/config', __DIR__ . '/src', __DIR__ . '/spec']);
2121

2222
$parameters->set(Option::AUTO_IMPORT_NAMES, true);
23-
$parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_73);
2423

2524
$parameters->set(Option::SKIP, [
2625
AbsolutizeRequireAndIncludePathRector::class,

spec/Listener/ForceHttpsFactorySpec.php

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

1616
describe('->__invoke', function () {
1717

18-
given('container', function (): object {
19-
return Double::instance(['implements' => ContainerInterface::class]);
20-
});
18+
given('container', fn(): object => Double::instance(['implements' => ContainerInterface::class]));
2119

2220
it('returns ' . ForceHttps::class . ' instance with default config', function (): void {
2321

spec/Middleware/ForceHttpsFactorySpec.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,9 @@
1616

1717
describe('->__invoke', function () {
1818

19-
given('container', function (): object {
20-
return Double::instance(['implements' => ContainerInterface::class]);
21-
});
19+
given('container', fn(): object => Double::instance(['implements' => ContainerInterface::class]));
2220

23-
given('router', function (): object {
24-
return Double::instance(['implements' => RouterInterface::class]);
25-
});
21+
given('router', fn(): object => Double::instance(['implements' => RouterInterface::class]));
2622

2723
it('returns ' . ForceHttps::class . ' instance with default config', function (): void {
2824

spec/Middleware/ForceHttpsSpec.php

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,13 @@
1717

1818
describe('->invoke()', function () {
1919

20-
given('response', function (): object {
21-
return Double::instance(['implements' => ResponseInterface::class]);
22-
});
20+
given('response', fn(): object => Double::instance(['implements' => ResponseInterface::class]));
2321

24-
given('request', function (): object {
25-
return Double::instance(['implements' => ServerRequestInterface::class]);
26-
});
22+
given('request', fn(): object => Double::instance(['implements' => ServerRequestInterface::class]));
2723

28-
given('uri', function (): object {
29-
return Double::instance(['implements' => UriInterface::class]);
30-
});
24+
given('uri', fn(): object => Double::instance(['implements' => UriInterface::class]));
3125

32-
given('router', function (): object {
33-
return Double::instance(['implements' => RouterInterface::class]);
34-
});
26+
given('router', fn(): object => Double::instance(['implements' => RouterInterface::class]));
3527

3628
it('not redirect on not-enable', function (): void {
3729

src/Listener/ForceHttps.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ public function forceHttpsScheme(MvcEvent $mvcEvent): void
8383
}
8484
}
8585

86-
$httpsRequestUri = $httpsRequestUri
87-
?? $this->getFinalhttpsRequestUri((string) $http->setScheme('https'));
86+
$httpsRequestUri ??= $this->getFinalhttpsRequestUri((string) $http->setScheme('https'));
8887

8988
// 308 keeps headers, request method, and request body
9089
$response->setStatusCode(308);

src/Middleware/ForceHttps.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ class ForceHttps implements MiddlewareInterface
1919
/** @var array */
2020
private $config;
2121

22-
/** @var RouterInterface */
23-
private $router;
22+
private RouterInterface $router;
2423

2524
/**
2625
* @param mixed[] $config
@@ -78,8 +77,7 @@ public function process(
7877
}
7978
}
8079

81-
$httpsRequestUri = $httpsRequestUri
82-
?? $this->getFinalhttpsRequestUri((string) $uri->withScheme('https'));
80+
$httpsRequestUri ??= $this->getFinalhttpsRequestUri((string) $uri->withScheme('https'));
8381

8482
// 308 keeps headers, request method, and request body
8583
$response = $response->withStatus(308);

0 commit comments

Comments
 (0)