X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2Fsrc%2FApp%2FModeTest.php;h=8955a50e7c4dd2d622080f2ed6a94c9590c1cf45;hb=273f4c352e9c521444cda44cf95b10b72cabab11;hp=0a374fd63e61b8be624acd874a7381128e80444c;hpb=122ad0af14f046c2462a03fe33967dc41abfc8b5;p=friendica.git

diff --git a/tests/src/App/ModeTest.php b/tests/src/App/ModeTest.php
index 0a374fd63e..8955a50e7c 100644
--- a/tests/src/App/ModeTest.php
+++ b/tests/src/App/ModeTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,12 +22,11 @@
 namespace Friendica\Test\src\App;
 
 use Detection\MobileDetect;
+use Friendica\App\Arguments;
 use Friendica\App\Mode;
-use Friendica\App\Module;
-use Friendica\Core\Config\Cache;
+use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Database\Database;
 use Friendica\Test\MockedTest;
-use Friendica\Test\Util\DBAMockTrait;
 use Friendica\Test\Util\VFSTrait;
 use Friendica\Util\BasePath;
 use Mockery;
@@ -36,7 +35,6 @@ use Mockery\MockInterface;
 class ModeTest extends MockedTest
 {
 	use VFSTrait;
-	use DBAMockTrait;
 
 	/**
 	 * @var BasePath|MockInterface
@@ -53,14 +51,14 @@ class ModeTest extends MockedTest
 	 */
 	private $configCacheMock;
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
 		$this->setUpVfsDir();
 
-		$this->basePathMock = Mockery::mock(BasePath::class);
-		$this->databaseMock = Mockery::mock(Database::class);
+		$this->basePathMock    = Mockery::mock(BasePath::class);
+		$this->databaseMock    = Mockery::mock(Database::class);
 		$this->configCacheMock = Mockery::mock(Cache::class);
 	}
 
@@ -110,7 +108,7 @@ class ModeTest extends MockedTest
 
 		$this->databaseMock->shouldReceive('connected')->andReturn(true)->once();
 		$this->databaseMock->shouldReceive('fetchFirst')
-		                   ->with('SHOW TABLES LIKE \'config\'')->andReturn(false)->once();
+						   ->with('SHOW TABLES LIKE \'config\'')->andReturn(false)->once();
 
 		$mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock);
 
@@ -126,9 +124,9 @@ class ModeTest extends MockedTest
 
 		$this->databaseMock->shouldReceive('connected')->andReturn(true)->once();
 		$this->databaseMock->shouldReceive('fetchFirst')
-		                   ->with('SHOW TABLES LIKE \'config\'')->andReturn(true)->once();
+						   ->with('SHOW TABLES LIKE \'config\'')->andReturn(true)->once();
 		$this->configCacheMock->shouldReceive('get')->with('system', 'maintenance')
-		                      ->andReturn(true)->once();
+							  ->andReturn(true)->once();
 
 		$mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock);
 
@@ -145,12 +143,12 @@ class ModeTest extends MockedTest
 
 		$this->databaseMock->shouldReceive('connected')->andReturn(true)->once();
 		$this->databaseMock->shouldReceive('fetchFirst')
-		                   ->with('SHOW TABLES LIKE \'config\'')->andReturn(true)->once();
+						   ->with('SHOW TABLES LIKE \'config\'')->andReturn(true)->once();
 		$this->configCacheMock->shouldReceive('get')->with('system', 'maintenance')
-		                      ->andReturn(false)->once();
+							  ->andReturn(false)->once();
 		$this->databaseMock->shouldReceive('selectFirst')
-		                   ->with('config', ['v'], ['cat' => 'system', 'k' => 'maintenance'])
-		                   ->andReturn(['v' => null])->once();
+						   ->with('config', ['v'], ['cat' => 'system', 'k' => 'maintenance'])
+						   ->andReturn(['v' => null])->once();
 
 		$mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock);
 
@@ -170,12 +168,12 @@ class ModeTest extends MockedTest
 
 		$this->databaseMock->shouldReceive('connected')->andReturn(true)->once();
 		$this->databaseMock->shouldReceive('fetchFirst')
-		                   ->with('SHOW TABLES LIKE \'config\'')->andReturn(true)->once();
+						   ->with('SHOW TABLES LIKE \'config\'')->andReturn(true)->once();
 		$this->configCacheMock->shouldReceive('get')->with('system', 'maintenance')
-		                      ->andReturn(false)->once();
+							  ->andReturn(false)->once();
 		$this->databaseMock->shouldReceive('selectFirst')
-		                   ->with('config', ['v'], ['cat' => 'system', 'k' => 'maintenance'])
-		                   ->andReturn(['v' => '0'])->once();
+						   ->with('config', ['v'], ['cat' => 'system', 'k' => 'maintenance'])
+						   ->andReturn(['v' => '0'])->once();
 
 		$mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock);
 
@@ -205,11 +203,11 @@ class ModeTest extends MockedTest
 	 */
 	public function testIsBackendNotIsBackend()
 	{
-		$server = [];
-		$module = new Module();
+		$server       = [];
+		$args         = new Arguments();
 		$mobileDetect = new MobileDetect();
 
-		$mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect);
+		$mode = (new Mode())->determineRunMode(true, $server, $args, $mobileDetect);
 
 		self::assertTrue($mode->isBackend());
 	}
@@ -219,11 +217,11 @@ class ModeTest extends MockedTest
 	 */
 	public function testIsBackendButIndex()
 	{
-		$server = [];
-		$module = new Module(Module::DEFAULT, Module::DEFAULT_CLASS, [], true);
+		$server       = [];
+		$args         = new Arguments('', '', Mode::BACKEND_MODULES[0]);
 		$mobileDetect = new MobileDetect();
 
-		$mode = (new Mode())->determineRunMode(false, $module, $server, $mobileDetect);
+		$mode = (new Mode())->determineRunMode(false, $server, $args, $mobileDetect);
 
 		self::assertTrue($mode->isBackend());
 	}
@@ -233,11 +231,11 @@ class ModeTest extends MockedTest
 	 */
 	public function testIsNotBackend()
 	{
-		$server = [];
-		$module = new Module(Module::DEFAULT, Module::DEFAULT_CLASS, [], false);
+		$server       = [];
+		$args         = new Arguments('', '', Arguments::DEFAULT_MODULE);
 		$mobileDetect = new MobileDetect();
 
-		$mode = (new Mode())->determineRunMode(false, $module, $server, $mobileDetect);
+		$mode = (new Mode())->determineRunMode(false, $server, $args, $mobileDetect);
 
 		self::assertFalse($mode->isBackend());
 	}
@@ -252,10 +250,10 @@ class ModeTest extends MockedTest
 			'HTTP_X_REQUESTED_WITH' => 'xmlhttprequest',
 		];
 
-		$module = new Module(Module::DEFAULT, Module::DEFAULT_CLASS, [], false);
+		$args         = new Arguments('', '', Arguments::DEFAULT_MODULE);
 		$mobileDetect = new MobileDetect();
 
-		$mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect);
+		$mode = (new Mode())->determineRunMode(true, $server, $args, $mobileDetect);
 
 		self::assertTrue($mode->isAjax());
 	}
@@ -265,11 +263,11 @@ class ModeTest extends MockedTest
 	 */
 	public function testIsNotAjax()
 	{
-		$server = [];
-		$module = new Module(Module::DEFAULT, Module::DEFAULT_CLASS, [], false);
+		$server       = [];
+		$args         = new Arguments('', '', Arguments::DEFAULT_MODULE);
 		$mobileDetect = new MobileDetect();
 
-		$mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect);
+		$mode = (new Mode())->determineRunMode(true, $server, $args, $mobileDetect);
 
 		self::assertFalse($mode->isAjax());
 	}
@@ -279,13 +277,13 @@ class ModeTest extends MockedTest
 	 */
 	public function testIsMobileIsTablet()
 	{
-		$server = [];
-		$module = new Module(Module::DEFAULT, Module::DEFAULT_CLASS, [], false);
+		$server       = [];
+		$args         = new Arguments('', '', Arguments::DEFAULT_MODULE);
 		$mobileDetect = Mockery::mock(MobileDetect::class);
 		$mobileDetect->shouldReceive('isMobile')->andReturn(true);
 		$mobileDetect->shouldReceive('isTablet')->andReturn(true);
 
-		$mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect);
+		$mode = (new Mode())->determineRunMode(true, $server, $args, $mobileDetect);
 
 		self::assertTrue($mode->isMobile());
 		self::assertTrue($mode->isTablet());
@@ -297,13 +295,13 @@ class ModeTest extends MockedTest
 	 */
 	public function testIsNotMobileIsNotTablet()
 	{
-		$server = [];
-		$module = new Module(Module::DEFAULT, Module::DEFAULT_CLASS, [], false);
+		$server       = [];
+		$args         = new Arguments('', '', Arguments::DEFAULT_MODULE);
 		$mobileDetect = Mockery::mock(MobileDetect::class);
 		$mobileDetect->shouldReceive('isMobile')->andReturn(false);
 		$mobileDetect->shouldReceive('isTablet')->andReturn(false);
 
-		$mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect);
+		$mode = (new Mode())->determineRunMode(true, $server, $args, $mobileDetect);
 
 		self::assertFalse($mode->isMobile());
 		self::assertFalse($mode->isTablet());