Merge remote-tracking branch 'origin/develop' into develop

Author: cklei-carly

src/Exports/Exporters/BaseImportUsedDataExporter.php

@@ -127,8 +127,8 @@ protected function processRecordForImportUsed(Model $record, $fs, ?string $dir,
     }
 
     /**
-     * @param \Illuminate\Database\Eloquent\Builder $query
-     * @param string $type
+     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param  string  $type
      * @return \Illuminate\Database\Eloquent\Builder
      */
     protected function buildExportingQueryForImportUsed($query, $type)

src/Exports/Exporters/ImportUsedExporter.php

@@ -36,13 +36,13 @@ public function export()
         if (blank($currentExportingFolder)) {
             return ExportResult::failed('No export folder selected. Please select at least one export type.');
         }
-        
+
         [$folderName, $fs, $fullPath, $subFolders] = $this->ensureTempFolderForExport('import_used', $targetFolders);
 
         $errors = [];
 
         foreach ($records->items() as $record) {
-            
+
             $this->processRecordForImportUsed(
                 $record,
                 $fs,
@@ -61,7 +61,7 @@ public function export()
         if ($isLastFolder && $isCurrentStepFinished) {
             return $this->handleExportCompletion($folderName, $processingErrors);
         }
-        
+
         $processingData['folderName'] = $folderName;
         $processingData['errors'] = $processingErrors;
         $processingData['__steps'][$currentExportingFolder]['nextPage'] = $page + 1;
@@ -71,7 +71,7 @@ public function export()
             // Get next step
             $currentIndex = array_search($currentExportingFolder, $targetFolders);
             $nextIndex = $currentIndex !== false ? $currentIndex + 1 : 0;
-            
+
             if ($nextIndex < count($targetFolders)) {
                 $processingData['nextStep'] = $targetFolders[$nextIndex];
             } else {
@@ -164,16 +164,15 @@ protected static function getFilterRecordsFor(string $type)
     {
         $query = static::getBaseQueryForModel($type);
 
-        if (!$query) {
+        if (! $query) {
             return collect();
         }
 
         return $query->get();
     }
 
     /**
-     * @param string $type
-     * @param Collection<Model> $records
+     * @param  Collection<Model>  $records
      * @return array
      */
     private static function buildOptionsFor(string $type, $records)
@@ -196,17 +195,17 @@ private static function buildOptionsFor(string $type, $records)
                 $label = $record->title;
             } elseif ($record instanceof ModelContracts\Navigation) {
                 $label = "{$record->title} ({$record->type})";
-            } 
-            
+            }
+
             $results[$key] = $label ?? $key;
 
         }
 
         return $results;
     }
+
     /**
-     * @param string $type
-     * @param Collection<Model> $records
+     * @param  Collection<Model>  $records
      * @return array
      */
     private static function buildOptionDescriptionsFor(string $type, $records)
@@ -229,8 +228,8 @@ private static function buildOptionDescriptionsFor(string $type, $records)
                 $label = $record->slug;
             } elseif ($record instanceof ModelContracts\Navigation) {
                 $label = "{$record->category}";
-            } 
-            
+            }
+
             $results[$key] = $label ?? $key;
 
         }