From 4083f1937e0ba4bb353c09c4020614c8a5eed4d0 Mon Sep 17 00:00:00 2001
From: Sipachev Igor <sipachev@sveak.com>
Date: Fri, 13 Aug 2021 13:06:40 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D0=B8=D1=81=D1=82=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BC=D1=83=D1=81=D0=BE=D1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/DependencyInjection/RequestExtension.php  |  2 --
 src/EventListener/RequestListener.php         |  7 ------
 src/Resources/config/services.yaml            |  7 ------
 .../Transformer/AbstractTransformer.php       | 13 -----------
 src/Service/Transformer/EntityTransformer.php |  1 +
 src/Service/Transformer/ServiceResolver.php   | 23 -------------------
 6 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 src/Service/Transformer/AbstractTransformer.php
 delete mode 100644 src/Service/Transformer/ServiceResolver.php

diff --git a/src/DependencyInjection/RequestExtension.php b/src/DependencyInjection/RequestExtension.php
index f58ff88..c6ca934 100644
--- a/src/DependencyInjection/RequestExtension.php
+++ b/src/DependencyInjection/RequestExtension.php
@@ -14,7 +14,5 @@ class RequestExtension extends Extension
     {
         $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yaml');
-
-        // $container->findTaggedServiceIds(AbstractTransformer::class);
     }
 }
diff --git a/src/EventListener/RequestListener.php b/src/EventListener/RequestListener.php
index da7032e..6b9ad0d 100644
--- a/src/EventListener/RequestListener.php
+++ b/src/EventListener/RequestListener.php
@@ -17,15 +17,8 @@ use Symfony\Component\Validator\Validation;
 // todo базовая заготовка. Требуется рефакторинг
 class RequestListener
 {
-    public function __construct(
-        private ServiceResolver $serviceResolver
-    ) {}
-
     public function onKernelRequest(RequestEvent $event)
     {
-        $storage = TransformerResolverStorage::getInstance();
-        $storage->add(ServiceResolver::TYPE, $this->serviceResolver);
-
         $request = $event->getRequest();
         $controller = $request->get('_controller');
         if (is_string($controller)) {
diff --git a/src/Resources/config/services.yaml b/src/Resources/config/services.yaml
index 0a25b3e..0fbec3d 100644
--- a/src/Resources/config/services.yaml
+++ b/src/Resources/config/services.yaml
@@ -11,10 +11,3 @@ services:
   Rinsvent\RequestBundle\Service\Transformer\:
     resource: '../../../src/Service/Transformer'
 
-  Rinsvent\RequestBundle\Service\Transformer\ServiceResolver:
-    bind:
-      $transformerLocator: !tagged_locator { tag: 'rinsvent.transformer', index_by: 'key', default_index_method: 'getLocatorKey' }
-
-  _instanceof:
-    Rinsvent\RequestBundle\Service\Transformer\AbstractTransformer:
-      tags: [ 'rinsvent.transformer' ]
diff --git a/src/Service/Transformer/AbstractTransformer.php b/src/Service/Transformer/AbstractTransformer.php
deleted file mode 100644
index f1df86b..0000000
--- a/src/Service/Transformer/AbstractTransformer.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Rinsvent\RequestBundle\Service\Transformer;
-
-use Rinsvent\Data2DTO\Transformer\TransformerInterface;
-
-abstract class AbstractTransformer implements TransformerInterface
-{
-    public static function getLocatorKey()
-    {
-        return static::class;
-    }
-}
diff --git a/src/Service/Transformer/EntityTransformer.php b/src/Service/Transformer/EntityTransformer.php
index 78fb4c8..7f436b2 100644
--- a/src/Service/Transformer/EntityTransformer.php
+++ b/src/Service/Transformer/EntityTransformer.php
@@ -4,6 +4,7 @@ namespace Rinsvent\RequestBundle\Service\Transformer;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Rinsvent\Data2DTO\Transformer\Meta;
+use Rinsvent\Data2DTOBundle\Service\AbstractTransformer;
 
 class EntityTransformer extends AbstractTransformer
 {
diff --git a/src/Service/Transformer/ServiceResolver.php b/src/Service/Transformer/ServiceResolver.php
deleted file mode 100644
index 7dcdcb2..0000000
--- a/src/Service/Transformer/ServiceResolver.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Rinsvent\RequestBundle\Service\Transformer;
-
-use Rinsvent\Data2DTO\Resolver\TransformerResolverInterface;
-use Rinsvent\Data2DTO\Transformer\Meta;
-use Rinsvent\Data2DTO\Transformer\TransformerInterface;
-use Symfony\Component\DependencyInjection\ServiceLocator;
-
-class ServiceResolver implements TransformerResolverInterface
-{
-    public const TYPE = 'service';
-
-    public function __construct(
-        private ServiceLocator $transformerLocator
-    ) {}
-
-    public function resolve(Meta $meta): TransformerInterface
-    {
-        $transformerClass = $meta::class . 'Transformer';
-        return $this->transformerLocator->get($transformerClass);
-    }
-}