Cadoles
/
CaptchaBundle
20
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Mergin & fixing text_color & background_color (fixes #57)

This commit is contained in:
Gregwar 2013-08-07 11:18:16 +02:00
parent 9578caab10
commit 3f64e064d3
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DependencyInjection/Configuration.php
View File

@ -42,8 +42,8 @@ class Configuration implements ConfigurationInterface
->scalarNode('max_front_lines')->defaultValue(null)->end() ->scalarNode('max_front_lines')->defaultValue(null)->end()
->scalarNode('max_behind_lines')->defaultValue(null)->end() ->scalarNode('max_behind_lines')->defaultValue(null)->end()
->scalarNode('interpolation')->defaultValue(true)->end() ->scalarNode('interpolation')->defaultValue(true)->end()
->arrayNode('background_color')->prototype('scalar')->end() ->arrayNode('text_color')->prototype('scalar')->end()->end()
->arrayNode('text_color')->prototype('scalar')->end() ->arrayNode('background_color')->prototype('scalar')->end()->end()
->end() ->end()
; ;

5
Generator/CaptchaGenerator.php
View File

@ -98,8 +98,7 @@ class CaptchaGenerator
$this->builder->setMaxFrontLines($options['max_front_lines']); $this->builder->setMaxFrontLines($options['max_front_lines']);
$this->builder->setMaxBehindLines($options['max_behind_lines']); $this->builder->setMaxBehindLines($options['max_behind_lines']);
if (isset($options['text_color']) && $options['text_color']) {
if (isset($options['text_color'])) {
if (count($options['text_color']) !== 3) { if (count($options['text_color']) !== 3) {
throw new \RuntimeException('text_color should be an array of r, g and b'); throw new \RuntimeException('text_color should be an array of r, g and b');
} }
@ -108,7 +107,7 @@ class CaptchaGenerator
$this->builder->setTextColor($color[0], $color[1], $color[2]); $this->builder->setTextColor($color[0], $color[1], $color[2]);
} }
if (isset($options['background_color'])) { if (isset($options['background_color']) && $options['background_color']) {
if (count($options['background_color']) !== 3) { if (count($options['background_color']) !== 3) {
throw new \RuntimeException('background_color should be an array of r, g and b'); throw new \RuntimeException('background_color should be an array of r, g and b');
} }