merged branch richardmiller/fixing_config_docblock (PR symfony#5542)

fabpot · fabpot · commit 5bfecef595e8 · 2012-09-19T05:44:42.000+02:00
Commits ------- 1402b42 Fixing config normalisation example in docblock Discussion ---------- Fixing config normalisation example in docblock Against 2.0 this time as per @stof's comments in symfony/symfony-docs#1721 Bug fix: no Feature addition: no Backwards compatibility break: no Symfony2 tests pass: - Fixes the following tickets: - Todo: - License of the code: MIT
diff --git a/src/Symfony/Component/Config/Definition/Processor.php b/src/Symfony/Component/Config/Definition/Processor.php
@@ -89,14 +89,14 @@ public static function normalizeKeys(array $config)
      *
      * Here is an example.
      *
-     * The configuration is XML:
+     * The configuration in XML:
      *
-     * <twig:extension id="twig.extension.foo" />
-     * <twig:extension id="twig.extension.bar" />
+     * <twig:extension>twig.extension.foo</twig:extension>
+     * <twig:extension>twig.extension.bar</twig:extension>
      *
      * And the same configuration in YAML:
      *
-     * twig.extensions: ['twig.extension.foo', 'twig.extension.bar']
+     * extensions: ['twig.extension.foo', 'twig.extension.bar']
      *
      * @param array  $config A config array
      * @param string $key    The key to normalize

Original file line number	Diff line number	Diff line change
`@@ -89,14 +89,14 @@ public static function normalizeKeys(array $config)`
`89`	`89`	`*`
`90`	`90`	`* Here is an example.`
`91`	`91`	`*`
`92`		`- * The configuration is XML:`
	`92`	`+ * The configuration in XML:`
`93`	`93`	`*`
`94`		`- * <twig:extension id="twig.extension.foo" />`
`95`		`- * <twig:extension id="twig.extension.bar" />`
	`94`	`+ * <twig:extension>twig.extension.foo</twig:extension>`
	`95`	`+ * <twig:extension>twig.extension.bar</twig:extension>`
`96`	`96`	`*`
`97`	`97`	`* And the same configuration in YAML:`
`98`	`98`	`*`
`99`		`- * twig.extensions: ['twig.extension.foo', 'twig.extension.bar']`
	`99`	`+ * extensions: ['twig.extension.foo', 'twig.extension.bar']`
`100`	`100`	`*`
`101`	`101`	`* @param array $config A config array`
`102`	`102`	`* @param string $key The key to normalize`