Merge branch '4.3' into 4.4

* 4.3:
  Fix tests
  Fix deprecated phpunit annotation

Author: nicolas-grekas

Tests/DotenvTest.php

@@ -12,11 +12,14 @@
 namespace Symfony\Component\Dotenv\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\Dotenv\Exception\FormatException;
 
 class DotenvTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     /**
      * @dataProvider getEnvDataWithFormatErrors
      */
@@ -305,11 +308,9 @@ public function testOverload()
         $this->assertSame('BAZ', $bar);
     }
 
-    /**
-     * @expectedException \Symfony\Component\Dotenv\Exception\PathException
-     */
     public function testLoadDirectory()
     {
+        $this->expectException('Symfony\Component\Dotenv\Exception\PathException');
         $dotenv = new Dotenv(true);
         $dotenv->load(__DIR__);
     }