From 0430544c1431cf956988e84b8270f41eddb7867c Mon Sep 17 00:00:00 2001 From: Anyon Date: Tue, 25 Feb 2020 15:51:47 +0800 Subject: [PATCH] ComposerUpdate --- composer.lock | 12 ++++++------ vendor/composer/installed.json | 14 +++++++------- vendor/league/flysystem/composer.json | 2 +- .../src/Adapter/AbstractFtpAdapter.php | 2 +- vendor/league/flysystem/src/Adapter/Ftp.php | 18 +++++++++--------- vendor/services.php | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/composer.lock b/composer.lock index ee48284c2..76bc1f34a 100644 --- a/composer.lock +++ b/composer.lock @@ -74,16 +74,16 @@ }, { "name": "league/flysystem", - "version": "1.0.63", + "version": "1.0.64", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "8132daec326565036bc8e8d1876f77ec183a7bd6" + "reference": "d13c43dbd4b791f815215959105a008515d1a2e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/8132daec326565036bc8e8d1876f77ec183a7bd6", - "reference": "8132daec326565036bc8e8d1876f77ec183a7bd6", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/d13c43dbd4b791f815215959105a008515d1a2e0", + "reference": "d13c43dbd4b791f815215959105a008515d1a2e0", "shasum": "", "mirrors": [ { @@ -101,7 +101,7 @@ }, "require-dev": { "phpspec/phpspec": "^3.4", - "phpunit/phpunit": "^5.7.10" + "phpunit/phpunit": "^5.7.26" }, "suggest": { "ext-fileinfo": "Required for MimeType", @@ -160,7 +160,7 @@ "sftp", "storage" ], - "time": "2020-01-04T16:30:31+00:00" + "time": "2020-02-05T18:14:17+00:00" }, { "name": "league/flysystem-cached-adapter", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 6f1a49c39..9d2041594 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -69,17 +69,17 @@ }, { "name": "league/flysystem", - "version": "1.0.63", - "version_normalized": "1.0.63.0", + "version": "1.0.64", + "version_normalized": "1.0.64.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "8132daec326565036bc8e8d1876f77ec183a7bd6" + "reference": "d13c43dbd4b791f815215959105a008515d1a2e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/8132daec326565036bc8e8d1876f77ec183a7bd6", - "reference": "8132daec326565036bc8e8d1876f77ec183a7bd6", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/d13c43dbd4b791f815215959105a008515d1a2e0", + "reference": "d13c43dbd4b791f815215959105a008515d1a2e0", "shasum": "", "mirrors": [ { @@ -97,7 +97,7 @@ }, "require-dev": { "phpspec/phpspec": "^3.4", - "phpunit/phpunit": "^5.7.10" + "phpunit/phpunit": "^5.7.26" }, "suggest": { "ext-fileinfo": "Required for MimeType", @@ -115,7 +115,7 @@ "spatie/flysystem-dropbox": "Allows you to use Dropbox storage", "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications" }, - "time": "2020-01-04T16:30:31+00:00", + "time": "2020-02-05T18:14:17+00:00", "type": "library", "extra": { "branch-alias": { diff --git a/vendor/league/flysystem/composer.json b/vendor/league/flysystem/composer.json index 92ab3889e..72b0787c2 100644 --- a/vendor/league/flysystem/composer.json +++ b/vendor/league/flysystem/composer.json @@ -20,7 +20,7 @@ }, "require-dev": { "phpspec/phpspec": "^3.4", - "phpunit/phpunit": "^5.7.10" + "phpunit/phpunit": "^5.7.26" }, "autoload": { "psr-4": { diff --git a/vendor/league/flysystem/src/Adapter/AbstractFtpAdapter.php b/vendor/league/flysystem/src/Adapter/AbstractFtpAdapter.php index fb8aa49cf..95a6b4d09 100644 --- a/vendor/league/flysystem/src/Adapter/AbstractFtpAdapter.php +++ b/vendor/league/flysystem/src/Adapter/AbstractFtpAdapter.php @@ -558,7 +558,7 @@ abstract class AbstractFtpAdapter extends AbstractAdapter protected function normalizePermissions($permissions) { if (is_numeric($permissions)) { - return $permissions & 0777; + return ((int) $permissions) & 0777; } // remove the type identifier diff --git a/vendor/league/flysystem/src/Adapter/Ftp.php b/vendor/league/flysystem/src/Adapter/Ftp.php index cdaf711b2..7dfcc2b05 100644 --- a/vendor/league/flysystem/src/Adapter/Ftp.php +++ b/vendor/league/flysystem/src/Adapter/Ftp.php @@ -532,15 +532,8 @@ class Ftp extends AbstractFtpAdapter */ public function isConnected() { - try { - return is_resource($this->connection) && ftp_rawlist($this->connection, $this->getRoot()) !== false; - } catch (ErrorException $e) { - if (strpos($e->getMessage(), 'ftp_rawlist') === false) { - throw new ConnectionErrorException($e->getMessage()); - } - - return false; - } + return is_resource($this->connection) + && $this->getRawExecResponseCode('NOOP') === 200; } /** @@ -571,4 +564,11 @@ class Ftp extends AbstractFtpAdapter return ftp_rawlist($connection, $options . ' ' . $path); } + + private function getRawExecResponseCode($command) + { + $response = @ftp_raw($this->connection, trim($command)); + + return (int) preg_replace('/\D/', '', implode(' ', $response)); + } } diff --git a/vendor/services.php b/vendor/services.php index 978d386d5..e1316ab99 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service',