From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Fri, 15 Jan 2016 14:47:13 +0000 (+0100)
Subject: Merge pull request #1583 from wallabag/v2-fix-delete
X-Git-Tag: 2.0.0-alpha.2~11
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=86719c63bf47686ca55020e6b0443344de36d45a;hp=-c;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #1583 from wallabag/v2-fix-delete

Fix `findOneByUrl` side effect in tests
---

86719c63bf47686ca55020e6b0443344de36d45a
diff --combined src/Wallabag/CoreBundle/Controller/EntryController.php
index aa70307b,1949bdf8..9dd904f1
--- a/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,14 -43,13 +43,13 @@@
      {
          $entry = new Entry($this->getUser());
  
 -        $form = $this->createForm(new NewEntryType(), $entry);
 +        $form = $this->createForm(NewEntryType::class, $entry);
  
          $form->handleRequest($request);
  
          if ($form->isValid()) {
              // check for existing entry, if it exists, redirect to it with a message
-             $existingEntry = $this->get('wallabag_core.entry_repository')
-                 ->existByUrlAndUserId($entry->getUrl(), $this->getUser()->getId());
+             $existingEntry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($entry->getUrl(), $this->getUser()->getId());
  
              if (false !== $existingEntry) {
                  $this->get('session')->getFlashBag()->add(
@@@ -117,7 -116,7 +116,7 @@@
      {
          $this->checkUserAction($entry);
  
 -        $form = $this->createForm(new EditEntryType(), $entry);
 +        $form = $this->createForm(EditEntryType::class, $entry);
  
          $form->handleRequest($request);
  
@@@ -239,7 -238,7 +238,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