default_timeout removed from builder constructor

Author: biscolab

src/ReCaptchaBuilder.php

@@ -50,13 +50,6 @@ class ReCaptchaBuilder {
 	 */
 	protected $version;
 
-	/**
-	 * The curl timeout
-	 * please visit https://curl.haxx.se/libcurl/c/CURLOPT_TIMEOUT.html
-	 * @var int
-	 */
-	protected $curl_timeout;
-
 	/**
 	 * Whether is true the ReCAPTCHA is inactive
 	 * @var boolean
@@ -74,19 +67,16 @@ class ReCaptchaBuilder {
 	 * @param string      $api_site_key
 	 * @param string      $api_secret_key
 	 * @param null|string $version
-	 * @param int|null    $curl_timeout
 	 */
 	public function __construct(
 		string $api_site_key,
 		string $api_secret_key,
-		?string $version = self::DEFAULT_API_VERSION,
-		?int $curl_timeout = self::DEFAULT_CURL_TIMEOUT
+		?string $version = self::DEFAULT_API_VERSION
 	) {
 
 		$this->setApiSiteKey($api_site_key);
 		$this->setApiSecretKey($api_secret_key);
 		$this->setVersion($version);
-		$this->setCurlTimeout($curl_timeout);
 		$this->setSkipByIp($this->skipByIp());
 	}
 
@@ -114,27 +104,12 @@ public function setApiSecretKey(string $api_secret_key): ReCaptchaBuilder {
 		return $this;
 	}
 
-	/**
-	 * @param int|null $curl_timeout
-	 *
-	 * @return ReCaptchaBuilder
-	 */
-	public function setCurlTimeout(?int $curl_timeout = null): ReCaptchaBuilder {
-
-		if($curl_timeout === null) {
-			$curl_timeout = config('recaptcha.curl_timeout', ReCaptchaBuilder::DEFAULT_CURL_TIMEOUT);
-		}
-		$this->curl_timeout = $curl_timeout;
-
-		return $this;
-	}
-
 	/**
 	 * @return int
 	 */
 	public function getCurlTimeout(): int {
 
-		return $this->curl_timeout;
+		return config('recaptcha.curl_timeout', self::DEFAULT_CURL_TIMEOUT);
 	}
 
 	/**
@@ -322,7 +297,7 @@ public function validate($response) {
 			$curl = curl_init($url);
 			curl_setopt($curl, CURLOPT_HEADER, false);
 			curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-			curl_setopt($curl, CURLOPT_TIMEOUT, $this->curl_timeout);
+			curl_setopt($curl, CURLOPT_TIMEOUT, $this->getCurlTimeout());
 			curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
 			$curl_response = curl_exec($curl);
 		}

src/ReCaptchaBuilderInvisible.php

@@ -21,11 +21,11 @@ class ReCaptchaBuilderInvisible extends ReCaptchaBuilder {
 	 *
 	 * @param string   $api_site_key
 	 * @param string   $api_secret_key
-	 * @param int|null $curl_timeout
 	 */
-	public function __construct(string $api_site_key, string $api_secret_key, ?int $curl_timeout = null) {
+	public function __construct(string $api_site_key, string $api_secret_key)
+	{
 
-		parent::__construct($api_site_key, $api_secret_key, 'invisible', $curl_timeout);
+		parent::__construct($api_site_key, $api_secret_key, 'invisible');
 	}
 
 	/**

src/ReCaptchaBuilderV2.php

@@ -21,11 +21,11 @@ class ReCaptchaBuilderV2 extends ReCaptchaBuilder {
 	 *
 	 * @param string   $api_site_key
 	 * @param string   $api_secret_key
-	 * @param int|null $curl_timeout
 	 */
-	public function __construct(string $api_site_key, string $api_secret_key, ?int $curl_timeout = null) {
+	public function __construct(string $api_site_key, string $api_secret_key)
+	{
 
-		parent::__construct($api_site_key, $api_secret_key, 'v2', $curl_timeout);
+		parent::__construct($api_site_key, $api_secret_key, 'v2');
 	}
 
 	/**

src/ReCaptchaBuilderV3.php

@@ -21,11 +21,11 @@ class ReCaptchaBuilderV3 extends ReCaptchaBuilder {
 	 *
 	 * @param string   $api_site_key
 	 * @param string   $api_secret_key
-	 * @param int|null $curl_timeout
 	 */
-	public function __construct(string $api_site_key, string $api_secret_key, ?int $curl_timeout = null) {
+	public function __construct(string $api_site_key, string $api_secret_key)
+	{
 
-		parent::__construct($api_site_key, $api_secret_key, 'v3', $curl_timeout);
+		parent::__construct($api_site_key, $api_secret_key, 'v3');
 	}
 
 }

src/ReCaptchaServiceProvider.php

@@ -114,7 +114,7 @@ protected function registerReCaptchaBuilder() {
 					break;
 			}
 
-			return new $recaptcha_class(config('recaptcha.api_site_key'), config('recaptcha.api_secret_key'), config('recaptcha.curl_timeout'));
+			return new $recaptcha_class(config('recaptcha.api_site_key'), config('recaptcha.api_secret_key'));
 
 		});
 	}