Skip to content

Commit d8ceb8c

Browse files
matchishmatchish
committed
Fix code style
Signed-off-by: Sergey Shliakhov <[email protected]>
1 parent 3b6b5ee commit d8ceb8c

File tree

7 files changed

+83
-96
lines changed

7 files changed

+83
-96
lines changed

‎lib/Command/TransferOwnership.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@
99
use Symfony\Component\Console\Output\OutputInterface;
1010

1111
final class TransferOwnership extends Command {
12-
1312
protected $boardService;
1413

15-
public function __construct(BoardService $boardService)
16-
{
14+
public function __construct(BoardService $boardService) {
1715
parent::__construct();
1816

1917
$this->boardService = $boardService;
@@ -45,5 +43,4 @@ protected function execute(InputInterface $input, OutputInterface $output) {
4543

4644
$output->writeln("Transfer deck entities from $owner to $newOwner completed");
4745
}
48-
4946
}

‎lib/Db/AclMapper.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ public function findByParticipant($type, $participant) {
5757
* @param $newOwnerId
5858
* @return void
5959
*/
60-
public function transferOwnership($ownerId, $newOwnerId)
61-
{
60+
public function transferOwnership($ownerId, $newOwnerId) {
6261
$params = [
6362
'owner' => $ownerId,
6463
'newOwner' => $newOwnerId,

‎lib/Db/AssignedUsersMapper.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@ private function getOrigin(AssignedUsers $assignment) {
120120
* @param $newOwnerId
121121
* @return void
122122
*/
123-
public function transferOwnership($ownerId, $newOwnerId)
124-
{
123+
public function transferOwnership($ownerId, $newOwnerId) {
125124
$params = [
126125
'owner' => $ownerId,
127126
'newOwner' => $newOwnerId

‎lib/Db/BoardMapper.php‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -262,19 +262,18 @@ public function mapOwner(Board &$board) {
262262
});
263263
}
264264

265-
/**
266-
* @param $ownerId
267-
* @param $newOwnerId
268-
* @return void
269-
*/
270-
public function transferOwnership($ownerId, $newOwnerId)
271-
{
272-
$params = [
273-
'owner' => $ownerId,
274-
'newOwner' => $newOwnerId
275-
];
276-
$sql = "UPDATE `{$this->tableName}` SET `owner` = :newOwner WHERE `owner` = :owner";
277-
$stmt = $this->execute($sql, $params);
278-
$stmt->closeCursor();
279-
}
265+
/**
266+
* @param $ownerId
267+
* @param $newOwnerId
268+
* @return void
269+
*/
270+
public function transferOwnership($ownerId, $newOwnerId) {
271+
$params = [
272+
'owner' => $ownerId,
273+
'newOwner' => $newOwnerId
274+
];
275+
$sql = "UPDATE `{$this->tableName}` SET `owner` = :newOwner WHERE `owner` = :owner";
276+
$stmt = $this->execute($sql, $params);
277+
$stmt->closeCursor();
278+
}
280279
}

‎lib/Db/CardMapper.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,7 @@ public function mapOwner(Card &$card) {
211211
* @param $newOwnerId
212212
* @return void
213213
*/
214-
public function transferOwnership($ownerId, $newOwnerId)
215-
{
214+
public function transferOwnership($ownerId, $newOwnerId) {
216215
$params = [
217216
'owner' => $ownerId,
218217
'newOwner' => $newOwnerId

‎lib/Service/BoardService.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -678,8 +678,7 @@ public function clone($id, $userId) {
678678
* @param $newOwnerId
679679
* @return void
680680
*/
681-
public function transferOwnership($owner, $newOwner)
682-
{
681+
public function transferOwnership($owner, $newOwner) {
683682
$this->boardMapper->transferOwnership($owner, $newOwner);
684683
$this->assignedUsersMapper->transferOwnership($owner, $newOwner);
685684
$this->aclMapper->transferOwnership($owner, $newOwner);

‎tests/integration/database/TransferOwnershipTest.php‎

Lines changed: 64 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ class AssignedUsersMapperTest extends \Test\TestCase {
2525
protected $assignedUsersMapper;
2626
/** @var AssignmentService */
2727
private $assignmentService;
28-
/** @var Board */
29-
private $board;
30-
private $cards;
31-
private $stacks;
28+
/** @var Board */
29+
private $board;
30+
private $cards;
31+
private $stacks;
3232

33-
public static function setUpBeforeClass(): void {
33+
public static function setUpBeforeClass(): void {
3434
parent::setUpBeforeClass();
3535

3636
$backend = new \Test\Util\User\Dummy();
@@ -60,82 +60,77 @@ public function createBoardWithExampleData() {
6060
$stacks = [];
6161
$board = $this->boardService->create('Test', self::TEST_OWNER, '000000');
6262
$id = $board->getId();
63-
$this->boardService->addAcl($id, Acl::PERMISSION_TYPE_USER, self::TEST_OWNER, true, true, true);
64-
$this->boardService->addAcl($id, Acl::PERMISSION_TYPE_GROUP, self::TEST_GROUP, true, true, true);
63+
$this->boardService->addAcl($id, Acl::PERMISSION_TYPE_USER, self::TEST_OWNER, true, true, true);
64+
$this->boardService->addAcl($id, Acl::PERMISSION_TYPE_GROUP, self::TEST_GROUP, true, true, true);
6565
$stacks[] = $this->stackService->create('Stack A', $id, 1);
6666
$stacks[] = $this->stackService->create('Stack B', $id, 1);
6767
$stacks[] = $this->stackService->create('Stack C', $id, 1);
6868
$cards[] = $this->cardService->create('Card 1', $stacks[0]->getId(), 'text', 0, self::TEST_OWNER);
6969
$cards[] = $this->cardService->create('Card 2', $stacks[0]->getId(), 'text', 0, self::TEST_OWNER);
70-
$this->assignmentService->assignUser($cards[0]->getId(), self::TEST_OWNER);
71-
$this->board = $board;
70+
$this->assignmentService->assignUser($cards[0]->getId(), self::TEST_OWNER);
71+
$this->board = $board;
7272
$this->cards = $cards;
7373
$this->stacks = $stacks;
7474
}
7575

76-
/**
77-
* @covers ::transferOwnership
78-
*/
79-
public function testTransferBoardOwnership()
80-
{
81-
$this->boardService->transferOwnership(self::TEST_OWNER, self::TEST_NEW_OWNER);
82-
$board = $this->boardService->find($this->board->getId());
83-
$boardOwner = $board->getOwner();
84-
$this->assertEquals(self::TEST_NEW_OWNER, $boardOwner);
85-
}
76+
/**
77+
* @covers ::transferOwnership
78+
*/
79+
public function testTransferBoardOwnership() {
80+
$this->boardService->transferOwnership(self::TEST_OWNER, self::TEST_NEW_OWNER);
81+
$board = $this->boardService->find($this->board->getId());
82+
$boardOwner = $board->getOwner();
83+
$this->assertEquals(self::TEST_NEW_OWNER, $boardOwner);
84+
}
8685

87-
/**
88-
* @covers ::transferOwnership
89-
*/
90-
public function testTransferACLOwnership()
91-
{
92-
$this->boardService->transferOwnership(self::TEST_OWNER, self::TEST_NEW_OWNER);
93-
$board = $this->boardService->find($this->board->getId());
94-
$acl = $board->getAcl();
95-
$isTargetInAcl = (bool)array_filter($acl, function ($item) {
96-
return $item->getParticipant() === self::TEST_NEW_OWNER && $item->getType() === Acl::PERMISSION_TYPE_USER;
97-
});
98-
$this->assertTrue($isTargetInAcl);
99-
}
86+
/**
87+
* @covers ::transferOwnership
88+
*/
89+
public function testTransferACLOwnership() {
90+
$this->boardService->transferOwnership(self::TEST_OWNER, self::TEST_NEW_OWNER);
91+
$board = $this->boardService->find($this->board->getId());
92+
$acl = $board->getAcl();
93+
$isTargetInAcl = (bool)array_filter($acl, function ($item) {
94+
return $item->getParticipant() === self::TEST_NEW_OWNER && $item->getType() === Acl::PERMISSION_TYPE_USER;
95+
});
96+
$this->assertTrue($isTargetInAcl);
97+
}
10098

101-
/**
102-
* @covers ::transferOwnership
103-
*/
104-
public function testNoTransferAclOwnershipIfGroupType()
105-
{
106-
$this->boardService->transferOwnership(self::TEST_OWNER, self::TEST_NEW_OWNER);
107-
$board = $this->boardService->find($this->board->getId());
108-
$acl = $board->getAcl();
109-
$isGroupInAcl = (bool)array_filter($acl, function ($item) {
110-
return $item->getParticipant() === self::TEST_GROUP && $item->getType() === Acl::PERMISSION_TYPE_GROUP;
111-
});
112-
$this->assertTrue($isGroupInAcl);
113-
}
114-
/**
115-
* @covers ::transferOwnership
116-
*/
117-
public function testTransferCardOwnership()
118-
{
119-
$this->boardService->transferOwnership(self::TEST_OWNER, self::TEST_NEW_OWNER);
120-
$card = $this->cardService->find($this->cards[0]->getId());
121-
$cardOwner = $card->getOwner();
122-
$this->assertEquals(self::TEST_NEW_OWNER, $cardOwner);
123-
}
99+
/**
100+
* @covers ::transferOwnership
101+
*/
102+
public function testNoTransferAclOwnershipIfGroupType() {
103+
$this->boardService->transferOwnership(self::TEST_OWNER, self::TEST_NEW_OWNER);
104+
$board = $this->boardService->find($this->board->getId());
105+
$acl = $board->getAcl();
106+
$isGroupInAcl = (bool)array_filter($acl, function ($item) {
107+
return $item->getParticipant() === self::TEST_GROUP && $item->getType() === Acl::PERMISSION_TYPE_GROUP;
108+
});
109+
$this->assertTrue($isGroupInAcl);
110+
}
111+
/**
112+
* @covers ::transferOwnership
113+
*/
114+
public function testTransferCardOwnership() {
115+
$this->boardService->transferOwnership(self::TEST_OWNER, self::TEST_NEW_OWNER);
116+
$card = $this->cardService->find($this->cards[0]->getId());
117+
$cardOwner = $card->getOwner();
118+
$this->assertEquals(self::TEST_NEW_OWNER, $cardOwner);
119+
}
124120

125-
/**
126-
* @covers ::transferOwnership
127-
*/
128-
public function testReassignCardToNewOwner()
129-
{
130-
$this->boardService->transferOwnership(self::TEST_OWNER, self::TEST_NEW_OWNER);
131-
$assignedUsers = $this->assignedUsersMapper->find($this->cards[0]->getId());
132-
$participantsUIDs = [];
133-
foreach ($assignedUsers as $user) {
134-
$participantsUIDs[] = $user->getParticipant();
135-
}
136-
$this->assertContains(self::TEST_NEW_OWNER, $participantsUIDs);
137-
$this->assertNotContains(self::TEST_OWNER, $participantsUIDs);
138-
}
121+
/**
122+
* @covers ::transferOwnership
123+
*/
124+
public function testReassignCardToNewOwner() {
125+
$this->boardService->transferOwnership(self::TEST_OWNER, self::TEST_NEW_OWNER);
126+
$assignedUsers = $this->assignedUsersMapper->find($this->cards[0]->getId());
127+
$participantsUIDs = [];
128+
foreach ($assignedUsers as $user) {
129+
$participantsUIDs[] = $user->getParticipant();
130+
}
131+
$this->assertContains(self::TEST_NEW_OWNER, $participantsUIDs);
132+
$this->assertNotContains(self::TEST_OWNER, $participantsUIDs);
133+
}
139134

140135
public function tearDown(): void {
141136
$this->boardService->deleteForce($this->board->getId());

0 commit comments

Comments
 (0)