Remove deprecated templating.helper configuration

Sylius · Jan 2, 2020 · 02c9aa7 · 02c9aa7
1 parent 4b385fd
commit 02c9aa7
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 53 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,7 +26,6 @@ install:
             symfony/http-kernel:${SYMFONY_VERSION} \
             symfony/options-resolver:${SYMFONY_VERSION} \
             symfony/property-access:${SYMFONY_VERSION} \
-            symfony/templating:${SYMFONY_VERSION} \
             --no-update --no-scripts
     - |
         composer require \

diff --git a/composer.json b/composer.json
@@ -30,8 +30,7 @@
         "symfony/framework-bundle": "^3.4|^4.3",
         "symfony/http-kernel": "^3.4|^4.3",
         "symfony/options-resolver": "^3.4|^4.3",
-        "symfony/property-access": "^3.4|^4.3",
-        "symfony/templating": "^3.4|^4.3"
+        "symfony/property-access": "^3.4|^4.3"
     },
     "require-dev": {
         "akeneo/phpspec-skip-example-extension": "^4.0",

diff --git a/src/Bundle/Resources/config/services/templating.xml b/src/Bundle/Resources/config/services/templating.xml
@@ -17,15 +17,13 @@
 
         <service id="sylius.templating.helper.grid" class="Sylius\Bundle\GridBundle\Templating\Helper\GridHelper" lazy="true">
             <argument type="service" id="sylius.grid.renderer" />
-            <tag name="templating.helper" alias="sylius_grid" />
         </service>
 
         <service id="sylius.templating.helper.bulk_action_grid"
                  class="Sylius\Bundle\GridBundle\Templating\Helper\BulkActionGridHelper"
                  lazy="true"
         >
             <argument type="service" id="sylius.grid.bulk_action_renderer" />
-            <tag name="templating.helper" alias="sylius_bulk_action_grid" />
         </service>
     </services>
 </container>
diff --git a/src/Bundle/Templating/Helper/BulkActionGridHelper.php b/src/Bundle/Templating/Helper/BulkActionGridHelper.php
@@ -16,12 +16,11 @@
 use Sylius\Component\Grid\Definition\Action;
 use Sylius\Component\Grid\Renderer\BulkActionGridRendererInterface;
 use Sylius\Component\Grid\View\GridView;
-use Symfony\Component\Templating\Helper\Helper;
 
 /**
  * @final
  */
-class BulkActionGridHelper extends Helper
+class BulkActionGridHelper
 {
     /** @var BulkActionGridRendererInterface */
     private $bulkActionGridRenderer;
@@ -38,9 +37,4 @@ public function renderBulkAction(GridView $gridView, Action $bulkAction, $data =
     {
         return $this->bulkActionGridRenderer->renderBulkAction($gridView, $bulkAction, $data);
     }
-
-    public function getName(): string
-    {
-        return 'sylius_bulk_action_grid';
-    }
 }
diff --git a/src/Bundle/Templating/Helper/GridHelper.php b/src/Bundle/Templating/Helper/GridHelper.php
@@ -18,9 +18,8 @@
 use Sylius\Component\Grid\Definition\Filter;
 use Sylius\Component\Grid\Renderer\GridRendererInterface;
 use Sylius\Component\Grid\View\GridView;
-use Symfony\Component\Templating\Helper\Helper;
 
-class GridHelper extends Helper
+class GridHelper
 {
     /** @var GridRendererInterface */
     private $gridRenderer;
@@ -65,9 +64,4 @@ public function renderFilter(GridView $gridView, Filter $filter)
     {
         return $this->gridRenderer->renderFilter($gridView, $filter);
     }
-
-    public function getName(): string
-    {
-        return 'sylius_grid';
-    }
 }
diff --git a/src/Bundle/spec/Templating/Helper/BulkActionGridHelperSpec.php b/src/Bundle/spec/Templating/Helper/BulkActionGridHelperSpec.php
@@ -17,8 +17,6 @@
 use Sylius\Component\Grid\Definition\Action;
 use Sylius\Component\Grid\Renderer\BulkActionGridRendererInterface;
 use Sylius\Component\Grid\View\GridView;
-use Symfony\Component\Templating\Helper\Helper;
-use Symfony\Component\Templating\Helper\HelperInterface;
 
 final class BulkActionGridHelperSpec extends ObjectBehavior
 {
@@ -27,16 +25,6 @@ function let(BulkActionGridRendererInterface $bulkActionGridRenderer): void
         $this->beConstructedWith($bulkActionGridRenderer);
     }
 
-    function it_is_a_templating_helper(): void
-    {
-        $this->shouldImplement(HelperInterface::class);
-    }
-
-    function it_extends_base_templating_helper(): void
-    {
-        $this->shouldHaveType(Helper::class);
-    }
-
     function it_uses_a_grid_renderer_to_render_a_bulk_action(
         BulkActionGridRendererInterface $bulkActionGridRenderer,
         GridView $gridView,
@@ -45,9 +33,4 @@ function it_uses_a_grid_renderer_to_render_a_bulk_action(
         $bulkActionGridRenderer->renderBulkAction($gridView, $bulkAction, null)->willReturn('<a href="#">Delete</a>');
         $this->renderBulkAction($gridView, $bulkAction)->shouldReturn('<a href="#">Delete</a>');
     }
-
-    function it_has_name(): void
-    {
-        $this->getName()->shouldReturn('sylius_bulk_action_grid');
-    }
 }
diff --git a/src/Bundle/spec/Templating/Helper/GridHelperSpec.php b/src/Bundle/spec/Templating/Helper/GridHelperSpec.php
@@ -18,8 +18,6 @@
 use Sylius\Component\Grid\Definition\Field;
 use Sylius\Component\Grid\Renderer\GridRendererInterface;
 use Sylius\Component\Grid\View\GridView;
-use Symfony\Component\Templating\Helper\Helper;
-use Symfony\Component\Templating\Helper\HelperInterface;
 
 final class GridHelperSpec extends ObjectBehavior
 {
@@ -28,16 +26,6 @@ function let(GridRendererInterface $gridRenderer): void
         $this->beConstructedWith($gridRenderer);
     }
 
-    function it_is_a_templating_helper(): void
-    {
-        $this->shouldImplement(HelperInterface::class);
-    }
-
-    function it_extends_base_templating_helper(): void
-    {
-        $this->shouldHaveType(Helper::class);
-    }
-
     function it_uses_grid_renderer_to_render_grid(GridRendererInterface $gridRenderer, GridView $gridView): void
     {
         $gridRenderer->render($gridView, null)->willReturn('<html>Grid!</html>');
@@ -55,9 +43,4 @@ function it_uses_grid_renderer_to_render_action(GridRendererInterface $gridRende
         $gridRenderer->renderAction($gridView, $action, null)->willReturn('<a href="#">Go go Gadget arms!</a>');
         $this->renderAction($gridView, $action)->shouldReturn('<a href="#">Go go Gadget arms!</a>');
     }
-
-    function it_has_name(): void
-    {
-        $this->getName()->shouldReturn('sylius_grid');
-    }
 }