Developer improvements, PhpCs, PhpUnit #42 (#43)

* improved dev fixtures with more diversity, more data, better testcases, user avatars #42
* added customer stats to dashboard, fixed column length for 3 widgets #42
* fixed empty alias - display empty message for new user #42
* unified-ui for "new" toolbar icon #42
* use kimai2_ as database prefix #42
* added customer stats to dashboard, fixed column length for 3 widgets #42
* fix long project/customer names in "currently active" navbar flyout" #42
* added services config for dev environment #42
* added command to run unit tests #42
* added command to run integration tests #42
* added command to run code sniffer #42
* added phpcs and phpunit to composer #42
* created tests directory #42
* fixed code sniffer warnings #42
* added function to switch result type from Pagerfanta to QueryBuilder #42
* dramatically reduced database calls by using custom joined query #42
* added command to install kimai dependencies #42
* added dev:reset command #42

src/TimesheetBundle/Controller/ActivityController.php

@@ -44,7 +44,8 @@ class ActivityController extends Controller
     public function recentActivitiesAction()
     {
         $user = $this->getUser();
-        $activeEntries = $this->getRepository()->getRecentActivities($user, new \DateTime('-30 days')); // TODO make days configurable
+        // TODO make days configurable
+        $activeEntries = $this->getRepository()->getRecentActivities($user, new \DateTime('-30 days'));
 
         return $this->render(
             'TimesheetBundle:Navbar:recent-activities.html.twig',

src/TimesheetBundle/Controller/Admin/ActivityController.php

@@ -14,14 +14,12 @@ namespace TimesheetBundle\Controller\Admin;
 use AppBundle\Controller\AbstractController;
 use Pagerfanta\Pagerfanta;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use TimesheetBundle\Entity\Activity;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
 use TimesheetBundle\Form\ActivityEditForm;
-use TimesheetBundle\Repository\ActivityRepository;
 use TimesheetBundle\Repository\Query\ActivityQuery;
 
 /**
@@ -89,9 +87,7 @@ class ActivityController extends AbstractController
 
             $this->flashSuccess('action.updated_successfully');
 
-            return $this->redirectToRoute(
-                'admin_activity', ['id' => $activity->getId()]
-            );
+            return $this->redirectToRoute('admin_activity', ['id' => $activity->getId()]);
         }
 
         return $this->render(
@@ -105,7 +101,7 @@ class ActivityController extends AbstractController
 
     /**
      * @param Activity $activity
-     * @return \Symfony\Component\Form\Form
+     * @return \Symfony\Component\Form\FormInterface
      */
     private function createEditForm(Activity $activity)
     {

src/TimesheetBundle/Controller/Admin/CustomerController.php

@@ -87,9 +87,7 @@ class CustomerController extends AbstractController
 
             $this->flashSuccess('action.updated_successfully');
 
-            return $this->redirectToRoute(
-                'admin_customer', ['id' => $customer->getId()]
-            );
+            return $this->redirectToRoute('admin_customer', ['id' => $customer->getId()]);
         }
 
         return $this->render(

src/TimesheetBundle/Controller/Admin/ProjectController.php

@@ -88,9 +88,7 @@ class ProjectController extends AbstractController
 
             $this->flashSuccess('action.updated_successfully');
 
-            return $this->redirectToRoute(
-                'admin_project', ['id' => $project->getId()]
-            );
+            return $this->redirectToRoute('admin_project', ['id' => $project->getId()]);
         }
 
         return $this->render(

src/TimesheetBundle/Controller/Admin/TimesheetController.php

@@ -34,10 +34,16 @@ class TimesheetController extends AbstractController
     use TimesheetControllerTrait;
 
     /**
+     * This route shows all users timesheet entries.
+     *
      * @Route("/", defaults={"page": 1}, name="admin_timesheet")
      * @Route("/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_timesheet_paginated")
      * @Method("GET")
      * @Cache(smaxage="10")
+     *
+     * @param $page
+     * @param Request $request
+     * @return \Symfony\Component\HttpFoundation\Response
      */
     public function indexAction($page, Request $request)
     {
@@ -62,10 +68,9 @@ class TimesheetController extends AbstractController
      * @Method({"GET"})
      *
      * @param Timesheet $entry
-     * @param Request $request
      * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
-    public function stopAction(Timesheet $entry, Request $request)
+    public function stopAction(Timesheet $entry)
     {
         try {
             $this->getRepository()->stopRecording($entry);

src/TimesheetBundle/Controller/TimesheetController.php

@@ -89,7 +89,13 @@ class TimesheetController extends AbstractController
 
         // make sure only ADMIN can stop other users entries
         if ($user->getId() !== $entry->getUser()->getId()) {
-            $this->denyUnlessGranted('ROLE_ADMIN', null, 'timesheet.access.denied', ['%user%' => $user->getId(), '%entry%' => $entry->getId()]);
+            // TODO move me to a voter
+            $this->denyUnlessGranted(
+                'ROLE_ADMIN',
+                null,
+                'timesheet.access.denied',
+                ['%user%' => $user->getId(), '%entry%' => $entry->getId()]
+            );
         }
 
         try {
@@ -141,7 +147,13 @@ class TimesheetController extends AbstractController
 
         // make sure only ADMIN can edit other users entries
         if ($user->getId() !== $entry->getUser()->getId()) {
-            $this->denyUnlessGranted('ROLE_ADMIN', null, 'timesheet.access.denied', ['%user%' => $user->getId(), '%entry%' => $entry->getId()]);
+            // TODO move me to a voter
+            $this->denyUnlessGranted(
+                'ROLE_ADMIN',
+                null,
+                'timesheet.access.denied',
+                ['%user%' => $user->getId(), '%entry%' => $entry->getId()]
+            );
         }
 
         $editForm = $this->createEditForm($entry, $request->get('page'));
@@ -155,9 +167,7 @@ class TimesheetController extends AbstractController
 
             $this->flashSuccess('action.updated_successfully');
 
-            return $this->redirectToRoute(
-                'timesheet_paginated', ['page' => $request->get('page')]
-            );
+            return $this->redirectToRoute('timesheet_paginated', ['page' => $request->get('page')]);
         }
 
         return $this->render(

src/TimesheetBundle/Controller/TimesheetControllerTrait.php

@@ -71,7 +71,7 @@ trait TimesheetControllerTrait
             } else {
                 $customer = null;
             }
-        } else if ($customer !== null) {
+        } elseif ($customer !== null) {
             $repo = $this->getDoctrine()->getRepository(Customer::class);
             $customer = $repo->getById($customer);
         }