Merge pull request #202 from acrobat/sf5-fixes

Use kernel.project_dir if available to support symfony 5

Author: dbu

resources/config/default.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-$kernelRootDir = $container->getParameter('kernel.root_dir');
+$kernelRootDir = $container->hasParameter('kernel.project_dir') ? $container->getParameter('kernel.project_dir') : $container->getParameter('kernel.root_dir');
 $bundleName = null;
 
 if (preg_match('&/([a-zA-Z]+?)Bundle&', $kernelRootDir, $matches)) {
@@ -23,7 +23,11 @@
     }
 }
 
-$loader->import('dist/parameters.yml');
+if ($container->hasParameter('kernel.project_dir')) {
+    $loader->import('dist/parameters_sf5.yml');
+} else {
+    $loader->import('dist/parameters.yml');
+}
 if (class_exists('Symfony\Bundle\MonologBundle\MonologBundle')) {
     $loader->import('dist/monolog.yml');
 }

resources/config/dist/framework.php

@@ -9,6 +9,11 @@
  * file that was distributed with this source code.
  */
 
+$routerPath = '%kernel.root_dir%/config/routing.php';
+if ($container->hasParameter('kernel.project_dir')) {
+    $routerPath = '%kernel.project_dir%/config/routing.php';
+}
+
 $config = [
     'secret' => 'test',
     'test' => null,
@@ -21,7 +26,7 @@
         'enable_annotations' => true,
     ],
     'router' => [
-        'resource' => '%kernel.root_dir%/config/routing.php',
+        'resource' => $routerPath,
     ],
     'default_locale' => 'en',
     'translator' => [

resources/config/dist/parameters.yml

@@ -1,16 +1,5 @@
-parameters:
-    phpcr_backend:
-        #type: jackrabbit
-        #url: http://localhost:8080/server/
-        type: doctrinedbal
-        # connection: default
-        parameters:
-            jackalope.check_login_on_server: false
-    phpcr_workspace: default
-    phpcr_user: admin
-    phpcr_pass: admin
+imports:
+    - { resource: parameters.yml }
 
-    database_driver: pdo_sqlite
+parameters:
     database_path: '%kernel.root_dir%/var/cache/app.sqlite'
-
-    locale: en

resources/config/dist/parameters_sf5.yml

@@ -0,0 +1,16 @@
+parameters:
+    phpcr_backend:
+        #type: jackrabbit
+        #url: http://localhost:8080/server/
+        type: doctrinedbal
+        # connection: default
+        parameters:
+            jackalope.check_login_on_server: false
+    phpcr_workspace: default
+    phpcr_user: admin
+    phpcr_pass: admin
+
+    database_driver: pdo_sqlite
+    database_path: '%kernel.project_dir%/var/cache/app.sqlite'
+
+    locale: en

resources/config/dist/phpcr_odm.php

@@ -27,7 +27,7 @@
     ],
 ];
 
-$kernelRootDir = $container->getParameter('kernel.root_dir');
+$kernelRootDir = $container->hasParameter('kernel.project_dir') ? $container->getParameter('kernel.project_dir') : $container->getParameter('kernel.root_dir');
 $bundleFQN = $container->getParameter('cmf_testing.bundle_fqn');
 if (getenv('KERNEL_CLASS')) {
     $phpcrOdmDocDir = sprintf('%s/Document', $kernelRootDir);

src/HttpKernel/TestKernel.php

@@ -158,6 +158,11 @@ public function registerBundles()
      * src/ directory (or wherever).
      */
     public function getKernelDir()
+    {
+        $this->getProjectDir();
+    }
+
+    public function getProjectDir()
     {
         $refl = new \ReflectionClass($this);
         $fname = $refl->getFileName();