Merge pull request #12820 from MrPetovan/bug/fatal-errors

[friendica.git] / tests / DiceHttpMockHandlerTrait.php

diff --git a/tests/DiceHttpMockHandlerTrait.php b/tests/DiceHttpMockHandlerTrait.php
index 3381a3219f8a5520cce55a30f548a7cc381436f1..56250817d64a5bf6d64facfee277c6b0014d6f9a 100644 (file)
--- a/tests/DiceHttpMockHandlerTrait.php
+++ b/tests/DiceHttpMockHandlerTrait.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -32,6 +32,8 @@ use GuzzleHttp\HandlerStack;
  */
 trait DiceHttpMockHandlerTrait
 {
+       use FixtureTestTrait;
+
        /**
         * Handler for mocking requests anywhere for testing purpose
         *
@@ -41,9 +43,7 @@ trait DiceHttpMockHandlerTrait
 
        protected function setupHttpMockHandler(): void
        {
-               if (!empty($this->httpRequestHandler) && $this->httpRequestHandler instanceof HandlerStack) {
-                       return;
-               }
+               $this->setUpFixtures();
 
                $this->httpRequestHandler = HandlerStack::create();
 
@@ -59,10 +59,8 @@ trait DiceHttpMockHandlerTrait
                DI::init($newDice);
        }
 
-       protected function tearDown(): void
+       protected function tearDownHandler(): void
        {
-               \Mockery::close();
-
-               parent::tearDown();
+               $this->tearDownFixtures();
        }
 }