Merge branch '3.4' into 4.3

* 3.4:
  Fix tests
  Fix deprecated phpunit annotation

Author: nicolas-grekas

Test/TranslatorTest.php

@@ -158,10 +158,10 @@ public function testReturnMessageIfExactlyOneStandardRuleIsGiven()
 
     /**
      * @dataProvider getNonMatchingMessages
-     * @expectedException \InvalidArgumentException
      */
     public function testThrowExceptionIfMatchingMessageCannotBeFound($id, $number)
     {
+        $this->expectException('InvalidArgumentException');
         $translator = $this->getTranslator();
 
         $translator->trans($id, ['%count%' => $number]);