WIP

Author: RhysLees

.github/workflows/dependency-review.yml

@@ -0,0 +1,20 @@
+# Dependency Review Action
+#
+# This Action will scan dependency manifest files that change as part of a Pull Request, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging.
+#
+# Source repository: https://github.com/actions/dependency-review-action
+# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v3
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@v3

.github/workflows/fix-php-code-style-issues.yml

@@ -1,12 +1,9 @@
-name: Check & fix styling
+name: Fix PHP code style issues
 
-on:
-  push:
-    branches:
-      - styling
+on: [push]
 
 jobs:
-  php-cs-fixer:
+  php-code-styling:
     runs-on: ubuntu-latest
 
     steps:
@@ -15,10 +12,8 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
 
-      - name: Run PHP CS Fixer
-        uses: docker://oskarstark/php-cs-fixer-ga
-        with:
-          args: --config=.php-cs-fixer.dist.php --allow-risky=yes
+      - name: Fix PHP code style issues
+        uses: aglipanci/laravel-pint-action@2.2.0
 
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v4

.github/workflows/phpstan.yml

@@ -2,9 +2,9 @@ name: PHPStan
 
 on:
   push:
-    paths:
-      - '**.php'
-      - 'phpstan.neon.dist'
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
 
 jobs:
   phpstan:

.github/workflows/psalm.yml

@@ -1,10 +1,7 @@
 .idea
 .php_cs
 .php_cs.cache
-<<<<<<< HEAD
 .php-cs-fixer.cache
-=======
->>>>>>> 960822c (Initial commit)
 .phpunit.result.cache
 build
 composer.lock
@@ -15,7 +12,4 @@ psalm.xml
 testbench.yaml
 vendor
 node_modules
-<<<<<<< HEAD
 phpstan.neon
-=======
->>>>>>> 960822c (Initial commit)

.gitignore

@@ -93,19 +93,7 @@ https://res.cloudinary.com/my-cloud-name/image/upload/v1/cat.jpg
 
 ### 🪐 How to use with Nova
 
-To customize the name of the stored file, you may use the `storeAs` methods
-of the `Image` field:
-
-```php
-use Laravel\Nova\Http\Requests\NovaRequest;
-use Laravel\Nova\Fields\Image;
-
-Image::make('Image')
-    ->disk('cloudinary')
-    ->storeAs(function (NovaRequest $request) {
-        return sha1($request->image->getClientOriginalName());
-    }),
-```
+We have a package for use with Laravel Nova: [Laravel Flysystem Cloudinary Nova](https://github.com/codebar-ag/laravel-flysystem-cloudinary-nova)
 
 ## 🗂 How to use folder prefix
 
@@ -157,6 +145,26 @@ Keep this in mind because the admin API is rate limited to 500 calls per hour.
 The package does check in following sequence:
 - `image` ➡️ `raw` ➡️ `video`
 
+## ⚙️ Optional Parameters
+
+Cloudinary has a lot of optional parameters to customize the upload.
+You can find all options in the [official documentation](https://cloudinary.com/documentation/image_upload_api_reference#upload_optional_parameters) optional parameters section.
+
+You can pass all parameters as an array to the `put`  method:
+
+```php
+use Illuminate\Support\Facades\Storage;
+
+Storage::disk('cloudinary')->put('meow', $contents, [
+    'options' [
+        'notification_url' => 'https://mysite.example.com/notify_endpoint',
+        'async' => true,
+    ]
+]);
+```
+
+`Note: if you find yourself using the same parameters for all requests, you should consider adding them to the config file. (see below)`
+
 ## 🔧 Configuration file
 
 You can publish the config file with:
@@ -210,6 +218,21 @@ return [
     */
 
     'secure_url' => (bool) env('CLOUDINARY_SECURE_URL', true),
+    
+    /*
+    |--------------------------------------------------------------------------
+    | Cloudinary Global Upload Options
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the upload options that will be applied to all
+    | your assets. This will be merged with the options that you may
+    | define in the `Storage::disk('cloudinary')` call.
+    |
+    */
+
+    'options' => [
+        //
+    ],
 
 ];
 ```

README.md

@@ -41,4 +41,18 @@
 
     'secure_url' => (bool) env('CLOUDINARY_SECURE_URL', true),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Cloudinary Global Upload Options
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the upload options that will be applied to all
+    | your assets. This will be merged with the options that you may
+    | define in the `Storage::disk('cloudinary')` call.
+    |
+    */
+
+    'options' => [
+        // 'async' => true,
+    ],
 ];

config/flysystem-cloudinary.php

@@ -1,32 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-    backupGlobals="false"
-    backupStaticAttributes="false"
-    bootstrap="vendor/autoload.php"
-    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    processIsolation="false"
-    stopOnFailure="false"
-    executionOrder="random"
-    failOnWarning="true"
-    failOnRisky="true"
-    failOnEmptyTestSuite="true"
-    beStrictAboutOutputDuringTests="true"
-    verbose="true"
->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd" backupGlobals="false"
+         bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false"
+         executionOrder="random" failOnWarning="true" failOnRisky="true" failOnEmptyTestSuite="true"
+         beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
     <testsuites>
         <testsuite name="codebar Solutions AG Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
     <coverage>
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
         <report>
             <html outputDirectory="build/coverage"/>
             <text outputFile="build/coverage.txt"/>
@@ -35,8 +18,13 @@
     </coverage>
     <php>
         <env name="FILESYSTEM_DRIVER" value="cloudinary"/>
-        <env name="CLOUDINARY_CLOUD_NAME" value="my-cloud-name"/>
-        <env name="CLOUDINARY_API_KEY" value="my-api-key"/>
-        <env name="CLOUDINARY_API_SECRET" value="my-api-secret"/>
+        <env name="CLOUDINARY_CLOUD_NAME" value="cloudinary_cloud_name"/>
+        <env name="CLOUDINARY_API_KEY" value="cloudinary_api_key"/>
+        <env name="CLOUDINARY_API_SECRET" value="cloudinary_api_secret"/>
     </php>
+    <source>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </source>
 </phpunit>

phpunit.xml.dist

@@ -53,31 +53,31 @@ public function __construct(
      */
     public function write(string $path, string $contents, Config $config): void
     {
-        $this->meta = $this->upload($path, $contents);
+        $this->meta = $this->upload($path, $contents, $config);
     }
 
     /**
      * {@inheritDoc}
      */
     public function writeStream(string $path, $resource, Config $config): void
     {
-        $this->meta = $this->upload($path, $resource);
+        $this->meta = $this->upload($path, $resource, $config);
     }
 
     /**
      * {@inheritDoc}
      */
     public function update($path, $contents, Config $config): array|false
     {
-        return $this->upload($path, $contents);
+        return $this->upload($path, $contents, $config);
     }
 
     /**
      * {@inheritDoc}
      */
     public function updateStream($path, $resource, Config $config): array|false
     {
-        return $this->upload($path, $resource);
+        return $this->upload($path, $resource, $config);
     }
 
     /**
@@ -87,7 +87,7 @@ public function updateStream($path, $resource, Config $config): array|false
      *
      * @param  string|resource  $body
      */
-    protected function upload(string $path, $body): array|false
+    protected function upload(string $path, $body, Config $config): array|false
     {
         if (is_string($body)) {
             $tempFile = tmpfile();
@@ -116,6 +116,14 @@ protected function upload(string $path, $body): array|false
             $options['upload_preset'] = config('flysystem-cloudinary.upload_preset');
         }
 
+        if (config('flysystem-cloudinary.options')) {
+            $options = array_merge($options, config('flysystem-cloudinary.options'));
+        }
+
+        if ($config->get('options')) {
+            $options = array_merge($options, $config->get('options'));
+        }
+
         try {
             $response = $this
                 ->cloudinary
@@ -176,7 +184,7 @@ public function copy(string $path, string $newpath, Config $config): void
             return;
         }
 
-        $metaUpload = $this->upload($newpath, $metaRead['contents']);
+        $metaUpload = $this->upload($newpath, $metaRead['contents'], $config);
 
         if ($metaUpload === false) {
             $this->copied = false;

src/Cloudinary.php

@@ -3,10 +3,10 @@
 namespace CodebarAg\FlysystemCloudinary;
 
 use Cloudinary\Cloudinary;
+use Illuminate\Filesystem\FilesystemAdapter;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\Facades\Storage;
 use League\Flysystem\Filesystem;
-use Illuminate\Filesystem\FilesystemAdapter;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
 
@@ -22,7 +22,7 @@ public function configurePackage(Package $package): void
     public function bootingPackage(): void
     {
         Storage::extend('cloudinary', function (Application $app, array $config) {
-            $adapter = new FlysystemCloudinaryAdapter( new Cloudinary($config));
+            $adapter = new FlysystemCloudinaryAdapter(new Cloudinary($config));
 
             return new FilesystemAdapter(new Filesystem($adapter, $config), $adapter, $config);
         });