Laravel 9

Author: overtrue

.php_cs

@@ -1,48 +1,49 @@
-# Laravel filesystem Qiniu 
+# Laravel filesystem Qiniu
 
 [Qiniu](http://www.qiniu.com/) storage for Laravel based on [overtrue/flysystem-qiniu](https://github.com/overtrue/flysystem-qiniu).
 
 [![Sponsor me](https://github.com/overtrue/overtrue/blob/master/sponsor-me-button-s.svg?raw=true)](https://github.com/sponsors/overtrue)
 
 # Requirement
 
-- PHP >= 5.5.9
+-   Laravel >= 9.0
 
 # Installation
 
 ```shell
-$ composer require "overtrue/laravel-filesystem-qiniu" -vvv
+$ composer require "overtrue/laravel-filesystem-qiniu"
 ```
 
 # Configuration
 
 1. After installing the library, register the `Overtrue\LaravelFilesystem\Qiniu\QiniuStorageServiceProvider` in your `config/app.php` file:
 
-  ```php
-  'providers' => [
-      // Other service providers...
-      Overtrue\LaravelFilesystem\Qiniu\QiniuStorageServiceProvider::class,
-  ],
-  ```
+```php
+'providers' => [
+    // Other service providers...
+    Overtrue\LaravelFilesystem\Qiniu\QiniuStorageServiceProvider::class,
+],
+```
 
 2. Add a new disk to your `config/filesystems.php` config:
- ```php
- <?php
-
- return [
-    'disks' => [
-         //...
-         'qiniu' => [
-            'driver'     => 'qiniu',
-            'access_key' => env('QINIU_ACCESS_KEY', 'xxxxxxxxxxxxxxxx'),
-            'secret_key' => env('QINIU_SECRET_KEY', 'xxxxxxxxxxxxxxxx'),
-            'bucket'     => env('QINIU_BUCKET', 'test'),
-            'domain'     => env('QINIU_DOMAIN', 'xxx.clouddn.com'), // or host: https://xxxx.clouddn.com
-         ],
-         //...
-     ]
- ];
- ```
+
+```php
+<?php
+
+return [
+   'disks' => [
+        //...
+        'qiniu' => [
+           'driver'     => 'qiniu',
+           'access_key' => env('QINIU_ACCESS_KEY', 'xxxxxxxxxxxxxxxx'),
+           'secret_key' => env('QINIU_SECRET_KEY', 'xxxxxxxxxxxxxxxx'),
+           'bucket'     => env('QINIU_BUCKET', 'test'),
+           'domain'     => env('QINIU_DOMAIN', 'xxx.clouddn.com'), // or host: https://xxxx.clouddn.com
+        ],
+        //...
+    ]
+];
+```
 
 # Usage
 
@@ -57,7 +58,6 @@ $exists = $disk->has('file.jpg');
 
 // get timestamp
 $time = $disk->lastModified('file1.jpg');
-$time = $disk->getTimestamp('file1.jpg');
 
 // copy a file
 $disk->copy('old/file1.jpg', 'new/file1.jpg');
@@ -69,28 +69,27 @@ $disk->move('old/file1.jpg', 'new/file1.jpg');
 $contents = $disk->read('folder/my_file.txt');
 
 // fetch url content
-$file = $disk->fetch('folder/save_as.txt', $fromUrl);
+$file = $disk->getAdapter()->fetch('folder/save_as.txt', $fromUrl);
 
 // get file url
-$url = $disk->getUrl('folder/my_file.txt');
+$url = $disk->getAdapter()->getUrl('folder/my_file.txt');
 
 // get file upload token
-$token = $disk->getUploadToken('folder/my_file.txt');
-$token = $disk->getUploadToken('folder/my_file.txt', 3600);
+$token = $disk->getAdapter()->getUploadToken('folder/my_file.txt');
+$token = $disk->getAdapter()->getUploadToken('folder/my_file.txt', 3600);
 
 // get private url
-$url = $disk->privateDownloadUrl('folder/my_file.txt');
+$url = $disk->getAdapter()->privateDownloadUrl('folder/my_file.txt');
 ```
 
 [Full API documentation.](http://flysystem.thephpleague.com/api/)
 
-## :heart: Sponsor me 
+## :heart: Sponsor me
 
 [![Sponsor me](https://github.com/overtrue/overtrue/blob/master/sponsor-me.svg?raw=true)](https://github.com/sponsors/overtrue)
 
 如果你喜欢我的项目并想支持它，[点击这里 :heart:](https://github.com/sponsors/overtrue)
 
-
 ## Project supported by JetBrains
 
 Many thanks to Jetbrains for kindly providing a license for me to work on this and other open-source projects.

README.md

@@ -2,9 +2,13 @@
     "name": "overtrue/laravel-filesystem-qiniu",
     "description": "A Qiniu storage filesystem for Laravel.",
     "require": {
-        "php": "^8.0.2",
-        "league/flysystem": "^3.0",
-        "overtrue/flysystem-qiniu": "^2.0.0"
+        "laravel/framework": "^9.0",
+        "overtrue/flysystem-qiniu": "^3.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^9.5",
+        "mockery/mockery": "^1.4",
+        "friendsofphp/php-cs-fixer": "^3.3"
     },
     "autoload": {
         "psr-4": {
@@ -23,6 +27,35 @@
             "providers": [
                 "Overtrue\\LaravelFilesystem\\Qiniu\\QiniuStorageServiceProvider"
             ]
+        },
+        "hooks": {
+            "pre-commit": [
+                "composer test",
+                "composer check-style"
+            ],
+            "pre-push": [
+                "composer test",
+                "composer check-style"
+            ]
         }
+    },
+    "scripts": {
+        "post-update-cmd": [
+            "cghooks update"
+        ],
+        "post-merge": "composer install",
+        "post-install-cmd": [
+            "cghooks add --ignore-lock",
+            "cghooks update"
+        ],
+        "cghooks": "vendor/bin/cghooks",
+        "check-style": "php-cs-fixer fix --using-cache=no --diff --dry-run --ansi",
+        "fix-style": "php-cs-fixer fix --using-cache=no --ansi",
+        "test": "vendor/bin/phpunit"
+    },
+    "scripts-descriptions": {
+        "test": "Run all tests.",
+        "check-style": "Run style checks (only dry run - no fixing!).",
+        "fix-style": "Run style checks and fix violations."
     }
 }

composer.json

@@ -1,53 +1,24 @@
 <?php
 
-/*
- * This file is part of the overtrue/laravel-filesystem-qiniu.
- * (c) overtrue <[email protected]>
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
 namespace Overtrue\LaravelFilesystem\Qiniu;
 
 use Illuminate\Support\ServiceProvider;
 use League\Flysystem\Config;
 use League\Flysystem\Filesystem;
-use Overtrue\Flysystem\Qiniu\Plugins\FetchFile;
-use Overtrue\Flysystem\Qiniu\Plugins\FileUrl;
-use Overtrue\Flysystem\Qiniu\Plugins\PrivateDownloadUrl;
-use Overtrue\Flysystem\Qiniu\Plugins\RefreshFile;
-use Overtrue\Flysystem\Qiniu\Plugins\UploadToken;
-use Overtrue\Flysystem\Qiniu\QiniuAdapter;
 
 class QiniuStorageServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap any application services.
-     */
     public function boot()
     {
-        app('filesystem')->extend('qiniu', function ($app, $config) {
+        app('filesystem')->extend('qiniu', function ($config) {
             $adapter = new QiniuAdapter(
-                $config['access_key'], $config['secret_key'],
-                $config['bucket'], $config['domain']
+                $config['access_key'],
+                $config['secret_key'],
+                $config['bucket'],
+                $config['domain']
             );
 
-            $flysystem = new Filesystem($adapter, new Config(['disable_asserts' => true]));
-
-            $flysystem->addPlugin(new FetchFile());
-            $flysystem->addPlugin(new UploadToken());
-            $flysystem->addPlugin(new FileUrl());
-            $flysystem->addPlugin(new PrivateDownloadUrl());
-            $flysystem->addPlugin(new RefreshFile());
-
-            return $flysystem;
+            return new Filesystem($adapter, new Config(['disable_asserts' => true]));
         });
     }
-
-    /**
-     * Register any application services.
-     */
-    public function register()
-    {
-    }
 }