ContainerBuilder::formatPhp() fixed compatibility when method is called directly

Author: dg

src/DI/ContainerBuilder.php

@@ -581,7 +581,7 @@ public function complete()
 
 
 	/**
-	 * @return void
+	 * @return Statement
 	 */
 	public function completeStatement(Statement $statement)
 	{
@@ -934,9 +934,17 @@ public function formatPhp($statement, $args)
 	{
 		array_walk_recursive($args, function (& $val) {
 			if ($val instanceof Statement) {
-				$val = self::literal($this->formatStatement($val));
+				$val = self::literal($this->formatStatement($this->completeStatement($val)));
+
+			} elseif ($val === $this) {
+				trigger_error("Replace object ContainerBuilder in Statement arguments with '@container'.", E_USER_DEPRECATED);
+				$val = self::literal('$this');
+
+			} elseif ($val instanceof ServiceDefinition) {
+				$val = '@' . current(array_keys($this->getDefinitions(), $val, TRUE));
+			}
 
-			} elseif (is_string($val) && substr($val, 0, 2) === '@@') { // escaped text @@
+			if (is_string($val) && substr($val, 0, 2) === '@@') { // escaped text @@
 				$val = substr($val, 1);
 
 			} elseif (is_string($val) && substr($val, 0, 1) === '@' && strlen($val) > 1) { // service reference