Merge pull request #978 from dash8x/patch-1

freekmurze · web-flow · commit b25d0218c2ce · 2024-12-11T10:53:49.000+01:00
Fixed IncludedCount.php
diff --git a/src/Includes/IncludedCount.php b/src/Includes/IncludedCount.php
@@ -9,6 +9,9 @@ class IncludedCount implements IncludeInterface
 {
     public function __invoke(Builder $query, string $count)
     {
-        $query->withCount(Str::before($count, config('query-builder.count_suffix', 'Count')));
+        $suffix = config('query-builder.count_suffix', 'Count');
+        $relation = Str::endsWith($count, $suffix) ? Str::beforeLast($count, $suffix) : $count;
+
+        $query->withCount($relation);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,9 @@ class IncludedCount implements IncludeInterface`
`9`	`9`	`{`
`10`	`10`	`public function __invoke(Builder $query, string $count)`
`11`	`11`	`{`
`12`		`- $query->withCount(Str::before($count, config('query-builder.count_suffix', 'Count')));`
	`12`	`+ $suffix = config('query-builder.count_suffix', 'Count');`
	`13`	`+ $relation = Str::endsWith($count, $suffix) ? Str::beforeLast($count, $suffix) : $count;`
	`14`	`+`
	`15`	`+ $query->withCount($relation);`
`13`	`16`	`}`
`14`	`17`	`}`