aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--app/DoctrineMigrations/Version20170606155640.php3
-rw-r--r--app/config/parameters.yml.dist2
-rw-r--r--app/config/parameters_test.yml1
-rw-r--r--app/config/wallabag.yml1
-rw-r--r--src/Wallabag/CoreBundle/DependencyInjection/Configuration.php2
-rw-r--r--src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php1
-rw-r--r--src/Wallabag/CoreBundle/Resources/config/services.yml2
-rw-r--r--tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php2
8 files changed, 5 insertions, 9 deletions
diff --git a/app/DoctrineMigrations/Version20170606155640.php b/app/DoctrineMigrations/Version20170606155640.php
index 1b234044..e9b50428 100644
--- a/app/DoctrineMigrations/Version20170606155640.php
+++ b/app/DoctrineMigrations/Version20170606155640.php
@@ -8,7 +8,8 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface;
8use Symfony\Component\DependencyInjection\ContainerInterface; 8use Symfony\Component\DependencyInjection\ContainerInterface;
9 9
10/** 10/**
11 * Add api_user_registration in craue_config_setting. 11 * Remove wallabag_url from craue_config_setting.
12 * It has been moved into the parameters.yml
12 */ 13 */
13class Version20170606155640 extends AbstractMigration implements ContainerAwareInterface 14class Version20170606155640 extends AbstractMigration implements ContainerAwareInterface
14{ 15{
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index c00ffb0e..d827219a 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -23,7 +23,7 @@ parameters:
23 # with PostgreSQL and SQLite, you must set "utf8" 23 # with PostgreSQL and SQLite, you must set "utf8"
24 database_charset: utf8mb4 24 database_charset: utf8mb4
25 25
26 domain_name: wallabag.me 26 domain_name: http://your-wallabag-url-instance.com
27 27
28 mailer_transport: smtp 28 mailer_transport: smtp
29 mailer_host: 127.0.0.1 29 mailer_host: 127.0.0.1
diff --git a/app/config/parameters_test.yml b/app/config/parameters_test.yml
index 92f0364f..010785e6 100644
--- a/app/config/parameters_test.yml
+++ b/app/config/parameters_test.yml
@@ -8,4 +8,3 @@ parameters:
8 test_database_path: "%env(TEST_DATABASE_PATH)%" 8 test_database_path: "%env(TEST_DATABASE_PATH)%"
9 env(TEST_DATABASE_PATH): "%kernel.root_dir%/../data/db/wallabag_test.sqlite" 9 env(TEST_DATABASE_PATH): "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
10 test_database_charset: utf8 10 test_database_charset: utf8
11 domain_name: 'http://v2.wallabag.org'
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
index d03450a0..51b7e4e3 100644
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@@ -26,7 +26,6 @@ wallabag_core:
26 fetching_error_message: | 26 fetching_error_message: |
27 wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>. 27 wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
28 api_limit_mass_actions: 10 28 api_limit_mass_actions: 10
29 domain_name: '%domain_name%'
30 default_internal_settings: 29 default_internal_settings:
31 - 30 -
32 name: share_public 31 name: share_public
diff --git a/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php b/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php
index a6f53714..33df92d3 100644
--- a/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php
+++ b/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php
@@ -63,8 +63,6 @@ class Configuration implements ConfigurationInterface
63 ->end() 63 ->end()
64 ->end() 64 ->end()
65 ->end() 65 ->end()
66 ->scalarNode('domain_name')
67 ->end()
68 ->end() 66 ->end()
69 ; 67 ;
70 68
diff --git a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
index d0b4351e..b4d8a386 100644
--- a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
+++ b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
@@ -29,7 +29,6 @@ class WallabagCoreExtension extends Extension
29 $container->setParameter('wallabag_core.fetching_error_message_title', $config['fetching_error_message_title']); 29 $container->setParameter('wallabag_core.fetching_error_message_title', $config['fetching_error_message_title']);
30 $container->setParameter('wallabag_core.api_limit_mass_actions', $config['api_limit_mass_actions']); 30 $container->setParameter('wallabag_core.api_limit_mass_actions', $config['api_limit_mass_actions']);
31 $container->setParameter('wallabag_core.default_internal_settings', $config['default_internal_settings']); 31 $container->setParameter('wallabag_core.default_internal_settings', $config['default_internal_settings']);
32 $container->setParameter('wallabag_core.domain_name', $config['domain_name']);
33 32
34 $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); 33 $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
35 $loader->load('services.yml'); 34 $loader->load('services.yml');
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index 6e2c9761..8b00700f 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -195,7 +195,7 @@ services:
195 arguments: 195 arguments:
196 - "@wallabag_core.entry.download_images.client" 196 - "@wallabag_core.entry.download_images.client"
197 - "%kernel.root_dir%/../web/assets/images" 197 - "%kernel.root_dir%/../web/assets/images"
198 - '%wallabag_core.domain_name%' 198 - '%domain_name%'
199 - "@logger" 199 - "@logger"
200 200
201 wallabag_core.entry.download_images.client: 201 wallabag_core.entry.download_images.client:
diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
index cc7b3672..581ee952 100644
--- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
@@ -1000,7 +1000,7 @@ class EntryControllerTest extends WallabagCoreTestCase
1000 $this->assertEquals($url, $entry->getUrl()); 1000 $this->assertEquals($url, $entry->getUrl());
1001 $this->assertContains('Perpignan', $entry->getTitle()); 1001 $this->assertContains('Perpignan', $entry->getTitle());
1002 // instead of checking for the filename (which might change) check that the image is now local 1002 // instead of checking for the filename (which might change) check that the image is now local
1003 $this->assertContains('http://v2.wallabag.org/assets/images/', $entry->getContent()); 1003 $this->assertContains('http://your-wallabag-url-instance.com/assets/images/', $entry->getContent());
1004 1004
1005 $client->getContainer()->get('craue_config')->set('download_images_enabled', 0); 1005 $client->getContainer()->get('craue_config')->set('download_images_enabled', 0);
1006 } 1006 }