do not allow to stop already stopped timesheets (#289)

src/Repository/ActivityRepository.php

@@ -15,6 +15,8 @@ use App\Entity\User;
 use App\Model\ActivityStatistic;
 use App\Repository\Query\ActivityQuery;
 use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
+use Pagerfanta\Pagerfanta;
 
 /**
  * Class ActivityRepository
@@ -130,7 +132,7 @@ class ActivityRepository extends AbstractRepository
 
     /**
      * @param ActivityQuery $query
-     * @return \Doctrine\ORM\QueryBuilder|\Pagerfanta\Pagerfanta
+     * @return QueryBuilder|Pagerfanta|array
      */
     public function findByQuery(ActivityQuery $query)
     {

src/Repository/CustomerRepository.php

@@ -16,6 +16,8 @@ use App\Entity\Timesheet;
 use App\Model\CustomerStatistic;
 use App\Repository\Query\CustomerQuery;
 use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
+use Pagerfanta\Pagerfanta;
 
 /**
  * Class CustomerRepository
@@ -97,7 +99,7 @@ class CustomerRepository extends AbstractRepository
 
     /**
      * @param CustomerQuery $query
-     * @return \Doctrine\ORM\QueryBuilder|\Pagerfanta\Pagerfanta
+     * @return QueryBuilder|Pagerfanta|array
      */
     public function findByQuery(CustomerQuery $query)
     {

src/Repository/InvoiceTemplateRepository.php

@@ -12,6 +12,8 @@ namespace App\Repository;
 use App\Entity\InvoiceTemplate;
 use App\Repository\Query\BaseQuery;
 use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
+use Pagerfanta\Pagerfanta;
 
 /**
  * Class InvoiceTemplateRepository
@@ -40,7 +42,7 @@ class InvoiceTemplateRepository extends AbstractRepository
 
     /**
      * @param BaseQuery $query
-     * @return \Doctrine\ORM\QueryBuilder|\Pagerfanta\Pagerfanta
+     * @return QueryBuilder|Pagerfanta|array
      */
     public function findByQuery(BaseQuery $query)
     {

src/Repository/ProjectRepository.php

@@ -15,6 +15,8 @@ use App\Entity\Timesheet;
 use App\Model\ProjectStatistic;
 use App\Repository\Query\ProjectQuery;
 use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
+use Pagerfanta\Pagerfanta;
 
 /**
  * Class ProjectRepository
@@ -90,7 +92,7 @@ class ProjectRepository extends AbstractRepository
 
     /**
      * @param ProjectQuery $query
-     * @return \Doctrine\ORM\QueryBuilder|\Pagerfanta\Pagerfanta
+     * @return QueryBuilder|Pagerfanta|array
      */
     public function findByQuery(ProjectQuery $query)
     {

src/Repository/Query/BaseQuery.php

@@ -20,6 +20,7 @@ class BaseQuery
     public const DEFAULT_PAGESIZE = 25;
     public const DEFAULT_PAGE = 1;
 
+    public const RESULT_TYPE_OBJECTS = 'Objects';
     public const RESULT_TYPE_PAGER = 'PagerFanta';
     public const RESULT_TYPE_QUERYBUILDER = 'QueryBuilder';
 
@@ -141,13 +142,18 @@ class BaseQuery
     /**
      * @param string $resultType
      * @return $this
+     * @throws \InvalidArgumentException
      */
-    public function setResultType($resultType)
+    public function setResultType(string $resultType)
     {
-        if (in_array($resultType, [self::RESULT_TYPE_PAGER, self::RESULT_TYPE_QUERYBUILDER])) {
-            $this->resultType = $resultType;
+        $allowed = [self::RESULT_TYPE_PAGER, self::RESULT_TYPE_QUERYBUILDER, self::RESULT_TYPE_OBJECTS];
+
+        if (!in_array($resultType, $allowed)) {
+            throw new \InvalidArgumentException('Unsupported query result type');
         }
 
+        $this->resultType = $resultType;
+
         return $this;
     }
 

src/Repository/RepositoryException.php

@@ -0,0 +1,14 @@
+<?php
+
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Repository;
+
+class RepositoryException extends \Exception
+{
+}

src/Repository/RepositoryTrait.php

@@ -23,12 +23,14 @@ trait RepositoryTrait
     /**
      * @param QueryBuilder $qb
      * @param BaseQuery $query
-     * @return QueryBuilder|Pagerfanta
+     * @return QueryBuilder|Pagerfanta|array
      */
     protected function getBaseQueryResult(QueryBuilder $qb, BaseQuery $query)
     {
-        if (BaseQuery::RESULT_TYPE_PAGER == $query->getResultType()) {
+        if (BaseQuery::RESULT_TYPE_PAGER === $query->getResultType()) {
             return $this->getPager($qb->getQuery(), $query->getPage(), $query->getPageSize());
+        } elseif (BaseQuery::RESULT_TYPE_OBJECTS === $query->getResultType()) {
+            return $qb->getQuery()->execute();
         }
 
         return $qb;

src/Repository/TimesheetRepository.php

@@ -33,14 +33,20 @@ class TimesheetRepository extends AbstractRepository
     /**
      * @param Timesheet $entry
      * @return bool
+     * @throws RepositoryException
      * @throws \Doctrine\ORM\ORMException
      * @throws \Doctrine\ORM\OptimisticLockException
      */
     public function stopRecording(Timesheet $entry)
     {
+        if (null !== $entry->getEnd()) {
+            throw new RepositoryException('Timesheet entry already stopped');
+        }
+
         // seems to be necessary so Doctrine will recognize a changed timestamp
         $entry->setBegin(clone $entry->getBegin());
         $entry->setEnd(new DateTime());
+
         $entityManager = $this->getEntityManager();
         $entityManager->persist($entry);
         $entityManager->flush();
@@ -51,7 +57,7 @@ class TimesheetRepository extends AbstractRepository
     /**
      * @param User $user
      * @param Activity $activity
-     * @return bool
+     * @return Timesheet
      * @throws \Doctrine\ORM\ORMException
      * @throws \Doctrine\ORM\OptimisticLockException
      */
@@ -67,7 +73,7 @@ class TimesheetRepository extends AbstractRepository
         $entityManager->persist($entry);
         $entityManager->flush();
 
-        return true;
+        return $entry;
     }
 
     /**
@@ -279,7 +285,7 @@ class TimesheetRepository extends AbstractRepository
 
     /**
      * @param TimesheetQuery $query
-     * @return QueryBuilder|Pagerfanta
+     * @return QueryBuilder|Pagerfanta|array
      */
     public function findByQuery(TimesheetQuery $query)
     {

src/Repository/WidgetRepository.php

@@ -60,7 +60,7 @@ class WidgetRepository
         $begin = !empty($widget['begin']) ? new \DateTime($widget['begin']) : null;
         $end = !empty($widget['end']) ? new \DateTime($widget['end']) : null;
         $theUser = $widget['user'] ? $user : null;
-        $type = isset($widget['type']) ? $widget['type'] : Widget::TYPE_COUNTER;
+        $type = $widget['type'] ?? Widget::TYPE_COUNTER;
 
         $data = $this->repository->getStatistic($widget['query'], $begin, $end, $theUser);