mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-23 08:06:33 +00:00
Code Issues Projects Releases Wiki Activity

Replace kernel.root_dir by kernel.project_dir

Browse source
This commit is contained in:
Yassine Guedidi 2023-08-07 22:22:35 +01:00
parent f4fd8e4675
commit cc33fcb4ba
5 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/AppKernel.php
View file

@ -62,11 +62,6 @@ class AppKernel extends Kernel
return $bundles; return $bundles;
} }
public function getRootDir()
{
return __DIR__;
}
public function getCacheDir() public function getCacheDir()
{ {
return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment(); return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment();
@ -79,7 +74,7 @@ class AppKernel extends Kernel
public function registerContainerConfiguration(LoaderInterface $loader) public function registerContainerConfiguration(LoaderInterface $loader)
{ {
$loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml'); $loader->load($this->getProjectDir() . '/app/config/config_' . $this->getEnvironment() . '.yml');
$loader->load(function ($container) { $loader->load(function ($container) {
if ($container->getParameter('use_webpack_dev_server')) { if ($container->getParameter('use_webpack_dev_server')) {

2
app/config/services.yml
View file

@ -12,7 +12,7 @@ services:
autoconfigure: true autoconfigure: true
public: true public: true
bind: bind:
$rootDir: '%kernel.root_dir%' $projectDir: '%kernel.project_dir%'
$debug: '%kernel.debug%' $debug: '%kernel.debug%'
$defaultLocale: '%kernel.default_locale%' $defaultLocale: '%kernel.default_locale%'
$wallabagUrl: '%domain_name%' $wallabagUrl: '%domain_name%'

10
app/config/webpack/common.js
View file

@ -2,16 +2,16 @@ const path = require('path');
const webpack = require('webpack'); const webpack = require('webpack');
const StyleLintPlugin = require('stylelint-webpack-plugin'); const StyleLintPlugin = require('stylelint-webpack-plugin');
const rootDir = path.resolve(__dirname, '../../../'); const projectDir = path.resolve(__dirname, '../../../');
module.exports = { module.exports = {
entry: { entry: {
material: path.join(rootDir, './app/Resources/static/themes/material/index.js'), material: path.join(projectDir, './app/Resources/static/themes/material/index.js'),
public: path.join(rootDir, './app/Resources/static/themes/_global/share.js'), public: path.join(projectDir, './app/Resources/static/themes/_global/share.js'),
}, },
output: { output: {
filename: '[name].js', filename: '[name].js',
path: path.resolve(rootDir, 'web/wallassets'), path: path.resolve(projectDir, 'web/wallassets'),
publicPath: '', publicPath: '',
}, },
plugins: [ plugins: [
@ -31,7 +31,7 @@ module.exports = {
], ],
resolve: { resolve: {
alias: { alias: {
jquery: path.join(rootDir, 'node_modules/jquery/dist/jquery.js'), jquery: path.join(projectDir, 'node_modules/jquery/dist/jquery.js'),
}, },
}, },
}; };

2
docker/php/config/parameters.yml
View file

@ -6,7 +6,7 @@ parameters:
database_name: ${DATABASE_NAME:-symfony} database_name: ${DATABASE_NAME:-symfony}
database_user: ${DATABASE_USER:-root} database_user: ${DATABASE_USER:-root}
database_password: ${DATABASE_PASSWORD:-~} database_password: ${DATABASE_PASSWORD:-~}
database_path: '${DATABASE_PATH:-"%kernel.root_dir%/data/db/wallabag.sqlite"}' database_path: '${DATABASE_PATH:-"%kernel.project_dir%/data/db/wallabag.sqlite"}'
database_table_prefix: ${DATABASE_TABLE_PREFIX:-wallabag_} database_table_prefix: ${DATABASE_TABLE_PREFIX:-wallabag_}
database_socket: null database_socket: null
database_charset: ${DATABASE_CHARSET:-utf8} database_charset: ${DATABASE_CHARSET:-utf8}

8
src/Wallabag/CoreBundle/Twig/WallabagExtension.php
View file

@ -19,16 +19,16 @@ class WallabagExtension extends AbstractExtension implements GlobalsInterface
private $tagRepository; private $tagRepository;
private $lifeTime; private $lifeTime;
private $translator; private $translator;
private $rootDir; private $projectDir;
public function __construct(EntryRepository $entryRepository, TagRepository $tagRepository, TokenStorageInterface $tokenStorage, $lifeTime, TranslatorInterface $translator, string $rootDir) public function __construct(EntryRepository $entryRepository, TagRepository $tagRepository, TokenStorageInterface $tokenStorage, $lifeTime, TranslatorInterface $translator, string $projectDir)
{ {
$this->entryRepository = $entryRepository; $this->entryRepository = $entryRepository;
$this->tagRepository = $tagRepository; $this->tagRepository = $tagRepository;
$this->tokenStorage = $tokenStorage; $this->tokenStorage = $tokenStorage;
$this->lifeTime = $lifeTime; $this->lifeTime = $lifeTime;
$this->translator = $translator; $this->translator = $translator;
$this->rootDir = $rootDir; $this->projectDir = $projectDir;
} }
public function getGlobals(): array public function getGlobals(): array
@ -174,7 +174,7 @@ class WallabagExtension extends AbstractExtension implements GlobalsInterface
public function assetFileExists($name) public function assetFileExists($name)
{ {
return file_exists(realpath($this->rootDir . '/../web/' . $name)); return file_exists(realpath($this->projectDir . '/web/' . $name));
} }
public function themeClass() public function themeClass()