Merge pull request Sylius#9426 from pamil/sf4-fixes

Random Symfony 4 related fixes
ezecosystem · May 24, 2018 · 18522aa · 18522aa
2 parents 04c0455 + a974ce0
commit 18522aa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -61,3 +61,10 @@ fos_rest:
         rules:
             - { path: '^/api/.*', priorities: ['json', 'xml'], fallback_format: json, prefer_extension: true }
             - { path: '^/', stop: true }
+
+liip_imagine:
+    resolvers:
+        default:
+            web_path:
+                web_root: "%kernel.project_dir%/web"
+                cache_prefix: "media/cache"
diff --git a/src/Sylius/Bundle/CoreBundle/Command/InstallAssetsCommand.php b/src/Sylius/Bundle/CoreBundle/Command/InstallAssetsCommand.php
@@ -54,7 +54,7 @@ protected function execute(InputInterface $input, OutputInterface $output): ?int
         }
 
         $commands = [
-            'assets:install' => ['web'],
+            'assets:install' => ['target' => 'web'],
         ];
 
         $this->runCommands($commands, $output);

diff --git a/src/Sylius/Bundle/ResourceBundle/DependencyInjection/SyliusResourceExtension.php b/src/Sylius/Bundle/ResourceBundle/DependencyInjection/SyliusResourceExtension.php
@@ -42,7 +42,7 @@ public function load(array $config, ContainerBuilder $container): void
         if ($config['translation']['enabled']) {
             $loader->load('services/integrations/translation.xml');
 
-            $container->setAlias('sylius.translation_locale_provider', $config['translation']['locale_provider']);
+            $container->setAlias('sylius.translation_locale_provider', $config['translation']['locale_provider'])->setPublic(true);
         }
 
         $container->setParameter('sylius.resource.settings', $config['settings']);