Merge branch '4.4' into 5.2

nicolas-grekas · nicolas-grekas · commit 3004b9c0891a · 2021-06-08T14:44:01.000+02:00
* 4.4:
  Optimize travis file a bit
  Remove duplicate catch block
  Add missing translations for Thai
  Add missing translations for Swedish
diff --git a/.travis.yml b/.travis.yml
@@ -121,7 +121,7 @@ before_install:
       # php.ini configuration
       (
           for PHP in $TRAVIS_PHP_VERSION $php_extra; do
-              (cd / && wget https://storage.googleapis.com/travis-ci-language-archives/php/binaries/ubuntu/18.04/x86_64/php-$PHP.tar.bz2 -O - | tar -xj) &
+              ([[ $PHP != 7.4 ]] && phpenv global $PHP 2>/dev/null) || (cd / && wget https://storage.googleapis.com/travis-ci-language-archives/php/binaries/ubuntu/18.04/x86_64/php-$PHP.tar.bz2 -O - | tar -xj) &
           done
           wait
       )
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php
@@ -39,11 +39,6 @@ public function testRedisCachePools()
                 throw $e;
             }
             $this->markTestSkipped($e->getMessage());
-        } catch (\PHPUnit\Framework\Error\Warning $e) {
-            if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
-                throw $e;
-            }
-            $this->markTestSkipped($e->getMessage());
         } catch (InvalidArgumentException $e) {
             if (0 !== strpos($e->getMessage(), 'Redis connection ')) {
                 throw $e;
@@ -67,11 +62,6 @@ public function testRedisCustomCachePools()
                 throw $e;
             }
             $this->markTestSkipped($e->getMessage());
-        } catch (\PHPUnit\Framework\Error\Warning $e) {
-            if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
-                throw $e;
-            }
-            $this->markTestSkipped($e->getMessage());
         }
     }
 
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.sv.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.sv.xlf
@@ -70,6 +70,14 @@
                 <source>Invalid or expired login link.</source>
                 <target>Ogiltig eller utgången inloggningslänk.</target>
             </trans-unit>
+            <trans-unit id="19">
+                <source>Too many failed login attempts, please try again in %minutes% minute.</source>
+                <target>För många misslyckade inloggningsförsök, försök igen om %minutes% minut.</target>
+            </trans-unit>
+            <trans-unit id="20">
+                <source>Too many failed login attempts, please try again in %minutes% minutes.</source>
+                <target>För många misslyckade inloggningsförsök, försök igen om %minutes% minuter.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.th.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.th.xlf
@@ -70,6 +70,14 @@
                 <source>Invalid or expired login link.</source>
                 <target>ลิงค์เข้าสู่ระบบไม่ถูกต้องหรือหมดอายุไปแล้ว</target>
             </trans-unit>
+            <trans-unit id="19">
+                <source>Too many failed login attempts, please try again in %minutes% minute.</source>
+                <target>มีความพยายามเข้าสู่ระบบล้มเหลวมากเกินไป โปรดลองอีกครั้งใน %minutes% นาที</target>
+            </trans-unit>
+            <trans-unit id="20">
+                <source>Too many failed login attempts, please try again in %minutes% minutes.</source>
+                <target>มีความพยายามเข้าสู่ระบบล้มเหลวมากเกินไป โปรดลองอีกครั้งใน %minutes% นาที</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ before_install:`
`121`	`121`	`# php.ini configuration`
`122`	`122`	`(`
`123`	`123`	`for PHP in $TRAVIS_PHP_VERSION $php_extra; do`
`124`		`- (cd / && wget https://storage.googleapis.com/travis-ci-language-archives/php/binaries/ubuntu/18.04/x86_64/php-$PHP.tar.bz2 -O - \| tar -xj) &`
	`124`	`+ ([[ $PHP != 7.4 ]] && phpenv global $PHP 2>/dev/null) \|\| (cd / && wget https://storage.googleapis.com/travis-ci-language-archives/php/binaries/ubuntu/18.04/x86_64/php-$PHP.tar.bz2 -O - \| tar -xj) &`
`125`	`125`	`done`
`126`	`126`	`wait`
`127`	`127`	`)`
Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,6 @@ public function testRedisCachePools()`
`39`	`39`	`throw $e;`
`40`	`40`	`}`
`41`	`41`	`$this->markTestSkipped($e->getMessage());`
`42`		`- } catch (\PHPUnit\Framework\Error\Warning $e) {`
`43`		`- if (0 !== strpos($e->getMessage(), 'unable to connect to')) {`
`44`		`- throw $e;`
`45`		`- }`
`46`		`- $this->markTestSkipped($e->getMessage());`
`47`	`42`	`} catch (InvalidArgumentException $e) {`
`48`	`43`	`if (0 !== strpos($e->getMessage(), 'Redis connection ')) {`
`49`	`44`	`throw $e;`
`@@ -67,11 +62,6 @@ public function testRedisCustomCachePools()`
`67`	`62`	`throw $e;`
`68`	`63`	`}`
`69`	`64`	`$this->markTestSkipped($e->getMessage());`
`70`		`- } catch (\PHPUnit\Framework\Error\Warning $e) {`
`71`		`- if (0 !== strpos($e->getMessage(), 'unable to connect to')) {`
`72`		`- throw $e;`
`73`		`- }`
`74`		`- $this->markTestSkipped($e->getMessage());`
`75`	`65`	`}`
`76`	`66`	`}`
`77`	`67`