ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix code style

Browse Source 
Signed-off-by: Sergey Shliakhov <husband.sergey@gmail.com>
This commit is contained in:
Sergey Shliakhov
2020-06-07 16:18:38 +02:00
committed by Julius Härtl
parent 118959795f
commit b8b3ac3516
7 changed files with 83 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Command/TransferOwnership.php
View File

@@ -9,11 +9,9 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
final class TransferOwnership extends Command { final class TransferOwnership extends Command {
protected $boardService; protected $boardService;
public function __construct(BoardService $boardService) public function __construct(BoardService $boardService) {
{
parent::__construct(); parent::__construct();
$this->boardService = $boardService; $this->boardService = $boardService;
@@ -45,5 +43,4 @@ final class TransferOwnership extends Command {
$output->writeln("Transfer deck entities from $owner to $newOwner completed"); $output->writeln("Transfer deck entities from $owner to $newOwner completed");
} }
} }

3
lib/Db/AclMapper.php
View File

@@ -63,8 +63,7 @@ class AclMapper extends DeckMapper implements IPermissionMapper {
* @param $newOwnerId * @param $newOwnerId
* @return void * @return void
*/ */
public function transferOwnership($ownerId, $newOwnerId) public function transferOwnership($ownerId, $newOwnerId) {
{
$params = [ $params = [
'owner' => $ownerId, 'owner' => $ownerId,
'newOwner' => $newOwnerId, 'newOwner' => $newOwnerId,

3
lib/Db/AssignmentMapper.php
View File

@@ -152,8 +152,7 @@ class AssignmentMapper extends QBMapper implements IPermissionMapper {
* @param $newOwnerId * @param $newOwnerId
* @return void * @return void
*/ */
public function transferOwnership($ownerId, $newOwnerId) public function transferOwnership($ownerId, $newOwnerId) {
{
$params = [ $params = [
'owner' => $ownerId, 'owner' => $ownerId,
'newOwner' => $newOwnerId 'newOwner' => $newOwnerId

29
lib/Db/BoardMapper.php
View File

@@ -304,19 +304,18 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
}); });
} }
/** /**
* @param $ownerId * @param $ownerId
* @param $newOwnerId * @param $newOwnerId
* @return void * @return void
*/ */
public function transferOwnership($ownerId, $newOwnerId) public function transferOwnership($ownerId, $newOwnerId) {
{ $params = [
$params = [ 'owner' => $ownerId,
'owner' => $ownerId, 'newOwner' => $newOwnerId
'newOwner' => $newOwnerId ];
]; $sql = "UPDATE `{$this->tableName}` SET `owner` = :newOwner WHERE `owner` = :owner";
$sql = "UPDATE `{$this->tableName}` SET `owner` = :newOwner WHERE `owner` = :owner"; $stmt = $this->execute($sql, $params);
$stmt = $this->execute($sql, $params); $stmt->closeCursor();
$stmt->closeCursor(); }
}
} }

3
lib/Db/CardMapper.php
View File

@@ -570,8 +570,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
* @param $newOwnerId * @param $newOwnerId
* @return void * @return void
*/ */
public function transferOwnership($ownerId, $newOwnerId) public function transferOwnership($ownerId, $newOwnerId) {
{
$params = [ $params = [
'owner' => $ownerId, 'owner' => $ownerId,
'newOwner' => $newOwnerId 'newOwner' => $newOwnerId

3
lib/Service/BoardService.php
View File

@@ -680,8 +680,7 @@ class BoardService {
* @param $newOwnerId * @param $newOwnerId
* @return void * @return void
*/ */
public function transferOwnership($owner, $newOwner) public function transferOwnership($owner, $newOwner) {
{
$this->boardMapper->transferOwnership($owner, $newOwner); $this->boardMapper->transferOwnership($owner, $newOwner);
$this->assignedUsersMapper->transferOwnership($owner, $newOwner); $this->assignedUsersMapper->transferOwnership($owner, $newOwner);
$this->aclMapper->transferOwnership($owner, $newOwner); $this->aclMapper->transferOwnership($owner, $newOwner);

133
tests/integration/database/TransferOwnershipTest.php
View File

@@ -25,12 +25,12 @@ class AssignedUsersMapperTest extends \Test\TestCase {
protected $assignedUsersMapper; protected $assignedUsersMapper;
/** @var AssignmentService */ /** @var AssignmentService */
private $assignmentService; private $assignmentService;
/** @var Board */ /** @var Board */
private $board; private $board;
private $cards; private $cards;
private $stacks; private $stacks;
public static function setUpBeforeClass(): void { public static function setUpBeforeClass(): void {
parent::setUpBeforeClass(); parent::setUpBeforeClass();
$backend = new \Test\Util\User\Dummy(); $backend = new \Test\Util\User\Dummy();
@@ -60,82 +60,77 @@ class AssignedUsersMapperTest extends \Test\TestCase {
$stacks = []; $stacks = [];
$board = $this->boardService->create('Test', self::TEST_OWNER, '000000'); $board = $this->boardService->create('Test', self::TEST_OWNER, '000000');
$id = $board->getId(); $id = $board->getId();
$this->boardService->addAcl($id, Acl::PERMISSION_TYPE_USER, self::TEST_OWNER, true, true, true); $this->boardService->addAcl($id, Acl::PERMISSION_TYPE_USER, self::TEST_OWNER, true, true, true);
$this->boardService->addAcl($id, Acl::PERMISSION_TYPE_GROUP, self::TEST_GROUP, true, true, true); $this->boardService->addAcl($id, Acl::PERMISSION_TYPE_GROUP, self::TEST_GROUP, true, true, true);
$stacks[] = $this->stackService->create('Stack A', $id, 1); $stacks[] = $this->stackService->create('Stack A', $id, 1);
$stacks[] = $this->stackService->create('Stack B', $id, 1); $stacks[] = $this->stackService->create('Stack B', $id, 1);
$stacks[] = $this->stackService->create('Stack C', $id, 1); $stacks[] = $this->stackService->create('Stack C', $id, 1);
$cards[] = $this->cardService->create('Card 1', $stacks[0]->getId(), 'text', 0, self::TEST_OWNER); $cards[] = $this->cardService->create('Card 1', $stacks[0]->getId(), 'text', 0, self::TEST_OWNER);
$cards[] = $this->cardService->create('Card 2', $stacks[0]->getId(), 'text', 0, self::TEST_OWNER); $cards[] = $this->cardService->create('Card 2', $stacks[0]->getId(), 'text', 0, self::TEST_OWNER);
$this->assignmentService->assignUser($cards[0]->getId(), self::TEST_OWNER); $this->assignmentService->assignUser($cards[0]->getId(), self::TEST_OWNER);
$this->board = $board; $this->board = $board;
$this->cards = $cards; $this->cards = $cards;
$this->stacks = $stacks; $this->stacks = $stacks;
} }
/** /**
* @covers ::transferOwnership * @covers ::transferOwnership
*/ */
public function testTransferBoardOwnership() public function testTransferBoardOwnership() {
{ $this->boardService->transferOwnership(self::TEST_OWNER, self::TEST_NEW_OWNER);
$this->boardService->transferOwnership(self::TEST_OWNER, self::TEST_NEW_OWNER); $board = $this->boardService->find($this->board->getId());
$board = $this->boardService->find($this->board->getId()); $boardOwner = $board->getOwner();
$boardOwner = $board->getOwner(); $this->assertEquals(self::TEST_NEW_OWNER, $boardOwner);
$this->assertEquals(self::TEST_NEW_OWNER, $boardOwner); }
}
/** /**
* @covers ::transferOwnership * @covers ::transferOwnership
*/ */
public function testTransferACLOwnership() public function testTransferACLOwnership() {
{ $this->boardService->transferOwnership(self::TEST_OWNER, self::TEST_NEW_OWNER);
$this->boardService->transferOwnership(self::TEST_OWNER, self::TEST_NEW_OWNER); $board = $this->boardService->find($this->board->getId());
$board = $this->boardService->find($this->board->getId()); $acl = $board->getAcl();
$acl = $board->getAcl(); $isTargetInAcl = (bool)array_filter($acl, function ($item) {
$isTargetInAcl = (bool)array_filter($acl, function ($item) { return $item->getParticipant() === self::TEST_NEW_OWNER && $item->getType() === Acl::PERMISSION_TYPE_USER;
return $item->getParticipant() === self::TEST_NEW_OWNER && $item->getType() === Acl::PERMISSION_TYPE_USER; });
}); $this->assertTrue($isTargetInAcl);
$this->assertTrue($isTargetInAcl); }
}
/** /**
* @covers ::transferOwnership * @covers ::transferOwnership
*/ */
public function testNoTransferAclOwnershipIfGroupType() public function testNoTransferAclOwnershipIfGroupType() {
{ $this->boardService->transferOwnership(self::TEST_OWNER, self::TEST_NEW_OWNER);
$this->boardService->transferOwnership(self::TEST_OWNER, self::TEST_NEW_OWNER); $board = $this->boardService->find($this->board->getId());
$board = $this->boardService->find($this->board->getId()); $acl = $board->getAcl();
$acl = $board->getAcl(); $isGroupInAcl = (bool)array_filter($acl, function ($item) {
$isGroupInAcl = (bool)array_filter($acl, function ($item) { return $item->getParticipant() === self::TEST_GROUP && $item->getType() === Acl::PERMISSION_TYPE_GROUP;
return $item->getParticipant() === self::TEST_GROUP && $item->getType() === Acl::PERMISSION_TYPE_GROUP; });
}); $this->assertTrue($isGroupInAcl);
$this->assertTrue($isGroupInAcl); }
} /**
/** * @covers ::transferOwnership
* @covers ::transferOwnership */
*/ public function testTransferCardOwnership() {
public function testTransferCardOwnership() $this->boardService->transferOwnership(self::TEST_OWNER, self::TEST_NEW_OWNER);
{ $card = $this->cardService->find($this->cards[0]->getId());
$this->boardService->transferOwnership(self::TEST_OWNER, self::TEST_NEW_OWNER); $cardOwner = $card->getOwner();
$card = $this->cardService->find($this->cards[0]->getId()); $this->assertEquals(self::TEST_NEW_OWNER, $cardOwner);
$cardOwner = $card->getOwner(); }
$this->assertEquals(self::TEST_NEW_OWNER, $cardOwner);
}
/** /**
* @covers ::transferOwnership * @covers ::transferOwnership
*/ */
public function testReassignCardToNewOwner() public function testReassignCardToNewOwner() {
{ $this->boardService->transferOwnership(self::TEST_OWNER, self::TEST_NEW_OWNER);
$this->boardService->transferOwnership(self::TEST_OWNER, self::TEST_NEW_OWNER); $assignedUsers = $this->assignedUsersMapper->find($this->cards[0]->getId());
$assignedUsers = $this->assignedUsersMapper->find($this->cards[0]->getId()); $participantsUIDs = [];
$participantsUIDs = []; foreach ($assignedUsers as $user) {
foreach ($assignedUsers as $user) { $participantsUIDs[] = $user->getParticipant();
$participantsUIDs[] = $user->getParticipant(); }
} $this->assertContains(self::TEST_NEW_OWNER, $participantsUIDs);
$this->assertContains(self::TEST_NEW_OWNER, $participantsUIDs); $this->assertNotContains(self::TEST_OWNER, $participantsUIDs);
$this->assertNotContains(self::TEST_OWNER, $participantsUIDs); }
}
public function tearDown(): void { public function tearDown(): void {
$this->boardService->deleteForce($this->board->getId()); $this->boardService->deleteForce($this->board->getId());