Skip to content

Replaced kernel.root_dir by kernel.project_dir #568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 30, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ framework:
translator: { fallback: '%locale%' }
secret: '%env(SYMFONY_SECRET)%'
router:
resource: '%kernel.root_dir%/config/routing.yml'
resource: '%kernel.project_dir%/app/config/routing.yml'
strict_requirements: ~
form: ~
csrf_protection: ~
Expand Down
2 changes: 1 addition & 1 deletion app/config/config_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand Down
2 changes: 1 addition & 1 deletion app/config/config_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ web_profiler:
# In this case we just need to define a different path for the application database.
doctrine:
dbal:
path: "%kernel.root_dir%/../var/data/blog_test.sqlite"
path: "%kernel.project_dir%/var/data/blog_test.sqlite"

# this configuration simplifies testing URLs protected by the security mechanism
# See https://symfony.com/doc/current/cookbook/testing/http_authentication.html
Expand Down
2 changes: 1 addition & 1 deletion app/config/parameters.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ parameters:
# this demo application uses an embedded SQLite database to simplify setup.
# in a real Symfony application you probably will use a MySQL or PostgreSQL database
# the path must be relative or else it will not work on Windows
env(DATABASE_URL): 'sqlite:///%kernel.root_dir%/../var/data/blog.sqlite'
env(DATABASE_URL): 'sqlite:///%kernel.project_dir%/var/data/blog.sqlite'

# Uncomment this line to use a MySQL database instead of SQLite (and remove
# the "doctrine" section from config_dev.yml regarding SQLite):
Expand Down
1 change: 0 additions & 1 deletion src/CodeExplorerBundle/Resources/config/services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ services:
code_explorer.twig.source_code_extension:
public: false
class: CodeExplorerBundle\Twig\SourceCodeExtension
arguments: ['%kernel.root_dir%']
tags:
- { name: twig.extension }

Expand Down
6 changes: 0 additions & 6 deletions src/CodeExplorerBundle/Twig/SourceCodeExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@
class SourceCodeExtension extends \Twig_Extension
{
private $controller;
private $kernelRootDir;

public function __construct($kernelRootDir)
{
$this->kernelRootDir = $kernelRootDir;
}

public function setController($controller)
{
Expand Down