Merge branch '3.0' into fix/remove-sitemap

Author: leszczuu

UPGRADE.md

@@ -3,6 +3,10 @@
 * The `stefandoorn/sitemap-plugin` dependency has been removed, and moved to the `suggest` section of composer.json.
 If you didn't require this plugin by yourselves, but want to keep the sitemap support, consider requiring it directly in your project as described [here](doc/sitemap.md).
 
+* Width and height has been added to image media. Now width and height html tags are generated in shop image.
+  Read the below changelog first and then migrate your structure using 
+  `bin/console doctrine:migrations:diff && bin/console doctrine:migrations:migrate` commands
+
 # UPGRADE FROM 1.0 TO 2.0
 
 * A lot of database modifications has been made. Read the below changelog first and then migrate your

spec/Twig/Extension/RenderBlockExtensionSpec.php

@@ -13,12 +13,19 @@
 namespace spec\BitBag\SyliusCmsPlugin\Twig\Extension;
 
 use BitBag\SyliusCmsPlugin\Twig\Extension\RenderBlockExtension;
+use BitBag\SyliusCmsPlugin\Twig\Runtime\RenderBlockRuntimeInterface;
 use PhpSpec\ObjectBehavior;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
 final class RenderBlockExtensionSpec extends ObjectBehavior
 {
+    function let(
+        RenderBlockRuntimeInterface $blockRuntime
+    ) {
+        $this->beConstructedWith($blockRuntime);
+    }
+
     function it_is_initializable(): void
     {
         $this->shouldHaveType(RenderBlockExtension::class);

spec/Twig/Extension/RenderMediaExtensionSpec.php

@@ -13,12 +13,19 @@
 namespace spec\BitBag\SyliusCmsPlugin\Twig\Extension;
 
 use BitBag\SyliusCmsPlugin\Twig\Extension\RenderMediaExtension;
+use BitBag\SyliusCmsPlugin\Twig\Runtime\RenderMediaRuntimeInterface;
 use PhpSpec\ObjectBehavior;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
 final class RenderMediaExtensionSpec extends ObjectBehavior
 {
+    function let(
+        RenderMediaRuntimeInterface $mediaRuntime
+    ) {
+        $this->beConstructedWith($mediaRuntime);
+    }
+
     function it_is_initializable(): void
     {
         $this->shouldHaveType(RenderMediaExtension::class);

spec/Twig/Parser/ContentParserSpec.php

@@ -26,7 +26,7 @@ function it_implements_content_parser_interface(): void
         $this->shouldHaveType(ContentParserInterface::class);
     }
 
-    function it_parses_string_functions(
+    function it_parses_string_function(
         Environment $twigEnvironment,
         TwigFunction $renderBlockFunction,
         RenderBlockRuntimeInterface $renderBlockRuntime
@@ -43,4 +43,24 @@ function it_parses_string_functions(
 
         $this->parse($input);
     }
+
+    function it_parses_string_functions(
+        Environment $twigEnvironment,
+        TwigFunction $renderBlockFunction,
+        RenderBlockRuntimeInterface $renderBlockRuntime
+    ): void
+    {
+        $twigEnvironment->getFunctions()->willReturn([
+            'bitbag_cms_render_block' => $renderBlockFunction,
+        ]);
+        $renderBlockFunction->getCallable()->willReturn([$renderBlockRuntime, 'renderBlock']);
+
+        $input = "Let's render! {{ bitbag_cms_render_block('intro', '@BitBagSyliusCmsPlugin/Shop/Block/show.html.twig') }}
+                  Let's render twice! {{ bitbag_cms_render_block('intro1', '@BitBagSyliusCmsPlugin/Shop/Block/show.html.twig') }}";
+
+        $renderBlockRuntime->renderBlock('intro', '@BitBagSyliusCmsPlugin/Shop/Block/show.html.twig')->shouldBeCalled();
+        $renderBlockRuntime->renderBlock('intro1', '@BitBagSyliusCmsPlugin/Shop/Block/show.html.twig')->shouldBeCalled();
+
+        $this->parse($input);
+    }
 }

src/Entity/Media.php

@@ -49,6 +49,12 @@ class Media implements MediaInterface
     /** @var string */
     protected $originalPath;
 
+    /** @var int|null */
+    protected $width;
+
+    /** @var int|null */
+    protected $height;
+
     public function __construct()
     {
         $this->initializeTranslationsCollection();
@@ -162,6 +168,26 @@ public function setLink(?string $link): void
         $this->getMediaTranslation()->setLink($link);
     }
 
+    public function getWidth(): ?int
+    {
+        return $this->width;
+    }
+
+    public function setWidth(?int $width): void
+    {
+        $this->width = $width;
+    }
+
+    public function getHeight(): ?int
+    {
+        return $this->height;
+    }
+
+    public function setHeight(?int $height): void
+    {
+        $this->height = $height;
+    }
+
     /**
      * @return MediaTranslationInterface|TranslationInterface
      */
@@ -174,7 +200,7 @@ protected function createTranslation(): MediaTranslationInterface
     {
         return new MediaTranslation();
     }
-    
+
     public function __toString(): string
     {
         return $this->getName() ?? $this->code;

src/Entity/MediaInterface.php

@@ -72,4 +72,12 @@ public function setAlt(?string $alt): void;
     public function getLink(): ?string;
 
     public function setLink(?string $link): void;
+
+    public function getWidth(): ?int;
+
+    public function setWidth(?int $width): void;
+
+    public function getHeight(): ?int;
+
+    public function setHeight(?int $height): void;
 }

src/Entity/Page.php

@@ -166,14 +166,14 @@ public function setTitle(?string $title): void
     }
 
     /**
-     * @return PageTranslationInterface|TranslationInterface|null
+     * @return PageTranslationInterface|TranslationInterface
      */
     protected function getPageTranslation(): PageTranslationInterface
     {
         return $this->getTranslation();
     }
 
-    protected function createTranslation(): ?PageTranslationInterface
+    protected function createTranslation(): PageTranslationInterface
     {
         return new PageTranslation();
     }

src/Resources/config/config.yml

@@ -32,3 +32,9 @@ sylius_ui:
                 javascripts:
                     template: "@BitBagSyliusCmsPlugin/_javascripts.html.twig"
                     priority: 10
+liip_imagine:
+    loaders:
+        default:
+            filesystem:
+                data_root:
+                    - "%kernel.project_dir%/public"

src/Resources/config/doctrine/Media.orm.yml

@@ -30,6 +30,15 @@ BitBag\SyliusCmsPlugin\Entity\Media:
         enabled:
             column: enabled
             type: boolean
+        width:
+            column: width
+            type: integer
+            nullable: true
+        height:
+            column: height
+            type: integer
+            nullable: true
+
     manyToMany:
         sections:
             targetEntity: BitBag\SyliusCmsPlugin\Entity\SectionInterface

src/Resources/config/services/twig.yml

@@ -7,6 +7,8 @@ parameters:
 services:
     bitbag_sylius_cms_plugin.twig.extension.block:
         class: BitBag\SyliusCmsPlugin\Twig\Extension\RenderBlockExtension
+        arguments:
+            - "@bitbag_sylius_cms_plugin.twig.runtime.block"
         tags:
             - { name: twig.extension }
 
@@ -21,6 +23,8 @@ services:
 
     bitbag_sylius_cms_plugin.twig.extension.media:
         class: BitBag\SyliusCmsPlugin\Twig\Extension\RenderMediaExtension
+        arguments:
+            - "@bitbag_sylius_cms_plugin.twig.runtime.media"
         tags:
             - { name: twig.extension }