Merge pull request #172 from cengizhancaliskan/master

Support of multiple instance

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()
@@ -47,6 +47,7 @@ class Configuration implements ConfigurationInterface
                 ->arrayNode('background_images')->prototype('scalar')->end()->end()
                 ->scalarNode('disabled')->defaultValue(false)->end()
                 ->scalarNode('ignore_all_effects')->defaultValue(false)->end()
+                ->scalarNode('session_key')->defaultValue('captcha')->end()
             ->end()
         ;
 

DependencyInjection/GregwarCaptchaExtension.php

@@ -34,6 +34,6 @@ class GregwarCaptchaExtension extends Extension
         $container->setParameter('gregwar_captcha.config.whitelist_key', $config['whitelist_key']);
 
         $resources = $container->getParameter('twig.form.resources');
-        $container->setParameter('twig.form.resources', array_merge(array('GregwarCaptchaBundle::captcha.html.twig'), $resources));
+        $container->setParameter('twig.form.resources', array_merge(array('@GregwarCaptcha/captcha.html.twig'), $resources));
     }
 }

README.md

@@ -1,6 +1,8 @@
 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.
 

Resources/config/services.yml

@@ -7,7 +7,8 @@ parameters:
     
 services:
     captcha.type:
-        class: '%gregwar_captcha.captcha_type.class%' 
+        class: '%gregwar_captcha.captcha_type.class%'
+        public: true
         arguments:
             - '@session'
             - '@gregwar_captcha.generator'
@@ -18,6 +19,7 @@ services:
 
     gregwar_captcha.generator:
         class: '%gregwar_captcha.captcha_generator.class%'
+        public: true
         arguments:
             - '@router'
             - '@gregwar_captcha.captcha_builder'
@@ -26,6 +28,7 @@ services:
 
     gregwar_captcha.image_file_handler:
         class: '%gregwar_captcha.image_file_handler.class%'
+        public: true
         arguments:
             - '%gregwar_captcha.config.image_folder%'
             - '%gregwar_captcha.config.web_path%'
@@ -34,6 +37,8 @@ services:
 
     gregwar_captcha.captcha_builder:
         class: '%gregwar_captcha.captcha_builder.class%'
+        public: true
 
     gregwar_captcha.phrase_builder:
         class: '%gregwar_captcha.phrase_builder.class%'
+        public: true

Type/CaptchaType.php

@@ -22,6 +22,8 @@ use Gregwar\CaptchaBundle\Generator\CaptchaGenerator;
  */
 class CaptchaType extends AbstractType
 {
+    const SESSION_KEY_PREFIX = '_captcha_';
+
     /**
      * @var SessionInterface
      */
@@ -53,7 +55,7 @@ class CaptchaType extends AbstractType
     {
         $this->session      = $session;
         $this->generator    = $generator;
-        $this->translator = $translator;
+        $this->translator   = $translator;
         $this->options      = $options;
     }
 
@@ -65,7 +67,7 @@ class CaptchaType extends AbstractType
         $validator = new CaptchaValidator(
             $this->translator,
             $this->session,
-            sprintf('gcb_%s', $builder->getForm()->getName()),
+            sprintf('%s%s', self::SESSION_KEY_PREFIX, $options['session_key']),
             $options['invalid_message'],
             $options['bypass_code'],
             $options['humanity']
@@ -83,7 +85,7 @@ class CaptchaType extends AbstractType
             throw new \InvalidArgumentException('GregwarCaptcha: The reload option cannot be set without as_url, see the README for more information');
         }
 
-        $sessionKey = sprintf('gcb_%s', $form->getName());
+        $sessionKey = sprintf('%s%s', self::SESSION_KEY_PREFIX, $options['session_key']);
         $isHuman    = false;
 
         if ($options['humanity'] > 0) {
@@ -113,7 +115,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/form": "~2.1|~3.0"
+        "symfony/framework-bundle": "~2.8|~3.0|~4.0",
+        "symfony/form": "~2.8|~3.0|~4.0"
     },
     "autoload": {
         "psr-4": {