CompilerExtension: uses $this->config only when parameter is not passed

Author: dg

src/DI/CompilerExtension.php

@@ -125,7 +125,7 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 	 */
 	protected function validateConfig(array $expected, array $config = NULL, $name = NULL)
 	{
-		if ($extra = array_diff_key((array) $config ?: $this->config, $expected)) {
+		if ($extra = array_diff_key(func_num_args() > 1 ? (array) $config : $this->config, $expected)) {
 			$name = $name ?: $this->name;
 			$extra = implode(", $name.", array_keys($extra));
 			throw new Nette\InvalidStateException("Unknown configuration option $name.$extra.");

tests/DI/CompilerExtension.validateConfig.phpt

@@ -38,6 +38,6 @@ Assert::exception(function() {
 Assert::exception(function() {
 	Assert::with(new MyExtension, function() {
 		$this->setConfig(array('c' => TRUE, 'd' => TRUE));
-		$this->validateConfig(array('a' => TRUE, 'b' => TRUE), NULL, 'name');
+		$this->validateConfig(array('a' => TRUE, 'b' => TRUE));
 	});
-}, 'Nette\InvalidStateException', 'Unknown configuration option name.c, name.d.');
+}, 'Nette\InvalidStateException', 'Unknown configuration option my.c, my.d.');