X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2Fsrc%2FCore%2FInstallerTest.php;h=9256581b16ce8e8031a5a356a5b7aa68740c4a60;hb=15bc1ac8a18924551c8af772c07e5fed9c75023b;hp=7404e216e2389661bb17bb465c25b6512fd25946;hpb=02e6dff6a0624d0753eaab7b92d8a8417ed1eb6c;p=friendica.git

diff --git a/tests/src/Core/InstallerTest.php b/tests/src/Core/InstallerTest.php
index 7404e216e2..9256581b16 100644
--- a/tests/src/Core/InstallerTest.php
+++ b/tests/src/Core/InstallerTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,10 +23,11 @@
 namespace Friendica\Core;
 
 use Dice\Dice;
-use Friendica\Core\Config\Cache;
+use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
+use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\DI;
-use Friendica\Network\CurlResult;
-use Friendica\Network\IHTTPRequest;
+use Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses;
+use Friendica\Network\HTTPClient\Capability\ICanSendHttpRequests;
 use Friendica\Test\MockedTest;
 use Friendica\Test\Util\VFSTrait;
 use Mockery;
@@ -35,6 +36,7 @@ use Mockery\MockInterface;
 class InstallerTest extends MockedTest
 {
 	use VFSTrait;
+	use ArraySubsetAsserts;
 
 	/**
 	 * @var L10n|MockInterface
@@ -103,7 +105,7 @@ class InstallerTest extends MockedTest
 		$this->mockL10nT('File Information PHP module', 1);
 		$this->mockL10nT('Error: File Information PHP module required but not installed.', 1);
 		$this->mockL10nT('Program execution functions', 1);
-		$this->mockL10nT('Error: Program execution functions required but not enabled.', 1);
+		$this->mockL10nT('Error: Program execution functions (proc_open) required but not enabled.', 1);
 	}
 
 	private function assertCheckExist($position, $title, $help, $status, $required, $assertionArray)
@@ -248,7 +250,7 @@ class InstallerTest extends MockedTest
 		self::assertFalse($install->checkFunctions());
 		self::assertCheckExist(9,
 			'Program execution functions',
-			'Error: Program execution functions required but not enabled.',
+			'Error: Program execution functions (proc_open) required but not enabled.',
 			false,
 			true,
 			$install->getChecks());
@@ -319,30 +321,30 @@ class InstallerTest extends MockedTest
 		$this->l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; });
 
 		// Mocking the CURL Response
-		$curlResult = Mockery::mock(CurlResult::class);
-		$curlResult
+		$IHTTPResult = Mockery::mock(ICanHandleHttpResponses::class);
+		$IHTTPResult
 			->shouldReceive('getReturnCode')
 			->andReturn('404');
-		$curlResult
+		$IHTTPResult
 			->shouldReceive('getRedirectUrl')
 			->andReturn('');
-		$curlResult
+		$IHTTPResult
 			->shouldReceive('getError')
 			->andReturn('test Error');
 
 		// Mocking the CURL Request
-		$networkMock = Mockery::mock(IHTTPRequest::class);
+		$networkMock = Mockery::mock(ICanSendHttpRequests::class);
 		$networkMock
 			->shouldReceive('fetchFull')
 			->with('https://test/install/testrewrite')
-			->andReturn($curlResult);
+			->andReturn($IHTTPResult);
 		$networkMock
 			->shouldReceive('fetchFull')
 			->with('http://test/install/testrewrite')
-			->andReturn($curlResult);
+			->andReturn($IHTTPResult);
 
 		$this->dice->shouldReceive('create')
-		     ->with(IHTTPRequest::class)
+		     ->with(ICanSendHttpRequests::class)
 		     ->andReturn($networkMock);
 
 		DI::init($this->dice);
@@ -366,30 +368,30 @@ class InstallerTest extends MockedTest
 		$this->l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; });
 
 		// Mocking the failed CURL Response
-		$curlResultF = Mockery::mock(CurlResult::class);
-		$curlResultF
+		$IHTTPResultF = Mockery::mock(ICanHandleHttpResponses::class);
+		$IHTTPResultF
 			->shouldReceive('getReturnCode')
 			->andReturn('404');
 
 		// Mocking the working CURL Response
-		$curlResultW = Mockery::mock(CurlResult::class);
-		$curlResultW
+		$IHTTPResultW = Mockery::mock(ICanHandleHttpResponses::class);
+		$IHTTPResultW
 			->shouldReceive('getReturnCode')
 			->andReturn('204');
 
 		// Mocking the CURL Request
-		$networkMock = Mockery::mock(IHTTPRequest::class);
+		$networkMock = Mockery::mock(ICanSendHttpRequests::class);
 		$networkMock
 			->shouldReceive('fetchFull')
 			->with('https://test/install/testrewrite')
-			->andReturn($curlResultF);
+			->andReturn($IHTTPResultF);
 		$networkMock
 			->shouldReceive('fetchFull')
 			->with('http://test/install/testrewrite')
-			->andReturn($curlResultW);
+			->andReturn($IHTTPResultW);
 
 		$this->dice->shouldReceive('create')
-		           ->with(IHTTPRequest::class)
+		           ->with(ICanSendHttpRequests::class)
 		           ->andReturn($networkMock);
 
 		DI::init($this->dice);