diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2018-05-10 23:02:08 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2018-05-10 23:02:08 +0100 |
| commit | 6f16899717b75618039efefd48e299e343b86cba (patch) | |
| tree | c8bce260ff40bca6045fa3cd8034d31aaff5a7fc /vendor/league | |
| parent | e72687d47ec530580ffef2ebb567066ca04cbe92 (diff) | |
| download | webtrees-6f16899717b75618039efefd48e299e343b86cba.tar.gz webtrees-6f16899717b75618039efefd48e299e343b86cba.tar.bz2 webtrees-6f16899717b75618039efefd48e299e343b86cba.zip | |
Update league/flysystem
Diffstat (limited to 'vendor/league')
| -rw-r--r-- | vendor/league/flysystem/src/MountManager.php | 2 | ||||
| -rw-r--r-- | vendor/league/flysystem/src/Plugin/ForcedCopy.php | 2 | ||||
| -rw-r--r-- | vendor/league/flysystem/src/Plugin/ForcedRename.php | 2 | ||||
| -rw-r--r-- | vendor/league/flysystem/src/Plugin/GetWithMetadata.php | 2 | ||||
| -rw-r--r-- | vendor/league/flysystem/src/Util.php | 2 | ||||
| -rw-r--r-- | vendor/league/flysystem/src/Util/MimeType.php | 13 |
6 files changed, 21 insertions, 2 deletions
diff --git a/vendor/league/flysystem/src/MountManager.php b/vendor/league/flysystem/src/MountManager.php index 706afd6f59..6dea200103 100644 --- a/vendor/league/flysystem/src/MountManager.php +++ b/vendor/league/flysystem/src/MountManager.php @@ -32,7 +32,7 @@ use League\Flysystem\Plugin\PluginNotFoundException; * @method array listPaths($directory = '', $recursive = false) * @method array getWithMetadata($path, array $metadata) * @method string|false getMimetype($path) - * @method string|false getTimestamp($path) + * @method int|false getTimestamp($path) * @method string|false getVisibility($path) * @method int|false getSize($path); * @method bool setVisibility($path, $visibility) diff --git a/vendor/league/flysystem/src/Plugin/ForcedCopy.php b/vendor/league/flysystem/src/Plugin/ForcedCopy.php index d2fc379501..a41e9f3aeb 100644 --- a/vendor/league/flysystem/src/Plugin/ForcedCopy.php +++ b/vendor/league/flysystem/src/Plugin/ForcedCopy.php @@ -2,6 +2,7 @@ namespace League\Flysystem\Plugin; +use League\Flysystem\FileExistsException; use League\Flysystem\FileNotFoundException; class ForcedCopy extends AbstractPlugin @@ -20,6 +21,7 @@ class ForcedCopy extends AbstractPlugin * @param string $path Path to the existing file. * @param string $newpath The new path of the file. * + * @throws FileExistsException * @throws FileNotFoundException Thrown if $path does not exist. * * @return bool True on success, false on failure. diff --git a/vendor/league/flysystem/src/Plugin/ForcedRename.php b/vendor/league/flysystem/src/Plugin/ForcedRename.php index 7c081b6cfa..3f51cd6076 100644 --- a/vendor/league/flysystem/src/Plugin/ForcedRename.php +++ b/vendor/league/flysystem/src/Plugin/ForcedRename.php @@ -2,6 +2,7 @@ namespace League\Flysystem\Plugin; +use League\Flysystem\FileExistsException; use League\Flysystem\FileNotFoundException; class ForcedRename extends AbstractPlugin @@ -21,6 +22,7 @@ class ForcedRename extends AbstractPlugin * @param string $newpath The new path of the file. * * @throws FileNotFoundException Thrown if $path does not exist. + * @throws FileExistsException * * @return bool True on success, false on failure. */ diff --git a/vendor/league/flysystem/src/Plugin/GetWithMetadata.php b/vendor/league/flysystem/src/Plugin/GetWithMetadata.php index bc39ef8185..6fe4f05628 100644 --- a/vendor/league/flysystem/src/Plugin/GetWithMetadata.php +++ b/vendor/league/flysystem/src/Plugin/GetWithMetadata.php @@ -3,6 +3,7 @@ namespace League\Flysystem\Plugin; use InvalidArgumentException; +use League\Flysystem\FileNotFoundException; class GetWithMetadata extends AbstractPlugin { @@ -23,6 +24,7 @@ class GetWithMetadata extends AbstractPlugin * @param array $metadata metadata keys * * @throws InvalidArgumentException + * @throws FileNotFoundException * * @return array|false metadata */ diff --git a/vendor/league/flysystem/src/Util.php b/vendor/league/flysystem/src/Util.php index 1a74292ee3..46dad86f15 100644 --- a/vendor/league/flysystem/src/Util.php +++ b/vendor/league/flysystem/src/Util.php @@ -26,7 +26,7 @@ class Util $pathinfo += pathinfo($pathinfo['basename']); - return $pathinfo; + return $pathinfo + ['dirname' => '']; } /** diff --git a/vendor/league/flysystem/src/Util/MimeType.php b/vendor/league/flysystem/src/Util/MimeType.php index 4807f04ed9..69e35e729a 100644 --- a/vendor/league/flysystem/src/Util/MimeType.php +++ b/vendor/league/flysystem/src/Util/MimeType.php @@ -165,6 +165,7 @@ class MimeType 'movie' => 'video/x-sgi-movie', 'doc' => 'application/msword', 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', + 'docm' => 'application/vnd.ms-word.template.macroEnabled.12', 'dot' => 'application/msword', 'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', @@ -214,6 +215,18 @@ class MimeType 'cdr' => 'application/cdr', 'wma' => 'audio/x-ms-wma', 'jar' => 'application/java-archive', + 'tex' => 'application/x-tex', + 'latex' => 'application/x-latex', + 'odt' => 'application/vnd.oasis.opendocument.text', + 'ods' => 'application/vnd.oasis.opendocument.spreadsheet', + 'odp' => 'application/vnd.oasis.opendocument.presentation', + 'odg' => 'application/vnd.oasis.opendocument.graphics', + 'odc' => 'application/vnd.oasis.opendocument.chart', + 'odf' => 'application/vnd.oasis.opendocument.formula', + 'odi' => 'application/vnd.oasis.opendocument.image', + 'odm' => 'application/vnd.oasis.opendocument.text-master', + 'odb' => 'application/vnd.oasis.opendocument.database', + 'ott' => 'application/vnd.oasis.opendocument.text-template', ]; } } |
