diff --git a/Controller/CustomerController.php b/Controller/CustomerController.php
index <HASH>..<HASH> 100644
--- a/Controller/CustomerController.php
+++ b/Controller/CustomerController.php
@@ -524,10 +524,10 @@ class CustomerController extends BaseFrontController
     /**
      * @param $token
      *
-     * @return \Symfony\Component\HttpFoundation\Response
-     *
      * @throws \Exception
      * @throws \Propel\Runtime\Exception\PropelException
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
      */
     public function confirmCustomerAction($token)
     {
diff --git a/Controller/FeedController.php b/Controller/FeedController.php
index <HASH>..<HASH> 100644
--- a/Controller/FeedController.php
+++ b/Controller/FeedController.php
@@ -51,9 +51,9 @@ class FeedController extends BaseFrontController
      * @param $id string        The id of the parent element. The id of the main parent category for catalog context.
      *                          The id of the content folder for content context
      *
-     * @return Response
-     *
      * @throws \RuntimeException
+     *
+     * @return Response
      */
     public function generateAction($context, $lang, $id)
     {
Fix BaseTaxType annotation order (#<I>)

* Fix BaseTaxType annotation order



* Fix php cs annotation order



* Fix ci and lock ci versions