Skip to content

Commit f2b6d2e

Browse files
Merge branch '4.4'
* 4.4: (27 commits) [Validator] add notice in UPGRADE file for new Range constraint option [CssSelector] Support *:only-of-type pseudo class selector [Intl] Update the ICU data to 65.1 (4.4 branch) [Intl] Update the ICU data to 65.1 (4.3 branch) Replace deprecated calls in tests [Intl] Update the ICU data to 65.1 Delete 5_Security_issue.md [DI] Whitelist error_renderer.renderer tag in UnusedTagsPass [DI] Whitelist validator.auto_mapper in UnusedTagsPass Update CHANGELOG.md [HttpClient] Fixed #33832 NO_PROXY option ignored in NativeHttpClient::request() method [EventDispatcher] A compiler pass for aliased userland events. [Cache] give 100ms before starting the expiration countdown [Cache] fix logger usage in CacheTrait::doGet() [VarDumper] fix dumping uninitialized SplFileInfo Added missing translations. [Form] Added CountryType option for using alpha3 country codes Fixed invalid changelog 4.0.0 for VarDumper [Workflow] Fixed BC break on WorkflowInterface Fix wrong expression language value ...
2 parents bbe96db + e381f6c commit f2b6d2e

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

Loader/Configurator/CollectionConfigurator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function __destruct()
4848
/**
4949
* Creates a sub-collection.
5050
*/
51-
final public function collection($name = ''): self
51+
final public function collection(string $name = ''): self
5252
{
5353
return new self($this->collection, $this->name.$name, $this, $this->prefixes);
5454
}

Loader/XmlFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ private function parseDefaultNode(\DOMElement $node, string $path)
409409
}
410410
}
411411

412-
private function isElementValueNull(\DOMElement $element)
412+
private function isElementValueNull(\DOMElement $element): bool
413413
{
414414
$namespaceUri = 'http://www.w3.org/2001/XMLSchema-instance';
415415

Matcher/Dumper/CompiledUrlMatcherDumper.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ private function compileRoute(Route $route, string $name, $vars, bool $hasTraili
443443
];
444444
}
445445

446-
private function getExpressionLanguage()
446+
private function getExpressionLanguage(): ExpressionLanguage
447447
{
448448
if (null === $this->expressionLanguage) {
449449
if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {
@@ -455,7 +455,7 @@ private function getExpressionLanguage()
455455
return $this->expressionLanguage;
456456
}
457457

458-
private function indent(string $code, int $level = 1)
458+
private function indent(string $code, int $level = 1): string
459459
{
460460
return preg_replace('/^./m', str_repeat(' ', $level).'$0', $code);
461461
}

Matcher/Dumper/CompiledUrlMatcherTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ trait CompiledUrlMatcherTrait
3232
private $dynamicRoutes = [];
3333
private $checkCondition;
3434

35-
public function match(string $pathinfo)
35+
public function match(string $pathinfo): array
3636
{
3737
$allow = $allowSchemes = [];
3838
if ($ret = $this->doMatch($pathinfo, $allow, $allowSchemes)) {

Matcher/UrlMatcher.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ protected function getExpressionLanguage()
267267
/**
268268
* @internal
269269
*/
270-
protected function createRequest(string $pathinfo)
270+
protected function createRequest(string $pathinfo): ?Request
271271
{
272272
if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
273273
return null;

0 commit comments

Comments
 (0)