minor #25115 [*Bundle] Replace some kernel.root_dir by kernel.project_dir (nicolas-grekas, xabbuh)

nicolas-grekas · nicolas-grekas · commit 3db1ee827916 · 2017-11-24T12:33:45.000+01:00
This PR was merged into the 3.4 branch.

Discussion
----------

[*Bundle] Replace some kernel.root_dir by kernel.project_dir

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

92fc2f7 remove more kernel.root_dir parameter refs
4add28b [*Bundle] Replace some kernel.root_dir by kernel.project_dir
diff --git a/Resources/config/templating_php.xml b/Resources/config/templating_php.xml
@@ -52,7 +52,7 @@
         <service id="templating.helper.code" class="Symfony\Bundle\FrameworkBundle\Templating\Helper\CodeHelper">
             <tag name="templating.helper" alias="code" />
             <argument type="service" id="debug.file_link_formatter"></argument>
-            <argument>%kernel.root_dir%</argument>
+            <argument>%kernel.project_dir%</argument>
             <argument>%kernel.charset%</argument>
         </service>
 
diff --git a/Tests/DependencyInjection/Fixtures/php/full.php b/Tests/DependencyInjection/Fixtures/php/full.php
@@ -21,7 +21,7 @@
         'enabled' => false,
     ),
     'router' => array(
-        'resource' => '%kernel.root_dir%/config/routing.xml',
+        'resource' => '%kernel.project_dir%/config/routing.xml',
         'type' => 'xml',
     ),
     'session' => array(
@@ -54,7 +54,7 @@
     'translator' => array(
         'enabled' => true,
         'fallback' => 'fr',
-        'paths' => array('%kernel.root_dir%/Fixtures/translations'),
+        'paths' => array('%kernel.project_dir%/Fixtures/translations'),
     ),
     'validation' => array(
         'enabled' => true,
diff --git a/Tests/DependencyInjection/Fixtures/php/serializer_mapping.php b/Tests/DependencyInjection/Fixtures/php/serializer_mapping.php
@@ -6,9 +6,9 @@
         'enable_annotations' => true,
         'mapping' => array(
             'paths' => array(
-                '%kernel.root_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/files',
-                '%kernel.root_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yml',
-                '%kernel.root_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yaml',
+                '%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/files',
+                '%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yml',
+                '%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yaml',
             ),
         ),
     ),
diff --git a/Tests/DependencyInjection/Fixtures/php/validation_mapping.php b/Tests/DependencyInjection/Fixtures/php/validation_mapping.php
@@ -4,9 +4,9 @@
     'validation' => array(
         'mapping' => array(
             'paths' => array(
-                '%kernel.root_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/files',
-                '%kernel.root_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yml',
-                '%kernel.root_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yaml',
+                '%kernel.project_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/files',
+                '%kernel.project_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yml',
+                '%kernel.project_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yaml',
             ),
         ),
     ),
diff --git a/Tests/DependencyInjection/Fixtures/xml/full.xml b/Tests/DependencyInjection/Fixtures/xml/full.xml
@@ -14,7 +14,7 @@
         <framework:esi enabled="true" />
         <framework:ssi enabled="true" />
         <framework:profiler only-exceptions="true" enabled="false" />
-        <framework:router resource="%kernel.root_dir%/config/routing.xml" type="xml" />
+        <framework:router resource="%kernel.project_dir%/config/routing.xml" type="xml" />
         <framework:session gc-maxlifetime="90000" gc-probability="1" gc-divisor="108" storage-id="session.storage.native" handler-id="session.handler.native_file" name="_SYMFONY" cookie-lifetime="86400" cookie-path="/" cookie-domain="example.com" cookie-secure="true" cookie-httponly="false" use-cookies="true" save-path="/path/to/sessions" />
         <framework:request>
             <framework:format name="csv">
@@ -37,7 +37,7 @@
         </framework:templating>
         <framework:assets version="v1" />
         <framework:translator enabled="true" fallback="fr" logging="true">
-            <framework:path>%kernel.root_dir%/Fixtures/translations</framework:path>
+            <framework:path>%kernel.project_dir%/Fixtures/translations</framework:path>
         </framework:translator>
         <framework:validation enabled="true" />
         <framework:annotations cache="file" debug="true" file-cache-dir="%kernel.cache_dir%/annotations" />
diff --git a/Tests/DependencyInjection/Fixtures/xml/serializer_mapping.xml b/Tests/DependencyInjection/Fixtures/xml/serializer_mapping.xml
@@ -8,9 +8,9 @@
         <framework:annotations enabled="true" />
         <framework:serializer enable-annotations="true">
             <framework:mapping>
-                <framework:path>%kernel.root_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/files</framework:path>
-                <framework:path>%kernel.root_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yml</framework:path>
-                <framework:path>%kernel.root_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yaml</framework:path>
+                <framework:path>%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/files</framework:path>
+                <framework:path>%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yml</framework:path>
+                <framework:path>%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yaml</framework:path>
             </framework:mapping>
         </framework:serializer>
     </framework:config>
diff --git a/Tests/DependencyInjection/Fixtures/xml/validation_mapping.xml b/Tests/DependencyInjection/Fixtures/xml/validation_mapping.xml
@@ -7,9 +7,9 @@
     <framework:config>
         <framework:validation>
             <framework:mapping>
-                <framework:path>%kernel.root_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/files</framework:path>
-                <framework:path>%kernel.root_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yml</framework:path>
-                <framework:path>%kernel.root_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yaml</framework:path>
+                <framework:path>%kernel.project_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/files</framework:path>
+                <framework:path>%kernel.project_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yml</framework:path>
+                <framework:path>%kernel.project_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yaml</framework:path>
             </framework:mapping>
         </framework:validation>
     </framework:config>
diff --git a/Tests/DependencyInjection/Fixtures/yml/full.yml b/Tests/DependencyInjection/Fixtures/yml/full.yml
@@ -14,7 +14,7 @@ framework:
         only_exceptions: true
         enabled: false
     router:
-        resource:     '%kernel.root_dir%/config/routing.xml'
+        resource:     '%kernel.project_dir%/config/routing.xml'
         type:         xml
     session:
         storage_id:      session.storage.native
@@ -42,8 +42,8 @@ framework:
     translator:
         enabled:  true
         fallback: fr
-        default_path: '%kernel.root_dir%/translations'
-        paths: ['%kernel.root_dir%/Fixtures/translations']
+        default_path: '%kernel.project_dir%/translations'
+        paths: ['%kernel.project_dir%/Fixtures/translations']
     validation:
         enabled: true
     annotations:
diff --git a/Tests/DependencyInjection/Fixtures/yml/serializer_mapping.yml b/Tests/DependencyInjection/Fixtures/yml/serializer_mapping.yml
@@ -5,6 +5,6 @@ framework:
         enable_annotations: true
         mapping:
             paths:
-                - "%kernel.root_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/files"
-                - "%kernel.root_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yml"
-                - "%kernel.root_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yaml"
+                - "%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/files"
+                - "%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yml"
+                - "%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yaml"
diff --git a/Tests/DependencyInjection/Fixtures/yml/validation_mapping.yml b/Tests/DependencyInjection/Fixtures/yml/validation_mapping.yml
@@ -2,6 +2,6 @@ framework:
   validation:
     mapping:
       paths:
-        - "%kernel.root_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/files"
-        - "%kernel.root_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yml"
-        - "%kernel.root_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yaml"
+        - "%kernel.project_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/files"
+        - "%kernel.project_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yml"
+        - "%kernel.project_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yaml"
diff --git a/Tests/DependencyInjection/FrameworkExtensionTest.php b/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -322,7 +322,7 @@ public function testRouter()
 
         $this->assertTrue($container->has('router'), '->registerRouterConfiguration() loads routing.xml');
         $arguments = $container->findDefinition('router')->getArguments();
-        $this->assertEquals($container->getParameter('kernel.root_dir').'/config/routing.xml', $container->getParameter('router.resource'), '->registerRouterConfiguration() sets routing resource');
+        $this->assertEquals($container->getParameter('kernel.project_dir').'/config/routing.xml', $container->getParameter('router.resource'), '->registerRouterConfiguration() sets routing resource');
         $this->assertEquals('%router.resource%', $arguments[1], '->registerRouterConfiguration() sets routing resource');
         $this->assertEquals('xml', $arguments[2]['resource_type'], '->registerRouterConfiguration() sets routing resource type');
     }

Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ public function testRouter()`
`322`	`322`
`323`	`323`	`$this->assertTrue($container->has('router'), '->registerRouterConfiguration() loads routing.xml');`
`324`	`324`	`$arguments = $container->findDefinition('router')->getArguments();`
`325`		`- $this->assertEquals($container->getParameter('kernel.root_dir').'/config/routing.xml', $container->getParameter('router.resource'), '->registerRouterConfiguration() sets routing resource');`
	`325`	`+ $this->assertEquals($container->getParameter('kernel.project_dir').'/config/routing.xml', $container->getParameter('router.resource'), '->registerRouterConfiguration() sets routing resource');`
`326`	`326`	`$this->assertEquals('%router.resource%', $arguments[1], '->registerRouterConfiguration() sets routing resource');`
`327`	`327`	`$this->assertEquals('xml', $arguments[2]['resource_type'], '->registerRouterConfiguration() sets routing resource type');`
`328`	`328`	`}`