danog/file
1
0
Fork 0
mirror of https://github.com/danog/file.git synced 2024-11-26 20:04:51 +01:00
Code Issues Projects Releases Wiki Activity

Don't fail if directory exists on recursive creation

Browse Source
This commit is contained in:
Niklas Keller 2023-02-18 17:32:06 +01:00
parent a631384d3e
commit b8e3314417
No known key found for this signature in database
GPG Key ID: AFA536ABA90C76A6
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Driver/EioFilesystemDriver.php
View File

@ -233,6 +233,13 @@ final class EioFilesystemDriver implements FilesystemDriver
try {
$deferred->getFuture()->await();
} catch (FilesystemException $exception) {
$result = $this->getStatus($path);
if ($result !== null && ($result['mode'] & 0040000)) {
return;
}
throw $exception;
} finally {
$this->poll->done();
}

7
src/Driver/UvFilesystemDriver.php
View File

@ -266,6 +266,13 @@ final class UvFilesystemDriver implements FilesystemDriver
try {
$deferred->getFuture()->await();
} catch (FilesystemException $exception) {
$result = $this->getStatus($path);
if ($result !== null && ($result['mode'] & 0040000)) {
return;
}
throw $exception;
} finally {
$this->poll->done();
}

9
test/FilesystemDriverTest.php
View File

@ -386,13 +386,20 @@ abstract class FilesystemDriverTest extends FilesystemTest
$this->assertTrue($this->driver->exists($dir));
}
public function testCreateDirectoryRecursivelyExists(): void
public function testCreateDirectoryRecursivelyExistsDir(): void
{
$this->expectNotToPerformAssertions();
$this->driver->createDirectoryRecursively(__DIR__, 0764);
}
public function testCreateDirectoryRecursivelyExistsFile(): void
{
$this->expectException(FilesystemException::class);
$this->driver->createDirectoryRecursively(__FILE__, 0764);
}
public function testCreateDirectoryFailsOnNonexistentPath(): void
{
$fixtureDir = Fixture::path();