Merge pull request #319 from smatyas/recaptcha-api-url-change

recaptcha api url changes
genemu · Mar 23, 2014 · 03c9308 · 03c9308
2 parents 1a84702 + 5f28794
commit 03c9308
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -139,9 +139,9 @@ private function addRecaptcha(ArrayNodeDefinition $rootNode)
                             ->canBeUnset()
                             ->addDefaultsIfNotSet()
                             ->children()
-                                ->scalarNode('host')->defaultValue('api-verify.recaptcha.net')->end()
+                                ->scalarNode('host')->defaultValue('www.google.com')->end()
                                 ->scalarNode('port')->defaultValue(80)->end()
-                                ->scalarNode('path')->defaultValue('/verify')->end()
+                                ->scalarNode('path')->defaultValue('/recaptcha/api/verify')->end()
                                 ->scalarNode('timeout')->defaultValue(10)->end()
                                 ->scalarNode('code')->defaultNull()->end()
                                 ->arrayNode('proxy')
@@ -156,15 +156,15 @@ private function addRecaptcha(ArrayNodeDefinition $rootNode)
                         ->variableNode('configs')->defaultValue(array())->end()
                     /* TO BE DEPRECATED */
                         ->scalarNode('code')->defaultNull()->end()
-                        ->scalarNode('server_url')->defaultValue('http://api.recaptcha.net')->end()
+                        ->scalarNode('server_url')->defaultValue('http://www.google.com/recaptcha/api')->end()
                         ->arrayNode('ssl')
                             ->canBeUnset()
                             ->treatNullLike(array('use' => true))
                             ->treatTrueLike(array('use' => true))
                             ->children()
                                 ->booleanNode('use')->defaultTrue()->end()
                                 ->scalarNode('server_url')
-                                    ->defaultValue('https://api-secure.recaptcha.net')
+                                    ->defaultValue('https://www.google.com/recaptcha/api')
                                 ->end()
                             ->end()
                         ->end()

diff --git a/Resources/doc/recaptcha/default.md b/Resources/doc/recaptcha/default.md
@@ -8,9 +8,9 @@ genenu_form:
         public_key:           ~ # Required
         private_key:          ~ # Required
         validation:
-            host:                 api-verify.recaptcha.net
+            host:                 www.google.com
             port:                 80
-            path:                 /verify
+            path:                 /recaptcha/api/verify
             timeout:              10
             code:                 ~
             proxy:                ~

diff --git a/Tests/Form/Core/Type/ReCaptchaTypeTest.php b/Tests/Form/Core/Type/ReCaptchaTypeTest.php
@@ -27,13 +27,13 @@ public function testDefaultConfigs()
         $view = $form->createView();
 
         $this->assertEquals('publicKey', $view->vars['public_key']);
-        $this->assertEquals('http://api.recaptcha.net', $view->vars['server']);
+        $this->assertEquals('http://www.google.com/recaptcha/api', $view->vars['server']);
         $this->assertEquals(array('lang' => 'en'), $view->vars['configs']);
 
         $this->assertEquals(array(
-            'host' => 'api-verify.recaptcha.net',
+            'host' => 'www.google.com',
             'port' => 80,
-            'path' => '/verify',
+            'path' => '/recaptcha/api/verify',
             'timeout' => 10,
         ), $form->getConfig()->getAttribute('option_validator'));
     }
@@ -52,9 +52,9 @@ public function testConfigs()
         $this->assertEquals(array('theme' => 'blackglass', 'lang' => 'en'), $view->vars['configs']);
 
         $this->assertEquals(array(
-            'host' => 'api-verify.recaptcha.net',
+            'host' => 'www.google.com',
             'port' => 80,
-            'path' => '/verify',
+            'path' => '/recaptcha/api/verify',
             'timeout' => 30
         ), $form->getConfig()->getAttribute('option_validator'));
     }
@@ -68,7 +68,7 @@ public function testCode($code, $isValid)
         $form = $this->factory->create(new ReCaptchaType(
             new ReCaptchaValidator($request, 'privateKey', array('code' => '1234')),
             'publicKey',
-            'http://api.recaptcha.net',
+            'http://www.google.com/recaptcha/api',
             array()
         ));
 

diff --git a/Tests/Form/Extension/TypeExtensionTest.php b/Tests/Form/Extension/TypeExtensionTest.php
@@ -79,13 +79,13 @@ protected function loadTypes()
                     $this->request,
                     'privateKey',
                     array(
-                        'host' => 'api-verify.recaptcha.net',
+                        'host' => 'www.google.com',
                         'port' => 80,
-                        'path' => '/verify',
+                        'path' => '/recaptcha/api/verify',
                         'timeout' => 10
                     )),
                 'publicKey',
-                'http://api.recaptcha.net',
+                'http://www.google.com/recaptcha/api',
                 array()),
             new Form\JQuery\Type\ImageType('medium', array(
                 'small' => array(100, 100),