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

Merge pull request #3382 from nclsHart/replace-kernel-rootdir

Browse source 
Replace kernel.root_dir by kernel.project_dir
This commit is contained in:
Jérémy Benoist 2017-10-15 09:24:32 +02:00 committed by GitHub
commit 3930201003
11 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/AppKernel.php
View file

@ -58,11 +58,6 @@ class AppKernel extends Kernel
return $bundles;
}
public function getRootDir()
{
return __DIR__;
}
public function getCacheDir()
{
return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment();
@ -75,7 +70,7 @@ class AppKernel extends Kernel
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) {
if ($container->getParameter('use_webpack_dev_server')) {
$container->loadFromExtension('framework', [

6
app/config/config.yml
View file

@ -16,7 +16,7 @@ framework:
fallback: "%locale%"
secret: "%secret%"
router:
resource: "%kernel.root_dir%/config/routing.yml"
resource: "%kernel.project_dir%/app/config/routing.yml"
strict_requirements: ~
form: ~
csrf_protection: ~
@ -30,7 +30,7 @@ framework:
session:
# handler_id set to null will use default session handler from php.ini
handler_id: session.handler.native_file
save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%"
save_path: "%kernel.project_dir%/var/sessions/%kernel.environment%"
fragments: ~
http_method_override: true
assets: ~
@ -72,7 +72,7 @@ stof_doctrine_extensions:
sluggable: true
doctrine_migrations:
dir_name: "%kernel.root_dir%/DoctrineMigrations"
dir_name: "%kernel.project_dir%/app/DoctrineMigrations"
namespace: Application\Migrations
table_name: migration_versions
name: Application Migrations

2
app/config/config_dev.yml
View file

@ -3,7 +3,7 @@ imports:
framework:
router:
resource: "%kernel.root_dir%/config/routing_dev.yml"
resource: "%kernel.project_dir%/app/config/routing_dev.yml"
strict_requirements: true
profiler:
only_exceptions: false

2
app/config/config_prod.yml
View file

@ -3,7 +3,7 @@ imports:
framework:
assets:
# json_manifest_path: '%kernel.root_dir%/../web/bundles/wallabagcore/manifest.json'
# json_manifest_path: '%kernel.project_dir%/web/bundles/wallabagcore/manifest.json'
#doctrine:
# orm:

2
app/config/parameters.yml.dist
View file

@ -16,7 +16,7 @@ parameters:
database_name: wallabag
database_user: root
database_password: ~
# For SQLite, database_path should be "%kernel.root_dir%/../data/db/wallabag.sqlite"
# For SQLite, database_path should be "%kernel.project_dir%/data/db/wallabag.sqlite"
database_path: null
database_table_prefix: wallabag_
database_socket: null

2
app/config/parameters_test.yml
View file

@ -6,5 +6,5 @@ parameters:
test_database_user: null
test_database_password: null
test_database_path: "%env(TEST_DATABASE_PATH)%"
env(TEST_DATABASE_PATH): "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
env(TEST_DATABASE_PATH): "%kernel.project_dir%/data/db/wallabag_test.sqlite"
test_database_charset: utf8

2
app/config/tests/parameters_test.sqlite.yml
View file

@ -8,5 +8,5 @@ parameters:
# Using an environnement variable in order to avoid the error "attempt to write a readonly database"
# when the schema is dropped then recreate
test_database_path: "%env(TEST_DATABASE_PATH)%"
env(TEST_DATABASE_PATH): "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
env(TEST_DATABASE_PATH): "%kernel.project_dir%/data/db/wallabag_test.sqlite"
test_database_charset: utf8

4
app/config/wallabag.yml
View file

@ -27,7 +27,7 @@ wallabag_core:
fetching_error_message: |
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>.
api_limit_mass_actions: 10
encryption_key_path: "%kernel.root_dir%/../data/site-credentials-secret-key.txt"
encryption_key_path: "%kernel.project_dir%/data/site-credentials-secret-key.txt"
default_internal_settings:
-
name: share_public
@ -159,4 +159,4 @@ wallabag_user:
wallabag_import:
allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv']
resource_dir: "%kernel.root_dir%/../web/uploads/import"
resource_dir: "%kernel.project_dir%/web/uploads/import"

2
src/Wallabag/CoreBundle/Command/ExportCommand.php
View file

@ -52,7 +52,7 @@ class ExportCommand extends ContainerAwareCommand
$filePath = $input->getArgument('filepath');
if (!$filePath) {
$filePath = $this->getContainer()->getParameter('kernel.root_dir') . '/../' . sprintf('%s-export.json', $user->getUsername());
$filePath = $this->getContainer()->getParameter('kernel.project_dir') . '/' . sprintf('%s-export.json', $user->getUsername());
}
try {

2
src/Wallabag/CoreBundle/Resources/config/services.yml
View file

@ -205,7 +205,7 @@ services:
class: Wallabag\CoreBundle\Helper\DownloadImages
arguments:
- "@wallabag_core.entry.download_images.client"
- "%kernel.root_dir%/../web/assets/images"
- "%kernel.project_dir%/web/assets/images"
- '%domain_name%'
- "@logger"

4
tests/Wallabag/ImportBundle/Command/ImportCommandTest.php
View file

@ -74,7 +74,7 @@ class ImportCommandTest extends WallabagCoreTestCase
$tester->execute([
'command' => $command->getName(),
'username' => 'admin',
'filepath' => $application->getKernel()->getContainer()->getParameter('kernel.root_dir') . '/../tests/Wallabag/ImportBundle/fixtures/wallabag-v2-read.json',
'filepath' => $application->getKernel()->getContainer()->getParameter('kernel.project_dir') . '/tests/Wallabag/ImportBundle/fixtures/wallabag-v2-read.json',
'--importer' => 'v2',
]);
@ -93,7 +93,7 @@ class ImportCommandTest extends WallabagCoreTestCase
$tester->execute([
'command' => $command->getName(),
'username' => 1,
'filepath' => $application->getKernel()->getContainer()->getParameter('kernel.root_dir') . '/../tests/Wallabag/ImportBundle/fixtures/wallabag-v2-read.json',
'filepath' => $application->getKernel()->getContainer()->getParameter('kernel.project_dir') . '/tests/Wallabag/ImportBundle/fixtures/wallabag-v2-read.json',
'--useUserId' => true,
'--importer' => 'v2',
]);