forked from dustin10/VichUploaderBundle
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix exception handling in FlysystemStorage
Related to dustin10#1445 Add handling for UndefinedMethodError exception in FlysystemStorage. * Catch both `FilesystemException` and `UndefinedMethodError` exceptions in the `publicUrl` method of `src/Storage/FlysystemStorage.php`. * Add a test case in `tests/Storage/Flysystem/AbstractFlysystemStorageTestCase.php` to check for `UndefinedMethodError` exception handling in the `resolveUri` method. * Ensure the test case covers both exceptions to maintain compatibility with different Flysystem versions. --- For more details, open the [Copilot Workspace session](https://copilot-workspace.githubnext.com/dustin10/VichUploaderBundle/issues/1445?shareId=XXXX-XXXX-XXXX-XXXX).
- Loading branch information
1 parent
5eb6c3a
commit 133d5bf
Showing
2 changed files
with
35 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,10 +7,12 @@ | |
use League\Flysystem\MountManager; | ||
use Psr\Container\ContainerInterface; | ||
use Symfony\Component\HttpFoundation\File\Exception\CannotWriteFileException; | ||
use Symfony\Component\ErrorHandler\Error\UndefinedMethodError; | ||
use Symfony\Component\HttpFoundation\File\File; | ||
use Vich\UploaderBundle\Mapping\PropertyMapping; | ||
use Vich\UploaderBundle\Mapping\PropertyMappingFactory; | ||
|
||
|
||
/** | ||
* @author Markus Bachmann <[email protected]> | ||
* @author Titouan Galopin <[email protected]> | ||
|
@@ -97,7 +99,7 @@ public function resolveUri(object|array $obj, ?string $fieldName = null, ?string | |
|
||
try { | ||
return $fs->publicUrl($path); | ||
} catch (FilesystemException) { | ||
} catch (FilesystemException | UndefinedMethodError) { | ||
return $mapping->getUriPrefix().'/'.$path; | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,6 +12,7 @@ | |
use Vich\UploaderBundle\Storage\FlysystemStorage; | ||
use Vich\UploaderBundle\Storage\StorageInterface; | ||
use Vich\UploaderBundle\Tests\Storage\StorageTestCase; | ||
use Symfony\Component\ErrorHandler\Error\UndefinedMethodError; | ||
|
||
/** | ||
* @author Markus Bachmann <[email protected]> | ||
|
@@ -209,4 +210,35 @@ public function testResolveUriThroughFlysystem(): void | |
|
||
self::assertEquals('example.com/file.txt', $path); | ||
} | ||
|
||
public function testResolveUriHandlesUndefinedMethodError(): void | ||
{ | ||
$this->useFlysystemToResolveUri = true; | ||
|
||
$this->filesystem | ||
->expects(self::once()) | ||
->method('publicUrl') | ||
->with('file.txt') | ||
->will($this->throwException(new UndefinedMethodError('Undefined method'))); | ||
|
||
$this->mapping | ||
->expects(self::once()) | ||
->method('getFileName') | ||
->willReturn('file.txt'); | ||
|
||
$this->mapping | ||
->expects(self::once()) | ||
->method('getUriPrefix') | ||
->willReturn('/uploads'); | ||
|
||
$this->factory | ||
->expects(self::exactly(2)) | ||
->method('fromField') | ||
->with($this->object, 'file_field') | ||
->willReturn($this->mapping); | ||
|
||
$path = $this->getStorage()->resolveUri($this->object, 'file_field'); | ||
|
||
self::assertEquals('/uploads/file.txt', $path); | ||
} | ||
} |