diff --git a/lib/Doctrine/Entities/Basket.php b/lib/Doctrine/Entities/Basket.php
index 211cfb6042..421d5f54ac 100644
--- a/lib/Doctrine/Entities/Basket.php
+++ b/lib/Doctrine/Entities/Basket.php
@@ -365,7 +365,7 @@ class Basket
     /**
      * Set order
      *
-     * @param \Entities\Order $order
+     * @param  \Entities\Order $order
      * @return Basket
      */
     public function setOrder(\Entities\Order $order = null)
diff --git a/lib/Doctrine/Entities/UserSetting.php b/lib/Doctrine/Entities/UserSetting.php
index 544bae7f20..28ee9a710e 100644
--- a/lib/Doctrine/Entities/UserSetting.php
+++ b/lib/Doctrine/Entities/UserSetting.php
@@ -158,7 +158,7 @@ class UserSetting
     }
 
     /**
-     * @param \DateTime  $created
+     * @param \DateTime $created
      *
      * @return UserSetting
      */
diff --git a/lib/Doctrine/Repositories/BasketRepository.php b/lib/Doctrine/Repositories/BasketRepository.php
index 395314a79e..4e89ab620e 100644
--- a/lib/Doctrine/Repositories/BasketRepository.php
+++ b/lib/Doctrine/Repositories/BasketRepository.php
@@ -124,8 +124,8 @@ class BasketRepository extends EntityRepository
      *
      * @throws NotFoundHttpException
      * @throws AccessDeniedHttpException
-     * @param  type                 $basket_id
-     * @param  \User_Adapter        $user
+     * @param  type                      $basket_id
+     * @param  \User_Adapter             $user
      * @return \Entities\Basket
      */
     public function findUserBasket(Application $app, $basket_id, \User_Adapter $user, $requireOwner)
diff --git a/lib/Doctrine/Repositories/OrderRepository.php b/lib/Doctrine/Repositories/OrderRepository.php
index 218338ed98..a4446ad9ad 100644
--- a/lib/Doctrine/Repositories/OrderRepository.php
+++ b/lib/Doctrine/Repositories/OrderRepository.php
@@ -15,10 +15,10 @@ class OrderRepository extends EntityRepository
     /**
      * Returns an array of all the orders, starting at $offsetStart, limited to $perPage
      *
-     * @param array $baseIds
+     * @param array   $baseIds
      * @param integer $offsetStart
      * @param integer $perPage
-     * @param string $sort
+     * @param string  $sort
      *
      * @return array
      */
@@ -34,7 +34,7 @@ class OrderRepository extends EntityRepository
 
          if ($sort === 'user') {
              $qb->orderBy('o.userId', 'ASC');
-         } else if ($sort === 'usage') {
+         } elseif ($sort === 'usage') {
              $qb->orderBy('o.orderUsage', 'ASC');
          } else {
              $qb->orderBy('o.createdOn', 'ASC');