jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

improved code styles #158 (#172)

Browse Source 
* use php-cs-fixer instead of phpcodesniffer
* updated scrutinizer config
* adjusted code yules to all files
* updated CONTRIBUTING guidelines
This commit is contained in:
Kevin Papst
2018-06-22 21:09:10 +02:00
committed by GitHub
parent 773d27bb0e
commit cd7cbeae88
142 changed files with 775 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Repository/AbstractRepository.php
View File

@@ -9,12 +9,7 @@
namespace App\Repository;
use App\Repository\Query\BaseQuery;
use Doctrine\ORM\EntityRepository;
use Doctrine\ORM\Query;
use Doctrine\ORM\QueryBuilder;
use Pagerfanta\Adapter\DoctrineORMAdapter;
use Pagerfanta\Pagerfanta;
/**
* Class AbstractRepository

18
src/Repository/ActivityRepository.php
View File

@@ -21,7 +21,6 @@ use App\Repository\Query\ActivityQuery;
*/
class ActivityRepository extends AbstractRepository
{
/**
* @param $id
* @return null|Activity
@@ -55,12 +54,12 @@ class ActivityRepository extends AbstractRepository
->setMaxResults(10)
;
if ($user !== null) {
if (null !== $user) {
$qb->andWhere('t.user = :user')
->setParameter('user', $user);
}
if ($startFrom !== null) {
if (null !== $startFrom) {
$qb->andWhere($qb->expr()->gt('t.begin', ':begin'))
->setParameter('begin', $startFrom);
}
@@ -85,7 +84,7 @@ class ActivityRepository extends AbstractRepository
public function getGlobalStatistics()
{
$countAll = $this->getEntityManager()
->createQuery('SELECT COUNT(a.id) FROM '.Activity::class.' a')
->createQuery('SELECT COUNT(a.id) FROM ' . Activity::class . ' a')
->getSingleScalarResult();
$stats = new ActivityStatistic();
@@ -135,6 +134,7 @@ class ActivityRepository extends AbstractRepository
$query = new ActivityQuery();
$query->setHiddenEntity($entity);
$query->setResultType(ActivityQuery::RESULT_TYPE_QUERYBUILDER);
return $this->findByQuery($query);
}
@@ -152,7 +152,7 @@ class ActivityRepository extends AbstractRepository
->join('p.customer', 'c')
->orderBy('a.' . $query->getOrderBy(), $query->getOrder());
if ($query->getVisibility() == ActivityQuery::SHOW_VISIBLE) {
if (ActivityQuery::SHOW_VISIBLE == $query->getVisibility()) {
if (!$query->isExclusiveVisibility()) {
$qb->andWhere('c.visible = 1');
$qb->andWhere('p.visible = 1');
@@ -161,17 +161,17 @@ class ActivityRepository extends AbstractRepository
/** @var Activity $entity */
$entity = $query->getHiddenEntity();
if ($entity !== null) {
if (null !== $entity) {
$qb->orWhere('a.id = :activity')->setParameter('activity', $entity);
}
} elseif ($query->getVisibility() == ActivityQuery::SHOW_HIDDEN) {
} elseif (ActivityQuery::SHOW_HIDDEN == $query->getVisibility()) {
$qb->andWhere('a.visible = 0');
}
if ($query->getProject() !== null) {
if (null !== $query->getProject()) {
$qb->andWhere('a.project = :project')
->setParameter('project', $query->getProject());
} elseif ($query->getCustomer() !== null) {
} elseif (null !== $query->getCustomer()) {
$qb->andWhere('p.customer = :customer')
->setParameter('customer', $query->getCustomer());
}

11
src/Repository/CustomerRepository.php
View File

@@ -22,7 +22,6 @@ use App\Repository\Query\CustomerQuery;
*/
class CustomerRepository extends AbstractRepository
{
/**
* @param $id
* @return null|Customer
@@ -41,11 +40,12 @@ class CustomerRepository extends AbstractRepository
public function getGlobalStatistics()
{
$countAll = $this->getEntityManager()
->createQuery('SELECT COUNT(c.id) FROM '.Customer::class.' c')
->createQuery('SELECT COUNT(c.id) FROM ' . Customer::class . ' c')
->getSingleScalarResult();
$stats = new CustomerStatistic();
$stats->setCount($countAll);
return $stats;
}
@@ -101,6 +101,7 @@ class CustomerRepository extends AbstractRepository
$query = new CustomerQuery();
$query->setHiddenEntity($entity);
$query->setResultType(CustomerQuery::RESULT_TYPE_QUERYBUILDER);
return $this->findByQuery($query);
}
@@ -116,15 +117,15 @@ class CustomerRepository extends AbstractRepository
->from(Customer::class, 'c')
->orderBy('c.' . $query->getOrderBy(), $query->getOrder());
if ($query->getVisibility() == CustomerQuery::SHOW_VISIBLE) {
if (CustomerQuery::SHOW_VISIBLE == $query->getVisibility()) {
$qb->andWhere('c.visible = 1');
/** @var Customer $entity */
$entity = $query->getHiddenEntity();
if ($entity!== null) {
if (null !== $entity) {
$qb->orWhere('c.id = :customer')->setParameter('customer', $entity);
}
} elseif ($query->getVisibility() == CustomerQuery::SHOW_HIDDEN) {
} elseif (CustomerQuery::SHOW_HIDDEN == $query->getVisibility()) {
$qb->andWhere('c.visible = 0');
}

1
src/Repository/InvoiceTemplateRepository.php
View File

@@ -18,7 +18,6 @@ use Doctrine\ORM\Query;
*/
class InvoiceTemplateRepository extends AbstractRepository
{
/**
* @return bool
*/

13
src/Repository/ProjectRepository.php
View File

@@ -21,7 +21,6 @@ use App\Repository\Query\ProjectQuery;
*/
class ProjectRepository extends AbstractRepository
{
/**
* @param $id
* @return null|Project
@@ -40,11 +39,12 @@ class ProjectRepository extends AbstractRepository
public function getGlobalStatistics()
{
$countAll = $this->getEntityManager()
->createQuery('SELECT COUNT(p.id) FROM '.Project::class.' p')
->createQuery('SELECT COUNT(p.id) FROM ' . Project::class . ' p')
->getSingleScalarResult();
$stats = new ProjectStatistic();
$stats->setCount($countAll);
return $stats;
}
@@ -94,6 +94,7 @@ class ProjectRepository extends AbstractRepository
$query = new ProjectQuery();
$query->setHiddenEntity($entity);
$query->setResultType(ProjectQuery::RESULT_TYPE_QUERYBUILDER);
return $this->findByQuery($query);
}
@@ -112,7 +113,7 @@ class ProjectRepository extends AbstractRepository
->join('p.customer', 'c')
->orderBy('p.' . $query->getOrderBy(), $query->getOrder());
if ($query->getVisibility() == ProjectQuery::SHOW_VISIBLE) {
if (ProjectQuery::SHOW_VISIBLE == $query->getVisibility()) {
if (!$query->isExclusiveVisibility()) {
$qb->andWhere('c.visible = 1');
}
@@ -120,17 +121,17 @@ class ProjectRepository extends AbstractRepository
/** @var Project $entity */
$entity = $query->getHiddenEntity();
if ($entity !== null) {
if (null !== $entity) {
$qb->orWhere('p.id = :project')->setParameter('project', $entity);
}
// TODO check for visibility of customer
} elseif ($query->getVisibility() == ProjectQuery::SHOW_HIDDEN) {
} elseif (ProjectQuery::SHOW_HIDDEN == $query->getVisibility()) {
$qb->andWhere('p.visible = 0');
// TODO check for visibility of customer
}
if ($query->getCustomer() !== null) {
if (null !== $query->getCustomer()) {
$qb->andWhere('p.customer = :customer')
->setParameter('customer', $query->getCustomer());
}

3
src/Repository/Query/ActivityQuery.php
View File

@@ -9,7 +9,6 @@
namespace App\Repository\Query;
use App\Entity\Customer;
use App\Entity\Project;
/**
@@ -17,7 +16,6 @@ use App\Entity\Project;
*/
class ActivityQuery extends ProjectQuery
{
/**
* @var Project
*/
@@ -38,6 +36,7 @@ class ActivityQuery extends ProjectQuery
public function setProject(Project $project = null)
{
$this->project = $project;
return $this;
}
}

30
src/Repository/Query/BaseQuery.php
View File

@@ -14,17 +14,17 @@ namespace App\Repository\Query;
*/
class BaseQuery
{
const ORDER_ASC = 'ASC';
const ORDER_DESC = 'DESC';
public const ORDER_ASC = 'ASC';
public const ORDER_DESC = 'DESC';
const DEFAULT_PAGESIZE = 25;
const DEFAULT_PAGE = 1;
public const DEFAULT_PAGESIZE = 25;
public const DEFAULT_PAGE = 1;
const RESULT_TYPE_PAGER = 'PagerFanta';
const RESULT_TYPE_QUERYBUILDER = 'QueryBuilder';
public const RESULT_TYPE_PAGER = 'PagerFanta';
public const RESULT_TYPE_QUERYBUILDER = 'QueryBuilder';
/**
* @var \stdClass
* @var object
*/
protected $hiddenEntity;
/**
@@ -62,7 +62,8 @@ class BaseQuery
*/
public function setPage($page)
{
$this->page = (int)$page;
$this->page = (int) $page;
return $this;
}
@@ -80,9 +81,10 @@ class BaseQuery
*/
public function setPageSize($pageSize)
{
if (!empty($pageSize) && (int)$pageSize > 0) {
$this->pageSize = (int)$pageSize;
if (!empty($pageSize) && (int) $pageSize > 0) {
$this->pageSize = (int) $pageSize;
}
return $this;
}
@@ -103,6 +105,7 @@ class BaseQuery
public function setOrderBy($orderBy)
{
$this->orderBy = $orderBy;
return $this;
}
@@ -123,6 +126,7 @@ class BaseQuery
if (in_array($order, [self::ORDER_ASC, self::ORDER_DESC])) {
$this->order = $order;
}
return $this;
}
@@ -143,11 +147,12 @@ class BaseQuery
if (in_array($resultType, [self::RESULT_TYPE_PAGER, self::RESULT_TYPE_QUERYBUILDER])) {
$this->resultType = $resultType;
}
return $this;
}
/**
* @return \stdClass
* @return object
*/
public function getHiddenEntity()
{
@@ -155,12 +160,13 @@ class BaseQuery
}
/**
* @param \stdClass $hiddenEntity
* @param object $hiddenEntity
* @return BaseQuery
*/
public function setHiddenEntity($hiddenEntity)
{
$this->hiddenEntity = $hiddenEntity;
return $this;
}
}

3
src/Repository/Query/InvoiceQuery.php
View File

@@ -16,7 +16,6 @@ use App\Entity\InvoiceTemplate;
*/
class InvoiceQuery extends TimesheetQuery
{
/**
* @var InvoiceTemplate
*/
@@ -42,6 +41,7 @@ class InvoiceQuery extends TimesheetQuery
public function setTemplate($template)
{
$this->template = $template;
return $this;
}
@@ -60,6 +60,7 @@ class InvoiceQuery extends TimesheetQuery
public function setTemplates(array $templates)
{
$this->templates = $templates;
return $this;
}
}

2
src/Repository/Query/ProjectQuery.php
View File

@@ -16,7 +16,6 @@ use App\Entity\Customer;
*/
class ProjectQuery extends VisibilityQuery
{
/**
* @var Customer
*/
@@ -37,6 +36,7 @@ class ProjectQuery extends VisibilityQuery
public function setCustomer(Customer $customer = null)
{
$this->customer = $customer;
return $this;
}
}

13
src/Repository/Query/TimesheetQuery.php
View File

@@ -10,19 +10,16 @@
namespace App\Repository\Query;
use App\Entity\User;
use App\Repository\Query\BaseQuery;
use App\Entity\Activity;
use App\Entity\Customer;
use App\Entity\Project;
/**
* Can be used for advanced timesheet repository queries.
*/
class TimesheetQuery extends ActivityQuery
{
const STATE_ALL = 1;
const STATE_RUNNING = 2;
const STATE_STOPPED = 3;
public const STATE_ALL = 1;
public const STATE_RUNNING = 2;
public const STATE_STOPPED = 3;
/**
* Overwritten for different default order
@@ -70,6 +67,7 @@ class TimesheetQuery extends ActivityQuery
public function setUser(User $user = null)
{
$this->user = $user;
return $this;
}
@@ -90,6 +88,7 @@ class TimesheetQuery extends ActivityQuery
public function setActivity(Activity $activity = null)
{
$this->activity = $activity;
return $this;
}
@@ -134,6 +133,7 @@ class TimesheetQuery extends ActivityQuery
public function setBegin($begin)
{
$this->begin = $begin;
return $this;
}
@@ -152,6 +152,7 @@ class TimesheetQuery extends ActivityQuery
public function setEnd($end)
{
$this->end = $end;
return $this;
}
}

4
src/Repository/Query/UserQuery.php
View File

@@ -14,7 +14,6 @@ namespace App\Repository\Query;
*/
class UserQuery extends VisibilityQuery
{
/**
* @var string
*/
@@ -34,9 +33,10 @@ class UserQuery extends VisibilityQuery
*/
public function setRole($role)
{
if (strpos($role, 'ROLE_') !== false || $role === null) {
if (false !== strpos($role, 'ROLE_') || null === $role) {
$this->role = $role;
}
return $this;
}
}

9
src/Repository/Query/VisibilityQuery.php
View File

@@ -14,12 +14,12 @@ namespace App\Repository\Query;
*/
class VisibilityQuery extends BaseQuery
{
const SHOW_VISIBLE = 1;
const SHOW_HIDDEN = 2;
const SHOW_BOTH = 3;
public const SHOW_VISIBLE = 1;
public const SHOW_HIDDEN = 2;
public const SHOW_BOTH = 3;
/**
* @var integer
* @var int
*/
protected $visibility = self::SHOW_VISIBLE;
/**
@@ -70,6 +70,7 @@ class VisibilityQuery extends BaseQuery
public function setExclusiveVisibility($exclusiveVisibility)
{
$this->exclusiveVisibility = (bool) $exclusiveVisibility;
return $this;
}
}

2
src/Repository/RepositoryTrait.php
View File

@@ -27,7 +27,7 @@ trait RepositoryTrait
*/
protected function getBaseQueryResult(QueryBuilder $qb, BaseQuery $query)
{
if ($query->getResultType() == BaseQuery::RESULT_TYPE_PAGER) {
if (BaseQuery::RESULT_TYPE_PAGER == $query->getResultType()) {
return $this->getPager($qb->getQuery(), $query->getPage(), $query->getPageSize());
}

31
src/Repository/TimesheetRepository.php
View File

@@ -27,7 +27,6 @@ use App\Repository\Query\TimesheetQuery;
*/
class TimesheetRepository extends AbstractRepository
{
/**
* @param Timesheet $entry
* @return bool
@@ -119,11 +118,11 @@ class TimesheetRepository extends AbstractRepository
public function getUserStatistics(User $user)
{
$durationTotal = $this->getEntityManager()
->createQuery('SELECT SUM(t.duration) FROM '.Timesheet::class.' t WHERE t.user = :user')
->createQuery('SELECT SUM(t.duration) FROM ' . Timesheet::class . ' t WHERE t.user = :user')
->setParameter('user', $user)
->getSingleScalarResult();
$rateTotal = $this->getEntityManager()
->createQuery('SELECT SUM(t.rate) FROM '.Timesheet::class.' t WHERE t.user = :user')
->createQuery('SELECT SUM(t.rate) FROM ' . Timesheet::class . ' t WHERE t.user = :user')
->setParameter('user', $user)
->getSingleScalarResult();
$amountMonth = $this->queryThisMonth('SUM(t.rate)', $user)
@@ -133,7 +132,7 @@ class TimesheetRepository extends AbstractRepository
->getQuery()
->getSingleScalarResult();
$firstEntry = $this->getEntityManager()
->createQuery('SELECT MIN(t.begin) FROM '.Timesheet::class.' t WHERE t.user = :user')
->createQuery('SELECT MIN(t.begin) FROM ' . Timesheet::class . ' t WHERE t.user = :user')
->setParameter('user', $user)
->getSingleScalarResult();
@@ -178,7 +177,7 @@ class TimesheetRepository extends AbstractRepository
if (!isset($years[$curYear])) {
$year = new Year($curYear);
for ($i = 1; $i < 13; $i++) {
$month = $i < 10 ? '0' . $i : (string)$i;
$month = $i < 10 ? '0' . $i : (string) $i;
$year->setMonth(new Month($month));
}
$years[$curYear] = $year;
@@ -202,13 +201,13 @@ class TimesheetRepository extends AbstractRepository
public function getGlobalStatistics()
{
$durationTotal = $this->getEntityManager()
->createQuery('SELECT SUM(t.duration) FROM '.Timesheet::class.' t')
->createQuery('SELECT SUM(t.duration) FROM ' . Timesheet::class . ' t')
->getSingleScalarResult();
$rateTotal = $this->getEntityManager()
->createQuery('SELECT SUM(t.rate) FROM '.Timesheet::class.' t')
->createQuery('SELECT SUM(t.rate) FROM ' . Timesheet::class . ' t')
->getSingleScalarResult();
$userTotal = $this->getEntityManager()
->createQuery('SELECT COUNT(DISTINCT(t.user)) FROM '.Timesheet::class.' t')
->createQuery('SELECT COUNT(DISTINCT(t.user)) FROM ' . Timesheet::class . ' t')
->getSingleScalarResult();
$activeNow = $this->getActiveEntries();
$amountMonth = $this->queryThisMonth('SUM(t.rate)')
@@ -278,33 +277,33 @@ class TimesheetRepository extends AbstractRepository
->join('p.customer', 'c')
->orderBy('t.' . $query->getOrderBy(), $query->getOrder());
if ($query->getUser() !== null) {
if (null !== $query->getUser()) {
$qb->andWhere('t.user = :user')
->setParameter('user', $query->getUser());
}
if ($query->getState() == TimesheetQuery::STATE_RUNNING) {
if (TimesheetQuery::STATE_RUNNING == $query->getState()) {
$qb->andWhere($qb->expr()->isNull('t.end'));
} elseif ($query->getState() == TimesheetQuery::STATE_STOPPED) {
} elseif (TimesheetQuery::STATE_STOPPED == $query->getState()) {
$qb->andWhere($qb->expr()->isNotNull('t.end'));
}
if ($query->getBegin() !== null) {
if (null !== $query->getBegin()) {
$qb->andWhere('t.begin >= :begin')
->setParameter('begin', $query->getBegin());
}
if ($query->getEnd() !== null) {
if (null !== $query->getEnd()) {
$qb->andWhere('t.end <= :end')
->setParameter('end', $query->getEnd());
}
if ($query->getActivity() !== null) {
if (null !== $query->getActivity()) {
$qb->andWhere('t.activity = :activity')
->setParameter('activity', $query->getActivity());
} elseif ($query->getProject() !== null) {
} elseif (null !== $query->getProject()) {
$qb->andWhere('a.project = :project')
->setParameter('project', $query->getProject());
} elseif ($query->getCustomer() !== null) {
} elseif (null !== $query->getCustomer()) {
$qb->andWhere('p.customer = :customer')
->setParameter('customer', $query->getCustomer());
}

7
src/Repository/UserRepository.php
View File

@@ -37,11 +37,12 @@ class UserRepository extends AbstractRepository implements UserLoaderInterface
public function getGlobalStatistics()
{
$countAll = $this->getEntityManager()
->createQuery('SELECT COUNT(u.id) FROM '.User::class.' u')
->createQuery('SELECT COUNT(u.id) FROM ' . User::class . ' u')
->getSingleScalarResult();
$stats = new UserStatistic();
$stats->setTotalAmount($countAll);
return $stats;
}
@@ -58,9 +59,9 @@ class UserRepository extends AbstractRepository implements UserLoaderInterface
->from(User::class, 'u')
->orderBy('u.' . $query->getOrderBy(), $query->getOrder());
if ($query->getVisibility() == UserQuery::SHOW_VISIBLE) {
if (UserQuery::SHOW_VISIBLE == $query->getVisibility()) {
$qb->andWhere('u.active = 1');
} elseif ($query->getVisibility() == UserQuery::SHOW_HIDDEN) {
} elseif (UserQuery::SHOW_HIDDEN == $query->getVisibility()) {
$qb->andWhere('u.active = 0');
}