Skip to content

Commit d319beb

Browse files
committed
Merge branch '5.2' into 5.x
* 5.2: Fixes Undefined method call minor symfony#41065 [Security] Added missing translations for Serbian (sr_Cyrl) [Security] Added missing translations for Serbian (sr_Latn) symfony#41066
2 parents 5ad6f69 + 0d514d1 commit d319beb

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public function loadRoutes(LoaderInterface $loader)
182182
throw new \LogicException(sprintf('"%s" uses "%s", but does not implement the required method "protected function configureRoutes(RoutingConfigurator $routes): void".', get_debug_type($this), MicroKernelTrait::class), 0, $e);
183183
}
184184

185-
$configuratorClass = $configureRoutes->getNumberOfParameters() > 0 && ($type = $configureRoutes->getParameters()[0]->getType()) && !$type->isBuiltin() ? $type->getName() : null;
185+
$configuratorClass = $configureRoutes->getNumberOfParameters() > 0 && ($type = $configureRoutes->getParameters()[0]->getType()) instanceof \ReflectionNamedType && !$type->isBuiltin() ? $type->getName() : null;
186186

187187
if ($configuratorClass && !is_a(RoutingConfigurator::class, $configuratorClass, true)) {
188188
trigger_deprecation('symfony/framework-bundle', '5.1', 'Using type "%s" for argument 1 of method "%s:configureRoutes()" is deprecated, use "%s" instead.', RouteCollectionBuilder::class, self::class, RoutingConfigurator::class);

src/Symfony/Component/Security/Core/Resources/translations/security.sr_Cyrl.xlf

+8
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,14 @@
7070
<source>Invalid or expired login link.</source>
7171
<target>Линк за пријављивање је истекао или је неисправан.</target>
7272
</trans-unit>
73+
<trans-unit id="19">
74+
<source>Too many failed login attempts, please try again in %minutes% minute.</source>
75+
<target>Превише неуспешних покушаја пријављивања, молим покушајте поново за %minutes% минут.</target>
76+
</trans-unit>
77+
<trans-unit id="20">
78+
<source>Too many failed login attempts, please try again in %minutes% minutes.</source>
79+
<target>Превише неуспешних покушаја пријављивања, молим покушајте поново за %minutes% минута.</target>
80+
</trans-unit>
7381
</body>
7482
</file>
7583
</xliff>

src/Symfony/Component/Security/Core/Resources/translations/security.sr_Latn.xlf

+8
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,14 @@
7070
<source>Invalid or expired login link.</source>
7171
<target>Link za prijavljivanje je istekao ili je neispravan.</target>
7272
</trans-unit>
73+
<trans-unit id="19">
74+
<source>Too many failed login attempts, please try again in %minutes% minute.</source>
75+
<target>Previše neuspešnih pokušaja prijavljivanja, molim pokušajte ponovo za %minutes% minut.</target>
76+
</trans-unit>
77+
<trans-unit id="20">
78+
<source>Too many failed login attempts, please try again in %minutes% minutes.</source>
79+
<target>Previše neuspešnih pokušaja prijavljivanja, molim pokušajte ponovo za %minutes% minuta.</target>
80+
</trans-unit>
7381
</body>
7482
</file>
7583
</xliff>

0 commit comments

Comments
 (0)