Merge pull request #244 from GrahamCampbell/fixes

A Few Fixes
thephpleague · Aug 7, 2014 · 9e630a4 · 9e630a4
2 parents 66af62a + 8311fc5
commit 9e630a4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+/.idea
 /vendor
 composer.lock
 phpunit.xml
diff --git a/src/Generators/Base.php b/src/Generators/Base.php
@@ -73,7 +73,7 @@ public function __construct($kind, $object = null, $faker = null)
      * @param object|null           $object The model instance.
      * @param \Faker\Generator|null $faker  The faker instance.
      *
-     * @return \League\FactoryMuffin\Generator
+     * @return \League\FactoryMuffin\Generators\Base
      */
     public static function detect($kind, $object = null, $faker = null)
     {

diff --git a/src/Generators/Call.php b/src/Generators/Call.php
@@ -52,6 +52,8 @@ public function generate()
      * @param string $method
      * @param array  $args
      *
+     * @throws \League\FactoryMuffin\Exceptions\MethodNotFoundException
+     *
      * @return mixed
      */
     private function execute($method, $args)

diff --git a/src/Generators/Factory.php b/src/Generators/Factory.php
@@ -51,7 +51,7 @@ public function generate()
      *
      * @param object $object The model instance.
      *
-     * @return int
+     * @return int|null
      */
     private function getId($object)
     {