- Fixed conflicts

src/Ulmus.php

@@ -107,14 +107,18 @@ abstract class Ulmus
         return static::$resolved[$entityClass] ?? static::$resolved[$entityClass] = new Common\EntityResolver($entityClass);
     }
 
-    public static function repository(...$arguments) : Repository
+    public static function repository(string $entityClass, ...$arguments) : Repository
     {
-        return new static::$repositoryClass(...$arguments);
+        $cls = $entityClass::resolveEntity()->sqlAdapter()->adapter()->repositoryClass();
+
+        return new $cls($entityClass, ...$arguments);
     }
 
-    public static function queryBuilder(...$arguments) : Query\QueryBuilderInterface
+    public static function queryBuilder($entityClass, ...$arguments) : Query\QueryBuilderInterface
     {
-        return new static::$queryBuilderClass(...$arguments);
+        $cls = $entityClass::resolveEntity()->sqlAdapter()->adapter()->queryBuilderClass();
+
+        return new $cls(...$arguments);
     }
     
     public static function instanciateObject(string $type, array $arguments) : object