Ensure relations are properly snaked (#43322)

laravel · Jul 20, 2022 · c8d3851 · c8d3851
1 parent d2caa9b
commit c8d3851
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/Illuminate/Http/Resources/ConditionallyLoadsAttributes.php b/src/Illuminate/Http/Resources/ConditionallyLoadsAttributes.php
@@ -219,7 +219,7 @@ public function whenCounted($relationship, $value = null, $default = null)
             $default = new MissingValue();
         }
 
-        $attribute = Str::finish($relationship, '_count');
+        $attribute = (string) Str::of($relationship)->snake()->finish('_count');
 
         if (! isset($this->resource->getAttributes()[$attribute])) {
             return value($default);

diff --git a/tests/Integration/Http/Fixtures/PostResourceWithOptionalRelationshipCounts.php b/tests/Integration/Http/Fixtures/PostResourceWithOptionalRelationshipCounts.php
@@ -9,6 +9,7 @@ public function toArray($request)
         return [
             'id' => $this->id,
             'authors' => $this->whenCounted('authors_count'),
+            'favourite_posts' => $this->whenCounted('favouritedPosts'),
             'comments' => $this->whenCounted('comments', function ($count) {
                 return "$count comments";
             }, 'None'),

diff --git a/tests/Integration/Http/ResourceTest.php b/tests/Integration/Http/ResourceTest.php
@@ -317,6 +317,7 @@ public function testResourcesMayLoadOptionalRelationshipCounts()
                 'title' => 'Test Title',
                 'authors_count' => 2,
                 'comments_count' => 5,
+                'favourited_posts_count' => 1,
             ]);
 
             return new PostResourceWithOptionalRelationshipCounts($post);
@@ -332,6 +333,7 @@ public function testResourcesMayLoadOptionalRelationshipCounts()
             'data' => [
                 'id' => 5,
                 'authors' => 2,
+                'favourite_posts' => 1,
                 'comments' => '5 comments',
             ],
         ]);