]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
[#1604] First draft to fix SensioLabsInsight report
authorNicolas Lœuillet <nicolas.loeuillet@smile.fr>
Wed, 20 Jan 2016 15:24:48 +0000 (16:24 +0100)
committerNicolas Lœuillet <nicolas@loeuillet.org>
Fri, 22 Jan 2016 20:12:11 +0000 (21:12 +0100)
17 files changed:
app/config/parameters.yml.dist
app/config/tests/parameters.yml.dist.mysql
app/config/tests/parameters.yml.dist.pgsql
app/config/tests/parameters.yml.dist.sqlite
src/Wallabag/ApiBundle/Controller/WallabagRestController.php
src/Wallabag/ApiBundle/DependencyInjection/Configuration.php
src/Wallabag/CoreBundle/Command/InstallCommand.php
src/Wallabag/CoreBundle/Controller/EntryController.php
src/Wallabag/CoreBundle/Form/Type/EditEntryType.php
src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php [moved from src/Wallabag/CoreBundle/Filter/EntryFilterType.php with 98% similarity]
src/Wallabag/CoreBundle/Resources/config/services.yml
src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css
src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md [changed mode: 0755->0644]
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig [changed mode: 0755->0644]
src/Wallabag/CoreBundle/Resources/views/themes/material/README.md [changed mode: 0755->0644]
src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig [changed mode: 0755->0644]
src/Wallabag/ImportBundle/Import/PocketImport.php

index 0c0cbff1cdc7a79be80a039e7663cea60bffaaa6..11d31b24aaa704e4e7288b4d1765b47ec13ae288 100644 (file)
@@ -31,11 +31,13 @@ parameters:
     mailer_host:       127.0.0.1
     mailer_user:       ~
     mailer_password:   ~
+    switftmailer_username: null
+    switftmailer_password: null
 
     locale:            en
 
     # A secret key that's used to generate certain security-related tokens
-    secret:            ThisTokenIsNotSoSecretChangeIt
+    secret:            ovmpmAWXRCabNlMgzlzFXDYmCFfzGv
 
     # wallabag misc
     app.version: 2.0.0-alpha
index 88b1d2b40afcd8203e3a70d99da012aef14d85b6..bd45f091658c3657a1e71c0954bb4f4c85716f95 100644 (file)
@@ -21,6 +21,8 @@ parameters:
     mailer_host:       127.0.0.1
     mailer_user:       ~
     mailer_password:   ~
+    switftmailer_username: null
+    switftmailer_password: null
 
     locale:            en
 
index 3c61142dd0c8987298f8f802d56721c35b8ec0ac..8352a1ad573b7e021e08a7d6089b1c34a94133ae 100644 (file)
@@ -21,6 +21,8 @@ parameters:
     mailer_host:       127.0.0.1
     mailer_user:       ~
     mailer_password:   ~
+    switftmailer_username: null
+    switftmailer_password: null
 
     locale:            en
 
index 2f7699b5795fb5f436f460503bea7e50c24bbd37..617e9f042639d645d3032c5630ddc69585de8a38 100644 (file)
@@ -21,6 +21,8 @@ parameters:
     mailer_host:       127.0.0.1
     mailer_user:       ~
     mailer_password:   ~
+    switftmailer_username: null
+    switftmailer_password: null
 
     locale:            en
 
index d9035cac716440bc2d08111db6053a51c45e1070..84bc14a959c041520cbb0c2897949580b990cdf4 100644 (file)
@@ -9,6 +9,7 @@ use Nelmio\ApiDocBundle\Annotation\ApiDoc;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\CoreBundle\Entity\Tag;
 
@@ -73,7 +74,6 @@ class WallabagRestController extends FOSRestController
         $order = $request->query->get('order', 'desc');
         $page = (int) $request->query->get('page', 1);
         $perPage = (int) $request->query->get('perPage', 30);
-        $tags = $request->query->get('tags', []);
 
         $pager = $this->getDoctrine()
             ->getRepository('WallabagCoreBundle:Entry')
index cec4541244912411fd6a7df3c8c09b164133572a..f70a58358f51b31df5d04f11697de8925d31a64a 100644 (file)
@@ -20,10 +20,6 @@ class Configuration implements ConfigurationInterface
         $treeBuilder = new TreeBuilder();
         $rootNode = $treeBuilder->root('wallabag_api');
 
-        // Here you should define the parameters that are allowed to
-        // configure your bundle. See the documentation linked above for
-        // more information on that topic.
-
         return $treeBuilder;
     }
 }
index da099a19bb8e0a003b5c0fc99fb80d87c02b6b6c..63032dbb6de1edc4767c5d355d7ab562f8d378c0 100644 (file)
@@ -64,7 +64,6 @@ class InstallCommand extends ContainerAwareCommand
 
         $fulfilled = true;
 
-        // @TODO: find a better way to check requirements
         $label = '<comment>PCRE</comment>';
         if (extension_loaded('pcre')) {
             $status = '<info>OK!</info>';
index 3e1b512ff3eb222a46b13cae9dfb3b5f5ed62eb3..747976e3565560369e7948eb54a826e38a26945d 100644 (file)
@@ -9,7 +9,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Filter\EntryFilterType;
+use Wallabag\CoreBundle\Form\Type\EntryFilterType;
 use Wallabag\CoreBundle\Form\Type\EditEntryType;
 use Wallabag\CoreBundle\Form\Type\NewEntryType;
 
index 0cb29881834db98ebe0ffee1b20aca29f28e9696..2b1e1ef43c76a0c744a37ee6f985b3826ca70e4f 100644 (file)
@@ -16,11 +16,6 @@ class EditEntryType extends AbstractType
         $builder
             ->add('title', TextType::class, array('required' => true))
             ->add('is_public', CheckboxType::class, array('required' => false))
-            // @todo: add autocomplete
-            // ->add('tags', 'entity', array(
-            //     'class' => 'Wallabag\CoreBundle\Entity\Tag',
-            //     'choice_translation_domain' => true,
-            // ))
             ->add('save', SubmitType::class)
         ;
     }
similarity index 98%
rename from src/Wallabag/CoreBundle/Filter/EntryFilterType.php
rename to src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
index c38be8320fb3de10748891175891329ad8b03363..ee10bc8b517135deac7303beea15fa7c00e2d11b 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Filter;
+namespace Wallabag\CoreBundle\Form\Type;
 
 use Doctrine\ORM\EntityRepository;
 use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface;
index 25d71cba07a5bf608b3512958146f6fc92d5c5d1..7d24d488ce78e987cc139f625cd9c62590cde6e7 100644 (file)
@@ -15,7 +15,7 @@ services:
             - { name: form.type }
 
     wallabag_core.filter.type.entry:
-        class: Wallabag\CoreBundle\Filter\EntryFilterType
+        class: Wallabag\CoreBundle\Form\Type\EntryFilterType
         arguments:
             - "@wallabag_core.entry_repository"
             - "@security.token_storage"
index d3f92926e846c89920075fdb31d08a773ffc7dfb..62f2964c0ccd77711543f2a42dcbfb6e28f3c7aa 100755 (executable)
@@ -564,7 +564,7 @@ img.preview {
   height: 100%;
   width: 100%;
   margin: 0;
-  margin-top: -30% !important; /* TODO: get rid of !important here; overridden by .messages selector */
+  margin-top: -30% !important;
   padding: 2em;
   display: none;
   border-left: 1px #EEE solid;
index 72b9047c8fdc3acc39267b67a4af11adc31f2634..617d551483aa1ac96c451adbf97f413a9438916d 100644 (file)
@@ -23,7 +23,6 @@ class PocketImport implements ImportInterface
     private $skippedEntries = 0;
     private $importedEntries = 0;
     protected $accessToken;
-    private $translator;
 
     public function __construct(TokenStorageInterface $tokenStorage, EntityManager $em, ContentProxy $contentProxy, $consumerKey)
     {
@@ -177,9 +176,6 @@ class PocketImport implements ImportInterface
         $this->client = $client;
     }
 
-    /**
-     * @todo move that in a more global place
-     */
     private function assignTagsToEntry(Entry $entry, $tags)
     {
         foreach ($tags as $tag) {