From 9ad2367362270b3f2dd33fcd805740d148ab8e34 Mon Sep 17 00:00:00 2001
From: Alexander Dmitryuk <xakzona@bk.ru>
Date: Mon, 31 Oct 2022 20:48:12 +0600
Subject: [PATCH] Remove TwigExtension.php (#329)

* Remove TwigExtension.php

* fix test

Co-authored-by: a.dmitryuk <a.dmitryuk@movavi.com>
Co-authored-by: Damien Harper <damien.harper@gmail.com>
---
 src/Resources/config/services.yaml         |  7 --
 src/Twig/Extension/TwigExtension.php       | 40 -----------
 tests/DHAuditorBundleTest.php              |  4 --
 tests/Twig/Extension/TwigExtensionTest.php | 78 ----------------------
 4 files changed, 129 deletions(-)
 delete mode 100644 src/Twig/Extension/TwigExtension.php
 delete mode 100644 tests/Twig/Extension/TwigExtensionTest.php

diff --git a/src/Resources/config/services.yaml b/src/Resources/config/services.yaml
index 6276ea6b..2059e2de 100644
--- a/src/Resources/config/services.yaml
+++ b/src/Resources/config/services.yaml
@@ -65,13 +65,6 @@ services:
       - { method: setContainer, arguments: ['@service_container'] }
     tags: ['controller.service_arguments']
 
-  DH\AuditorBundle\Twig\Extension\TwigExtension:
-    class: DH\AuditorBundle\Twig\Extension\TwigExtension
-    arguments:
-      - '@doctrine'
-    tags:
-      - { name: twig.extension }
-
   DH\AuditorBundle\User\UserProvider:
     class: DH\AuditorBundle\User\UserProvider
     arguments: ['@security.helper', '@DH\Auditor\Provider\Doctrine\Configuration']
diff --git a/src/Twig/Extension/TwigExtension.php b/src/Twig/Extension/TwigExtension.php
deleted file mode 100644
index 4b979a76..00000000
--- a/src/Twig/Extension/TwigExtension.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DH\AuditorBundle\Twig\Extension;
-
-use Doctrine\Persistence\ManagerRegistry;
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFilter;
-
-/**
- * @see \DH\AuditorBundle\Tests\Twig\Extension\TwigExtensionTest
- */
-class TwigExtension extends AbstractExtension
-{
-    /**
-     * @var ManagerRegistry
-     */
-    protected $doctrine;
-
-    public function __construct(ManagerRegistry $doctrine)
-    {
-        $this->doctrine = $doctrine;
-    }
-
-    public function getFilters(): array
-    {
-        return [
-            new TwigFilter('json_decode', 'json_decode'),
-        ];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName(): string
-    {
-        return 'twig_extensions';
-    }
-}
diff --git a/tests/DHAuditorBundleTest.php b/tests/DHAuditorBundleTest.php
index 1160fdb4..2f7acdd6 100644
--- a/tests/DHAuditorBundleTest.php
+++ b/tests/DHAuditorBundleTest.php
@@ -13,7 +13,6 @@
 use DH\AuditorBundle\Controller\ViewerController;
 use DH\AuditorBundle\DHAuditorBundle;
 use DH\AuditorBundle\Event\ConsoleEventSubscriber;
-use DH\AuditorBundle\Twig\Extension\TwigExtension;
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
 use Nyholm\BundleTest\BaseBundleTestCase;
 use Nyholm\BundleTest\CompilerPass\PublicServicePass;
@@ -80,9 +79,6 @@ public function testInitBundle(): void
         self::assertTrue($container->has(\DH\AuditorBundle\Controller\ViewerController::class));
         self::assertInstanceOf(ViewerController::class, $container->get(\DH\AuditorBundle\Controller\ViewerController::class));
 
-        self::assertTrue($container->has(\DH\AuditorBundle\Twig\Extension\TwigExtension::class));
-        self::assertInstanceOf(TwigExtension::class, $container->get(\DH\AuditorBundle\Twig\Extension\TwigExtension::class));
-
         self::assertTrue($container->has(\DH\AuditorBundle\Event\ConsoleEventSubscriber::class));
         self::assertInstanceOf(ConsoleEventSubscriber::class, $container->get(\DH\AuditorBundle\Event\ConsoleEventSubscriber::class));
     }
diff --git a/tests/Twig/Extension/TwigExtensionTest.php b/tests/Twig/Extension/TwigExtensionTest.php
deleted file mode 100644
index 4c7e98bc..00000000
--- a/tests/Twig/Extension/TwigExtensionTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DH\AuditorBundle\Tests\Twig\Extension;
-
-use DH\AuditorBundle\DHAuditorBundle;
-use DH\AuditorBundle\Twig\Extension\TwigExtension;
-use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
-use Nyholm\BundleTest\BaseBundleTestCase;
-use Nyholm\BundleTest\CompilerPass\PublicServicePass;
-use Symfony\Bundle\SecurityBundle\SecurityBundle;
-use Symfony\Bundle\TwigBundle\TwigBundle;
-use Symfony\Component\HttpKernel\Kernel;
-
-/**
- * @internal
- *
- * @small
- */
-final class TwigExtensionTest extends BaseBundleTestCase
-{
-    protected $container;
-
-    protected function setUp(): void
-    {
-        if (3 === Kernel::MAJOR_VERSION) {
-            self::markTestSkipped('Test skipped for Symfony <= 3.4');
-        }
-
-        parent::setUp();
-
-        // Make services public
-        $this->addCompilerPass(new PublicServicePass('#^(DH\\\\Auditor(Bundle)?\\\\|dh_auditor\.).*$#'));
-
-        $kernel = $this->createKernel();
-
-        $kernel->addConfigFile(__DIR__.'/../../Fixtures/Resources/config/dh_auditor.yaml');
-        $kernel->addConfigFile(__DIR__.'/../../Fixtures/Resources/config/doctrine.yaml');
-        if (6 === Kernel::MAJOR_VERSION) {
-            $kernel->addConfigFile(__DIR__.'/../../Fixtures/Resources/config/sf6/security.yaml');
-        } else {
-            $kernel->addConfigFile(__DIR__.'/../../Fixtures/Resources/config/sf4_5/security.yaml');
-        }
-
-        $kernel->addBundle(DoctrineBundle::class);
-        $kernel->addBundle(SecurityBundle::class);
-        $kernel->addBundle(TwigBundle::class);
-
-        $this->bootKernel();
-
-        $this->container = $this->getContainer();
-    }
-
-    public function testGetFilters(): void
-    {
-        $extension = new TwigExtension($this->container->get('doctrine'));
-        $filters = $extension->getFilters();
-
-        self::assertNotEmpty($filters, 'extension has at least 1 filter.');
-
-        foreach ($filters as $filter) {
-            self::assertInstanceOf(\Twig\TwigFilter::class, $filter, 'filter instanceof Twig\TwigFilter');
-        }
-    }
-
-    public function testGetName(): void
-    {
-        $extension = new TwigExtension($this->container->get('doctrine'));
-
-        self::assertSame('twig_extensions', $extension->getName(), 'TwigExtension::getName() is ok.');
-    }
-
-    protected function getBundleClass()
-    {
-        return DHAuditorBundle::class;
-    }
-}