composer update

vendor/league/flysystem/.php_cs.dist

@@ -1,32 +0,0 @@
-<?php
-
-$finder = PhpCsFixer\Finder::create()
-    ->in([__DIR__ . '/spec', __DIR__ . '/src', __DIR__ . '/stub', __DIR__ . '/tests'])
-;
-
-return PhpCsFixer\Config::create()
-    ->setRules([
-        '@PSR2' => true,
-        'array_syntax' => ['syntax' => 'short'],
-        'binary_operator_spaces' => true,
-        'blank_line_before_return' => true,
-        'cast_spaces' => true,
-        'concat_space' => ['spacing' => 'one'],
-        'no_singleline_whitespace_before_semicolons' => true,
-        'not_operator_with_space' => true,
-        'ordered_imports' => true,
-        'phpdoc_align' => true,
-        'phpdoc_indent' => true,
-        'phpdoc_no_access' => true,
-        'phpdoc_no_alias_tag' => true,
-        'phpdoc_no_package' => true,
-        'phpdoc_scalar' => true,
-        'phpdoc_separation' => true,
-        'phpdoc_summary' => true,
-        'phpdoc_to_comment' => true,
-        'phpdoc_trim' => true,
-        'single_blank_line_at_eof' => true,
-        'ternary_operator_spaces' => true,
-    ])
-    ->setFinder($finder)
-    ;

vendor/league/flysystem/composer.json

@@ -53,12 +53,12 @@
     "conflict": {
         "league/flysystem-sftp": "<1.0.6"
     },
-    "config": {
-        "bin-dir": "bin"
-    },
     "extra": {
         "branch-alias": {
             "dev-master": "1.1-dev"
         }
+    },
+    "scripts": {
+        "phpstan": "php phpstan.php"
     }
 }

vendor/league/flysystem/deprecations.md

@@ -16,4 +16,4 @@ your application this is Flysystem) to leak into the application. The most
 important part for Flysystem is that it improves portability and creates a
 solid boundary between your application core and the infrastructure you use.
 The OOP-style handling breaks this principle, therefore I want to stop
-promoting it. 
+promoting it. 

vendor/league/flysystem/src/Adapter/Ftp.php

@@ -250,7 +250,7 @@ class Ftp extends AbstractFtpAdapter
         }
 
         $result['contents'] = $contents;
-        $result['mimetype'] = Util::guessMimeType($path, $contents);
+        $result['mimetype'] = $config->get('mimetype') ?: Util::guessMimeType($path, $contents);
 
         return $result;
     }

vendor/league/flysystem/src/Adapter/Ftpd.php

@@ -12,6 +12,11 @@ class Ftpd extends Ftp
         if ($path === '') {
             return ['type' => 'dir', 'path' => ''];
         }
+        if (@ftp_chdir($this->getConnection(), $path) === true) {
+            $this->setConnectionRoot();
+
+            return ['type' => 'dir', 'path' => $path];
+        }
 
         if ( ! ($object = ftp_raw($this->getConnection(), 'STAT ' . $path)) || count($object) < 3) {
             return false;

vendor/league/flysystem/src/Adapter/Local.php

@@ -5,7 +5,6 @@ namespace League\Flysystem\Adapter;
 use DirectoryIterator;
 use FilesystemIterator;
 use finfo as Finfo;
-use League\Flysystem\AdapterInterface;
 use League\Flysystem\Config;
 use League\Flysystem\Exception;
 use League\Flysystem\NotSupportedException;
@@ -207,7 +206,7 @@ class Local extends AbstractAdapter
 
         $result = compact('type', 'path', 'size', 'contents');
 
-        if ($mimetype = Util::guessMimeType($path, $contents)) {
+        if ($mimetype = $config->get('mimetype') ?: Util::guessMimeType($path, $contents)) {
             $result['mimetype'] = $mimetype;
         }
 
@@ -320,7 +319,7 @@ class Local extends AbstractAdapter
         $finfo = new Finfo(FILEINFO_MIME_TYPE);
         $mimetype = $finfo->file($location);
 
-        if (in_array($mimetype, ['application/octet-stream', 'inode/x-empty'])) {
+        if (in_array($mimetype, ['application/octet-stream', 'inode/x-empty', 'application/x-empty'])) {
             $mimetype = Util\MimeType::detectByFilename($location);
         }
 
@@ -343,7 +342,15 @@ class Local extends AbstractAdapter
         $location = $this->applyPathPrefix($path);
         clearstatcache(false, $location);
         $permissions = octdec(substr(sprintf('%o', fileperms($location)), -4));
-        $visibility = $permissions & 0044 ? AdapterInterface::VISIBILITY_PUBLIC : AdapterInterface::VISIBILITY_PRIVATE;
+        $type = is_dir($location) ? 'dir' : 'file';
+
+        foreach ($this->permissionMap[$type] as $visibility => $visibilityPermissions) {
+            if ($visibilityPermissions == $permissions) {
+                return compact('path', 'visibility');
+            }
+        }
+
+        $visibility = substr(sprintf('%o', fileperms($location)), -4);
 
         return compact('path', 'visibility');
     }
@@ -372,11 +379,13 @@ class Local extends AbstractAdapter
         $location = $this->applyPathPrefix($dirname);
         $umask = umask(0);
         $visibility = $config->get('visibility', 'public');
+        $return = ['path' => $dirname, 'type' => 'dir'];
 
-        if ( ! is_dir($location) && ! mkdir($location, $this->permissionMap['dir'][$visibility], true)) {
-            $return = false;
-        } else {
-            $return = ['path' => $dirname, 'type' => 'dir'];
+        if ( ! is_dir($location)) {
+            if (false === @mkdir($location, $this->permissionMap['dir'][$visibility], true)
+                || false === is_dir($location)) {
+                $return = false;
+            }
         }
 
         umask($umask);

vendor/league/flysystem/src/Config.php

@@ -10,7 +10,7 @@ class Config
     protected $settings = [];
 
     /**
-     * @var Config
+     * @var Config|null
      */
     protected $fallback;
 

vendor/league/flysystem/src/Util/MimeType.php

@@ -34,8 +34,19 @@ class MimeType
         'smil' => 'application/smil',
         'mif' => 'application/vnd.mif',
         'xls' => 'application/vnd.ms-excel',
+        'xlt' => 'application/vnd.ms-excel',
+        'xla' => 'application/vnd.ms-excel',
         'ppt' => 'application/powerpoint',
+        'pot' => 'application/vnd.ms-powerpoint',
+        'pps' => 'application/vnd.ms-powerpoint',
+        'ppa' => 'application/vnd.ms-powerpoint',
         'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+        'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+        'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+        'ppam' => 'application/vnd.ms-powerpoint.addin.macroEnabled.12',
+        'pptm' => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
+        'potm' => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
+        'ppsm' => 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12',
         'wbxml' => 'application/wbxml',
         'wmlc' => 'application/wmlc',
         'dcr' => 'application/x-director',
@@ -107,9 +118,15 @@ class MimeType
         'doc' => 'application/msword',
         'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
         'docm' => 'application/vnd.ms-word.template.macroEnabled.12',
+        'dotm' => 'application/vnd.ms-word.template.macroEnabled.12',
         'dot' => 'application/msword',
         'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
         'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+        'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+        'xlsm' => 'application/vnd.ms-excel.sheet.macroEnabled.12',
+        'xltm' => 'application/vnd.ms-excel.template.macroEnabled.12',
+        'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
+        'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
         'word' => 'application/msword',
         'xl' => 'application/excel',
         'eml' => 'message/rfc822',