Fixes issues according to insights.

Author: adri

src/VCR/LibraryHooks/CurlRunkit.php

@@ -2,7 +2,6 @@
 
 namespace VCR\LibraryHooks;
 
-use VCR\Configuration;
 use VCR\Request;
 use VCR\Response;
 use VCR\Assertion;
@@ -132,15 +131,13 @@ public static function multiAddHandle($mh, $ch)
  } else {
  self::$multiHandles[(int) $mh] = array((int) $ch);
  }
- // return \curl_multi_add_handle_original($mh, $ch);
  }
 
  public static function multiRemoveHandle($mh, $ch)
  {
  if (isset(self::$multiHandles[(int) $mh][(int) $ch])) {
  unset(self::$multiHandles[(int) $mh][(int) $ch]);
  }
- // return \curl_multi_remove_handle_original($mh, $ch);
  }
 
  public static function multiExec($mh, &$still_running)
@@ -153,7 +150,6 @@ public static function multiExec($mh, &$still_running)
  }
  }
  }
- // return \curl_multi_exec($mh, $still_running);
  return CURLM_OK;
  }
 

src/VCR/LibraryHooks/Soap.php

@@ -3,10 +3,8 @@
 namespace VCR\LibraryHooks;
 
 use VCR\Assertion;
-use VCR\Configuration;
 use VCR\LibraryHooks\LibraryHooksException;
 use VCR\Request;
-use VCR\Response;
 use VCR\Util\StreamProcessor;
 
 /**

src/VCR/LibraryHooks/StreamWrapper.php

@@ -2,7 +2,6 @@
 
 namespace VCR\LibraryHooks;
 
-use VCR\Configuration;
 use VCR\Request;
 use VCR\Response;
 use VCR\Assertion;

src/VCR/Storage/Json.php

@@ -16,7 +16,6 @@ class Json implements StorageInterface
 
  public function __construct($filePath)
  {
- // Todo: should this be automatically created?
  if (!file_exists($filePath)) {
  file_put_contents($filePath, '[]');
  }
@@ -42,10 +41,6 @@ public function storeRecording(array $recording)
  public function current()
  {
  return $this->currentJson;
- // $firstChar = fgetc($this->handle);
- // if ($firstChar !== '[') {
- // throw new \InvalidArgumentException('File has to start with [, like a json array.');
- // }
  }
 
  public function key()

src/VCR/Util/CurlHelper.php

@@ -83,7 +83,7 @@ function ($curlInfo) use (&$info, $response) {
 
  $constants = get_defined_constants(true);
  $constantNames = array_flip($constants['curl']);
- die("Todo: {$constantNames[$option]} ({$option}) ");
+ throw new \BadMethodCallException("Not implemented: {$constantNames[$option]} ({$option}) ");
  }
 
  public static function setCurlOptionOnRequest(Request $request, $option, $value)
@@ -122,18 +122,11 @@ public static function setCurlOptionOnRequest(Request $request, $option, $value)
  }
  $request->addHeaders($headers);
  break;
- case CURLOPT_FILE:
- $additionalCurlOpts[CURLOPT_FILE] = $value;
- break;
  case CURLOPT_WRITEFUNCTION:
  case CURLOPT_HEADERFUNCTION:
  // Ignore writer and header functions
  break;
  default:
- $constants = get_defined_constants(true);
- $constantNames = array_flip($constants['curl']);
- // TODO: Handle all missing curl options
- // var_dump("Todo: {$constantNames[$option]} ({$option}): {$value}");
  $request->getCurlOptions()->set($option, $value);
  break;
  }

src/VCR/Util/Soap/SoapClient.php

@@ -2,10 +2,8 @@
 
 namespace VCR\Util\Soap;
 
-
 use VCR\LibraryHooks\LibraryHookInterface;
 use VCR\LibraryHooks\LibraryHooksException;
-use VCR\Request;
 use VCR\VCRFactory;
 
 class SoapClient extends \SoapClient

src/VCR/Util/StreamProcessor.php

@@ -109,11 +109,6 @@ protected function isBlacklisted($uri)
  /**
  * Determines that the provided uri leads to a PHP file.
  *
- * @todo What about PHP files with extensions:
- * - .inc
- * - .php(\d)*
- * - ...
- *
  * @param string $uri
  *
  * @return bool
@@ -187,7 +182,7 @@ public function stream_tell()
  return ftell($this->resource);
  }
 
- public function url_stat($path, $flags)
+ public function url_stat($path)
  {
  $this->restore();
  try {
@@ -210,7 +205,7 @@ public function dir_closedir()
  return true;
  }
 
- public function dir_opendir($path, $options)
+ public function dir_opendir($path)
  {
  $this->restore();
  if (isset($this->context)) {
@@ -257,7 +252,7 @@ public function rename($path_from, $path_to)
  return $result;
  }
 
- public function rmdir($path, $options)
+ public function rmdir($path)
  {
  $this->restore();
  if (isset($this->context)) {

src/VCR/VCRFactory.php

@@ -3,7 +3,6 @@
 namespace VCR;
 
 use VCR\LibraryHooks\CurlRewrite;
-use VCR\LibraryHooks\CurlRewrite\Filter as CurlRewriteFilter;
 use VCR\LibraryHooks\Soap;
 use VCR\Util\StreamProcessor;