Fix CS again

biigle · Dec 19, 2024 · e9ecd73 · e9ecd73
1 parent 8eb5637
commit e9ecd73
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/app/Console/Commands/SyncUuids.php b/app/Console/Commands/SyncUuids.php
@@ -115,8 +115,7 @@ protected function generateOutput()
                     'lastname' => Hash::make($user->lastname),
                     'email' => Hash::make($user->email),
                 ];
-            })
-            ->toJson(JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+            })->toJson(JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
         $bar->finish();
 
         echo $users;

diff --git a/app/Services/Export/LabelTreeExport.php b/app/Services/Export/LabelTreeExport.php
@@ -12,8 +12,11 @@ class LabelTreeExport extends Export
      */
     public function getContent()
     {
-        $trees =
-            LabelTree::where(function ($query) {
+        $trees = LabelTree::with('labels', 'version')
+            ->with(['members' => function ($query) {
+                $query->select('users.id', 'label_tree_user.role_id');
+            }])
+            ->where(function ($query) {
                 $query->whereIn('id', $this->ids)
                     // Also add master trees of all included versioned trees.
                     ->orWhereIn('id', function ($query) {
@@ -23,10 +26,6 @@ public function getContent()
                             ->whereIn('label_trees.id', $this->ids);
                     });
             })
-            ->with('labels', 'version')
-            ->with(['members' => function ($query) {
-                $query->select('users.id', 'label_tree_user.role_id');
-            }])
             ->get();
 
         $trees->each(function ($tree) {