belongsTo $foreignClass shouldn't be optional

maghead · Jun 15, 2016 · b5c9f80 · b5c9f80
1 parent 4f9c3df
commit b5c9f80
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/Schema/DeclareSchema.php b/src/Schema/DeclareSchema.php
@@ -693,7 +693,7 @@ protected function getCurrentSchemaClass()
      * @param string $foreignColumn foreign reference schema column.
      * @param string $selfColumn self column name
      */
-    public function belongsTo($accessor, $foreignClass = NULL, $foreignColumn = NULL,  $selfColumn = 'id')
+    public function belongsTo($accessor, $foreignClass, $foreignColumn = 'id', $selfColumn = null)
     {
         if ($foreignClass && NULL === $foreignColumn) {
             $s = new $foreignClass;

diff --git a/src/Schema/Relationship.php b/src/Schema/Relationship.php
@@ -45,6 +45,15 @@ public function __construct($accessor, array $data = array())
         $this->data = $data;
     }
 
+
+    public function by($column)
+    {
+        $this->data['self_column'] = $column;
+        return $this;
+    }
+
+
+
     public function newForeignSchema()
     {
         $class = $this->data['foreign_schema'];

diff --git a/tests/AuthorBooks/Model/AddressSchema.php b/tests/AuthorBooks/Model/AddressSchema.php
@@ -17,10 +17,9 @@ public function schema()
             ->boolean()
             ->defaultValue(false)
             ;
-        /**
-         * $address->author 
-         */
-        $this->belongsTo('author', '\\AuthorBooks\Model\\AuthorSchema', 'id' , 'author_id')
+
+        $this->belongsTo('author', '\\AuthorBooks\Model\\AuthorSchema')
+            ->by('author_id')
             ->onDelete('CASCADE');
     }
 }