Symfony update 4.1.4 (#290)

composer.json

@@ -16,7 +16,7 @@
         "kevinpapst/adminlte-bundle": "^2.0",
         "nelmio/api-doc-bundle": "^3.2",
         "ocramius/proxy-manager": "2.1.1",
-        "sensio/framework-extra-bundle": "^5.1",
+        "sensio/framework-extra-bundle": "^5.2",
         "symfony/asset": "^4.0",
         "symfony/console": "^4.0",
         "symfony/dotenv": "^4.0",

config/packages/sensio_framework_extra.yaml

@@ -0,0 +1,3 @@
+sensio_framework_extra:
+    router:
+        annotations: false

phpunit.xml.dist

@@ -17,6 +17,8 @@
         <env name="DATABASE_PREFIX" value="kimai2_" force="true"/>
         <!-- define your env variables for the test env here -->
 
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak_vendors"/>
+
         <!-- ###+ doctrine/doctrine-bundle ### -->
         <env name="DATABASE_URL" value="sqlite:///var/data/kimai_test.sqlite" force="true"/>
         <!-- ###- doctrine/doctrine-bundle ### -->

src/Controller/Admin/ActivityController.php

@@ -16,15 +16,14 @@ use App\Form\Toolbar\ActivityToolbarForm;
 use App\Repository\Query\ActivityQuery;
 use Pagerfanta\Pagerfanta;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * Controller used to manage activities in the admin part of the site.
  *
- * @Route("/admin/activity")
+ * @Route(path="/admin/activity")
  * @Security("is_granted('ROLE_ADMIN')")
  * @Security("is_granted('IS_AUTHENTICATED_FULLY')")
  */
@@ -39,9 +38,8 @@ class ActivityController extends AbstractController
     }
 
     /**
-     * @Route("/", defaults={"page": 1}, name="admin_activity")
-     * @Route("/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_activity_paginated")
-     * @Method("GET")
+     * @Route(path="/", defaults={"page": 1}, name="admin_activity", methods={"GET"})
+     * @Route(path="/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_activity_paginated", methods={"GET"})
      * @Cache(smaxage="10")
      */
     public function indexAction($page, Request $request)
@@ -68,8 +66,7 @@ class ActivityController extends AbstractController
     }
 
     /**
-     * @Route("/create", name="admin_activity_create")
-     * @Method({"GET", "POST"})
+     * @Route(path="/create", name="admin_activity_create", methods={"GET", "POST"})
      *
      * @param Request $request
      * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
@@ -80,8 +77,7 @@ class ActivityController extends AbstractController
     }
 
     /**
-     * @Route("/{id}/edit", name="admin_activity_edit")
-     * @Method({"GET", "POST"})
+     * @Route(path="/{id}/edit", name="admin_activity_edit", methods={"GET", "POST"})
      * @Security("is_granted('edit', activity)")
      *
      * @param Activity $activity
@@ -96,8 +92,7 @@ class ActivityController extends AbstractController
     /**
      * The route to delete an existing entry.
      *
-     * @Route("/{id}/delete", name="admin_activity_delete")
-     * @Method({"GET", "POST"})
+     * @Route(path="/{id}/delete", name="admin_activity_delete", methods={"GET", "POST"})
      * @Security("is_granted('delete', activity)")
      *
      * @param Activity $activity

src/Controller/Admin/CustomerController.php

@@ -15,15 +15,14 @@ use App\Form\CustomerEditForm;
 use App\Form\Toolbar\CustomerToolbarForm;
 use App\Repository\Query\CustomerQuery;
 use Pagerfanta\Pagerfanta;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * Controller used to manage activities in the admin part of the site.
  *
- * @Route("/admin/customer")
+ * @Route(path="/admin/customer")
  * @Security("is_granted('ROLE_ADMIN')")
  * @Security("is_granted('IS_AUTHENTICATED_FULLY')")
  */
@@ -38,9 +37,8 @@ class CustomerController extends AbstractController
     }
 
     /**
-     * @Route("/", defaults={"page": 1}, name="admin_customer")
-     * @Route("/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_customer_paginated")
-     * @Method("GET")
+     * @Route(path="/", defaults={"page": 1}, name="admin_customer", methods={"GET"})
+     * @Route(path="/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_customer_paginated", methods={"GET"})
      */
     public function indexAction($page, Request $request)
     {
@@ -65,8 +63,7 @@ class CustomerController extends AbstractController
     }
 
     /**
-     * @Route("/create", name="admin_customer_create")
-     * @Method({"GET", "POST"})
+     * @Route(path="/create", name="admin_customer_create", methods={"GET", "POST"})
      */
     public function createAction(Request $request)
     {
@@ -74,8 +71,7 @@ class CustomerController extends AbstractController
     }
 
     /**
-     * @Route("/{id}/edit", name="admin_customer_edit")
-     * @Method({"GET", "POST"})
+     * @Route(path="/{id}/edit", name="admin_customer_edit", methods={"GET", "POST"})
      * @Security("is_granted('edit', customer)")
      */
     public function editAction(Customer $customer, Request $request)
@@ -113,8 +109,7 @@ class CustomerController extends AbstractController
     /**
      * The route to delete an existing entry.
      *
-     * @Route("/{id}/delete", name="admin_customer_delete")
-     * @Method({"GET", "POST"})
+     * @Route(path="/{id}/delete", name="admin_customer_delete", methods={"GET", "POST"})
      * @Security("is_granted('delete', customer)")
      *
      * @param Customer $customer

src/Controller/Admin/ProjectController.php

@@ -17,15 +17,14 @@ use App\Form\Toolbar\ProjectToolbarForm;
 use App\Repository\Query\ProjectQuery;
 use Pagerfanta\Pagerfanta;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * Controller used to manage projects in the admin part of the site.
  *
- * @Route("/admin/project")
+ * @Route(path="/admin/project")
  * @Security("is_granted('ROLE_ADMIN')")
  * @Security("is_granted('IS_AUTHENTICATED_FULLY')")
  */
@@ -40,9 +39,8 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @Route("/", defaults={"page": 1}, name="admin_project")
-     * @Route("/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_project_paginated")
-     * @Method("GET")
+     * @Route(path="/", defaults={"page": 1}, name="admin_project", methods={"GET"})
+     * @Route(path="/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_project_paginated", methods={"GET"})
      * @Cache(smaxage="10")
      */
     public function indexAction($page, Request $request)
@@ -69,8 +67,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @Route("/create", name="admin_project_create")
-     * @Method({"GET", "POST"})
+     * @Route(path="/create", name="admin_project_create", methods={"GET", "POST"})
      */
     public function createAction(Request $request)
     {
@@ -78,8 +75,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @Route("/{id}/edit", name="admin_project_edit")
-     * @Method({"GET", "POST"})
+     * @Route(path="/{id}/edit", name="admin_project_edit", methods={"GET", "POST"})
      * @Security("is_granted('edit', project)")
      */
     public function editAction(Project $project, Request $request)
@@ -90,8 +86,7 @@ class ProjectController extends AbstractController
     /**
      * The route to delete an existing entry.
      *
-     * @Route("/{id}/delete", name="admin_project_delete")
-     * @Method({"GET", "POST"})
+     * @Route(path="/{id}/delete", name="admin_project_delete", methods={"GET", "POST"})
      * @Security("is_granted('delete', project)")
      *
      * @param Project $project

src/Controller/Admin/TimesheetController.php

@@ -16,15 +16,14 @@ use App\Form\TimesheetEditForm;
 use App\Form\Toolbar\TimesheetAdminToolbarForm;
 use App\Repository\Query\TimesheetQuery;
 use Pagerfanta\Pagerfanta;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * Controller used for manage timesheet entries in the admin part of the site.
  *
- * @Route("/team/timesheet")
+ * @Route(path="/team/timesheet")
  * @Security("is_granted('ROLE_TEAMLEAD')")
  * @Security("is_granted('IS_AUTHENTICATED_FULLY')")
  */
@@ -44,9 +43,8 @@ class TimesheetController extends AbstractController
     /**
      * 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")
+     * @Route(path="/", defaults={"page": 1}, name="admin_timesheet", methods={"GET"})
+     * @Route(path="/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_timesheet_paginated", methods={"GET"})
      *
      * @param $page
      * @param Request $request
@@ -78,8 +76,7 @@ class TimesheetController extends AbstractController
     /**
      * The route to stop a running entry.
      *
-     * @Route("/{id}/stop", name="admin_timesheet_stop")
-     * @Method({"GET"})
+     * @Route(path="/{id}/stop", name="admin_timesheet_stop", methods={"GET"})
      * @Security("is_granted('stop', entry)")
      *
      * @param Timesheet $entry
@@ -93,8 +90,7 @@ class TimesheetController extends AbstractController
     /**
      * The route to edit an existing entry.
      *
-     * @Route("/{id}/edit", name="admin_timesheet_edit")
-     * @Method({"GET", "POST"})
+     * @Route(path="/{id}/edit", name="admin_timesheet_edit", methods={"GET", "POST"})
      * @Security("is_granted('edit', entry)")
      *
      * @param Timesheet $entry
@@ -109,8 +105,7 @@ class TimesheetController extends AbstractController
     /**
      * The route to create a new entry by form.
      *
-     * @Route("/create", name="admin_timesheet_create")
-     * @Method({"GET", "POST"})
+     * @Route(path="/create", name="admin_timesheet_create", methods={"GET", "POST"})
      *
      * @param Request $request
      * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
@@ -123,8 +118,7 @@ class TimesheetController extends AbstractController
     /**
      * The route to delete an existing entry.
      *
-     * @Route("/{id}/delete", name="admin_timesheet_delete")
-     * @Method({"GET", "POST"})
+     * @Route(path="/{id}/delete", name="admin_timesheet_delete", methods={"GET", "POST"})
      * @Security("is_granted('delete', entry)")
      *
      * @param Timesheet $entry

src/Controller/Admin/UserController.php

@@ -16,16 +16,15 @@ use App\Form\Toolbar\UserToolbarForm;
 use App\Form\UserCreateType;
 use App\Repository\Query\UserQuery;
 use Pagerfanta\Pagerfanta;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
 
 /**
  * Controller used to manage users in the admin part of the site.
  *
- * @Route("/admin/user")
+ * @Route(path="/admin/user")
  * @Security("is_granted('ROLE_SUPER_ADMIN')")
  * @Security("is_granted('IS_AUTHENTICATED_FULLY')")
  */
@@ -53,9 +52,12 @@ class UserController extends AbstractController
     }
 
     /**
-     * @Route("/", defaults={"page": 1}, name="admin_user")
-     * @Route("/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_user_paginated")
-     * @Method("GET")
+     * @Route(path="/", defaults={"page": 1}, name="admin_user", methods={"GET"})
+     * @Route(path="/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_user_paginated", methods={"GET"})
+
+     * @param int $page
+     * @param Request $request
+     * @return \Symfony\Component\HttpFoundation\Response
      */
     public function indexAction($page, Request $request)
     {
@@ -80,8 +82,7 @@ class UserController extends AbstractController
     }
 
     /**
-     * @Route("/create", name="admin_user_create")
-     * @Method({"GET", "POST"})
+     * @Route(path="/create", name="admin_user_create", methods={"GET", "POST"})
      * @Security("is_granted('create', user)")
      */
     public function createAction(Request $request)
@@ -124,8 +125,7 @@ class UserController extends AbstractController
     /**
      * The route to delete an existing user.
      *
-     * @Route("/{id}/delete", name="admin_user_delete")
-     * @Method({"GET", "POST"})
+     * @Route(path="/{id}/delete", name="admin_user_delete", methods={"GET", "POST"})
      * @Security("is_granted('delete', userToDelete)")
      *
      * @param User $userToDelete

src/Controller/CalendarController.php

@@ -14,15 +14,14 @@ use App\Calendar\TimesheetEntity;
 use App\Entity\Timesheet;
 use App\Repository\Query\TimesheetQuery;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * Controller used to display calendars.
  *
- * @Route("/calendar")
+ * @Route(path="/calendar")
  * @Security("is_granted('ROLE_USER')")
  */
 class CalendarController extends AbstractController
@@ -41,8 +40,7 @@ class CalendarController extends AbstractController
     }
 
     /**
-     * @Route("/", name="calendar")
-     * @Method("GET")
+     * @Route(path="/", name="calendar", methods={"GET"})
      * @Cache(smaxage="10")
      */
     public function userCalendar()
@@ -54,8 +52,7 @@ class CalendarController extends AbstractController
     }
 
     /**
-     * @Route("/user", name="calendar_entries")
-     * @Method("GET")
+     * @Route(path="/user", name="calendar_entries", methods={"GET"})
      * @Cache(smaxage="10")
      */
     public function calendarEntries(Request $request)

src/Controller/DashboardController.php

@@ -12,16 +12,15 @@ namespace App\Controller;
 use App\Event\DashboardEvent;
 use App\Model\DashboardSection;
 use App\Repository\WidgetRepository;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * Dashboard controller for the admin area.
  *
- * @Route("/dashboard")
+ * @Route(path="/dashboard")
  * @Security("is_granted('ROLE_USER')")
  */
 class DashboardController extends Controller
@@ -52,8 +51,7 @@ class DashboardController extends Controller
     }
 
     /**
-     * @Route("/", defaults={}, name="dashboard")
-     * @Method("GET")
+     * @Route(path="/", defaults={}, name="dashboard", methods={"GET"})
      */
     public function indexAction()
     {

src/Controller/HelpController.php

@@ -10,15 +10,14 @@
 namespace App\Controller;
 
 use App\Constants;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * This controller can render the markdown documentation from /var/docs/
  *
- * @Route("/help")
+ * @Route(path="/help")
  * @Security("is_granted('ROLE_USER')")
  */
 class HelpController extends Controller
@@ -41,9 +40,8 @@ class HelpController extends Controller
     }
 
     /**
-     * @Route("/", defaults={"chapter": "README"}, name="help")
-     * @Route("/{chapter}", requirements={"chapter": "[a-zA-Z]*"}, name="help_chapter")
-     * @Method("GET")
+     * @Route(path="/", defaults={"chapter": "README"}, name="help", methods={"GET"})
+     * @Route(path="/{chapter}", requirements={"chapter": "[a-zA-Z]*"}, name="help_chapter", methods={"GET"})
      *
      * @param string $chapter
      * @return \Symfony\Component\HttpFoundation\Response

src/Controller/InvoiceController.php

@@ -19,15 +19,14 @@ use App\Repository\Query\BaseQuery;
 use App\Repository\Query\InvoiceQuery;
 use App\Repository\Query\TimesheetQuery;
 use App\Repository\TimesheetRepository;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * Controller used to manage invoices.
  *
- * @Route("/invoice")
+ * @Route(path="/invoice")
  * @Security("is_granted('ROLE_TEAMLEAD')")
  */
 class InvoiceController extends AbstractController
@@ -38,7 +37,6 @@ class InvoiceController extends AbstractController
     protected $service;
 
     /**
-     * InvoiceController constructor.
      * @param ServiceInvoice $service
      */
     public function __construct(ServiceInvoice $service)
@@ -73,7 +71,7 @@ class InvoiceController extends AbstractController
     }
 
     /**
-     * @Route("/", name="invoice")
+     * @Route(path="/", name="invoice", methods={"GET", "POST"})
      *
      * @param Request $request
      * @return \Symfony\Component\HttpFoundation\Response
@@ -139,9 +137,8 @@ class InvoiceController extends AbstractController
     }
 
     /**
-     * @Route("/template", defaults={"page": 1}, name="admin_invoice_template")
-     * @Route("/template/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_invoice_template_paginated")
-     * @Method({"GET", "POST"})
+     * @Route(path="/template", defaults={"page": 1}, name="admin_invoice_template", methods={"GET", "POST"})
+     * @Route(path="/template/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_invoice_template_paginated", methods={"GET", "POST"})
      *
      * TODO permission
      *
@@ -159,8 +156,7 @@ class InvoiceController extends AbstractController
     }
 
     /**
-     * @Route("/{id}/edit", name="admin_invoice_template_edit")
-     * @Method({"GET", "POST"})
+     * @Route(path="/{id}/edit", name="admin_invoice_template_edit", methods={"GET", "POST"})
      *
      * TODO permission
      *
@@ -174,8 +170,7 @@ class InvoiceController extends AbstractController
     }
 
     /**
-     * @Route("/create", name="admin_invoice_template_create")
-     * @Method({"GET", "POST"})
+     * @Route(path="/create", name="admin_invoice_template_create", methods={"GET", "POST"})
      *
      * TODO permission
      *

src/Controller/ProfileController.php

@@ -18,17 +18,16 @@ use App\Form\UserPreferencesForm;
 use App\Form\UserRolesType;
 use App\Repository\TimesheetRepository;
 use App\Voter\UserVoter;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\Form\Form;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
 
 /**
  * User profile controller
  *
- * @Route("/profile")
+ * @Route(path="/profile")
  * @Security("is_granted('ROLE_USER')")
  */
 class ProfileController extends AbstractController
@@ -47,8 +46,7 @@ class ProfileController extends AbstractController
     }
 
     /**
-     * @Route("/{username}", name="user_profile")
-     * @Method("GET")
+     * @Route(path="/{username}", name="user_profile", methods={"GET"})
      * @Security("is_granted('view', profile)")
      */
     public function indexAction(User $profile)
@@ -57,8 +55,7 @@ class ProfileController extends AbstractController
     }
 
     /**
-     * @Route("/{username}/edit", name="user_profile_edit")
-     * @Method({"GET", "POST"})
+     * @Route(path="/{username}/edit", name="user_profile_edit", methods={"GET", "POST"})
      * @Security("is_granted('edit', profile)")
      */
     public function editAction(User $profile, Request $request)
@@ -80,8 +77,7 @@ class ProfileController extends AbstractController
     }
 
     /**
-     * @Route("/{username}/password", name="user_profile_password")
-     * @Method({"GET", "POST"})
+     * @Route(path="/{username}/password", name="user_profile_password", methods={"GET", "POST"})
      * @Security("is_granted('password', profile)")
      */
     public function passwordAction(User $profile, Request $request)
@@ -106,8 +102,7 @@ class ProfileController extends AbstractController
     }
 
     /**
-     * @Route("/{username}/api-token", name="user_profile_api_token")
-     * @Method({"GET", "POST"})
+     * @Route(path="/{username}/api-token", name="user_profile_api_token", methods={"GET", "POST"})
      * @Security("is_granted('api-token', profile)")
      */
     public function apiTokenAction(User $profile, Request $request)
@@ -132,8 +127,7 @@ class ProfileController extends AbstractController
     }
 
     /**
-     * @Route("/{username}/roles", name="user_profile_roles")
-     * @Method({"GET", "POST"})
+     * @Route(path="/{username}/roles", name="user_profile_roles", methods={"GET", "POST"})
      * @Security("is_granted('roles', profile)")
      */
     public function rolesAction(User $profile, Request $request)
@@ -155,8 +149,7 @@ class ProfileController extends AbstractController
     }
 
     /**
-     * @Route("/{username}/prefs", name="user_profile_preferences")
-     * @Method({"GET", "POST"})
+     * @Route(path="/{username}/prefs", name="user_profile_preferences", methods={"GET", "POST"})
      * @Security("is_granted('preferences', profile)")
      */
     public function savePreferencesAction(User $profile, Request $request)

src/Controller/TimesheetController.php

@@ -16,15 +16,14 @@ use App\Form\Toolbar\TimesheetToolbarForm;
 use App\Repository\Query\TimesheetQuery;
 use Pagerfanta\Pagerfanta;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * Controller used to manage timesheets.
  *
- * @Route("/timesheet")
+ * @Route(path="/timesheet")
  * @Security("is_granted('ROLE_USER')")
  */
 class TimesheetController extends AbstractController
@@ -40,9 +39,8 @@ class TimesheetController extends AbstractController
     }
 
     /**
-     * @Route("/", defaults={"page": 1}, name="timesheet")
-     * @Route("/page/{page}", requirements={"page": "[1-9]\d*"}, name="timesheet_paginated")
-     * @Method("GET")
+     * @Route(path="/", defaults={"page": 1}, name="timesheet", methods={"GET"})
+     * @Route(path="/page/{page}", requirements={"page": "[1-9]\d*"}, name="timesheet_paginated", methods={"GET"})
      * @Cache(smaxage="10")
      */
     public function indexAction($page, Request $request)
@@ -89,8 +87,7 @@ class TimesheetController extends AbstractController
     /**
      * The route to stop a running entry.
      *
-     * @Route("/{id}/stop", name="timesheet_stop")
-     * @Method({"GET"})
+     * @Route(path="/{id}/stop", name="timesheet_stop", methods={"GET"})
      * @Security("is_granted('stop', entry)")
      *
      * @param Timesheet $entry
@@ -104,8 +101,7 @@ class TimesheetController extends AbstractController
     /**
      * The route to stop a running entry.
      *
-     * @Route("/start/{id}", name="timesheet_start", requirements={"id" = "\d+"})
-     * @Method({"GET", "POST"})
+     * @Route(path="/start/{id}", name="timesheet_start", requirements={"id" = "\d+"}, methods={"GET", "POST"})
      * @Security("is_granted('start', activity)")
      *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
@@ -127,8 +123,7 @@ class TimesheetController extends AbstractController
     /**
      * The route to edit an existing entry.
      *
-     * @Route("/{id}/edit", name="timesheet_edit")
-     * @Method({"GET", "POST"})
+     * @Route(path="/{id}/edit", name="timesheet_edit", methods={"GET", "POST"})
      * @Security("is_granted('edit', entry)")
      *
      * @param Timesheet $entry
@@ -147,8 +142,7 @@ class TimesheetController extends AbstractController
     /**
      * The route to create a new entry by form.
      *
-     * @Route("/create", name="timesheet_create")
-     * @Method({"GET", "POST"})
+     * @Route(path="/create", name="timesheet_create", methods={"GET", "POST"})
      *
      * @param Request $request
      * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
@@ -161,8 +155,7 @@ class TimesheetController extends AbstractController
     /**
      * The route to delete an existing entry.
      *
-     * @Route("/{id}/delete", name="timesheet_delete")
-     * @Method({"GET", "POST"})
+     * @Route(path="/{id}/delete", name="timesheet_delete", methods={"GET", "POST"})
      * @Security("is_granted('delete', entry)")
      *
      * @param Timesheet $entry

tests/API/ActivityControllerTest.php

@@ -14,7 +14,6 @@ use App\Entity\User;
 /**
  * @coversDefaultClass \App\API\ActivityController
  * @group integration
- * @group legacy
  */
 class ActivityControllerTest extends APIControllerBaseTest
 {

tests/API/ApiDocControllerTest.php

@@ -14,7 +14,6 @@ use App\Tests\Controller\ControllerBaseTest;
 
 /**
  * @group integration
- * @group legacy
  */
 class ApiDocControllerTest extends ControllerBaseTest
 {

tests/API/CustomerControllerTest.php

@@ -14,7 +14,6 @@ use App\Entity\User;
 /**
  * @coversDefaultClass \App\API\CustomerController
  * @group integration
- * @group legacy
  */
 class CustomerControllerTest extends APIControllerBaseTest
 {

tests/API/HealthcheckControllerTest.php

@@ -14,7 +14,6 @@ use App\Entity\User;
 /**
  * @coversDefaultClass \App\API\HealthcheckController
  * @group integration
- * @group legacy
  */
 class HealthcheckControllerTest extends APIControllerBaseTest
 {

tests/API/ProjectControllerTest.php

@@ -14,7 +14,6 @@ use App\Entity\User;
 /**
  * @coversDefaultClass \App\API\ProjectController
  * @group integration
- * @group legacy
  */
 class ProjectControllerTest extends APIControllerBaseTest
 {

tests/API/UserControllerTest.php

@@ -14,7 +14,6 @@ use App\Entity\User;
 /**
  * @coversDefaultClass \App\API\UserController
  * @group integration
- * @group legacy
  */
 class UserControllerTest extends APIControllerBaseTest
 {

tests/Command/CreateUserCommandTest.php

@@ -20,7 +20,6 @@ use Symfony\Component\Validator\Validator\ValidatorInterface;
 /**
  * @coversDefaultClass \App\Command\CreateUserCommand
  * @group integration
- * @group legacy
  */
 class CreateUserCommandTest extends KernelTestCase
 {

tests/Controller/Admin/ActivityControllerTest.php

@@ -17,7 +17,6 @@ use App\Tests\DataFixtures\TimesheetFixtures;
 /**
  * @coversDefaultClass \App\Controller\Admin\ActivityController
  * @group integration
- * @group legacy
  */
 class ActivityControllerTest extends ControllerBaseTest
 {

tests/Controller/Admin/CustomerControllerTest.php

@@ -17,7 +17,6 @@ use App\Tests\DataFixtures\TimesheetFixtures;
 /**
  * @coversDefaultClass \App\Controller\Admin\CustomerController
  * @group integration
- * @group legacy
  */
 class CustomerControllerTest extends ControllerBaseTest
 {

tests/Controller/Admin/ProjectControllerTest.php

@@ -18,7 +18,6 @@ use App\Tests\DataFixtures\TimesheetFixtures;
 /**
  * @coversDefaultClass \App\Controller\Admin\ProjectController
  * @group integration
- * @group legacy
  */
 class ProjectControllerTest extends ControllerBaseTest
 {

tests/Controller/Admin/UserControllerTest.php

@@ -15,7 +15,6 @@ use App\Tests\Controller\ControllerBaseTest;
 /**
  * @coversDefaultClass \App\Controller\Admin\UserController
  * @group integration
- * @group legacy
  */
 class UserControllerTest extends ControllerBaseTest
 {

tests/Controller/CalendarControllerTest.php

@@ -15,7 +15,6 @@ use App\Tests\DataFixtures\TimesheetFixtures;
 /**
  * @coversDefaultClass \App\Controller\CalendarController
  * @group integration
- * @group legacy
  */
 class CalendarControllerTest extends ControllerBaseTest
 {

tests/Controller/ProfileControllerTest.php

@@ -16,7 +16,6 @@ use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
 /**
  * @coversDefaultClass \App\Controller\InvoiceController
  * @group integration
- * @group legacy
  */
 class ProfileControllerTest extends ControllerBaseTest
 {

tests/Controller/TimesheetControllerTest.php

@@ -15,7 +15,6 @@ use App\Tests\DataFixtures\TimesheetFixtures;
 /**
  * @coversDefaultClass \App\Controller\TimesheetController
  * @group integration
- * @group legacy
  */
 class TimesheetControllerTest extends ControllerBaseTest
 {