DI extensions use CompilerExtension::validateConfig()

Author: dg

src/Bridges/ApplicationDI/ApplicationExtension.php

@@ -43,7 +43,7 @@ public function loadConfiguration()
 			$config = $this->getConfig($this->defaults);
 		}
 
-		$this->validate($config, $this->defaults, $old ? 'nette.application' : $this->name);
+		$this->validateConfig($this->defaults, $config, $old ? 'nette.application' : $this->name);
 
 		$application = $container->addDefinition('application') // no namespace for back compatibility
 			->setClass('Nette\Application\Application')
@@ -63,13 +63,4 @@ public function loadConfiguration()
 		}
 	}
 
-
-	private function validate(array $config, array $expected, $name)
-	{
-		if ($extra = array_diff_key($config, $expected)) {
-			$extra = implode(", $name.", array_keys($extra));
-			throw new Nette\InvalidStateException("Unknown option $name.$extra.");
-		}
-	}
-
 }

src/Bridges/ApplicationDI/LatteExtension.php

@@ -57,7 +57,7 @@ public function loadConfiguration()
 			$config['xhtml'] = $config['nette']['xhtml'];
 		}
 
-		$this->validate($config, $this->defaults, $this->name);
+		$this->validateConfig($this->defaults, $config);
 		$container = $this->getContainerBuilder();
 
 		$latteFactory = $container->addDefinition('nette.latteFactory')
@@ -115,13 +115,4 @@ public function addMacro($macro)
 			->addSetup('?->onCompile[] = function($engine) { ' . $macro . '($engine->getCompiler()); }', array('@self'));
 	}
 
-
-	private function validate(array $config, array $expected, $name)
-	{
-		if ($extra = array_diff_key($config, $expected)) {
-			$extra = implode(", $name.", array_keys($extra));
-			throw new Nette\InvalidStateException("Unknown option $name.$extra.");
-		}
-	}
-
 }

src/Bridges/ApplicationDI/RoutingExtension.php

@@ -44,7 +44,7 @@ public function loadConfiguration()
 			$config = $this->getConfig($this->defaults);
 		}
 
-		$this->validate($config, $this->defaults, $old ? 'nette.routing' : $this->name);
+		$this->validateConfig($this->defaults, $config, $old ? 'nette.routing' : $this->name);
 
 		$router = $container->addDefinition('router') // no namespace for back compatibility
 			->setClass('Nette\Application\IRouter')
@@ -61,13 +61,4 @@ public function loadConfiguration()
 		}
 	}
 
-
-	private function validate(array $config, array $expected, $name)
-	{
-		if ($extra = array_diff_key($config, $expected)) {
-			$extra = implode(", $name.", array_keys($extra));
-			throw new Nette\InvalidStateException("Unknown option $name.$extra.");
-		}
-	}
-
 }