diff --git a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
index b3b78a15b7..8f7ecb4017 100644
--- a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
+++ b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\ErrorHandler;
+use Composer\InstalledVersions;
use Doctrine\Common\Persistence\Proxy as LegacyProxy;
use Doctrine\Persistence\Proxy;
use Mockery\MockInterface;
@@ -491,6 +492,14 @@ class DebugClassLoader
self::$method[$class] = self::$method[$use];
}
} elseif (!$refl->isInterface()) {
+ if (!strncmp($vendor, str_replace('_', '\\', $use), $vendorLen)
+ && 0 === strpos($className, 'Symfony\\')
+ && (!class_exists(InstalledVersions::class)
+ || 'symfony/symfony' !== InstalledVersions::getRootPackage()['name'])
+ ) {
+ // skip "same vendor" @method deprecations for Symfony\* classes unless symfony/symfony is being tested
+ continue;
+ }
$hasCall = $refl->hasMethod('__call');
$hasStaticCall = $refl->hasMethod('__callStatic');
foreach (self::$method[$use] as $method) {
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.de.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.de.xlf
index c196611b17..dc7a875e31 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.de.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.de.xlf
@@ -70,6 +70,14 @@
Ungültiger oder abgelaufener Anmelde-Link.
+
+
+ Zu viele fehlgeschlagene Anmeldeversuche, bitte versuchen Sie es in einer Minute noch einmal.
+
+
+
+ Zu viele fehlgeschlagene Anmeldeversuche, bitte versuchen Sie es in %minutes% Minuten noch einmal.
+