Move Arguments reset to right place

diff --git a/tests/FixtureTest.php b/tests/FixtureTest.php
index bbf8cfd53994113362c0109b8a086a0ddf243964..4b7deb0223a1504ba6acc38bfbd7404bb2efcf08 100644 (file)
--- a/tests/FixtureTest.php
+++ b/tests/FixtureTest.php
@@ -32,10 +32,19 @@ abstract class FixtureTest extends DatabaseTest
        {
                parent::setUp();
 
+               $server                   = $_SERVER;
+               $server['REQUEST_METHOD'] = Router::GET;
+
                $this->dice = (new Dice())
                        ->addRules(include __DIR__ . '/../static/dependencies.config.php')
                        ->addRule(Database::class, ['instanceOf' => StaticDatabase::class, 'shared' => true])
-                       ->addRule(IHandleSessions::class, ['instanceOf' => Session\Type\Memory::class, 'shared' => true, 'call' => null]);
+                       ->addRule(IHandleSessions::class, ['instanceOf' => Session\Type\Memory::class, 'shared' => true, 'call' => null])
+                       ->addRule(Arguments::class, [
+                               'instanceOf' => Arguments::class,
+                               'call'       => [
+                                       ['determine', [$server, $_GET], Dice::CHAIN_CALL],
+                               ],
+                       ]);
                DI::init($this->dice);
 
                /** @var IManageConfigValues $config */

diff --git a/tests/src/Module/Api/ApiTest.php b/tests/src/Module/Api/ApiTest.php
index 6bddf35f35a6a39d7a46dc0342ba3c45fe34d596..890bba19b65e367657dc0e05577282556b5eb75d 100644 (file)
--- a/tests/src/Module/Api/ApiTest.php
+++ b/tests/src/Module/Api/ApiTest.php
@@ -21,9 +21,7 @@
 
 namespace Friendica\Test\src\Module\Api;
 
-use Dice\Dice;
 use Friendica\App;
-use Friendica\App\Arguments;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\Core\Addon;
 use Friendica\Core\Hook;
@@ -169,18 +167,9 @@ abstract class ApiTest extends FixtureTest
        {
                parent::setUp(); // TODO: Change the autogenerated stub
 
-               $server                   = $_SERVER;
-               $server['REQUEST_METHOD'] = App\Router::GET;
-
                $this->dice = $this->dice
                        ->addRule(Authentication::class, ['instanceOf' => AuthenticationDouble::class, 'shared' => true])
-                       ->addRule(App::class, ['instanceOf' => AppDouble::class, 'shared' => true])
-                       ->addRule(Arguments::class, [
-                               'instanceOf' => App\Arguments::class,
-                               'call'       => [
-                                       ['determine', [$server, $_GET], Dice::CHAIN_CALL],
-                               ],
-                       ]);
+                       ->addRule(App::class, ['instanceOf' => AppDouble::class, 'shared' => true]);
                DI::init($this->dice);
 
                // Manual override to bypass API authentication