From efe4f1a3a7e2eae9c803074e754f60517b199b61 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Fri, 6 Apr 2018 13:15:37 +0000 Subject: [PATCH] [5.6] Fixed league/flysystem-cached-adapter dependency (#23817) * Revert "Add missing dependency on league/flysystem-cached-adapter (#23815)" This reverts commit d60b1c1a40c2e8f42e69625dfe75d4046f8247e8. * Added to suggested deps * Removed duplicate * Sync with main composer.json * Added to require-dev --- composer.json | 4 ++-- src/Illuminate/Filesystem/composer.json | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 05da2ed6a1c2..d7dc5bf3d5e9 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,6 @@ "dragonmantank/cron-expression": "~2.0", "erusev/parsedown": "~1.7", "league/flysystem": "^1.0.8", - "league/flysystem-cached-adapter": "^1.0", "monolog/monolog": "~1.12", "nesbot/carbon": "^1.24.1", "psr/container": "~1.0", @@ -77,6 +76,7 @@ "aws/aws-sdk-php": "~3.0", "doctrine/dbal": "~2.6", "filp/whoops": "^2.1.4", + "league/flysystem-cached-adapter": "~1.0", "mockery/mockery": "~1.0", "moontoast/math": "^1.1", "orchestra/testbench-core": "3.6.*", @@ -117,8 +117,8 @@ "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~6.0).", "laravel/tinker": "Required to use the tinker console command (~1.0).", "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).", + "league/flysystem-cached-adapter": "Required to use the Flysystem cache (~1.0).", "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).", - "league/flysystem-cached-adapter": "Required to use Flysystem caching (~1.0).", "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (~1.0).", "nexmo/client": "Required to use the Nexmo transport (~1.0).", "pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).", diff --git a/src/Illuminate/Filesystem/composer.json b/src/Illuminate/Filesystem/composer.json index fa1ad3ea52f0..041413abd00f 100644 --- a/src/Illuminate/Filesystem/composer.json +++ b/src/Illuminate/Filesystem/composer.json @@ -32,6 +32,7 @@ "suggest": { "league/flysystem": "Required to use the Flysystem local and FTP drivers (~1.0).", "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).", + "league/flysystem-cached-adapter": "Required to use the Flysystem cache (~1.0).", "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).", "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (~1.0)." },