Revert "merge #127 Some minor changes at TicketManager (phansys)"

This reverts commit 758b79e, reversing
changes made to 3c1270b.

Author: phansys

Controller/TicketController.php

@@ -33,7 +33,7 @@ public function indexAction(Request $request)
         $ticketState    = $request->get('state', $this->get('translator')->trans('STATUS_OPEN'));
         $ticketPriority = $request->get('priority', null);
 
-        $query = $ticketManager->getTicketListQuery(
+        $query = $ticketManager->getTicketList(
             $userManager,
             $ticketManager->getTicketStatus($ticketState),
             $ticketManager->getTicketPriority($ticketPriority)

Manager/TicketManager.php

@@ -105,6 +105,8 @@ public function createMessage(TicketInterface $ticket = null)
      *
      * @param TicketInterface        $ticket
      * @param TicketMessageInterface $message
+     *
+     * @return TicketInterface
      */
     public function updateTicket(TicketInterface $ticket, TicketMessageInterface $message = null)
     {
@@ -116,12 +118,14 @@ public function updateTicket(TicketInterface $ticket, TicketMessageInterface $me
             $this->objectManager->persist($message);
         }
         $this->objectManager->flush();
+
+        return $ticket;
     }
 
     /**
      * Delete a ticket from the database.
      *
-     * @param TicketInterface $ticket
+     * @param TicketInterface $ticket*
      */
     public function deleteTicket(TicketInterface $ticket)
     {
@@ -176,9 +180,13 @@ public function findTicketsBy(array $criteria)
     }
 
     /**
-     * {@inheritdoc}
+     * @param UserManagerInterface $userManager
+     * @param int                  $ticketStatus
+     * @param int                  $ticketPriority
+     *
+     * @return mixed
      */
-    public function getTicketListQuery(UserManagerInterface $userManager, $ticketStatus, $ticketPriority = null)
+    public function getTicketList(UserManagerInterface $userManager, $ticketStatus, $ticketPriority = null)
     {
         $query = $this->ticketRepository->createQueryBuilder('t')
 //            ->select($this->ticketClass.' t')

Manager/TicketManagerInterface.php

@@ -34,9 +34,9 @@ public function findTicketsBy(array $criteria);
      * @param int                  $ticketStatus
      * @param int                  $ticketPriority
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return mixed
      */
-    public function getTicketListQuery(UserManagerInterface $userManager, $ticketStatus, $ticketPriority = null);
+    public function getTicketList(UserManagerInterface $userManager, $ticketStatus, $ticketPriority = null);
 
     /**
      * @param int $days

UPGRADE-3.0.md

@@ -4,10 +4,3 @@ UPGRADE FROM 2.x to 3.0
  * Translation catalogues were renamed from "messages" to "HackzillaTicketBundle"
    in order to allow projects consuming this bundle to override them in a proper
    way.
-
- * Renamed method `TicketManagerInterface::getTicketList()` to `TicketManagerInterface::getTicketListQuery()`
-   to clarify what it returns.
-
- * `TicketManagerInterface::updateTicket()` now returns `void`, since the object
-   (`TicketInterface`) it was returning before is the same as the provided in its
-   argument 1.