Merge pull request #180 from andreybolonin/master

add sf 4.0 support

DependencyInjection/Configuration.php

@@ -33,7 +33,7 @@ class Configuration implements ConfigurationInterface
                 ->scalarNode('web_path')->defaultValue('%kernel.root_dir%/../web')->end()
                 ->scalarNode('gc_freq')->defaultValue(100)->end()
                 ->scalarNode('expiration')->defaultValue(60)->end()
-                ->scalarNode('quality')->defaultValue(30)->end()
+                ->scalarNode('quality')->defaultValue(50)->end()
                 ->scalarNode('invalid_message')->defaultValue('Bad code value')->end()
                 ->scalarNode('bypass_code')->defaultValue(null)->end()
                 ->scalarNode('whitelist_key')->defaultValue('captcha_whitelist_key')->end()

README.md

@@ -1,9 +1,13 @@
 Gregwar's CaptchaBundle
 =====================
 
+[![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YUXRLWHQSWS6L)
+
 The `GregwarCaptchaBundle` adds support for a captcha form type for the
 Symfony form component.
 
+It uses [gregwar/captcha](https://github.com/Gregwar/Captcha) as captcha generator, which is a separate standalone library that can be used for none-symfony projects.
+
 Compatibility with Symfony
 ==========================
 

Resources/config/services.yml

@@ -7,17 +7,19 @@ parameters:
     
 services:
     captcha.type:
-        class: %gregwar_captcha.captcha_type.class%
+        class: '%gregwar_captcha.captcha_type.class%'
+        public: true
         arguments:
             - '@session'
             - '@gregwar_captcha.generator'
             - '@translator'
-            - %gregwar_captcha.config%
+            - '%gregwar_captcha.config%'
         tags:
             - { name: form.type, alias: captcha }
 
     gregwar_captcha.generator:
-        class: %gregwar_captcha.captcha_generator.class%
+        class: '%gregwar_captcha.captcha_generator.class%'
+        public: true
         arguments:
             - '@router'
             - '@gregwar_captcha.captcha_builder'
@@ -25,15 +27,18 @@ services:
             - '@gregwar_captcha.image_file_handler'
 
     gregwar_captcha.image_file_handler:
-        class: %gregwar_captcha.image_file_handler.class%
+        class: '%gregwar_captcha.image_file_handler.class%'
+        public: true
         arguments:
-            - %gregwar_captcha.config.image_folder%
+            - '%gregwar_captcha.config.image_folder%'
-            - %gregwar_captcha.config.web_path%
+            - '%gregwar_captcha.config.web_path%'
-            - %gregwar_captcha.config.gc_freq%
+            - '%gregwar_captcha.config.gc_freq%'
-            - %gregwar_captcha.config.expiration%
+            - '%gregwar_captcha.config.expiration%'
 
     gregwar_captcha.captcha_builder:
-        class: %gregwar_captcha.captcha_builder.class%
+        class: '%gregwar_captcha.captcha_builder.class%'
+        public: true
 
     gregwar_captcha.phrase_builder:
-        class: %gregwar_captcha.phrase_builder.class%
+        class: '%gregwar_captcha.phrase_builder.class%'
+        public: true

Resources/views/captcha.html.twig

@@ -3,7 +3,7 @@
 -
 {% else %}
 {% spaceless %}
-    <img id="{{ image_id }}" src="{{ captcha_code }}" alt="" title="captcha" width="{{ captcha_width }}" height="{{ captcha_height }}" />
+    <img class="captcha_image" id="{{ image_id }}" src="{{ captcha_code }}" alt="" title="captcha" width="{{ captcha_width }}" height="{{ captcha_height }}" />
     {% if reload %}
     <script type="text/javascript">
         function reload_{{ image_id }}() {

Type/CaptchaType.php

@@ -113,7 +113,8 @@ class CaptchaType extends AbstractType
         ));
 
         $persistOptions = array();
-        foreach (array('phrase', 'width', 'height', 'distortion', 'length', 'quality', 'background_color', 'text_color') as $key) {
+        foreach (array('phrase', 'width', 'height', 'distortion', 'length',
+        'quality', 'background_color', 'background_images', 'text_color') as $key) {
             $persistOptions[$key] = $options[$key];
         }
 

composer.json

@@ -19,8 +19,8 @@
     "require": {
         "php": ">=5.3.9",
         "gregwar/captcha": "~1.1",
-        "symfony/framework-bundle": "~2.1|~3.0",
+        "symfony/framework-bundle": "~2.8|~3.0|~4.0",
-        "symfony/form": "~2.1|~3.0"
+        "symfony/form": "~2.8|~3.0|~4.0"
     },
     "autoload": {
         "psr-4": {