Merge remote-tracking branch 'origin/HEAD' into 4.x

Author: cklei-carly

database/seeders/SampleSeeder.php

@@ -4,8 +4,10 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Seeder;
+use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
+use SolutionForest\InspireCms\Fields\Configs\RichEditor;
 use SolutionForest\InspireCms\Helpers\ModelHelper;
 use SolutionForest\InspireCms\Helpers\TemplateHelper;
 use SolutionForest\InspireCms\ImportData\Entities as ImportDataEntities;
@@ -14,6 +16,7 @@
 use SolutionForest\InspireCms\Services\ImportDataServiceInterface;
 use SolutionForest\InspireCms\Support\Dtos\MediaAssetDto;
 use SolutionForest\InspireCms\Support\Models\Contracts\MediaAsset;
+use Spatie\MediaLibrary\MediaCollections\Models\Media;
 
 class SampleSeeder extends Seeder
 {
@@ -117,7 +120,7 @@ private function showImportErrors(): void
 
     protected function addSampleTemplates(): void
     {
-        $allTemplates = app(\Illuminate\Filesystem\Filesystem::class)->allFiles(__DIR__ . '/../../stubs/SampleTemplates');
+        $allTemplates = app(Filesystem::class)->allFiles(__DIR__ . '/../../stubs/SampleTemplates');
 
         $getContent = function (string $slug, string $theme) use ($allTemplates) {
             try {
@@ -152,7 +155,7 @@ protected function addSampleTemplates(): void
 
     protected function getSampleFields(): array
     {
-        $toolbarButtonsForRichEditor = array_keys(\SolutionForest\InspireCms\Fields\Configs\RichEditor::getAllAvailableToolbarButtons());
+        $toolbarButtonsForRichEditor = array_keys(RichEditor::getAllAvailableToolbarButtons());
         $extraConfigForRichEditor = [
             'fileAttachmentsDisk' => 'public',
             'fileAttachmentsVisibility' => 'public',
@@ -564,7 +567,7 @@ protected function addSampleNavigation(): void
     protected function makeSampleMedia(): void
     {
         $mediaAssetModel = InspireCmsConfig::getMediaAssetModelClass();
-        $mediaModel = config('media-library.media_model', \Spatie\MediaLibrary\MediaCollections\Models\Media::class);
+        $mediaModel = config('media-library.media_model', Media::class);
 
         if (! $this->isTableExists($mediaAssetModel) || ! $this->isTableExists($mediaModel)) {
             return;

src/Base/Filament/Actions/Concerns/CreateContentActionTrait.php

@@ -6,6 +6,7 @@
 use Filament\Forms\Components\TableSelect;
 use Filament\Support\Facades\FilamentIcon;
 use Illuminate\Database\Eloquent\Model;
+use SolutionForest\InspireCms\Filament\Resources\Contents\Actions\CreateContentAction;
 use SolutionForest\InspireCms\Filament\Resources\Contents\Tables\DocumentTypesAssociationTable;
 use SolutionForest\InspireCms\InspireCmsConfig;
 
@@ -76,7 +77,7 @@ protected function setUpAction(): void
                     }),
             ])
             ->action(function (array $data, $livewire) {
-                $url = \SolutionForest\InspireCms\Filament\Resources\Contents\Actions\CreateContentAction::generateCreateContentUrl(
+                $url = CreateContentAction::generateCreateContentUrl(
                     documentType: $data['selection'],
                     parentContent: $this->getParentContentKey(),
                     translatableLocale: isset($livewire->activeLocale) ? $livewire->activeLocale : null

src/Base/Filament/Concerns/ContentFormTrait.php

@@ -17,6 +17,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Arr;
 use Illuminate\Validation\ValidationException;
+use LaraZeus\SpatieTranslatable\Resources\Pages\CreateRecord\Concerns\Translatable;
 use SolutionForest\InspireCms\Base\Filament\Resources\Pages\BaseContentCreatePage;
 use SolutionForest\InspireCms\Base\Filament\Resources\Pages\CreateContentRecord\Concerns\Translatable as CmsCreateContentRecordsTranslatable;
 use SolutionForest\InspireCms\Filament\Resources\Contents\Schemas\PublishContentForm;
@@ -347,7 +348,7 @@ public function handlePublishableRecordCreateOrUpdate(array $data, array $publis
 
             $isLivewireHandleTranslatable = collect(class_uses_recursive($this))
                 ->where(fn ($traitClass) => in_array($traitClass, [
-                    \LaraZeus\SpatieTranslatable\Resources\Pages\CreateRecord\Concerns\Translatable::class,
+                    Translatable::class,
                     CmsCreateContentRecordsTranslatable::class,
                 ]))
                 ->isNotEmpty();

src/Base/Filament/Tables/BladeIconTable.php

@@ -6,6 +6,7 @@
 use Filament\Support\Enums\TextSize;
 use Filament\Tables\Columns\Layout\Stack;
 use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Filters\SelectFilter;
 use Filament\Tables\Table;
 use Illuminate\Pagination\LengthAwarePaginator;
 use SolutionForest\InspireCms\Filament\Tables\Columns\BladeIconColumn;
@@ -80,7 +81,7 @@ public static function configure(Table $table): Table
                 ]),
             ])
             ->filters([
-                \Filament\Tables\Filters\SelectFilter::make('set')
+                SelectFilter::make('set')
                     ->options(fn () => static::getAvailableSets()),
             ]);
     }

src/Collection/ContentCollection.php

@@ -6,6 +6,7 @@
 use Illuminate\Container\Container;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Pagination\Paginator;
+use Illuminate\Support\Collection;
 use InvalidArgumentException;
 use SolutionForest\InspireCms\Models\Contracts\Content;
 use Staudenmeir\LaravelAdjacencyList\Eloquent\Collection as BaseCollection;
@@ -105,7 +106,7 @@ public function simplePaginate($perPage = null, $pageName = 'page', $page = null
     /**
      * Create a new length-aware paginator instance.
      *
-     * @param  \Illuminate\Support\Collection  $items
+     * @param  Collection  $items
      * @param  int  $total
      * @param  int  $perPage
      * @param  int  $currentPage
@@ -126,7 +127,7 @@ protected function paginator($items, $total, $perPage, $currentPage, $options)
     /**
      * Create a new simple paginator instance.
      *
-     * @param  \Illuminate\Support\Collection  $items
+     * @param  Collection  $items
      * @param  int  $perPage
      * @param  int  $currentPage
      * @param  array  $options

src/Dtos/ContentDto.php

@@ -2,6 +2,7 @@
 
 namespace SolutionForest\InspireCms\Dtos;
 
+use Carbon\CarbonInterface;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection as SupportCollection;
 use SolutionForest\InspireCms\Base\Dtos\Concerns\HasPropertyGroup;
@@ -35,7 +36,7 @@ class ContentDto extends BaseTranslatableModelDto
     public $type;
 
     /**
-     * @var ?\Carbon\CarbonInterface
+     * @var ?CarbonInterface
      */
     public $publishAt;
 
@@ -85,7 +86,7 @@ class ContentDto extends BaseTranslatableModelDto
      * @param  Content  $model
      * @param  string  $locale
      */
-    public static function make($model, array $propertyData, $locale, ?\Carbon\CarbonInterface $publishAt = null)
+    public static function make($model, array $propertyData, $locale, ?CarbonInterface $publishAt = null)
     {
         $availableLanguages = inspirecms()->getAllAvailableLanguages();
 
@@ -278,7 +279,7 @@ public function getRedirectUrl(?string $locale = null): ?string
 
     // region Helpers
     /**
-     * @param  Model | \SolutionForest\InspireCms\Models\Contracts\Content  $record
+     * @param  Model | Content  $record
      */
     protected static function prepareDtoParameters(Model $record, array $propertyData, array $availableLanguages): array
     {

src/Facades/LocalizationManager.php

@@ -3,6 +3,7 @@
 namespace SolutionForest\InspireCms\Facades;
 
 use Illuminate\Support\Facades\Facade;
+use SolutionForest\InspireCms\Base\Manifests\LocaleManifest;
 use SolutionForest\InspireCms\Base\Manifests\LocaleManifestInterface;
 
 /**
@@ -13,7 +14,7 @@
  * @method static array getLocaleLabelsFor(array $locales, ?string $displayLocale = null)
  * @method static string getLocaleLabel(string $locale, ?string $displayLocale = null)
  *
- * @see \SolutionForest\InspireCms\Base\Manifests\LocaleManifest
+ * @see LocaleManifest
  */
 class LocalizationManager extends Facade
 {

src/Facades/Templates.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Facade;
+use SolutionForest\InspireCms\Base\TemplateManager;
 use SolutionForest\InspireCms\Base\TemplateManagerInterface;
 use SolutionForest\InspireCms\Models\Contracts\Base\HasTemplates;
 use SolutionForest\InspireCms\Models\Contracts\Template;
@@ -22,7 +23,7 @@
  * @method static void assignDefaultTemplateIfNotSet(HasTemplates&Model $templateable, $template)
  * @method static void exportTemplate(Model&Template $template, ?string $theme = null)
  *
- * @see \SolutionForest\InspireCms\Base\TemplateManager
+ * @see TemplateManager
  */
 class Templates extends Facade
 {

src/Fields/Converters/MarkdownConverter.php

@@ -3,6 +3,7 @@
 namespace SolutionForest\InspireCms\Fields\Converters;
 
 use Illuminate\Support\Arr;
+use League\CommonMark\Extension\Attributes\AttributesExtension;
 use Throwable;
 
 class MarkdownConverter extends BaseConverter
@@ -74,7 +75,7 @@ public function getExtensions(): array
         $extensions = $this->mdExtensions;
 
         $defaultExtensions = [
-            app(\League\CommonMark\Extension\Attributes\AttributesExtension::class),
+            app(AttributesExtension::class),
         ];
 
         foreach ($defaultExtensions as $extension) {

src/Filament/Concerns/ClusterSectionPageTrait.php

@@ -88,8 +88,8 @@ public static function getNavigationItems(): array
     }
 
     /**
-     * @param  \Filament\Navigation\NavigationItem  $navigationItem
-     * @return \Filament\Navigation\NavigationItem
+     * @param  NavigationItem  $navigationItem
+     * @return NavigationItem
      */
     public static function configurePageKeyOnNavigationItem($navigationItem)
     {