Upgrade to v8

.editorconfig

@@ -11,5 +11,9 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.blade.php]
+insert_final_newline = false
+trim_trailing_whitespace = false
+
 [*.md]
 trim_trailing_whitespace = false

.github/workflows/run-tests.yml

@@ -11,22 +11,24 @@ jobs:
 
         runs-on: ubuntu-latest
         strategy:
-            fail-fast: true
+            fail-fast: false
             matrix:
-                php: [7.4, 7.3, 7.2]
-                laravel: [7.*, 6.*, 5.8.*]
+                php: [7.4]
+                laravel: [6.*]
                 dependency-version: [prefer-lowest, prefer-stable]
                 include:
-                    - laravel: 7.*
-                      testbench: 5.*
                     - laravel: 6.*
                       testbench: 4.*
-                    - laravel: 5.8.*
-                      testbench: 3.8.*
 
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
         steps:
+            - name: Update apt
+              run: sudo apt-get update --fix-missing
+
+            - name: Install ffmpeg
+              run: sudo apt-get install ffmpeg
+
             - name: Checkout code
               uses: actions/checkout@v1
 
@@ -49,11 +51,15 @@ jobs:
             - name: Install dependencies
               run: |
                   composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-                  composer require league/flysystem-aws-s3-v3
                   composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
 
             - name: Execute tests
               run: vendor/bin/phpunit
+              env:
+                AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+                AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+                AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+                AWS_BUCKET: ${{ secrets.AWS_BUCKET }}
 
             - name: Send Slack notification
               uses: 8398a7/action-slack@v2

CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to `laravel-medialibrary` will be documented in this file
 
+## 8.0.0 - 2020-XX-XX
+
+- added `uuid` on `media` table
+- an empty string is now a proper collection name. `getMedia('')` will not return media from the default collection anymore (#1697).
+- add the ability to store conversions on a separate disk
+- simplify URL generation. You can now just use the `root` and `url` properties on a configured disk
+- spatie/pdf-to-image is now a suggestion dependency, removing the need for always having to install ext-imagick
+- added `shouldMatchBothExtensionsAndMimeTypes` to `Spatie\Medialibrary\ImageGenerators\BaseGenerator`
+- added progress bar on the clean command (#1623)
+- the `UrlGenerator` interface now contains all required methods (#1656)
+- use PHP 7.4 features where possible
+- the namespace has been renamed from `Spatie\MediaLibrary` to `Spatie\Medialibrary`. All code where `MediaLibrary` was used is renamed to `Medialibrary`
+- added support for the `loading` attribute (#1667)
+- conversion files can now be named using the `conversion_file_namer` key in the `medialibrary` config file (#1636)
+
 ## 7.18.2 - 2020-01-25
 
 - add support for Laravel 7
@@ -121,7 +136,7 @@ All notable changes to `laravel-medialibrary` will be documented in this file
 
 ## 7.6.5 - 2019-07-16
 
-- Support `jpeg` in `\Spatie\MediaLibrary\Conversion\Conversion::getResultExtension`
+- Support `jpeg` in `\Spatie\Medialibrary\Conversion\Conversion::getResultExtension`
 
 ## 7.6.4 - 2019-07-15
 
@@ -535,12 +550,12 @@ All notable changes to `laravel-medialibrary` will be documented in this file
 
 ## 5.0.0 - 2017-02-06
 
-- add `toMediaLibraryOnCloudDisk`
+- add `toMedialibraryOnCloudDisk`
 - image generators may now be specified in the config file
 - use json columns for `manipulations` and `custom_properties`
 - refactor all functions in `FileCannotBeAdded` to their own exception classes
 - rename config file from `laravel-medialibrary` to `medialibrary`
-- remove `toCollection` and `toCollectionOnDisk` and `toMediaLibraryOnDisk`
+- remove `toCollection` and `toCollectionOnDisk` and `toMedialibraryOnDisk`
 - replace dependency on `spatie/laravel-glide` by `spatie/image`
 - mime types will now be stored in the database so they can be queried even if files are stored on external filesystems
 - rename `Spatie\MedialibraryFilesystemInterface` to `Spatie\Medialibrary\Filesystem\Filesystem`
@@ -877,7 +892,7 @@ This version is a complete rewrite. Though there are lots of breaking changes mo
 - Small bugfixes
 
 ## 1.6.0
-- Added: `Spatie\MediaLibrary\Models\Media::getHumanReadableFileSize()`
+- Added: `Spatie\Medialibrary\Models\Media::getHumanReadableFileSize()`
 
 ## 1.5.6
 - Bugfix: make compatible with Laravel 5.1
@@ -887,11 +902,11 @@ This version is a complete rewrite. Though there are lots of breaking changes mo
 other traits and the base model.
 
 ## 1.5.4
-- Feature: The `profile` parameter in `Media::getUrl()` and `MediaLibraryModelTrait::getUrl()` is now optional. On null, it retrieves the original file's url.
+- Feature: The `profile` parameter in `Media::getUrl()` and `MedialibraryModelTrait::getUrl()` is now optional. On null, it retrieves the original file's url.
 - Bugfix: `Media::getOriginalUrl()` now returns the correct url.
 
 ## 1.5.3
-- Bugfix: Removed unnecessary static methods from `MediaLibraryModelInterface`
+- Bugfix: Removed unnecessary static methods from `MedialibraryModelInterface`
 
 ## 1.5.0
 - Added a method to remove all media in a collection.

README.md

@@ -65,7 +65,7 @@ The package will automatically register itself.
 You can publish the migration with:
 
 ```bash
-php artisan vendor:publish --provider="Spatie\MediaLibrary\MediaLibraryServiceProvider" --tag="migrations"
+php artisan vendor:publish --provider="Spatie\Medialibrary\MedialibraryServiceProvider" --tag="migrations"
 ```
 
 After the migration has been published you can create the media-table by running the migrations:
@@ -77,7 +77,7 @@ php artisan migrate
 You can publish the config-file with:
 
 ```bash
-php artisan vendor:publish --provider="Spatie\MediaLibrary\MediaLibraryServiceProvider" --tag="config"
+php artisan vendor:publish --provider="Spatie\Medialibrary\MedialibraryServiceProvider" --tag="config"
 ```
 
 This is the contents of the published config file:
@@ -106,7 +106,7 @@ return [
     /*
      * The class name of the media model that should be used.
      */
-    'media_model' => Spatie\MediaLibrary\Models\Media::class,
+    'media_model' => Spatie\Medialibrary\Models\Media::class,
 
     /*
      * The engine that should perform the image conversions.
@@ -150,11 +150,11 @@ return [
      * These generators will be used to create an image of media files.
      */
     'image_generators' => [
-        Spatie\MediaLibrary\ImageGenerators\FileTypes\Image::class,
-        Spatie\MediaLibrary\ImageGenerators\FileTypes\Webp::class,
-        Spatie\MediaLibrary\ImageGenerators\FileTypes\Pdf::class,
-        Spatie\MediaLibrary\ImageGenerators\FileTypes\Svg::class,
-        Spatie\MediaLibrary\ImageGenerators\FileTypes\Video::class,
+        Spatie\Medialibrary\ImageGenerators\FileTypes\Image::class,
+        Spatie\Medialibrary\ImageGenerators\FileTypes\Webp::class,
+        Spatie\Medialibrary\ImageGenerators\FileTypes\Pdf::class,
+        Spatie\Medialibrary\ImageGenerators\FileTypes\Svg::class,
+        Spatie\Medialibrary\ImageGenerators\FileTypes\Video::class,
     ],
 
     /*
@@ -243,7 +243,7 @@ Configure the laravel-medialibrary service provider (and `AppServiceProvider` if
 ```php
 // bootstrap/app.php:
 $app->register(App\Providers\AppServiceProvider::class);
-$app->register(Spatie\MediaLibrary\MediaLibraryServiceProvider::class);
+$app->register(Spatie\Medialibrary\MedialibraryServiceProvider::class);
 ```
 
 Update the `AppServiceProvider` register method to bind the filesystem manager to the IOC container:

UPGRADING.md

@@ -2,6 +2,18 @@
 
 Because there are many breaking changes an upgrade is not that easy. There are many edge cases this guide does not cover. We accept PRs to improve this guide.
 
+## From v7 to v8
+
+- the namespace has been renamed from `Spatie\Medialibrary` to `Spatie\Medialibrary`. Make sure you modified all classes that reference medialibrary classes.
+- replace all code occurrences of `mediaLibrary` by `medialibrary`
+- Add a `conversions_disk` field to the `media` table (you'll find the definition in the migrations file of the package) and for each row copy the value of `disk` to `conversions_disk`.
+- Add a `uuid` field to the `media` table and fill each row with a unique value, preferably a `uuid`
+- Url generation has been vastly simplified. You should set the `url_generator` in the `medialibrary` config file to `Spatie\Medialibrary\UrlGenerator\DefaultUrlGenerator::class`. It will be able to handle most disks.
+- remove the `s3.domain` key from the `medialibrary` config file
+- spatie/pdf-to-image is now a suggestion dependency. Make sure to install it, if you want to create thumbnails for PDFs or SVGs
+- `registerMediaConversions` and `registerMediaCollections` should now use the  `void` return type.
+- if the `path_generator` key in the `medialibrary` config file was set to `null`, change the value to `Spatie\Medialibrary\PathGenerator\DefaultPathGenerator::class`
+
 ## 7.3.0
 
 - Before `hasGeneratedConversion` will work, the custom properties 
@@ -19,11 +31,11 @@ If you want your own filesystem implementation, you should extend the `Filesyste
 ## From v6 to v7
 
 - add the `responsive_images` column in the media table: `$table->json('responsive_images');`
-- rename the `use Spatie\MediaLibrary\HasMedia\Interfaces\HasMedia;` interface to `use Spatie\MediaLibrary\HasMedia\HasMedia;`
-- rename the `use Spatie\MediaLibrary\HasMedia\Interfaces\HasMediaConversions;` interface to `use Spatie\MediaLibrary\HasMedia\HasMedia;` as well (the distinction was [removed](https://github.com/spatie/laravel-medialibrary/commit/48f371a7b10cc82bbee5b781ab8784acc5ad0fc3#diff-f12df6f7f30b5ee54d9ccc6e56e8f93e)).
+- rename the `use Spatie\Medialibrary\HasMedia\Interfaces\HasMedia;` interface to `use Spatie\Medialibrary\HasMedia\HasMedia;`
+- rename the `use Spatie\Medialibrary\HasMedia\Interfaces\HasMediaConversions;` interface to `use Spatie\Medialibrary\HasMedia\HasMedia;` as well (the distinction was [removed](https://github.com/spatie/laravel-medialibrary/commit/48f371a7b10cc82bbee5b781ab8784acc5ad0fc3#diff-f12df6f7f30b5ee54d9ccc6e56e8f93e)).
 - all converted files should now start with the name of the original file. TODO: add instructions / or maybe a script
-- `Spatie\MediaLibrary\Media` has been moved to `Spatie\MediaLibrary\Models\Media`. Update the namespace import of `Media` accross your app
-- The method definitions of `Spatie\MediaLibrary\Filesystem\Filesystem::add` and `Spatie\MediaLibrary\Filesystem\Filesystem::copyToMediaLibrary` are changed, they now use nullable string typehints for `$targetFileName` and `$type`.
+- `Spatie\Medialibrary\Media` has been moved to `Spatie\Medialibrary\Models\Media`. Update the namespace import of `Media` accross your app
+- The method definitions of `Spatie\Medialibrary\Filesystem\Filesystem::add` and `Spatie\Medialibrary\Filesystem\Filesystem::copyToMedialibrary` are changed, they now use nullable string typehints for `$targetFileName` and `$type`.
 
 ## From v5 to v6
 
@@ -43,13 +55,13 @@ to
  - change the `defaultFilesystem` key in the config file to `default_filesystem`
  - add the `image_optimizers` key from the default config file to your config file.
  - be aware that the medialibrary will now optimize all conversions by default. If you do not want this tack on `nonOptimized` to all your media conversions.
- - `toMediaLibrary` has been removed. Use `toMediaCollection` instead.
- - `toMediaLibraryOnCloudDisk` has been removed. Use `toMediaCollectionOnCloudDisk` instead.
+ - `toMedialibrary` has been removed. Use `toMediaCollection` instead.
+ - `toMedialibraryOnCloudDisk` has been removed. Use `toMediaCollectionOnCloudDisk` instead.
 
 
 ## From v4 to v5
 - rename `config/laravel-medialibrary` to `config/medialibrary.php`. Some keys have been added or renamed. Please compare your config file againt the one provided by this package
-- all calls to `toCollection` and `toCollectionOnDisk` and `toMediaLibraryOnDisk` should be renamed to `toMediaLibrary`
+- all calls to `toCollection` and `toCollectionOnDisk` and `toMedialibraryOnDisk` should be renamed to `toMedialibrary`
 - media conversions are now handled by `spatie/image`. Convert all manipulations on your conversion to manipulations supported by `spatie/image`.
 - add a `mime_type` column to the `media` table, manually populate the column with the right values.
 - calls to `getNestedCustomProperty`, `setNestedCustomProperty`, `forgetNestedCustomProperty` and `hasNestedCustomProperty` should be replaced by their non-nested counterparts.
@@ -65,9 +77,9 @@ to
 ## From v2 to v3
 You can upgrade from v2 to v3 by performing these renames in your model that has media.
 
-- `Spatie\MediaLibrary\HasMediaTrait` has been renamed to `Spatie\MediaLibrary\HasMedia\HasMediaTrait`.
-- `Spatie\MediaLibrary\HasMedia` has been renamed to `Spatie\MediaLibrary\HasMedia\Interfaces\HasMediaConversions`
-- `Spatie\MediaLibrary\HasMediaWithoutConversions` has been renamed to `Spatie\MediaLibrary\HasMedia\Interfaces\HasMedia`
+- `Spatie\Medialibrary\HasMediaTrait` has been renamed to `Spatie\Medialibrary\HasMedia\HasMediaTrait`.
+- `Spatie\Medialibrary\HasMedia` has been renamed to `Spatie\Medialibrary\HasMedia\Interfaces\HasMediaConversions`
+- `Spatie\Medialibrary\HasMediaWithoutConversions` has been renamed to `Spatie\Medialibrary\HasMedia\Interfaces\HasMedia`
 
 In the config file you should rename the `filesystem`-option to `default_filesystem`.
 

composer.json

@@ -22,52 +22,57 @@
     }
   ],
   "require": {
-    "php": "^7.2",
+    "php": "^7.4",
     "ext-fileinfo": "*",
-    "illuminate/bus": "~5.8.35|^6.0|^7.0",
-    "illuminate/console": "~5.8.35|^6.0|^7.0",
-    "illuminate/database": "~5.8.35|^6.0|^7.0",
-    "illuminate/pipeline": "~5.8.35|^6.0|^7.0",
-    "illuminate/support": "~5.8.35|^6.0|^7.0",
-    "league/flysystem": "^1.0.8",
+    "ext-json": "*",
+    "illuminate/bus": "^6.0|^7.0",
+    "illuminate/console": "^6.0|^7.0",
+    "illuminate/database": "^6.0|^7.0",
+    "illuminate/pipeline": "^6.0|^7.0",
+    "illuminate/support": "^6.0|^7.0",
+    "league/flysystem": "^1.0.64",
     "maennchen/zipstream-php": "^1.0",
     "spatie/image": "^1.4.0",
-    "spatie/pdf-to-image": "^2.0",
     "spatie/temporary-directory": "^1.1",
-    "symfony/console": "^4.4|^5.0",
-    "ext-json": "*"
+    "symfony/console": "^4.4|^5.0"
+
   },
   "require-dev": {
     "ext-pdo_sqlite": "*",
+    "ext-zip": "*",
+    "aws/aws-sdk-php": "^3.133.11",
     "doctrine/dbal": "^2.5.2",
     "guzzlehttp/guzzle": "^6.3",
-    "league/flysystem-aws-s3-v3": "^1.0.13",
+    "league/flysystem-aws-s3-v3": "^1.0.23",
     "mockery/mockery": "^1.0",
-    "orchestra/testbench": "^3.8|^4.0|^5.0",
-    "phpunit/phpunit" : "^8.0",
-    "spatie/phpunit-snapshot-assertions": "^2.0"
+    "orchestra/testbench": "^4.0|^5.0",
+    "php-ffmpeg/php-ffmpeg": "^0.14.0",
+    "phpunit/phpunit": "^9.0",
+    "spatie/pdf-to-image": "^2.0",
+    "spatie/phpunit-snapshot-assertions": "^4.0"
   },
   "conflict": {
     "php-ffmpeg/php-ffmpeg": "<0.6.1"
   },
   "suggest": {
     "league/flysystem-aws-s3-v3": "Required to use AWS S3 file storage",
-    "php-ffmpeg/php-ffmpeg": "Required for generating video thumbnails"
+    "php-ffmpeg/php-ffmpeg": "Required for generating video thumbnails",
+    "spatie/pdf-to-image": "Required for generating thumbsnails of PDFs and SVGs"
   },
   "autoload": {
     "psr-4": {
-      "Spatie\\MediaLibrary\\": "src"
+      "Spatie\\Medialibrary\\": "src"
     }
   },
   "autoload-dev": {
     "psr-4": {
-      "Spatie\\MediaLibrary\\Tests\\": "tests"
+      "Spatie\\Medialibrary\\Tests\\": "tests"
     }
   },
   "extra": {
     "laravel": {
       "providers": [
-        "Spatie\\MediaLibrary\\MediaLibraryServiceProvider"
+        "Spatie\\Medialibrary\\MedialibraryServiceProvider"
       ]
     }
   },