clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixings & add tests

Browse Source
This commit is contained in:
Philipp
2021-10-19 22:03:24 +02:00
parent ed184bd592
commit 690369cc4b
4 changed files with 132 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Contact/Introduction/Depository/Introduction.php
View File

@@ -68,7 +68,6 @@ class Introduction extends BaseDepository
{
return [
'uid' => $introduction->uid,
'fid' => $introduction->fid,
'contact-id' => $introduction->cid,
'suggest-cid' => $introduction->sid,
'knowyou' => $introduction->knowyou ? 1 : 0,

26
src/Contact/Introduction/Entity/Introduction.php
View File

@@ -26,7 +26,6 @@ use Friendica\BaseEntity;
/**
* @property-read int $uid
* @property-read int $sid
* @property-read int|null $fid
* @property-read int|null $cid
* @property-read bool $knowyou
* @property-read bool $duplex
@@ -43,8 +42,6 @@ class Introduction extends BaseEntity
/** @var int */
protected $sid;
/** @var int|null */
protected $fid;
/** @var int|null */
protected $cid;
/** @var bool */
protected $knowyou;
@@ -64,7 +61,6 @@ class Introduction extends BaseEntity
/**
* @param int $uid
* @param int $sid
* @param int|null $fid
* @param int|null $cid
* @param bool $knowyou
* @param bool $duplex
@@ -74,18 +70,18 @@ class Introduction extends BaseEntity
* @param bool $ignore
* @param int|null $id
*/
public function __construct(int $uid, int $sid, ?int $fid, ?int $cid, bool $knowyou, bool $duplex, string $note, string $hash, \DateTime $datetime, bool $ignore, ?int $id)
public function __construct(int $uid, int $sid, ?int $cid, bool $knowyou, bool $duplex, string $note, string $hash, \DateTime $datetime, bool $ignore, ?int $id)
{
$this->uid = $uid;
$this->sid = $sid;
$this->fid = $fid;
$this->cid = $cid;
$this->knowyou = $knowyou;
$this->duplex = $duplex;
$this->note = $note;
$this->hash = $hash;
$this->ignore = $ignore;
$this->id = $id;
$this->uid = $uid;
$this->sid = $sid;
$this->cid = $cid;
$this->knowyou = $knowyou;
$this->duplex = $duplex;
$this->note = $note;
$this->hash = $hash;
$this->datetime = $datetime;
$this->ignore = $ignore;
$this->id = $id;
}
/**

11
src/Contact/Introduction/Factory/Introduction.php
View File

@@ -37,7 +37,6 @@ class Introduction extends BaseFactory implements ICanCreateFromTableRow
return new Entity\Introduction(
$row['uid'] ?? 0,
$row['suggest-cid'] ?? 0,
$row['fid'] ?? null,
$row['contact-id'] ?? null,
!empty($row['knowyou']),
!empty($row['duplex']),
@@ -51,18 +50,16 @@ class Introduction extends BaseFactory implements ICanCreateFromTableRow
public function createNew(
int $uid,
int $cid,
int $sid,
string $note,
int $fid = null,
int $sid = null,
int $cid = null,
bool $knowyou = false,
bool $duplex = false
): Entity\Introduction {
return $this->createFromTableRow([
'uid' => $uid,
'fid' => $fid,
'contact-id' => $cid,
'suggest-cid' => $sid,
'contact-id' => $cid,
'knowyou' => $knowyou,
'duplex' => $duplex,
'note' => $note,
@@ -72,7 +69,7 @@ class Introduction extends BaseFactory implements ICanCreateFromTableRow
]);
}
public function createDummy(int $id): Entity\Introduction
public function createDummy(?int $id): Entity\Introduction
{
return $this->createFromTableRow(['id' => $id]);
}