Merge pull request #1612 from wallabag/v2-settings-page

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Helper / EntriesExport.php

diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
index f073ed7f46447b655d8459fd0fe1c81e6d1198f9..965a40b6a1ec190bb06c4f0bb0956fcd0f709ada 100644 (file)
--- a/src/Wallabag/CoreBundle/Helper/EntriesExport.php
+++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
@@ -2,17 +2,17 @@
 
 namespace Wallabag\CoreBundle\Helper;
 
+use JMS\Serializer;
+use JMS\Serializer\SerializationContext;
+use JMS\Serializer\SerializerBuilder;
 use PHPePub\Core\EPub;
 use PHPePub\Core\Structure\OPF\DublinCore;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Serializer\Serializer;
-use Symfony\Component\Serializer\Encoder\XmlEncoder;
-use Symfony\Component\Serializer\Encoder\JsonEncoder;
-use Symfony\Component\Serializer\Normalizer\PropertyNormalizer;
-use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
-use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
-use Doctrine\Common\Annotations\AnnotationReader;
+use Craue\ConfigBundle\Util\Config;
 
+/**
+ * This class doesn't have unit test BUT it's fully covered by a functional test with ExportControllerTest.
+ */
 class EntriesExport
 {
     private $wallabagUrl;
@@ -28,12 +28,12 @@ class EntriesExport
         </div';
 
     /**
-     * @param string $wallabagUrl Wallabag instance url
+     * @param Config $craueConfig CraueConfig instance to get wallabag instance url from database
      * @param string $logoPath    Path to the logo FROM THE BUNDLE SCOPE
      */
-    public function __construct($wallabagUrl, $logoPath)
+    public function __construct(Config $craueConfig, $logoPath)
     {
-        $this->wallabagUrl = $wallabagUrl;
+        $this->wallabagUrl = $craueConfig->get('wallabag_url');
         $this->logoPath = $logoPath;
     }
 
@@ -307,7 +307,8 @@ class EntriesExport
                 array(
                     $entry->getTitle(),
                     $entry->getURL(),
-                    $entry->getContent(),
+                    // remove new line to avoid crazy results
+                    str_replace(array("\r\n", "\r", "\n"), '', $entry->getContent()),
                     implode(', ', $entry->getTags()->toArray()),
                     $entry->getMimetype(),
                     $entry->getLanguage(),
@@ -365,12 +366,13 @@ class EntriesExport
      */
     private function prepareSerializingContent($format)
     {
-        $encoders = array(new XmlEncoder(), new JsonEncoder());
-        $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
-        $normalizers = array(new PropertyNormalizer($classMetadataFactory));
-        $serializer = new Serializer($normalizers, $encoders);
+        $serializer = SerializerBuilder::create()->build();
 
-        return $serializer->serialize($this->entries, $format, array('groups' => array('entries_for_user')));
+        return $serializer->serialize(
+            $this->entries,
+            $format,
+            SerializationContext::create()->setGroups(array('entries_for_user'))
+        );
     }
 
     /**