[8.x] bind mock instances as singletons so they are not overwritten

laravel · Jun 19, 2021 · 8debb3b · 8debb3b
1 parent 952f84a
commit 8debb3b
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/src/Illuminate/Foundation/Testing/Concerns/InteractsWithContainer.php b/src/Illuminate/Foundation/Testing/Concerns/InteractsWithContainer.php
@@ -41,6 +41,22 @@ protected function instance($abstract, $instance)
         return $instance;
     }
 
+    /**
+     * Register an instance of an object as a singleton in the container.
+     *
+     * @param $abstract
+     * @param $instance
+     * @return \Mockery\MockInterface
+     */
+    protected function singletonInstance($abstract, $instance)
+    {
+        $this->app->singleton($abstract, function () use ($instance) {
+            return $instance;
+        });
+
+        return $instance;
+    }
+
     /**
      * Mock an instance of an object in the container.
      *
@@ -50,7 +66,7 @@ protected function instance($abstract, $instance)
      */
     protected function mock($abstract, Closure $mock = null)
     {
-        return $this->instance($abstract, Mockery::mock(...array_filter(func_get_args())));
+        return $this->singletonInstance($abstract, Mockery::mock(...array_filter(func_get_args())));
     }
 
     /**
@@ -62,7 +78,7 @@ protected function mock($abstract, Closure $mock = null)
      */
     protected function partialMock($abstract, Closure $mock = null)
     {
-        return $this->instance($abstract, Mockery::mock(...array_filter(func_get_args()))->makePartial());
+        return $this->singletonInstance($abstract, Mockery::mock(...array_filter(func_get_args()))->makePartial());
     }
 
     /**
@@ -74,7 +90,7 @@ protected function partialMock($abstract, Closure $mock = null)
      */
     protected function spy($abstract, Closure $mock = null)
     {
-        return $this->instance($abstract, Mockery::spy(...array_filter(func_get_args())));
+        return $this->singletonInstance($abstract, Mockery::spy(...array_filter(func_get_args())));
     }
 
     /**