fixed 410 expty target in import (#31)

sulu · Oct 4, 2018 · e702686 · e702686
1 parent 00efc73
commit e702686
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/Import/Writer/Writer.php b/Import/Writer/Writer.php
@@ -15,6 +15,7 @@
 use Sulu\Bundle\RedirectBundle\Manager\RedirectRouteManagerInterface;
 use Sulu\Bundle\RedirectBundle\Manager\RedirectRouteNotUniqueException;
 use Sulu\Bundle\RedirectBundle\Model\RedirectRouteInterface;
+use Symfony\Component\HttpFoundation\Response;
 
 /**
  * Write redirect-route entity to database by using the entity-manager.
@@ -112,7 +113,7 @@ private function save(RedirectRouteInterface $entity)
      */
     private function validate(RedirectRouteInterface $entity)
     {
-        if ('' === $entity->getTarget()) {
+        if ('' === $entity->getTarget() && Response::HTTP_GONE !== $entity->getStatusCode()) {
             throw new TargetIsEmptyException($entity);
         }
 

diff --git a/Tests/Unit/Import/Writer/WriterTest.php b/Tests/Unit/Import/Writer/WriterTest.php
@@ -13,10 +13,12 @@
 
 use Doctrine\ORM\EntityManagerInterface;
 use Sulu\Bundle\RedirectBundle\Import\Writer\DuplicatedSourceException;
+use Sulu\Bundle\RedirectBundle\Import\Writer\TargetIsEmptyException;
 use Sulu\Bundle\RedirectBundle\Import\Writer\Writer;
 use Sulu\Bundle\RedirectBundle\Manager\RedirectRouteManagerInterface;
 use Sulu\Bundle\RedirectBundle\Manager\RedirectRouteNotUniqueException;
 use Sulu\Bundle\RedirectBundle\Model\RedirectRouteInterface;
+use Symfony\Component\HttpFoundation\Response;
 
 class WriterTest extends \PHPUnit_Framework_TestCase
 {
@@ -154,6 +156,34 @@ public function testWriteAlreadyExisting()
         $this->writer->write($entity->reveal());
     }
 
+    public function testWriteEmptyTarget()
+    {
+        $this->setExpectedException(TargetIsEmptyException::class);
+
+        $entity = $this->prophesize(RedirectRouteInterface::class);
+        $entity->getSource()->willReturn('/source');
+        $entity->getTarget()->willReturn('');
+        $entity->getStatusCode()->willReturn(Response::HTTP_MOVED_PERMANENTLY);
+
+        $this->redirectRouteManager->save($entity->reveal())->shouldNotBeCalled();
+
+        $this->writer->write($entity->reveal());
+    }
+
+    public function testWriteEmptyTargetFor410()
+    {
+        $entity = $this->prophesize(RedirectRouteInterface::class);
+        $entity->getSource()->willReturn('/source');
+        $entity->getTarget()->willReturn('');
+        $entity->getStatusCode()->willReturn(Response::HTTP_GONE);
+
+        $this->redirectRouteManager->save($entity->reveal())->shouldBeCalled();
+
+        $this->writer->write($entity->reveal());
+
+        $this->redirectRouteManager->save($entity->reveal())->shouldBeCalled();
+    }
+
     public function testFinalize()
     {
         $this->writer->finalize();