added fixed-rate and hourly-rate for customer, project and activity (#304)

src/Controller/AbstractController.php

@@ -10,7 +10,7 @@
 namespace App\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use Symfony\Component\Translation\DataCollectorTranslator;
 
 /**
  * The abstract base controller.
@@ -27,29 +27,13 @@ abstract class AbstractController extends Controller
     public const ROLE_ADMIN = 'ROLE_ADMIN';
 
     /**
-     * @return object|\Symfony\Component\Translation\DataCollectorTranslator|\Symfony\Component\Translation\IdentityTranslator
+     * @return DataCollectorTranslator
      */
-    protected function getTranslator()
+    private function getTranslator()
     {
         return $this->container->get('translator');
     }
 
-    /**
-     * A translated helper for denyAccessUnlessGranted()
-     *
-     * @param mixed $attributes
-     * @param mixed $subject
-     * @param string $translation
-     * @param array $parameter
-     * @throws AccessDeniedException
-     */
-    protected function denyUnlessGranted($attributes, $subject = null, $translation = 'access.denied', $parameter = [])
-    {
-        $error = $this->getTranslator()->trans($translation, $parameter, self::DOMAIN_ERROR);
-        // TODO try & catch and add to audit log?
-        $this->denyAccessUnlessGranted($attributes, $subject, $error);
-    }
-
     /**
      * Adds a "successful" flash message to the stack.
      *
@@ -72,7 +56,7 @@ abstract class AbstractController extends Controller
     /**
      * Adds a "warning" flash message to the stack.
      *
-     * @param $translationKey
+     * @param string $translationKey
      * @param array $parameter
      */
     protected function flashWarning($translationKey, $parameter = [])
@@ -91,7 +75,7 @@ abstract class AbstractController extends Controller
     /**
      * Adds a "error" flash message to the stack.
      *
-     * @param $translationKey
+     * @param string $translationKey
      * @param array $parameter
      */
     protected function flashError($translationKey, $parameter = [])

src/Controller/ActivityController.php

@@ -13,6 +13,7 @@ use App\Entity\Activity;
 use App\Repository\ActivityRepository;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Response;
 
 /**
  * Controller used to manage activity contents in the public part of the site.
@@ -32,7 +33,7 @@ class ActivityController extends Controller
     /**
      * The flyout to render recent activities and quick-start new recordings.
      *
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @return Response
      */
     public function recentActivitiesAction()
     {

src/Controller/ProfileController.php

@@ -70,7 +70,7 @@ class ProfileController extends AbstractController
 
             $this->flashSuccess('action.update.success');
 
-            return $this->redirectToRoute('user_profile', ['username' => $profile->getUsername()]);
+            return $this->redirectToRoute('user_profile_edit', ['username' => $profile->getUsername()]);
         }
 
         return $this->getProfileView($profile, 'settings', $form);
@@ -95,7 +95,7 @@ class ProfileController extends AbstractController
 
             $this->flashSuccess('action.update.success');
 
-            return $this->redirectToRoute('user_profile', ['username' => $profile->getUsername()]);
+            return $this->redirectToRoute('user_profile_password', ['username' => $profile->getUsername()]);
         }
 
         return $this->getProfileView($profile, 'password', null, $form);
@@ -120,7 +120,7 @@ class ProfileController extends AbstractController
 
             $this->flashSuccess('action.update.success');
 
-            return $this->redirectToRoute('user_profile', ['username' => $profile->getUsername()]);
+            return $this->redirectToRoute('user_profile_api_token', ['username' => $profile->getUsername()]);
         }
 
         return $this->getProfileView($profile, 'api-token', null, null, null, null, $form);
@@ -142,7 +142,7 @@ class ProfileController extends AbstractController
 
             $this->flashSuccess('action.update.success');
 
-            return $this->redirectToRoute('user_profile', ['username' => $profile->getUsername()]);
+            return $this->redirectToRoute('user_profile_roles', ['username' => $profile->getUsername()]);
         }
 
         return $this->getProfileView($profile, 'roles', null, null, $form);
@@ -186,7 +186,7 @@ class ProfileController extends AbstractController
 
             $this->flashSuccess('action.update.success');
 
-            return $this->redirectToRoute('user_profile', ['username' => $profile->getUsername()]);
+            return $this->redirectToRoute('user_profile_preferences', ['username' => $profile->getUsername()]);
         }
 
         return $this->getProfileView($profile, 'preferences', null, null, null, $form);

src/Controller/TimesheetController.php

@@ -99,7 +99,7 @@ class TimesheetController extends AbstractController
     }
 
     /**
-     * The route to stop a running entry.
+     * The route to start a running entry.
      *
      * @Route(path="/start/{id}", name="timesheet_start", requirements={"id" = "\d+"}, methods={"GET", "POST"})
      * @Security("is_granted('start', activity)")