Merge branch '1.3'

mockery · Feb 24, 2021 · 1dadfa2 · 1dadfa2
2 parents 4198c03 + dd9d724
commit 1dadfa2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,4 +14,4 @@ phpunit.xml
 docs/api
 phpDocumentor.phar*
 .phpunit.result.cache
-.phpdoc
+.phpdoc/
diff --git a/Makefile b/Makefile
@@ -12,8 +12,8 @@ test: deps
 apidocs: docs/api/index.html
 
 phpDocumentor.phar: 
-	wget https://github.com/phpDocumentor/phpDocumentor/releases/download/v3.0.0-rc/phpDocumentor.phar
-	wget https://github.com/phpDocumentor/phpDocumentor/releases/download/v3.0.0-rc/phpDocumentor.phar.asc
+	wget https://github.com/phpDocumentor/phpDocumentor/releases/download/v3.0.0/phpDocumentor.phar
+	wget https://github.com/phpDocumentor/phpDocumentor/releases/download/v3.0.0/phpDocumentor.phar.asc
 
 library_files=$(shell find library -name '*.php')
 docs/api/index.html: vendor/composer/installed.json $(library_files) phpDocumentor.phar

diff --git a/library/Mockery.php b/library/Mockery.php
@@ -214,7 +214,7 @@ public static function close()
      */
     public static function fetchMock($name)
     {
-        return self::$_container->fetchMock($name);
+        return self::getContainer()->fetchMock($name);
     }
 
     /**

diff --git a/library/Mockery/LegacyMockInterface.php b/library/Mockery/LegacyMockInterface.php
@@ -84,7 +84,7 @@ public function makePartial();
 
     /**
      * @param null|string $method
-     * @param null $args
+     * @param null|array|Closure $args
      * @return mixed
      */
     public function shouldHaveReceived($method, $args = null);
@@ -96,7 +96,7 @@ public function shouldHaveBeenCalled();
 
     /**
      * @param null|string $method
-     * @param null $args
+     * @param null|array|Closure $args
      * @return mixed
      */
     public function shouldNotHaveReceived($method, $args = null);