Fix Sortable trait & test

Credit to @inxilpro, see laravel/framework#37956 (comment)

Author: LukeTowers

src/Database/SortableScope.php

@@ -6,8 +6,6 @@
 
 class SortableScope implements ScopeInterface
 {
-    protected $scopeApplied;
-
     /**
      * Apply the scope to a given Eloquent query builder.
      *
@@ -17,27 +15,9 @@ class SortableScope implements ScopeInterface
      */
     public function apply(BuilderBase $builder, ModelBase $model)
     {
-        $this->scopeApplied = true;
-
-        $builder->getQuery()->orderBy($model->getSortOrderColumn());
-    }
-
-    /**
-     * Extend the Eloquent query builder.
-     *
-     * @param  \Illuminate\Database\Eloquent\Builder  $builder
-     * @return void
-     */
-    public function extend(BuilderBase $builder)
-    {
-        $builder->macro('orderBy', function ($builder, $column, $direction = 'asc') {
-            $builder
-                ->withoutGlobalScope($this)
-                ->getQuery()
-                ->orderBy($column, $direction)
-            ;
-
-            return $builder;
-        });
+        // Only apply the scope when no other explicit orders have been set
+        if (empty($builder->getQuery()->orders) && empty($builder->getQuery()->unionOrders)) {
+            $builder->orderBy($model->getSortOrderColumn());
+        }
     }
 }

tests/Database/SortableTest.php

@@ -12,11 +12,6 @@ public function testOrderByIsAutomaticallyAdded()
 
     public function testOrderByCanBeOverridden()
     {
-        // @TODO: Fix, see https://github.com/laravel/framework/pull/37956#issuecomment-993822397
-        // May have to override orderBy explicitly in the Winter Builder and then check for defined
-        // macros there before passing to parent to handle
-        $this->markTestSkipped('@TODO: Failing');
-
         $model = new TestSortableModel();
         $query1 = $model->newQuery()->orderBy('name')->orderBy('email', 'desc')->toSql();
         $query2 = $model->newQuery()->orderBy('sort_order')->orderBy('name')->toSql();