Merge branch '7.0.2-erasys' into upgradeToPhp82

composer.json

@@ -32,6 +32,16 @@
             "role": "Developer"
         }
     ],
+    "repositories": [
+      {
+        "type": "vcs",
+        "url": "https://github.com/erasys/eloquence-base"
+      },
+      {
+        "type": "vcs",
+        "url": "https://github.com/erasys/hookable"
+      }
+    ],
     "require": {
         "php": ">=8.2",
         "sofa/eloquence-base": "8.0.0"
@@ -52,7 +62,8 @@
             "Sofa\\Eloquence\\Tests\\": "tests"
         }
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
+    "prefer_stable": true,
     "scripts": {
         "test": "./vendor/bin/phpunit && ./vendor/bin/phpcs src --standard=psr2 --report=diff --colors",
         "phpcs": "./vendor/bin/phpcs src --standard=psr2 --report=diff --colors"

src/Mappable.php

@@ -77,6 +77,29 @@ protected function mappedQuery(Builder $query, $method, ArgumentBag $args) : mix
         return $query->callParent($method, $args->all());
     }
 
+    /**
+     * Custom group by to group by mapped attributes
+     *
+     * @param \Sofa\Eloquence\Builder $query
+     * @param \Sofa\Hookable\Contracts\ArgumentBag $args
+     * @return void
+     */
+    protected function mappedGroupBy(Builder $query, ArgumentBag $args)
+    {
+        $groupArgs = $args->get('groups');
+        $groups = \is_array($groupArgs[0]) ? $groupArgs[0] : $groupArgs;
+
+        foreach ($groups as $key => $group) {
+            if ($this->hasMapping($group)) {
+                $mapping = $this->getMappingForAttribute($group);
+
+                $groups[$key] = $mapping;
+            }
+        }
+
+        $args->set('groups', $groups);
+    }
+
     /**
      * Adjust mapped columns for select statement.
      *

src/Mappable/Hooks.php

@@ -32,6 +32,10 @@ public function queryHook()
                 call_user_func_array([$this, 'mappedSelect'], [$query, $args]);
             }
 
+            if ($method === 'groupBy') {
+              call_user_func_array([$this, 'mappedGroupBy'], [$query, $args]);
+            }
+
             return $next($query, $bag);
         };
     }