EZP-31220: Migrated codebase to Symfony 5 (#15)

* Updated dependencies in composer.json * Changed kernel.root_dir -> kernel.project_dir * Fixed Process initialization
ezsystems · Mar 18, 2020 · f3fb7fc · f3fb7fc
1 parent 26590a0
commit f3fb7fc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -22,11 +22,11 @@
     },
     "require": {
         "php": "^7.3",
-        "symfony/config": "^4.3",
-        "symfony/dependency-injection": "^4.3",
-        "symfony/filesystem": "^4.3",
-        "symfony/finder": "^4.3",
-        "symfony/http-kernel": "^4.3"
+        "symfony/config": "^5.0",
+        "symfony/dependency-injection": "^5.0",
+        "symfony/filesystem": "^5.0",
+        "symfony/finder": "^5.0",
+        "symfony/http-kernel": "^5.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.15",

diff --git a/src/EzPlatformEncoreBundle/bundle/Command/CompileAssetsCommand.php b/src/EzPlatformEncoreBundle/bundle/Command/CompileAssetsCommand.php
@@ -42,7 +42,7 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
         }
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): void
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $timeout = $input->getOption('timeout');
         $env = $input->getOption('env');
@@ -55,7 +55,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void
 
         $debugFormatter = $this->getHelper('debug_formatter');
 
-        $process = new Process(
+        $process = Process::fromShellCommandline(
             $yarnEncoreCommand,
             null,
             null,
@@ -85,5 +85,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void
                 $process->isSuccessful()
             )
         );
+
+        return $process->getExitCode();
     }
 }
diff --git a/src/EzPlatformEncoreBundle/bundle/DependencyInjection/EzSystemsEzPlatformEncoreExtension.php b/src/EzPlatformEncoreBundle/bundle/DependencyInjection/EzSystemsEzPlatformEncoreExtension.php
@@ -36,7 +36,7 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('services.yaml');
 
         $bundlesMetadata = $container->getParameter('kernel.bundles_metadata');
-        $rootPath = \dirname($container->getParameter('kernel.root_dir')) . '/';
+        $rootPath = $container->getParameter('kernel.project_dir') . '/';
         $targetPath = 'var/encore';
 
         foreach (self::CONFIG_NAMES as $configName) {