[ProxyManagerBridge] remove deprecated features

xabbuh · xabbuh · commit 9b4c44bbf783 · 2017-05-21T10:21:32.000+02:00
diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -14,7 +14,6 @@
 use ProxyManager\Generator\ClassGenerator;
 use ProxyManager\GeneratorStrategy\BaseGeneratorStrategy;
 use ProxyManager\ProxyGenerator\LazyLoadingValueHolderGenerator;
-use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\DumperInterface;
 
@@ -63,20 +62,18 @@ public function isProxyCandidate(Definition $definition)
     /**
      * {@inheritdoc}
      */
-    public function getProxyFactoryCode(Definition $definition, $id)
+    public function getProxyFactoryCode(Definition $definition, $id, $methodName = null)
     {
         $instantiation = 'return';
 
         if ($definition->isShared()) {
             $instantiation .= " \$this->services['$id'] =";
         }
 
-        if (func_num_args() >= 3) {
-            $methodName = func_get_arg(2);
-        } else {
-            @trigger_error(sprintf('You must use the third argument of %s to define the method to call to construct your service since version 3.1, not using it won\'t be supported in 4.0.', __METHOD__), E_USER_DEPRECATED);
-            $methodName = 'get'.Container::camelize($id).'Service';
+        if (null === $methodName) {
+            throw new \InvalidArgumentException(sprintf('Missing name of method to call to construct the service "%s".', $id));
         }
+
         $proxyClass = $this->getProxyClassName($definition);
 
         $generatedClass = $this->generateProxyClass($definition);
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -80,24 +80,14 @@ public function testGetProxyFactoryCodeWithCustomMethod()
     }
 
     /**
-     * @group legacy
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Missing name of method to call to construct the service "foo".
      */
-    public function testGetProxyFactoryCode()
+    public function testGetProxyFactoryCodeWithoutCustomMethod()
     {
         $definition = new Definition(__CLASS__);
-
         $definition->setLazy(true);
-
-        $code = $this->dumper->getProxyFactoryCode($definition, 'foo');
-
-        $this->assertStringMatchesFormat(
-            '%wif ($lazyLoad) {%wreturn $this->services[\'foo\'] =%s'
-            .'SymfonyBridgeProxyManagerTestsLazyProxyPhpDumperProxyDumperTest_%s(%wfunction '
-            .'(&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) {'
-            .'%w$wrappedInstance = $this->getFooService(false);%w$proxy->setProxyInitializer(null);'
-            .'%wreturn true;%w}%w);%w}%w',
-            $code
-        );
+        $this->dumper->getProxyFactoryCode($definition, 'foo');
     }
 
     /**
diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": "^7.1.3",
-        "symfony/dependency-injection": "~3.4|~4.0",
+        "symfony/dependency-injection": "~4.0",
         "ocramius/proxy-manager": "~0.4|~1.0|~2.0"
     },
     "require-dev": {
diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php
@@ -34,11 +34,11 @@ public function isProxyCandidate(Definition $definition);
      *
      * @param Definition $definition
      * @param string     $id         service identifier
-     * @param string     $methodName the method name to get the service, will be added to the interface in 4.0
+     * @param string     $methodName the method name to get the service
      *
      * @return string
      */
-    public function getProxyFactoryCode(Definition $definition, $id/**, $methodName = null */);
+    public function getProxyFactoryCode(Definition $definition, $id, $methodName);
 
     /**
      * Generates the code for the lazy proxy.
diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/NullDumper.php b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/NullDumper.php
@@ -31,7 +31,7 @@ public function isProxyCandidate(Definition $definition)
     /**
      * {@inheritdoc}
      */
-    public function getProxyFactoryCode(Definition $definition, $id)
+    public function getProxyFactoryCode(Definition $definition, $id, $methodName)
     {
         return '';
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php
@@ -88,7 +88,7 @@ public function isProxyCandidate(Definition $definition)
         return false;
     }
 
-    public function getProxyFactoryCode(Definition $definition, $id)
+    public function getProxyFactoryCode(Definition $definition, $id, $methodName)
     {
         return '';
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/LazyProxy/PhpDumper/NullDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/LazyProxy/PhpDumper/NullDumperTest.php
@@ -28,7 +28,7 @@ public function testNullDumper()
         $definition = new Definition('stdClass');
 
         $this->assertFalse($dumper->isProxyCandidate($definition));
-        $this->assertSame('', $dumper->getProxyFactoryCode($definition, 'foo'));
+        $this->assertSame('', $dumper->getProxyFactoryCode($definition, 'foo', 'getFooService'));
         $this->assertSame('', $dumper->getProxyCode($definition));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,11 @@ public function isProxyCandidate(Definition $definition);`
`34`	`34`	`*`
`35`	`35`	`* @param Definition $definition`
`36`	`36`	`* @param string $id service identifier`
`37`		`- * @param string $methodName the method name to get the service, will be added to the interface in 4.0`
	`37`	`+ * @param string $methodName the method name to get the service`
`38`	`38`	`*`
`39`	`39`	`* @return string`
`40`	`40`	`*/`
`41`		`- public function getProxyFactoryCode(Definition $definition, $id/*, $methodName = null /);`
	`41`	`+ public function getProxyFactoryCode(Definition $definition, $id, $methodName);`
`42`	`42`
`43`	`43`	`/**`
`44`	`44`	`* Generates the code for the lazy proxy.`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function isProxyCandidate(Definition $definition)`
`31`	`31`	`/**`
`32`	`32`	`* {@inheritdoc}`
`33`	`33`	`*/`
`34`		`- public function getProxyFactoryCode(Definition $definition, $id)`
	`34`	`+ public function getProxyFactoryCode(Definition $definition, $id, $methodName)`
`35`	`35`	`{`
`36`	`36`	`return '';`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public function isProxyCandidate(Definition $definition)`
`88`	`88`	`return false;`
`89`	`89`	`}`
`90`	`90`
`91`		`- public function getProxyFactoryCode(Definition $definition, $id)`
	`91`	`+ public function getProxyFactoryCode(Definition $definition, $id, $methodName)`
`92`	`92`	`{`
`93`	`93`	`return '';`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function testNullDumper()`
`28`	`28`	`$definition = new Definition('stdClass');`
`29`	`29`
`30`	`30`	`$this->assertFalse($dumper->isProxyCandidate($definition));`
`31`		`- $this->assertSame('', $dumper->getProxyFactoryCode($definition, 'foo'));`
	`31`	`+ $this->assertSame('', $dumper->getProxyFactoryCode($definition, 'foo', 'getFooService'));`
`32`	`32`	`$this->assertSame('', $dumper->getProxyCode($definition));`
`33`	`33`	`}`
`34`	`34`	`}`