Fix export with ghost articles in different languages (#615)

sulu · Jul 6, 2022 · 3ed9bd8 · 3ed9bd8
1 parent 2a04d53
commit 3ed9bd8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/Controller/ArticleController.php b/Controller/ArticleController.php
@@ -334,10 +334,7 @@ function(FieldDescriptorInterface $fieldDescriptor) use ($fields) {
         $result = [];
         foreach ($searchResult as $document) {
             $documentData = $this->normalize($document['_source'], $fieldDescriptors);
-
-            if ('ghost' == $documentData['localizationState']['state']) {
-                $documentData['ghostLocale'] = $documentData['localizationState']['locale'];
-            }
+            $documentData['ghostLocale'] = 'ghost' == $documentData['localizationState']['state'] ? $documentData['localizationState']['locale'] : null;
 
             if (false !== ($index = array_search($documentData['id'], $ids))) {
                 $result[$index] = $documentData;

diff --git a/Tests/Application/Kernel.php b/Tests/Application/Kernel.php
@@ -27,7 +27,7 @@ class Kernel extends SuluTestKernel implements CompilerPassInterface
     /**
      * {@inheritdoc}
      */
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         $bundles = parent::registerBundles();
         $bundles[] = new SuluArticleBundle();
@@ -70,7 +70,7 @@ public function process(ContainerBuilder $container)
             ->setPublic(true);
     }
 
-    protected function getKernelParameters()
+    protected function getKernelParameters(): array
     {
         $parameters = parent::getKernelParameters();
 

diff --git a/composer.json b/composer.json
@@ -48,7 +48,9 @@
         "sulu/automation-bundle": "^2.0@dev",
         "symfony/browser-kit": "^4.3 || ^5.0",
         "symfony/dotenv": "^4.3 || ^5.0",
+        "symfony/framework-bundle": "^4.3 || ^5.0",
         "symfony/monolog-bundle": "^3.1",
+        "symfony/security-bundle": "^4.3 || ^5.0",
         "symfony/stopwatch": "^4.3 || ^5.0",
         "thecodingmachine/phpstan-strict-rules": "^0.12.0"
     },