enables normalizeConfig() to handle irregular plural forms, e.g. factory -> factories
This commit is contained in:
parent
81219bba15
commit
62d52d8015
@ -84,14 +84,21 @@ abstract class Extension implements ExtensionInterface
|
|||||||
*
|
*
|
||||||
* twig.extensions: ['twig.extension.foo', 'twig.extension.bar']
|
* twig.extensions: ['twig.extension.foo', 'twig.extension.bar']
|
||||||
*
|
*
|
||||||
* @param array A config array
|
* @param array $config A config array
|
||||||
* @param key The key to normalize
|
* @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();
|
$values = array();
|
||||||
if (isset($config[$key.'s'])) {
|
if (isset($config[$plural])) {
|
||||||
$values = $config[$key.'s'];
|
$values = $config[$plural];
|
||||||
} elseif (isset($config[$key])) {
|
} elseif (isset($config[$key])) {
|
||||||
if (is_string($config[$key]) || !is_int(key($config[$key]))) {
|
if (is_string($config[$key]) || !is_int(key($config[$key]))) {
|
||||||
// only one
|
// only one
|
||||||
|
Reference in New Issue
Block a user