OP-543: Fixtures fix and ECS

spec/Renderer/ContentElement/PagesCollectionContentElementRendererSpec.php

@@ -10,7 +10,6 @@
 use Sylius\CmsPlugin\Entity\ContentConfigurationInterface;
 use Sylius\CmsPlugin\Form\Type\ContentElements\PagesCollectionContentElementType;
 use Sylius\CmsPlugin\Renderer\ContentElement\AbstractContentElement;
-use Sylius\CmsPlugin\Renderer\ContentElement\ContentElementRendererInterface;
 use Sylius\CmsPlugin\Renderer\ContentElement\PagesCollectionContentElementRenderer;
 use Sylius\CmsPlugin\Repository\CollectionRepositoryInterface;
 use Twig\Environment;

spec/Renderer/ContentElementRendererStrategySpec.php

@@ -19,7 +19,7 @@ final class ContentElementRendererStrategySpec extends ObjectBehavior
     public function let(
         ContentParserInterface $contentParser,
         LocaleContextInterface $localeContext,
-        ContentElementRendererInterface $renderer
+        ContentElementRendererInterface $renderer,
     ): void {
         $this->beConstructedWith($contentParser, $localeContext, [$renderer]);
     }
@@ -34,7 +34,7 @@ public function it_renders_a_page_content_element_correctly(
         ContentConfigurationInterface $contentElement,
         LocaleContextInterface $localeContext,
         ContentElementRendererInterface $renderer,
-        ContentParserInterface $contentParser
+        ContentParserInterface $contentParser,
     ): void {
         $page->getContentElements()->willReturn(new ArrayCollection([$contentElement->getWrappedObject()]));
         $localeContext->getLocaleCode()->willReturn('en_US');
@@ -52,7 +52,7 @@ public function it_skips_content_element_with_non_matching_locale(
         BlockInterface $block,
         ContentConfigurationInterface $contentElement,
         LocaleContextInterface $localeContext,
-        ContentParserInterface $contentParser
+        ContentParserInterface $contentParser,
     ): void {
         $block->getContentElements()->willReturn(new ArrayCollection([$contentElement]));
         $localeContext->getLocaleCode()->willReturn('en_US');
@@ -69,7 +69,7 @@ public function it_renders_only_supported_content_elements(
         ContentConfigurationInterface $unsupportedElement,
         LocaleContextInterface $localeContext,
         ContentElementRendererInterface $renderer,
-        ContentParserInterface $contentParser
+        ContentParserInterface $contentParser,
     ): void {
         $block->getContentElements()->willReturn(new ArrayCollection([$supportedElement->getWrappedObject(), $unsupportedElement->getWrappedObject()]));
         $localeContext->getLocaleCode()->willReturn('en_US');

spec/Twig/Runtime/TranslationFormReduceRuntimeSpec.php

@@ -19,10 +19,10 @@ public function it_reduces_form_to_specified_fields(
         FormView $form,
         FormView $localeForm,
         FormView $slugForm,
-        FormView $titleForm
+        FormView $titleForm,
     ): void {
         $form->children = [
-            'en_US' => $localeForm
+            'en_US' => $localeForm,
         ];
 
         $localeForm->children = [
@@ -56,7 +56,7 @@ public function it_handles_multiple_locales(
         FormView $enLocale,
         FormView $deLocale,
         FormView $slugForm,
-        FormView $titleForm
+        FormView $titleForm,
     ): void {
         $form->children = [
             'en_US' => $enLocale,
@@ -85,7 +85,7 @@ public function it_throws_exception_if_field_is_not_present_in_multiple_locales(
         FormView $form,
         FormView $enLocale,
         FormView $deLocale,
-        FormView $slugForm
+        FormView $slugForm,
     ): void {
         $form->children = [
             'en_US' => $enLocale,
@@ -108,7 +108,7 @@ public function it_handles_empty_field_array(
         FormView $form,
         FormView $localeForm,
         FormView $slugForm,
-        FormView $titleForm
+        FormView $titleForm,
     ): void {
         $form->children = [
             'en_US' => $localeForm,

src/Fixture/BlockFixture.php

@@ -41,7 +41,9 @@ protected function configureOptionsNode(ArrayNodeDefinition $optionsNode): void
                             ->arrayNode('taxons')->scalarPrototype()->end()->end()
                             ->arrayNode('products_in_taxons')->scalarPrototype()->end()->end()
                             ->arrayNode('content_elements')
-                                ->useAttributeAsKey('key')
+                                ->useAttributeAsKey('locale')
+                                ->arrayPrototype()
+                                    ->useAttributeAsKey('key')
                                     ->arrayPrototype()
                                         ->children()
                                             ->scalarNode('type')->end()
@@ -54,7 +56,6 @@ protected function configureOptionsNode(ArrayNodeDefinition $optionsNode): void
                                                     ->scalarNode('products_carousel_by_taxon')->end()
                                                     ->scalarNode('products_grid_by_taxon')->end()
                                                     ->scalarNode('pages_collection')->end()
-                                                    ->scalarNode('pages_collection')->end()
                                                     ->scalarNode('spacer')->end()
                                                     ->arrayNode('multiple_media')->scalarPrototype()->end()->end()
                                                     ->arrayNode('products_grid')

src/Fixture/Factory/BlockFixtureFactory.php

@@ -61,16 +61,19 @@ private function createBlock(string $code, array $blockData): void
         $this->taxonsAssigner->assign($block, $blockData['taxons']);
         $this->productsInTaxonsAssigner->assign($block, $blockData['products_in_taxons']);
 
-        foreach ($blockData['content_elements'] as $data) {
-            $data['data'] = array_filter($data['data'], static function ($value) {
-                return !empty($value);
-            });
+        foreach ($blockData['content_elements'] as $locale => $data) {
+            foreach ($data as $contentElementData) {
+                $contentElementData['data'] = array_filter($contentElementData['data'], static function ($value) {
+                    return !empty($value);
+                });
 
-            $contentConfiguration = new ContentConfiguration();
-            $contentConfiguration->setType($data['type']);
-            $contentConfiguration->setConfiguration($data['data']);
-            $contentConfiguration->setBlock($block);
-            $block->addContentElement($contentConfiguration);
+                $contentConfiguration = new ContentConfiguration();
+                $contentConfiguration->setType($contentElementData['type']);
+                $contentConfiguration->setConfiguration($contentElementData['data']);
+                $contentConfiguration->setLocale($locale);
+                $contentConfiguration->setBlock($block);
+                $block->addContentElement($contentConfiguration);
+            }
         }
 
         $this->blockRepository->add($block);

src/Fixture/Factory/PageFixtureFactory.php

@@ -78,16 +78,19 @@ private function createPage(
             $page->addTranslation($pageTranslation);
         }
 
-        foreach ($pageData['content_elements'] as $data) {
-            $data['data'] = array_filter($data['data'], static function ($value) {
-                return !empty($value);
-            });
-
-            $contentConfiguration = new ContentConfiguration();
-            $contentConfiguration->setType($data['type']);
-            $contentConfiguration->setConfiguration($data['data']);
-            $contentConfiguration->setPage($page);
-            $page->addContentElement($contentConfiguration);
+        foreach ($pageData['content_elements'] as $locale => $data) {
+            foreach ($data as $contentElementData) {
+                $contentElementData['data'] = array_filter($contentElementData['data'], static function ($value) {
+                    return !empty($value);
+                });
+
+                $contentConfiguration = new ContentConfiguration();
+                $contentConfiguration->setType($contentElementData['type']);
+                $contentConfiguration->setConfiguration($contentElementData['data']);
+                $contentConfiguration->setLocale($locale);
+                $contentConfiguration->setPage($page);
+                $page->addContentElement($contentConfiguration);
+            }
         }
 
         $this->pageRepository->add($page);

src/Fixture/PageFixture.php

@@ -50,7 +50,9 @@ protected function configureOptionsNode(ArrayNodeDefinition $optionsNode): void
                                 ->end()
                             ->end()
                             ->arrayNode('content_elements')
-                                ->useAttributeAsKey('key')
+                                ->useAttributeAsKey('locale')
+                                ->arrayPrototype()
+                                    ->useAttributeAsKey('key')
                                     ->arrayPrototype()
                                         ->children()
                                             ->scalarNode('type')->end()

src/Form/Type/BlockType.php

@@ -101,7 +101,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 'label' => 'sylius.ui.locale',
                 'attr' => [
                     'class' => 'locale-selector',
-                ]
+                ],
             ])
         ;
 

src/Form/Type/PageType.php

@@ -95,7 +95,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 'label' => 'sylius.ui.locale',
                 'attr' => [
                     'class' => 'locale-selector',
-                ]
+                ],
             ])
         ;