From 65de6cdd55436bc561f70fb3e0e9df6a541d04ae Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Fri, 8 Dec 2017 20:38:46 +0700
Subject: [PATCH 1/2] Parameter $on at Select::join() allow
 Zend\Db\Sql\Predicate\Expression

added `Predicate\Expression` to its `@params`
---
 src/Sql/Select.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sql/Select.php b/src/Sql/Select.php
index dbf79779e3..b09f3b9485 100644
--- a/src/Sql/Select.php
+++ b/src/Sql/Select.php
@@ -263,7 +263,7 @@ public function columns(array $columns, $prefixColumnsWithTable = true)
      * Create join clause
      *
      * @param  string|array|TableIdentifier $name
-     * @param  string $on
+     * @param  string|Predicate\Expression $on
      * @param  string|array $columns
      * @param  string $type one of the JOIN_* constants
      * @return self Provides a fluent interface

From 98f49ac3605c1ab48039ca8e64cd80bad7631a88 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Fri, 8 Dec 2017 20:45:57 +0700
Subject: [PATCH 2/2] add |Predicate\Expression param to Join:join() as well
 for $on

---
 src/Sql/Join.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sql/Join.php b/src/Sql/Join.php
index 20a4900b00..12e8599663 100644
--- a/src/Sql/Join.php
+++ b/src/Sql/Join.php
@@ -110,7 +110,7 @@ public function getJoins()
     /**
      * @param string|array|TableIdentifier $name A table name on which to join, or a single
      *     element associative array, of the form alias => table, or TableIdentifier instance
-     * @param string $on A string specification describing the fields to join on.
+     * @param string|Predicate\Expression $on A specification describing the fields to join on.
      * @param string|string[]|int|int[] $columns A single column name, an array
      *     of column names, or (a) specification(s) such as SQL_STAR representing
      *     the columns to join.