Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/Database/SelectQuery.php

Author: Daniel Opitz

docs/readme.md

@@ -242,13 +242,13 @@ Please use the [join](#inner-join-clause) method.
 #### Advanced Join Clauses
 
 You may also specify more advanced join clauses. 
-To get started, pass a RawExp as the second argument into 
+To get started, pass a (raw) string as the second argument into 
 the `joinRaw` and `leftJoinRaw` method.
 
 ```php
 $users = $this->select()
     ->from('users AS u')
-    ->joinRaw('posts AS p', new RawExp('p.user_id=u.id AND u.enabled=1 OR p.published IS NULL'))
+    ->joinRaw('posts AS p', 'p.user_id=u.id AND u.enabled=1 OR p.published IS NULL')
     ->execute()
     ->fetchAll();
 ```

src/Database/SelectQuery.php

@@ -230,13 +230,12 @@ public function leftJoin(string $table, string $leftField, string $comparison, $
      * Join with complex conditions.
      *
      * @param string $table Table name
-     * @param RawExp $raw
-     *
+     * @param string $conditions The ON conditions e.g. 'user.id = article.user_id'
      * @return self
      */
-    public function joinRaw(string $table, RawExp $raw): self
+    public function joinRaw(string $table, string $conditions): self
     {
-        $this->join[] = ['inner', $table, $raw, null, null, null];
+        $this->join[] = ['inner', $table, new RawExp($conditions), null, null, null];
 
         return $this;
     }
@@ -245,13 +244,12 @@ public function joinRaw(string $table, RawExp $raw): self
      * Left join with complex conditions.
      *
      * @param string $table Table name
-     * @param RawExp $raw
-     *
+     * @param string $conditions The ON conditions e.g. 'user.id = article.user_id'
      * @return self
      */
-    public function leftJoinRaw(string $table, RawExp $raw): self
+    public function leftJoinRaw(string $table, string $conditions): self
     {
-        $this->join[] = ['left', $table, $raw, null, null, null];
+        $this->join[] = ['left', $table, new RawExp($conditions), null, null, null];
 
         return $this;
     }

tests/SelectQueryTest.php

@@ -592,7 +592,7 @@ public function testJoinRaw()
         $select = $this->select()
             ->columns('id')
             ->from('test')
-            ->joinRaw('users u', new RawExp('t2.a=t1.a AND t3.b=t1.b AND t4.c=t1.c OR t2.b IS NULL'));
+            ->joinRaw('users u', 't2.a=t1.a AND t3.b=t1.b AND t4.c=t1.c OR t2.b IS NULL');
         $this->assertInstanceOf(PDOStatement::class, $select->prepare());
         $this->assertSame("SELECT `id` FROM `test` INNER JOIN `users` `u` ON (t2.a=t1.a AND t3.b=t1.b AND t4.c=t1.c OR t2.b IS NULL);", $select->build());
     }
@@ -611,7 +611,7 @@ public function testLeftJoinRaw()
         $select = $this->select()
             ->columns('id')
             ->from('test')
-            ->leftJoinRaw('users u', new RawExp('t2.a=t1.a AND t3.b=t1.b AND t4.c=t1.c OR t2.b IS NULL'));
+            ->leftJoinRaw('users u', 't2.a=t1.a AND t3.b=t1.b AND t4.c=t1.c OR t2.b IS NULL');
         $this->assertInstanceOf(PDOStatement::class, $select->prepare());
         $this->assertSame("SELECT `id` FROM `test` LEFT JOIN `users` `u` ON (t2.a=t1.a AND t3.b=t1.b AND t4.c=t1.c OR t2.b IS NULL);", $select->build());
     }