Merge pull request mockery#70 from innsand/master

Fix for \Mockery inclusion with setIncludePath.

README.markdown

@@ -465,12 +465,12 @@ replace the previously defined default. This is useful so you can setup default
 mocks in your unit test setup() and later tweak them in specific tests as
 needed.
 
-    mock()
+    getMock()
 
 Returns the current mock object from an expectation chain. Useful where
 you prefer to keep mock setups as a single statement, e.g.
 
-    $mock = \Mockery::mock('foo')->shouldReceive('foo')->andReturn(1)->mock();
+    $mock = \Mockery::mock('foo')->shouldReceive('foo')->andReturn(1)->getMock();
 
 
 Argument Validation

library/Mockery/Loader.php

@@ -125,7 +125,7 @@ public function unregister()
     public function loadClass($className)
     {
         if ($className === 'Mockery') {
-            require 'Mockery.php';
+            require $this->getFullPath('Mockery.php');
             return;
         }
         if (null === $this->_namespace
@@ -138,7 +138,18 @@ public function loadClass($className)
                 $fileName = str_replace($this->_namespaceSeparator, DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
             }
             $fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . $this->_fileExtension;
-            require ($this->_includePath !== null ? $this->_includePath . DIRECTORY_SEPARATOR : '') . $fileName;
+            require $this->getFullPath($fileName);
         }
     }
+
+	/**
+	 * Returns full path for $fileName if _includePath is set, or leaves as-is for PHP's internal search in 'require'.
+	 *
+	 * @param string $fileName relative to include path.
+	 * @return string
+	 */
+	private function getFullPath($fileName)
+	{
+		return ($this->_includePath !== null ? $this->_includePath . DIRECTORY_SEPARATOR : '') . $fileName;
+	}
 }