minor #7829 replace kernel.root_dir with kernel.project_dir (xabbuh, javiereguiluz)

javiereguiluz · javiereguiluz · commit 6dc4742fd117 · 2017-04-24T15:15:17.000+02:00
This PR was merged into the master branch. Discussion ---------- replace kernel.root_dir with kernel.project_dir see #7768 Commits ------- 3c0ba11 Fixed a path b49da4a replace kernel.root_dir with kernel.project_dir
diff --git a/assetic/yuicompressor.rst b/assetic/yuicompressor.rst
@@ -38,9 +38,9 @@ stylesheets:
             # java: '/usr/bin/java'
             filters:
                 yui_css:
-                    jar: '%kernel.root_dir%/Resources/java/yuicompressor.jar'
+                    jar: '%kernel.project_dir%/app/Resources/java/yuicompressor.jar'
                 yui_js:
-                    jar: '%kernel.root_dir%/Resources/java/yuicompressor.jar'
+                    jar: '%kernel.project_dir%/app/Resources/java/yuicompressor.jar'
 
     .. code-block:: xml
 
@@ -57,10 +57,10 @@ stylesheets:
             <assetic:config>
                 <assetic:filter
                     name="yui_css"
-                    jar="%kernel.root_dir%/Resources/java/yuicompressor.jar" />
+                    jar="%kernel.project_dir%/app/Resources/java/yuicompressor.jar" />
                 <assetic:filter
                     name="yui_js"
-                    jar="%kernel.root_dir%/Resources/java/yuicompressor.jar" />
+                    jar="%kernel.project_dir%/app/Resources/java/yuicompressor.jar" />
             </assetic:config>
         </container>
 
@@ -71,10 +71,10 @@ stylesheets:
             // 'java' => '/usr/bin/java',
             'filters' => array(
                 'yui_css' => array(
-                    'jar' => '%kernel.root_dir%/Resources/java/yuicompressor.jar',
+                    'jar' => '%kernel.project_dir%/app/Resources/java/yuicompressor.jar',
                 ),
                 'yui_js' => array(
-                    'jar' => '%kernel.root_dir%/Resources/java/yuicompressor.jar',
+                    'jar' => '%kernel.project_dir%/app/Resources/java/yuicompressor.jar',
                 ),
             ),
         ));
diff --git a/bundles/installation.rst b/bundles/installation.rst
@@ -125,7 +125,7 @@ The output will look like this:
         use_controller:
             enabled:              '%kernel.debug%'
             profiler:             false
-        read_from:            '%kernel.root_dir%/../web'
+        read_from:            '%kernel.project_dir%/web'
         write_to:             '%assetic.read_from%'
         java:                 /usr/bin/java
         node:                 /usr/local/bin/node
diff --git a/components/dependency_injection/_imports-parameters-note.rst.inc b/components/dependency_injection/_imports-parameters-note.rst.inc
@@ -10,7 +10,7 @@
 
             # app/config/config.yml
             imports:
-                - { resource: '%kernel.root_dir%/parameters.yml' }
+                - { resource: '%kernel.project_dir%/app/parameters.yml' }
 
         .. code-block:: xml
 
@@ -22,11 +22,11 @@
                     http://symfony.com/schema/dic/services/services-1.0.xsd">
 
                 <imports>
-                    <import resource="%kernel.root_dir%/parameters.yml" />
+                    <import resource="%kernel.project_dir%/app/parameters.yml" />
                 </imports>
             </container>
 
         .. code-block:: php
 
             // app/config/config.php
-            $loader->import('%kernel.root_dir%/parameters.yml');
+            $loader->import('%kernel.project_dir%/app/parameters.yml');
diff --git a/configuration.rst b/configuration.rst
@@ -25,7 +25,7 @@ The main configuration file is called ``config.yml``:
 
         framework:
             secret:          '%secret%'
-            router:          { resource: '%kernel.root_dir%/config/routing.yml' }
+            router:          { resource: '%kernel.project_dir%/app/config/routing.yml' }
             # ...
 
         # Twig Configuration
@@ -57,7 +57,7 @@ The main configuration file is called ``config.yml``:
             </imports>
 
             <framework:config secret="%secret%">
-                <framework:router resource="%kernel.root_dir%/config/routing.xml" />
+                <framework:router resource="%kernel.project_dir%/app/config/routing.xml" />
                 <!-- ... -->
             </framework:config>
 
@@ -77,7 +77,7 @@ The main configuration file is called ``config.yml``:
         $container->loadFromExtension('framework', array(
             'secret' => '%secret%',
             'router' => array(
-                'resource' => '%kernel.root_dir%/config/routing.php',
+                'resource' => '%kernel.project_dir%/app/config/routing.php',
             ),
             // ...
         ));
diff --git a/configuration/configuration_organization.rst b/configuration/configuration_organization.rst
@@ -23,7 +23,7 @@ class::
 
         public function registerContainerConfiguration(LoaderInterface $loader)
         {
-            $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
+            $loader->load($this->getProjectDir().'/app/config/config_'.$this->getEnvironment().'.yml');
         }
     }
 
@@ -99,7 +99,7 @@ method::
 
         public function registerContainerConfiguration(LoaderInterface $loader)
         {
-            $loader->load($this->getRootDir().'/config/'.$this->getEnvironment().'/config.yml');
+            $loader->load($this->getProjectDir().'/app/config/'.$this->getEnvironment().'/config.yml');
         }
     }
 
@@ -196,7 +196,7 @@ make Symfony aware of the new file organization::
 
         public function registerContainerConfiguration(LoaderInterface $loader)
         {
-            $loader->load($this->getRootDir().'/config/environments/'.$this->getEnvironment().'.yml');
+            $loader->load($this->getProjectDir().'/app/config/environments/'.$this->getEnvironment().'.yml');
         }
     }
 
diff --git a/configuration/environments.rst b/configuration/environments.rst
@@ -45,7 +45,7 @@ class:
 
         public function registerContainerConfiguration(LoaderInterface $loader)
         {
-            $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
+            $loader->load($this->getProjectDir().'/app/config/config_'.$this->getEnvironment().'.yml');
         }
     }
 
diff --git a/configuration/multiple_kernels.rst b/configuration/multiple_kernels.rst
@@ -101,7 +101,7 @@ they don't collide with the files from ``AppKernel``::
 
         public function registerContainerConfiguration(LoaderInterface $loader)
         {
-            $loader->load($this->getRootDir().'/config/api/config_'.$this->getEnvironment().'.yml');
+            $loader->load($this->getProjectDir().'/app/config/api/config_'.$this->getEnvironment().'.yml');
         }
     }
 
@@ -176,7 +176,7 @@ In order to solve this issue, add the following configuration to your kernel:
     twig:
         paths:
             # allows to use app/Resources/views/ templates in the ApiKernel
-            "%kernel.root_dir%/../app/Resources/views": ~
+            "%kernel.project_dir%/app/Resources/views": ~
 
 Adding more Kernels to the Application
 --------------------------------------
diff --git a/configuration/override_dir_structure.rst b/configuration/override_dir_structure.rst
@@ -135,7 +135,7 @@ You also need to change the ``extra.symfony-web-dir`` option in the
             # ...
             assetic:
                 # ...
-                read_from: '%kernel.root_dir%/../../public_html'
+                read_from: '%kernel.project_dir%/../public_html'
 
         .. code-block:: xml
 
@@ -150,7 +150,7 @@ You also need to change the ``extra.symfony-web-dir`` option in the
                     http://symfony.com/schema/dic/assetic/assetic-1.0.xsd">
 
                 <!-- ... -->
-                <assetic:config read-from="%kernel.root_dir%/../../public_html" />
+                <assetic:config read-from="%kernel.project_dir%/../public_html" />
             </container>
 
         .. code-block:: php
@@ -160,7 +160,7 @@ You also need to change the ``extra.symfony-web-dir`` option in the
             // ...
             $container->loadFromExtension('assetic', array(
                 // ...
-                'read_from' => '%kernel.root_dir%/../../public_html',
+                'read_from' => '%kernel.project_dir%/../public_html',
             ));
 
     Now you just need to clear the cache and dump the assets again and your
diff --git a/controller/upload_file.rst b/controller/upload_file.rst
@@ -165,7 +165,7 @@ controller to specify the directory in which the brochures should be stored:
 
     # ...
     parameters:
-        brochures_directory: '%kernel.root_dir%/../web/uploads/brochures'
+        brochures_directory: '%kernel.project_dir%/web/uploads/brochures'
 
 There are some important things to consider in the code of the above controller:
 
diff --git a/doctrine.rst b/doctrine.rst
@@ -207,7 +207,7 @@ can automatically generate an empty ``test_project`` database for you:
             doctrine:
                 dbal:
                     driver: pdo_sqlite
-                    path: '%kernel.root_dir%/sqlite.db'
+                    path: '%kernel.project_dir%/app/sqlite.db'
                     charset: UTF8
 
         .. code-block:: xml
@@ -225,7 +225,7 @@ can automatically generate an empty ``test_project`` database for you:
                 <doctrine:config>
                     <doctrine:dbal
                         driver="pdo_sqlite"
-                        path="%kernel.root_dir%/sqlite.db"
+                        path="%kernel.project_dir%/app/sqlite.db"
                         charset="UTF-8" />
                 </doctrine:config>
             </container>
@@ -236,7 +236,7 @@ can automatically generate an empty ``test_project`` database for you:
             $container->loadFromExtension('doctrine', array(
                 'dbal' => array(
                     'driver'  => 'pdo_sqlite',
-                    'path'    => '%kernel.root_dir%/sqlite.db',
+                    'path'    => '%kernel.project_dir%/app/sqlite.db',
                     'charset' => 'UTF-8',
                 ),
             ));
diff --git a/email/spool.rst b/email/spool.rst
@@ -111,12 +111,12 @@ In order to use the spool with files, use the following configuration:
 .. tip::
 
     If you want to store the spool somewhere with your project directory,
-    remember that you can use the ``%kernel.root_dir%`` parameter to reference
+    remember that you can use the ``%kernel.project_dir%`` parameter to reference
     the project's root:
 
     .. code-block:: yaml
 
-        path: '%kernel.root_dir%/spool'
+        path: '%kernel.project_dir%/app/spool'
 
 Now, when your app sends an email, it will not actually be sent but instead
 added to the spool. Sending the messages from the spool is done separately.
diff --git a/frontend/custom_version_strategy.rst b/frontend/custom_version_strategy.rst
@@ -117,7 +117,7 @@ After creating the strategy PHP class, register it as a Symfony service.
             app.assets.versioning.gulp_buster:
                 class: AppBundle\Asset\VersionStrategy\GulpBusterVersionStrategy
                 arguments:
-                    - "%kernel.root_dir%/../busters.json"
+                    - "%kernel.project_dir%/busters.json"
                     - "%%s?version=%%s"
                 public: false
 
@@ -133,7 +133,7 @@ After creating the strategy PHP class, register it as a Symfony service.
             <services>
                 <service id="app.assets.versioning.gulp_buster"
                  class="AppBundle\Asset\VersionStrategy\GulpBusterVersionStrategy" public="false">
-                    <argument>%kernel.root_dir%/../busters.json</argument>
+                    <argument>%kernel.project_dir%/busters.json</argument>
                     <argument>%%s?version=%%s</argument>
                 </service>
             </services>
@@ -147,7 +147,7 @@ After creating the strategy PHP class, register it as a Symfony service.
         $definition = new Definition(
             'AppBundle\Asset\VersionStrategy\GulpBusterVersionStrategy',
             array(
-                '%kernel.root_dir%/../busters.json',
+                '%kernel.project_dir%/busters.json',
                 '%%s?version=%%s',
             )
         );
diff --git a/quick_tour/the_architecture.rst b/quick_tour/the_architecture.rst
@@ -156,7 +156,7 @@ or PHP. Have a look at this sample of the default Symfony configuration:
         #translator:      { fallbacks: ['%locale%'] }
         secret:          '%secret%'
         router:
-            resource: '%kernel.root_dir%/config/routing.yml'
+            resource: '%kernel.project_dir%/app/config/routing.yml'
             strict_requirements: '%kernel.debug%'
         form:            true
         csrf_protection: true
@@ -198,7 +198,7 @@ the ``config_dev.yml`` file, which loads the main configuration (i.e.
         - { resource: config.yml }
 
     framework:
-        router:   { resource: '%kernel.root_dir%/config/routing_dev.yml' }
+        router:   { resource: '%kernel.project_dir%/app/config/routing_dev.yml' }
         profiler: { only_exceptions: false }
 
     web_profiler:
diff --git a/reference/configuration/assetic.rst b/reference/configuration/assetic.rst
@@ -20,7 +20,7 @@ Full Default Configuration
                 enabled:              '%kernel.debug%'
                 profiler:             false
             read_from:            '%assetic.read_from%'
-            write_to:             '%kernel.root_dir%/../web'
+            write_to:             '%kernel.project_dir%/web'
             java:                 /usr/bin/java
             node:                 /usr/bin/node
             ruby:                 /usr/bin/ruby
@@ -78,7 +78,7 @@ Full Default Configuration
                 debug="%kernel.debug%"
                 use-controller="%kernel.debug%"
                 read-from="%assetic.read_from%"
-                write-to="%kernel.root_dir%/../web"
+                write-to="%kernel.project_dir%/web"
                 java="/usr/bin/java"
                 node="/usr/bin/node"
                 sass="/usr/bin/sass">
diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst
@@ -205,7 +205,7 @@ Full Default Configuration
                         password="secret"
                         driver="pdo_mysql"
                         driver-class="MyNamespace\MyDriverImpl"
-                        path="%kernel.root_dir%/../var/data/data.sqlite"
+                        path="%kernel.project_dir%/var/data/data.sqlite"
                         memory="true"
                         unix-socket="/tmp/mysql.sock"
                         wrapper-class="MyDoctrineDbalConnectionWrapper"
@@ -264,7 +264,7 @@ Full Default Configuration
                         <doctrine:mapping
                             name="DoctrineExtensions"
                             type="xml"
-                            dir="%kernel.root_dir%/../vendor/gedmo/doctrine-extensions/lib/DoctrineExtensions/Entity"
+                            dir="%kernel.project_dir%/vendor/gedmo/doctrine-extensions/lib/DoctrineExtensions/Entity"
                             prefix="DoctrineExtensions\Entity"
                             alias="DExt"
                         />
@@ -340,7 +340,7 @@ Path to the mapping or entity files (depending on the driver). If this path
 is relative it is assumed to be relative to the bundle root. This only works
 if the name of your mapping is a bundle name. If you want to use this option
 to specify absolute paths you should prefix the path with the kernel parameters
-that exist in the DIC (for example ``%kernel.root_dir%``).
+that exist in the DIC (for example ``%kernel.project_dir%``).
 
 prefix
 ......
@@ -398,7 +398,7 @@ The following block shows all possible configuration keys:
                 # the DBAL driverOptions option
                 options:
                     foo: bar
-                path:                 '%kernel.root_dir%/data/data.sqlite'
+                path:                 '%kernel.project_dir%/app/data/data.sqlite'
                 memory:               true
                 unix_socket:          /tmp/mysql.sock
                 # the DBAL wrapperClass option
@@ -434,7 +434,7 @@ The following block shows all possible configuration keys:
                     password="secret"
                     driver="pdo_mysql"
                     driver-class="MyNamespace\MyDriverImpl"
-                    path="%kernel.root_dir%/../var/data/data.sqlite"
+                    path="%kernel.project_dir%/var/data/data.sqlite"
                     memory="true"
                     unix-socket="/tmp/mysql.sock"
                     wrapper-class="MyDoctrineDbalConnectionWrapper"
@@ -605,7 +605,7 @@ namespace in the ``src/Entity`` directory and gives them an ``App`` alias
                         # ...
                         SomeEntityNamespace:
                             type: annotation
-                            dir: '%kernel.root_dir%/../src/Entity'
+                            dir: '%kernel.project_dir%/src/Entity'
                             is_bundle: false
                             prefix: App\Entity
                             alias: App
@@ -620,7 +620,7 @@ namespace in the ``src/Entity`` directory and gives them an ``App`` alias
                 <doctrine:orm>
                     <mapping name="SomeEntityNamespace"
                         type="annotation"
-                        dir="%kernel.root_dir%/../src/Entity"
+                        dir="%kernel.project_dir%/src/Entity"
                         is-bundle="false"
                         prefix="App\Entity"
                         alias="App"
@@ -637,7 +637,7 @@ namespace in the ``src/Entity`` directory and gives them an ``App`` alias
                 'mappings' => array(
                     'SomeEntityNamespace' => array(
                         'type'      => 'annotation',
-                        'dir'       => '%kernel.root_dir%/../src/Entity',
+                        'dir'       => '%kernel.project_dir%/src/Entity',
                         'is_bundle' => false,
                         'prefix'    => 'App\Entity',
                         'alias'     => 'App',
diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst
diff --git a/session/sessions_directory.rst b/session/sessions_directory.rst
diff --git a/templating/namespaced_paths.rst b/templating/namespaced_paths.rst
diff --git a/translation.rst b/translation.rst

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class::`
`23`	`23`
`24`	`24`	`public function registerContainerConfiguration(LoaderInterface $loader)`
`25`	`25`	`{`
`26`		`- $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');`
	`26`	`+ $loader->load($this->getProjectDir().'/app/config/config_'.$this->getEnvironment().'.yml');`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`@@ -99,7 +99,7 @@ method::`
`99`	`99`
`100`	`100`	`public function registerContainerConfiguration(LoaderInterface $loader)`
`101`	`101`	`{`
`102`		`- $loader->load($this->getRootDir().'/config/'.$this->getEnvironment().'/config.yml');`
	`102`	`+ $loader->load($this->getProjectDir().'/app/config/'.$this->getEnvironment().'/config.yml');`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
`@@ -196,7 +196,7 @@ make Symfony aware of the new file organization::`
`196`	`196`
`197`	`197`	`public function registerContainerConfiguration(LoaderInterface $loader)`
`198`	`198`	`{`
`199`		`- $loader->load($this->getRootDir().'/config/environments/'.$this->getEnvironment().'.yml');`
	`199`	`+ $loader->load($this->getProjectDir().'/app/config/environments/'.$this->getEnvironment().'.yml');`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class:`
`45`	`45`
`46`	`46`	`public function registerContainerConfiguration(LoaderInterface $loader)`
`47`	`47`	`{`
`48`		`- $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');`
	`48`	`+ $loader->load($this->getProjectDir().'/app/config/config_'.$this->getEnvironment().'.yml');`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
@@ -101,7 +101,7 @@ they don't collide with the files from ``AppKernel``::
`101`	`101`
`102`	`102`	`public function registerContainerConfiguration(LoaderInterface $loader)`
`103`	`103`	`{`
`104`		`- $loader->load($this->getRootDir().'/config/api/config_'.$this->getEnvironment().'.yml');`
	`104`	`+ $loader->load($this->getProjectDir().'/app/config/api/config_'.$this->getEnvironment().'.yml');`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`
`@@ -176,7 +176,7 @@ In order to solve this issue, add the following configuration to your kernel:`
`176`	`176`	`twig:`
`177`	`177`	`paths:`
`178`	`178`	`# allows to use app/Resources/views/ templates in the ApiKernel`
`179`		`- "%kernel.root_dir%/../app/Resources/views": ~`
	`179`	`+ "%kernel.project_dir%/app/Resources/views": ~`
`180`	`180`
`181`	`181`	`Adding more Kernels to the Application`
`182`	`182`	`--------------------------------------`