ContainerBuilder: setClassName() & getClassName() moved to Compiler (BC break)

Author: dg

src/DI/Compiler.php

@@ -30,6 +30,9 @@ class Compiler
 	/** @var string[] of file names */
 	private $dependencies = [];
 
+	/** @var string */
+	private $className = 'Container';
+
 	/** @var array reserved section names */
 	private static $reserved = ['services' => 1, 'parameters' => 1];
 
@@ -74,6 +77,16 @@ public function getContainerBuilder()
 	}
 
 
+	/**
+	 * @return self
+	 */
+	public function setClassName($className)
+	{
+		$this->className = $className;
+		return $this;
+	}
+
+
 	/**
 	 * Adds new configuration.
 	 * @return self
@@ -138,7 +151,7 @@ public function compile(array $config = NULL, $className = NULL, $parentName = N
 		$this->processParameters();
 		$this->processExtensions();
 		$this->processServices();
-		$classes = $this->generateCode($className, $parentName);
+		$classes = $this->generateCode($className ?: $this->className, $parentName);
 		return func_num_args()
 			? implode("\n\n\n", $classes) // back compatiblity
 			: $classes;

src/DI/ContainerBuilder.php

@@ -28,7 +28,7 @@ class ContainerBuilder
 	public $parameters = [];
 
 	/** @var string */
-	private $className = 'Container';
+	private $className;
 
 	/** @var ServiceDefinition[] */
 	private $definitions = [];
@@ -174,20 +174,22 @@ public function getAliases()
 
 
 	/**
-	 * @return self
+	 * @deprecated
 	 */
 	public function setClassName($name)
 	{
+		trigger_error(__METHOD__ . ' has been deprecated', E_USER_DEPRECATED);
 		$this->className = (string) $name;
 		return $this;
 	}
 
 
 	/**
-	 * @return string
+	 * @deprecated
 	 */
 	public function getClassName()
 	{
+		trigger_error(__METHOD__ . ' has been deprecated', E_USER_DEPRECATED);
 		return $this->className;
 	}
 

src/DI/ContainerLoader.php

@@ -109,7 +109,7 @@ private function isExpired($file)
 	protected function generate($class, $generator)
 	{
 		$compiler = new Compiler;
-		$compiler->getContainerBuilder()->setClassName($class);
+		$compiler->setClassName($class);
 		$code = call_user_func_array($generator, [& $compiler]);
 		$code = $code ?: implode("\n\n\n", $compiler->compile());
 		$files = $compiler->getDependencies();