Fixing bindingKey for HasOne and adding test for it

src/ORM/Association.php

@@ -781,20 +781,20 @@ abstract class Association
         $tAlias = $this->target()->alias();
         $sAlias = $this->source()->alias();
         $foreignKey = (array)$options['foreignKey'];
-        $primaryKey = (array)$this->_sourceTable->primaryKey();
+        $bindingKey = (array)$this->bindingKey();
 
-        if (count($foreignKey) !== count($primaryKey)) {
+        if (count($foreignKey) !== count($bindingKey)) {
             $msg = 'Cannot match provided foreignKey for "%s", got "(%s)" but expected foreign key for "(%s)"';
             throw new RuntimeException(sprintf(
                 $msg,
                 $this->_name,
                 implode(', ', $foreignKey),
-                implode(', ', $primaryKey)
+                implode(', ', $bindingKey)
             ));
         }
 
         foreach ($foreignKey as $k => $f) {
-            $field = sprintf('%s.%s', $sAlias, $primaryKey[$k]);
+            $field = sprintf('%s.%s', $sAlias, $bindingKey[$k]);
             $value = new IdentifierExpression(sprintf('%s.%s', $tAlias, $f));
             $conditions[$field] = $value;
         }

tests/TestCase/ORM/BindingKeyTest.php

@@ -30,20 +30,33 @@ class BindingKeyTest extends TestCase
      */
     public $fixtures = [
         'core.users',
-        'core.auth_users'
+        'core.auth_users',
+        'core.site_authors'
     ];
 
     /**
+     * Data provider for the two types of strategies BelongsTo and HasOne implements
+     *
+     * @return void
+     */
+    public function strategiesProviderJoinable()
+    {
+        return [['join'], ['select']];
+    }
+
+    /**
      * Tests that bindingKey can be used in belongsTo associations
      *
+     * @dataProvider strategiesProviderJoinable
      * @return void
      */
-    public function testBelongsto()
+    public function testBelongsto($strategy)
     {
         $users = TableRegistry::get('Users');
         $users->belongsTo('AuthUsers', [
             'bindingKey' => 'username',
-            'foreignKey' => 'username'
+            'foreignKey' => 'username',
+            'strategy' => $strategy
         ]);
 
         $result = $users->find()
@@ -62,4 +75,27 @@ class BindingKeyTest extends TestCase
             $result->combine('id', 'auth_user.id')->toArray()
         );
     }
+
+    /**
+     * Tests that bindingKey can be used in hasOne associations
+     *
+     * @dataProvider strategiesProviderJoinable
+     * @return void
+     */
+    public function testHasOne($strategy) {
+        $users = TableRegistry::get('Users');
+        $users->hasOne('SiteAuthors', [
+            'bindingKey' => 'username',
+            'foreignKey' => 'name',
+            'strategy' => $strategy
+        ]);
+
+        $users->updateAll(['username' => 'jose'], ['username' => 'garrett']);
+        $result = $users->find()
+            ->contain(['SiteAuthors'])
+            ->where(['username' => 'jose'])
+            ->first();
+
+        $this->assertEquals(3, $result->site_author->id);
+    }
 }