From: Michael <heluecht@pirati.ca>
Date: Tue, 30 Nov 2021 19:07:24 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/2021.12-rc' into api-fixes
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=56f8adcb80a9005302a7896c63d868eff6779845;p=friendica.git

Merge remote-tracking branch 'upstream/2021.12-rc' into api-fixes
---

56f8adcb80a9005302a7896c63d868eff6779845
diff --cc src/Module/Api/Friendica/Notification/Seen.php
index f9a375f2bd,ffd178bcb0..5e4b132298
--- a/src/Module/Api/Friendica/Notification/Seen.php
+++ b/src/Module/Api/Friendica/Notification/Seen.php
@@@ -70,8 -70,7 +70,8 @@@ class Seen extends BaseAp
  					// we found the item, return it to the user
  					$ret  = [DI::twitterStatus()->createFromUriId($item['uri-id'], $item['uid'], $include_entities)->toArray()];
  					$data = ['status' => $ret];
- 					DI::apiResponse()->exit('statuses', $data, $this->parameters['extension'] ?? null);
+ 					$this->response->exit('statuses', $data, $this->parameters['extension'] ?? null);
 +					return;
  				}
  				// the item can't be found, but we set the notification as seen, so we count this as a success
  			}
diff --cc tests/src/Module/Api/Friendica/Photo/DeleteTest.php
index 849d17cb84,6dd8efff81..8c49456b36
--- a/tests/src/Module/Api/Friendica/Photo/DeleteTest.php
+++ b/tests/src/Module/Api/Friendica/Photo/DeleteTest.php
@@@ -67,8 -67,8 +67,8 @@@ class DeleteTest extends ApiTes
  	{
  		$this->loadFixture(__DIR__ . '/../../../../../datasets/photo/photo.fixture.php', DI::dba());
  
 -		$delete   = new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::DELETE]);
 +		$delete   = new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]);
- 		$response = $delete->run([], ['photo_id' => '709057080661a283a6aa598501504178']);
+ 		$response = $delete->run(['photo_id' => '709057080661a283a6aa598501504178']);
  
  		$responseText = (string)$response->getBody();
  
diff --cc tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php
index d576715186,df8b720a82..88355483a3
--- a/tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php
+++ b/tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php
@@@ -46,8 -46,8 +46,8 @@@ class DeleteTest extends ApiTes
  	{
  		$this->loadFixture(__DIR__ . '/../../../../../datasets/photo/photo.fixture.php', DI::dba());
  
 -		$delete   = new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::DELETE]);
 +		$delete   = new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]);
- 		$response = $delete->run([], ['album' => 'test_album']);
+ 		$response = $delete->run(['album' => 'test_album']);
  
  		$responseText = (string)$response->getBody();