Move option check from CachedCurlRequest to CurlRequest

.scrutinizer.yml

@@ -20,6 +20,8 @@ tools:
 
 checks:
     php:
+        psr2_class_declaration: false
+        psr2_switch_declaration: false
         sql_injection_vulnerabilities: true
         security_vulnerabilities: true
         no_eval: true

src/CachedCurlRequest.php

@@ -83,28 +83,6 @@ public function isFromCache() {
 		return $this->isFromCache;
 	}
 
-	/**
-	 * @since 1.3
-	 *
-	 * @param string $name
-	 * @param mixed $value
-	 */
-	public function setOption( $name, $value ) {
-
-		$this->options[$name] = $value;
-
-		// Internal ONOI options are not further relayed
-		if ( strpos( $name, 'ONOI_HTTP_REQUEST' ) !== false ) {
-			return;
-		}
-
-		curl_setopt(
-			$this->handle,
-			$name,
-			$value
-		);
-	}
-
 	/**
 	 * @since  1.0
 	 *

src/CurlRequest.php

@@ -15,7 +15,7 @@ class CurlRequest implements HttpRequest {
 	/**
 	 * @var resource
 	 */
-	protected $handle;
+	private $handle;
 
 	/**
 	 * @var array
@@ -73,6 +73,11 @@ public function setOption( $name, $value ) {
 
 		$this->options[$name] = $value;
 
+		// Internal ONOI options are not further relayed
+		if ( strpos( $name, 'ONOI_HTTP_REQUEST' ) !== false ) {
+			return;
+		}
+
 		curl_setopt(
 			$this->handle,
 			$name,

tests/phpunit/Unit/CurlRequestTest.php

@@ -93,4 +93,15 @@ public function testExecuteForNullUrl() {
 		);
 	}
 
+	public function testSetOptionUsingOnoiSpecificConstantDoesNotCauseAnyFailureWithCurl_Setopt() {
+
+		$instance = new CurlRequest( curl_init( null ) );
+		$instance->setOption( ONOI_HTTP_REQUEST_RESPONSECACHE_TTL, 42 );
+
+		$this->assertEquals(
+			42,
+			$instance->getOption( ONOI_HTTP_REQUEST_RESPONSECACHE_TTL )
+		);
+	}
+
 }