Sekretaerbaer-Netz/friendica-sekretaerbaer-netz
1
0
Fork 0
forked from Friendica/friendica
Code Pull requests Activity

Fix 2 PHPStan errors

Browse source
This commit is contained in:
Art4 2025-02-26 15:06:57 +00:00
parent b6312f1dfc
commit 3bc3f5fe4d
2 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/Moderation/Repository/Report.php
View file

@ -7,12 +7,14 @@
namespace Friendica\Moderation\Repository; namespace Friendica\Moderation\Repository;
use Friendica\BaseEntity;
use Friendica\Database\Database; use Friendica\Database\Database;
use Friendica\DI;
use Friendica\Model\Post; use Friendica\Model\Post;
use Friendica\Moderation\Factory; use Friendica\Moderation\Collection\Report\Posts as PostsCollection;
use Friendica\Moderation\Collection; use Friendica\Moderation\Collection\Report\Rules as RulesCollection;
use Friendica\Moderation\Entity\Report as ReportEntity;
use Friendica\Moderation\Factory\Report as ReportFactory;
use Friendica\Moderation\Factory\Report\Post as PostFactory;
use Friendica\Moderation\Factory\Report\Rule as RuleFactory;
use Friendica\Network\HTTPException\NotFoundException; use Friendica\Network\HTTPException\NotFoundException;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
@ -21,14 +23,14 @@ final class Report extends \Friendica\BaseRepository
{ {
protected static $table_name = 'report'; protected static $table_name = 'report';
/** @var Factory\Report */ /** @var ReportFactory */
protected $factory; protected $factory;
/** @var Factory\Report\Post */ /** @var PostFactory */
protected $postFactory; protected $postFactory;
/** @var Factory\Report\Rule */ /** @var RuleFactory */
protected $ruleFactory; protected $ruleFactory;
public function __construct(Database $database, LoggerInterface $logger, Factory\Report $factory, Factory\Report\Post $postFactory, Factory\Report\Rule $ruleFactory) public function __construct(Database $database, LoggerInterface $logger, ReportFactory $factory, PostFactory $postFactory, RuleFactory $ruleFactory)
{ {
parent::__construct($database, $logger, $factory); parent::__construct($database, $logger, $factory);
@ -37,12 +39,12 @@ final class Report extends \Friendica\BaseRepository
$this->ruleFactory = $ruleFactory; $this->ruleFactory = $ruleFactory;
} }
public function selectOneById(int $lastInsertId): \Friendica\Moderation\Entity\Report public function selectOneById(int $lastInsertId): ReportEntity
{ {
return $this->_selectOne(['id' => $lastInsertId]); return $this->_selectOne(['id' => $lastInsertId]);
} }
public function save(\Friendica\Moderation\Entity\Report $Report): \Friendica\Moderation\Entity\Report public function save(ReportEntity $Report): ReportEntity
{ {
$fields = [ $fields = [
'reporter-id' => $Report->reporterCid, 'reporter-id' => $Report->reporterCid,
@ -73,7 +75,7 @@ final class Report extends \Friendica\BaseRepository
if (Post::exists(['uri-id' => $post->uriId])) { if (Post::exists(['uri-id' => $post->uriId])) {
$this->db->insert('report-post', ['rid' => $newReportId, 'uri-id' => $post->uriId, 'status' => $post->status]); $this->db->insert('report-post', ['rid' => $newReportId, 'uri-id' => $post->uriId, 'status' => $post->status]);
} else { } else {
DI::logger()->notice('Post does not exist', ['uri-id' => $post->uriId, 'report' => $Report]); $this->logger->notice('Post does not exist', ['uri-id' => $post->uriId, 'report' => $Report]);
} }
} }
@ -87,15 +89,18 @@ final class Report extends \Friendica\BaseRepository
return $Report; return $Report;
} }
protected function _selectOne(array $condition, array $params = []): BaseEntity /**
* @throws NotFoundException
*/
protected function _selectOne(array $condition, array $params = []): ReportEntity
{ {
$fields = $this->db->selectFirst(self::$table_name, [], $condition, $params); $fields = $this->db->selectFirst(self::$table_name, [], $condition, $params);
if (!$this->db->isResult($fields)) { if (!$this->db->isResult($fields)) {
throw new NotFoundException(); throw new NotFoundException();
} }
$reportPosts = new Collection\Report\Posts(array_map([$this->postFactory, 'createFromTableRow'], $this->db->selectToArray('report-post', ['uri-id', 'status'], ['rid' => $condition['id'] ?? 0]))); $reportPosts = new PostsCollection(array_map([$this->postFactory, 'createFromTableRow'], $this->db->selectToArray('report-post', ['uri-id', 'status'], ['rid' => $condition['id'] ?? 0])));
$reportRules = new Collection\Report\Rules(array_map([$this->ruleFactory, 'createFromTableRow'], $this->db->selectToArray('report-rule', ['line-id', 'text'], ['rid' => $condition['id'] ?? 0]))); $reportRules = new RulesCollection(array_map([$this->ruleFactory, 'createFromTableRow'], $this->db->selectToArray('report-rule', ['line-id', 'text'], ['rid' => $condition['id'] ?? 0])));
return $this->factory->createFromTableRow($fields, $reportPosts, $reportRules); return $this->factory->createFromTableRow($fields, $reportPosts, $reportRules);
} }

2
src/Module/Api/Mastodon/Lists/Accounts.php
View file

@ -31,7 +31,7 @@ class Accounts extends BaseApi
$this->logAndJsonError(422, $this->errorFactory->UnprocessableEntity()); $this->logAndJsonError(422, $this->errorFactory->UnprocessableEntity());
} }
return Circle::removeMembers($this->parameters['id'], $request['account_ids']); Circle::removeMembers($this->parameters['id'], $request['account_ids']);
} }
protected function post(array $request = []) protected function post(array $request = [])