Skip to content

Revert "Merge pull request #139 from utopia-php/fix-dir-exists-0.18.x" #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChiragAgg5k merged 1 commit into from
Dec 3, 2025
Merged

Revert "Merge pull request #139 from utopia-php/fix-dir-exists-0.18.x" #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 4 additions & 22 deletions src/Storage/Device/S3.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ public function deletePath(string $path): bool
}

/**
* Check if file or directory exists
* Check if file exists
*
* @param string $path
* @return bool
Expand All @@ -564,29 +564,11 @@ public function exists(string $path): bool
{
try {
$this->getInfo($path);

return true;
} catch (\Throwable $th) {
try {
$root = $this->getRoot();
if (str_starts_with($path, $root.'/') || str_starts_with($path, $root.'\\')) {
$prefix = $path;
} else {
$prefix = $root.'/'.ltrim($path, '/');
}

if (! empty($path) && ! str_ends_with($prefix, '/')) {
$prefix .= '/';
}

$objects = $this->listObjects($prefix, 1);
$count = (int) ($objects['KeyCount'] ?? 0);

return $count > 0;
} catch (\Throwable $th2) {
return false;
}
return false;
}

return true;
}

/**
Expand Down
30 changes: 0 additions & 30 deletions tests/Storage/Device/LocalTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,36 +84,6 @@ public function testFileExists()
$this->object->delete($this->object->getPath('text-for-test-exists.txt'));
}

public function testDirectoryExists()
{
$this->assertEquals(false, $this->object->exists($this->object->getPath('nonexistent-directory')));
$this->assertEquals(false, $this->object->exists($this->object->getPath('nonexistent-directory/')));

$testDir = $this->object->getPath('test-directory-exists');
$this->assertTrue($this->object->createDirectory($testDir));
$this->assertEquals(true, $this->object->exists($testDir));
$this->assertEquals(true, $this->object->exists($testDir.'/'));

$nestedDir = $testDir.'/nested/deep/structure';
$this->assertTrue($this->object->createDirectory($nestedDir));
$this->object->write($nestedDir.'/test.txt', 'Hello World');

$this->assertEquals(true, $this->object->exists($testDir.'/nested'));
$this->assertEquals(true, $this->object->exists($testDir.'/nested/'));
$this->assertEquals(true, $this->object->exists($testDir.'/nested/deep'));
$this->assertEquals(true, $this->object->exists($testDir.'/nested/deep/'));
$this->assertEquals(true, $this->object->exists($nestedDir));
$this->assertEquals(true, $this->object->exists($nestedDir.'/'));

$this->assertEquals(true, $this->object->exists($nestedDir.'/test.txt'));

$this->object->delete($testDir, true);

$this->assertEquals(false, $this->object->exists($testDir));
$this->assertEquals(false, $this->object->exists($testDir.'/nested'));
$this->assertEquals(false, $this->object->exists($nestedDir));
}

public function testMove()
{
$this->assertEquals($this->object->write($this->object->getPath('text-for-move.txt'), 'Hello World'), true);
Expand Down
21 changes: 0 additions & 21 deletions tests/Storage/S3Base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,27 +144,6 @@ public function testFileExists()
$this->assertEquals(false, $this->object->exists($this->object->getPath('testing/kitten-5.jpg')));
}

public function testDirectoryExists()
{
$this->assertEquals(true, $this->object->exists($this->object->getPath('testing/')));

$this->assertEquals(false, $this->object->exists($this->object->getPath('nonexistent/')));

$this->object->write($this->object->getPath('nested/deep/structure/test.txt'), 'Hello World', 'text/plain');

$this->assertEquals(true, $this->object->exists($this->object->getPath('nested')));
$this->assertEquals(true, $this->object->exists($this->object->getPath('nested/deep')));
$this->assertEquals(true, $this->object->exists($this->object->getPath('nested/deep/structure')));

$this->assertEquals(true, $this->object->exists($this->object->getPath('nested/deep/structure/test.txt')));

$this->object->delete($this->object->getPath('nested/deep/structure/test.txt'));

$this->assertEquals(false, $this->object->exists($this->object->getPath('nested')));
$this->assertEquals(false, $this->object->exists($this->object->getPath('nested/deep')));
$this->assertEquals(false, $this->object->exists($this->object->getPath('nested/deep/structure')));
}

public function testMove()
{
$this->assertEquals(true, $this->object->write($this->object->getPath('text-for-move.txt'), 'Hello World', 'text/plain'));
Expand Down