symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+2-6Lines changed: 2 additions & 6 deletions b/‎src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+2-6Lines changed: 2 additions & 6 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/legacy_invalid_definition.yml renamed to ‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/bad_keyword.yml
Copy file name to clipboard b/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/legacy_invalid_definition.yml renamed to ‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/bad_keyword.yml
Copy file name to clipboard
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
+11Lines changed: 11 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
+11Lines changed: 11 additions & 0 deletions
@@ -782,7 +782,7 @@ private function loadFromExtensions(array $content)
      */
     private function checkDefinition($id, array $definition, $file)
     {
-        if ($throw = $this->isLoadingInstanceof) {
+        if ($this->isLoadingInstanceof) {
             $keywords = self::$instanceofKeywords;
         } elseif ($throw = isset($definition['resource'])) {
             $keywords = self::$prototypeKeywords;
@@ -792,11 +792,7 @@ private function checkDefinition($id, array $definition, $file)
 
         foreach ($definition as $key => $value) {
             if (!isset($keywords[$key])) {
-                if ($throw) {
-                    throw new InvalidArgumentException(sprintf('The configuration key "%s" is unsupported for definition "%s" in "%s". Allowed configuration keys are "%s".', $key, $id, $file, implode('", "', $keywords)));
-                }
-
-                @trigger_error(sprintf('The configuration key "%s" is unsupported for service definition "%s" in "%s". Allowed configuration keys are "%s". The YamlFileLoader object will raise an exception instead in Symfony 4.0 when detecting an unsupported service configuration key.', $key, $id, $file, implode('", "', $keywords)), E_USER_DEPRECATED);
+                throw new InvalidArgumentException(sprintf('The configuration key "%s" is unsupported for definition "%s" in "%s". Allowed configuration keys are "%s".', $key, $id, $file, implode('", "', $keywords)));
             }
         }
     }
 
@@ -633,6 +633,17 @@ public function testEmptyInstanceofThrowsClearException()
         $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
         $loader->load('bad_empty_instanceof.yml');
     }
+
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
+     * @expectedExceptionMessageRegExp /^The configuration key "private" is unsupported for definition "bar"/
+     */
+    public function testUnsupportedKeywordThrowsException()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('bad_keyword.yml');
+    }
 }
 
 interface FooInterface
Original file line number	Diff line number	Diff line change
`@@ -782,7 +782,7 @@ private function loadFromExtensions(array $content)`
`782`	`782`	`*/`
`783`	`783`	`private function checkDefinition($id, array $definition, $file)`
`784`	`784`	`{`
`785`		`- if ($throw = $this->isLoadingInstanceof) {`
	`785`	`+ if ($this->isLoadingInstanceof) {`
`786`	`786`	`$keywords = self::$instanceofKeywords;`
`787`	`787`	`} elseif ($throw = isset($definition['resource'])) {`
`788`	`788`	`$keywords = self::$prototypeKeywords;`
`@@ -792,11 +792,7 @@ private function checkDefinition($id, array $definition, $file)`
`792`	`792`
`793`	`793`	`foreach ($definition as $key => $value) {`
`794`	`794`	`if (!isset($keywords[$key])) {`
`795`		`- if ($throw) {`
`796`		`- throw new InvalidArgumentException(sprintf('The configuration key "%s" is unsupported for definition "%s" in "%s". Allowed configuration keys are "%s".', $key, $id, $file, implode('", "', $keywords)));`
`797`		`- }`
`798`		`-`
`799`		`- @trigger_error(sprintf('The configuration key "%s" is unsupported for service definition "%s" in "%s". Allowed configuration keys are "%s". The YamlFileLoader object will raise an exception instead in Symfony 4.0 when detecting an unsupported service configuration key.', $key, $id, $file, implode('", "', $keywords)), E_USER_DEPRECATED);`
	`795`	`+ throw new InvalidArgumentException(sprintf('The configuration key "%s" is unsupported for definition "%s" in "%s". Allowed configuration keys are "%s".', $key, $id, $file, implode('", "', $keywords)));`
`800`	`796`	`}`
`801`	`797`	`}`
`802`	`798`	`}`