Fix after rebase

.env

@@ -14,7 +14,7 @@
 # Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
 # https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
 
-DOMAIN_NAME=https://your-wallabag-url.instance
+DOMAIN_NAME=https://your-wallabag-instance.wallabag.org
 SERVER_NAME="Your wallabag instance"
 
 # two factor stuff

config/wallabag.yaml

@@ -1,4 +1,4 @@
-wallabag_core:
+wallabag:
     version: 2.6.2
     paypal_url: "https://liberapay.com/wallabag/donate"
     languages:

src/Controller/Api/WallabagRestController.php

@@ -2,8 +2,9 @@
 
 namespace App\Controller\Api;
 
-use Craue\ConfigBundle\Util\Config;
+use App\Entity\ApplicationInfo;
 use App\Entity\User;
+use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use FOS\RestBundle\Controller\AbstractFOSRestController;
 use JMS\Serializer\SerializationContext;
@@ -17,7 +18,6 @@ use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInt
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use App\Entity\ApplicationInfo;
 
 class WallabagRestController extends AbstractFOSRestController
 {

src/DependencyInjection/WallabagExtension.php

@@ -22,6 +22,7 @@ class WallabagExtension extends Extension
         $container->setParameter('wallabag.cache_lifetime', $config['cache_lifetime']);
         $container->setParameter('wallabag.action_mark_as_read', $config['action_mark_as_read']);
         $container->setParameter('wallabag.list_mode', $config['list_mode']);
+        $container->setParameter('wallabag.display_thumbnails', $config['display_thumbnails']);
         $container->setParameter('wallabag.fetching_error_message', $config['fetching_error_message']);
         $container->setParameter('wallabag.fetching_error_message_title', $config['fetching_error_message_title']);
         $container->setParameter('wallabag.api_limit_mass_actions', $config['api_limit_mass_actions']);

src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\DependencyInjection;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-
-class WallabagCoreExtension extends Extension
-{
-    public function load(array $configs, ContainerBuilder $container)
-    {
-        $configuration = new Configuration();
-        $config = $this->processConfiguration($configuration, $configs);
-
-        $container->setParameter('wallabag_core.languages', $config['languages']);
-        $container->setParameter('wallabag_core.items_on_page', $config['items_on_page']);
-        $container->setParameter('wallabag_core.language', $config['language']);
-        $container->setParameter('wallabag_core.feed_limit', $config['rss_limit']);
-        $container->setParameter('wallabag_core.reading_speed', $config['reading_speed']);
-        $container->setParameter('wallabag_core.version', $config['version']);
-        $container->setParameter('wallabag_core.paypal_url', $config['paypal_url']);
-        $container->setParameter('wallabag_core.cache_lifetime', $config['cache_lifetime']);
-        $container->setParameter('wallabag_core.action_mark_as_read', $config['action_mark_as_read']);
-        $container->setParameter('wallabag_core.list_mode', $config['list_mode']);
-        $container->setParameter('wallabag_core.display_thumbnails', $config['display_thumbnails']);
-        $container->setParameter('wallabag_core.fetching_error_message', $config['fetching_error_message']);
-        $container->setParameter('wallabag_core.fetching_error_message_title', $config['fetching_error_message_title']);
-        $container->setParameter('wallabag_core.api_limit_mass_actions', $config['api_limit_mass_actions']);
-        $container->setParameter('wallabag_core.default_internal_settings', $config['default_internal_settings']);
-        $container->setParameter('wallabag_core.site_credentials.encryption_key_path', $config['encryption_key_path']);
-        $container->setParameter('wallabag_core.default_ignore_origin_instance_rules', $config['default_ignore_origin_instance_rules']);
-    }
-
-    public function getAlias()
-    {
-        return 'wallabag_core';
-    }
-}

src/Wallabag/UserBundle/Resources/translations/wallabag_user.da.yml

@@ -1 +0,0 @@
-{}

tests/Controller/Api/WallabagRestControllerTest.php

@@ -2,8 +2,8 @@
 
 namespace App\Tests\Controller\Api;
 
-use Craue\ConfigBundle\Util\Config;
 use App\Tests\WallabagApiTestCase;
+use Craue\ConfigBundle\Util\Config;
 
 class WallabagRestControllerTest extends WallabagApiTestCase
 {