From aecccfa4ad3a92c942cd28b91f15726d7b1651de Mon Sep 17 00:00:00 2001 From: Thomas Calvet Date: Fri, 2 Oct 2020 09:32:33 +0200 Subject: [PATCH 1/2] [4.4] Ignore more deprecations for Mockery mocks --- Authentication/Token/Storage/TokenStorage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Authentication/Token/Storage/TokenStorage.php b/Authentication/Token/Storage/TokenStorage.php index 61ece1aa..7aea15c9 100644 --- a/Authentication/Token/Storage/TokenStorage.php +++ b/Authentication/Token/Storage/TokenStorage.php @@ -45,7 +45,7 @@ public function getToken() */ public function setToken(TokenInterface $token = null) { - if (null !== $token && !method_exists($token, 'getRoleNames') && !$token instanceof \PHPUnit\Framework\MockObject\MockObject && !$token instanceof \Prophecy\Prophecy\ProphecySubjectInterface) { + if (null !== $token && !method_exists($token, 'getRoleNames') && !$token instanceof \PHPUnit\Framework\MockObject\MockObject && !$token instanceof \Prophecy\Prophecy\ProphecySubjectInterface && !$token instanceof \Mockery\MockInterface) { @trigger_error(sprintf('Not implementing the "%s::getRoleNames()" method in "%s" is deprecated since Symfony 4.3.', TokenInterface::class, \get_class($token)), \E_USER_DEPRECATED); } From 2696823e8d17416e67d06798f9d00c71fd15ada0 Mon Sep 17 00:00:00 2001 From: Ben Hakim Date: Sun, 4 Oct 2020 00:49:48 +0300 Subject: [PATCH 2/2] Update security.he.xlf --- Resources/translations/security.he.xlf | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Resources/translations/security.he.xlf b/Resources/translations/security.he.xlf index 3640698c..3004ad9d 100644 --- a/Resources/translations/security.he.xlf +++ b/Resources/translations/security.he.xlf @@ -4,7 +4,7 @@ An authentication exception occurred. - An authentication exception occurred. + שגיאה באימות Authentication credentials could not be found. @@ -12,11 +12,11 @@ Authentication request could not be processed due to a system problem. - Authentication request could not be processed due to a system problem. + לא ניתן היה לעבד את בקשת אימות בגלל בעיית מערכת. Invalid credentials. - Invalid credentials. + שם משתמש או סיסמא שגויים Cookie has already been used by someone else. @@ -40,7 +40,7 @@ No session available, it either timed out or cookies are not enabled. - No session available, it either timed out or cookies are not enabled. + אין סיישן זמין, או שתם הזמן הקצוב או העוגיות אינן מופעלות. No token could be found. @@ -48,23 +48,23 @@ Username could not be found. - Username could not be found. + שם משתמש לא נמצא במערכת Account has expired. - Account has expired. + החשבון פג תוקף. Credentials have expired. - Credentials have expired. + פרטי התחברות פקעו תוקף Account is disabled. - Account is disabled. + החשבון מבוטל. Account is locked. - Account is locked. + החשבון נעול.