Merge branch '3.4' into 4.4

* 3.4:
  update missing translations arabic
  [Yaml] simplify the test
  fix test by letting mock throw the actual expected exception

Author: fabpot

src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php

@@ -144,7 +144,10 @@ public function testFallbackIfLocaleDoesNotExist()
                 [self::RES_DIR, 'en_GB'],
                 [self::RES_DIR, 'en']
             )
-            ->willReturnOnConsecutiveCalls(self::$data, self::$fallbackData);
+            ->willReturnOnConsecutiveCalls(
+                $this->throwException(new ResourceBundleNotFoundException()),
+                self::$fallbackData
+            );
 
         $this->assertSame('Lah', $this->reader->readEntry(self::RES_DIR, 'en_GB', ['Entries', 'Bam']));
     }
@@ -283,7 +286,7 @@ public function testFailIfEntryFoundNeitherInParentNorChild()
                 [self::RES_DIR, 'en_GB'],
                 [self::RES_DIR, 'en']
             )
-            ->willReturnOnConsecutiveCalls(['Foo' => 'Baz'], ['Foo' => 'Baz']);
+            ->willReturnOnConsecutiveCalls(['Foo' => 'Baz'], ['Foo' => 'Bar']);
 
         $this->reader->readEntry(self::RES_DIR, 'en_GB', ['Foo', 'Bar'], true);
     }

src/Symfony/Component/Validator/Resources/translations/validators.ar.xlf

@@ -382,6 +382,10 @@
                 <source>Each element of this collection should satisfy its own set of constraints.</source>
                 <target>يجب أن يفي كل عنصر من عناصر هذه المجموعة بمجموعة القيود الخاصة به.</target>
             </trans-unit>
+            <trans-unit id="99">
+                <source>This value is not a valid International Securities Identification Number (ISIN).</source>
+                <target> صالح (ISIN) هذه القيمة ليست رقم تعريف الأوراق المالية الدولي.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

src/Symfony/Component/Yaml/Tests/ParserTest.php

@@ -2457,19 +2457,13 @@ public function testParsingMultipleDocuments()
 c: d
 YAML;
 
-        $expected = ['a' => ['b' => "row\nrow2\n"], 'c' => 'd'];
-
-        // The parser was not used before, so there is a new line after row2
-        $this->assertSame($expected, $this->parser->parse($longDocument));
-
-        $parser = new Parser();
         // The first parsing set and fixed the totalNumberOfLines in the Parser before, so parsing the short document here
         // to reproduce the issue. If the issue would not have been fixed, the next assertion will fail
-        $parser->parse($shortDocument);
+        $this->parser->parse($shortDocument);
 
-        // After the total number of lines has been rset the result will be the same as if a new parser was used
+        // After the total number of lines has been reset the result will be the same as if a new parser was used
         // (before, there was no \n after row2)
-        $this->assertSame($expected, $parser->parse($longDocument));
+        $this->assertSame(['a' => ['b' => "row\nrow2\n"], 'c' => 'd'], $this->parser->parse($longDocument));
     }
 }