Merge pull request #1524 from wallabag/sf2.8

Upgrade to Symfony 3.0

diff --combined src/Wallabag/CoreBundle/Controller/EntryController.php
index 3d22c7bcaa15d48b7a0633c68c6c920f5b1d2918,dda0a45610b78ff0199c00c929fb3aad60d6e42a..aa70307b15e29b930ef47726d2daad262892eaa5
--- 1/src/Wallabag/CoreBundle/Controller/EntryController.php
--- 2/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@@ -2,16 -2,16 +2,16 @@@
  
  namespace Wallabag\CoreBundle\Controller;
  
+ use Pagerfanta\Adapter\DoctrineORMAdapter;
+ use Pagerfanta\Pagerfanta;
  use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
  use Symfony\Bundle\FrameworkBundle\Controller\Controller;
  use Symfony\Component\HttpFoundation\Request;
  use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
  use Wallabag\CoreBundle\Entity\Entry;
- use Wallabag\CoreBundle\Form\Type\NewEntryType;
- use Wallabag\CoreBundle\Form\Type\EditEntryType;
  use Wallabag\CoreBundle\Filter\EntryFilterType;
- use Pagerfanta\Adapter\DoctrineORMAdapter;
- use Pagerfanta\Pagerfanta;
+ use Wallabag\CoreBundle\Form\Type\EditEntryType;
+ use Wallabag\CoreBundle\Form\Type\NewEntryType;
  
  class EntryController extends Controller
  {
@@@ -43,7 -43,7 +43,7 @@@
      {
          $entry = new Entry($this->getUser());
  
-         $form = $this->createForm(new NewEntryType(), $entry);
+         $form = $this->createForm(NewEntryType::class, $entry);
  
          $form->handleRequest($request);
  
@@@ -117,7 -117,7 +117,7 @@@
      {
          $this->checkUserAction($entry);
  
-         $form = $this->createForm(new EditEntryType(), $entry);
+         $form = $this->createForm(EditEntryType::class, $entry);
  
          $form->handleRequest($request);
  
@@@ -166,11 -166,6 +166,11 @@@
       */
      public function showUnreadAction(Request $request, $page)
      {
 +        // load the quickstart if no entry in database
 +        if ($page == 1 && $this->get('wallabag_core.entry_repository')->countAllEntriesByUsername($this->getUser()->getId()) == 0) {
 +            return $this->redirect($this->generateUrl('quickstart'));
 +        }
 +
          return $this->showEntries('unread', $request, $page);
      }
  
@@@ -216,7 -211,7 +216,7 @@@
       */
      private function showEntries($type, Request $request, $page)
      {
 -        $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry');
 +        $repository = $this->get('wallabag_core.entry_repository');
  
          switch ($type) {
              case 'starred':
@@@ -239,7 -234,7 +239,7 @@@
                  throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type));
          }
  
-         $form = $this->get('form.factory')->create(new EntryFilterType($repository, $this->getUser()));
+         $form = $this->createForm(EntryFilterType::class);
  
          if ($request->query->has($form->getName())) {
              // manually bind values from the request