Merge commit 'be90f19'

Conflicts:
	DependencyInjection/Configuration.php
	Generator/CaptchaGenerator.php
	composer.json
This commit is contained in:
Gregwar 2013-04-22 00:35:49 +02:00
commit 39e2f390f0
3 changed files with 11 additions and 1 deletions

View File

@ -41,6 +41,7 @@ class Configuration implements ConfigurationInterface
->scalarNode('distortion')->defaultValue(true)->end() ->scalarNode('distortion')->defaultValue(true)->end()
->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()
->arrayNode('backgroundColor')->prototype('scalar')->end()
->end() ->end()
; ;

View File

@ -98,6 +98,15 @@ 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 ($options['backgroundColor'] != array()) {
if (count($options['backgroundColor'])!=3) {
throw new \RuntimeException('backgroundColor should be an array of r, g and b');
}
$color = $options['backgroundColor'];
$this->builder->setBackgroundColor($color[0], $color[1], $color[2]);
}
$fingerprint = isset($options['fingerprint']) ? $options['fingerprint'] : null; $fingerprint = isset($options['fingerprint']) ? $options['fingerprint'] : null;
$content = $this->builder->build( $content = $this->builder->build(

View File

@ -18,7 +18,7 @@
], ],
"require": { "require": {
"php": ">=5.3.0", "php": ">=5.3.0",
"gregwar/captcha": "v1.0.2" "gregwar/captcha": "v1.0.3"
}, },
"autoload": { "autoload": {
"psr-0": { "psr-0": {