symfony
diff --git a/‎src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php
Lines changed: 5 additions & 1 deletion b/‎src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php
Lines changed: 5 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Dotenv/Dotenv.php
Lines changed: 5 additions & 1 deletion b/‎src/Symfony/Component/Dotenv/Dotenv.php
Lines changed: 5 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Dotenv/Tests/DotenvTest.php
Lines changed: 10 additions & 0 deletions b/‎src/Symfony/Component/Dotenv/Tests/DotenvTest.php
Lines changed: 10 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Form/Resources/translations/validators.bs.xlf
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Form/Resources/translations/validators.bs.xlf
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Messenger/Tests/TraceableMessageBusTest.php
Lines changed: 18 additions & 0 deletions b/‎src/Symfony/Component/Messenger/Tests/TraceableMessageBusTest.php
Lines changed: 18 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Messenger/TraceableMessageBus.php
Lines changed: 8 additions & 5 deletions b/‎src/Symfony/Component/Messenger/TraceableMessageBus.php
Lines changed: 8 additions & 5 deletions
diff --git a/‎src/Symfony/Component/Validator/Resources/translations/validators.ar.xlf
Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/Validator/Resources/translations/validators.ar.xlf
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf
Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Resources/translations/validators.bs.xlf
Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Component/Validator/Resources/translations/validators.bs.xlf
Lines changed: 4 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Resources/translations/validators.da.xlf
Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/Validator/Resources/translations/validators.da.xlf
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Resources/translations/validators.es.xlf
Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/Validator/Resources/translations/validators.es.xlf
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf
Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Resources/translations/validators.it.xlf
Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/Validator/Resources/translations/validators.it.xlf
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Resources/translations/validators.lt.xlf
Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/Validator/Resources/translations/validators.lt.xlf
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Resources/translations/validators.lv.xlf
Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/Validator/Resources/translations/validators.lv.xlf
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf
Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf
Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf
Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Resources/translations/validators.sl.xlf
Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Component/Validator/Resources/translations/validators.sl.xlf
Lines changed: 4 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Resources/translations/validators.sr_Cyrl.xlf
Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/Validator/Resources/translations/validators.sr_Cyrl.xlf
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Resources/translations/validators.sr_Latn.xlf
Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/Validator/Resources/translations/validators.sr_Latn.xlf
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Resources/translations/validators.uk.xlf
Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/Validator/Resources/translations/validators.uk.xlf
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Resources/translations/validators.vi.xlf
Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/Validator/Resources/translations/validators.vi.xlf
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Resources/translations/validators.zh_CN.xlf
Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/Validator/Resources/translations/validators.zh_CN.xlf
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Resources/translations/validators.zh_TW.xlf
Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/Validator/Resources/translations/validators.zh_TW.xlf
Lines changed: 8 additions & 0 deletions
@@ -122,7 +122,7 @@
 }
 
 $oldPwd = getcwd();
-$PHPUNIT_DIR = $getEnvVar('SYMFONY_PHPUNIT_DIR', $root.'/vendor/bin/.phpunit');
+$PHPUNIT_DIR = rtrim($getEnvVar('SYMFONY_PHPUNIT_DIR', $root.'/vendor/bin/.phpunit'), '/'.\DIRECTORY_SEPARATOR);
 $PHP = defined('PHP_BINARY') ? \PHP_BINARY : 'php';
 $PHP = escapeshellarg($PHP);
 if ('phpdbg' === \PHP_SAPI) {
@@ -239,6 +239,10 @@
         $passthruOrFail("$COMPOSER config --unset platform.php");
     }
     if (file_exists($path = $root.'/vendor/symfony/phpunit-bridge')) {
+        $p = str_repeat('../', substr_count("$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR", '/', strlen($root))).'vendor/symfony/phpunit-bridge';
+        if (realpath($p) === realpath($path)) {
+            $path = $p;
+        }
         $passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*@dev\"");
         $passthruOrFail("$COMPOSER config repositories.phpunit-bridge path ".escapeshellarg(str_replace('/', \DIRECTORY_SEPARATOR, $path)));
         if ('\\' === \DIRECTORY_SEPARATOR) {
 
@@ -191,8 +191,12 @@ public function populate(array $values, bool $overrideExistingVars = false): voi
 
         foreach ($values as $name => $value) {
             $notHttpName = 0 !== strpos($name, 'HTTP_');
+            if (isset($_SERVER[$name]) && $notHttpName && !isset($_ENV[$name])) {
+                $_ENV[$name] = $_SERVER[$name];
+            }
+
             // don't check existence with getenv() because of thread safety issues
-            if (!isset($loadedVars[$name]) && (!$overrideExistingVars && (isset($_ENV[$name]) || (isset($_SERVER[$name]) && $notHttpName)))) {
+            if (!isset($loadedVars[$name]) && !$overrideExistingVars && isset($_ENV[$name])) {
                 continue;
             }
 
 
@@ -483,6 +483,16 @@ public function testDoNotUsePutenv()
         $this->assertFalse(getenv('TEST_USE_PUTENV'));
     }
 
+    public function testSERVERVarsDuplicationInENV()
+    {
+        unset($_ENV['SYMFONY_DOTENV_VARS'], $_SERVER['SYMFONY_DOTENV_VARS'], $_ENV['FOO']);
+        $_SERVER['FOO'] = 'CCC';
+
+        (new Dotenv(false))->populate(['FOO' => 'BAR']);
+
+        $this->assertSame('CCC', $_ENV['FOO']);
+    }
+
     public function testBootEnv()
     {
         $resetContext = static function (): void {
 
@@ -16,7 +16,7 @@
             </trans-unit>
             <trans-unit id="99">
                 <source>This value is not a valid HTML5 color.</source>
-                <target>Ova vrijednost nije ispravna HTML5 boja.</target>
+                <target>Ova vrijednost nije važeća HTML5 boja.</target>
             </trans-unit>
             <trans-unit id="100">
                 <source>Please enter a valid birthdate.</source>
 
@@ -156,4 +156,22 @@ public function testItTracesExceptions()
             ],
         ], $actualTracedMessage);
     }
+
+    public function testItTracesExceptionsWhenMessageBusIsFiredFromArrayCallback()
+    {
+        $message = new DummyMessage('Hello');
+        $exception = new \RuntimeException();
+
+        $bus = $this->createMock(MessageBusInterface::class);
+        $bus->expects($this->once())
+            ->method('dispatch')
+            ->with($message)
+            ->willThrowException($exception);
+
+        $traceableBus = new TraceableMessageBus($bus);
+
+        $this->expectExceptionObject($exception);
+
+        array_map([$traceableBus, 'dispatch'], [$message]);
+    }
 }
@@ -62,8 +62,8 @@ private function getCaller(): array
     {
         $trace = debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS, 8);
 
-        $file = $trace[1]['file'];
-        $line = $trace[1]['line'];
+        $file = $trace[1]['file'] ?? null;
+        $line = $trace[1]['line'] ?? null;
 
         $handleTraitFile = (new \ReflectionClass(HandleTrait::class))->getFileName();
         $found = false;
@@ -97,9 +97,12 @@ private function getCaller(): array
             }
         }
 
-        $name = str_replace('\\', '/', $file);
-        $name = substr($name, strrpos($name, '/') + 1);
+        $name = str_replace('\\', '/', (string) $file);
 
-        return compact('name', 'file', 'line');
+        return [
+            'name' => substr($name, strrpos($name, '/') + 1),
+            'file' => $file,
+            'line' => $line,
+        ];
     }
 }
@@ -394,6 +394,14 @@
                 <source>This value is not a valid CSS color.</source>
                 <target>هذه القيمة ليست لون CSS صالحًا.</target>
             </trans-unit>
+            <trans-unit id="102">
+                <source>This value is not a valid CIDR notation.</source>
+                <target>هذه القيمة ليست تدوين CIDR صالحًا.</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
+                <target>يجب أن تكون قيمة netmask بين {{ min }} و {{ max }}.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
@@ -394,6 +394,14 @@
                 <source>This value is not a valid CSS color.</source>
                 <target>Стойността не е валиден CSS цвят.</target>
             </trans-unit>
+            <trans-unit id="102">
+                <source>This value is not a valid CIDR notation.</source>
+                <target>Стойността не е валидна CIDR нотация.</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
+                <target>Стойността на мрежовата маска трябва да бъде между {{ min }} и {{ max }}.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
@@ -390,6 +390,10 @@
                 <source>This value should be a valid expression.</source>
                 <target>Ova vrijednost bi trebala biti važeći izraz.</target>
             </trans-unit>
+            <trans-unit id="101">
+                <source>This value is not a valid CSS color.</source>
+                <target>Ova vrijednost nije važeća CSS boja.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
@@ -394,6 +394,14 @@
                 <source>This value is not a valid CSS color.</source>
                 <target>Værdien skal være en gyldig CSS farve.</target>
             </trans-unit>
+            <trans-unit id="102">
+                <source>This value is not a valid CIDR notation.</source>
+                <target>Værdien er ikke en gyldig CIDR notation.</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
+                <target>Værdien af netmasken skal være mellem {{ min }} og {{ max }}.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
@@ -394,6 +394,14 @@
                 <source>This value is not a valid CSS color.</source>
                 <target>Este valor no es un color CSS válido.</target>
             </trans-unit>
+            <trans-unit id="102">
+                <source>This value is not a valid CIDR notation.</source>
+                <target>Este valor no es una notación CIDR válida.</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
+                <target>El valor de la máscara de red debería estar entre {{ min }} y {{ max }}.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
@@ -394,6 +394,14 @@
                 <source>This value is not a valid CSS color.</source>
                 <target>Ez az érték nem egy érvényes CSS szín.</target>
             </trans-unit>
+            <trans-unit id="102">
+                <source>This value is not a valid CIDR notation.</source>
+                <target>Ez az érték nem egy érvényes CIDR jelölés.</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
+                <target>Ennek a netmask értéknek {{ min }} és {{ max }} között kell lennie.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
@@ -394,6 +394,14 @@
                 <source>This value is not a valid CSS color.</source>
                 <target>Questo valore non è un colore CSS valido.</target>
             </trans-unit>
+            <trans-unit id="102">
+                <source>This value is not a valid CIDR notation.</source>
+                <target>Questo valore non è una notazione CIDR valida.</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
+                <target>Il valore della netmask dovrebbe essere compreso tra {{ min }} e {{ max }}.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
@@ -394,6 +394,14 @@
                 <source>This value is not a valid CSS color.</source>
                 <target>Ši reikšmė nėra tinkama CSS spalva.</target>
             </trans-unit>
+            <trans-unit id="102">
+                <source>This value is not a valid CIDR notation.</source>
+                <target>Ši vertė nėra tinkamas CIDR žymėjimas.</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
+                <target>Tinklo kaukės reikšmė turi būti nuo {{ min }} iki {{ max }}.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
@@ -394,6 +394,14 @@
                 <source>This value is not a valid CSS color.</source>
                 <target>Šī vērtība nav korekta CSS krāsa.</target>
             </trans-unit>
+            <trans-unit id="102">
+                <source>This value is not a valid CIDR notation.</source>
+                <target>Šī vērtība nav korekts CIDR apzīmējums.</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
+                <target>Tīkla maskas (netmask) vērtībai jābūt starp {{ min }} un {{ max }}.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
@@ -394,6 +394,14 @@
                 <source>This value is not a valid CSS color.</source>
                 <target>Deze waarde is geen geldige CSS kleur.</target>
             </trans-unit>
+            <trans-unit id="102">
+                <source>This value is not a valid CIDR notation.</source>
+                <target>Deze waarde is geen geldige CIDR notatie.</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
+                <target>De waarde van de netmask moet zich tussen {{ min }} en {{ max }} bevinden.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
@@ -394,6 +394,14 @@
                 <source>This value is not a valid CSS color.</source>
                 <target>Ta wartość nie jest prawidłowym kolorem CSS.</target>
             </trans-unit>
+            <trans-unit id="102">
+                <source>This value is not a valid CIDR notation.</source>
+                <target>Ta wartość nie jest prawidłową notacją CIDR.</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
+                <target>Wartość maski podsieci powinna być pomiędzy {{ min }} i {{ max }}.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
@@ -394,6 +394,14 @@
                 <source>This value is not a valid CSS color.</source>
                 <target>Значение не является корректным CSS цветом.</target>
             </trans-unit>
+            <trans-unit id="102">
+                <source>This value is not a valid CIDR notation.</source>
+                <target>Значение не соответствует нотации CIDR.</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
+                <target>Значение маски подсети должно быть от {{ min }} до {{ max }}.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
@@ -390,6 +390,10 @@
                 <source>This value should be a valid expression.</source>
                 <target>Ta vrednost bi morala biti veljaven izraz.</target>
             </trans-unit>
+            <trans-unit id="101">
+                <source>This value is not a valid CSS color.</source>
+                <target>Ta vrednost ni veljavna barva CSS.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
@@ -394,6 +394,14 @@
                 <source>This value is not a valid CSS color.</source>
                 <target>Ова вредност није исправна CSS боја.</target>
             </trans-unit>
+            <trans-unit id="102">
+                <source>This value is not a valid CIDR notation.</source>
+                <target>Ова вредност није исправна CIDR нотација.</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
+                <target>Вредност мрежне маске треба бити између {{ min }} и {{ max }}.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
@@ -394,6 +394,14 @@
                 <source>This value is not a valid CSS color.</source>
                 <target>Ova vrednost nije ispravna CSS boja.</target>
             </trans-unit>
+            <trans-unit id="102">
+                <source>This value is not a valid CIDR notation.</source>
+                <target>Ova vrednost nije ispravna CIDR notacija.</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
+                <target>Vrednost mrežne maske treba biti između {{ min }} i {{ max }}.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
@@ -394,6 +394,14 @@
                 <source>This value is not a valid CSS color.</source>
                 <target>Це значення не є дійсним CSS кольором.</target>
             </trans-unit>
+            <trans-unit id="102">
+                <source>This value is not a valid CIDR notation.</source>
+                <target>Це значення не є дійсною CIDR нотаціею.</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
+                <target>Значення в мережевій масці має бути між {{ min }} та {{ max }}.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
@@ -394,6 +394,14 @@
                 <source>This value is not a valid CSS color.</source>
                 <target>Giá trị này không phải là màu CSS hợp lệ.</target>
             </trans-unit>
+            <trans-unit id="102">
+                <source>This value is not a valid CIDR notation.</source>
+                <target>Giá trị này không phải là ký hiệu CIDR hợp lệ.</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
+                <target>Giá trị của mặt nạ mạng phải nằm trong khoảng từ {{ min }} đến {{ max }}.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
@@ -394,6 +394,14 @@
                 <source>This value is not a valid CSS color.</source>
                 <target>该值不是有效的CSS颜色。</target>
             </trans-unit>
+            <trans-unit id="102">
+                <source>This value is not a valid CIDR notation.</source>
+                <target>该值不是一个有效的CIDR表示。</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
+                <target>网络掩码的值应当在 {{ min }} 和 {{ max }} 之间。</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
@@ -394,6 +394,14 @@
                 <source>This value is not a valid CSS color.</source>
                 <target>該值不是有效的CSS顏色。</target>
             </trans-unit>
+            <trans-unit id="102">
+                <source>This value is not a valid CIDR notation.</source>
+                <target>該值不是一個有效的CIDR表示。</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
+                <target>網絡掩碼的值應當在 {{ min }} 和 {{ max }} 之間。</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>