nextcloud / polls

lib/Db/ParticipationTextMapper.php

Indentation +42 added lines, -42 removed lines

@@ -28,50 +28,50 @@
 
 class ParticipationTextMapper extends Mapper {
 
-	/**
-	 * ParticipationTextMapper constructor.
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'polls_particip_text', '\OCA\Polls\Db\ParticipationText');
-	}
+    /**
+     * ParticipationTextMapper constructor.
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'polls_particip_text', '\OCA\Polls\Db\ParticipationText');
+    }
 
-	/**
-	 * @param string $pollId
-	 * @param int $limit
-	 * @param int $offset
-	 * @return ParticipationText[]
-	 */
-	public function findByPoll($pollId, $limit = null, $offset = null) {
-		$sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
-		return $this->findEntities($sql, [$pollId], $limit, $offset);
-	}
+    /**
+     * @param string $pollId
+     * @param int $limit
+     * @param int $offset
+     * @return ParticipationText[]
+     */
+    public function findByPoll($pollId, $limit = null, $offset = null) {
+        $sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
+        return $this->findEntities($sql, [$pollId], $limit, $offset);
+    }
 
-	/**
-	 * @param string $userId
-	 * @param int $limit
-	 * @param int $offset
-	 * @return ParticipationText[]
-	 */
-	public function findDistinctByUser($userId, $limit = null, $offset = null) {
-		$sql = 'SELECT DISTINCT * FROM ' . $this->getTableName() . ' WHERE user_id = ?';
-		return $this->findEntities($sql, [$userId], $limit, $offset);
-	}
+    /**
+     * @param string $userId
+     * @param int $limit
+     * @param int $offset
+     * @return ParticipationText[]
+     */
+    public function findDistinctByUser($userId, $limit = null, $offset = null) {
+        $sql = 'SELECT DISTINCT * FROM ' . $this->getTableName() . ' WHERE user_id = ?';
+        return $this->findEntities($sql, [$userId], $limit, $offset);
+    }
 
-	/**
-	 * @param string $pollId
-	 */
-	public function deleteByPoll($pollId) {
-		$sql = 'DELETE FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
-		$this->execute($sql, [$pollId]);
-	}
+    /**
+     * @param string $pollId
+     */
+    public function deleteByPoll($pollId) {
+        $sql = 'DELETE FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
+        $this->execute($sql, [$pollId]);
+    }
 
-	/**
-	 * @param string $pollId
-	 * @param string $userId
-	 */
-	public function deleteByPollAndUser($pollId, $userId) {
-		$sql = 'DELETE FROM ' . $this->getTableName() . ' WHERE poll_id = ? AND user_id = ?';
-		$this->execute($sql, [$pollId, $userId]);
-	}
+    /**
+     * @param string $pollId
+     * @param string $userId
+     */
+    public function deleteByPollAndUser($pollId, $userId) {
+        $sql = 'DELETE FROM ' . $this->getTableName() . ' WHERE poll_id = ? AND user_id = ?';
+        $this->execute($sql, [$pollId, $userId]);
+    }
 }

lib/Db/DateMapper.php

Indentation +24 added lines, -24 removed lines

@@ -28,30 +28,30 @@
 
 class DateMapper extends Mapper {
 
-	/**
-	 * DateMapper constructor.
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'polls_dts', '\OCA\Polls\Db\Date');
-	}
+    /**
+     * DateMapper constructor.
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'polls_dts', '\OCA\Polls\Db\Date');
+    }
 
-	/**
-	 * @param string $pollId
-	 * @param int $limit
-	 * @param int $offset
-	 * @return Date[]
-	 */
-	public function findByPoll($pollId, $limit = null, $offset = null) {
-		$sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
-		return $this->findEntities($sql, [$pollId], $limit, $offset);
-	}
+    /**
+     * @param string $pollId
+     * @param int $limit
+     * @param int $offset
+     * @return Date[]
+     */
+    public function findByPoll($pollId, $limit = null, $offset = null) {
+        $sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
+        return $this->findEntities($sql, [$pollId], $limit, $offset);
+    }
 
-	/**
-	 * @param string $pollId
-	 */
-	public function deleteByPoll($pollId) {
-		$sql = 'DELETE FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
-		$this->execute($sql, [$pollId]);
-	}
+    /**
+     * @param string $pollId
+     */
+    public function deleteByPoll($pollId) {
+        $sql = 'DELETE FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
+        $this->execute($sql, [$pollId]);
+    }
 }

lib/Db/CommentMapper.php

Indentation +34 added lines, -34 removed lines

@@ -28,41 +28,41 @@
 
 class CommentMapper extends Mapper {
 
-	/**
-	 * CommentMapper constructor.
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'polls_comments', '\OCA\Polls\Db\Comment');
-	}
+    /**
+     * CommentMapper constructor.
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'polls_comments', '\OCA\Polls\Db\Comment');
+    }
 
-	/**
-	 * @param string $userId
-	 * @param int $limit
-	 * @param int $offset
-	 * @return Comment[]
-	 */
-	public function findDistinctByUser($userId, $limit = null, $offset = null) {
-		$sql = 'SELECT DISTINCT * FROM ' . $this->getTableName() . ' WHERE user_id = ?';
-		return $this->findEntities($sql, [$userId], $limit, $offset);
-	}
+    /**
+     * @param string $userId
+     * @param int $limit
+     * @param int $offset
+     * @return Comment[]
+     */
+    public function findDistinctByUser($userId, $limit = null, $offset = null) {
+        $sql = 'SELECT DISTINCT * FROM ' . $this->getTableName() . ' WHERE user_id = ?';
+        return $this->findEntities($sql, [$userId], $limit, $offset);
+    }
 
-	/**
-	 * @param string $pollId
-	 * @param int $limit
-	 * @param int $offset
-	 * @return Comment[]
-	 */
-	public function findByPoll($pollId, $limit = null, $offset = null) {
-		$sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE poll_id = ? ORDER BY Dt DESC';
-		return $this->findEntities($sql, [$pollId], $limit, $offset);
-	}
+    /**
+     * @param string $pollId
+     * @param int $limit
+     * @param int $offset
+     * @return Comment[]
+     */
+    public function findByPoll($pollId, $limit = null, $offset = null) {
+        $sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE poll_id = ? ORDER BY Dt DESC';
+        return $this->findEntities($sql, [$pollId], $limit, $offset);
+    }
 
-	/**
-	 * @param string $pollId
-	 */
-	public function deleteByPoll($pollId) {
-		$sql = 'DELETE FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
-		$this->execute($sql, [$pollId]);
-	}
+    /**
+     * @param string $pollId
+     */
+    public function deleteByPoll($pollId) {
+        $sql = 'DELETE FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
+        $this->execute($sql, [$pollId]);
+    }
 }

templates/no.acc.tmpl.php

Indentation +22 added lines, -22 removed lines

@@ -1,27 +1,27 @@
 <?php
-	/**
-	 * @copyright Copyright (c) 2017 Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com>
-	 *
-	 * @author Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com>
-	 *
-	 * @license GNU AGPL version 3 or any later version
-	 *
-	 *  This program is free software: you can redistribute it and/or modify
-	 *  it under the terms of the GNU Affero General Public License as
-	 *  published by the Free Software Foundation, either version 3 of the
-	 *  License, or (at your option) any later version.
-	 *
-	 *  This program is distributed in the hope that it will be useful,
-	 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 *  GNU Affero General Public License for more details.
-	 *
-	 *  You should have received a copy of the GNU Affero General Public License
-	 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	 *
-	 */
+    /**
+     * @copyright Copyright (c) 2017 Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com>
+     *
+     * @author Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com>
+     *
+     * @license GNU AGPL version 3 or any later version
+     *
+     *  This program is free software: you can redistribute it and/or modify
+     *  it under the terms of the GNU Affero General Public License as
+     *  published by the Free Software Foundation, either version 3 of the
+     *  License, or (at your option) any later version.
+     *
+     *  This program is distributed in the hope that it will be useful,
+     *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+     *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     *  GNU Affero General Public License for more details.
+     *
+     *  You should have received a copy of the GNU Affero General Public License
+     *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     *
+     */
 
-	\OCP\Util::addStyle('polls', 'main');
+    \OCP\Util::addStyle('polls', 'main');
 ?>
 <div id="app">
 	<div id="app-content">

templates/main.tmpl.php

Indentation +122 added lines, -122 removed lines

@@ -1,35 +1,35 @@ 
 <?php
-	/**
-	 * @copyright Copyright (c) 2017 Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com>
-	 *
-	 * @author Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com>
-	 *
-	 * @license GNU AGPL version 3 or any later version
-	 *
-	 *  This program is free software: you can redistribute it and/or modify
-	 *  it under the terms of the GNU Affero General Public License as
-	 *  published by the Free Software Foundation, either version 3 of the
-	 *  License, or (at your option) any later version.
-	 *
-	 *  This program is distributed in the hope that it will be useful,
-	 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 *  GNU Affero General Public License for more details.
-	 *
-	 *  You should have received a copy of the GNU Affero General Public License
-	 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	 *
-	 */
+    /**
+     * @copyright Copyright (c) 2017 Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com>
+     *
+     * @author Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com>
+     *
+     * @license GNU AGPL version 3 or any later version
+     *
+     *  This program is free software: you can redistribute it and/or modify
+     *  it under the terms of the GNU Affero General Public License as
+     *  published by the Free Software Foundation, either version 3 of the
+     *  License, or (at your option) any later version.
+     *
+     *  This program is distributed in the hope that it will be useful,
+     *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+     *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     *  GNU Affero General Public License for more details.
+     *
+     *  You should have received a copy of the GNU Affero General Public License
+     *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     *
+     */
 
-	use OCP\User;
+    use OCP\User;
 
-	\OCP\Util::addStyle('polls', 'main');
-	\OCP\Util::addStyle('polls', 'list');
-	\OCP\Util::addScript('polls', 'start');
+    \OCP\Util::addStyle('polls', 'main');
+    \OCP\Util::addStyle('polls', 'list');
+    \OCP\Util::addScript('polls', 'start');
 
-	$userId = $_['userId'];
-	$userMgr = $_['userMgr'];
-	$urlGenerator = $_['urlGenerator'];
+    $userId = $_['userId'];
+    $userMgr = $_['userMgr'];
+    $urlGenerator = $_['urlGenerator'];
 ?>
 	<div id="app-content">
 		<div id="app-content-wrapper">
@@ -83,61 +83,61 @@ 
 
 				<?php foreach ($_['polls'] as $poll) : ?>
 					<?php
-						if (!userHasAccess($poll, $userId)) continue;
-						// direct url to poll
-						$pollUrl = $urlGenerator->linkToRouteAbsolute('polls.page.goto_poll', array('hash' => $poll->getHash()));
-						$owner = $poll->getOwner();
+                        if (!userHasAccess($poll, $userId)) continue;
+                        // direct url to poll
+                        $pollUrl = $urlGenerator->linkToRouteAbsolute('polls.page.goto_poll', array('hash' => $poll->getHash()));
+                        $owner = $poll->getOwner();
 
-						$expiry_style = '';
-						if ($poll->getType() == '0') {
-							$participated = $_['participations'];
-						} else {
-							$participated = $_['participations_text'];
-						}
-						$participated_class = 'partic_no';
-						$participated_title = $l->t('You did not vote');
-						$participated_count = count($participated);
+                        $expiry_style = '';
+                        if ($poll->getType() == '0') {
+                            $participated = $_['participations'];
+                        } else {
+                            $participated = $_['participations_text'];
+                        }
+                        $participated_class = 'partic_no';
+                        $participated_title = $l->t('You did not vote');
+                        $participated_count = count($participated);
 
-						$comments = $_['comments'];
-						$commented_class = 'commented_no';
-						$commented_title = $l->t('You did not comment');
-						$commented_count = count($comments);
+                        $comments = $_['comments'];
+                        $commented_class = 'commented_no';
+                        $commented_title = $l->t('You did not comment');
+                        $commented_count = count($comments);
 
-						if ($owner == $userId) {
-							$owner = $l->t('Yourself');
-						}
+                        if ($owner == $userId) {
+                            $owner = $l->t('Yourself');
+                        }
 
-						if ($poll->getExpire() != null) {
-							// $expiry_date = date('d.m.Y', strtotime($poll->getExpire()));
-							$expiry_date = OCP\relative_modified_date(strtotime($poll->getExpire())); // does not work, because relative_modified_date seems not to recognise future time diffs
-							$expiry_style = ' progress';
-							if (date('U') > strtotime($poll->getExpire())) {
-								$expiry_date = OCP\relative_modified_date(strtotime($poll->getExpire()));
-								$expiry_style = ' expired';
-							}
-						} else {
-							$expiry_style = ' endless';
-							$expiry_date = $l->t('Never');
-						}
+                        if ($poll->getExpire() != null) {
+                            // $expiry_date = date('d.m.Y', strtotime($poll->getExpire()));
+                            $expiry_date = OCP\relative_modified_date(strtotime($poll->getExpire())); // does not work, because relative_modified_date seems not to recognise future time diffs
+                            $expiry_style = ' progress';
+                            if (date('U') > strtotime($poll->getExpire())) {
+                                $expiry_date = OCP\relative_modified_date(strtotime($poll->getExpire()));
+                                $expiry_style = ' expired';
+                            }
+                        } else {
+                            $expiry_style = ' endless';
+                            $expiry_date = $l->t('Never');
+                        }
 
-						for ($i = 0; $i < count($participated); $i++) {
-							if ($poll->getId() == intval($participated[$i]->getPollId())) {
-								$participated_class = 'partic_yes';
-								$participated_title = $l->t('You voted');
-								array_splice($participated, $i, 1);
-								break;
-							}
-						}
+                        for ($i = 0; $i < count($participated); $i++) {
+                            if ($poll->getId() == intval($participated[$i]->getPollId())) {
+                                $participated_class = 'partic_yes';
+                                $participated_title = $l->t('You voted');
+                                array_splice($participated, $i, 1);
+                                break;
+                            }
+                        }
 
-						for ($i = 0; $i < count($comments); $i++) {
-							if ($poll->getId() == intval($comments[$i]->getPollId())) {
-								$commented_class = 'commented_yes';
-								$commented_title = $l->t('You commented');
-								array_splice($comments, $i, 1);
-								break;
-							}
-						}
-					?>
+                        for ($i = 0; $i < count($comments); $i++) {
+                            if ($poll->getId() == intval($comments[$i]->getPollId())) {
+                                $commented_class = 'commented_yes';
+                                $commented_title = $l->t('You commented');
+                                array_splice($comments, $i, 1);
+                                break;
+                            }
+                        }
+                    ?>
 
 
 					<div class="row table-body">
@@ -213,16 +213,16 @@ 
  * @return array with groups
  */
 function getGroups($userId) {
-	// $this->requireLogin();
-	if (class_exists('\OC_Group', true)) {
-		// Nextcloud <= 11, ownCloud
-		return \OC_Group::getUserGroups($userId);
-	}
-	// Nextcloud >= 12
-	$groups = \OC::$server->getGroupManager()->getUserGroups(\OC::$server->getUserSession()->getUser());
-	return array_map(function ($group) {
-		return $group->getGID();
-	}, $groups);
+    // $this->requireLogin();
+    if (class_exists('\OC_Group', true)) {
+        // Nextcloud <= 11, ownCloud
+        return \OC_Group::getUserGroups($userId);
+    }
+    // Nextcloud >= 12
+    $groups = \OC::$server->getGroupManager()->getUserGroups(\OC::$server->getUserSession()->getUser());
+    return array_map(function ($group) {
+        return $group->getGID();
+    }, $groups);
 }
 
 /**
@@ -231,42 +231,42 @@ 
  * @return boolean 
  */
 function userHasAccess($poll, $userId) {
-	if ($poll == null) {
-		return false;
-	}
-	$access = $poll->getAccess();
-	$owner = $poll->getOwner();
-	if (!User::isLoggedIn()) {
-		return false;
-	}
-	if ($access == 'public') {
-		return true;
-	}
-	if ($access == 'hidden') {
-		return true;
-	}
-	if ($access == 'registered') {
-		return true;
-	}
-	if ($owner == $userId) {
-		return true;
-	}
-	$user_groups = getGroups($userId);
+    if ($poll == null) {
+        return false;
+    }
+    $access = $poll->getAccess();
+    $owner = $poll->getOwner();
+    if (!User::isLoggedIn()) {
+        return false;
+    }
+    if ($access == 'public') {
+        return true;
+    }
+    if ($access == 'hidden') {
+        return true;
+    }
+    if ($access == 'registered') {
+        return true;
+    }
+    if ($owner == $userId) {
+        return true;
+    }
+    $user_groups = getGroups($userId);
 
-	$arr = explode(';', $access);
+    $arr = explode(';', $access);
 
-	foreach ($arr as $item) {
-		if (strpos($item, 'group_') == 0) {
-			$grp = substr($item, 6);
-			foreach ($user_groups as $user_group) {
-				if ($user_group == $grp) return true;
-			}
-		}
-		else if (strpos($item, 'user_') == 0) {
-			$usr = substr($item, 5);
-			if ($usr == $userId) return true;
-		}
-	}
-	return false;
+    foreach ($arr as $item) {
+        if (strpos($item, 'group_') == 0) {
+            $grp = substr($item, 6);
+            foreach ($user_groups as $user_group) {
+                if ($user_group == $grp) return true;
+            }
+        }
+        else if (strpos($item, 'user_') == 0) {
+            $usr = substr($item, 5);
+            if ($usr == $userId) return true;
+        }
+    }
+    return false;
 }
 ?>

tests/Unit/Controller/PageControllerTest.php

Indentation +75 added lines, -75 removed lines

@@ -29,83 +29,83 @@
 
 class PageControllerTest extends PHPUnit_Framework_TestCase {
 
-	private $controller;
-	private $userId = 'john';
+    private $controller;
+    private $userId = 'john';
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function setUp() {
-		$request = $this->getMockBuilder('OCP\IRequest')
-			->disableOriginalConstructor()
-			->getMock();
-		$userManager = $this->getMockBuilder('OCP\IUserManager')
-			->disableOriginalConstructor()
-			->getMock();
-		$groupManager = $this->getMockBuilder('OCP\IGroupManager')
-			->disableOriginalConstructor()
-			->getMock();
-		$avatarManager = $this->getMockBuilder('OCP\IAvatarManager')
-			->disableOriginalConstructor()
-			->getMock();
-		$logger = $this->getMockBuilder('OCP\ILogger')
-			->disableOriginalConstructor()
-			->getMock();
-		$l10n = $this->getMockBuilder('OCP\IL10N')
-			->disableOriginalConstructor()
-			->getMock();
-		$urlGenerator = $this->getMockBuilder('OCP\IURLGenerator')
-			->disableOriginalConstructor()
-			->getMock();
-		$commentMapper = $this->getMockBuilder('OCA\Polls\Db\CommentMapper')
-			->disableOriginalConstructor()
-			->getMock();
-		$dateMapper = $this->getMockBuilder('OCA\Polls\Db\DateMapper')
-			->disableOriginalConstructor()
-			->getMock();
-		$eventMapper = $this->getMockBuilder('OCA\Polls\Db\EventMapper')
-			->disableOriginalConstructor()
-			->getMock();
-		$notificationMapper = $this->getMockBuilder('OCA\Polls\Db\NotificationMapper')
-			->disableOriginalConstructor()
-			->getMock();
-		$participationMapper = $this->getMockBuilder('OCA\Polls\Db\ParticipationMapper')
-			->disableOriginalConstructor()
-			->getMock();
-		$participationTextMapper = $this->getMockBuilder('OCA\Polls\Db\ParticipationTextMapper')
-			->disableOriginalConstructor()
-			->getMock();
-		$textMapper = $this->getMockBuilder('OCA\Polls\Db\TextMapper')
-			->disableOriginalConstructor()
-			->getMock();
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp() {
+        $request = $this->getMockBuilder('OCP\IRequest')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $userManager = $this->getMockBuilder('OCP\IUserManager')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $groupManager = $this->getMockBuilder('OCP\IGroupManager')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $avatarManager = $this->getMockBuilder('OCP\IAvatarManager')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $logger = $this->getMockBuilder('OCP\ILogger')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $l10n = $this->getMockBuilder('OCP\IL10N')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $urlGenerator = $this->getMockBuilder('OCP\IURLGenerator')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $commentMapper = $this->getMockBuilder('OCA\Polls\Db\CommentMapper')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $dateMapper = $this->getMockBuilder('OCA\Polls\Db\DateMapper')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $eventMapper = $this->getMockBuilder('OCA\Polls\Db\EventMapper')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $notificationMapper = $this->getMockBuilder('OCA\Polls\Db\NotificationMapper')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $participationMapper = $this->getMockBuilder('OCA\Polls\Db\ParticipationMapper')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $participationTextMapper = $this->getMockBuilder('OCA\Polls\Db\ParticipationTextMapper')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $textMapper = $this->getMockBuilder('OCA\Polls\Db\TextMapper')
+            ->disableOriginalConstructor()
+            ->getMock();
 
-		$this->controller = new PageController(
-			'polls',
-			$request,
-			$userManager,
-			$groupManager,
-			$avatarManager,
-			$logger,
-			$l10n,
-			$urlGenerator,
-			$this->userId,
-			$commentMapper,
-			$dateMapper,
-			$eventMapper,
-			$notificationMapper,
-			$participationMapper,
-			$participationTextMapper,
-			$textMapper
-		);
-	}
+        $this->controller = new PageController(
+            'polls',
+            $request,
+            $userManager,
+            $groupManager,
+            $avatarManager,
+            $logger,
+            $l10n,
+            $urlGenerator,
+            $this->userId,
+            $commentMapper,
+            $dateMapper,
+            $eventMapper,
+            $notificationMapper,
+            $participationMapper,
+            $participationTextMapper,
+            $textMapper
+        );
+    }
 
-	/**
-	 *
-	 */
-	public function testIndex() {
-		$result = $this->controller->index();
+    /**
+     *
+     */
+    public function testIndex() {
+        $result = $this->controller->index();
 
-		$this->assertEquals('main.tmpl', $result->getTemplateName());
-		$this->assertTrue($result instanceof TemplateResponse);
-	}
+        $this->assertEquals('main.tmpl', $result->getTemplateName());
+        $this->assertTrue($result instanceof TemplateResponse);
+    }
 }

tests/Unit/Factories/EventFactory.php

Indentation +16 added lines, -16 removed lines

@@ -27,20 +27,20 @@
  * General factory for the event model.
  */
 $fm->define('OCA\Polls\Db\Event')->setDefinitions([
-	'type' => 0,
-	'title' => Faker::sentence(10),
-	'description' => Faker::paragraph(),
-	'owner' => Faker::firstNameMale(),
-	'created' => function () {
-		$date = new DateTime( 'today');
-		return $date->format('Y-m-d H:i:s');
-	},
-	'access' => 'registered',
-	'expire' => function () {
-		$date = new DateTime( 'tomorrow');
-		return $date->format('Y-m-d H:i:s');
-	},
-	'hash' => Faker::regexify('[A-Za-z0-9]{16}'),
-	'isAnonymous' => 0,
-	'fullAnonymous' => 0
+    'type' => 0,
+    'title' => Faker::sentence(10),
+    'description' => Faker::paragraph(),
+    'owner' => Faker::firstNameMale(),
+    'created' => function () {
+        $date = new DateTime( 'today');
+        return $date->format('Y-m-d H:i:s');
+    },
+    'access' => 'registered',
+    'expire' => function () {
+        $date = new DateTime( 'tomorrow');
+        return $date->format('Y-m-d H:i:s');
+    },
+    'hash' => Faker::regexify('[A-Za-z0-9]{16}'),
+    'isAnonymous' => 0,
+    'fullAnonymous' => 0
 ]);

tests/Unit/Factories/CommentFactory.php

Indentation +6 added lines, -6 removed lines

@@ -27,10 +27,10 @@
  * General factory for the comment model.
  */
 $fm->define('OCA\Polls\Db\Comment')->setDefinitions([
-	'userId' => Faker::firstNameMale(),
-	'dt' => function () {
-		$date = new DateTime( 'today');
-		return $date->format('Y-m-d H:i:s');
-	},
-	'comment' => Faker::paragraph()
+    'userId' => Faker::firstNameMale(),
+    'dt' => function () {
+        $date = new DateTime( 'today');
+        return $date->format('Y-m-d H:i:s');
+    },
+    'comment' => Faker::paragraph()
 ]);

tests/Unit/Db/CommentMapperTest.php

Indentation +58 added lines, -58 removed lines

@@ -35,71 +35,71 @@
 
 class CommentMapperTest extends PHPUnit_Framework_TestCase {
 
-	/** @var IDBConnection */
-	private $con;
-	/** @var CommentMapper */
-	private $commentMapper;
-	/** @var EventMapper */
-	private $eventMapper;
-	/** @var FactoryMuffin */
-	private	$fm;
+    /** @var IDBConnection */
+    private $con;
+    /** @var CommentMapper */
+    private $commentMapper;
+    /** @var EventMapper */
+    private $eventMapper;
+    /** @var FactoryMuffin */
+    private	$fm;
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function setUp() {
-		parent::setUp();
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp() {
+        parent::setUp();
 
-		$this->con = \OC::$server->getDatabaseConnection();
-		$this->commentMapper = new CommentMapper($this->con);
-		$this->eventMapper = new EventMapper($this->con);
+        $this->con = \OC::$server->getDatabaseConnection();
+        $this->commentMapper = new CommentMapper($this->con);
+        $this->eventMapper = new EventMapper($this->con);
 
-		$this->fm = new FactoryMuffin();
-		$this->fm->loadFactories(__DIR__ . '/../Factories');
-	}
+        $this->fm = new FactoryMuffin();
+        $this->fm->loadFactories(__DIR__ . '/../Factories');
+    }
 
-	/**
-	 * Test the creation of an event and a comment object and save them to the database.
-	 *
-	 * @return Comment
-	 */
-	public function testCreate() {
-		/** @var Event $event */
-		$event = $this->fm->instance('OCA\Polls\Db\Event');
-		$this->assertInstanceOf(Event::class, $this->eventMapper->insert($event));
+    /**
+     * Test the creation of an event and a comment object and save them to the database.
+     *
+     * @return Comment
+     */
+    public function testCreate() {
+        /** @var Event $event */
+        $event = $this->fm->instance('OCA\Polls\Db\Event');
+        $this->assertInstanceOf(Event::class, $this->eventMapper->insert($event));
 
-		/** @var Comment $comment */
-		$comment = $this->fm->instance('OCA\Polls\Db\Comment');
-		$comment->setPollId($event->getId());
-		$this->assertInstanceOf(Comment::class, $this->commentMapper->insert($comment));
+        /** @var Comment $comment */
+        $comment = $this->fm->instance('OCA\Polls\Db\Comment');
+        $comment->setPollId($event->getId());
+        $this->assertInstanceOf(Comment::class, $this->commentMapper->insert($comment));
 
-		return $comment;
-	}
+        return $comment;
+    }
 
-	/**
-	 * Update the previously created comment.
-	 *
-	 * @depends testCreate
-	 * @param Comment $comment
-	 * @return Comment
-	 */
-	public function testUpdate(Comment $comment) {
-		$newComment = Faker::paragraph();
-		$comment->setComment($newComment());
-		$this->commentMapper->update($comment);
+    /**
+     * Update the previously created comment.
+     *
+     * @depends testCreate
+     * @param Comment $comment
+     * @return Comment
+     */
+    public function testUpdate(Comment $comment) {
+        $newComment = Faker::paragraph();
+        $comment->setComment($newComment());
+        $this->commentMapper->update($comment);
 
-		return $comment;
-	}
+        return $comment;
+    }
 
-	/**
-	 * Delete the previously created entries from the database.
-	 *
-	 * @depends testUpdate
-	 * @param Comment $comment
-	 */
-	public function testDelete(Comment $comment) {
-		$event = $this->eventMapper->find($comment->getPollId());
-		$this->commentMapper->delete($comment);
-		$this->eventMapper->delete($event);
-	}
+    /**
+     * Delete the previously created entries from the database.
+     *
+     * @depends testUpdate
+     * @param Comment $comment
+     */
+    public function testDelete(Comment $comment) {
+        $event = $this->eventMapper->find($comment->getPollId());
+        $this->commentMapper->delete($comment);
+        $this->eventMapper->delete($event);
+    }
 }