diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 0c0cbff1c..11d31b24a 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -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 diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index 88b1d2b40..bd45f0916 100644 --- a/app/config/tests/parameters.yml.dist.mysql +++ b/app/config/tests/parameters.yml.dist.mysql @@ -21,6 +21,8 @@ parameters: mailer_host: 127.0.0.1 mailer_user: ~ mailer_password: ~ + switftmailer_username: null + switftmailer_password: null locale: en diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index 3c61142dd..8352a1ad5 100644 --- a/app/config/tests/parameters.yml.dist.pgsql +++ b/app/config/tests/parameters.yml.dist.pgsql @@ -21,6 +21,8 @@ parameters: mailer_host: 127.0.0.1 mailer_user: ~ mailer_password: ~ + switftmailer_username: null + switftmailer_password: null locale: en diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite index 2f7699b57..617e9f042 100644 --- a/app/config/tests/parameters.yml.dist.sqlite +++ b/app/config/tests/parameters.yml.dist.sqlite @@ -21,6 +21,8 @@ parameters: mailer_host: 127.0.0.1 mailer_user: ~ mailer_password: ~ + switftmailer_username: null + switftmailer_password: null locale: en diff --git a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php index d9035cac7..84bc14a95 100644 --- a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php +++ b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php @@ -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') diff --git a/src/Wallabag/ApiBundle/DependencyInjection/Configuration.php b/src/Wallabag/ApiBundle/DependencyInjection/Configuration.php index cec454124..f70a58358 100644 --- a/src/Wallabag/ApiBundle/DependencyInjection/Configuration.php +++ b/src/Wallabag/ApiBundle/DependencyInjection/Configuration.php @@ -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; } } diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php index da099a19b..63032dbb6 100644 --- a/src/Wallabag/CoreBundle/Command/InstallCommand.php +++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php @@ -64,7 +64,6 @@ class InstallCommand extends ContainerAwareCommand $fulfilled = true; - // @TODO: find a better way to check requirements $label = 'PCRE'; if (extension_loaded('pcre')) { $status = 'OK!'; diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 3e1b512ff..747976e35 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php @@ -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; diff --git a/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php b/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php index 0cb298818..2b1e1ef43 100644 --- a/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php +++ b/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php @@ -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) ; } diff --git a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php similarity index 98% rename from src/Wallabag/CoreBundle/Filter/EntryFilterType.php rename to src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php index c38be8320..ee10bc8b5 100644 --- a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php +++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php @@ -1,6 +1,6 @@ client = $client; } - /** - * @todo move that in a more global place - */ private function assignTagsToEntry(Entry $entry, $tags) { foreach ($tags as $tag) {