diff options
author | Nicolas Hart <contact@nclshart.net> | 2017-10-13 23:52:15 +0200 |
---|---|---|
committer | Nicolas Hart <contact@nclshart.net> | 2017-10-14 00:32:56 +0200 |
commit | 9ca069a6fea67ddf2ef44601901ea3c02e3cffbe (patch) | |
tree | 55bc8ee87f1f758bea7617bc24bc02c4a0c19408 /src | |
parent | f44a927530476eaf903525481e5e8114c3b017b8 (diff) | |
download | wallabag-9ca069a6fea67ddf2ef44601901ea3c02e3cffbe.tar.gz wallabag-9ca069a6fea67ddf2ef44601901ea3c02e3cffbe.tar.zst wallabag-9ca069a6fea67ddf2ef44601901ea3c02e3cffbe.zip |
Replace kernel.root_dir by kernel.project_dir
kernel.root_dir and Kernel::getRootDir() are deprecated since Symfony 3.3.
See https://symfony.com/blog/new-in-symfony-3-3-a-simpler-way-to-get-the-project-root-directory and https://github.com/symfony/symfony/blob/3.3/UPGRADE-3.3.md#httpkernel for more information.
Diffstat (limited to 'src')
-rw-r--r-- | src/Wallabag/CoreBundle/Command/ExportCommand.php | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/config/services.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Command/ExportCommand.php b/src/Wallabag/CoreBundle/Command/ExportCommand.php index b07087c8..75e9ad91 100644 --- a/src/Wallabag/CoreBundle/Command/ExportCommand.php +++ b/src/Wallabag/CoreBundle/Command/ExportCommand.php | |||
@@ -52,7 +52,7 @@ class ExportCommand extends ContainerAwareCommand | |||
52 | $filePath = $input->getArgument('filepath'); | 52 | $filePath = $input->getArgument('filepath'); |
53 | 53 | ||
54 | if (!$filePath) { | 54 | if (!$filePath) { |
55 | $filePath = $this->getContainer()->getParameter('kernel.root_dir') . '/../' . sprintf('%s-export.json', $user->getUsername()); | 55 | $filePath = $this->getContainer()->getParameter('kernel.project_dir') . '/' . sprintf('%s-export.json', $user->getUsername()); |
56 | } | 56 | } |
57 | 57 | ||
58 | try { | 58 | try { |
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index caef2c8d..31b16739 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -205,7 +205,7 @@ services: | |||
205 | class: Wallabag\CoreBundle\Helper\DownloadImages | 205 | class: Wallabag\CoreBundle\Helper\DownloadImages |
206 | arguments: | 206 | arguments: |
207 | - "@wallabag_core.entry.download_images.client" | 207 | - "@wallabag_core.entry.download_images.client" |
208 | - "%kernel.root_dir%/../web/assets/images" | 208 | - "%kernel.project_dir%/web/assets/images" |
209 | - '%domain_name%' | 209 | - '%domain_name%' |
210 | - "@logger" | 210 | - "@logger" |
211 | 211 | ||