From ad2e166d4ebd4398d822e6caf42141cc60446545 Mon Sep 17 00:00:00 2001 From: Yannick Vanhaeren Date: Tue, 17 Jul 2018 09:53:55 +0200 Subject: [PATCH 01/10] Fix SVGs not scaling in IE9, IE10, and IE11 --- .../WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig index 00ab74ad9f..b5e21a6ebf 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig @@ -60,6 +60,7 @@ .sf-toolbarreset svg, .sf-toolbarreset img { height: 20px; + width: 20px; display: inline-block; } From 1d93b5e26ad9bb9e22c9a7c453ea98bc5400dbbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Tue, 17 Jul 2018 14:18:04 +0200 Subject: [PATCH 02/10] [MonologBridge] Improve FirePHPHandler --- src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php b/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php index 056496ae13..966a7baf83 100644 --- a/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php +++ b/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php @@ -38,9 +38,10 @@ class FirePHPHandler extends BaseFirePHPHandler return; } - if (!preg_match('{\bFirePHP/\d+\.\d+\b}', $event->getRequest()->headers->get('User-Agent')) - && !$event->getRequest()->headers->has('X-FirePHP-Version')) { - $this->sendHeaders = false; + $request = $event->getRequest(); + if (!preg_match('{\bFirePHP/\d+\.\d+\b}', $request->headers->get('User-Agent')) + && !$request->headers->has('X-FirePHP-Version')) { + self::$sendHeaders = false; $this->headers = array(); return; @@ -58,7 +59,7 @@ class FirePHPHandler extends BaseFirePHPHandler */ protected function sendHeader($header, $content) { - if (!$this->sendHeaders) { + if (!self::$sendHeaders) { return; } From 8e49598788cab3bb20ff1b1284406eee4c28bc98 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Wed, 18 Jul 2018 13:02:07 +0200 Subject: [PATCH 03/10] Fix PHPDoc return type GetResponseEvent::getResponse() may return null too --- src/Symfony/Component/HttpKernel/Event/GetResponseEvent.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpKernel/Event/GetResponseEvent.php b/src/Symfony/Component/HttpKernel/Event/GetResponseEvent.php index f7745ea3dc..c25a0f1cf1 100644 --- a/src/Symfony/Component/HttpKernel/Event/GetResponseEvent.php +++ b/src/Symfony/Component/HttpKernel/Event/GetResponseEvent.php @@ -29,7 +29,7 @@ class GetResponseEvent extends KernelEvent /** * Returns the response object. * - * @return Response + * @return Response|null */ public function getResponse() { From 1a427b181dec0ffe920b604d5b42f23d83495c12 Mon Sep 17 00:00:00 2001 From: Andreas Date: Fri, 16 Feb 2018 06:32:23 +0100 Subject: [PATCH 04/10] Fix false-positive deprecation notices for TranslationLoader and WriteCheckSessionHandler --- .../FrameworkBundle/Translation/TranslationLoader.php | 7 +++++-- .../Session/Storage/Handler/WriteCheckSessionHandler.php | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php b/src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php index 2431e79ff2..2466d1f295 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php +++ b/src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php @@ -14,13 +14,16 @@ namespace Symfony\Bundle\FrameworkBundle\Translation; use Symfony\Component\Translation\Reader\TranslationReader; use Symfony\Component\Translation\MessageCatalogue; -@trigger_error(sprintf('The class "%s" is deprecated since Symfony 3.4 and will be removed in 4.0. Use "%s" instead. ', TranslationLoader::class, TranslationReader::class), E_USER_DEPRECATED); - /** * @deprecated since version 3.4 and will be removed in 4.0. Use Symfony\Component\Translation\Reader\TranslationReader instead */ class TranslationLoader extends TranslationReader { + public function __construct() + { + @trigger_error(sprintf('The class "%s" is deprecated since Symfony 3.4 and will be removed in 4.0. Use "%s" instead. ', self::class, TranslationReader::class), E_USER_DEPRECATED); + } + /** * Loads translation messages from a directory to the catalogue. * diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/WriteCheckSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/WriteCheckSessionHandler.php index 1541ec4e0a..127e47f210 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/WriteCheckSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/WriteCheckSessionHandler.php @@ -11,8 +11,6 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Handler; -@trigger_error(sprintf('The %s class is deprecated since Symfony 3.4 and will be removed in 4.0. Implement `SessionUpdateTimestampHandlerInterface` or extend `AbstractSessionHandler` instead.', WriteCheckSessionHandler::class), E_USER_DEPRECATED); - /** * Wraps another SessionHandlerInterface to only write the session when it has been modified. * @@ -31,6 +29,8 @@ class WriteCheckSessionHandler implements \SessionHandlerInterface public function __construct(\SessionHandlerInterface $wrappedSessionHandler) { + @trigger_error(sprintf('The %s class is deprecated since Symfony 3.4 and will be removed in 4.0. Implement `SessionUpdateTimestampHandlerInterface` or extend `AbstractSessionHandler` instead.', self::class), E_USER_DEPRECATED); + $this->wrappedSessionHandler = $wrappedSessionHandler; } From 7cf840c83c1a61014f7f72e63c1819c1dfe91b26 Mon Sep 17 00:00:00 2001 From: Massimiliano Arione Date: Thu, 19 Jul 2018 10:51:22 +0200 Subject: [PATCH 05/10] add missing translation for uuid validator --- .../Validator/Resources/translations/validators.it.xlf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.it.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.it.xlf index 38e437d6cf..b3ea45f70b 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.it.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.it.xlf @@ -314,6 +314,10 @@ This is not a valid Business Identifier Code (BIC). Questo valore non è un codice BIC valido. + + This is not a valid UUID. + Questo non è un UUID valido. + From 2a950b668f92f7c0eceb213b8efbcc983b48577d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Egyed?= Date: Thu, 19 Jul 2018 12:05:15 +0200 Subject: [PATCH 06/10] [Validator] Add missing UUID validator message translation (en) --- .../Validator/Resources/translations/validators.en.xlf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf index 2a5c97d8cf..30ac67c346 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf @@ -314,6 +314,10 @@ This is not a valid Business Identifier Code (BIC). This is not a valid Business Identifier Code (BIC). + + This is not a valid UUID. + This is not a valid UUID. + From 0b2134415c7506fd8a99abb30bc9e34851ba0b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Egyed?= Date: Thu, 19 Jul 2018 12:07:41 +0200 Subject: [PATCH 07/10] [Validator] Add missing UUID validator message translation (hu) --- .../Validator/Resources/translations/validators.hu.xlf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf index a113a7241b..afa3de65ec 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf @@ -314,6 +314,10 @@ This is not a valid Business Identifier Code (BIC). Érvénytelen nemzetközi bankazonosító kód (BIC/SWIFT). + + This is not a valid UUID. + Érvénytelen egyedi azonosító (UUID). + From 4ff0f951be67af1be5d2830244e707859ce9becd Mon Sep 17 00:00:00 2001 From: Kyle Date: Thu, 19 Jul 2018 13:59:44 +0200 Subject: [PATCH 08/10] Serbo-Croatian has Serbian plural rule --- src/Symfony/Component/Translation/PluralizationRules.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Symfony/Component/Translation/PluralizationRules.php b/src/Symfony/Component/Translation/PluralizationRules.php index 2b7b118336..80de7aabdf 100644 --- a/src/Symfony/Component/Translation/PluralizationRules.php +++ b/src/Symfony/Component/Translation/PluralizationRules.php @@ -144,6 +144,7 @@ class PluralizationRules case 'bs': case 'hr': case 'ru': + case 'sh': case 'sr': case 'uk': return ((1 == $number % 10) && (11 != $number % 100)) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2); From ee780f3c664f8e2846aba087c5e9653a92c64252 Mon Sep 17 00:00:00 2001 From: Jannik Zschiesche Date: Thu, 19 Jul 2018 14:11:20 +0200 Subject: [PATCH 09/10] Add several missing translations of the UUID validation message. --- .../Validator/Resources/translations/validators.ca.xlf | 4 ++++ .../Validator/Resources/translations/validators.de.xlf | 4 ++++ .../Validator/Resources/translations/validators.es.xlf | 4 ++++ .../Validator/Resources/translations/validators.eu.xlf | 4 ++++ .../Validator/Resources/translations/validators.fr.xlf | 4 ++++ .../Validator/Resources/translations/validators.nl.xlf | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf index 85b6970fc3..ecdc80bdf7 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf @@ -302,6 +302,10 @@ An empty file is not allowed. No està permès un fixter buit. + + This is not a valid UUID. + Aquest valor no és un UUID vàlid. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf index 192b992f8f..8be512549c 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf @@ -314,6 +314,10 @@ This is not a valid Business Identifier Code (BIC). Dieser Wert ist kein gültiger BIC. + + This is not a valid UUID. + Dies ist keine gültige UUID. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf index 1fa59dda6a..f8950a6f47 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf @@ -314,6 +314,10 @@ This is not a valid Business Identifier Code (BIC). No es un Código de Identificación Bancaria (BIC) válido. + + This is not a valid UUID. + Este valor no es un UUID válido. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.eu.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.eu.xlf index b2edefd303..eef1c5acc1 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.eu.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.eu.xlf @@ -278,6 +278,10 @@ This value should not be identical to {{ compared_value_type }} {{ compared_value }}. Balio hau ez litzateke {{ compared_value_type }} {{ compared_value }}-(r)en berbera izan behar. + + This is not a valid UUID. + Balio hau ez da onartutako UUID bat. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf index 30a883bbf2..a6d5a63db9 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf @@ -314,6 +314,10 @@ This is not a valid Business Identifier Code (BIC). Ce n'est pas un code universel d'identification des banques (BIC) valide. + + This is not a valid UUID. + Ceci n'est pas un UUID valide. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf index e81141f0ee..f49c8c6f02 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf @@ -310,6 +310,10 @@ This is not a valid Business Identifier Code (BIC). Dit is geen geldige bedrijfsidentificatiecode (BIC/SWIFT). + + This is not a valid UUID. + Deze waarde is geen geldige UUID waarde. + From 5d76ed7a3afc748aa38d219b9a3ca100d3c458fc Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 23 Jul 2018 10:13:01 +0200 Subject: [PATCH 10/10] fixed UUID error message id in translation files --- .../Validator/Resources/translations/validators.ca.xlf | 2 +- .../Validator/Resources/translations/validators.de.xlf | 2 +- .../Validator/Resources/translations/validators.en.xlf | 2 +- .../Validator/Resources/translations/validators.es.xlf | 2 +- .../Validator/Resources/translations/validators.eu.xlf | 2 +- .../Validator/Resources/translations/validators.fr.xlf | 2 +- .../Validator/Resources/translations/validators.hu.xlf | 2 +- .../Validator/Resources/translations/validators.it.xlf | 2 +- .../Validator/Resources/translations/validators.nl.xlf | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf index ecdc80bdf7..078a25d052 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf @@ -302,7 +302,7 @@ An empty file is not allowed. No està permès un fixter buit. - + This is not a valid UUID. Aquest valor no és un UUID vàlid. diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf index 8be512549c..503a22930b 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf @@ -314,7 +314,7 @@ This is not a valid Business Identifier Code (BIC). Dieser Wert ist kein gültiger BIC. - + This is not a valid UUID. Dies ist keine gültige UUID. diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf index 30ac67c346..693177d431 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf @@ -314,7 +314,7 @@ This is not a valid Business Identifier Code (BIC). This is not a valid Business Identifier Code (BIC). - + This is not a valid UUID. This is not a valid UUID. diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf index f8950a6f47..d356d190e2 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf @@ -314,7 +314,7 @@ This is not a valid Business Identifier Code (BIC). No es un Código de Identificación Bancaria (BIC) válido. - + This is not a valid UUID. Este valor no es un UUID válido. diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.eu.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.eu.xlf index eef1c5acc1..4ec2516691 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.eu.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.eu.xlf @@ -278,7 +278,7 @@ This value should not be identical to {{ compared_value_type }} {{ compared_value }}. Balio hau ez litzateke {{ compared_value_type }} {{ compared_value }}-(r)en berbera izan behar. - + This is not a valid UUID. Balio hau ez da onartutako UUID bat. diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf index a6d5a63db9..7032ac9a73 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf @@ -314,7 +314,7 @@ This is not a valid Business Identifier Code (BIC). Ce n'est pas un code universel d'identification des banques (BIC) valide. - + This is not a valid UUID. Ceci n'est pas un UUID valide. diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf index afa3de65ec..f495d09106 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf @@ -314,7 +314,7 @@ This is not a valid Business Identifier Code (BIC). Érvénytelen nemzetközi bankazonosító kód (BIC/SWIFT). - + This is not a valid UUID. Érvénytelen egyedi azonosító (UUID). diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.it.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.it.xlf index b3ea45f70b..ee24b9ca4a 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.it.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.it.xlf @@ -314,7 +314,7 @@ This is not a valid Business Identifier Code (BIC). Questo valore non è un codice BIC valido. - + This is not a valid UUID. Questo non è un UUID valido. diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf index f49c8c6f02..954558ad22 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf @@ -310,7 +310,7 @@ This is not a valid Business Identifier Code (BIC). Dit is geen geldige bedrijfsidentificatiecode (BIC/SWIFT). - + This is not a valid UUID. Deze waarde is geen geldige UUID waarde.