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

Scrutinizer Auto-Fixes

Browse Source 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
This commit is contained in:
Scrutinizer Auto-Fixer
2017-01-31 09:28:59 +00:00
parent 5c1713d928
commit 094aa6d636
19 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/AppInfo/Application.php
View File

@@ -40,7 +40,7 @@ class Application extends App {
$container = $this->getContainer(); $container = $this->getContainer();
$server = $container->getServer(); $server = $container->getServer();
$container->registerService('SharingMiddleware', function ($container) use ($server) { $container->registerService('SharingMiddleware', function($container) use ($server) {
return new SharingMiddleware( return new SharingMiddleware(
$container, $container,
$server->getRequest(), $server->getRequest(),
@@ -55,7 +55,7 @@ class Application extends App {
public function registerNavigationEntry() { public function registerNavigationEntry() {
$container = $this->getContainer(); $container = $this->getContainer();
$container->query('OCP\INavigationManager')->add(function () use ($container) { $container->query('OCP\INavigationManager')->add(function() use ($container) {
$urlGenerator = $container->query('OCP\IURLGenerator'); $urlGenerator = $container->query('OCP\IURLGenerator');
$l10n = $container->query('OCP\IL10N'); $l10n = $container->query('OCP\IL10N');
return [ return [

2
lib/CardArchivedException.php
View File

@@ -28,7 +28,7 @@ class CardArchivedException extends \Exception {
* Constructor * Constructor
* @param string $msg the error message * @param string $msg the error message
*/ */
public function __construct($msg=""){ public function __construct($msg = "") {
parent::__construct($msg); parent::__construct($msg);
} }
} }

4
lib/Controller/CardController.php
View File

@@ -32,7 +32,7 @@ class CardController extends Controller {
private $userId; private $userId;
private $cardService; private $cardService;
public function __construct($appName, IRequest $request, CardService $cardService, $userId){ public function __construct($appName, IRequest $request, CardService $cardService, $userId) {
parent::__construct($appName, $request); parent::__construct($appName, $request);
$this->userId = $userId; $this->userId = $userId;
$this->cardService = $cardService; $this->cardService = $cardService;
@@ -76,7 +76,7 @@ class CardController extends Controller {
* @param int $order * @param int $order
* @return \OCP\AppFramework\Db\Entity * @return \OCP\AppFramework\Db\Entity
*/ */
public function create($title, $stackId, $type, $order=999) { public function create($title, $stackId, $type, $order = 999) {
return $this->cardService->create($title, $stackId, $type, $order, $this->userId); return $this->cardService->create($title, $stackId, $type, $order, $this->userId);
} }

2
lib/Controller/LabelController.php
View File

@@ -32,7 +32,7 @@ class LabelController extends Controller {
private $labelService; private $labelService;
public function __construct($appName, IRequest $request, LabelService $labelService){ public function __construct($appName, IRequest $request, LabelService $labelService) {
parent::__construct($appName, $request); parent::__construct($appName, $request);
$this->labelService = $labelService; $this->labelService = $labelService;
} }

5
lib/Controller/ShareController.php
View File

@@ -67,8 +67,9 @@ class ShareController extends Controller {
} }
$limit = 10; $limit = 10;
foreach ($this->userManager->searchDisplayName($search, $limit, $offset) as $idx => $user) { foreach ($this->userManager->searchDisplayName($search, $limit, $offset) as $idx => $user) {
if ($user->getUID() === $this->userId) if ($user->getUID() === $this->userId) {
continue; continue;
}
$acl = new Acl(); $acl = new Acl();
$acl->setType('user'); $acl->setType('user');
$acl->setParticipant($user->getUID()); $acl->setParticipant($user->getUID());

4
lib/Controller/StackController.php
View File

@@ -33,7 +33,7 @@ use OCP\AppFramework\Controller;
class StackController extends Controller { class StackController extends Controller {
private $userId; private $userId;
private $stackService; private $stackService;
public function __construct($appName, IRequest $request, StackService $cardService, $userId){ public function __construct($appName, IRequest $request, StackService $cardService, $userId) {
parent::__construct($appName, $request); parent::__construct($appName, $request);
$this->userId = $userId; $this->userId = $userId;
$this->stackService = $cardService; $this->stackService = $cardService;
@@ -64,7 +64,7 @@ class StackController extends Controller {
* @param int $order * @param int $order
* @return \OCP\AppFramework\Db\Entity * @return \OCP\AppFramework\Db\Entity
*/ */
public function create($title, $boardId, $order=999) { public function create($title, $boardId, $order = 999) {
return $this->stackService->create($title, $boardId, $order); return $this->stackService->create($title, $boardId, $order);
} }

2
lib/Db/AclMapper.php
View File

@@ -32,7 +32,7 @@ class AclMapper extends DeckMapper implements IPermissionMapper {
parent::__construct($db, 'deck_board_acl', '\OCA\Deck\Db\Acl'); parent::__construct($db, 'deck_board_acl', '\OCA\Deck\Db\Acl');
} }
public function findAll($boardId, $limit=null, $offset=null) { public function findAll($boardId, $limit = null, $offset = null) {
$sql = 'SELECT id, board_id, type, participant, permission_edit, permission_share, permission_manage FROM `*PREFIX*deck_board_acl` WHERE `board_id` = ? '; $sql = 'SELECT id, board_id, type, participant, permission_edit, permission_share, permission_manage FROM `*PREFIX*deck_board_acl` WHERE `board_id` = ? ';
return $this->findEntities($sql, [$boardId], $limit, $offset); return $this->findEntities($sql, [$boardId], $limit, $offset);
} }

8
lib/Db/Board.php
View File

@@ -37,9 +37,9 @@ class Board extends Entity implements JsonSerializable {
protected $shared; protected $shared;
public function __construct() { public function __construct() {
$this->addType('id','integer'); $this->addType('id', 'integer');
$this->addType('shared','integer'); $this->addType('shared', 'integer');
$this->addType('archived','boolean'); $this->addType('archived', 'boolean');
$this->addRelation('labels'); $this->addRelation('labels');
$this->addRelation('acl'); $this->addRelation('acl');
$this->addRelation('shared'); $this->addRelation('shared');
@@ -55,7 +55,7 @@ class Board extends Entity implements JsonSerializable {
'labels' => $this->labels, 'labels' => $this->labels,
'acl' => $this->acl, 'acl' => $this->acl,
]; ];
if($this->shared!==-1) { if ($this->shared !== -1) {
$result['shared'] = $this->shared; $result['shared'] = $this->shared;
} }
return $result; return $result;

8
lib/Db/Card.php
View File

@@ -41,12 +41,12 @@ class Card extends Entity implements JsonSerializable {
protected $archived = false; protected $archived = false;
public function __construct() { public function __construct() {
$this->addType('id','integer'); $this->addType('id', 'integer');
$this->addType('stackId','integer'); $this->addType('stackId', 'integer');
$this->addType('order','integer'); $this->addType('order', 'integer');
$this->addType('lastModified', 'integer'); $this->addType('lastModified', 'integer');
$this->addType('createdAt', 'integer'); $this->addType('createdAt', 'integer');
$this->addType('archived','boolean'); $this->addType('archived', 'boolean');
$this->addRelation('labels'); $this->addRelation('labels');
} }

4
lib/Db/Entity.php
View File

@@ -50,8 +50,8 @@ class Entity extends \OCP\AppFramework\Db\Entity {
* @param string $attribute the name of the attribute * @param string $attribute the name of the attribute
* @since 7.0.0 * @since 7.0.0
*/ */
protected function markFieldUpdated($attribute){ protected function markFieldUpdated($attribute) {
if(!in_array($attribute, $this->_relations)) { if (!in_array($attribute, $this->_relations)) {
parent::markFieldUpdated($attribute); parent::markFieldUpdated($attribute);
} }
} }

2
lib/Db/Label.php
View File

@@ -34,7 +34,7 @@ class Label extends Entity implements JsonSerializable {
protected $boardId; protected $boardId;
protected $cardId; protected $cardId;
public function __construct() { public function __construct() {
$this->addType('id','integer'); $this->addType('id', 'integer');
} }
public function jsonSerialize() { public function jsonSerialize() {
return [ return [

12
lib/Db/LabelMapper.php
View File

@@ -32,7 +32,7 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
parent::__construct($db, 'deck_labels', '\OCA\Deck\Db\Label'); parent::__construct($db, 'deck_labels', '\OCA\Deck\Db\Label');
} }
public function findAll($boardId, $limit=null, $offset=null) { public function findAll($boardId, $limit = null, $offset = null) {
$sql = 'SELECT * FROM `*PREFIX*deck_labels` WHERE `board_id` = ? ORDER BY `id`'; $sql = 'SELECT * FROM `*PREFIX*deck_labels` WHERE `board_id` = ? ORDER BY `id`';
return $this->findEntities($sql, [$boardId], $limit, $offset); return $this->findEntities($sql, [$boardId], $limit, $offset);
} }
@@ -44,11 +44,11 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
return parent::delete($entity); return parent::delete($entity);
} }
public function findAssignedLabelsForCard($cardId, $limit=null, $offset=null) { public function findAssignedLabelsForCard($cardId, $limit = null, $offset = null) {
$sql = 'SELECT l.* FROM `*PREFIX*deck_assigned_labels` as al INNER JOIN *PREFIX*deck_labels as l ON l.id = al.label_id WHERE `card_id` = ? ORDER BY l.id'; $sql = 'SELECT l.* FROM `*PREFIX*deck_assigned_labels` as al INNER JOIN *PREFIX*deck_labels as l ON l.id = al.label_id WHERE `card_id` = ? ORDER BY l.id';
return $this->findEntities($sql, [$cardId], $limit, $offset); return $this->findEntities($sql, [$cardId], $limit, $offset);
} }
public function findAssignedLabelsForBoard($boardId, $limit=null, $offset=null) { public function findAssignedLabelsForBoard($boardId, $limit = null, $offset = null) {
$sql = "SELECT c.id as card_id, l.id as id, l.title as title, l.color as color FROM oc_deck_cards as c " . $sql = "SELECT c.id as card_id, l.id as id, l.title as title, l.color as color FROM oc_deck_cards as c " .
" INNER JOIN oc_deck_assigned_labels as al ON al.card_id = c.id INNER JOIN oc_deck_labels as l ON al.label_id = l.id WHERE board_id=? ORDER BY l.id"; " INNER JOIN oc_deck_assigned_labels as al ON al.card_id = c.id INNER JOIN oc_deck_labels as l ON al.label_id = l.id WHERE board_id=? ORDER BY l.id";
$entities = $this->findEntities($sql, [$boardId], $limit, $offset); $entities = $this->findEntities($sql, [$boardId], $limit, $offset);
@@ -59,7 +59,7 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
$labels = $this->findAssignedLabelsForBoard($boardId); $labels = $this->findAssignedLabelsForBoard($boardId);
$result = array(); $result = array();
foreach ($labels as $label) { foreach ($labels as $label) {
if(!array_key_exists($label->getCardId(), $result)) { if (!array_key_exists($label->getCardId(), $result)) {
$result[$label->getCardId()] = array(); $result[$label->getCardId()] = array();
} }
$result[$label->getCardId()][] = $label; $result[$label->getCardId()][] = $label;
@@ -70,14 +70,14 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
public function deleteLabelAssignments($labelId) { public function deleteLabelAssignments($labelId) {
$sql = 'DELETE FROM `*PREFIX*deck_assigned_labels` WHERE label_id = ?'; $sql = 'DELETE FROM `*PREFIX*deck_assigned_labels` WHERE label_id = ?';
$stmt = $this->db->prepare($sql); $stmt = $this->db->prepare($sql);
$stmt->bindParam(1, $labelId, \PDO::PARAM_INT); $stmt->bindParam(1, $labelId, \PDO::PARAM_INT);
$stmt->execute(); $stmt->execute();
} }
public function deleteLabelAssignmentsForCard($cardId) { public function deleteLabelAssignmentsForCard($cardId) {
$sql = 'DELETE FROM `*PREFIX*deck_assigned_labels` WHERE card_id = ?'; $sql = 'DELETE FROM `*PREFIX*deck_assigned_labels` WHERE card_id = ?';
$stmt = $this->db->prepare($sql); $stmt = $this->db->prepare($sql);
$stmt->bindParam(1, $cardId, \PDO::PARAM_INT); $stmt->bindParam(1, $cardId, \PDO::PARAM_INT);
$stmt->execute(); $stmt->execute();
} }

2
lib/Db/StackMapper.php
View File

@@ -48,7 +48,7 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
} }
public function findAll($boardId, $limit=null, $offset=null) { public function findAll($boardId, $limit = null, $offset = null) {
$sql = 'SELECT * FROM `*PREFIX*deck_stacks` WHERE `board_id` = ? ORDER BY `order`'; $sql = 'SELECT * FROM `*PREFIX*deck_stacks` WHERE `board_id` = ? ORDER BY `order`';
return $this->findEntities($sql, [$boardId], $limit, $offset); return $this->findEntities($sql, [$boardId], $limit, $offset);
} }

4
lib/NoPermissionException.php
View File

@@ -26,9 +26,9 @@ namespace OCA\Deck;
class NoPermissionException extends StatusException { class NoPermissionException extends StatusException {
public function __construct($message, $controller=null, $method=null) { public function __construct($message, $controller = null, $method = null) {
parent::__construct($message); parent::__construct($message);
if($controller && $method) { if ($controller && $method) {
$this->message = get_class($controller) . "#" . $method . ": " . $message; $this->message = get_class($controller) . "#" . $method . ": " . $message;
} }
} }

2
lib/NotFoundException.php
View File

@@ -26,7 +26,7 @@ namespace OCA\Deck;
class NotFoundException extends StatusException { class NotFoundException extends StatusException {
public function __construct($message="") { public function __construct($message = "") {
parent::__construct($message); parent::__construct($message);
} }

5
lib/Service/CardService.php
View File

@@ -101,8 +101,9 @@ class CardService {
$card->setLastModified(time()); $card->setLastModified(time());
} }
if ($i === $order) if ($i === $order) {
$i++; $i++;
}
if ($card->id !== $id) { if ($card->id !== $id) {
$card->setOrder($i++); $card->setOrder($i++);

2
lib/Service/LabelService.php
View File

@@ -28,7 +28,7 @@ use OCA\Deck\Db\Acl;
use OCA\Deck\Db\LabelMapper; use OCA\Deck\Db\LabelMapper;
class LabelService { class LabelService {
private $labelMapper; private $labelMapper;

2
lib/Service/PermissionService.php
View File

@@ -26,10 +26,8 @@ namespace OCA\Deck\Service;
use OCA\Deck\Db\Acl; use OCA\Deck\Db\Acl;
use OCA\Deck\Db\AclMapper; use OCA\Deck\Db\AclMapper;
use OCA\Deck\Db\BoardMapper; use OCA\Deck\Db\BoardMapper;
use OCA\Deck\Db\IPermissionMapper; use OCA\Deck\Db\IPermissionMapper;
use OCA\Deck\NoPermissionException; use OCA\Deck\NoPermissionException;
use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Db\DoesNotExistException;
use OCP\IGroupManager; use OCP\IGroupManager;
use OCP\ILogger; use OCP\ILogger;

6
lib/Service/StackService.php
View File

@@ -33,7 +33,7 @@ use OCA\Deck\Db\Stack;
use OCA\Deck\Db\StackMapper; use OCA\Deck\Db\StackMapper;
class StackService { class StackService {
private $stackMapper; private $stackMapper;
private $cardMapper; private $cardMapper;
@@ -54,7 +54,7 @@ class StackService {
foreach ($stacks as $stackIndex => $stack) { foreach ($stacks as $stackIndex => $stack) {
$cards = $this->cardMapper->findAll($stack->id); $cards = $this->cardMapper->findAll($stack->id);
foreach ($cards as $cardIndex => $card) { foreach ($cards as $cardIndex => $card) {
if(array_key_exists($card->id, $labels)) { if (array_key_exists($card->id, $labels)) {
$cards[$cardIndex]->setLabels($labels[$card->id]); $cards[$cardIndex]->setLabels($labels[$card->id]);
} }
} }
@@ -70,7 +70,7 @@ class StackService {
foreach ($stacks as $stackIndex => $stack) { foreach ($stacks as $stackIndex => $stack) {
$cards = $this->cardMapper->findAllArchived($stack->id); $cards = $this->cardMapper->findAllArchived($stack->id);
foreach ($cards as $cardIndex => $card) { foreach ($cards as $cardIndex => $card) {
if(array_key_exists($card->id, $labels)) { if (array_key_exists($card->id, $labels)) {
$cards[$cardIndex]->setLabels($labels[$card->id]); $cards[$cardIndex]->setLabels($labels[$card->id]);
} }
} }