Require symfony/dependency-injection v4.2

Author: olvlvl

README.md

@@ -115,28 +115,21 @@ many. For instance, if a service was an instance of `ArrayObject` the following
 Don't know which interface to choose from for ArrayObject: IteratorAggregate, Traversable, ArrayAccess, Serializable, Countable.
 ```
 
-We can help by decorating the basic interface resolver with a map, and specify which interface to implement for which
-class:
+We can specify which interface to implement using the `proxy` tag:
 
-```php
-<?php
-
-use olvlvl\SymfonyDependencyInjectionProxy\FactoryRenderer;
-use olvlvl\SymfonyDependencyInjectionProxy\InterfaceResolver\BasicInterfaceResolver;
-use olvlvl\SymfonyDependencyInjectionProxy\InterfaceResolver\MapInterfaceResolver;
-use olvlvl\SymfonyDependencyInjectionProxy\MethodRenderer;
-use olvlvl\SymfonyDependencyInjectionProxy\ProxyDumper;
-use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
+```yaml
+ArrayObject:
+  lazy: true
+  tags:
+  - { name: proxy, interface: ArrayAccess }
+```
 
-/* @var PhpDumper $dumper */
+And since `symfony/dependency-injection` v4.2 we can specify the interface to implement using the `lazy` attribute:
 
-$dumper->setProxyDumper(new ProxyDumper(
-    new MapInterfaceResolver(new BasicInterfaceResolver(), [
-        ArrayObject::class => ArrayAccess::class,
-    ]),
-    new FactoryRenderer(new MethodRenderer)
-));
-``` 
+```yaml
+ArrayObject:
+  lazy: ArrayAccess
+```
 
 
 

composer.json

@@ -13,7 +13,7 @@
     "require": {
         "php": ">=7.1",
         "ext-json": "*",
-        "symfony/dependency-injection": "^4.1"
+        "symfony/dependency-injection": "^4.2"
     },
     "autoload": {
         "psr-4": {

lib/InterfaceResolver/MapInterfaceResolver.php

@@ -13,9 +13,9 @@
 
 use ReflectionMethod;
 use ReflectionParameter;
+use ReflectionType;
 use function implode;
 use function json_encode;
-use ReflectionType;
 
 class MethodRenderer
 {

lib/MethodRenderer.php

@@ -12,13 +12,11 @@
 namespace olvlvl\SymfonyDependencyInjectionProxy;
 
 use InvalidArgumentException;
-use function method_exists;
-use function sprintf;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\DumperInterface;
 use function class_exists;
 use function ltrim;
+use function sprintf;
 
 final class ProxyDumper implements DumperInterface
 {
@@ -83,15 +81,27 @@ public function getProxyFactoryCode(Definition $definition, $id, $factoryCode)
      */
     public function getProxyCode(Definition $definition)
     {
-        return '// nothing to do';
+        return '';
     }
 
     /**
      * @throws \Exception
      */
     private function findInterface(Definition $definition): string
     {
-        return $this->interfaceResolver->resolveInterface($definition->getClass());
+        return $this->resolveInterfaceFromTags($definition)
+            ?: $this->interfaceResolver->resolveInterface($definition->getClass());
+    }
+
+    private function resolveInterfaceFromTags(Definition $definition): ?string
+    {
+        $proxy = $definition->getTag('proxy');
+
+        if (empty($proxy[0]['interface'])) {
+            return null;
+        }
+
+        return $proxy[0]['interface'];
     }
 
     private function renderFactory(string $interface, string $factoryCode): string

lib/ProxyDumper.php

@@ -13,7 +13,6 @@
 
 use olvlvl\SymfonyDependencyInjectionProxy\FactoryRenderer;
 use olvlvl\SymfonyDependencyInjectionProxy\InterfaceResolver\BasicInterfaceResolver;
-use olvlvl\SymfonyDependencyInjectionProxy\InterfaceResolver\MapInterfaceResolver;
 use olvlvl\SymfonyDependencyInjectionProxy\MethodRenderer;
 use olvlvl\SymfonyDependencyInjectionProxy\ProxyDumper;
 use PHPUnit\Framework\TestCase;
@@ -53,9 +52,7 @@ public function testCompilation(array $definitions, callable $assert, callable $
 
         $dumper = new PhpDumper($builder);
         $dumper->setProxyDumper(new ProxyDumper(
-            new MapInterfaceResolver(new BasicInterfaceResolver(), [
-                Sample2::class => SampleInterface2::class,
-            ]),
+            new BasicInterfaceResolver(),
             new FactoryRenderer(new MethodRenderer)
         ));
 
@@ -103,6 +100,7 @@ function (ContainerInterface $container) use ($id, $value) {
                         ->setPublic(true)
                         ->addArgument(uniqid())
                         ->addArgument($value2 = uniqid())
+                        ->addTag('proxy', [ 'interface' => SampleInterface2::class ])
                 ],
                 function (ContainerInterface $container) use ($id, $value2) {
                     /* @var SampleInterface2 $service */

tests/IntegrationTest.php

@@ -150,7 +150,6 @@ public function testGetProxyCode()
 
         $proxyCode = $stu->getProxyCode(new Definition());
 
-        $this->assertNotEmpty($proxyCode);
-        $this->assertGreaterThanOrEqual(2, count(explode(' ', $proxyCode)));
+        $this->assertEmpty($proxyCode);
     }
 }