Merge remote-tracking branch 'origin/master' into 2.2

[github/wallabag/wallabag.git] / src / Wallabag / ImportBundle / Command / ImportCommand.php

diff --git a/src/Wallabag/ImportBundle/Command/ImportCommand.php b/src/Wallabag/ImportBundle/Command/ImportCommand.php
index 2f7a906e38e9752bf3ec39038328445bd72a0c1f..28d0171599a97db540077ce89d21d82bded2bd15 100644 (file)
--- a/src/Wallabag/ImportBundle/Command/ImportCommand.php
+++ b/src/Wallabag/ImportBundle/Command/ImportCommand.php
@@ -17,7 +17,7 @@ class ImportCommand extends ContainerAwareCommand
             ->setDescription('Import entries from a JSON export')
             ->addArgument('userId', InputArgument::REQUIRED, 'User ID to populate')
             ->addArgument('filepath', InputArgument::REQUIRED, 'Path to the JSON file')
-            ->addOption('importer', null, InputArgument::OPTIONAL, 'The importer to use: v1, v2, instapaper, readability, firefox or chrome', 'v1')
+            ->addOption('importer', null, InputArgument::OPTIONAL, 'The importer to use: v1, v2, instapaper, pinboard, readability, firefox or chrome', 'v1')
             ->addOption('markAsRead', null, InputArgument::OPTIONAL, 'Mark all entries as read', false)
         ;
     }
@@ -56,10 +56,11 @@ class ImportCommand extends ContainerAwareCommand
             case 'instapaper':
                 $import = $this->getContainer()->get('wallabag_import.instapaper.import');
                 break;
-            case 'v1':
+            case 'pinboard':
+                $import = $this->getContainer()->get('wallabag_import.pinboard.import');
+                break;
             default:
                 $import = $this->getContainer()->get('wallabag_import.wallabag_v1.import');
-                break;
         }
 
         $import->setMarkAsRead($input->getOption('markAsRead'));