From: Jeremy Benoist <j0k3r@users.noreply.github.com>
Date: Fri, 5 Feb 2016 14:22:51 +0000 (+0100)
Subject: Merge pull request #1651 from wallabag/v2-fix-wllbgv2-import
X-Git-Tag: 2.0.0-beta.1~49
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=ae5b37ef2e52c06182bc6edb14f6b3aae381ddb4;hp=4c46e2609fe0ebb1f6a4b4b23a3d8647a1d9d9cd;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #1651 from wallabag/v2-fix-wllbgv2-import

Test if some keys are missing in v2 import
---

diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index e6a06eea..69fb0a6f 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -201,6 +201,7 @@ class InstallCommand extends ContainerAwareCommand
         $user->setEmail($questionHelper->ask($this->defaultInput, $this->defaultOutput, $question));
 
         $user->setEnabled(true);
+        $user->addRole('ROLE_SUPER_ADMIN');
 
         $em->persist($user);
 
diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
index c9aac6e5..6ecdf019 100644
--- a/src/Wallabag/CoreBundle/Helper/EntriesExport.php
+++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
@@ -99,6 +99,7 @@ class EntriesExport
 
             case 'xml':
                 return $this->produceXML();
+
             case 'txt':
                 return $this->produceTXT();
         }
@@ -185,7 +186,7 @@ class EntriesExport
                 'Content-Disposition' => 'attachment; filename="'.$this->title.'.epub"',
                 'Content-Transfer-Encoding' => 'binary',
             )
-        )->send();
+        );
     }
 
     /**
@@ -235,7 +236,7 @@ class EntriesExport
                 'Content-Disposition' => 'attachment; filename="'.$this->title.'.mobi"',
                 'Content-Transfer-Encoding' => 'binary',
             )
-        )->send();
+        );
     }
 
     /**
@@ -289,7 +290,7 @@ class EntriesExport
                 'Content-Disposition' => 'attachment; filename="'.$this->title.'.pdf"',
                 'Content-Transfer-Encoding' => 'binary',
             )
-        )->send();
+        );
     }
 
     /**
@@ -332,7 +333,7 @@ class EntriesExport
                 'Content-Disposition' => 'attachment; filename="'.$this->title.'.csv"',
                 'Content-Transfer-Encoding' => 'UTF-8',
             )
-        )->send();
+        );
     }
 
     private function produceJSON()
@@ -345,7 +346,7 @@ class EntriesExport
                 'Content-Disposition' => 'attachment; filename="'.$this->title.'.json"',
                 'Content-Transfer-Encoding' => 'UTF-8',
             )
-        )->send();
+        );
     }
 
     private function produceXML()
@@ -358,7 +359,7 @@ class EntriesExport
                 'Content-Disposition' => 'attachment; filename="'.$this->title.'.xml"',
                 'Content-Transfer-Encoding' => 'UTF-8',
             )
-        )->send();
+        );
     }
 
     private function produceTXT()
@@ -378,7 +379,7 @@ class EntriesExport
                 'Content-Disposition' => 'attachment; filename="'.$this->title.'.txt"',
                 'Content-Transfer-Encoding' => 'UTF-8',
             )
-        )->send();
+        );
     }
 
     /**