Sf4 fix (#331)

* Use correct new symfony 4 translations directory * Import command new sf4 directory structure * Create translations cache dir
lexik · Dec 17, 2018 · 91d1844 · 91d1844
1 parent cdd6296
commit 91d1844
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/Command/ImportTranslationsCommand.php b/Command/ImportTranslationsCommand.php
@@ -199,7 +199,12 @@ protected function importComponentTranslationFiles(array $locales, array $domain
      */
     protected function importAppTranslationFiles(array $locales, array $domains)
     {
-        $finder = $this->findTranslationsFiles($this->getApplication()->getKernel()->getRootDir(), $locales, $domains);
+        if (Kernel::MAJOR_VERSION >= 4) {
+            $translationPath = $this->getApplication()->getKernel()->getProjectDir().'/translations';
+            $finder = $this->findTranslationsFiles($translationPath, $locales, $domains, false);
+        } else {
+            $finder = $this->findTranslationsFiles($this->getApplication()->getKernel()->getRootDir(), $locales, $domains);
+        }
         $this->importTranslationFiles($finder);
     }
 

diff --git a/DependencyInjection/LexikTranslationExtension.php b/DependencyInjection/LexikTranslationExtension.php
@@ -310,6 +310,10 @@ protected function registerTranslatorConfiguration(array $config, ContainerBuild
                 $dirs[] = $dir;
             }
 
+            if (Kernel::MAJOR_VERSION >= 4 && is_dir($dir = $container->getParameter('kernel.project_dir').'/translations')) {
+                $dirs[] = $dir;
+            }
+
             // Register translation resources
             if (count($dirs) > 0) {
                 foreach ($dirs as $dir) {

diff --git a/EventDispatcher/CleanTranslationCacheListener.php b/EventDispatcher/CleanTranslationCacheListener.php
@@ -65,6 +65,8 @@ public function onKernelRequest(GetResponseEvent $event)
             $lastUpdateTime = $this->storage->getLatestUpdatedAt();
 
             if ($lastUpdateTime instanceof \DateTime) {
+                $this->checkCacheFolder();
+
                 $finder = new Finder();
                 $finder->files()
                     ->in($this->cacheDirectory.'/translations')
@@ -109,4 +111,11 @@ private function isCacheExpired()
 
         return $expired;
     }
+
+    private function checkCacheFolder()
+    {
+        if (!is_dir($dirName = $this->cacheDirectory.'/translations') && !mkdir($dirName) && !is_dir($dirName)) {
+            throw new \RuntimeException(sprintf('Directory "%s" was not created', $dirName));
+        }
+    }
 }