Upgrade to 3.6.1

2021-12-07 12:39:37 +01:00
parent 9fc43ea22c
commit 70b8439c49
134 changed files with 19987 additions and 1100 deletions
--- a/kirby/src/Cms/FileModifications.php
+++ b/kirby/src/Cms/FileModifications.php
@@ -203,9 +203,10 @@ trait FileModifications

        if (
            is_a($result, 'Kirby\Cms\FileVersion') === false &&
-            is_a($result, 'Kirby\Cms\File') === false
+            is_a($result, 'Kirby\Cms\File') === false &&
+            is_a($result, 'Kirby\Filesystem\Asset') === false
        ) {
-            throw new InvalidArgumentException('The file::version component must return a File or FileVersion object');
+            throw new InvalidArgumentException('The file::version component must return a File, FileVersion or Asset object');
        }

        return $result;