Merge pull request #62348 from nextcloud/backport/62346/stable22

[stable22] test: Fix unit test after last patch

Author: nickvergessen

apps/federation/tests/Controller/OCSAuthAPIControllerTest.php

@@ -121,7 +121,6 @@ public function testRequestSharedSecret($token, $localToken, $isTrustedServer, $
 
 		try {
 			$this->ocsAuthApi->requestSharedSecret($url, $token);
-			$this->assertTrue($ok);
 		} catch (OCSForbiddenException $e) {
 			$this->assertFalse($ok);
 		}

build/integration/composer.json

@@ -1,10 +1,10 @@
 {
   "require-dev": {
-    "phpunit/phpunit": "~6.5",
-    "behat/behat": "~3.11.0",
-    "guzzlehttp/guzzle": "6.5.8",
+    "phpunit/phpunit": "^8.5",
+    "behat/behat": "^3.12.0",
+    "guzzlehttp/guzzle": "^7.6.0",
     "jarnaiz/behat-junit-formatter": "^1.3",
-    "sabre/dav": "4.4.0",
-    "symfony/event-dispatcher": "~5.3"
+    "sabre/dav": "^4.4.0",
+    "symfony/event-dispatcher": "^5.3"
   }
 }

build/integration/features/bootstrap/Avatar.php

@@ -109,7 +109,7 @@ public function loggedInUserGetsTemporaryAvatarWith(string $statusCode) {
 	 * @param string $source
 	 */
 	public function loggedInUserPostsTemporaryAvatarFromFile(string $source) {
-		$file = \GuzzleHttp\Psr7\stream_for(fopen($source, 'r'));
+		$file = \GuzzleHttp\Psr7\Utils::streamFor(fopen($source, 'r'));
 
 		$this->sendingAToWithRequesttoken('POST', '/index.php/avatar',
 			[

build/integration/features/bootstrap/ChecksumsContext.php

@@ -79,7 +79,7 @@ private function getPasswordForUser($userName) {
 	 * @param string $checksum
 	 */
 	public function userUploadsFileToWithChecksum($user, $source, $destination, $checksum) {
-		$file = \GuzzleHttp\Psr7\stream_for(fopen($source, 'r'));
+		$file = \GuzzleHttp\Psr7\Utils::streamFor(fopen($source, 'r'));
 		try {
 			$this->response = $this->client->put(
 				$this->baseUrl . '/remote.php/webdav' . $destination,

build/integration/features/bootstrap/FilesDropContext.php

@@ -51,7 +51,7 @@ public function droppingFileWith($path, $content) {
 		$options['headers'] = [
 			'X-REQUESTED-WITH' => 'XMLHttpRequest'
 		];
-		$options['body'] = \GuzzleHttp\Psr7\stream_for($content);
+		$options['body'] = \GuzzleHttp\Psr7\Utils::streamFor($content);
 
 		try {
 			$this->response = $client->request('PUT', $fullUrl, $options);

build/integration/features/bootstrap/WebDav.php

@@ -454,7 +454,7 @@ public function checkElementList($user, $expectedElements) {
 	 * @param string $destination
 	 */
 	public function userUploadsAFileTo($user, $source, $destination) {
-		$file = \GuzzleHttp\Psr7\stream_for(fopen($source, 'r'));
+		$file = \GuzzleHttp\Psr7\Utils::streamFor(fopen($source, 'r'));
 		try {
 			$this->response = $this->makeDavRequest($user, "PUT", $destination, [], $file);
 		} catch (\GuzzleHttp\Exception\ServerException $e) {
@@ -486,7 +486,7 @@ public function userAddsAFileTo($user, $bytes, $destination) {
 	 * @When User :user uploads file with content :content to :destination
 	 */
 	public function userUploadsAFileWithContentTo($user, $content, $destination) {
-		$file = \GuzzleHttp\Psr7\stream_for($content);
+		$file = \GuzzleHttp\Psr7\Utils::streamFor($content);
 		try {
 			$this->response = $this->makeDavRequest($user, "PUT", $destination, [], $file);
 		} catch (\GuzzleHttp\Exception\ServerException $e) {
@@ -544,7 +544,7 @@ public function userCreatedAFolder($user, $destination) {
 	 */
 	public function userUploadsChunkFileOfWithToWithChecksum($user, $num, $total, $data, $destination) {
 		$num -= 1;
-		$data = \GuzzleHttp\Psr7\stream_for($data);
+		$data = \GuzzleHttp\Psr7\Utils::streamFor($data);
 		$file = $destination . '-chunking-42-' . $total . '-' . $num;
 		$this->makeDavRequest($user, 'PUT', $file, ['OC-Chunked' => '1'], $data, "uploads");
 	}
@@ -561,7 +561,7 @@ public function userCreatesANewChunkingUploadWithId($user, $id) {
 	 * @Given user :user uploads new chunk file :num with :data to id :id
 	 */
 	public function userUploadsNewChunkFileOfWithToId($user, $num, $data, $id) {
-		$data = \GuzzleHttp\Psr7\stream_for($data);
+		$data = \GuzzleHttp\Psr7\Utils::streamFor($data);
 		$destination = '/uploads/' . $user . '/' . $id . '/' . $num;
 		$this->makeDavRequest($user, 'PUT', $destination, [], $data, "uploads");
 	}

build/integration/run.sh

@@ -26,7 +26,7 @@ else
 fi
 NC_DATADIR=$($OCC config:system:get datadirectory)
 
-composer install --no-audit
+composer install
 
 # avoid port collision on jenkins - use $EXECUTOR_NUMBER
 if [ -z "$EXECUTOR_NUMBER" ]; then