From 77a7752a592af9ac821621a34d9955533baf40a0 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Wed, 30 Dec 2015 10:06:45 +0100
Subject: Update after previous merge

PR #1443 was merged into this branch to handle all import type in the same place.
---
 .../ImportBundle/Form/Type/UploadImportType.php    | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 src/Wallabag/ImportBundle/Form/Type/UploadImportType.php

(limited to 'src/Wallabag/ImportBundle/Form')

diff --git a/src/Wallabag/ImportBundle/Form/Type/UploadImportType.php b/src/Wallabag/ImportBundle/Form/Type/UploadImportType.php
new file mode 100644
index 00000000..5d894318
--- /dev/null
+++ b/src/Wallabag/ImportBundle/Form/Type/UploadImportType.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Wallabag\ImportBundle\Form\Type;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class UploadImportType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('file', 'file')
+            ->add('save', 'submit')
+        ;
+    }
+
+    public function getDefaultOptions(array $options)
+    {
+        return array(
+            'csrf_protection' => false,
+        );
+    }
+
+    public function getName()
+    {
+        return 'upload_import_file';
+    }
+}
-- 
cgit v1.2.3


From 7019c7cf6c6af39c0f458769e20c3f9306477943 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Thu, 31 Dec 2015 11:24:46 +0100
Subject: Add tagged services for import

- list services in /import
- add url to import service
- ImportBundle routing are now prefixed by /import
- optimize flush in each import (flushing each 20 contents)
- improve design of each import
- add more tests
---
 src/Wallabag/ImportBundle/Form/Type/UploadImportType.php | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'src/Wallabag/ImportBundle/Form')

diff --git a/src/Wallabag/ImportBundle/Form/Type/UploadImportType.php b/src/Wallabag/ImportBundle/Form/Type/UploadImportType.php
index 5d894318..415890f3 100644
--- a/src/Wallabag/ImportBundle/Form/Type/UploadImportType.php
+++ b/src/Wallabag/ImportBundle/Form/Type/UploadImportType.php
@@ -15,13 +15,6 @@ class UploadImportType extends AbstractType
         ;
     }
 
-    public function getDefaultOptions(array $options)
-    {
-        return array(
-            'csrf_protection' => false,
-        );
-    }
-
     public function getName()
     {
         return 'upload_import_file';
-- 
cgit v1.2.3