Fix styling

cklei-carly · github-actions[bot] · commit 64bd76edb75d · 2025-04-03T09:56:25.000Z
diff --git a/src/Fields/Converters/MediaPickerConverter.php b/src/Fields/Converters/MediaPickerConverter.php
@@ -28,11 +28,10 @@ public function toDisplayValue(mixed $sourceValue, ?string $locale, ?string $fal
             ->filter(fn ($c) => in_array($c->getKey(), $formattedSourceValue))
             ->sortBy(fn ($c) => array_search($c->getKey(), $formattedSourceValue))
             ->values()
-            ->map(function ($item) use ($locale, $fallbackLocale) {
+            ->map(function ($item) use ($locale) {
                 if ($item instanceof MediaAsset) {
                     return $item->toDto($locale);
-                }
-                else if ($item instanceof BaseDto) {
+                } elseif ($item instanceof BaseDto) {
                     return $item;
                 }
 
diff --git a/src/Helpers/ContentHelper.php b/src/Helpers/ContentHelper.php
@@ -86,7 +86,6 @@ public static function getAccessibleContentIds($user = null)
             ->all();
     }
 
-
     public static function getDtoRequiredRelations(): array
     {
         return [
diff --git a/src/Helpers/FieldTypeHelper.php b/src/Helpers/FieldTypeHelper.php
@@ -128,7 +128,7 @@ public static function getFieldConfigFormSchemaForFieldType($typeName)
 
     public static function getFieldTypeConfig(string $typeName, array $config = []): ?FieldTypeConfig
     {
-        try{
+        try {
             return FilamentFieldGroup::getFieldTypeConfig($typeName, $config);
         } catch (\Exception $e) {
             return null;
diff --git a/src/Models/Concerns/HasContentVersions.php b/src/Models/Concerns/HasContentVersions.php
@@ -115,10 +115,10 @@ public function getLatestPublishedPropertyData()
 
                 if (is_array($propData)) {
                     return $propData;
-                } else if (is_string($propData)) {
+                } elseif (is_string($propData)) {
                     return json_decode($propData, true);
                 }
-                
+
             } catch (\Throwable $th) {
                 // Fallback to load via publishedVersions
             }
@@ -147,10 +147,10 @@ public function getLatestVersionPropertyData()
 
                 if (is_array($propData)) {
                     return $propData;
-                } else if (is_string($propData)) {
+                } elseif (is_string($propData)) {
                     return json_decode($propData, true);
                 }
-                
+
             } catch (\Throwable $th) {
                 // Fallback to load via latestContentVersion
             }
diff --git a/src/Models/DocumentType.php b/src/Models/DocumentType.php
@@ -120,7 +120,7 @@ public function scopeWhereCanBeContent($query, bool $condition = true)
             static::getCategoryEnumClass()::Web->value,
             static::getCategoryEnumClass()::Data->value,
         ];
-        
+
         if ($condition) {
             return $query->whereIn('category', $canBeContentCats);
         }
diff --git a/src/Models/Scopes/ContentVersionDetailScope.php b/src/Models/Scopes/ContentVersionDetailScope.php
@@ -36,16 +36,16 @@ public function apply($builder, Model $model)
                         [
                             'id' => $related->getKeyName(),
                             'dt' => $recordCreationColumn,
-                            'status' => "publish_state",
-                        ], 
-                        null, 
-                    ) . " as __version_details"
+                            'status' => 'publish_state',
+                        ],
+                        null,
+                    ) . ' as __version_details'
                 )
                 ->selectRaw(
                     $this->buildJsonGroupConcatExpression(
-                        "to_data",
+                        'to_data',
                         $related->getKeyName(),
-                    ) . " as __version_data"
+                    ) . ' as __version_data'
                 )
                 ->selectRaw("MAX($recordCreationColumn) as __latest_version_dt")
                 ->selectRaw("MIN($recordCreationColumn) as __earliest_version_dt")
@@ -71,25 +71,25 @@ public function apply($builder, Model $model)
         }
     }
 
-    private function buildJsonGroupConcatExpression(array|string $columns, ?string $jsonKeyColumn): string
+    private function buildJsonGroupConcatExpression(array | string $columns, ?string $jsonKeyColumn): string
     {
         $isJsonColumn = filled($jsonKeyColumn);
 
         // Check db driver
         $dbDriver = DB::connection()->getDriverName();
 
         if (is_string($columns)) {
-        
+
             $gpConcatString = $columns;
 
         } else {
 
             $gpConcatStrings = collect($columns)
                 ->map(function ($columnName, $jsonKey) use ($dbDriver) {
-                    
+
                     $columnTemplate = match ($dbDriver) {
                         // Haven't 'concat' function in sqlite
-                        'sqlite' => "( '\"?\":\"' || ? || '\"' )", 
+                        'sqlite' => "( '\"?\":\"' || ? || '\"' )",
                         default => "CONCAT('\"?\":\"', ?, '\"')",
                     };
 
@@ -100,19 +100,19 @@ private function buildJsonGroupConcatExpression(array|string $columns, ?string $
                 })
                 ->implode(match ($dbDriver) {
                     'sqlite' => " || ', ' || ",
-                    default => ", ', ', ", 
+                    default => ", ', ', ",
                 });
 
             // Json format '{key1': 'value1', 'key2': 'value2'}'
             $gpConcatString = match ($dbDriver) {
-                'sqlite' => "( '{' || $gpConcatStrings || '}' )", 
+                'sqlite' => "( '{' || $gpConcatStrings || '}' )",
                 default => "CONCAT('{', $gpConcatStrings, '}')",
             };
         }
 
         if ($jsonKeyColumn) {
 
-            $gpConcatString = str( 
+            $gpConcatString = str(
                 match ($dbDriver) {
                     'sqlite' => "( '\"' || ? ||'\":' || ? )",
                     default => "CONCAT('\"', ?, '\":', ?, '')",
@@ -122,7 +122,6 @@ private function buildJsonGroupConcatExpression(array|string $columns, ?string $
                 ->toString();
         }
 
-
         // Not concat function
         if ($dbDriver === 'sqlite') {
             return $isJsonColumn
diff --git a/src/Models/Scopes/DocumentTypeScope.php b/src/Models/Scopes/DocumentTypeScope.php
@@ -12,15 +12,15 @@ class DocumentTypeScope implements Scope
     public function apply($builder, Model $model)
     {
         if ($model instanceof Content) {
-            
+
             $query = $builder->getQuery();
 
             $related = $model->documentType()->getRelated();
             $foreignKey = $model->documentType()->getForeignKeyName();
 
             $query
                 ->leftJoin(
-                    $related->getTable() . ' as _dt', 
+                    $related->getTable() . ' as _dt',
                     $model->qualifyColumn($foreignKey),
                     '=',
                     '_dt.' . $related->getKeyName()
diff --git a/src/Resolvers/PublishedContentResolver.php b/src/Resolvers/PublishedContentResolver.php
@@ -77,7 +77,7 @@ protected function getContentAndLocaleByRoute($route)
                 $locale = $this->segmentProvider->getLocaleFromDefaultRoute($route);
             }
         } else {
-            
+
             [$content, $landId] = $this->contentService->findByRoutePatternWithLangId(
                 uri: $routePatternToCheck,
                 isDefaultRoutePattern: false,
diff --git a/src/Services/ContentService.php b/src/Services/ContentService.php
@@ -35,17 +35,18 @@ public function findByIds($ids, $isWebPage = null, $isPublished = null, $withRel
     public function findByRoutePatternWithLangId($uri, $isDefaultRoutePattern, $isWebPage = null, $withRelations = [], $sorting = [], $limit = 10)
     {
         $query = $this
-            ->buildFindWithRouteQuery(fn ($q) => $q
-                ->where('uri', $uri)
-                ->when($isDefaultRoutePattern != null, fn ($q) => $q->whereIsDefaultPattern())
+            ->buildFindWithRouteQuery(
+                fn ($q) => $q
+                    ->where('uri', $uri)
+                    ->when($isDefaultRoutePattern != null, fn ($q) => $q->whereIsDefaultPattern())
             )
             ->with($withRelations);
 
         $query = $this->applyScopeFilters($query, [
             'whereIsWebPage' => $isWebPage,
         ]);
         $query = $this->applySortingAndLimit($query, $sorting, $limit);
-        
+
         $records = $query->get();
 
         return collect($records)
@@ -59,7 +60,7 @@ public function findByRoutePatternWithLangId($uri, $isDefaultRoutePattern, $isWe
     public function findByRealPath($path, $isWebPage = null, $isPublished = null, $withRelations = [], $sorting = [], $limit = 10)
     {
         $query = $this->buildFindByRealPathQuery($path, $isWebPage, $isPublished, $withRelations, $sorting, $limit);
-    
+
         // Key the result by the path
         return $query
             ->get()
@@ -152,7 +153,7 @@ protected function buildBaseQuery()
     }
 
     /**
-     * @param \Closure(\Illuminate\Database\Eloquent\Builder)   $routeQueryCallback
+     * @param  \Closure(\Illuminate\Database\Eloquent\Builder)  $routeQueryCallback
      * @return \Illuminate\Database\Eloquent\Builder
      */
     protected function buildFindWithRouteQuery(\Closure $routeQueryCallback)
@@ -197,9 +198,8 @@ protected function buildFindByPathQuery(string | array $path)
     }
 
     /**
-     * @param \Illuminate\Database\Eloquent\Builder   $query
+     * @param  \Illuminate\Database\Eloquent\Builder  $query
      * @param  array<string, string>  $sorting
-     * @param  int|null  $limit
      * @return \Illuminate\Database\Eloquent\Builder
      */
     protected function applySortingAndLimit($query, array $sorting, ?int $limit = null)
@@ -229,7 +229,7 @@ protected function applySortingAndLimit($query, array $sorting, ?int $limit = nu
     }
 
     /**
-     * @param \Illuminate\Database\Eloquent\Builder   $query
+     * @param  \Illuminate\Database\Eloquent\Builder  $query
      * @param  array<string,mixed>  $where
      * @return \Illuminate\Database\Eloquent\Builder
      */
@@ -251,6 +251,7 @@ protected function applyScopeFilters($query, $where)
                 }
             }
         }
+
         return $query;
     }
 
@@ -268,7 +269,7 @@ private function buildFindByIdsQuery($ids, $isWebPage = null, $isPublished = nul
         $ids = is_string($ids) ? $ids : Arr::flatten($ids);
 
         $query = $this->buildBaseQuery()->with($withRelations);
-        
+
         $query = $this->applyScopeFilters($query, [
             'whereIsWebPage' => $isWebPage,
             'whereIsPublished' => $isPublished,
@@ -289,15 +290,14 @@ private function buildFindByRealPathQuery($path, $isWebPage = null, $isPublished
             'whereIsPublished' => $isPublished,
         ]);
         $query = $this->applySortingAndLimit($query, $sorting, $limit);
-    
+
         return $query;
     }
 
-
     private function buildGetUnderRealPathQuery($path, $isWebPage = null, $isPublished = null, $withRelations = [], $sorting = [], $limit = null)
     {
         $query = $this->buildUnderPathQuery($path)->with($withRelations);
-        
+
         $query = $this->applyScopeFilters($query, [
             'whereIsWebPage' => $isWebPage,
             'whereIsPublished' => $isPublished,
@@ -310,7 +310,7 @@ private function buildGetUnderRealPathQuery($path, $isWebPage = null, $isPublish
     private function initializePaginatorCollection($paginator)
     {
         if ($paginator instanceof \Illuminate\Contracts\Pagination\Paginator) {
-            
+
             $items = $paginator->getCollection();
 
             // for "toDto" method
diff --git a/src/Services/ContentServiceInterface.php b/src/Services/ContentServiceInterface.php
@@ -18,21 +18,21 @@ interface ContentServiceInterface
      * @param  bool|null  $isWebPage  Whether to filter by web page status.
      * @param  bool|null  $isPublished  Whether to filter by published status.
      * @param  array  $withRelations  The relations to load with the content.
-     * @param array<string,string>|null $sorting The sorting options for the query.
-     * @param int|null $limit The maximum number of content items to retrieve, or null for unlimited.
+     * @param  array<string,string>|null  $sorting  The sorting options for the query.
+     * @param  int|null  $limit  The maximum number of content items to retrieve, or null for unlimited.
      * @return ContentCollection<TResult>
      */
     public function findByIds($ids, $isWebPage = null, $isPublished = null, $withRelations = [], $sorting = [], $limit = 10);
-    
+
     /**
      * Find content item(s) by their route pattern and language ID.
      *
      * @param  string  $uri  The URI of the content item to find.
      * @param  bool  $isDefaultRoutePattern  Whether to filter by default route pattern.
      * @param  bool|null  $isWebPage  Whether to filter by web page status.
      * @param  array  $withRelations  The relations to load with the content.
-     * @param array<string,string>|null $sorting The sorting options for the query.
-     * @param int|null $limit The maximum number of content items to retrieve, or null for unlimited.
+     * @param  array<string,string>|null  $sorting  The sorting options for the query.
+     * @param  int|null  $limit  The maximum number of content items to retrieve, or null for unlimited.
      * @return Collection<array{content:TResult,language_id:int}>
      */
     public function findByRoutePatternWithLangId($uri, $isDefaultRoutePattern, $isWebPage = null, $withRelations = [], $sorting = [], $limit = 10);
@@ -44,8 +44,8 @@ public function findByRoutePatternWithLangId($uri, $isDefaultRoutePattern, $isWe
      * @param  bool|null  $isWebPage  Whether to filter by web page status.
      * @param  bool|null  $isPublished  Whether to filter by published status.
      * @param  array  $withRelations  The relations to load with the content.
-     * @param array<string,string>|null $sorting The sorting options for the query.
-     * @param int|null $limit The maximum number of content items to retrieve, or null for unlimited.
+     * @param  array<string,string>|null  $sorting  The sorting options for the query.
+     * @param  int|null  $limit  The maximum number of content items to retrieve, or null for unlimited.
      * @return Collection<string,TResult> Keyed by the path.
      */
     public function findByRealPath($path, $isWebPage = null, $isPublished = null, $withRelations = [], $sorting = [], $limit = 10);
@@ -57,8 +57,8 @@ public function findByRealPath($path, $isWebPage = null, $isPublished = null, $w
      * @param  bool|null  $isWebPage  Whether to filter by web page status.
      * @param  bool|null  $isPublished  Whether to filter by published status.
      * @param  array  $withRelations  The relations to load with the content.
-     * @param array<string,string>|null $sorting The sorting options for the query.
-     * @param int|null $limit The maximum number of content items to retrieve, or null for unlimited.
+     * @param  array<string,string>|null  $sorting  The sorting options for the query.
+     * @param  int|null  $limit  The maximum number of content items to retrieve, or null for unlimited.
      * @return ContentCollection<TResult>
      */
     public function getUnderRealPath($path, $isWebPage = null, $isPublished = null, $withRelations = [], $sorting = [], $limit = 10);
@@ -73,39 +73,38 @@ public function getUnderRealPath($path, $isWebPage = null, $isPublished = null,
      * @param  bool|null  $isWebPage  Whether to filter by web page status.
      * @param  bool|null  $isPublished  Whether to filter by published status.
      * @param  array  $withRelations  The relations to load with the content.
-     * @param array<string,string>|null $sorting The sorting options for the query.
+     * @param  array<string,string>|null  $sorting  The sorting options for the query.
      * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator<TResult>
      */
     public function getPaginatedByIds($ids, $page = 1, $perPage = 10, $pageName = 'page', $isWebPage = null, $isPublished = null, $withRelations = [], $sorting = []);
 
     /**
      * Get content items by their real path with pagination.
      *
-     * @param string $path The real path to filter content items by
-     * @param int $page The current page number
-     * @param int|null  $perPage  The number of items per page.
-     * @param string $pageName Name of the page query parameter
-     * @param bool|null $isWebPage Filter by web page status (true/false/null for all)
-     * @param bool|null $isPublished Filter by published status (true/false/null for all)
-     * @param array $withRelations Relationships to eager load with the query
-     * @param array $sorting Sorting options for the results
-     * 
+     * @param  string  $path  The real path to filter content items by
+     * @param  int  $page  The current page number
+     * @param  int|null  $perPage  The number of items per page.
+     * @param  string  $pageName  Name of the page query parameter
+     * @param  bool|null  $isWebPage  Filter by web page status (true/false/null for all)
+     * @param  bool|null  $isPublished  Filter by published status (true/false/null for all)
+     * @param  array  $withRelations  Relationships to eager load with the query
+     * @param  array  $sorting  Sorting options for the results
      * @return \Illuminate\Pagination\LengthAwarePaginator<TResult>
      */
     public function getPaginatedByRealPath($path, $page = 1, $perPage = 10, $pageName = 'page', $isWebPage = null, $isPublished = null, $withRelations = [], $sorting = []);
-    
+
     /**
      * Get content items under the given real path with pagination.
      *
      * @param  string|string[]  $path  The real path under which to find content items.
-     * @param int $page The current page number
-     * @param int|null  $perPage  The number of items per page.
-     * @param string $pageName Name of the page query parameter
+     * @param  int  $page  The current page number
+     * @param  int|null  $perPage  The number of items per page.
+     * @param  string  $pageName  Name of the page query parameter
      * @param  bool|null  $isWebPage  Whether to filter by web page status.
      * @param  bool|null  $isPublished  Whether to filter by published status.
      * @param  array  $withRelations  The relations to load with the content.
-     * @param array<string,string>|null $sorting The sorting options for the query.
-     * @param int|null $limit The maximum number of content items to retrieve, or null for unlimited.
+     * @param  array<string,string>|null  $sorting  The sorting options for the query.
+     * @param  int|null  $limit  The maximum number of content items to retrieve, or null for unlimited.
      * @return ContentCollection<TResult>
      */
     public function getPaginatedUnderRealPath($path, $page = 1, $perPage = 10, $pageName = 'page', $isWebPage = null, $isPublished = null, $withRelations = [], $sorting = []);
diff --git a/src/Services/ImportDataService.php b/src/Services/ImportDataService.php
@@ -257,11 +257,11 @@ protected function processForDocumentTypes()
 
         $reorderDocumentTypes = function ($collection) {
 
-            $allowedItemsCount = collect($collection)->pluck('allowed')->reject(fn ($i) => !is_array($i) || empty($i))->flatten()->map(fn ($v) => ['n' => $v])->countBy('n')->all();
+            $allowedItemsCount = collect($collection)->pluck('allowed')->reject(fn ($i) => ! is_array($i) || empty($i))->flatten()->map(fn ($v) => ['n' => $v])->countBy('n')->all();
             // @todo For inheritance
 
             return collect($collection)->sortBy(function ($item) use ($allowedItemsCount) {
-                
+
                 // Low = Higher Order
                 $itemOrder = 0;
 

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,6 @@ public static function getAccessibleContentIds($user = null)`
`86`	`86`	`->all();`
`87`	`87`	`}`
`88`	`88`
`89`		`-`
`90`	`89`	`public static function getDtoRequiredRelations(): array`
`91`	`90`	`{`
`92`	`91`	`return [`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public static function getFieldConfigFormSchemaForFieldType($typeName)`
`128`	`128`
`129`	`129`	`public static function getFieldTypeConfig(string $typeName, array $config = []): ?FieldTypeConfig`
`130`	`130`	`{`
`131`		`- try{`
	`131`	`+ try {`
`132`	`132`	`return FilamentFieldGroup::getFieldTypeConfig($typeName, $config);`
`133`	`133`	`} catch (\Exception $e) {`
`134`	`134`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -115,10 +115,10 @@ public function getLatestPublishedPropertyData()`
`115`	`115`
`116`	`116`	`if (is_array($propData)) {`
`117`	`117`	`return $propData;`
`118`		`- } else if (is_string($propData)) {`
	`118`	`+ } elseif (is_string($propData)) {`
`119`	`119`	`return json_decode($propData, true);`
`120`	`120`	`}`
`121`		`-`
	`121`	`+`
`122`	`122`	`} catch (\Throwable $th) {`
`123`	`123`	`// Fallback to load via publishedVersions`
`124`	`124`	`}`
`@@ -147,10 +147,10 @@ public function getLatestVersionPropertyData()`
`147`	`147`
`148`	`148`	`if (is_array($propData)) {`
`149`	`149`	`return $propData;`
`150`		`- } else if (is_string($propData)) {`
	`150`	`+ } elseif (is_string($propData)) {`
`151`	`151`	`return json_decode($propData, true);`
`152`	`152`	`}`
`153`		`-`
	`153`	`+`
`154`	`154`	`} catch (\Throwable $th) {`
`155`	`155`	`// Fallback to load via latestContentVersion`
`156`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public function scopeWhereCanBeContent($query, bool $condition = true)`
`120`	`120`	`static::getCategoryEnumClass()::Web->value,`
`121`	`121`	`static::getCategoryEnumClass()::Data->value,`
`122`	`122`	`];`
`123`		`-`
	`123`	`+`
`124`	`124`	`if ($condition) {`
`125`	`125`	`return $query->whereIn('category', $canBeContentCats);`
`126`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ protected function getContentAndLocaleByRoute($route)`
`77`	`77`	`$locale = $this->segmentProvider->getLocaleFromDefaultRoute($route);`
`78`	`78`	`}`
`79`	`79`	`} else {`
`80`		`-`
	`80`	`+`
`81`	`81`	`[$content, $landId] = $this->contentService->findByRoutePatternWithLangId(`
`82`	`82`	`uri: $routePatternToCheck,`
`83`	`83`	`isDefaultRoutePattern: false,`