[#1604] First draft to fix SensioLabsInsight report

This commit is contained in:
Nicolas Lœuillet 2016-01-20 16:24:48 +01:00 committed by Nicolas Lœuillet
parent 96fcb60c33
commit b0b893eafd
17 changed files with 14 additions and 20 deletions

View file

@ -31,11 +31,13 @@ parameters:
mailer_host: 127.0.0.1 mailer_host: 127.0.0.1
mailer_user: ~ mailer_user: ~
mailer_password: ~ mailer_password: ~
switftmailer_username: null
switftmailer_password: null
locale: en locale: en
# A secret key that's used to generate certain security-related tokens # A secret key that's used to generate certain security-related tokens
secret: ThisTokenIsNotSoSecretChangeIt secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv
# wallabag misc # wallabag misc
app.version: 2.0.0-alpha app.version: 2.0.0-alpha

View file

@ -21,6 +21,8 @@ parameters:
mailer_host: 127.0.0.1 mailer_host: 127.0.0.1
mailer_user: ~ mailer_user: ~
mailer_password: ~ mailer_password: ~
switftmailer_username: null
switftmailer_password: null
locale: en locale: en

View file

@ -21,6 +21,8 @@ parameters:
mailer_host: 127.0.0.1 mailer_host: 127.0.0.1
mailer_user: ~ mailer_user: ~
mailer_password: ~ mailer_password: ~
switftmailer_username: null
switftmailer_password: null
locale: en locale: en

View file

@ -21,6 +21,8 @@ parameters:
mailer_host: 127.0.0.1 mailer_host: 127.0.0.1
mailer_user: ~ mailer_user: ~
mailer_password: ~ mailer_password: ~
switftmailer_username: null
switftmailer_password: null
locale: en locale: en

View file

@ -9,6 +9,7 @@ use Nelmio\ApiDocBundle\Annotation\ApiDoc;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use Wallabag\CoreBundle\Entity\Entry; use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Entity\Tag; use Wallabag\CoreBundle\Entity\Tag;
@ -73,7 +74,6 @@ class WallabagRestController extends FOSRestController
$order = $request->query->get('order', 'desc'); $order = $request->query->get('order', 'desc');
$page = (int) $request->query->get('page', 1); $page = (int) $request->query->get('page', 1);
$perPage = (int) $request->query->get('perPage', 30); $perPage = (int) $request->query->get('perPage', 30);
$tags = $request->query->get('tags', []);
$pager = $this->getDoctrine() $pager = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Entry') ->getRepository('WallabagCoreBundle:Entry')

View file

@ -20,10 +20,6 @@ class Configuration implements ConfigurationInterface
$treeBuilder = new TreeBuilder(); $treeBuilder = new TreeBuilder();
$rootNode = $treeBuilder->root('wallabag_api'); $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; return $treeBuilder;
} }
} }

View file

@ -64,7 +64,6 @@ class InstallCommand extends ContainerAwareCommand
$fulfilled = true; $fulfilled = true;
// @TODO: find a better way to check requirements
$label = '<comment>PCRE</comment>'; $label = '<comment>PCRE</comment>';
if (extension_loaded('pcre')) { if (extension_loaded('pcre')) {
$status = '<info>OK!</info>'; $status = '<info>OK!</info>';

View file

@ -9,7 +9,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Wallabag\CoreBundle\Entity\Entry; 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\EditEntryType;
use Wallabag\CoreBundle\Form\Type\NewEntryType; use Wallabag\CoreBundle\Form\Type\NewEntryType;

View file

@ -16,11 +16,6 @@ class EditEntryType extends AbstractType
$builder $builder
->add('title', TextType::class, array('required' => true)) ->add('title', TextType::class, array('required' => true))
->add('is_public', CheckboxType::class, array('required' => false)) ->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) ->add('save', SubmitType::class)
; ;
} }

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Filter; namespace Wallabag\CoreBundle\Form\Type;
use Doctrine\ORM\EntityRepository; use Doctrine\ORM\EntityRepository;
use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface; use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface;

View file

@ -15,7 +15,7 @@ services:
- { name: form.type } - { name: form.type }
wallabag_core.filter.type.entry: wallabag_core.filter.type.entry:
class: Wallabag\CoreBundle\Filter\EntryFilterType class: Wallabag\CoreBundle\Form\Type\EntryFilterType
arguments: arguments:
- "@wallabag_core.entry_repository" - "@wallabag_core.entry_repository"
- "@security.token_storage" - "@security.token_storage"

View file

@ -564,7 +564,7 @@ img.preview {
height: 100%; height: 100%;
width: 100%; width: 100%;
margin: 0; margin: 0;
margin-top: -30% !important; /* TODO: get rid of !important here; overridden by .messages selector */ margin-top: -30% !important;
padding: 2em; padding: 2em;
display: none; display: none;
border-left: 1px #EEE solid; border-left: 1px #EEE solid;

View file

View file

View file

@ -23,7 +23,6 @@ class PocketImport implements ImportInterface
private $skippedEntries = 0; private $skippedEntries = 0;
private $importedEntries = 0; private $importedEntries = 0;
protected $accessToken; protected $accessToken;
private $translator;
public function __construct(TokenStorageInterface $tokenStorage, EntityManager $em, ContentProxy $contentProxy, $consumerKey) public function __construct(TokenStorageInterface $tokenStorage, EntityManager $em, ContentProxy $contentProxy, $consumerKey)
{ {
@ -177,9 +176,6 @@ class PocketImport implements ImportInterface
$this->client = $client; $this->client = $client;
} }
/**
* @todo move that in a more global place
*/
private function assignTagsToEntry(Entry $entry, $tags) private function assignTagsToEntry(Entry $entry, $tags)
{ {
foreach ($tags as $tag) { foreach ($tags as $tag) {