Fix merge

Author: nicolas-grekas

Tests/FilesystemTest.php

@@ -376,7 +376,7 @@ public function testRemoveCleansInvalidLinks()
 
         // create symlink to nonexistent dir
         rmdir($basePath.'dir');
-        $this->assertDirectoryNotExists($basePath.'dir-link');
+        $this->assertFalse(is_dir($basePath.'dir-link'));
 
         $this->filesystem->remove($basePath);