diff options
-rw-r--r-- | lib/private/Files/SimpleFS/NewSimpleFile.php | 11 | ||||
-rw-r--r-- | lib/private/Files/SimpleFS/SimpleFile.php | 7 | ||||
-rw-r--r-- | lib/public/Files/SimpleFS/ISimpleFile.php | 5 | ||||
-rw-r--r-- | lib/public/Files/SimpleFS/InMemoryFile.php | 7 |
4 files changed, 30 insertions, 0 deletions
diff --git a/lib/private/Files/SimpleFS/NewSimpleFile.php b/lib/private/Files/SimpleFS/NewSimpleFile.php index f805403fd87..76fc69ebbe7 100644 --- a/lib/private/Files/SimpleFS/NewSimpleFile.php +++ b/lib/private/Files/SimpleFS/NewSimpleFile.php @@ -191,6 +191,17 @@ class NewSimpleFile implements ISimpleFile { } /** + * {@inheritDoc} + */ + public function getExtension(): string { + if ($this->file) { + return $this->file->getExtension(); + } else { + return \pathinfo($this->name, PATHINFO_EXTENSION); + } + } + + /** * Open the file as stream for reading, resulting resource can be operated as stream like the result from php's own fopen * * @return resource diff --git a/lib/private/Files/SimpleFS/SimpleFile.php b/lib/private/Files/SimpleFS/SimpleFile.php index baf9b24e020..21a2fd92dcb 100644 --- a/lib/private/Files/SimpleFS/SimpleFile.php +++ b/lib/private/Files/SimpleFS/SimpleFile.php @@ -159,6 +159,13 @@ class SimpleFile implements ISimpleFile { } /** + * {@inheritDoc} + */ + public function getExtension(): string { + return $this->file->getExtension(); + } + + /** * Open the file as stream for reading, resulting resource can be operated as stream like the result from php's own fopen * * @return resource diff --git a/lib/public/Files/SimpleFS/ISimpleFile.php b/lib/public/Files/SimpleFS/ISimpleFile.php index 3287c42054f..c0db4cc22e9 100644 --- a/lib/public/Files/SimpleFS/ISimpleFile.php +++ b/lib/public/Files/SimpleFS/ISimpleFile.php @@ -103,6 +103,11 @@ interface ISimpleFile { public function getMimeType(); /** + * @since 24.0.0 + */ + public function getExtension(): string; + + /** * Open the file as stream for reading, resulting resource can be operated as stream like the result from php's own fopen * * @return resource diff --git a/lib/public/Files/SimpleFS/InMemoryFile.php b/lib/public/Files/SimpleFS/InMemoryFile.php index 6020b42d953..4606fe9bd8a 100644 --- a/lib/public/Files/SimpleFS/InMemoryFile.php +++ b/lib/public/Files/SimpleFS/InMemoryFile.php @@ -127,6 +127,13 @@ class InMemoryFile implements ISimpleFile { } /** + * {@inheritDoc} + */ + public function getExtension(): string { + return \pathinfo($this->name, PATHINFO_EXTENSION); + } + + /** * Stream reading is unsupported for in memory files. * * @throws NotPermittedException |