Update composer, update travis.yml, simplify queryJoinBuilder()

.travis.yml

@@ -36,4 +36,4 @@ script: vendor/bin/phpunit
 
 branches:
   only:
-    - master
+    - L5.4

composer.json

@@ -25,7 +25,7 @@
   },
   "require-dev": {
     "phpunit/phpunit": "~5.0",
-    "orchestra/testbench": "3.3.*"
+    "orchestra/testbench": "3.4.*"
   },
   "autoload": {
     "psr-4": {

src/ColumnSortable/Sortable.php

@@ -27,7 +27,7 @@ public function scopeSortable($query, $defaultSortParameters = null)
             return $this->queryOrderBuilder($query, Request::only(['sort', 'order']));
         } elseif (!is_null($defaultSortParameters)) {
             $defaultSortArray = $this->formatToSortParameters($defaultSortParameters);
-            
+
             if (Config::get('columnsortable.allow_request_modification', true) && !empty($defaultSortArray)) {
                 Request::merge($defaultSortArray);
             }
@@ -117,20 +117,16 @@ private function parseSortParameters(array $sortParameters)
      */
     private function queryJoinBuilder($query, $relation)
     {
-        $relatedModel = $relation->getRelated();
-        $relatedTable = $relatedModel->getTable();
-
-        $parentModel = $relation->getParent();
-        $parentTable = $parentModel->getTable();
-
+        $relatedTable = $relation->getRelated()->getTable();
+        $parentTable = $relation->getParent()->getTable();
 
         if ($relation instanceof HasOne) {
             $relatedPrimaryKey = $relation->getQualifiedForeignKeyName();
-            $parentPrimaryKey = $parentTable . '.' . $parentModel->primaryKey;
+            $parentPrimaryKey = $relation->getQualifiedParentKeyName();
             return $query->select($parentTable . '.*')->join($relatedTable, $parentPrimaryKey, '=', $relatedPrimaryKey);
         } elseif ($relation instanceof BelongsTo) {
-            $relatedPrimaryKey = $relatedTable . '.' . $relatedModel->primaryKey;
-            $parentPrimaryKey = $parentTable . '.' . $relation->getForeignKey();
+            $relatedPrimaryKey = $relation->getQualifiedOwnerKeyName();
+            $parentPrimaryKey = $relation->getQualifiedForeignKey();
             return $query->select($parentTable . '.*')->join($relatedTable, $parentPrimaryKey, '=', $relatedPrimaryKey);
         } else {
             throw new \Exception();
@@ -168,7 +164,7 @@ private function formatToSortParameters($sort)
 
         reset($sort);
         $each = each($sort);
-        
+
         return ($each[0] === 0) ? ['sort' => $each[1], 'order' => $configDefaultOrder] :
                                   ['sort' => $each[0], 'order' => $each[1]];
     }