New implementation of bundle
This commit is contained in:
@@ -20,16 +20,28 @@ class Configuration implements ConfigurationInterface
|
||||
$treeBuilder = new TreeBuilder();
|
||||
$rootNode = $treeBuilder->root('jhg_nexmo');
|
||||
|
||||
// Here you should define the parameters that are allowed to
|
||||
// configure your bundle. See the documentation linked above for
|
||||
// more information on that topic.
|
||||
|
||||
$rootNode
|
||||
->children()
|
||||
->scalarNode('api_key')->end()
|
||||
->scalarNode('api_secret')->end()
|
||||
->scalarNode('from_name')->end()
|
||||
->booleanNode('disable_delivery')->end()
|
||||
->scalarNode('api_key')
|
||||
->isRequired()
|
||||
->end()
|
||||
|
||||
->scalarNode('api_secret')
|
||||
->isRequired()
|
||||
->end()
|
||||
|
||||
->scalarNode('from_name')
|
||||
->validate()
|
||||
->ifTrue(function ($s) {
|
||||
return (strlen($s)>11 || strlen($s)<2) && preg_match('/^[0-9a-z]{11}$/i', $s) !== 1;
|
||||
})
|
||||
->thenInvalid('Invalid from_name, only alphanumeric characters are allowed')
|
||||
->end()
|
||||
->end()
|
||||
|
||||
->booleanNode('disable_delivery')
|
||||
->defaultFalse()
|
||||
->end()
|
||||
->end()
|
||||
;
|
||||
|
||||
|
||||
@@ -21,35 +21,11 @@ class JhgNexmoExtension extends Extension
|
||||
$configuration = new Configuration();
|
||||
$config = $this->processConfiguration($configuration, $configs);
|
||||
|
||||
if (!isset($config['api_key'])) {
|
||||
throw new \InvalidArgumentException('The "api_key" option must be set for JhgNexmoBundle');
|
||||
}
|
||||
|
||||
if (!isset($config['api_secret'])) {
|
||||
throw new \InvalidArgumentException('The "api_secret" option must be set for JhgNexmoBundle');
|
||||
}
|
||||
|
||||
$container->setParameter('jhg_nexmo.api_key', $config['api_key']);
|
||||
$container->setParameter('jhg_nexmo.api_secret', $config['api_secret']);
|
||||
|
||||
if(isset($config['disable_delivery'])) {
|
||||
$container->setParameter('jhg_nexmo.disable_delivery', $config['disable_delivery']);
|
||||
}
|
||||
|
||||
if(isset($config['from_name'])) {
|
||||
if (strlen($config['from_name'])>11) {
|
||||
throw new \InvalidArgumentException('The "jhg_nexmo.from_name" option can not be larger than 11 characters');
|
||||
}
|
||||
|
||||
if (!preg_match('/^[0-9a-z]{11}$/i', $config['from_name'])) {
|
||||
throw new \InvalidArgumentException('The "jhg_nexmo.from_name" option only have alphanumeric characters');
|
||||
}
|
||||
|
||||
$container->setParameter('jhg_nexmo.from_name', $config['from_name']);
|
||||
} else {
|
||||
$container->setParameter('jhg_nexmo.from_name', 'MyAppName');
|
||||
}
|
||||
|
||||
$container->setParameter('jhg_nexmo.disable_delivery', $config['disable_delivery']);
|
||||
$container->setParameter('jhg_nexmo.from_name', $config['from_name']);
|
||||
|
||||
$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
|
||||
$loader->load('services.yml');
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user