Merge branch 'feature/has-scope' of https://github.com/alexbowers/fra…

…mework into alexbowers-feature/has-scope

src/Illuminate/Database/Eloquent/Builder.php

@@ -1327,6 +1327,17 @@ public static function hasGlobalMacro($name)
         return isset(static::$macros[$name]);
     }
 
+    /**
+     * Determine if the given model has a scope.
+     *
+     * @param  string  $name
+     * @return bool
+     */
+    public function hasScope($name)
+    {
+        return $this->model && $this->model->hasScope($name);
+    }
+
     /**
      * Dynamically access builder proxies.
      *
@@ -1373,8 +1384,8 @@ public function __call($method, $parameters)
             return call_user_func_array(static::$macros[$method], $parameters);
         }
 
-        if (method_exists($this->model, $scope = 'scope'.ucfirst($method))) {
-            return $this->callScope([$this->model, $scope], $parameters);
+        if ($this->hasScope($method)) {
+            return $this->callScope([$this->model, 'scope'.ucfirst($method)], $parameters);
         }
 
         if (in_array($method, $this->passthru)) {

src/Illuminate/Database/Eloquent/Model.php

@@ -331,6 +331,17 @@ public static function isIgnoringTouch($class = null)
         return false;
     }
 
+    /**
+     * Determine if the given model has a scope.
+     *
+     * @param  string  $method
+     * @return bool
+     */
+    public function hasScope($method)
+    {
+        return method_exists($this, 'scope'.ucfirst($method));
+    }
+
     /**
      * Fill the model with an array of attributes.
      *

tests/Integration/Database/EloquentModelScopeTest.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Illuminate\Tests\Integration\Database;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * @group integration
+ */
+class EloquentModelScopeTest extends DatabaseTestCase
+{
+    public function testModelHasScope()
+    {
+        $model = new TestScopeModel1;
+
+        $this->assertTrue($model->hasScope('exists'));
+    }
+
+    public function testModelDoesNotHaveScope()
+    {
+        $model = new TestScopeModel1;
+
+        $this->assertFalse($model->hasScope('doesNotExist'));
+    }
+}
+
+class TestScopeModel1 extends Model
+{
+    public function scopeExists()
+    {
+        return true;
+    }
+}