Merge branch 'main' of github.com:spatie/laravel-medialibrary

Author: freekmurze

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:
+    - name: Feature Request
+      url: https://github.com/spatie/laravel-medialibrary/discussions/new?category=ideas
+      about: Share ideas for new features
+    - name: Ask a Question
+      url: https://github.com/spatie/laravel-medialibrary/discussions/new?category=q-a
+      about: Ask the community for help

.github/workflows/pint.yml

@@ -16,6 +16,6 @@ jobs:
         uses: aglipanci/laravel-pint-action@v2
 
       - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v6
+        uses: stefanzweifel/git-auto-commit-action@v7
         with:
           commit_message: Fix styling

.github/workflows/run-tests.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.4, 8.3, 8.2]
+        php: [8.5, 8.4, 8.3, 8.2]
         laravel: [10.*, 11.*, 12.*]
         dependency-version: [prefer-lowest, prefer-stable]
         include:
@@ -18,7 +18,10 @@ jobs:
           - laravel: 11.*
             testbench: ^9.0
           - laravel: 12.*
-            testbench: ^10.0
+            testbench: ^10.6
+        exclude:
+          - laravel: 10.*
+            php: 8.5
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 

.github/workflows/update-changelog.yml

@@ -21,7 +21,7 @@ jobs:
           release-notes: ${{ github.event.release.body }}
 
       - name: Commit updated CHANGELOG
-        uses: stefanzweifel/git-auto-commit-action@v6
+        uses: stefanzweifel/git-auto-commit-action@v7
         with:
           branch: main
           commit_message: Update CHANGELOG

CHANGELOG.md

@@ -2,6 +2,35 @@
 
 All notable changes to `laravel-medialibrary` will be documented in this file
 
+## 11.16.0 - 2025-10-21
+
+### What's Changed
+
+* Test PHP 8.5 by @erikn69 in https://github.com/spatie/laravel-medialibrary/pull/3857
+* Add Support for Defining Custom Path Generators in Models or Service Providers by @alissn in https://github.com/spatie/laravel-medialibrary/pull/3828
+* Bump stefanzweifel/git-auto-commit-action from 6 to 7 by @dependabot[bot] in https://github.com/spatie/laravel-medialibrary/pull/3860
+
+### New Contributors
+
+* @alissn made their first contribution in https://github.com/spatie/laravel-medialibrary/pull/3828
+
+**Full Changelog**: https://github.com/spatie/laravel-medialibrary/compare/11.15.0...11.16.0
+
+## 11.15.0 - 2025-09-19
+
+### What's Changed
+
+* docs: add installation instructions for image optimizers on Alpine Linux by @nastoychev in https://github.com/spatie/laravel-medialibrary/pull/3845
+* Feat: allow null expiration for model get temporary url method by @chinmaypurav in https://github.com/spatie/laravel-medialibrary/pull/3851
+* Update issue template by @AlexVanderbist in https://github.com/spatie/laravel-medialibrary/pull/3850
+* Optimize filename suffix generation in MediaStream by @iizno in https://github.com/spatie/laravel-medialibrary/pull/3855
+
+### New Contributors
+
+* @iizno made their first contribution in https://github.com/spatie/laravel-medialibrary/pull/3855
+
+**Full Changelog**: https://github.com/spatie/laravel-medialibrary/compare/11.14.0...11.15.0
+
 ## 11.14.0 - 2025-08-19
 
 ### What's Changed

composer.json

@@ -49,7 +49,7 @@
         "league/flysystem-aws-s3-v3": "^3.22",
         "mockery/mockery": "^1.6.7",
         "orchestra/testbench": "^7.0|^8.17|^9.0|^10.0",
-        "pestphp/pest": "^2.28|^3.5",
+        "pestphp/pest": "^2.28|^3.5|^4.0",
         "phpstan/extension-installer": "^1.3.1",
         "spatie/laravel-ray": "^1.33",
         "spatie/pdf-to-image": "^2.2|^3.0",

docs/advanced-usage/using-a-custom-directory-structure.md

@@ -55,6 +55,31 @@ interface PathGenerator
 
 There aren't any restrictions on how the directories can be named. When a `Media`-object gets deleted the package will delete its entire associated directory. To avoid tears or worse, make sure that every media gets stored its own unique directory.
 
+### Model-specific Custom Path Generators
+In addition to setting a global path generator in the config file, You can also define a `CustomPathGenerator` class for specific models directly inside the model's `booting()` method or within a service provider:
+
+```php
+use Spatie\MediaLibrary\Support\PathGenerator\PathGeneratorFactory;
+use Spatie\MediaLibrary\Tests\Support\PathGenerator\CustomPathGenerator;
+
+class YourModel extends Model
+{
+    protected static function booting(): void
+    {
+        PathGeneratorFactory::setCustomPathGenerators(static::class, CustomPathGenerator::class);
+    }
+}
+```
+
+This allows you to customize the directory structure on a per-model basis.
+
+Keep in mind that path generators set in the model override those defined in the config file.
+
+
+### Defining a Custom Path Generator Inside a Model or Service Provider
+
+ This approach allows for fine-grained control over the media directory structure on a per-model basis, without affecting global configuration.
+
 ## Are you a visual learner?
 
 Here's a video that shows custom paths:

src/MediaCollections/Exceptions/InvalidPathGenerator.php

@@ -16,6 +16,6 @@ public static function doesNotImplementPathGenerator(string $class): self
     {
         $pathGeneratorClass = PathGenerator::class;
 
-        return new static("Path generator class `{$class}` must implement `$pathGeneratorClass}`");
+        return new static("Path generator class `{$class}` must implement `{$pathGeneratorClass}`");
     }
 }

src/Support/MediaStream.php

@@ -12,6 +12,8 @@ class MediaStream implements Responsable
 {
     protected Collection $mediaItems;
 
+    private array $nameCounters = [];
+
     protected array $zipOptions;
 
     public static function create(string $zipName): self
@@ -108,28 +110,22 @@ protected function getZipStreamContents(): Collection
 
     protected function getFileNameWithSuffix(Collection $mediaItems, int $currentIndex): string
     {
-        $fileNameCount = 0;
-
         $fileName = $mediaItems[$currentIndex]->getDownloadFilename();
 
-        foreach ($mediaItems as $index => $media) {
-            if ($index >= $currentIndex) {
-                break;
-            }
+        $prefix = $this->getZipFileNamePrefix($mediaItems, $currentIndex);
+        $key = $prefix.$fileName;
 
-            if ($this->getZipFileNamePrefix($mediaItems, $index).$media->getDownloadFilename() === $this->getZipFileNamePrefix($mediaItems, $currentIndex).$fileName) {
-                $fileNameCount++;
-            }
-        }
+        $count = ($this->nameCounters[$key] ?? 0);
+        $this->nameCounters[$key] = $count + 1;
 
-        if ($fileNameCount === 0) {
+        if ($count === 0) {
             return $fileName;
         }
 
         $extension = pathinfo($fileName, PATHINFO_EXTENSION);
         $fileNameWithoutExtension = pathinfo($fileName, PATHINFO_FILENAME);
 
-        return "{$fileNameWithoutExtension} ({$fileNameCount}).{$extension}";
+        return "{$fileNameWithoutExtension} ({$count}).{$extension}";
     }
 
     protected function getZipFileNamePrefix(Collection $mediaItems, int $currentIndex): string

src/Support/PathGenerator/PathGeneratorFactory.php

@@ -8,6 +8,8 @@
 
 class PathGeneratorFactory
 {
+    protected static array $customPathGenerators = [];
+
     public static function create(Media $media): PathGenerator
     {
         $pathGeneratorClass = static::getPathGeneratorClass($media);
@@ -17,11 +19,21 @@ public static function create(Media $media): PathGenerator
         return app($pathGeneratorClass);
     }
 
+    /**
+     * @throws InvalidPathGenerator
+     */
+    public static function setCustomPathGenerators(string $model, string $pathGeneratorClass): void
+    {
+        static::guardAgainstInvalidPathGenerator($pathGeneratorClass);
+
+        self::$customPathGenerators[$model] = $pathGeneratorClass;
+    }
+
     protected static function getPathGeneratorClass(Media $media)
     {
         $defaultPathGeneratorClass = config('media-library.path_generator');
 
-        foreach (config('media-library.custom_path_generators', []) as $modelClass => $customPathGeneratorClass) {
+        foreach (array_merge(config('media-library.custom_path_generators', []), self::$customPathGenerators) as $modelClass => $customPathGeneratorClass) {
             if (static::mediaBelongToModelClass($media, $modelClass)) {
                 return $customPathGeneratorClass;
             }