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

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());
}