From 62d52d8015b0ec90077a1f5302feb58e00121651 Mon Sep 17 00:00:00 2001
From: "Johannes M. Schmitt" <schmittjoh@gmail.com>
Date: Fri, 28 Jan 2011 12:01:21 +0100
Subject: [PATCH] enables normalizeConfig() to handle irregular plural forms,
 e.g. factory -> factories

---
 .../DependencyInjection/Extension/Extension.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Extension/Extension.php b/src/Symfony/Component/DependencyInjection/Extension/Extension.php
index 36b0455acd..bf56be455f 100644
--- a/src/Symfony/Component/DependencyInjection/Extension/Extension.php
+++ b/src/Symfony/Component/DependencyInjection/Extension/Extension.php
@@ -84,14 +84,21 @@ abstract class Extension implements ExtensionInterface
      *
      * twig.extensions: ['twig.extension.foo', 'twig.extension.bar']
      *
-     * @param array A config array
-     * @param key   The key to normalize
+     * @param array  $config A config array
+     * @param string $key    The key to normalize
+     * @param string $plural The plural form of the key if it is irregular
+     *
+     * @return array
      */
-    public static function normalizeConfig($config, $key)
+    public static function normalizeConfig($config, $key, $plural = null)
     {
+        if (null === $plural) {
+            $plural = $key.'s';
+        }
+
         $values = array();
-        if (isset($config[$key.'s'])) {
-            $values = $config[$key.'s'];
+        if (isset($config[$plural])) {
+            $values = $config[$plural];
         } elseif (isset($config[$key])) {
             if (is_string($config[$key]) || !is_int(key($config[$key]))) {
                 // only one