fixed query builder join

Author: Simon Karlen

src/ActiveRecord.php

@@ -55,7 +55,7 @@ public function attributes(): array
      * {@inheritdoc}
      * @throws InvalidConfigException
      */
-    public static function primaryKey()
+    public static function primaryKey(): array
     {
         throw new InvalidConfigException('The primaryKey() method of RestClient ActiveRecord has to be implemented by child classes.');
     }

src/QueryBuilder.php

@@ -128,10 +128,14 @@ public function buildJoin($joins, &$params): string
         }
 
         $expand = [];
-        foreach ($joins as $join) {
+        foreach ($joins as $i => $join) {
             if (empty($join)) {
                 continue;
             }
+            if (is_array($join)) {
+                $expand[] = $join[1];
+                continue;
+            }
             $expand[] = $join;
         }
 

tests/RelationTest.php

@@ -7,7 +7,6 @@
 
 namespace yiiunit\extensions\rest;
 
-
 use Yii;
 use yiiunit\extensions\rest\fixtures\RestModelFixture;
 use yiiunit\extensions\rest\models\RestModel;

tests/models/.gitignore

@@ -0,0 +1,4 @@
+ReservationEvent.php
+ReservationObject.php
+ReservationProperty.php
+ReservationShow.php

tests/models/RestModel.php

@@ -7,7 +7,6 @@
 
 namespace yiiunit\extensions\rest\models;
 
-
 use simialbi\yii2\rest\ActiveRecord;
 
 /**