Switch to ZendService-Recaptcha. (#912)

composer.json

@@ -13,7 +13,6 @@
         "aferrandini/phpqrcode": "1.0.1",
         "jasig/phpcas": "1.3.4",
         "cap60552/php-sip2": "1.0.0",
-        "los/losrecaptcha": "2.0.2",
         "ahand/mobileesp": "dev-master",
         "matthiasmullie/minify": "1.3.43",
         "ocramius/proxy-manager": "1.0.2",
@@ -57,6 +56,7 @@
         "zendframework/zend-view": "2.8.1",
         "zendframework/zendrest": "2.0.2",
         "zendframework/zendservice-amazon": "2.0.4",
+        "zendframework/zendservice-recaptcha": "3.0.0",
         "zf-commons/zfc-rbac": "2.5.3"
     },
     "require-dev": {

module/VuFind/src/VuFind/Controller/Plugin/Recaptcha.php

@@ -124,7 +124,7 @@ class Recaptcha extends AbstractPlugin
         } catch (\ZendService\ReCaptcha\Exception $e) {
             $response = false;
         }
-        $captchaPassed = $response && $response->isSuccess();
+        $captchaPassed = $response && $response->isValid();
         if (!$captchaPassed && $this->errorMode != 'none') {
             if ($this->errorMode == 'flash') {
                 $this->getController()->flashMessenger()

module/VuFind/src/VuFind/Service/Factory.php

@@ -532,9 +532,7 @@ class Factory
             $options['theme'] = $config->Captcha->theme;
         }
         $recaptcha = new \VuFind\Service\ReCaptcha(
-            $siteKey, $secretKey,
-            new \LosReCaptcha\Service\Request\ZendHttpClient($httpClient),
-            ['ssl' => true], $options
+            $siteKey, $secretKey, ['ssl' => true], $options, null, $httpClient
         );
 
         return $recaptcha;

module/VuFind/src/VuFind/Service/ReCaptcha.php

@@ -36,7 +36,7 @@ namespace VuFind\Service;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development Wiki
  */
-class ReCaptcha extends \LosReCaptcha\Service\ReCaptcha
+class ReCaptcha extends \ZendService\ReCaptcha\ReCaptcha
 {
     /**
      * Get the HTML code for the captcha