Don't trigger deprecation errors

matthiasnoback · matthiasnoback · commit e150ef53602a · 2015-12-19T08:35:34.000+01:00
diff --git a/ConstructorResolver.php b/ConstructorResolver.php
@@ -111,15 +111,15 @@ private function resolveFactory(Definition $definition)
         }
 
         if (method_exists($definition, 'getFactoryClass')
-            && $definition->getFactoryClass()
-            && $definition->getFactoryMethod()) {
-            return array($definition->getFactoryClass(), $definition->getFactoryMethod());
+            && $definition->getFactoryClass(false)
+            && $definition->getFactoryMethod(false)) {
+            return array($definition->getFactoryClass(false), $definition->getFactoryMethod(false));
         }
 
         if (method_exists($definition, 'getFactoryService')
-            && $definition->getFactoryService()
-            && $definition->getFactoryMethod()) {
-            return array(new Reference($definition->getFactoryService()), $definition->getFactoryMethod());
+            && $definition->getFactoryService(false)
+            && $definition->getFactoryMethod(false)) {
+            return array(new Reference($definition->getFactoryService(false)), $definition->getFactoryMethod(false));
         }
 
         return null;
diff --git a/ServiceDefinitionValidator.php b/ServiceDefinitionValidator.php
@@ -73,16 +73,16 @@ private function validateFactory(Definition $definition)
     {
         if (method_exists($definition, 'getFactoryClass')) {
             // Symfony <= 3.0.0
-            $factoryClass = $definition->getFactoryClass();
+            $factoryClass = $definition->getFactoryClass(false);
             if ($factoryClass) {
-                $this->validateFactoryClassAndMethod($factoryClass, $definition->getFactoryMethod());
+                $this->validateFactoryClassAndMethod($factoryClass, $definition->getFactoryMethod(false));
             }
         }
 
         if (method_exists($definition, 'getFactoryService')) {
-            $factoryService = $definition->getFactoryService();
+            $factoryService = $definition->getFactoryService(false);
             if ($factoryService) {
-                $this->validateFactoryServiceAndMethod($factoryService, $definition->getFactoryMethod());
+                $this->validateFactoryServiceAndMethod($factoryService, $definition->getFactoryMethod(false));
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -111,15 +111,15 @@ private function resolveFactory(Definition $definition)`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`if (method_exists($definition, 'getFactoryClass')`
`114`		`- && $definition->getFactoryClass()`
`115`		`- && $definition->getFactoryMethod()) {`
`116`		`- return array($definition->getFactoryClass(), $definition->getFactoryMethod());`
	`114`	`+ && $definition->getFactoryClass(false)`
	`115`	`+ && $definition->getFactoryMethod(false)) {`
	`116`	`+ return array($definition->getFactoryClass(false), $definition->getFactoryMethod(false));`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`if (method_exists($definition, 'getFactoryService')`
`120`		`- && $definition->getFactoryService()`
`121`		`- && $definition->getFactoryMethod()) {`
`122`		`- return array(new Reference($definition->getFactoryService()), $definition->getFactoryMethod());`
	`120`	`+ && $definition->getFactoryService(false)`
	`121`	`+ && $definition->getFactoryMethod(false)) {`
	`122`	`+ return array(new Reference($definition->getFactoryService(false)), $definition->getFactoryMethod(false));`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -73,16 +73,16 @@ private function validateFactory(Definition $definition)`
`73`	`73`	`{`
`74`	`74`	`if (method_exists($definition, 'getFactoryClass')) {`
`75`	`75`	`// Symfony <= 3.0.0`
`76`		`- $factoryClass = $definition->getFactoryClass();`
	`76`	`+ $factoryClass = $definition->getFactoryClass(false);`
`77`	`77`	`if ($factoryClass) {`
`78`		`- $this->validateFactoryClassAndMethod($factoryClass, $definition->getFactoryMethod());`
	`78`	`+ $this->validateFactoryClassAndMethod($factoryClass, $definition->getFactoryMethod(false));`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`if (method_exists($definition, 'getFactoryService')) {`
`83`		`- $factoryService = $definition->getFactoryService();`
	`83`	`+ $factoryService = $definition->getFactoryService(false);`
`84`	`84`	`if ($factoryService) {`
`85`		`- $this->validateFactoryServiceAndMethod($factoryService, $definition->getFactoryMethod());`
	`85`	`+ $this->validateFactoryServiceAndMethod($factoryService, $definition->getFactoryMethod(false));`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`