Fix final CS issues

biigle · Oct 11, 2023 · de0659c · de0659c
1 parent 5dc354a
commit de0659c
Show file tree

Hide file tree

Showing 10 changed files with 218 additions and 227 deletions.
diff --git a/app/Http/Controllers/Api/Annotations/Filters/AnnotationUserController.php b/app/Http/Controllers/Api/Annotations/Filters/AnnotationUserController.php
@@ -55,12 +55,12 @@ public function index(Request $request, $tid, $uid)
         $labelsRelation = $model->labels();
 
         return $query
-                ->join($labelsRelation->getRelated()->getTable(), $labelsRelation->getQualifiedParentKeyName(), '=', $labelsRelation->getQualifiedForeignKeyName())
-                ->where($labelsRelation->getRelated()->user()->getQualifiedForeignKeyName(), $uid)
-                ->join($fileRelation->getRelated()->getTable(), $fileRelation->getQualifiedForeignKeyName(), '=', $ownerKeyName)
-                ->where($fileRelation->getRelated()->volume()->getQualifiedForeignKeyName(), $tid)
-                ->select($ownerKeyName)
-                ->distinct()
-                ->pluck($ownerKeyName);
+            ->join($labelsRelation->getRelated()->getTable(), $labelsRelation->getQualifiedParentKeyName(), '=', $labelsRelation->getQualifiedForeignKeyName())
+            ->where($labelsRelation->getRelated()->user()->getQualifiedForeignKeyName(), $uid)
+            ->join($fileRelation->getRelated()->getTable(), $fileRelation->getQualifiedForeignKeyName(), '=', $ownerKeyName)
+            ->where($fileRelation->getRelated()->volume()->getQualifiedForeignKeyName(), $tid)
+            ->select($ownerKeyName)
+            ->distinct()
+            ->pluck($ownerKeyName);
     }
 }
diff --git a/app/Http/Controllers/Api/Volumes/Filters/AnnotationLabelController.php b/app/Http/Controllers/Api/Volumes/Filters/AnnotationLabelController.php
@@ -54,12 +54,12 @@ public function index(Request $request, $tid, $lid)
         $labelsRelation = $model->labels();
 
         return $query
-                ->join($labelsRelation->getRelated()->getTable(), $labelsRelation->getQualifiedParentKeyName(), '=', $labelsRelation->getQualifiedForeignKeyName())
-                ->where($labelsRelation->getRelated()->label()->getQualifiedForeignKeyName(), $lid)
-                ->join($fileRelation->getRelated()->getTable(), $fileRelation->getQualifiedForeignKeyName(), '=', $ownerKeyName)
-                ->where($fileRelation->getRelated()->volume()->getQualifiedForeignKeyName(), $tid)
-                ->select($ownerKeyName)
-                ->distinct()
-                ->pluck($ownerKeyName);
+            ->join($labelsRelation->getRelated()->getTable(), $labelsRelation->getQualifiedParentKeyName(), '=', $labelsRelation->getQualifiedForeignKeyName())
+            ->where($labelsRelation->getRelated()->label()->getQualifiedForeignKeyName(), $lid)
+            ->join($fileRelation->getRelated()->getTable(), $fileRelation->getQualifiedForeignKeyName(), '=', $ownerKeyName)
+            ->where($fileRelation->getRelated()->volume()->getQualifiedForeignKeyName(), $tid)
+            ->select($ownerKeyName)
+            ->distinct()
+            ->pluck($ownerKeyName);
     }
 }
diff --git a/app/Jobs/CloneImagesOrVideos.php b/app/Jobs/CloneImagesOrVideos.php
@@ -229,8 +229,8 @@ private function copyImageAnnotation($volume, $copy, $selectedFileIds, $selected
                 '=',
                 'image_annotations.id'
             )
-            ->when(!empty($selectedLabelIds), fn ($query) => $query->whereIn('image_annotation_labels.label_id', $selectedLabelIds))
-            ->whereIn('image_annotations.image_id', $selectedFileIds);
+                ->when(!empty($selectedLabelIds), fn ($query) => $query->whereIn('image_annotation_labels.label_id', $selectedLabelIds))
+                ->whereIn('image_annotations.image_id', $selectedFileIds);
 
 
         // use unique ids, because an annotation with multiple labels would be duplicated
@@ -384,9 +384,9 @@ private function copyVideoAnnotation($volume, $copy, $selectedFileIds, $selected
                 '=',
                 'video_annotations.id'
             )
-            ->when(!empty($selectedLabelIds), fn ($query) => $query->whereIn('video_annotation_labels.label_id', $selectedLabelIds))
-            ->whereIn('video_annotations.video_id', $selectedFileIds)
-            ->distinct();
+                ->when(!empty($selectedLabelIds), fn ($query) => $query->whereIn('video_annotation_labels.label_id', $selectedLabelIds))
+                ->whereIn('video_annotations.video_id', $selectedFileIds)
+                ->distinct();
 
         // use unique ids, because an annotation with multiple labels would be duplicated
         $usedAnnotationIds = $annotationJoinLabel
@@ -480,7 +480,8 @@ private function copyVideoLabels($volume, $copy, $selectedFileIds, $selectedLabe
                 fn ($q) => $q->with('labels')
             )
             ->orderBy('id')
-            ->get()->map(function ($oldVideo) use ($newVideoIds) {
+            ->get()
+            ->map(function ($oldVideo) use ($newVideoIds) {
                 $newVideoId = $newVideoIds->shift();
                 $oldVideo->labels->map(function ($oldLabel) use ($newVideoId) {
                     $origin = $oldLabel->getRawOriginal();

diff --git a/app/Jobs/ProcessNewImage.php b/app/Jobs/ProcessNewImage.php
@@ -126,9 +126,7 @@ protected function makeThumbnail(Image $image, $path)
     {
         $prefix = fragment_uuid_path($image->uuid);
         $format = config('thumbnails.format');
-        $buffer = VipsImage::thumbnail($path, $this->width, [
-                'height' => $this->height,
-            ])
+        $buffer = VipsImage::thumbnail($path, $this->width, ['height' => $this->height])
             // Strip EXIF information to not auto rotate thumbnails because
             // the orientation of AUV captured images is not reliable.
             ->writeToBuffer(".{$format}", [
@@ -137,7 +135,7 @@ protected function makeThumbnail(Image $image, $path)
             ]);
 
         Storage::disk(config('thumbnails.storage_disk'))
-                ->put("{$prefix}.{$format}", $buffer);
+            ->put("{$prefix}.{$format}", $buffer);
     }
 
     /**

diff --git a/app/Project.php b/app/Project.php
@@ -328,14 +328,10 @@ public function getThumbnailUrlAttribute()
     public function hasGeoInfo()
     {
         return Cache::remember("project-{$this->id}-has-geo-info", 3600, function () {
-            return Image::whereIn('volume_id', function ($query) {
-                return $query->select('volume_id')
-                    ->from('project_volume')
-                    ->where('project_id', $this->id);
-            })
-            ->whereNotNull('lng')
-            ->whereNotNull('lat')
-            ->exists();
+            return Image::whereIn('volume_id', fn ($q) => $q->select('volume_id')->from('project_volume')->where('project_id', $this->id))
+                ->whereNotNull('lng')
+                ->whereNotNull('lat')
+                ->exists();
         });
     }
 

diff --git a/tests/php/Http/Controllers/Api/ProjectInvitationControllerTest.php b/tests/php/Http/Controllers/Api/ProjectInvitationControllerTest.php
@@ -148,9 +148,10 @@ public function testJoinRedirect()
         $pid = $this->project()->id;
 
         $this->beUser();
-        $this->post("/api/v1/project-invitations/{$id}/join", [
-            'token' => $invitation->uuid,
-        ])
+        $this
+            ->post("/api/v1/project-invitations/{$id}/join", [
+                'token' => $invitation->uuid,
+            ])
             ->assertRedirect("projects/{$pid}");
     }
 

diff --git a/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php b/tests/php/Http/Controllers/Api/ProjectVolumeControllerTest.php
@@ -334,8 +334,8 @@ public function testStoreFilesExistException()
         FileCache::shouldReceive('exists')
             ->andThrow(new Exception('Invalid MIME type.'));
 
-        $response = 
-            $this->postJson("/api/v1/projects/{$id}/volumes", [
+        $response = $this
+            ->postJson("/api/v1/projects/{$id}/volumes", [
                 'name' => 'my volume no. 1',
                 'url' => 'test://images',
                 'media_type' => 'image',

diff --git a/tests/php/Http/Controllers/Api/VolumeControllerTest.php b/tests/php/Http/Controllers/Api/VolumeControllerTest.php
@@ -244,8 +244,8 @@ public function testUpdateRedirect()
 
     public function testCloneVolume()
     {
-        $volume =
-            $this->volume([
+        $volume = $this
+            ->volume([
                 'created_at' => '2022-11-09 14:37:00',
                 'updated_at' => '2022-11-09 14:37:00',
             ])

diff --git a/tests/php/Http/Controllers/Api/VolumeFileControllerTest.php b/tests/php/Http/Controllers/Api/VolumeFileControllerTest.php
@@ -97,7 +97,7 @@ public function testStoreImage()
             ])
             ->assertStatus(422);
 
-        $response = 
+        $response =
             $this->json('POST', "/api/v1/volumes/{$id}/files", [
                 'files' => '1.jpg, 2.jpg',
             ]);
@@ -203,7 +203,7 @@ public function testStoreVideo()
             ])
             ->assertStatus(422);
 
-        $response = 
+        $response =
             $this->json('POST', "/api/v1/volumes/{$id}/files", [
                 'files' => '1.mp4, 2.mp4',
             ]);
@@ -270,8 +270,8 @@ public function testStoreFilesExistException()
         FileCache::shouldReceive('exists')
             ->andThrow(new Exception('Invalid MIME type.'));
 
-        $response =
-            $this->postJson("/api/v1/volumes/{$id}/files", [
+        $response = $this
+            ->postJson("/api/v1/volumes/{$id}/files", [
                 'files' => '1.jpg',
             ])
             ->assertStatus(422);