Skip to content

Commit 4190ab7

Browse files
lochmuellerlochmueller
committed
Update CGL to TYPO3 CORE CGL / PER
1 parent e940e3f commit 4190ab7

19 files changed

+39
-38
lines changed

‎Classes/Check/FromCurrentPageCheck.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public function __invoke(CheckLanguageDetectionEvent $event): void
1414

1515
$referer = $serverInformation['HTTP_REFERER'] ?? '';
1616
$baseUri = rtrim((string)$event->getSite()->getBase(), '/');
17-
if ('' !== $referer && '' !== $baseUri && str_starts_with((string)$referer, $baseUri)) {
17+
if ($referer !== '' && $baseUri !== '' && str_starts_with((string)$referer, $baseUri)) {
1818
$event->disableLanguageDetection();
1919
}
2020
}

‎Classes/Check/PathCheck.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function __invoke(CheckLanguageDetectionEvent $event): void
2222
return;
2323
}
2424

25-
if ('/' !== $event->getRequest()->getUri()->getPath()) {
25+
if ($event->getRequest()->getUri()->getPath() !== '/') {
2626
$event->disableLanguageDetection();
2727
}
2828
}

‎Classes/Check/RequestMethodCheck.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class RequestMethodCheck
1010
{
1111
public function __invoke(CheckLanguageDetectionEvent $event): void
1212
{
13-
if ('GET' !== $event->getRequest()->getMethod()) {
13+
if ($event->getRequest()->getMethod() !== 'GET') {
1414
$event->disableLanguageDetection();
1515
}
1616
}

‎Classes/Detect/BrowserLanguageDetect.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,22 @@ public function __invoke(DetectUserLanguagesEvent $event): void
2121
// Set default quality
2222
$acceptedLanguagesArr = [];
2323
foreach ($languages as $languageAndQualityStr) {
24-
if (false !== strpos($languageAndQualityStr, ';')) {
24+
if (str_contains($languageAndQualityStr, ';')) {
2525
$parts = GeneralUtility::trimExplode(';', $languageAndQualityStr, true);
2626
$languageCode = $parts[0];
2727
$quality = isset($parts[1]) ? (string)$parts[1] : '';
2828
} else {
2929
$languageCode = $languageAndQualityStr;
3030
$quality = 'q=1.0';
3131
}
32-
$acceptedLanguagesArr[$languageCode] = '' !== $quality ? (float)mb_substr($quality, 2) : 1.0;
32+
$acceptedLanguagesArr[$languageCode] = $quality !== '' ? (float)mb_substr($quality, 2) : 1.0;
3333
}
3434

3535
// Sort
3636
arsort($acceptedLanguagesArr);
3737

3838
// Remove quality 0.0
39-
$acceptedLanguagesArr = array_filter($acceptedLanguagesArr, fn ($value, $key): bool => 0.0 !== $value, \ARRAY_FILTER_USE_BOTH);
39+
$acceptedLanguagesArr = array_filter($acceptedLanguagesArr, fn ($value, $key): bool => $value !== 0.0, \ARRAY_FILTER_USE_BOTH);
4040

4141
$event->setUserLanguages(LocaleCollection::fromArray(array_keys($acceptedLanguagesArr)));
4242
}

‎Classes/Detect/GeoPluginDetect.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function __invoke(DetectUserLanguagesEvent $event): void
4141
}
4242

4343
$language = $this->getLanguage($event->getRequest());
44-
if (null === $language) {
44+
if ($language === null) {
4545
return;
4646
}
4747

@@ -51,7 +51,7 @@ public function __invoke(DetectUserLanguagesEvent $event): void
5151
public function getLanguage(ServerRequestInterface $request): ?string
5252
{
5353
$countryCode = $this->ipLocation->getCountryCode($request->getServerParams()['REMOTE_ADDR'] ?? '');
54-
if (null === $countryCode) {
54+
if ($countryCode === null) {
5555
return null;
5656
}
5757

‎Classes/Detect/MaxMindDetect.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ protected function getProvider(SiteConfiguration $siteConfiguration): ?ProviderI
5656
return new Client($siteConfiguration->getMaxMindAccountId(), $siteConfiguration->getMaxMindLicenseKey());
5757
}
5858

59-
if ('' !== $siteConfiguration->getMaxMindDatabasePath()) {
59+
if ($siteConfiguration->getMaxMindDatabasePath() !== '') {
6060
$dbPath = GeneralUtility::getFileAbsFileName($siteConfiguration->getMaxMindDatabasePath());
6161
if (is_file($dbPath)) {
6262
return new Reader($dbPath);

‎Classes/Event/BuildResponseEvent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ public function setResponse(ResponseInterface $response): void
5151

5252
public function isPropagationStopped(): bool
5353
{
54-
return null !== $this->getResponse();
54+
return $this->getResponse() !== null;
5555
}
5656
}

‎Classes/Event/NegotiateSiteLanguageEvent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ public function setSelectedLanguage(SiteLanguage $selectedLanguage): void
5151

5252
public function isPropagationStopped(): bool
5353
{
54-
return null !== $this->selectedLanguage;
54+
return $this->selectedLanguage !== null;
5555
}
5656
}

‎Classes/Handler/JsonDetectionHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class JsonDetectionHandler extends AbstractHandler implements RequestHandlerInte
2222
{
2323
public function handle(ServerRequestInterface $request): ResponseInterface
2424
{
25-
if ('/language.json' !== $request->getUri()->getPath()) {
25+
if ($request->getUri()->getPath() !== '/language.json') {
2626
throw new DisableLanguageDetectionException('Wrong URI for JSON detection', 2_346_782);
2727
}
2828

@@ -39,7 +39,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
3939
$this->eventDispatcher->dispatch($negotiate);
4040

4141
$selectedLanguage = $negotiate->getSelectedLanguage();
42-
if (null === $selectedLanguage) {
42+
if ($selectedLanguage === null) {
4343
$negotiate->setSelectedLanguage($site->getDefaultLanguage());
4444
}
4545

‎Classes/Handler/LanguageDetectionHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ public function handle(ServerRequestInterface $request): ResponseInterface
4343
$negotiate = new NegotiateSiteLanguageEvent($site, $request, $detect->getUserLanguages());
4444
$this->eventDispatcher->dispatch($negotiate);
4545

46-
if (null === $negotiate->getSelectedLanguage()) {
46+
if ($negotiate->getSelectedLanguage() === null) {
4747
throw new NoSelectedLanguageException();
4848
}
4949

5050
$response = new BuildResponseEvent($site, $request, $negotiate->getSelectedLanguage());
5151
$this->eventDispatcher->dispatch($response);
5252

53-
if (null === $response->getResponse()) {
53+
if ($response->getResponse() === null) {
5454
throw new NoResponseException();
5555
}
5656

‎Classes/Handler/LinkLanguageHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
4848
$negotiate = new NegotiateSiteLanguageEvent($site, $request, $detect->getUserLanguages());
4949
$this->eventDispatcher->dispatch($negotiate);
5050

51-
if (null === $negotiate->getSelectedLanguage()) {
51+
if ($negotiate->getSelectedLanguage() === null) {
5252
throw new NoSelectedLanguageException();
5353
}
5454

‎Classes/Response/DefaultResponse.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ protected function checkSameUri(ServerRequestInterface $request, Uri $targetUri)
6363
return false;
6464
}
6565

66-
if ('' === (string)$targetUri->getHost()) {
66+
if ((string)$targetUri->getHost() === '') {
6767
$absoluteTargetUri = $targetUri->withScheme($request->getUri()->getScheme())->withHost($request->getUri()->getHost());
6868
if ((string)$request->getUri() === (string)$absoluteTargetUri) {
6969
return false;

‎Classes/Service/IpLocation.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@ public function __construct(RequestFactoryInterface $requestFactory)
1818

1919
public function getCountryCode(string $ip): ?string
2020
{
21-
if ('' === $ip) {
21+
if ($ip === '') {
2222
return null;
2323
}
2424
$urlService = 'http://www.geoplugin.net/php.gp?ip=' . $ip;
2525
try {
2626
$request = $this->requestFactory->createRequest('GET', $urlService);
2727
$response = GuzzleClientFactory::getClient()->send($request);
2828

29-
if (200 !== $response->getStatusCode()) {
29+
if ($response->getStatusCode() !== 200) {
3030
throw new IpLocationException('Missing information in response', 123781);
3131
}
3232
$result = (array)unserialize((string)$response->getBody(), ['allowed_classes' => false]);
3333

34-
if (empty($result) || 404 === (int)$result['geoplugin_status']) {
34+
if (empty($result) || (int)$result['geoplugin_status'] === 404) {
3535
throw new IpLocationException('No valid data', 162378);
3636
}
3737

‎Classes/Service/Normalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public function normalize(string $locale): string
2020
{
2121
// Drop charset
2222
$pos = strpos($locale, '.');
23-
if (false !== $pos) {
23+
if ($pos !== false) {
2424
$locale = substr($locale, 0, $pos);
2525
}
2626

‎Classes/Service/RespectLanguageLinkDetailsTrait.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ trait RespectLanguageLinkDetailsTrait
2626
*/
2727
public function addLanguageParameterByDetection(array $linkDetails, ?ServerRequestInterface $request = null): array
2828
{
29-
if (LinkService::TYPE_PAGE !== $linkDetails['type']) {
29+
if ($linkDetails['type'] !== LinkService::TYPE_PAGE) {
3030
return $linkDetails;
3131
}
3232

33-
if (null === $request) {
33+
if ($request === null) {
3434
$request = ServerRequestFactory::fromGlobals();
3535
$request = $request->withMethod('GET')->withUri(new Uri('/'));
3636
}

‎Classes/Service/TcaLanguageSelection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class TcaLanguageSelection
1414

1515
public function __construct(?SiteFinder $siteFinder = null)
1616
{
17-
if (null === $siteFinder) {
17+
if ($siteFinder === null) {
1818
/** @var SiteFinder $siteFinder */
1919
$siteFinder = GeneralUtility::makeInstance(SiteFinder::class);
2020
}

‎Resources/Private/Build/PhpCsFixer.php

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,8 @@
1515
return (new PhpCsFixer\Config())
1616
->setRiskyAllowed(true)
1717
->setRules([
18-
'@PhpCsFixer' => true,
19-
'@Symfony' => true,
20-
'@Symfony:risky' => true,
2118
'@DoctrineAnnotation' => true,
22-
'@PSR12' => true,
23-
'@PHP74Migration' => true,
24-
'@PHP74Migration:risky' => true,
25-
'@PHPUnit84Migration:risky' => true,
19+
'@PER' => true,
2620
'array_syntax' => ['syntax' => 'short'],
2721
'blank_line_after_opening_tag' => true,
2822
'braces' => ['allow_single_line_closure' => true],
@@ -31,29 +25,33 @@
3125
'concat_space' => ['spacing' => 'one'],
3226
'declare_equal_normalize' => ['space' => 'none'],
3327
'dir_constant' => true,
28+
'function_to_constant' => ['functions' => ['get_called_class', 'get_class', 'get_class_this', 'php_sapi_name', 'phpversion', 'pi']],
3429
'function_typehint_space' => true,
3530
'lowercase_cast' => true,
36-
'native_function_invocation' => ['exclude' => ['function_exists']],
3731
'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
32+
'modernize_strpos' => true,
3833
'modernize_types_casting' => true,
3934
'native_function_casing' => true,
4035
'new_with_braces' => true,
4136
'no_alias_functions' => true,
4237
'no_blank_lines_after_phpdoc' => true,
4338
'no_empty_phpdoc' => true,
4439
'no_empty_statement' => true,
40+
'no_extra_blank_lines' => true,
4541
'no_leading_import_slash' => true,
4642
'no_leading_namespace_whitespace' => true,
4743
'no_null_property_initialization' => true,
4844
'no_short_bool_cast' => true,
4945
'no_singleline_whitespace_before_semicolons' => true,
5046
'no_superfluous_elseif' => true,
51-
'no_trailing_comma_in_singleline_array' => true,
47+
'no_trailing_comma_in_singleline' => true,
5248
'no_unneeded_control_parentheses' => true,
5349
'no_unused_imports' => true,
5450
'no_useless_else' => true,
51+
'no_useless_nullsafe_operator' => true,
5552
'no_whitespace_in_blank_line' => true,
5653
'ordered_imports' => true,
54+
'php_unit_construct' => ['assertions' => ['assertEquals', 'assertSame', 'assertNotEquals', 'assertNotSame']],
5755
'php_unit_mock_short_will_return' => true,
5856
'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
5957
'phpdoc_no_access' => true,
@@ -65,8 +63,11 @@
6563
'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
6664
'return_type_declaration' => ['space_before' => 'none'],
6765
'single_quote' => true,
66+
'single_line_comment_style' => ['comment_types' => ['hash']],
6867
'single_trait_insert_per_statement' => true,
69-
'whitespace_after_comma_in_array' => true,
68+
'trailing_comma_in_multiline' => ['elements' => ['arrays']],
69+
'whitespace_after_comma_in_array' => ['ensure_single_space' => true],
70+
'yoda_style' => ['equal' => false, 'identical' => false, 'less_and_greater' => false],
7071
])
7172
->setFinder($finder)
7273
;

‎Tests/Unit/Response/DefaultResponseTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function testConfigurationWithWrongErrorCode(): void
8282
$defaultResponse($event);
8383

8484
self::assertNotNull($event->getResponse());
85-
if (null !== $event->getResponse()) {
85+
if ($event->getResponse() !== null) {
8686
self::assertEquals(307, $event->getResponse()->getStatusCode());
8787
}
8888
}
@@ -117,7 +117,7 @@ public function testConfigurationWithRedirectParams(): void
117117
$defaultResponse($event);
118118

119119
self::assertNotNull($event->getResponse());
120-
if (null !== $event->getResponse()) {
120+
if ($event->getResponse() !== null) {
121121
self::assertEquals(307, $event->getResponse()->getStatusCode());
122122
self::assertEquals('/en/?test=1', $event->getResponse()->getHeaderLine('location'));
123123
}

‎Tests/Unit/Service/RespectLanguageLinkDetailsTraitTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,13 @@ protected function createTraitMock(?LinkLanguageHandler $linkLanguageHandler = n
133133
$traitObject = $this->getObjectForTrait(RespectLanguageLinkDetailsTrait::class);
134134
$reflectionClass = new \ReflectionClass($traitObject);
135135

136-
if (null !== $linkLanguageHandler) {
136+
if ($linkLanguageHandler !== null) {
137137
$propertyLanguageEventDispatcher = $reflectionClass->getProperty('linkLanguageHandler');
138138
$propertyLanguageEventDispatcher->setAccessible(true);
139139
$propertyLanguageEventDispatcher->setValue($traitObject, $linkLanguageHandler);
140140
}
141141

142-
if (null !== $languageSiteFinder) {
142+
if ($languageSiteFinder !== null) {
143143
$propertyLanguageSiteFinder = $reflectionClass->getProperty('languageSiteFinder');
144144
$propertyLanguageSiteFinder->setAccessible(true);
145145
$propertyLanguageSiteFinder->setValue($traitObject, $languageSiteFinder);

0 commit comments

Comments
 (0)