diff --git a/.ecrc b/.ecrc
new file mode 100644
index 000000000..4d0f6e504
--- /dev/null
+++ b/.ecrc
@@ -0,0 +1,12 @@
+{
+  "Verbose": true,
+  "IgnoreDefaults": false,
+  "Exclude": [
+    ".phpunit.result.cache",
+    ".php-cs-fixer.cache",
+    ".idea",
+    ".git",
+    "vendor/",
+    "tests/fixtures"
+  ]
+}
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..eda412b6c
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,18 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
+[*.php]
+indent_size = 4
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.neon]
+indent_style = tab
diff --git a/.gitattributes b/.gitattributes
index 93298ab07..0b9d70cfc 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,12 @@
-/docs               export-ignore
-/tests              export-ignore
-/.gitattributes     export-ignore
-/.gitignore         export-ignore
-/.travis.yml        export-ignore
-/phpunit.xml        export-ignore
-/phpunit.xml.dist   export-ignore
+/docs                   export-ignore
+/tests                  export-ignore
+/.gitattributes         export-ignore
+/.gitignore             export-ignore
+/.php-cs-fixer.dist.php export-ignore
+/.editorconfig          export-ignore
+/.ecrc                  export-ignore
+/docker-compose.yaml    export-ignore
+/phpstan.neon           export-ignore
+/phpstan-baseline.neon  export-ignore
+/phpunit.xml.dist       export-ignore
+/resources              export-ignore
diff --git a/.github/workflows/continuous integration.yml b/.github/workflows/continuous integration.yml
new file mode 100644
index 000000000..711b7ce52
--- /dev/null
+++ b/.github/workflows/continuous integration.yml	
@@ -0,0 +1,142 @@
+name: "Continuous Integration"
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  phpstan:
+    name: "PHPStan"
+    runs-on: "ubuntu-latest"
+
+    steps:
+      - name: "Checkout code"
+        uses: "actions/checkout@v2"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "8.0"
+          extensions: "curl, soap"
+          tools: "composer:v2"
+
+      - name: "Enforce using stable dependencies"
+        run: "composer config minimum-stability stable"
+
+      - name: "Check Composer configuration"
+        run: "composer validate --strict"
+
+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v2"
+        with:
+          dependency-versions: "highest"
+          composer-options: "--prefer-dist -o"
+
+      - name: "Run PHPStan"
+        run: "composer run-script phpstan"
+
+  editorconfig-checker:
+    name: EditorConfig Checker
+    runs-on: "ubuntu-latest"
+
+    steps:
+      - name: "Checkout code"
+        uses: "actions/checkout@v2"
+
+      - name: "Install EditorConfig Checker"
+        uses: "editorconfig-checker/action-editorconfig-checker@main"
+
+      - name: "Run EditorConfig Checker"
+        run: "editorconfig-checker"
+
+  codestyle:
+    name: "PHP-CS-Fixer"
+    runs-on: "ubuntu-latest"
+
+    steps:
+      - name: "Checkout code"
+        uses: "actions/checkout@v2"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "8.0"
+          extensions: "curl, soap"
+          tools: "composer:v2"
+
+      - name: "Enforce using stable dependencies"
+        run: "composer config minimum-stability stable"
+
+      - name: "Check Composer configuration"
+        run: "composer validate --strict"
+
+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v2"
+        with:
+          dependency-versions: "highest"
+          composer-options: "--prefer-dist -o"
+
+      - name: "Run PHP-CS-Fixer"
+        run: "composer run-script cs"
+
+  phpunit:
+    name: "PHPUnit Test"
+    runs-on: "ubuntu-latest"
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php:
+          - "8.0"
+          - "8.1"
+          - "8.2"
+          - "8.3"
+          - "8.4"
+        dependencies:
+          - "lowest"
+          - "highest"
+        stability:
+          - "stable"
+
+    steps:
+      - name: "Checkout code"
+        uses: "actions/checkout@v2"
+        with:
+          fetch-depth: 2
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php }}"
+          extensions: "curl, soap"
+          tools: "composer:v2"
+          coverage: "pcov"
+
+      - name: "Enforce using stable dependencies"
+        run: "composer config minimum-stability stable"
+        if: "${{ matrix.stability == 'stable' }}"
+
+      - name: "Check Composer configuration"
+        run: "composer validate --strict"
+
+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v2"
+        with:
+          dependency-versions: "${{ matrix.dependencies }}"
+          composer-options: "--prefer-dist -o"
+
+      - name: "Run PHPUnit Test"
+        run: "vendor/bin/phpunit --coverage-clover=coverage.clover --log-junit=phpunit.xml"
+
+      - name: "Publish Test Report"
+        uses: "mikepenz/action-junit-report@v2"
+        if: "always()" # always run even if the previous step fails
+        with:
+          report_paths: "phpunit.xml"
+          check_name: "PHPUnit Test Report (${{ matrix.php }}, ${{ matrix.dependencies }}, ${{ matrix.stability }})"
+
+      - name: "Publish Scrutinizer Coverage"
+        uses: "sudo-bot/action-scrutinizer@latest"
+        if: "always()" # always run even if the previous step fails
+        with:
+          cli-args: "--format=php-clover coverage.clover"
diff --git a/.gitignore b/.gitignore
index 2883d5b45..88071df64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
-*.idea*
-*.sublime-*
 **/vendor/*
 coverage/*
 notes.md
 tests/fixtures/cassette*
-/.php_cs.cache
 /.php_cs
+composer.lock
+.phpunit.result.cache
+.php-cs-fixer.cache
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
new file mode 100644
index 000000000..2733e07e9
--- /dev/null
+++ b/.php-cs-fixer.dist.php
@@ -0,0 +1,18 @@
+<?php
+
+return (new PhpCsFixer\Config())
+    ->setRules([
+        '@PSR12' => true,
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        '@PHP80Migration' => true,
+        '@PHP80Migration:risky' => true,
+        '@PHPUnit84Migration:risky' => true,
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->exclude('vendor')
+            ->exclude('docs')
+            ->in(__DIR__)
+    )
+    ->setRiskyAllowed(true);
diff --git a/.php_cs.dist b/.php_cs.dist
deleted file mode 100644
index 871b5ac9a..000000000
--- a/.php_cs.dist
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-return PhpCsFixer\Config::create()
-    ->setRules([
-        '@PSR2' => true,
-        'single_blank_line_before_namespace' => true,
-        'concat_space' => ['spacing' => 'one'],
-        'single_quote' => true,
-        'braces' => true,
-    ])
-
-    ->setFinder(
-        PhpCsFixer\Finder::create()
-            ->exclude('vendor')
-            ->exclude('docs')
-            ->in(__DIR__)
-    )
-
-    ->setRiskyAllowed(true);
-
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 06f543c1e..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-language: php
-dist: precise
-
-matrix:
-  fast_finish: true
-  include:
-    - env: TEST_DIR=.
-      php: 5.3
-    - env: TEST_DIR=. COMPOSER_FLAGS="--prefer-lowest"
-      php: 5.3
-    - env: TEST_DIR=.
-      php: 5.4
-    - env: TEST_DIR=.
-      php: 5.5
-    - env: TEST_DIR=.
-      php: 5.6
-    - env: TEST_DIR=. COMPOSER_FLAGS="--prefer-lowest"
-      php: 5.6
-    - env: TEST_DIR=.
-      php: 7.0
-    - env: TEST_DIR=. COMPOSER_FLAGS="--prefer-lowest"
-      php: 7.0
-    - env: TEST_DIR=.
-      php: 7.1
-    - env: TEST_DIR=. COMPOSER_FLAGS="--prefer-lowest"
-      php: 7.1
-    - env: TEST_DIR=. PHP_CS_FIXER=true
-      php: 7.2
-    - env: TEST_DIR=tests/integration/guzzle/3
-      php: 5.6
-    - env: TEST_DIR=tests/integration/guzzle/4
-      php: 5.6
-    - env: TEST_DIR=tests/integration/guzzle/5
-      php: 5.6
-    - env: TEST_DIR=tests/integration/guzzle/6
-      php: 5.6
-    - env: TEST_DIR=tests/integration/soap
-      php: 5.6
-
-before_install:
-  - composer self-update
-
-install:
-  - composer update --prefer-source -o $COMPOSER_FLAGS
-  - PHPUNIT_BIN=$(pwd)/vendor/bin/phpunit
-  - cd ${TEST_DIR}
-  - composer update --prefer-source -o $COMPOSER_FLAGS
-
-script:
-  - $PHPUNIT_BIN --coverage-clover=coverage.clover
-  - if [ "${PHP_CS_FIXER}" = "true" ]; then wget http://cs.sensiolabs.org/download/php-cs-fixer-v2.phar && php ./php-cs-fixer-v2.phar fix --dry-run --diff $TRAVIS_BUILD_DIR; fi
-
-after_success:
-  - wget https://scrutinizer-ci.com/ocular.phar
-  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
-
-cache:
-  directories:
-    - vendor
-    - tests/integration/guzzle/3/vendor
-    - tests/integration/guzzle/4/vendor
-    - tests/integration/guzzle/5/vendor
-    - tests/integration/guzzle/6/vendor
-    - $HOME/.composer/cache
diff --git a/LICENSE.md b/LICENSE.md
index 0d8812c51..bb5af01e3 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
+THE SOFTWARE.
diff --git a/README.md b/README.md
index 75b060ce2..bae7e2488 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![PHP-VCR](https://user-images.githubusercontent.com/133832/27151811-0d95c6c4-514c-11e7-834e-eff1eec2ea16.png)
 
-[![Build Status](https://travis-ci.org/php-vcr/php-vcr.svg?branch=master)](https://travis-ci.org/php-vcr/php-vcr)
+[![Continuous Integration](https://github.com/php-vcr/php-vcr/actions/workflows/continuous%20integration.yml/badge.svg?branch=master)](https://github.com/php-vcr/php-vcr/actions/workflows/continuous%20integration.yml)
 [![Code Coverage](https://scrutinizer-ci.com/g/php-vcr/php-vcr/badges/coverage.png?s=15cf1644c8cf37a868e03cfba809a5e24c78f285)](https://scrutinizer-ci.com/g/php-vcr/php-vcr/)
 [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/php-vcr/php-vcr/badges/quality-score.png?s=4f638dbca5eb51fb9c87a1dd45c5df94687d85bd)](https://scrutinizer-ci.com/g/php-vcr/php-vcr/)
 
@@ -8,13 +8,13 @@ This is a port of the [VCR](http://github.com/vcr/vcr) Ruby library to PHP.
 
 Record your test suite's HTTP interactions and replay them during future test runs for fast, deterministic, accurate tests. A bit of documentation can be found on the [php-vcr website](http://php-vcr.github.io).
 
-Disclaimer: Doing this in PHP is not as easy as in programming languages which support monkey patching (I'm looking at you, Ruby) – this project is not yet fully tested, so please use at your own risk!
+Disclaimer: Doing this in PHP is not as easy as in programming languages which support monkey patching (I'm looking at you, Ruby)
 
 ## Features
 
 * Automatically records and replays your HTTP(s) interactions with minimal setup/configuration code.
 * Supports common http functions and extensions
-  * everyting using [streamWrapper](http://php.net/manual/en/class.streamwrapper.php): fopen(), fread(), file_get_contents(), ... without any modification (except `$http_response_header` see #96)
+  * everything using [streamWrapper](http://php.net/manual/en/class.streamwrapper.php): fopen(), fread(), file_get_contents(), ... without any modification (except `$http_response_header` see [#96](https://github.com/php-vcr/php-vcr/issues/96))
   * [SoapClient](http://www.php.net/manual/en/soapclient.soapclient.php) by adding `\VCR\VCR::turnOn();` in your `tests/bootstrap.php`
   * curl(), by adding `\VCR\VCR::turnOn();` in your `tests/bootstrap.php`
 * The same request can receive different responses in different tests -- just use different cassettes.
@@ -30,7 +30,7 @@ Disclaimer: Doing this in PHP is not as easy as in programming languages which s
 Using static method calls:
 
 ``` php
-class VCRTest extends \PHPUnit_Framework_TestCase
+class VCRTest extends TestCase
 {
     public function testShouldInterceptStreamWrapper()
     {
@@ -68,7 +68,7 @@ class VCRTest extends \PHPUnit_Framework_TestCase
 You can use annotations in PHPUnit by using [phpunit-testlistener-vcr](https://github.com/php-vcr/phpunit-testlistener-vcr):
 
 ``` php
-class VCRTest extends \PHPUnit_Framework_TestCase
+class VCRTest extends TestCase
 {
     /**
      * @vcr unittest_annotation_test
@@ -97,9 +97,9 @@ $ composer require --dev php-vcr/php-vcr
 
 PHP-VCR depends on:
 
-  * PHP 5.3+
+  * PHP 8
   * Curl extension
-  * HTTP library [Guzzle](http://guzzlephp.org)
+  * [symfony/event-dispatcher](https://github.com/symfony/event-dispatcher)
   * [symfony/yaml](https://github.com/symfony/yaml)
   * [beberlei/assert](https://github.com/beberlei/assert)
 
@@ -121,7 +121,7 @@ composer test
 [Old changelog entries](docs/old-changelog.md)
 
 ## Copyright
-Copyright (c) 2013-2016 Adrian Philipp. Released under the terms of the MIT license. See LICENSE for details.
+Copyright (c) 2013-2023 Adrian Philipp. Released under the terms of the MIT license. See LICENSE for details.
 [Contributors](https://github.com/php-vcr/php-vcr/graphs/contributors)
 
 <!--
diff --git a/composer.json b/composer.json
index 4b93a30b5..639e5daf8 100644
--- a/composer.json
+++ b/composer.json
@@ -2,41 +2,53 @@
     "name": "php-vcr/php-vcr",
     "description": "Record your test suite's HTTP interactions and replay them during future test runs for fast, deterministic, accurate tests.",
     "license": "MIT",
-
     "scripts": {
         "test": "./vendor/bin/phpunit",
-        "lint": "./vendor/bin/php-cs-fixer fix --verbose --diff --dry-run --config-file=.php_cs",
-        "fix": "./vendor/bin/php-cs-fixer fix --verbose --diff --config-file=.php_cs"
+        "cs": "./vendor/bin/php-cs-fixer fix --verbose --diff --dry-run",
+        "cs-fix": "./vendor/bin/php-cs-fixer fix --verbose --diff",
+        "phpstan": "php -d memory_limit=-1 vendor/bin/phpstan analyse -c phpstan.neon --no-progress -vvv",
+        "ec": "./vendor/bin/ec"
     },
-
     "authors": [
         {
             "name": "Adrian Philipp",
             "email": "mail@adrian-philipp.com"
         }
     ],
-
     "require": {
+        "php": "^8,<8.2|>=8.2.9,<8.5",
         "ext-curl": "*",
-        "beberlei/assert": "^2.0",
-        "symfony/yaml": "~2.1|^3.0|^4.0|^5.0",
-        "symfony/event-dispatcher": "^2.4|^3.0|^4.0|^5.0"
+        "beberlei/assert": "^3.2.5",
+        "symfony/yaml": "^3|^4|^5|^6|^7",
+        "symfony/event-dispatcher": "^4|^5|^6|^7",
+        "symfony/event-dispatcher-contracts": "^1|^2|^3"
     },
-
     "require-dev": {
-        "phpunit/phpunit": "^4.8|^5.0",
-        "sebastian/version": "^1.0.3|^2.0",
-        "mikey179/vfsstream": "^1.2",
-        "lapistano/proxy-object": "dev-master#d7184a479f502d5a0f96d0bae73566dbb498da8f"
+        "ext-soap": "*",
+        "guzzlehttp/guzzle": "^7",
+        "phpunit/phpunit": "^9.5.10",
+        "mikey179/vfsstream": "^1.6.10",
+        "phpstan/phpstan": "^1",
+        "phpstan/phpstan-beberlei-assert": "^1",
+        "thecodingmachine/phpstan-strict-rules": "^1",
+        "friendsofphp/php-cs-fixer": "^3.0",
+        "phpstan/phpstan-phpunit": "^1",
+        "phpstan/extension-installer": "^1.1",
+        "editorconfig-checker/editorconfig-checker": "^10.3"
     },
-
     "autoload": {
-        "classmap": ["src/"]
+        "psr-4": {
+            "VCR\\": "src/VCR/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "VCR\\Tests\\": "tests"
+        }
     },
-
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.4.x-dev"
+    "config": {
+        "allow-plugins": {
+            "phpstan/extension-installer": true
         }
     }
 }
diff --git a/composer.lock b/composer.lock
deleted file mode 100644
index 46716eb5b..000000000
--- a/composer.lock
+++ /dev/null
@@ -1,1730 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "d6bd001788410447c8beb888654a0a1c",
-    "packages": [
-        {
-            "name": "beberlei/assert",
-            "version": "v2.9.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/beberlei/assert.git",
-                "reference": "124317de301b7c91d5fce34c98bba2c6925bec95"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/beberlei/assert/zipball/124317de301b7c91d5fce34c98bba2c6925bec95",
-                "reference": "124317de301b7c91d5fce34c98bba2c6925bec95",
-                "shasum": ""
-            },
-            "require": {
-                "ext-mbstring": "*",
-                "php": ">=5.3"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.1.1",
-                "phpunit/phpunit": "^4.8.35|^5.7"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Assert\\": "lib/Assert"
-                },
-                "files": [
-                    "lib/Assert/functions.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-2-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de",
-                    "role": "Lead Developer"
-                },
-                {
-                    "name": "Richard Quadling",
-                    "email": "rquadling@gmail.com",
-                    "role": "Collaborator"
-                }
-            ],
-            "description": "Thin assertion library for input validation in business models.",
-            "keywords": [
-                "assert",
-                "assertion",
-                "validation"
-            ],
-            "time": "2019-05-28T15:27:37+00:00"
-        },
-        {
-            "name": "psr/event-dispatcher",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/event-dispatcher.git",
-                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
-                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\EventDispatcher\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Standard interfaces for event handling.",
-            "keywords": [
-                "events",
-                "psr",
-                "psr-14"
-            ],
-            "time": "2019-01-08T18:20:26+00:00"
-        },
-        {
-            "name": "symfony/event-dispatcher",
-            "version": "v5.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "7b738a51645e10f864cc25c24d232fb03f37b475"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7b738a51645e10f864cc25c24d232fb03f37b475",
-                "reference": "7b738a51645e10f864cc25c24d232fb03f37b475",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2.5",
-                "symfony/event-dispatcher-contracts": "^2"
-            },
-            "conflict": {
-                "symfony/dependency-injection": "<4.4"
-            },
-            "provide": {
-                "psr/event-dispatcher-implementation": "1.0",
-                "symfony/event-dispatcher-implementation": "2.0"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "^4.4|^5.0",
-                "symfony/dependency-injection": "^4.4|^5.0",
-                "symfony/expression-language": "^4.4|^5.0",
-                "symfony/http-foundation": "^4.4|^5.0",
-                "symfony/service-contracts": "^1.1|^2",
-                "symfony/stopwatch": "^4.4|^5.0"
-            },
-            "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\EventDispatcher\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony EventDispatcher Component",
-            "homepage": "https://symfony.com",
-            "time": "2019-11-18T17:27:11+00:00"
-        },
-        {
-            "name": "symfony/event-dispatcher-contracts",
-            "version": "v2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "af23c2584d4577d54661c434446fb8fbed6025dd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/af23c2584d4577d54661c434446fb8fbed6025dd",
-                "reference": "af23c2584d4577d54661c434446fb8fbed6025dd",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2.5",
-                "psr/event-dispatcher": "^1"
-            },
-            "suggest": {
-                "symfony/event-dispatcher-implementation": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Contracts\\EventDispatcher\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Generic abstractions related to dispatching event",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "abstractions",
-                "contracts",
-                "decoupling",
-                "interfaces",
-                "interoperability",
-                "standards"
-            ],
-            "time": "2019-11-18T17:27:11+00:00"
-        },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.13.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3",
-                "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.13-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
-            "time": "2019-11-27T13:56:44+00:00"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v4.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "76de473358fe802578a415d5bb43c296cf09d211"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/76de473358fe802578a415d5bb43c296cf09d211",
-                "reference": "76de473358fe802578a415d5bb43c296cf09d211",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3",
-                "symfony/polyfill-ctype": "~1.8"
-            },
-            "conflict": {
-                "symfony/console": "<3.4"
-            },
-            "require-dev": {
-                "symfony/console": "^3.4|^4.0|^5.0"
-            },
-            "suggest": {
-                "symfony/console": "For validating YAML files using the lint command"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2019-11-12T14:51:11+00:00"
-        }
-    ],
-    "packages-dev": [
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1",
-                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "^6.0",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpbench/phpbench": "^0.13",
-                "phpstan/phpstan-phpunit": "^0.11",
-                "phpstan/phpstan-shim": "^0.11",
-                "phpunit/phpunit": "^7.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2019-10-21T16:45:58+00:00"
-        },
-        {
-            "name": "lapistano/proxy-object",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/lapistano/proxy-object.git",
-                "reference": "d7184a479f502d5a0f96d0bae73566dbb498da8f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/lapistano/proxy-object/zipball/d7184a479f502d5a0f96d0bae73566dbb498da8f",
-                "reference": "d7184a479f502d5a0f96d0bae73566dbb498da8f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "@stable"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "lapistano\\ProxyObject": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache 2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Bastian Feder",
-                    "email": "lapis@bastian-feder.de",
-                    "homepage": "http://blog.bastian-feder.de"
-                }
-            ],
-            "description": "A library that makes it much easier to generate a proxy of your system under test (SUT)",
-            "homepage": "http://www.github.com/lapistano/proxy-object",
-            "keywords": [
-                "phpunit",
-                "proxy-object",
-                "testing"
-            ],
-            "time": "2015-06-24T09:27:33+00:00"
-        },
-        {
-            "name": "mikey179/vfsstream",
-            "version": "v1.6.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/bovigo/vfsStream.git",
-                "reference": "231c73783ebb7dd9ec77916c10037eff5a2b6efe"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/231c73783ebb7dd9ec77916c10037eff5a2b6efe",
-                "reference": "231c73783ebb7dd9ec77916c10037eff5a2b6efe",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.5|^5.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.6.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "org\\bovigo\\vfs\\": "src/main/php"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Frank Kleine",
-                    "homepage": "http://frankkleine.de/",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Virtual file system to mock the real file system in unit tests.",
-            "homepage": "http://vfs.bovigo.org/",
-            "time": "2019-10-30T15:31:00+00:00"
-        },
-        {
-            "name": "myclabs/deep-copy",
-            "version": "1.9.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/007c053ae6f31bba39dfa19a7726f56e9763bbea",
-                "reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "replace": {
-                "myclabs/deep-copy": "self.version"
-            },
-            "require-dev": {
-                "doctrine/collections": "^1.0",
-                "doctrine/common": "^2.6",
-                "phpunit/phpunit": "^7.1"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "DeepCopy\\": "src/DeepCopy/"
-                },
-                "files": [
-                    "src/DeepCopy/deep_copy.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Create deep copies (clones) of your objects",
-            "keywords": [
-                "clone",
-                "copy",
-                "duplicate",
-                "object",
-                "object graph"
-            ],
-            "time": "2019-08-09T12:45:53+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a",
-                "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "time": "2018-08-07T13:53:10+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "4.3.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
-                "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0",
-                "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0",
-                "phpdocumentor/type-resolver": "~0.4 || ^1.0.0",
-                "webmozart/assert": "^1.0"
-            },
-            "require-dev": {
-                "doctrine/instantiator": "^1.0.5",
-                "mockery/mockery": "^1.0",
-                "phpunit/phpunit": "^6.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2019-09-12T14:27:41+00:00"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
-                "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1",
-                "phpdocumentor/reflection-common": "^2.0"
-            },
-            "require-dev": {
-                "ext-tokenizer": "^7.1",
-                "mockery/mockery": "~1",
-                "phpunit/phpunit": "^7.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "time": "2019-08-22T18:11:29+00:00"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "1.9.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/f6811d96d97bdf400077a0cc100ae56aa32b9203",
-                "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
-                "sebastian/comparator": "^1.1|^2.0|^3.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^2.5|^3.2",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.8.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Prophecy\\": "src/Prophecy"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "time": "2019-10-03T11:07:50+00:00"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "4.0.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d",
-                "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-xmlwriter": "*",
-                "php": "^5.6 || ^7.0",
-                "phpunit/php-file-iterator": "^1.3",
-                "phpunit/php-text-template": "^1.2",
-                "phpunit/php-token-stream": "^1.4.2 || ^2.0",
-                "sebastian/code-unit-reverse-lookup": "^1.0",
-                "sebastian/environment": "^1.3.2 || ^2.0",
-                "sebastian/version": "^1.0 || ^2.0"
-            },
-            "require-dev": {
-                "ext-xdebug": "^2.1.4",
-                "phpunit/phpunit": "^5.7"
-            },
-            "suggest": {
-                "ext-xdebug": "^2.5.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "time": "2017-04-02T07:44:40+00:00"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "1.4.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "time": "2017-11-27T13:52:08+00:00"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "time": "2015-06-21T13:50:34+00:00"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "1.0.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "time": "2017-02-26T11:10:40+00:00"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "2.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "791198a2c6254db10131eecfe8c06670700904db"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db",
-                "reference": "791198a2c6254db10131eecfe8c06670700904db",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.2.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "time": "2017-11-27T05:48:46+00:00"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "5.7.27",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c",
-                "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-libxml": "*",
-                "ext-mbstring": "*",
-                "ext-xml": "*",
-                "myclabs/deep-copy": "~1.3",
-                "php": "^5.6 || ^7.0",
-                "phpspec/prophecy": "^1.6.2",
-                "phpunit/php-code-coverage": "^4.0.4",
-                "phpunit/php-file-iterator": "~1.4",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": "^1.0.6",
-                "phpunit/phpunit-mock-objects": "^3.2",
-                "sebastian/comparator": "^1.2.4",
-                "sebastian/diff": "^1.4.3",
-                "sebastian/environment": "^1.3.4 || ^2.0",
-                "sebastian/exporter": "~2.0",
-                "sebastian/global-state": "^1.1",
-                "sebastian/object-enumerator": "~2.0",
-                "sebastian/resource-operations": "~1.0",
-                "sebastian/version": "^1.0.6|^2.0.1",
-                "symfony/yaml": "~2.1|~3.0|~4.0"
-            },
-            "conflict": {
-                "phpdocumentor/reflection-docblock": "3.0.2"
-            },
-            "require-dev": {
-                "ext-pdo": "*"
-            },
-            "suggest": {
-                "ext-xdebug": "*",
-                "phpunit/php-invoker": "~1.1"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.7.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "time": "2018-02-01T05:50:59+00:00"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "3.4.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "a23b761686d50a560cc56233b9ecf49597cc9118"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/a23b761686d50a560cc56233b9ecf49597cc9118",
-                "reference": "a23b761686d50a560cc56233b9ecf49597cc9118",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.6 || ^7.0",
-                "phpunit/php-text-template": "^1.2",
-                "sebastian/exporter": "^1.2 || ^2.0"
-            },
-            "conflict": {
-                "phpunit/phpunit": "<5.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.4"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "abandoned": true,
-            "time": "2017-06-30T09:13:00+00:00"
-        },
-        {
-            "name": "sebastian/code-unit-reverse-lookup",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Looks up which function or method a line of code belongs to",
-            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2017-03-04T06:30:41+00:00"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "1.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
-                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/diff": "~1.2",
-                "sebastian/exporter": "~1.2 || ~2.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "time": "2017-01-29T09:50:25+00:00"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "1.4.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4",
-                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "https://github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff"
-            ],
-            "time": "2017-05-22T07:24:03+00:00"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
-                "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "time": "2016-11-26T07:53:53+00:00"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
-                "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/recursion-context": "~2.0"
-            },
-            "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "time": "2016-11-19T08:54:04+00:00"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "time": "2015-10-12T03:26:01+00:00"
-        },
-        {
-            "name": "sebastian/object-enumerator",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7",
-                "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6",
-                "sebastian/recursion-context": "~2.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
-            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2017-02-18T15:18:39+00:00"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a",
-                "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2016-11-19T07:33:16+00:00"
-        },
-        {
-            "name": "sebastian/resource-operations",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides a list of PHP built-in functions that operate on resources",
-            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2015-07-28T20:34:47+00:00"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2016-10-03T07:35:21+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.6.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozart/assert.git",
-                "reference": "573381c0a64f155a0d9a23f4b0c797194805b925"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/573381c0a64f155a0d9a23f4b0c797194805b925",
-                "reference": "573381c0a64f155a0d9a23f4b0c797194805b925",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0",
-                "symfony/polyfill-ctype": "^1.8"
-            },
-            "conflict": {
-                "vimeo/psalm": "<3.6.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.36 || ^7.5.13"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "time": "2019-11-24T13:36:37+00:00"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": {
-        "lapistano/proxy-object": 20
-    },
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "ext-curl": "*"
-    },
-    "platform-dev": []
-}
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 000000000..21cf8bade
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,55 @@
+version: "3.8"
+services:
+  workspace80:
+    tty: true
+    build:
+      context: resources/docker/workspace/8.0
+      args:
+        PUID: "${PUID:-1000}"
+        PGID: "${PGID:-1000}"
+    volumes:
+      - .:/var/www/html
+      - ~/.composer:/home/user/.composer
+  workspace81:
+    tty: true
+    build:
+      context: resources/docker/workspace/8.1
+      args:
+        PUID: "${PUID:-1000}"
+        PGID: "${PGID:-1000}"
+    volumes:
+      - .:/var/www/html
+      - ~/.composer:/home/user/.composer
+  workspace82:
+    tty: true
+    build:
+      context: resources/docker/workspace/8.2
+      args:
+        PUID: "${PUID:-1000}"
+        PGID: "${PGID:-1000}"
+    volumes:
+      - .:/var/www/html
+      - ~/.composer:/home/user/.composer
+  workspace83:
+    tty: true
+    build:
+      context: resources/docker/workspace/8.3
+      args:
+        PUID: "${PUID:-1000}"
+        PGID: "${PGID:-1000}"
+    volumes:
+      - .:/var/www/html
+      - ~/.composer:/home/user/.composer
+  workspace84:
+    tty: true
+    build:
+      context: resources/docker/workspace/8.4
+      args:
+        PUID: "${PUID:-1000}"
+        PGID: "${PGID:-1000}"
+    volumes:
+      - .:/var/www/html
+      - ~/.composer:/home/user/.composer
+
+
+
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
new file mode 100644
index 000000000..693088674
--- /dev/null
+++ b/phpstan-baseline.neon
@@ -0,0 +1,96 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: src/VCR/Util/HttpUtil.php
+
+		-
+			message: "#^Method VCR\\\\Util\\\\HttpUtil\\:\\:parseHeaders\\(\\) should return array\\<string, string\\> but returns array\\<array\\<int, string\\>\\|string\\>\\.$#"
+			count: 1
+			path: src/VCR/Util/HttpUtil.php
+
+		-
+			message: "#^Parameter \\#1 \\$string of function substr expects string, string\\|false given\\.$#"
+			count: 1
+			path: src/VCR/Util/HttpUtil.php
+
+		-
+			message: "#^Method VCR\\\\Util\\\\SoapClient\\:\\:realDoRequest\\(\\) should return string but returns string\\|null\\.$#"
+			count: 1
+			path: src/VCR/Util/SoapClient.php
+
+		-
+			message: "#^Offset 'uri' does not exist on array\\{timed_out\\: bool, blocked\\: bool, eof\\: bool, unread_bytes\\: int, stream_type\\: string, wrapper_type\\: string, wrapper_data\\: mixed, mode\\: string, \\.\\.\\.\\}\\.$#"
+			count: 1
+			path: src/VCR/Util/StreamProcessor.php
+
+		-
+			message: "#^Parameter \\#2 \\$length of function fread expects int\\<1, max\\>, int given\\.$#"
+			count: 1
+			path: src/VCR/Util/StreamProcessor.php
+
+		-
+			message: "#^Parameter \\#2 \\$size of function ftruncate expects int\\<0, max\\>, int given\\.$#"
+			count: 1
+			path: src/VCR/Util/StreamProcessor.php
+
+		-
+			message: "#^Parameter \\#3 \\$microseconds of function stream_set_timeout expects int, int\\|null given\\.$#"
+			count: 1
+			path: src/VCR/Util/StreamProcessor.php
+
+		-
+			message: "#^Cannot call method record\\(\\) on VCR\\\\Cassette\\|null\\.$#"
+			count: 1
+			path: src/VCR/Videorecorder.php
+
+		-
+			message: "#^Parameter \\#3 \\$cassette of class VCR\\\\Event\\\\BeforeRecordEvent constructor expects VCR\\\\Cassette, VCR\\\\Cassette\\|null given\\.$#"
+			count: 1
+			path: src/VCR/Videorecorder.php
+
+		-
+			message: "#^Cannot call method toArray\\(\\) on VCR\\\\Response\\|null\\.$#"
+			count: 5
+			path: tests/Unit/CassetteTest.php
+
+		-
+			message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertCount\\(\\) with arguments 22, array\\{url\\: string, content_type\\: string\\|null, http_code\\: int, header_size\\: int, request_size\\: int, filetime\\: int, ssl_verify_result\\: int, redirect_count\\: int, \\.\\.\\.\\} and 'curl_getinfo\\(\\)…' will always evaluate to false\\.$#"
+			count: 1
+			path: tests/Unit/LibraryHooks/CurlHookTest.php
+
+		-
+			message: "#^Parameter \\#2 \\$requestMatchers of method VCR\\\\Request\\:\\:matches\\(\\) expects array\\<callable\\(\\)\\: mixed\\>, array\\{array\\{'some', 'method'\\}\\} given\\.$#"
+			count: 1
+			path: tests/Unit/RequestTest.php
+
+		-
+			message: "#^Parameter \\#1 \\$stream of function fclose expects resource, resource\\|false given\\.$#"
+			count: 1
+			path: tests/Unit/Util/StreamProcessorTest.php
+
+		-
+			message: "#^Parameter \\#1 \\$stream of function stream_set_blocking expects resource, resource\\|false given\\.$#"
+			count: 1
+			path: tests/Unit/Util/StreamProcessorTest.php
+
+		-
+			message: "#^Parameter \\#1 \\$stream of function stream_set_read_buffer expects resource, resource\\|false given\\.$#"
+			count: 1
+			path: tests/Unit/Util/StreamProcessorTest.php
+
+		-
+			message: "#^Parameter \\#1 \\$stream of function stream_set_timeout expects resource, resource\\|false given\\.$#"
+			count: 2
+			path: tests/Unit/Util/StreamProcessorTest.php
+
+		-
+			message: "#^Parameter \\#1 \\$stream of function stream_set_write_buffer expects resource, resource\\|false given\\.$#"
+			count: 1
+			path: tests/Unit/Util/StreamProcessorTest.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:addListener\\(\\)\\.$#"
+			count: 1
+			path: tests/Unit/VCRTest.php
diff --git a/phpstan.neon b/phpstan.neon
new file mode 100644
index 000000000..492460e87
--- /dev/null
+++ b/phpstan.neon
@@ -0,0 +1,8 @@
+includes:
+	- phpstan-baseline.neon
+
+parameters:
+	level: 8
+	paths:
+		- src
+		- tests
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 0a5ff319b..bc9de4884 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,28 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
-         backupGlobals="false"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         colors="true"
-         bootstrap="tests/bootstrap.php"
->
-
-    <testsuites>
-        <testsuite name="VCR Test Suit">
-            <directory>./tests/VCR</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <blacklist>
-            <directory>./vendor</directory>
-        </blacklist>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
-
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" colors="true" bootstrap="tests/bootstrap.php">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Unit">
+      <directory>./tests/Unit</directory>
+    </testsuite>
+    <testsuite name="Integration">
+      <directory>./tests/Integration</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/resources/docker/workspace/8.0/Dockerfile b/resources/docker/workspace/8.0/Dockerfile
new file mode 100644
index 000000000..d52603324
--- /dev/null
+++ b/resources/docker/workspace/8.0/Dockerfile
@@ -0,0 +1,40 @@
+FROM php:8.0-cli-alpine
+
+ARG PUID=1000
+ARG PGID=1000
+
+RUN apk add --no-cache --virtual .build-deps \
+    # for extensions
+    $PHPIZE_DEPS \
+    # for soap
+    libxml2-dev \
+    # for xdebug \
+    linux-headers \
+    && \
+    apk add --no-cache \
+    bash \
+    # for soap
+    libxml2 \
+    # for composer
+    unzip \
+    && \
+    docker-php-ext-install soap \
+    && \
+    pecl install \
+    # pcov for coverage runs
+    pcov && docker-php-ext-enable pcov \
+    && \
+    # for debugging
+    pecl install xdebug && docker-php-ext-enable xdebug \
+    && \
+    apk del .build-deps
+
+COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
+
+WORKDIR /var/www/html
+
+# Add a non-root user to prevent files being created with root permissions on host machine.
+RUN addgroup -g ${PGID} user && \
+    adduser -u ${PUID} -G user -D user
+
+USER user
diff --git a/resources/docker/workspace/8.1/Dockerfile b/resources/docker/workspace/8.1/Dockerfile
new file mode 100644
index 000000000..37e39c29d
--- /dev/null
+++ b/resources/docker/workspace/8.1/Dockerfile
@@ -0,0 +1,40 @@
+FROM php:8.1-cli-alpine
+
+ARG PUID=1000
+ARG PGID=1000
+
+RUN apk add --no-cache --virtual .build-deps \
+    # for extensions
+    $PHPIZE_DEPS \
+    # for soap
+    libxml2-dev \
+    # for xdebug \
+    linux-headers \
+    && \
+    apk add --no-cache \
+    bash \
+    # for soap
+    libxml2 \
+    # for composer
+    unzip \
+    && \
+    docker-php-ext-install soap \
+    && \
+    pecl install \
+    # pcov for coverage runs
+    pcov && docker-php-ext-enable pcov \
+    && \
+    # for debugging
+    pecl install xdebug && docker-php-ext-enable xdebug \
+    && \
+    apk del .build-deps
+
+COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
+
+WORKDIR /var/www/html
+
+# Add a non-root user to prevent files being created with root permissions on host machine.
+RUN addgroup -g ${PGID} user && \
+    adduser -u ${PUID} -G user -D user
+
+USER user
diff --git a/resources/docker/workspace/8.2/Dockerfile b/resources/docker/workspace/8.2/Dockerfile
new file mode 100644
index 000000000..4b4a210ce
--- /dev/null
+++ b/resources/docker/workspace/8.2/Dockerfile
@@ -0,0 +1,40 @@
+FROM php:8.2-cli-alpine
+
+ARG PUID=1000
+ARG PGID=1000
+
+RUN apk add --no-cache --virtual .build-deps \
+    # for extensions
+    $PHPIZE_DEPS \
+    # for soap
+    libxml2-dev \
+    # for xdebug \
+    linux-headers \
+    && \
+    apk add --no-cache \
+    bash \
+    # for soap
+    libxml2 \
+    # for composer
+    unzip \
+    && \
+    docker-php-ext-install soap \
+    && \
+    pecl install \
+    # pcov for coverage runs
+    pcov && docker-php-ext-enable pcov \
+    && \
+    # for debugging
+    pecl install xdebug && docker-php-ext-enable xdebug \
+    && \
+    apk del .build-deps
+
+COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
+
+WORKDIR /var/www/html
+
+# Add a non-root user to prevent files being created with root permissions on host machine.
+RUN addgroup -g ${PGID} user && \
+    adduser -u ${PUID} -G user -D user
+
+USER user
diff --git a/resources/docker/workspace/8.3/Dockerfile b/resources/docker/workspace/8.3/Dockerfile
new file mode 100644
index 000000000..014f592e7
--- /dev/null
+++ b/resources/docker/workspace/8.3/Dockerfile
@@ -0,0 +1,40 @@
+FROM php:8.3-cli-alpine
+
+ARG PUID=1000
+ARG PGID=1000
+
+RUN apk add --no-cache --virtual .build-deps \
+    # for extensions
+    $PHPIZE_DEPS \
+    # for soap
+    libxml2-dev \
+    # for xdebug \
+    linux-headers \
+    && \
+    apk add --no-cache \
+    bash \
+    # for soap
+    libxml2 \
+    # for composer
+    unzip \
+    && \
+    docker-php-ext-install soap \
+    && \
+    pecl install \
+    # pcov for coverage runs
+    pcov && docker-php-ext-enable pcov \
+    && \
+    # for debugging
+    pecl install xdebug && docker-php-ext-enable xdebug \
+    && \
+    apk del .build-deps
+
+COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
+
+WORKDIR /var/www/html
+
+# Add a non-root user to prevent files being created with root permissions on host machine.
+RUN addgroup -g ${PGID} user && \
+    adduser -u ${PUID} -G user -D user
+
+USER user
diff --git a/resources/docker/workspace/8.4/Dockerfile b/resources/docker/workspace/8.4/Dockerfile
new file mode 100644
index 000000000..ddc8f973d
--- /dev/null
+++ b/resources/docker/workspace/8.4/Dockerfile
@@ -0,0 +1,40 @@
+FROM php:8.4-cli-alpine
+
+ARG PUID=1000
+ARG PGID=1000
+
+RUN apk add --no-cache --virtual .build-deps \
+    # for extensions
+    $PHPIZE_DEPS \
+    # for soap
+    libxml2-dev \
+    # for xdebug \
+    linux-headers \
+    && \
+    apk add --no-cache \
+    bash \
+    # for soap
+    libxml2 \
+    # for composer
+    unzip \
+    && \
+    docker-php-ext-install soap \
+    && \
+    pecl install \
+    # pcov for coverage runs
+    pcov && docker-php-ext-enable pcov \
+    && \
+    # for debugging
+    pecl install xdebug-3.4.0 && docker-php-ext-enable xdebug \
+    && \
+    apk del .build-deps
+
+COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
+
+WORKDIR /var/www/html
+
+# Add a non-root user to prevent files being created with root permissions on host machine.
+RUN addgroup -g ${PGID} user && \
+    adduser -u ${PUID} -G user -D user
+
+USER user
diff --git a/src/VCR/Cassette.php b/src/VCR/Cassette.php
index 0d0237c46..273e20935 100644
--- a/src/VCR/Cassette.php
+++ b/src/VCR/Cassette.php
@@ -1,9 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR;
 
 use VCR\Storage\Storage;
-use VCR\Util\Assertion;
 
 /**
  * A Cassette records and plays back pairs of Requests and Responses in a Storage.
@@ -11,66 +12,30 @@
 class Cassette
 {
     /**
-     * Casette name
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * VCR configuration.
-     *
-     * @var Configuration
-     */
-    protected $config;
-
-    /**
-     * Storage used to store records and request pairs.
-     *
-     * @var Storage
+     * @param Storage<array> $storage
      */
-    protected $storage;
-
-    /**
-     * Creates a new cassette.
-     *
-     * @param  string           $name    Name of the cassette.
-     * @param  Configuration    $config  Configuration to use for this cassette.
-     * @param  Storage          $storage Storage to use for requests and responses.
-     * @throws \VCR\VCRException If cassette name is in an invalid format.
-     */
-    public function __construct($name, Configuration $config, Storage $storage)
-    {
-        Assertion::string($name, 'Cassette name must be a string, ' . \gettype($name) . ' given.');
-
-        $this->name = $name;
-        $this->config = $config;
-        $this->storage = $storage;
+    public function __construct(
+        protected string $name,
+        protected Configuration $config,
+        protected Storage $storage
+    ) {
     }
 
-    /**
-     * Returns true if a response was recorded for specified request.
-     *
-     * @param Request $request Request to check if it was recorded.
-     *
-     * @return boolean True if a response was recorded for specified request.
-     */
-    public function hasResponse(Request $request)
+    public function hasResponse(Request $request, int $index = 0): bool
     {
-        return $this->playback($request) !== null;
+        return null !== $this->playback($request, $index);
     }
 
-    /**
-     * Returns a response for given request or null if not found.
-     *
-     * @param Request $request Request.
-     *
-     * @return Response|null Response for specified request.
-     */
-    public function playback(Request $request)
+    public function playback(Request $request, int $index = 0): ?Response
     {
         foreach ($this->storage as $recording) {
             $storedRequest = Request::fromArray($recording['request']);
-            if ($storedRequest->matches($request, $this->getRequestMatchers())) {
+
+            // Support legacy cassettes which do not have the 'index' key by setting the index to the searched one to
+            // always match this record if the request matches
+            $recording['index'] ??= $index;
+
+            if ($storedRequest->matches($request, $this->getRequestMatchers()) && $index == $recording['index']) {
                 return Response::fromArray($recording['response']);
             }
         }
@@ -78,54 +43,33 @@ public function playback(Request $request)
         return null;
     }
 
-    /**
-     * Records a request and response pair.
-     *
-     * @param Request  $request  Request to record.
-     * @param Response $response Response to record.
-     *
-     * @return void
-     */
-    public function record(Request $request, Response $response)
+    public function record(Request $request, Response $response, int $index = 0): void
     {
-        if ($this->hasResponse($request)) {
+        if ($this->hasResponse($request, $index)) {
             return;
         }
 
-        $recording = array(
-            'request'  => $request->toArray(),
-            'response' => $response->toArray()
-        );
-
-        $this->storage->storeRecording($recording);
+        $this->storage->storeRecording([
+            'request' => $request->toArray(),
+            'response' => $response->toArray(),
+            'index' => $index,
+        ]);
     }
 
-    /**
-     * Returns the name of the current cassette.
-     *
-     * @return string Current cassette name.
-     */
-    public function getName()
+    public function getName(): string
     {
         return $this->name;
     }
 
-    /**
-     * Returns true if the cassette was created recently.
-     *
-     * @return boolean
-     */
-    public function isNew()
+    public function isNew(): bool
     {
         return $this->storage->isNew();
     }
 
     /**
-     * Returns a list of callbacks to configured request matchers.
-     *
-     * @return array List of callbacks to configured request matchers.
+     * @return callable[]
      */
-    protected function getRequestMatchers()
+    protected function getRequestMatchers(): array
     {
         return $this->config->getRequestMatchers();
     }
diff --git a/src/VCR/CodeTransform/AbstractCodeTransform.php b/src/VCR/CodeTransform/AbstractCodeTransform.php
index 934367c42..14b189cce 100644
--- a/src/VCR/CodeTransform/AbstractCodeTransform.php
+++ b/src/VCR/CodeTransform/AbstractCodeTransform.php
@@ -1,35 +1,32 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\CodeTransform;
 
+use VCR\Util\Assertion;
+
 /**
  * A stream wrapper filter to transform code.
- *
- * @package VCR\CodeTransform
  */
-abstract class AbstractCodeTransform extends \PHP_User_Filter
+abstract class AbstractCodeTransform extends \php_user_filter
 {
-    const NAME = 'vcr_abstract_filter';
+    public const NAME = 'vcr_abstract_filter';
 
-    /**
-     * Flag to signalize the current filter is registered.
-     *
-     * @var bool
-     */
-    protected $isRegistered = false;
+    private string $data = '';
 
     /**
      * Attaches the current filter to a stream.
-     *
-     * @return bool true on success or false on failure.
      */
-    public function register()
+    public function register(): void
     {
-        if (!$this->isRegistered) {
-            $this->isRegistered = stream_filter_register(static::NAME, get_called_class());
+        if (!\in_array(static::NAME, stream_get_filters(), true)) {
+            $isRegistered = stream_filter_register(static::NAME, static::class);
+            Assertion::true(
+                $isRegistered,
+                \sprintf('Failed registering stream filter "%s" on stream "%s"', static::class, static::NAME)
+            );
         }
-
-        return $this->isRegistered;
     }
 
     /**
@@ -38,29 +35,31 @@ public function register()
      * @param resource $in
      * @param resource $out
      * @param int      $consumed
-     * @param bool     $closing
      *
      * @return int PSFS_PASS_ON
      *
-     * @link http://www.php.net/manual/en/php-user-filter.filter.php
+     * @see http://www.php.net/manual/en/php-user-filter.filter.php
      */
-    public function filter($in, $out, &$consumed, $closing)
+    public function filter($in, $out, &$consumed, bool $closing): int
     {
-        while ($bucket = stream_bucket_make_writeable($in)) {
-            $bucket->data = $this->transformCode($bucket->data);
-            $consumed += $bucket->datalen;
-            stream_bucket_append($out, $bucket);
+        while ($buffer = stream_bucket_make_writeable($in)) {
+            $this->data .= $buffer->data;
+            $consumed += $buffer->datalen;
+        }
+
+        if (!$closing) {
+            return \PSFS_FEED_ME;
         }
 
-        return PSFS_PASS_ON;
+        $bucket = stream_bucket_new($this->stream, $this->transformCode($this->data));
+        $this->data = '';
+        stream_bucket_append($out, $bucket);
+
+        return \PSFS_PASS_ON;
     }
 
     /**
      * Transcodes the provided data to whatever.
-     *
-     * @param string $code
-     *
-     * @return string
      */
-    abstract protected function transformCode($code);
+    abstract protected function transformCode(string $code): string;
 }
diff --git a/src/VCR/CodeTransform/CurlCodeTransform.php b/src/VCR/CodeTransform/CurlCodeTransform.php
index b6af88e83..3b7c3c248 100644
--- a/src/VCR/CodeTransform/CurlCodeTransform.php
+++ b/src/VCR/CodeTransform/CurlCodeTransform.php
@@ -1,29 +1,39 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\CodeTransform;
 
+use VCR\Util\Assertion;
+
 class CurlCodeTransform extends AbstractCodeTransform
 {
-    const NAME = 'vcr_curl';
-
-    private static $patterns = array(
-        '/(?<!::|->|\w_)\\\?curl_init\s*\(/i'                => '\VCR\LibraryHooks\CurlHook::curl_init(',
-        '/(?<!::|->|\w_)\\\?curl_exec\s*\(/i'                => '\VCR\LibraryHooks\CurlHook::curl_exec(',
-        '/(?<!::|->|\w_)\\\?curl_getinfo\s*\(/i'             => '\VCR\LibraryHooks\CurlHook::curl_getinfo(',
-        '/(?<!::|->|\w_)\\\?curl_setopt\s*\(/i'              => '\VCR\LibraryHooks\CurlHook::curl_setopt(',
-        '/(?<!::|->|\w_)\\\?curl_setopt_array\s*\(/i'        => '\VCR\LibraryHooks\CurlHook::curl_setopt_array(',
-        '/(?<!::|->|\w_)\\\?curl_multi_add_handle\s*\(/i'    => '\VCR\LibraryHooks\CurlHook::curl_multi_add_handle(',
-        '/(?<!::|->|\w_)\\\?curl_multi_remove_handle\s*\(/i' => '\VCR\LibraryHooks\CurlHook::curl_multi_remove_handle(',
-        '/(?<!::|->|\w_)\\\?curl_multi_exec\s*\(/i'          => '\VCR\LibraryHooks\CurlHook::curl_multi_exec(',
-        '/(?<!::|->|\w_)\\\?curl_multi_info_read\s*\(/i'     => '\VCR\LibraryHooks\CurlHook::curl_multi_info_read(',
-        '/(?<!::|->|\w_)\\\?curl_reset\s*\(/i'               => '\VCR\LibraryHooks\CurlHook::curl_reset('
-    );
+    public const NAME = 'vcr_curl';
 
     /**
-     * @inheritdoc
+     * @var array<string, string>
      */
-    protected function transformCode($code)
+    private static $patterns = [
+        '/(?<!::|->|\w_)\\\?curl_init\s*\(/i' => '\VCR\LibraryHooks\CurlHook::curl_init(',
+        '/(?<!::|->|\w_)\\\?curl_exec\s*\(/i' => '\VCR\LibraryHooks\CurlHook::curl_exec(',
+        '/(?<!::|->|\w_)\\\?curl_getinfo\s*\(/i' => '\VCR\LibraryHooks\CurlHook::curl_getinfo(',
+        '/(?<!::|->|\w_)\\\?curl_setopt\s*\(/i' => '\VCR\LibraryHooks\CurlHook::curl_setopt(',
+        '/(?<!::|->|\w_)\\\?curl_setopt_array\s*\(/i' => '\VCR\LibraryHooks\CurlHook::curl_setopt_array(',
+        '/(?<!::|->|\w_)\\\?curl_multi_add_handle\s*\(/i' => '\VCR\LibraryHooks\CurlHook::curl_multi_add_handle(',
+        '/(?<!::|->|\w_)\\\?curl_multi_remove_handle\s*\(/i' => '\VCR\LibraryHooks\CurlHook::curl_multi_remove_handle(',
+        '/(?<!::|->|\w_)\\\?curl_multi_exec\s*\(/i' => '\VCR\LibraryHooks\CurlHook::curl_multi_exec(',
+        '/(?<!::|->|\w_)\\\?curl_multi_info_read\s*\(/i' => '\VCR\LibraryHooks\CurlHook::curl_multi_info_read(',
+        '/(?<!::|->|\w_)\\\?curl_multi_getcontent\s*\(/i' => '\VCR\LibraryHooks\CurlHook::curl_multi_getcontent(',
+        '/(?<!::|->|\w_)\\\?curl_reset\s*\(/i' => '\VCR\LibraryHooks\CurlHook::curl_reset(',
+        '/(?<!::|->|\w_)\\\?curl_error\s*\(/i' => '\VCR\LibraryHooks\CurlHook::curl_error(',
+        '/(?<!::|->|\w_)\\\?curl_errno\s*\(/i' => '\VCR\LibraryHooks\CurlHook::curl_errno(',
+    ];
+
+    protected function transformCode(string $code): string
     {
-        return preg_replace(array_keys(self::$patterns), array_values(self::$patterns), $code);
+        $transformedCode = preg_replace(array_keys(self::$patterns), array_values(self::$patterns), $code);
+        Assertion::string($transformedCode);
+
+        return $transformedCode;
     }
 }
diff --git a/src/VCR/CodeTransform/SoapCodeTransform.php b/src/VCR/CodeTransform/SoapCodeTransform.php
index 6c192b041..746a8b285 100644
--- a/src/VCR/CodeTransform/SoapCodeTransform.php
+++ b/src/VCR/CodeTransform/SoapCodeTransform.php
@@ -1,26 +1,36 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\CodeTransform;
 
+use VCR\Util\Assertion;
+
 class SoapCodeTransform extends AbstractCodeTransform
 {
-    const NAME = 'vcr_soap';
+    public const NAME = 'vcr_soap';
 
-    private static $replacements = array(
+    /**
+     * @var string[]
+     */
+    private static $replacements = [
         'new \VCR\Util\SoapClient(',
         'extends \VCR\Util\SoapClient',
-    );
-
-    private static $patterns = array(
-        '@new\s+\\\?SoapClient\W*\(@i',
-        '@extends\s+\\\?SoapClient@i',
-    );
+    ];
 
     /**
-     * @inheritdoc
+     * @var string[]
      */
-    protected function transformCode($code)
+    private static $patterns = [
+        '@new\s+\\\?SoapClient\W*\(@i',
+        '@extends\s+\\\?SoapClient\b@i',
+    ];
+
+    protected function transformCode(string $code): string
     {
-        return preg_replace(self::$patterns, self::$replacements, $code);
+        $transformedCode = preg_replace(self::$patterns, self::$replacements, $code);
+        Assertion::string($transformedCode);
+
+        return $transformedCode;
     }
 }
diff --git a/src/VCR/Configuration.php b/src/VCR/Configuration.php
index a80a44edb..d2b0a9a3b 100644
--- a/src/VCR/Configuration.php
+++ b/src/VCR/Configuration.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR;
 
 use VCR\Util\Assertion;
@@ -14,18 +16,16 @@
  */
 class Configuration
 {
-    /**
-     * @var string Path where cassette files should be stored.
-     */
-    private $cassettePath = 'tests/fixtures';
+    private string $cassettePath = 'tests/fixtures';
 
     /**
      * List of enabled LibraryHook names.
      *
      * A value of null means all hooks are enabled.
      *
-     * @see \VCR\LibraryHooks\LibraryHook
-     * @var array List of enabled LibraryHook names.
+     * @see LibraryHooks\LibraryHook
+     *
+     * @var string[]|null list of enabled LibraryHook names
      */
     private $enabledLibraryHooks;
 
@@ -36,13 +36,14 @@ class Configuration
      * array(
      *  'name' => 'class name'
      * )
-     * @var array List of library hooks.
+     *
+     * @var array<string, class-string> List of library hooks
      */
-    private $availableLibraryHooks = array(
+    private $availableLibraryHooks = [
         'stream_wrapper' => 'VCR\LibraryHooks\StreamWrapperHook',
-        'curl'           => 'VCR\LibraryHooks\CurlHook',
-        'soap'           => 'VCR\LibraryHooks\SoapHook',
-    );
+        'curl' => 'VCR\LibraryHooks\CurlHook',
+        'soap' => 'VCR\LibraryHooks\SoapHook',
+    ];
 
     /**
      * Name of the enabled storage.
@@ -50,7 +51,7 @@ class Configuration
      * Only one storage can be enabled at a time.
      * By default YAML is enabled.
      *
-     * @var string Enabled storage name.
+     * @var string enabled storage name
      */
     private $enabledStorage = 'yaml';
 
@@ -62,18 +63,18 @@ class Configuration
      *  'name' => 'class name'
      * )
      *
-     * @var array List of available storages.
+     * @var array<string, class-string> List of available storages
      */
-    private $availableStorages = array(
+    private $availableStorages = [
         'blackhole' => 'VCR\Storage\Blackhole',
-        'json'      => 'VCR\Storage\Json',
-        'yaml'      => 'VCR\Storage\Yaml',
-    );
+        'json' => 'VCR\Storage\Json',
+        'yaml' => 'VCR\Storage\Yaml',
+    ];
 
     /**
      * A value of null means all RequestMatchers are enabled.
      *
-     * @var array Names of the RequestMatchers which are enabled.
+     * @var string[] names of the RequestMatchers which are enabled
      */
     private $enabledRequestMatchers;
 
@@ -81,22 +82,23 @@ class Configuration
      * Format:
      * array(
      *  'name' => callback
-     * )
+     * ).
      *
      * The RequestMatcher callback takes two Request objects and
      * returns true if they match or false otherwise.
      *
-     * @var array List of RequestMatcher names and callbacks.
+     * @var array<string,callable(Request, Request):bool> List of RequestMatcher names and callbacks
      */
-    private $availableRequestMatchers = array(
-        'method'       => array('VCR\RequestMatcher', 'matchMethod'),
-        'url'          => array('VCR\RequestMatcher', 'matchUrl'),
-        'host'         => array('VCR\RequestMatcher', 'matchHost'),
-        'headers'      => array('VCR\RequestMatcher', 'matchHeaders'),
-        'body'         => array('VCR\RequestMatcher', 'matchBody'),
-        'post_fields'  => array('VCR\RequestMatcher', 'matchPostFields'),
-        'query_string' => array('VCR\RequestMatcher', 'matchQueryString'),
-    );
+    private $availableRequestMatchers = [
+        'method' => [RequestMatcher::class, 'matchMethod'],
+        'url' => [RequestMatcher::class, 'matchUrl'],
+        'host' => [RequestMatcher::class, 'matchHost'],
+        'headers' => [RequestMatcher::class, 'matchHeaders'],
+        'body' => [RequestMatcher::class, 'matchBody'],
+        'post_fields' => [RequestMatcher::class, 'matchPostFields'],
+        'query_string' => [RequestMatcher::class, 'matchQueryString'],
+        'soap_operation' => [RequestMatcher::class, 'matchSoapOperation'],
+    ];
 
     /**
      * A whitelist is a list of paths.
@@ -106,9 +108,9 @@ class Configuration
      * all files (which are not blacklisted) are being considered for
      * code transformation.
      *
-     * @var array A whitelist is a list of paths.
+     * @var string[] a whitelist is a list of paths
      */
-    private $whiteList = array();
+    private $whiteList = [];
 
     /**
      * A blacklist is a list of paths which may not be processed for code transformation.
@@ -116,16 +118,11 @@ class Configuration
      * Files in this path are left as is. Blacklisting PHP-VCRs own paths is necessary
      * to avoid infinite loops.
      *
-     * @var array A blacklist is a list of paths.
+     * @var string[] a blacklist is a list of paths
      */
-    private $blackList = array('src/VCR/LibraryHooks/', 'src/VCR/Util/SoapClient', 'tests/VCR/Filter');
+    private $blackList = ['src/VCR/LibraryHooks/', 'src/VCR/Util/SoapClient', 'tests/VCR/Filter'];
 
-    /**
-     * The mode which determines how requests are handled. One of the MODE constants.
-     *
-     * @var string Current mode
-     */
-    private $mode = VCR::MODE_NEW_EPISODES;
+    private string $mode = VCR::MODE_NEW_EPISODES;
 
     /**
      * List of available modes.
@@ -135,46 +132,35 @@ class Configuration
      *  'name'
      * )
      *
-     * @var array List of available modes.
+     * @var string[] list of available modes
      */
-    private $availableModes = array(
+    private $availableModes = [
         VCR::MODE_NEW_EPISODES,
         VCR::MODE_ONCE,
         VCR::MODE_NONE,
-    );
+    ];
 
     /**
-     * Returns the current blacklist.
-     *
-     * @return array
+     * @return string[]
      */
-    public function getBlackList()
+    public function getBlackList(): array
     {
         return $this->blackList;
     }
 
     /**
-     * Sets one or more paths to blacklist.
-     *
-     * @param string|string[] $paths Path(s) to blacklist.
-     *
-     * @return Configuration
+     * @param string|string[] $paths
      */
-    public function setBlackList($paths)
+    public function setBlackList($paths): self
     {
-        $paths = (is_array($paths)) ? $paths : array($paths);
+        $paths = \is_array($paths) ? $paths : [$paths];
 
         $this->blackList = $paths;
 
         return $this;
     }
 
-    /**
-     * Returns the path to where cassettes are stored.
-     *
-     * @return string Path to where cassettes are stored.
-     */
-    public function getCassettePath()
+    public function getCassettePath(): string
     {
         $this->assertValidCassettePath($this->cassettePath);
 
@@ -182,14 +168,9 @@ public function getCassettePath()
     }
 
     /**
-     * Sets the cassette path where a cassettes should be stored in.
-     *
-     * @param string $cassettePath Path where to store cassettes.
-     *
-     * @return Configuration
-     * @throws VCRException If provided cassette path is invalid.
+     * @throws VCRException if provided cassette path is invalid
      */
-    public function setCassettePath($cassettePath)
+    public function setCassettePath(string $cassettePath): self
     {
         $this->assertValidCassettePath($cassettePath);
         $this->cassettePath = $cassettePath;
@@ -203,11 +184,11 @@ public function setCassettePath($cassettePath)
      * Only class names are returned, any object creation happens
      * in the VCRFactory.
      *
-     * @return string[] List of LibraryHook class names.
+     * @return string[] list of LibraryHook class names
      */
-    public function getLibraryHooks()
+    public function getLibraryHooks(): array
     {
-        if (is_null($this->enabledLibraryHooks)) {
+        if (null === $this->enabledLibraryHooks) {
             return array_values($this->availableLibraryHooks);
         }
 
@@ -220,16 +201,16 @@ public function getLibraryHooks()
     /**
      * Enables specified LibraryHook(s) by its name.
      *
-     * @param string|string[] $hooks Name of the LibraryHook(s) to enable.
-     * @return Configuration
-     * @throws \InvalidArgumentException If a specified library hook doesn't exist.
+     * @param string|string[] $hooks name of the LibraryHook(s) to enable
+     *
+     * @throws \InvalidArgumentException if a specified library hook doesn't exist
      */
-    public function enableLibraryHooks($hooks)
+    public function enableLibraryHooks($hooks): self
     {
-        $hooks = is_array($hooks) ? $hooks : array($hooks);
+        $hooks = \is_array($hooks) ? $hooks : [$hooks];
         $invalidHooks = array_diff($hooks, array_keys($this->availableLibraryHooks));
         if ($invalidHooks) {
-            throw new \InvalidArgumentException("Library hooks don't exist: " . join(', ', $invalidHooks));
+            throw new \InvalidArgumentException("Library hooks don't exist: ".implode(', ', $invalidHooks));
         }
         $this->enabledLibraryHooks = $hooks;
 
@@ -241,9 +222,9 @@ public function enableLibraryHooks($hooks)
      *
      * Objects are created in the VCRFactory.
      *
-     * @return string Class name of the storage to use.
+     * @return string class name of the storage to use
      */
-    public function getStorage()
+    public function getStorage(): string
     {
         return $this->availableStorages[$this->enabledStorage];
     }
@@ -251,11 +232,11 @@ public function getStorage()
     /**
      * Returns a list of enabled RequestMatcher callbacks.
      *
-     * @return array List of enabled RequestMatcher callbacks.
+     * @return callable[] list of enabled RequestMatcher callbacks
      */
-    public function getRequestMatchers()
+    public function getRequestMatchers(): array
     {
-        if (is_null($this->enabledRequestMatchers)) {
+        if (null === $this->enabledRequestMatchers) {
             return array_values($this->availableRequestMatchers);
         }
 
@@ -268,16 +249,14 @@ public function getRequestMatchers()
     /**
      * Adds a new RequestMatcher callback.
      *
-     * @param string $name Name of the RequestMatcher.
-     * @param callable $callback A callback taking two Request objects as parameters and returns true if those match.
+     * @param string   $name     name of the RequestMatcher
+     * @param callable $callback a callback taking two Request objects as parameters and returns true if those match
      *
-     * @return Configuration
-     * @throws VCRException If specified parameters are invalid.
+     * @throws VCRException if specified parameters are invalid
      */
-    public function addRequestMatcher($name, $callback)
+    public function addRequestMatcher(string $name, callable $callback): self
     {
-        Assertion::minLength($name, 1, "A request matchers name must be at least one character long. Found '{$name}'");
-        Assertion::isCallable($callback, "Request matcher '{$name}' is not callable.");
+        Assertion::minLength($name, 1, "A request matchers name must be at least one character long. Found ''");
         $this->availableRequestMatchers[$name] = $callback;
 
         return $this;
@@ -286,32 +265,25 @@ public function addRequestMatcher($name, $callback)
     /**
      * Enables specified RequestMatchers by its name.
      *
-     * @param array $matchers List of RequestMatcher names to enable.
+     * @param string[] $matchers list of RequestMatcher names to enable
      *
-     * @return Configuration
-     *
-     * @throws \InvalidArgumentException If a specified request matcher does not exist.
+     * @throws \InvalidArgumentException if a specified request matcher does not exist
      */
-    public function enableRequestMatchers(array $matchers)
+    public function enableRequestMatchers(array $matchers): self
     {
         $invalidMatchers = array_diff($matchers, array_keys($this->availableRequestMatchers));
         if ($invalidMatchers) {
-            throw new \InvalidArgumentException("Request matchers don't exist: " . join(', ', $invalidMatchers));
+            throw new \InvalidArgumentException("Request matchers don't exist: ".implode(', ', $invalidMatchers));
         }
         $this->enabledRequestMatchers = $matchers;
-        
+
         return $this;
     }
 
     /**
-     * Enables a storage by name.
-     *
-     * @param string $storageName Name of the storage to enable.
-     *
-     * @return $this
-     * @throws VCRException If a invalid storage name is given.
+     * @throws VCRException if a invalid storage name is given
      */
-    public function setStorage($storageName)
+    public function setStorage(string $storageName): self
     {
         Assertion::keyExists($this->availableStorages, $storageName, "Storage '{$storageName}' not available.");
         $this->enabledStorage = $storageName;
@@ -320,49 +292,31 @@ public function setStorage($storageName)
     }
 
     /**
-      * Returns a list of whitelisted paths.
-      *
-      * @return array
-      */
-    public function getWhiteList()
+     * @return string[]
+     */
+    public function getWhiteList(): array
     {
         return $this->whiteList;
     }
 
     /**
-     * Sets a list of paths to whitelist when processing in the StreamProcessor.
-     *
-     * @param string|array $paths Single path or list of path which are whitelisted.
-     *
-     * @return Configuration
+     * @param string|string[] $paths single path or list of path which are whitelisted
      */
-    public function setWhiteList($paths)
+    public function setWhiteList($paths): self
     {
-        $paths = (is_array($paths)) ? $paths : array($paths);
+        $paths = \is_array($paths) ? $paths : [$paths];
 
         $this->whiteList = $paths;
 
         return $this;
     }
 
-    /**
-      * Returns the current mode.
-      *
-      * @return string
-      */
-    public function getMode()
+    public function getMode(): string
     {
         return $this->mode;
     }
 
-    /**
-     * Sets the current mode.
-     *
-     * @param string $mode The mode to set VCR to
-     *
-     * @return Configuration
-     */
-    public function setMode($mode)
+    public function setMode(string $mode): self
     {
         Assertion::choice($mode, $this->availableModes, "Mode '{$mode}' does not exist.");
         $this->mode = $mode;
@@ -371,18 +325,15 @@ public function setMode($mode)
     }
 
     /**
-     * Validates a specified cassette path.
-     *
-     * @param string $cassettePath Path to a cassette.
-     * @throws VCRException If cassette path is invalid.
+     * @throws VCRException if cassette path is invalid
      */
-    private function assertValidCassettePath($cassettePath)
+    private function assertValidCassettePath(string $cassettePath): void
     {
         Assertion::directory(
             $cassettePath,
             "Cassette path '{$cassettePath}' is not a directory. Please either "
-            . 'create it or set a different cassette path using '
-            . "\\VCR\\VCR::configure()->setCassettePath('directory')."
+            .'create it or set a different cassette path using '
+            ."\\VCR\\VCR::configure()->setCassettePath('directory')."
         );
     }
 }
diff --git a/src/VCR/Event/AfterHttpRequestEvent.php b/src/VCR/Event/AfterHttpRequestEvent.php
index 0440d3e61..fbbffc255 100644
--- a/src/VCR/Event/AfterHttpRequestEvent.php
+++ b/src/VCR/Event/AfterHttpRequestEvent.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\Event;
 
 use VCR\Request;
@@ -7,38 +9,18 @@
 
 class AfterHttpRequestEvent extends Event
 {
-    /**
-     * @var Request
-     */
-    protected $request;
-
-    /**
-     * @var Response
-     */
-    protected $response;
-
-    /**
-     * @param Request $request
-     * @param Response $response
-     */
-    public function __construct(Request $request, Response $response)
-    {
-        $this->request = $request;
-        $this->response = $response;
+    public function __construct(
+        protected Request $request,
+        protected Response $response
+    ) {
     }
 
-    /**
-     * @return Request
-     */
-    public function getRequest()
+    public function getRequest(): Request
     {
         return $this->request;
     }
 
-    /**
-     * @return Response
-     */
-    public function getResponse()
+    public function getResponse(): Response
     {
         return $this->response;
     }
diff --git a/src/VCR/Event/AfterPlaybackEvent.php b/src/VCR/Event/AfterPlaybackEvent.php
index 283d2b6fd..67e387a57 100644
--- a/src/VCR/Event/AfterPlaybackEvent.php
+++ b/src/VCR/Event/AfterPlaybackEvent.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\Event;
 
 use VCR\Cassette;
@@ -8,53 +10,24 @@
 
 class AfterPlaybackEvent extends Event
 {
-    /**
-     * @var Request
-     */
-    protected $request;
-
-    /**
-     * @var Response
-     */
-    protected $response;
-
-    /**
-     * @var Cassette
-     */
-    protected $cassette;
-
-    /**
-     * @param Request $request
-     * @param Response $response
-     * @param Cassette $cassette
-     */
-    public function __construct(Request $request, Response $response, Cassette $cassette)
-    {
-        $this->request = $request;
-        $this->response = $response;
-        $this->cassette = $cassette;
+    public function __construct(
+        protected Request $request,
+        protected Response $response,
+        protected Cassette $cassette
+    ) {
     }
 
-    /**
-     * @return Request
-     */
-    public function getRequest()
+    public function getRequest(): Request
     {
         return $this->request;
     }
 
-    /**
-     * @return Response
-     */
-    public function getResponse()
+    public function getResponse(): Response
     {
         return $this->response;
     }
 
-    /**
-     * @return Cassette
-     */
-    public function getCassette()
+    public function getCassette(): Cassette
     {
         return $this->cassette;
     }
diff --git a/src/VCR/Event/BeforeHttpRequestEvent.php b/src/VCR/Event/BeforeHttpRequestEvent.php
index 423fbd085..0f56dd262 100644
--- a/src/VCR/Event/BeforeHttpRequestEvent.php
+++ b/src/VCR/Event/BeforeHttpRequestEvent.php
@@ -1,28 +1,19 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\Event;
 
 use VCR\Request;
 
 class BeforeHttpRequestEvent extends Event
 {
-    /**
-     * @var Request
-     */
-    protected $request;
-
-    /**
-     * @param Request $request
-     */
-    public function __construct(Request $request)
-    {
-        $this->request = $request;
+    public function __construct(
+        protected Request $request
+    ) {
     }
 
-    /**
-     * @return Request
-     */
-    public function getRequest()
+    public function getRequest(): Request
     {
         return $this->request;
     }
diff --git a/src/VCR/Event/BeforePlaybackEvent.php b/src/VCR/Event/BeforePlaybackEvent.php
index e9523fd47..f82d83321 100644
--- a/src/VCR/Event/BeforePlaybackEvent.php
+++ b/src/VCR/Event/BeforePlaybackEvent.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\Event;
 
 use VCR\Cassette;
@@ -7,37 +9,18 @@
 
 class BeforePlaybackEvent extends Event
 {
-    /**
-     * @var Request
-     */
-    protected $request;
-    /**
-     * @var Cassette
-     */
-    protected $cassette;
-
-    /**
-     * @param Request $request
-     * @param Cassette $cassette
-     */
-    public function __construct(Request $request, Cassette $cassette)
-    {
-        $this->request = $request;
-        $this->cassette = $cassette;
+    public function __construct(
+        protected Request $request,
+        protected Cassette $cassette
+    ) {
     }
 
-    /**
-     * @return Request
-     */
-    public function getRequest()
+    public function getRequest(): Request
     {
         return $this->request;
     }
 
-    /**
-     * @return Cassette
-     */
-    public function getCassette()
+    public function getCassette(): Cassette
     {
         return $this->cassette;
     }
diff --git a/src/VCR/Event/BeforeRecordEvent.php b/src/VCR/Event/BeforeRecordEvent.php
index e916f8f11..ffbf4668a 100644
--- a/src/VCR/Event/BeforeRecordEvent.php
+++ b/src/VCR/Event/BeforeRecordEvent.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\Event;
 
 use VCR\Cassette;
@@ -8,53 +10,24 @@
 
 class BeforeRecordEvent extends Event
 {
-    /**
-     * @var Request
-     */
-    protected $request;
-
-    /**
-     * @var Response
-     */
-    protected $response;
-
-    /**
-     * @var Cassette
-     */
-    protected $cassette;
-
-    /**
-     * @param Request $request
-     * @param Response $response
-     * @param Cassette $cassette
-     */
-    public function __construct(Request $request, Response $response, Cassette $cassette)
-    {
-        $this->request = $request;
-        $this->response = $response;
-        $this->cassette = $cassette;
+    public function __construct(
+        protected Request $request,
+        protected Response $response,
+        protected Cassette $cassette
+    ) {
     }
 
-    /**
-     * @return Request
-     */
-    public function getRequest()
+    public function getRequest(): Request
     {
         return $this->request;
     }
 
-    /**
-     * @return Response
-     */
-    public function getResponse()
+    public function getResponse(): Response
     {
         return $this->response;
     }
 
-    /**
-     * @return Cassette
-     */
-    public function getCassette()
+    public function getCassette(): Cassette
     {
         return $this->cassette;
     }
diff --git a/src/VCR/Event/Event.php b/src/VCR/Event/Event.php
index 06d49e263..f9b3de8e0 100644
--- a/src/VCR/Event/Event.php
+++ b/src/VCR/Event/Event.php
@@ -1,14 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\Event;
 
-// inferior to Symfony/Contracts PHP minimal version
-if (class_exists(\Symfony\Contracts\EventDispatcher\Event::class)) {
-    class Event extends \Symfony\Contracts\EventDispatcher\Event
-    {
-    }
-} else {
-    class Event extends \Symfony\Component\EventDispatcher\Event
-    {
-    }
+use Symfony\Contracts\EventDispatcher\Event as BaseEvent;
+
+abstract class Event extends BaseEvent
+{
 }
diff --git a/src/VCR/Exceptions/InvalidHostException.php b/src/VCR/Exceptions/InvalidHostException.php
new file mode 100644
index 000000000..ca1b37f82
--- /dev/null
+++ b/src/VCR/Exceptions/InvalidHostException.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Exceptions;
+
+class InvalidHostException extends \InvalidArgumentException
+{
+    public static function create(?string $url): self
+    {
+        return new self(\sprintf('Could not read host from URL "%s". Please check the URL syntax.', $url));
+    }
+}
diff --git a/src/VCR/LibraryHooks/CurlHook.php b/src/VCR/LibraryHooks/CurlHook.php
index 64c302068..5c70a5609 100644
--- a/src/VCR/LibraryHooks/CurlHook.php
+++ b/src/VCR/LibraryHooks/CurlHook.php
@@ -1,94 +1,77 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\LibraryHooks;
 
-use VCR\Util\Assertion;
+use VCR\CodeTransform\AbstractCodeTransform;
 use VCR\Request;
 use VCR\Response;
-use VCR\CodeTransform\AbstractCodeTransform;
+use VCR\Util\Assertion;
+use VCR\Util\CurlException;
 use VCR\Util\CurlHelper;
 use VCR\Util\StreamProcessor;
 use VCR\Util\TextUtil;
 
+use function array_fill_keys;
+use function in_array;
+
+use const CURLINFO_PRIVATE;
+use const CURLOPT_PRIVATE;
+
 /**
  * Library hook for curl functions using include-overwrite.
  */
 class CurlHook implements LibraryHook
 {
-    /**
-     * @var \Closure Callback which will be executed when a request is intercepted.
-     */
-    protected static $requestCallback;
+    protected static ?\Closure $requestCallback;
 
-    /**
-     * @var string Current status of this hook, either enabled or disabled.
-     */
-    protected static $status = self::DISABLED;
+    protected static string $status = self::DISABLED;
 
     /**
-     * @var Request[] All requests which have been intercepted.
+     * @var Request[] all requests which have been intercepted
      */
-    protected static $requests = array();
+    protected static array $requests = [];
 
     /**
-     * @var Response[] All responses which have been intercepted.
+     * @var Response[] all responses which have been intercepted
      */
-    protected static $responses = array();
+    protected static array $responses = [];
 
     /**
-     * @var array Additinal curl options, which are not stored within a request.
+     * @var array<int,mixed> additional curl options, which are not stored within a request
      */
-    protected static $curlOptions = array();
+    protected static array $curlOptions = [];
 
     /**
-     * @var array All curl handles which belong to curl_multi handles.
+     * @var array<int, array<\CurlHandle>> all curl handles which belong to curl_multi handles
      */
-    protected static $multiHandles = array();
+    protected static array $multiHandles = [];
 
     /**
-     * @var array Last active curl_multi_exec() handles.
+     * @var array<\CurlHandle> last active curl_multi_exec() handles
      */
-    protected static $multiExecLastChs = array();
+    protected static array $multiExecLastChs = [];
 
     /**
-     * @var AbstractCodeTransform
+     * @var array<int, string|null> return values of curl_multi responses
      */
-    private $codeTransformer;
+    protected static array $multiReturnValues = [];
 
     /**
-     * @var StreamProcessor
+     * @var CurlException[] last cURL error, as a CurlException
      */
-    private $processor;
+    protected static array $lastErrors = [];
 
-    /**
-     * Creates a new cURL hook instance.
-     *
-     * @param AbstractCodeTransform  $codeTransformer
-     * @param StreamProcessor $processor
-     *
-     * @throws \BadMethodCallException in case the cURL extension is not installed.
-     */
-    public function __construct(AbstractCodeTransform $codeTransformer, StreamProcessor $processor)
-    {
-        if (!function_exists('curl_version')) {
-            // @codeCoverageIgnoreStart
-            throw new \BadMethodCallException(
-                'cURL extension not installed, please disable the cURL library hook'
-            );
-            // @codeCoverageIgnoreEnd
-        }
-        $this->processor = $processor;
-        $this->codeTransformer = $codeTransformer;
+    public function __construct(
+        private AbstractCodeTransform $codeTransformer,
+        private StreamProcessor $processor
+    ) {
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function enable(\Closure $requestCallback)
+    public function enable(\Closure $requestCallback): void
     {
-        Assertion::isCallable($requestCallback, 'No valid callback for handling requests defined.');
-
-        if (static::$status == self::ENABLED) {
+        if (self::ENABLED == static::$status) {
             return;
         }
 
@@ -101,126 +84,119 @@ public function enable(\Closure $requestCallback)
         static::$status = self::ENABLED;
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function disable()
+    public function disable(): void
     {
-        if (static::$status == self::DISABLED) {
-            return;
-        }
-
         self::$requestCallback = null;
 
         static::$status = self::DISABLED;
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function isEnabled()
+    public function isEnabled(): bool
     {
-        return self::$status == self::ENABLED;
+        return self::ENABLED == self::$status;
     }
 
     /**
      * Calls the intercepted curl method if library hook is disabled, otherwise the real one.
      *
-     * @param string $method cURL method to call, example: curl_info()
-     * @param array  $args   cURL arguments for this function.
+     * @param callable&string  $method cURL method to call, example: curl_info()
+     * @param array<int,mixed> $args   cURL arguments for this function
      *
-     * @return mixed  cURL function return type.
+     * @return mixed cURL function return type
      */
-    public static function __callStatic($method, $args)
+    public static function __callStatic($method, array $args)
     {
         // Call original when disabled
-        if (static::$status == self::DISABLED) {
-            if ($method === 'curl_multi_exec') {
+        if (self::DISABLED == static::$status) {
+            if ('curl_multi_exec' === $method) {
                 // curl_multi_exec expects to be called with args by reference
                 // which call_user_func_array doesn't do.
-                return \curl_multi_exec($args[0], $args[1]);
+                return curl_multi_exec($args[0], $args[1]);
             }
 
             return \call_user_func_array($method, $args);
         }
 
-        if ($method === 'curl_multi_exec') {
+        if ('curl_multi_exec' === $method) {
             // curl_multi_exec expects to be called with args by reference
             // which call_user_func_array doesn't do.
             return self::curlMultiExec($args[0], $args[1]);
         }
 
         $localMethod = TextUtil::underscoreToLowerCamelcase($method);
-        return \call_user_func_array(array(__CLASS__, $localMethod), $args);
+
+        $callable = [__CLASS__, $localMethod];
+
+        Assertion::isCallable($callable);
+
+        return \call_user_func_array($callable, $args);
     }
 
     /**
-     * Initialize a cURL session.
-     *
-     * @link http://www.php.net/manual/en/function.curl-init.php
-     * @param string $url (Optional) url.
-     *
-     * @return resource cURL handle.
+     * @see http://www.php.net/manual/en/function.curl-init.php
      */
-    public static function curlInit($url = null)
+    public static function curlInit(?string $url = null): \CurlHandle|false
     {
-        $curlHandle = \curl_init($url);
-        self::$requests[(int) $curlHandle] = new Request('GET', $url);
-        self::$curlOptions[(int) $curlHandle] = array();
+        $curlHandle = curl_init($url);
+        if (false !== $curlHandle) {
+            self::$requests[(int) $curlHandle] = new Request('GET', $url);
+            self::$curlOptions[(int) $curlHandle] = [];
+        }
 
         return $curlHandle;
     }
 
     /**
-     * Reset a cURL session.
-     *
-     * @link http://www.php.net/manual/en/function.curl-reset.php
-     * @param resource $curlHandle A cURL handle returned by curl_init().
+     * @see http://www.php.net/manual/en/function.curl-reset.php
      */
-    public static function curlReset($curlHandle)
+    public static function curlReset(\CurlHandle $curlHandle): void
     {
-        \curl_reset($curlHandle);
+        curl_reset($curlHandle);
         self::$requests[(int) $curlHandle] = new Request('GET', null);
-        self::$curlOptions[(int) $curlHandle] = array();
+        self::$curlOptions[(int) $curlHandle] = [];
         unset(self::$responses[(int) $curlHandle]);
     }
 
     /**
      * Perform a cURL session.
      *
-     * @link http://www.php.net/manual/en/function.curl-exec.php
-     * @param resource $curlHandle A cURL handle returned by curl_init().
+     * @see http://www.php.net/manual/en/function.curl-exec.php
      *
      * @return mixed Returns TRUE on success or FALSE on failure.
-     * However, if the CURLOPT_RETURNTRANSFER option is set, it will return the
-     * result on success, FALSE on failure.
+     *               However, if the CURLOPT_RETURNTRANSFER option is set, it will return the
+     *               result on success, FALSE on failure.
      */
-    public static function curlExec($curlHandle)
+    public static function curlExec(\CurlHandle $curlHandle)
     {
-        $request = self::$requests[(int) $curlHandle];
-        CurlHelper::validateCurlPOSTBody($request, $curlHandle);
-
-        $requestCallback = self::$requestCallback;
-        self::$responses[(int) $curlHandle] = $requestCallback($request);
+        try {
+            $request = self::$requests[(int) $curlHandle];
+            CurlHelper::validateCurlPOSTBody($request, $curlHandle);
+
+            $requestCallback = self::$requestCallback;
+            Assertion::isCallable($requestCallback);
+            self::$responses[(int) $curlHandle] = $requestCallback($request);
+
+            return CurlHelper::handleOutput(
+                self::$responses[(int) $curlHandle],
+                self::$curlOptions[(int) $curlHandle],
+                $curlHandle
+            );
+        } catch (CurlException $e) {
+            self::$lastErrors[(int) $curlHandle] = $e;
 
-        return CurlHelper::handleOutput(
-            self::$responses[(int) $curlHandle],
-            self::$curlOptions[(int) $curlHandle],
-            $curlHandle
-        );
+            return false;
+        }
     }
 
     /**
      * Add a normal cURL handle to a cURL multi handle.
      *
-     * @link http://www.php.net/manual/en/function.curl-multi-add-handle.php
-     * @param resource $multiHandle A cURL multi handle returned by curl_multi_init().
-     * @param resource $curlHandle  A cURL handle returned by curl_init().
+     * @see http://www.php.net/manual/en/function.curl-multi-add-handle.php
      */
-    public static function curlMultiAddHandle($multiHandle, $curlHandle)
+    public static function curlMultiAddHandle(\CurlMultiHandle $multiHandle, \CurlHandle $curlHandle): void
     {
         if (!isset(self::$multiHandles[(int) $multiHandle])) {
-            self::$multiHandles[(int) $multiHandle] = array();
+            self::$multiHandles[(int) $multiHandle] = [];
         }
 
         self::$multiHandles[(int) $multiHandle][(int) $curlHandle] = $curlHandle;
@@ -229,11 +205,9 @@ public static function curlMultiAddHandle($multiHandle, $curlHandle)
     /**
      * Remove a multi handle from a set of cURL handles.
      *
-     * @link http://www.php.net/manual/en/function.curl-multi-remove-handle.php
-     * @param resource $multiHandle A cURL multi handle returned by curl_multi_init().
-     * @param resource $curlHandle A cURL handle returned by curl_init().
+     * @see http://www.php.net/manual/en/function.curl-multi-remove-handle.php
      */
-    public static function curlMultiRemoveHandle($multiHandle, $curlHandle)
+    public static function curlMultiRemoveHandle(\CurlMultiHandle $multiHandle, \CurlHandle $curlHandle): void
     {
         if (isset(self::$multiHandles[(int) $multiHandle][(int) $curlHandle])) {
             unset(self::$multiHandles[(int) $multiHandle][(int) $curlHandle]);
@@ -243,41 +217,37 @@ public static function curlMultiRemoveHandle($multiHandle, $curlHandle)
     /**
      * Run the sub-connections of the current cURL handle.
      *
-     * @link http://www.php.net/manual/en/function.curl-multi-exec.php
-     * @param resource $multiHandle A cURL multi handle returned by curl_multi_init().
-     * @param integer $stillRunning A reference to a flag to tell whether the operations are still running.
-     *
-     * @return integer  A cURL code defined in the cURL Predefined Constants.
+     * @see http://www.php.net/manual/en/function.curl-multi-exec.php
      */
-    public static function curlMultiExec($multiHandle, &$stillRunning)
+    public static function curlMultiExec(\CurlMultiHandle $multiHandle, ?int &$stillRunning): int
     {
         if (isset(self::$multiHandles[(int) $multiHandle])) {
             foreach (self::$multiHandles[(int) $multiHandle] as $curlHandle) {
                 if (!isset(self::$responses[(int) $curlHandle])) {
                     self::$multiExecLastChs[] = $curlHandle;
-                    self::curlExec($curlHandle);
+                    self::$multiReturnValues[(int) $curlHandle] = self::curlExec($curlHandle);
                 }
             }
         }
 
-        return CURLM_OK;
+        return \CURLM_OK;
     }
 
     /**
      * Get information about the current transfers.
      *
-     * @link http://www.php.net/manual/en/function.curl-multi-info-read.php
+     * @see http://www.php.net/manual/en/function.curl-multi-info-read.php
      *
-     * @return array|bool On success, returns an associative array for the message, FALSE on failure.
+     * @return array<string,mixed>|bool on success, returns an associative array for the message, FALSE on failure
      */
     public static function curlMultiInfoRead()
     {
         if (!empty(self::$multiExecLastChs)) {
-            $info = array(
-                'msg' => CURLMSG_DONE,
+            $info = [
+                'msg' => \CURLMSG_DONE,
                 'handle' => array_pop(self::$multiExecLastChs),
-                'result' => CURLE_OK
-            );
+                'result' => \CURLE_OK,
+            ];
 
             return $info;
         }
@@ -286,66 +256,103 @@ public static function curlMultiInfoRead()
     }
 
     /**
-     * Get information regarding a specific transfer.
+     * Return the content of a cURL handle if CURLOPT_RETURNTRANSFER is set.
+     *
+     * @see https://www.php.net/manual/en/function.curl-multi-getcontent.php
      *
-     * @link http://www.php.net/manual/en/function.curl-getinfo.php
-     * @param resource $curlHandle A cURL handle returned by curl_init().
-     * @param integer  $option     A cURL option defined in the cURL Predefined Constants.
+     * @return string|null return the content of a cURL handle if CURLOPT_RETURNTRANSFER is set
+     */
+    public static function curlMultiGetcontent(\CurlHandle $curlHandle): ?string
+    {
+        return self::$multiReturnValues[(int) $curlHandle] ?? null;
+    }
+
+    /**
+     * Get information regarding a specific transfer.
      *
-     * @return mixed
+     * @see http://www.php.net/manual/en/function.curl-getinfo.php
      */
-    public static function curlGetinfo($curlHandle, $option = 0)
+    public static function curlGetinfo(\CurlHandle $curlHandle, int $option = 0): mixed
     {
         // Workaround for CURLINFO_PRIVATE.
         // It can be set AND read before the response is available, e.g by symfony/http-client.
-        //   - If the response is available, we read from it.
-        //   - If not, we return what was first set.
-        if ($option === CURLINFO_PRIVATE && !in_array((int) $curlHandle, self::$responses, true)) {
+        //   - We return what was first set.
+        if ($option === CURLINFO_PRIVATE) {
             return static::$curlOptions[(int) $curlHandle][CURLOPT_PRIVATE];
         }
 
-        if ($option === 0 && !in_array((int) $curlHandle, self::$responses, true)) {
-            return array_fill_keys(CurlHelper::$curlInfoList, null);
-        }
+        if (isset(self::$responses[(int) $curlHandle])) {
+            return CurlHelper::getCurlOptionFromResponse(
+                self::$responses[(int) $curlHandle],
+                self::$requests[(int) $curlHandle]->getUrl(),
+                $option
+            );
+        } elseif (isset(self::$lastErrors[(int) $curlHandle])) {
+            return self::$lastErrors[(int) $curlHandle]->getInfo();
+        } else {
+            if ($option === 0 && !in_array((int) $curlHandle, self::$responses, true)) {
+                return array_fill_keys(CurlHelper::$curlInfoList, null);
+            }
 
-        return CurlHelper::getCurlOptionFromResponse(
-            self::$responses[(int) $curlHandle],
-            $option
-        );
+            throw new \RuntimeException('Unexpected error, could not find curl_getinfo in response or errors');
+        }
     }
 
     /**
      * Set an option for a cURL transfer.
      *
-     * @link http://www.php.net/manual/en/function.curl-setopt.php
-     * @param resource $curlHandle A cURL handle returned by curl_init().
-     * @param integer  $option     The CURLOPT_XXX option to set.
-     * @param mixed    $value      The value to be set on option.
+     * @see http://www.php.net/manual/en/function.curl-setopt.php
      *
-     * @return boolean  Returns TRUE on success or FALSE on failure.
+     * @param mixed $value the value to be set on option
      */
-    public static function curlSetopt($curlHandle, $option, $value)
+    public static function curlSetopt(\CurlHandle $curlHandle, int $option, $value): bool
     {
-        CurlHelper::setCurlOptionOnRequest(self::$requests[(int) $curlHandle], $option, $value, $curlHandle);
+        CurlHelper::setCurlOptionOnRequest(self::$requests[(int) $curlHandle], $option, $value);
 
         static::$curlOptions[(int) $curlHandle][$option] = $value;
 
-        return \curl_setopt($curlHandle, $option, $value);
+        return curl_setopt($curlHandle, $option, $value);
     }
 
     /**
      * Set multiple options for a cURL transfer.
      *
-     * @link http://www.php.net/manual/en/function.curl-setopt-array.php
-     * @param resource $curlHandle A cURL handle returned by curl_init().
-     * @param array    $options    An array specifying which options to set and their values.
+     * @see http://www.php.net/manual/en/function.curl-setopt-array.php
+     *
+     * @param array<int, mixed> $options an array specifying which options to set and their values
      */
-    public static function curlSetoptArray($curlHandle, $options)
+    public static function curlSetoptArray(\CurlHandle $curlHandle, array $options): void
     {
-        if (is_array($options)) {
-            foreach ($options as $option => $value) {
-                static::curlSetopt($curlHandle, $option, $value);
-            }
+        foreach ($options as $option => $value) {
+            static::curlSetopt($curlHandle, $option, $value);
         }
     }
+
+    /**
+     * Return a string containing the last error for the current session.
+     *
+     * @see https://php.net/manual/en/function.curl-error.php
+     */
+    public static function curlError(\CurlHandle $curlHandle): string
+    {
+        if (isset(self::$lastErrors[(int) $curlHandle])) {
+            return self::$lastErrors[(int) $curlHandle]->getMessage();
+        }
+
+        return '';
+    }
+
+    /**
+     * Return the last error number.
+     *
+     * @see https://php.net/manual/en/function.curl-errno.php
+     */
+    public static function curlErrno(\CurlHandle $curlHandle): int
+    {
+        if (isset(self::$lastErrors[(int) $curlHandle])) {
+            return self::$lastErrors[(int) $curlHandle]->getCode();
+        }
+
+        return 0;
+    }
 }
diff --git a/src/VCR/LibraryHooks/LibraryHook.php b/src/VCR/LibraryHooks/LibraryHook.php
index c98dec937..277f00e4b 100644
--- a/src/VCR/LibraryHooks/LibraryHook.php
+++ b/src/VCR/LibraryHooks/LibraryHook.php
@@ -1,44 +1,22 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\LibraryHooks;
 
-/**
- * Library hook interface.
- */
 interface LibraryHook
 {
-    /**
-     * @var string Enabled status for a hook.
-     */
-    const ENABLED = 'ENABLED';
+    public const ENABLED = 'ENABLED';
 
-    /**
-     * @var string Disabled status for a hook.
-     */
-    const DISABLED = 'DISABLED';
+    public const DISABLED = 'DISABLED';
 
     /**
      * Enables library hook which means that all of this library
      * http interactions are intercepted.
-     *
-     * @param \Closure Callback which will be called when a request is intercepted.
-     * @throws \VCR\VCRException When specified callback is not callable.
-     * @return void
      */
-    public function enable(\Closure $requestCallback);
+    public function enable(\Closure $requestCallback): void;
 
-    /**
-     * Disables library hook, so no http interactions of
-     * this library are intercepted anymore.
-     *
-     * @return void
-     */
-    public function disable();
+    public function disable(): void;
 
-    /**
-     * Returns true if library hook is enabled, false otherwise.
-     *
-     * @return boolean True if library hook is enabled, false otherwise.
-     */
-    public function isEnabled();
+    public function isEnabled(): bool;
 }
diff --git a/src/VCR/LibraryHooks/SoapHook.php b/src/VCR/LibraryHooks/SoapHook.php
index 18e402810..285d90765 100644
--- a/src/VCR/LibraryHooks/SoapHook.php
+++ b/src/VCR/LibraryHooks/SoapHook.php
@@ -1,48 +1,28 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\LibraryHooks;
 
-use VCR\Util\Assertion;
-use VCR\VCRException;
-use VCR\Request;
 use VCR\CodeTransform\AbstractCodeTransform;
+use VCR\Request;
+use VCR\Util\Assertion;
 use VCR\Util\StreamProcessor;
+use VCR\VCRException;
 
-/**
- * Library hook for curl functions.
- */
 class SoapHook implements LibraryHook
 {
-    /**
-     * @var callable
-     */
-    private static $requestCallback;
-
-    /**
-     * @var string
-     */
-    private $status = self::DISABLED;
-
-    /**
-     * @var AbstractCodeTransform
-     */
-    private $codeTransformer;
+    private static ?\Closure $requestCallback;
 
-    /**
-     * @var \VCR\Util\StreamProcessor
-     */
-    private $processor;
+    private string $status = self::DISABLED;
 
     /**
-     * Creates a SOAP hook instance.
-     *
-     * @param AbstractCodeTransform  $codeTransformer
-     * @param StreamProcessor $processor
-     *
-     * @throws \BadMethodCallException in case the Soap extension is not installed.
+     * @throws \BadMethodCallException in case the Soap extension is not installed
      */
-    public function __construct(AbstractCodeTransform $codeTransformer, StreamProcessor $processor)
-    {
+    public function __construct(
+        private AbstractCodeTransform $codeTransformer,
+        private StreamProcessor $processor
+    ) {
         if (!class_exists('\SoapClient')) {
             throw new \BadMethodCallException('For soap support you need to install the soap extension.');
         }
@@ -50,37 +30,26 @@ public function __construct(AbstractCodeTransform $codeTransformer, StreamProces
         if (!class_exists('\DOMDocument')) {
             throw new \BadMethodCallException('For soap support you need to install the xml extension.');
         }
-
-        $this->processor = $processor;
-        $this->codeTransformer = $codeTransformer;
     }
 
     /**
-     * @param string $request
-     * @param string $location
-     * @param string $action
-     * @param integer $version
-     * @param int $one_way
-     *
-     * @throws \VCR\VCRException It this method is called although VCR is disabled.
-     *
-     * @return string SOAP response.
+     * @param array<string,mixed> $options
      */
-    public function doRequest($request, $location, $action, $version, $one_way = 0, $options = array())
+    public function doRequest(string $request, string $location, string $action, int $version, bool $one_way = false, array $options = []): string
     {
-        if ($this->status === self::DISABLED) {
+        if (self::DISABLED === $this->status) {
             throw new VCRException('Hook must be enabled.', VCRException::LIBRARY_HOOK_DISABLED);
         }
 
         $vcrRequest = new Request('POST', $location);
 
-        if ($version === SOAP_1_1) {
-            $vcrRequest->setHeader('Content-Type', 'text/xml; charset=utf-8;');
+        if (\SOAP_1_1 === $version) {
+            $vcrRequest->setHeader('Content-Type', 'text/xml; charset=utf-8');
             $vcrRequest->setHeader('SOAPAction', $action);
         } else { // >= SOAP_1_2
             $vcrRequest->setHeader(
                 'Content-Type',
-                sprintf('application/soap+xml; charset=utf-8; action="%s"', $action)
+                \sprintf('application/soap+xml; charset=utf-8; action="%s"', $action)
             );
         }
 
@@ -92,20 +61,17 @@ public function doRequest($request, $location, $action, $version, $one_way = 0,
 
         /* @var \VCR\Response $response */
         $requestCallback = self::$requestCallback;
+        Assertion::isCallable($requestCallback);
         $response = $requestCallback($vcrRequest);
 
         return $response->getBody();
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function enable(\Closure $requestCallback)
+    public function enable(\Closure $requestCallback): void
     {
-        Assertion::isCallable($requestCallback, 'No valid callback for handling requests defined.');
         self::$requestCallback = $requestCallback;
 
-        if ($this->status == self::ENABLED) {
+        if (self::ENABLED == $this->status) {
             return;
         }
 
@@ -116,33 +82,18 @@ public function enable(\Closure $requestCallback)
         $this->status = self::ENABLED;
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function disable()
+    public function disable(): void
     {
-        if (!$this->isEnabled()) {
-            return;
-        }
-
         self::$requestCallback = null;
 
         $this->status = self::DISABLED;
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function isEnabled()
+    public function isEnabled(): bool
     {
-        return $this->status == self::ENABLED;
+        return self::ENABLED == $this->status;
     }
 
-    /**
-     * Cleanup.
-     *
-     * @return  void
-     */
     public function __destruct()
     {
         self::$requestCallback = null;
diff --git a/src/VCR/LibraryHooks/StreamWrapperHook.php b/src/VCR/LibraryHooks/StreamWrapperHook.php
index e6fb6d427..1377f08bf 100644
--- a/src/VCR/LibraryHooks/StreamWrapperHook.php
+++ b/src/VCR/LibraryHooks/StreamWrapperHook.php
@@ -1,63 +1,42 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\LibraryHooks;
 
-use VCR\Request;
 use VCR\Response;
 use VCR\Util\Assertion;
-use VCR\Util\HttpUtil;
+use VCR\Util\CurlException;
 use VCR\Util\StreamHelper;
 
-/**
- * Library hook for streamWrapper functions using stream_wrapper_register().
- */
 class StreamWrapperHook implements LibraryHook
 {
-    /**
-     * @var \Closure Callback which will be executed when a request is intercepted.
-     */
-    protected static $requestCallback;
+    protected static ?\Closure $requestCallback;
 
-    /**
-     * @var integer Position in the current response body.
-     */
-    protected $position;
+    protected int $position = 0;
 
-    /**
-     * @var string Current status of this hook, either enabled or disabled.
-     */
-    protected $status = self::DISABLED;
+    protected string $status = self::DISABLED;
 
-    /**
-     * @var Response
-     */
-    protected $response;
+    protected Response $response;
 
     /**
-     * @var resource Current stream context.
+     * @var resource current stream context
      */
     public $context;
 
-    /**
-     * @inheritDoc
-     */
-    public function enable(\Closure $requestCallback)
+    public function enable(\Closure $requestCallback): void
     {
-        Assertion::isCallable($requestCallback, 'No valid callback for handling requests defined.');
         self::$requestCallback = $requestCallback;
         stream_wrapper_unregister('http');
-        stream_wrapper_register('http', __CLASS__, STREAM_IS_URL);
+        stream_wrapper_register('http', __CLASS__, \STREAM_IS_URL);
 
         stream_wrapper_unregister('https');
-        stream_wrapper_register('https', __CLASS__, STREAM_IS_URL);
+        stream_wrapper_register('https', __CLASS__, \STREAM_IS_URL);
 
         $this->status = self::ENABLED;
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function disable()
+    public function disable(): void
     {
         self::$requestCallback = null;
         stream_wrapper_restore('http');
@@ -66,63 +45,62 @@ public function disable()
         $this->status = self::DISABLED;
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function isEnabled()
+    public function isEnabled(): bool
     {
-        return $this->status == self::ENABLED;
+        return self::ENABLED == $this->status;
     }
 
     /**
      * This method is called immediately after the wrapper is initialized (f.e. by fopen() and file_get_contents()).
      *
-     * @link http://www.php.net/manual/en/streamwrapper.stream-open.php
-     * @param  string $path        Specifies the URL that was passed to the original function.
-     * @param  string $mode        The mode used to open the file, as detailed for fopen().
-     * @param  int $options        Holds additional flags set by the streams API.
-     * @param  string $opened_path If the path is opened successfully, and STREAM_USE_PATH is set.
+     * @see http://www.php.net/manual/en/streamwrapper.stream-open.php
+     *
+     * @param string $path        specifies the URL that was passed to the original function
+     * @param string $mode        the mode used to open the file, as detailed for fopen()
+     * @param int    $options     holds additional flags set by the streams API
+     * @param string $opened_path if the path is opened successfully, and STREAM_USE_PATH is set
      *
-     * @return boolean Returns TRUE on success or FALSE on failure.
+     * @return bool returns TRUE on success or FALSE on failure
      */
-    public function stream_open($path, $mode, $options, &$opened_path)
+    public function stream_open(string $path, string $mode, int $options, ?string &$opened_path): bool
     {
         $request = StreamHelper::createRequestFromStreamContext($this->context, $path);
 
         $requestCallback = self::$requestCallback;
-        $this->response = $requestCallback($request);
+        Assertion::isCallable($requestCallback);
+        try {
+            $this->response = $requestCallback($request);
 
-        return true;
+            return true;
+        } catch (CurlException $e) {
+            return false;
+        }
     }
 
     /**
      * Read from stream.
      *
-     * @link http://www.php.net/manual/en/streamwrapper.stream-read.php
-     * @param  int $count How many bytes of data from the current position should be returned.
+     * @see http://www.php.net/manual/en/streamwrapper.stream-read.php
+     *
+     * @param int $count how many bytes of data from the current position should be returned
      *
      * @return string If there are less than count bytes available, return as many as are available.
      *                If no more data is available, return either FALSE or an empty string.
      */
-    public function stream_read($count)
+    public function stream_read(int $count): string
     {
-        $ret = substr($this->response->getBody(), $this->position, $count);
-        $this->position += strlen($ret);
+        $ret = substr($this->response->getBody(), $this->position ?? 0, $count);
+        $this->position += \strlen($ret);
 
         return $ret;
     }
 
     /**
-     * Write to stream.
+     * @throws \BadMethodCallException if called, because this method is not applicable for this stream
      *
-     * @throws \BadMethodCallException If called, because this method is not applicable for this stream.
-     * @link http://www.php.net/manual/en/streamwrapper.stream-write.php
-     *
-     * @param  string $data Should be stored into the underlying stream.
-     *
-     * @return int
+     * @see http://www.php.net/manual/en/streamwrapper.stream-write.php
      */
-    public function stream_write($data)
+    public function stream_write(string $data): int
     {
         throw new \BadMethodCallException('No writing possible');
     }
@@ -132,11 +110,9 @@ public function stream_write($data)
      *
      * This method is called in response to fseek() to determine the current position.
      *
-     * @link http://www.php.net/manual/en/streamwrapper.stream-tell.php
-     *
-     * @return integer Should return the current position of the stream.
+     * @see http://www.php.net/manual/en/streamwrapper.stream-tell.php
      */
-    public function stream_tell()
+    public function stream_tell(): int
     {
         return $this->position;
     }
@@ -144,71 +120,68 @@ public function stream_tell()
     /**
      * Tests for end-of-file on a file pointer.
      *
-     * @link http://www.php.net/manual/en/streamwrapper.stream-eof.php
-     *
-     * @return boolean Should return TRUE if the read/write position is at the end of the stream
-     *                 and if no more data is available to be read, or FALSE otherwise.
+     * @see http://www.php.net/manual/en/streamwrapper.stream-eof.php
      */
-    public function stream_eof()
+    public function stream_eof(): bool
     {
-        return $this->position >= strlen($this->response->getBody());
+        return $this->position >= \strlen($this->response->getBody());
     }
 
     /**
      * Retrieve information about a file resource.
      *
-     * @link http://www.php.net/manual/en/streamwrapper.stream-stat.php
+     * @see http://www.php.net/manual/en/streamwrapper.stream-stat.php
      *
-     * @return array See stat().
+     * @return array<int|string,int> see stat()
      */
-    public function stream_stat()
+    public function stream_stat(): array
     {
-        return array();
+        return [];
     }
 
     /**
-    * Retrieve information about a file resource.
-    *
-    * @link http://www.php.net/manual/en/streamwrapper.url-stat.php
-    *
-    * @return array See stat().
-    */
-
-    public function url_stat($path, $flags)
+     * Retrieve information about a file resource.
+     *
+     * @see http://www.php.net/manual/en/streamwrapper.url-stat.php
+     *
+     * @return array<int|string,int> see stat()
+     */
+    public function url_stat(string $path, int $flags): array
     {
-        return array();
+        return [];
     }
 
     /**
      * Seeks to specific location in a stream.
      *
-     * @param  integer $offset The stream offset to seek to.
-     * @param  integer $whence Possible values:
-     *                         SEEK_SET - Set position equal to offset bytes.
-     *                         SEEK_CUR - Set position to current location plus offset.
-     *                         SEEK_END - Set position to end-of-file plus offset.
-     * @return boolean Return TRUE if the position was updated, FALSE otherwise.
+     * @param int $offset the stream offset to seek to
+     * @param int $whence Possible values:
+     *                    SEEK_SET - Set position equal to offset bytes.
+     *                    SEEK_CUR - Set position to current location plus offset.
+     *                    SEEK_END - Set position to end-of-file plus offset.
+     *
+     * @return bool return TRUE if the position was updated, FALSE otherwise
      */
-    public function stream_seek($offset, $whence)
+    public function stream_seek(int $offset, int $whence): bool
     {
         switch ($whence) {
-            case SEEK_SET:
-                if ($offset < strlen($this->response->getBody()) && $offset >= 0) {
+            case \SEEK_SET:
+                if ($offset < \strlen($this->response->getBody()) && $offset >= 0) {
                     $this->position = $offset;
 
                     return true;
                 }
                 break;
-            case SEEK_CUR:
+            case \SEEK_CUR:
                 if ($offset >= 0) {
                     $this->position += $offset;
 
                     return true;
                 }
                 break;
-            case SEEK_END:
-                if (strlen($this->response->getBody()) + $offset >= 0) {
-                    $this->position = strlen($this->response->getBody()) + $offset;
+            case \SEEK_END:
+                if (\strlen($this->response->getBody()) + $offset >= 0) {
+                    $this->position = \strlen($this->response->getBody()) + $offset;
 
                     return true;
                 }
@@ -218,16 +191,11 @@ public function stream_seek($offset, $whence)
     }
 
     /**
-     * Change stream options.
-     *
-     * @link http://www.php.net/manual/en/streamwrapper.stream-metadata.php
-     * @param  string  $path   The file path or URL to set metadata.
-     * @param  integer $option One of the stream options.
-     * @param  mixed   $var    Value depending on the option.
+     * @see http://www.php.net/manual/en/streamwrapper.stream-metadata.php
      *
-     * @return boolean Returns TRUE on success or FALSE on failure.
+     * @param mixed $var value depending on the option
      */
-    public function stream_metadata($path, $option, $var)
+    public function stream_metadata(string $path, int $option, $var): bool
     {
         return false;
     }
diff --git a/src/VCR/Request.php b/src/VCR/Request.php
index 5aa02655a..15396f17e 100644
--- a/src/VCR/Request.php
+++ b/src/VCR/Request.php
@@ -1,73 +1,60 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR;
 
+use Assert\Assertion;
+use VCR\Exceptions\InvalidHostException;
+
 /**
  * Encapsulates a HTTP request.
  */
 class Request
 {
+    protected ?string $body = null;
+
     /**
-     * @var string
-     */
-    protected $method;
-    /**
-     * @var string
-     */
-    protected $url;
-    /**
-     * @var array
-     */
-    protected $headers = array();
-    /**
-     * @var string
-     */
-    protected $body;
-    /**
-     * @var array
+     * @var array<int,array<string,string>>
      */
-    protected $postFiles = array();
+    protected array $postFiles = [];
+
     /**
-     * @var array
+     * @var array<string,mixed>
      */
-    protected $postFields = array();
+    protected array $postFields = [];
+
     /**
-     * @var array
+     * @var array<int,mixed>
      */
-    protected $curlOptions = array();
+    protected array $curlOptions = [];
 
     /**
-     * @param string $method
-     * @param string $url
-     * @param array $headers
+     * @param array<string,string|null> $headers
      */
-    public function __construct($method, $url, array $headers = array())
-    {
+    public function __construct(
+        protected string $method,
+        protected ?string $url,
+        protected array $headers = []
+    ) {
         $this->method = $method;
         $this->headers = $headers;
         $this->setUrl($url);
     }
 
     /**
-     * Returns true if specified request matches the current one
-     * with specified request matcher callbacks.
-     *
-     * @param  Request $request Request to check if it matches the current one.
-     * @param  \callable[] $requestMatchers Request matcher callbacks.
+     * @param callable[] $requestMatchers request matcher callbacks
      *
-     * @throws \BadFunctionCallException If one of the specified request matchers is not callable.
-     * @return boolean True if specified request matches the current one.
+     * @throws \BadFunctionCallException if one of the specified request matchers is not callable
      */
-    public function matches(Request $request, array $requestMatchers)
+    public function matches(self $request, array $requestMatchers): bool
     {
         foreach ($requestMatchers as $matcher) {
-            if (!is_callable($matcher)) {
-                throw new \BadFunctionCallException(
-                    'Matcher could not be executed. ' . print_r($matcher, true)
-                );
+            if (!\is_callable($matcher)) {
+                throw new \BadFunctionCallException('Matcher could not be executed. '.print_r($matcher, true));
             }
 
-            if (call_user_func_array($matcher, array($this, $request)) === false) {
+            if (false === \call_user_func_array($matcher, [$this, $request])) {
                 return false;
             }
         }
@@ -76,180 +63,161 @@ public function matches(Request $request, array $requestMatchers)
     }
 
     /**
-     * Returns an array representation of this request.
-     *
-     * @return array Array representation of this request.
+     * @return array<string,mixed>
      */
-    public function toArray()
+    public function toArray(): array
     {
-        return array_filter(
-            array(
-                'method' => $this->getMethod(),
-                'url' => $this->getUrl(),
-                'headers' => $this->getHeaders(),
-                'body' => $this->getBody(),
-                'post_files' => $this->getPostFiles(),
-                'post_fields' => $this->getPostFields(),
-            )
-        );
+        return array_filter([
+            'method' => $this->getMethod(),
+            'url' => $this->getUrl(),
+            'headers' => $this->getHeaders(),
+            'body' => $this->getBody(),
+            'post_files' => $this->getPostFiles(),
+            'post_fields' => $this->getPostFields(),
+        ]);
     }
 
     /**
-     * Creates a new Request from a specified array.
-     *
-     * @param  array $request Request represented as an array.
-     *
-     * @return Request A new Request from specified array.
+     * @param array<string,mixed> $request Request represented as an array. Allowed keys: "method", "url", "headers",
+     *                                     "post_fields", "post_files", "body"
      */
-    public static function fromArray(array $request)
+    public static function fromArray(array $request): self
     {
-        $requestObject = new Request(
+        $requestObject = new self(
             $request['method'],
             $request['url'],
-            isset($request['headers']) ? $request['headers'] : array()
+            $request['headers'] ?? []
         );
 
-        if (!empty($request['post_fields']) && is_array($request['post_fields'])) {
+        if (!empty($request['post_fields']) && \is_array($request['post_fields'])) {
             $requestObject->setPostFields($request['post_fields']);
         }
 
-        if (!empty($request['post_files']) && is_array($request['post_files'])) {
+        if (!empty($request['post_files']) && \is_array($request['post_files'])) {
             foreach ($request['post_files'] as $file) {
                 $requestObject->addPostFile($file);
             }
         }
 
         if (!empty($request['body'])) {
-            $requestObject->setBody((string)$request['body']);
+            $requestObject->setBody((string) $request['body']);
         }
 
         return $requestObject;
     }
 
-    /**
-     * @param string $url
-     */
-    public function setUrl($url)
+    public function setUrl(?string $url): void
     {
         $this->url = $url;
-        if ($this->hasHeader('Host') === false || $this->getHeader('Host') === null) {
+        if (null !== $url && false === $this->hasHeader('Host')) {
             $this->setHeader('Host', $this->getHost());
         }
     }
 
-    /**
-     * @return string
-     */
-    public function getBody()
+    public function getBody(): ?string
     {
         return $this->body;
     }
 
-    /**
-     * @return string
-     */
-    public function getMethod()
+    public function getMethod(): string
     {
-        if ($this->getCurlOption(CURLOPT_CUSTOMREQUEST) !== null) {
-            return $this->getCurlOption(CURLOPT_CUSTOMREQUEST);
+        if (null !== $this->getCurlOption(\CURLOPT_CUSTOMREQUEST)) {
+            return $this->getCurlOption(\CURLOPT_CUSTOMREQUEST);
         }
 
         return $this->method;
     }
 
     /**
-     * @return array
+     * @return array<string,string|null>
      */
-    public function getHeaders()
+    public function getHeaders(): array
     {
         return $this->headers;
     }
 
-    /**
-     * @param $key
-     * @return mixed
-     */
-    public function getHeader($key)
+    public function getHeader(string $key): ?string
     {
+        if (!isset($this->headers[$key])) {
+            return null;
+        }
+
         return $this->headers[$key];
     }
 
-    /**
-     * @param $key
-     * @return boolean
-     */
-    public function hasHeader($key)
+    public function hasHeader(string $key): bool
     {
-        return array_key_exists($key, $this->headers);
+        return \array_key_exists($key, $this->headers);
     }
 
     /**
-     * @return array
+     * @return array<string,mixed>
      */
-    public function getPostFields()
+    public function getPostFields(): array
     {
         return $this->postFields;
     }
 
     /**
-     * @return array
+     * @return array<int,array<string,string>>
      */
-    public function getPostFiles()
+    public function getPostFiles(): array
     {
         return $this->postFiles;
     }
 
-    /**
-     * @return string
-     */
-    public function getUrl()
+    public function getUrl(): ?string
     {
         return $this->url;
     }
 
-    /**
-     * @return mixed
-     */
-    public function getHost()
+    public function getHost(): string
     {
-        $host = parse_url($this->getUrl(), PHP_URL_HOST);
+        $url = $this->getUrl();
+        Assertion::string($url);
+
+        $host = parse_url($url, \PHP_URL_HOST);
 
-        if ($port = parse_url($this->getUrl(), PHP_URL_PORT)) {
-            $host .= ':' . $port;
+        if (null === $host || false === $host) {
+            throw InvalidHostException::create($this->getUrl());
+        }
+
+        if ($port = parse_url($url, \PHP_URL_PORT)) {
+            $host .= ':'.$port;
         }
 
         return $host;
     }
 
-    /**
-     * @return mixed
-     */
-    public function getPath()
+    public function getPath(): ?string
     {
-        return parse_url($this->getUrl(), PHP_URL_PATH);
+        $url = $this->getUrl();
+        Assertion::string($url);
+        $path = parse_url($url, \PHP_URL_PATH);
+        Assertion::notSame($path, false);
+
+        return $path;
     }
 
-    /**
-     * @return mixed
-     */
-    public function getQuery()
+    public function getQuery(): ?string
     {
-        return parse_url($this->getUrl(), PHP_URL_QUERY);
+        $url = $this->getUrl();
+        Assertion::string($url);
+        $query = parse_url($url, \PHP_URL_QUERY);
+        Assertion::notSame($query, false);
+
+        return $query;
     }
 
     /**
-     * @return array
+     * @return array<int,mixed>
      */
-    public function getCurlOptions()
+    public function getCurlOptions(): array
     {
         return $this->curlOptions;
     }
 
-    /**
-     * @param $key
-     * @return mixed
-     */
-    public function getCurlOption($key)
+    public function getCurlOption(int $key): mixed
     {
         if (empty($this->curlOptions[$key])) {
             return null;
@@ -258,96 +226,80 @@ public function getCurlOption($key)
         return $this->curlOptions[$key];
     }
 
-    /**
-     * Sets the request method.
-     *
-     * @param string $method HTTP request method like GET, POST, PUT, ...
-     */
-    public function setMethod($method)
+    public function setMethod(string $method): void
     {
         $this->method = strtoupper($method);
     }
 
     /**
-     * @param array $post_fields
+     * @param array<string,mixed> $post_fields
      */
-    public function setPostFields(array $post_fields)
+    public function setPostFields(array $post_fields): void
     {
         $this->postFields = $post_fields;
     }
 
     /**
-     * @param array $post_files
+     * @param array<int,array<string,string>> $post_files
      */
-    public function setPostFiles(array $post_files)
+    public function setPostFiles(array $post_files): void
     {
         $this->postFiles = $post_files;
     }
 
-    /**
-     * @param string $body
-     */
-    public function setBody($body)
+    public function setBody(?string $body): void
     {
         $this->body = $body;
     }
 
-    /**
-     * Sets the authorization credentials as header.
-     *
-     * @param string $username Username.
-     * @param string $password Password.
-     */
-    public function setAuthorization($username, $password)
+    public function setAuthorization(string $username, string $password): void
     {
-        $this->setHeader('Authorization', 'Basic ' . base64_encode($username . ':' . $password));
+        $this->setHeader('Authorization', 'Basic '.base64_encode($username.':'.$password));
     }
 
     /**
-     * @param array $curlOptions
+     * @param array<int,mixed> $curlOptions
      */
-    public function setCurlOptions(array $curlOptions)
+    public function setCurlOptions(array $curlOptions): void
     {
         $this->curlOptions = $curlOptions;
     }
 
-    /**
-     * @param $key
-     * @param $value
-     */
-    public function setHeader($key, $value)
+    public function setHeader(string $key, string $value): void
     {
         $this->headers[$key] = $value;
     }
 
-    /**
-     * @param $key
-     */
-    public function removeHeader($key)
+    public function removeHeader(string $key): void
     {
         unset($this->headers[$key]);
     }
 
-    /**
-     * @param $key
-     * @param $value
-     */
-    public function setPostField($key, $value)
+    public function setPostField(string $key, mixed $value): void
     {
         $this->postFields[$key] = $value;
     }
 
-    /**
-     * @param $key
-     * @param $value
-     */
-    public function setCurlOption($key, $value)
+    public function setCurlOption(int $key, mixed $value): void
     {
         $this->curlOptions[$key] = $value;
     }
 
-    public function addPostFile(array $file)
+    /**
+     * @param array<string,string> $file An array with the keys "fieldName", "contentType", "filename" and "postname"
+     */
+    public function addPostFile(array $file): void
     {
         $this->postFiles[] = $file;
     }
+
+    /**
+     * Generate a string representation of the request.
+     *
+     * @return string
+     */
+    public function getHash()
+    {
+        return md5(serialize($this->toArray()));
+    }
 }
diff --git a/src/VCR/RequestMatcher.php b/src/VCR/RequestMatcher.php
index a89e950cf..05d85a299 100644
--- a/src/VCR/RequestMatcher.php
+++ b/src/VCR/RequestMatcher.php
@@ -1,102 +1,67 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR;
 
-/**
- * Collection of matcher methods to match two requests.
- */
 class RequestMatcher
 {
-    /**
-     * Returns true if the method of both specified requests match.
-     *
-     * @param  Request $first  First request to match.
-     * @param  Request $second Second request to match.
-     *
-     * @return boolean True if the method of both specified requests match.
-     */
-    public static function matchMethod(Request $first, Request $second)
+    public static function matchMethod(Request $storedRequest, Request $request): bool
     {
-        return $first->getMethod() == $second->getMethod();
+        return $storedRequest->getMethod() == $request->getMethod();
     }
 
-    /**
-     * Returns true if the url of both specified requests match.
-     *
-     * @param  Request $first  First request to match.
-     * @param  Request $second Second request to match.
-     *
-     * @return boolean True if the url of both specified requests match.
-     */
-    public static function matchUrl(Request $first, Request $second)
+    public static function matchUrl(Request $storedRequest, Request $request): bool
     {
-        return $first->getPath() === $second->getPath();
+        return $storedRequest->getPath() === $request->getPath();
     }
 
-    /**
-     * Returns true if the host of both specified requests match.
-     *
-     * @param  Request $first  First request to match.
-     * @param  Request $second Second request to match.
-     *
-     * @return boolean True if the host of both specified requests match.
-     */
-    public static function matchHost(Request $first, Request $second)
+    public static function matchHost(Request $storedRequest, Request $request): bool
     {
-        return $first->getHost() === $second->getHost();
+        return $storedRequest->getHost() === $request->getHost();
     }
 
-    /**
-     * Returns true if the headers of both specified requests match.
-     *
-     * @param  Request $first  First request to match.
-     * @param  Request $second Second request to match.
-     *
-     * @return boolean True if the headers of both specified requests match.
-     */
-    public static function matchHeaders(Request $first, Request $second)
+    public static function matchHeaders(Request $storedRequest, Request $request): bool
     {
         // Use array_filter to ignore headers which are null.
 
-        return array_filter($first->getHeaders()) === array_filter($second->getHeaders());
+        return array_filter($storedRequest->getHeaders()) === array_filter($request->getHeaders());
+    }
+
+    public static function matchBody(Request $storedRequest, Request $request): bool
+    {
+        return $storedRequest->getBody() === $request->getBody();
     }
 
-    /**
-     * Returns true if the body of both specified requests match.
-     *
-     * @param  Request $first  First request to match.
-     * @param  Request $second Second request to match.
-     *
-     * @return boolean True if the body of both specified requests match.
-     */
-    public static function matchBody(Request $first, Request $second)
+    public static function matchPostFields(Request $storedRequest, Request $request): bool
     {
-        return $first->getBody() === $second->getBody();
+        return $storedRequest->getPostFields() === $request->getPostFields();
     }
 
-    /**
-     * Returns true if the post fields of both specified requests match.
-     *
-     * @param  Request $first  First request to match.
-     * @param  Request $second Second request to match.
-     *
-     * @return boolean True if the post fields of both specified requests match.
-     */
-    public static function matchPostFields(Request $first, Request $second)
+    public static function matchQueryString(Request $storedRequest, Request $request): bool
     {
-        return $first->getPostFields() === $second->getPostFields();
+        return $storedRequest->getQuery() === $request->getQuery();
     }
 
-    /**
-     * Returns true if the query string of both specified requests match.
-     *
-     * @param  Request $first  First request to match.
-     * @param  Request $second Second request to match.
-     *
-     * @return boolean True if the query string of both specified requests match.
-     */
-    public static function matchQueryString(Request $first, Request $second)
+    public static function matchSoapOperation(Request $storedRequest, Request $request): bool
     {
-        return $first->getQuery() === $second->getQuery();
+        if (null === $request->getBody() || null === $storedRequest->getBody()) {
+            return true;
+        }
+
+        $soapOperationRequest = preg_match('/<SOAP-ENV:Body><(.*?)>/m', $request->getBody(), $matches);
+        if (empty($matches)) {
+            // The request is not a SOAP request
+            return true;
+        }
+        $operationRequest = $matches[1];
+        $soapOperationStoredRequest = preg_match('/<SOAP-ENV:Body><(.*?)>/m', $storedRequest->getBody(), $matches);
+        if (empty($matches)) {
+            // The stored request is not a SOAP request
+            return false;
+        }
+        $operationStoredRequest = $matches[1];
+
+        return $operationRequest === $operationStoredRequest;
     }
 }
diff --git a/src/VCR/Response.php b/src/VCR/Response.php
index cd110fe9b..6ff45d806 100644
--- a/src/VCR/Response.php
+++ b/src/VCR/Response.php
@@ -9,36 +9,28 @@
  */
 class Response
 {
-    /**
-     * @var array
-     */
-    protected $status = array(
-        'code' => null,
-        'message' => ''
-    );
+    protected int $statusCode;
+
+    protected string $statusMessage = '';
 
     /**
-     * @var array
-     */
-    protected $headers = array();
-    /**
-     * @var string
+     * @var array<string,string>
      */
-    protected $body;
+    protected array $headers = [];
+    protected ?string $body;
     /**
-     * @var array
+     * @var array<string,mixed>
      */
-    protected $curlInfo = array();
+    protected array $curlInfo = [];
 
-    protected $httpVersion;
+    protected mixed $httpVersion = null;
 
     /**
-     * @param string|array $status
-     * @param array $headers
-     * @param string $body
-     * @param array $curlInfo
+     * @param string|array<string, string> $status
+     * @param array<string,string>         $headers
+     * @param array<string,mixed>          $curlInfo
      */
-    public function __construct($status, array $headers = array(), $body = null, array $curlInfo = array())
+    final public function __construct($status, array $headers = [], ?string $body = null, array $curlInfo = [])
     {
         $this->setStatus($status);
         $this->headers = $headers;
@@ -49,42 +41,51 @@ public function __construct($status, array $headers = array(), $body = null, arr
     /**
      * Returns an array representation of this Response.
      *
-     * @return array Array representation of this Request.
+     * @return array<string,mixed> array representation of this Request
      */
-    public function toArray()
+    public function toArray(): array
     {
         $body = $this->getBody();
         // Base64 encode when binary
-        if (strpos($this->getContentType(), 'application/x-gzip') !== false
-            || $this->getHeader('Content-Transfer-Encoding') == 'binary'
+        if (
+            null !== $this->getContentType()
+            && (
+                str_contains($this->getContentType(), 'application/x-gzip')
+                || 'binary' == $this->getHeader('Content-Transfer-Encoding')
+            )
         ) {
             $body = base64_encode($body);
         }
 
         return array_filter(
-            array(
-                'status'    => $this->status,
-                'headers'   => $this->getHeaders(),
-                'body'      => $body
-            )
+            [
+                'status' => [
+                    'code' => $this->statusCode,
+                    'message' => $this->statusMessage,
+                ],
+                'headers' => $this->getHeaders(),
+                'body' => $body,
+                'curl_info' => $this->curlInfo,
+            ]
         );
     }
 
     /**
      * Creates a new Response from a specified array.
      *
-     * @param  array  $response Array representation of a Response.
+     * @param array<string,mixed> $response array representation of a Response
+     *
      * @return Response A new Response from a specified array
      */
-    public static function fromArray(array $response)
+    public static function fromArray(array $response): self
     {
-        $body = isset($response['body']) ? $response['body'] : null;
+        $body = $response['body'] ?? null;
 
         $gzip = isset($response['headers']['Content-Type'])
-            && strpos($response['headers']['Content-Type'], 'application/x-gzip') !== false;
+            && str_contains($response['headers']['Content-Type'], 'application/x-gzip');
 
         $binary = isset($response['headers']['Content-Transfer-Encoding'])
-            && $response['headers']['Content-Transfer-Encoding'] == 'binary';
+            && 'binary' == $response['headers']['Content-Transfer-Encoding'];
 
         // Base64 decode when binary
         if ($gzip || $binary) {
@@ -92,29 +93,26 @@ public static function fromArray(array $response)
         }
 
         return new static(
-            isset($response['status']) ? $response['status'] : 200,
-            isset($response['headers']) ? $response['headers'] : array(),
-            $body
+            $response['status'] ?? 200,
+            $response['headers'] ?? [],
+            $body,
+            $response['curl_info'] ?? []
         );
     }
 
-    /**
-     * @return string
-     */
-    public function getBody()
+    public function getBody(): string
     {
-        return $this->body;
+        return $this->body ?: '';
     }
 
     /**
-     * @return array
+     * @return array<string,mixed>|mixed|null
      */
-    public function getCurlInfo($option = null)
+    public function getCurlInfo(?string $option = null): mixed
     {
         if (empty($option)) {
             return $this->curlInfo;
         }
-
         if (!isset($this->curlInfo[$option])) {
             return null;
         }
@@ -123,27 +121,24 @@ public function getCurlInfo($option = null)
     }
 
     /**
-     * @return array
+     * @return array<string,string>
      */
-    public function getHeaders()
+    public function getHeaders(): array
     {
         return $this->headers;
     }
 
-    /**
-     * @return string
-     */
-    public function getStatusCode()
+    public function getStatusCode(): int
     {
-        return $this->status['code'];
+        return $this->statusCode;
     }
 
-    public function getContentType()
+    public function getContentType(): ?string
     {
         return $this->getHeader('Content-Type');
     }
 
-    public function getHeader($key)
+    public function getHeader(string $key): ?string
     {
         if (!isset($this->headers[$key])) {
             return null;
@@ -152,35 +147,30 @@ public function getHeader($key)
         return $this->headers[$key];
     }
 
-    /**
-     * @return mixed
-     */
-    public function getHttpVersion()
+    public function getHttpVersion(): mixed
     {
         return $this->httpVersion;
     }
 
-    /**
-     * @return string
-     */
-    public function getStatusMessage()
+    public function getStatusMessage(): string
     {
-        return $this->status['message'];
+        return $this->statusMessage;
     }
 
     /**
-     * @param string|array $status
+     * @param string|array<string,mixed> $status
      */
-    protected function setStatus($status)
+    protected function setStatus($status): void
     {
-        if (is_array($status)) {
-            $this->status = $status;
+        if (\is_array($status)) {
+            $this->statusCode = (int) $status['code'];
+            $this->statusMessage = $status['message'];
             if (!empty($status['http_version'])) {
                 $this->httpVersion = $status['http_version'];
             }
         } else {
             Assertion::numeric($status, 'Response status must be either an array or a number.');
-            $this->status['code'] = $status;
+            $this->statusCode = (int) $status;
         }
     }
 }
diff --git a/src/VCR/Storage/AbstractStorage.php b/src/VCR/Storage/AbstractStorage.php
index b4cacbaea..6ba79170d 100644
--- a/src/VCR/Storage/AbstractStorage.php
+++ b/src/VCR/Storage/AbstractStorage.php
@@ -1,9 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\Storage;
 
 use VCR\Util\Assertion;
-use VCR\VCRException;
 
 /**
  * Abstract base for reading and storing records.
@@ -14,58 +15,37 @@
 abstract class AbstractStorage implements Storage
 {
     /**
-     * @var resource File handle.
+     * @var resource
      */
     protected $handle;
 
-    /**
-     * @var string Path to storage file.
-     */
-    protected $filePath;
+    protected string $filePath;
 
     /**
-     * @var array Current parsed record.
+     * @var array<string,mixed>|null current parsed record
      */
-    protected $current;
+    protected ?array $current = null;
 
-    /**
-     * @var integer Number of the current recording.
-     */
-    protected $position = 0;
+    protected int $position = 0;
 
-    /**
-     * @var boolean True when parser is at the end of the file.
-     */
-    protected $isEOF = false;
+    protected bool $isEOF = false;
 
-    /**
-     * @var boolean If the cassette file is new.
-     */
-    protected $isNew = false;
+    protected bool $isNew = false;
 
-    /**
-     * @var boolean If the current position is valid.
-     */
-    protected $isValidPosition = true;
+    protected bool $isValidPosition = true;
 
     /**
-     * Creates a new file store.
-     *
      * If the cassetteName contains PATH_SEPARATORs, subfolders of the
      * cassettePath are autocreated when not existing.
-     *
-     * @param string  $cassettePath   Path to the cassette directory.
-     * @param string  $cassetteName   Path to the cassette file, relative to the path.
-     * @param string  $defaultContent Default data for this cassette if its not existing
      */
-    public function __construct($cassettePath, $cassetteName, $defaultContent = '[]')
+    public function __construct(string $cassettePath, string $cassetteName, string $defaultContent = '[]')
     {
         Assertion::directory($cassettePath, "Cassette path '{$cassettePath}' is not existing or not a directory");
 
-        $this->filePath = rtrim($cassettePath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $cassetteName;
+        $this->filePath = rtrim($cassettePath, \DIRECTORY_SEPARATOR).\DIRECTORY_SEPARATOR.$cassetteName;
 
-        if (!is_dir(dirname($this->filePath))) {
-            mkdir(dirname($this->filePath), 0777, true);
+        if (!is_dir(\dirname($this->filePath))) {
+            mkdir(\dirname($this->filePath), 0777, true);
         }
 
         if (!file_exists($this->filePath) || 0 === filesize($this->filePath)) {
@@ -76,45 +56,36 @@ public function __construct($cassettePath, $cassetteName, $defaultContent = '[]'
         Assertion::file($this->filePath, "Specified path '{$this->filePath}' is not a file.");
         Assertion::readable($this->filePath, "Specified file '{$this->filePath}' must be readable.");
 
-        $this->handle = fopen($this->filePath, 'r+');
+        $handle = fopen($this->filePath, 'r+');
+
+        Assertion::isResource($handle);
+
+        $this->handle = $handle;
     }
 
     /**
      * Returns the current record.
      *
-     * @return array Parsed current record.
+     * @return array<string,mixed>|null parsed current record
      */
-    public function current()
+    public function current(): ?array
     {
         return $this->current;
     }
 
-    /**
-     * Returns the current key.
-     *
-     * @return integer
-     */
-    public function key()
+    public function key(): int
     {
         return $this->position;
     }
 
-    /**
-     * Returns true if the file did not exist and had to be created.
-     *
-     * @return boolean TRUE if created, FALSE if not
-     */
-    public function isNew()
+    public function isNew(): bool
     {
         return $this->isNew;
     }
 
-    /**
-     * Closes file handle.
-     */
     public function __destruct()
     {
-        if (is_resource($this->handle)) {
+        if (\is_resource($this->handle)) {
             fclose($this->handle);
         }
     }
diff --git a/src/VCR/Storage/Blackhole.php b/src/VCR/Storage/Blackhole.php
index e50012751..3812ccf4d 100644
--- a/src/VCR/Storage/Blackhole.php
+++ b/src/VCR/Storage/Blackhole.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\Storage;
 
 /**
@@ -7,40 +9,35 @@
  */
 class Blackhole implements Storage
 {
-    /**
-     * {@inheritDoc}
-     */
-    public function storeRecording(array $recording)
+    public function storeRecording(array $recording): void
     {
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    public function isNew()
+    public function isNew(): bool
     {
         return true;
     }
 
-    public function current()
+    /** @return array<string, mixed> */
+    public function current(): ?array
     {
         throw new \BadMethodCallException('Not implemented');
     }
 
-    public function key()
+    public function key(): int
     {
         throw new \BadMethodCallException('Not implemented');
     }
 
-    public function next()
+    public function next(): void
     {
     }
 
-    public function rewind()
+    public function rewind(): void
     {
     }
 
-    public function valid()
+    public function valid(): bool
     {
         return false;
     }
diff --git a/src/VCR/Storage/Json.php b/src/VCR/Storage/Json.php
index af7b371ab..34fc822d2 100644
--- a/src/VCR/Storage/Json.php
+++ b/src/VCR/Storage/Json.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace VCR\Storage;
+declare(strict_types=1);
 
-use VCR\Util\Assertion;
+namespace VCR\Storage;
 
 /**
  * Json based storage for records.
@@ -12,30 +12,22 @@
  */
 class Json extends AbstractStorage
 {
-    /**
-     * @inheritDoc
-     */
-    public function storeRecording(array $recording)
+    public function storeRecording(array $recording): void
     {
-        fseek($this->handle, -1, SEEK_END);
+        fseek($this->handle, -1, \SEEK_END);
         if (ftell($this->handle) > 2) {
             fwrite($this->handle, ',');
         }
-        if (defined('JSON_PRETTY_PRINT')) {
-            $json = json_encode($recording, JSON_PRETTY_PRINT);
+        if (\defined('JSON_PRETTY_PRINT')) {
+            $json = json_encode($recording, \JSON_PRETTY_PRINT);
         } else {
             $json = json_encode($recording);
         }
-        fwrite($this->handle, $json . ']');
+        fwrite($this->handle, $json.']');
         fflush($this->handle);
     }
 
-    /**
-     * Parses the next record.
-     *
-     * @return void
-     */
-    public function next()
+    public function next(): void
     {
         $this->current = json_decode($this->readNextRecord(), true);
         ++$this->position;
@@ -43,24 +35,22 @@ public function next()
 
     /**
      * Returns the next record in raw format.
-     *
-     * @return string Next record in raw format.
      */
-    protected function readNextRecord()
+    protected function readNextRecord(): string
     {
         $depth = 0;
         $isInRecord = false;
         $record = '';
 
         while (false !== ($char = fgetc($this->handle))) {
-            if ($char === '{') {
+            if ('{' === $char) {
                 ++$depth;
             }
-            if ($char === '}') {
+            if ('}' === $char) {
                 --$depth;
             }
 
-            if (!$isInRecord && $char === '{') {
+            if (!$isInRecord && '{' === $char) {
                 $isInRecord = true;
             }
 
@@ -68,38 +58,28 @@ protected function readNextRecord()
                 $record .= $char;
             }
 
-            if ($isInRecord && $char === '}' && $depth == 0) {
+            if ($isInRecord && '}' === $char && 0 == $depth) {
                 break;
             }
         }
 
-        if ($char == false) {
+        if (false == $char) {
             $this->isEOF = true;
         }
 
         return $record;
     }
 
-    /**
-     * Resets the storage to the beginning.
-     *
-     * @return void
-     */
-    public function rewind()
+    public function rewind(): void
     {
         rewind($this->handle);
         $this->isEOF = false;
         $this->position = 0;
     }
 
-    /**
-     * Returns true if the current record is valid.
-     *
-     * @return boolean True if the current record is valid.
-     */
-    public function valid()
+    public function valid(): bool
     {
-        if (is_null($this->current)) {
+        if (null === $this->current) {
             $this->next();
         }
 
diff --git a/src/VCR/Storage/Storage.php b/src/VCR/Storage/Storage.php
index f9699b68b..c8156ba98 100644
--- a/src/VCR/Storage/Storage.php
+++ b/src/VCR/Storage/Storage.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\Storage;
 
 /**
@@ -7,21 +9,15 @@
  *
  * A Storage can be iterated using standard loops.
  * New recordings can be stored.
+ *
+ * @phpstan-extends \Iterator<int, array>
  */
 interface Storage extends \Iterator
 {
     /**
-     * Stores an array of data.
-     *
-     * @param array $recording Array to store in storage.
-     * @return void
+     * @param array<string,int|string|array<string,mixed>|null> $recording
      */
-    public function storeRecording(array $recording);
+    public function storeRecording(array $recording): void;
 
-    /**
-     * Returns true if the file did not exist and had to be created.
-     *
-     * @return boolean TRUE if created, FALSE if not
-     */
-    public function isNew();
+    public function isNew(): bool;
 }
diff --git a/src/VCR/Storage/Yaml.php b/src/VCR/Storage/Yaml.php
index 50ff7640e..b1a826f81 100644
--- a/src/VCR/Storage/Yaml.php
+++ b/src/VCR/Storage/Yaml.php
@@ -1,10 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\Storage;
 
-use Symfony\Component\Yaml\Parser;
 use Symfony\Component\Yaml\Dumper;
-use VCR\Util\Assertion;
+use Symfony\Component\Yaml\Parser;
 
 /**
  * Yaml based storage for records.
@@ -14,25 +15,11 @@
  */
 class Yaml extends AbstractStorage
 {
-    /**
-     * @var Parser Yaml parser.
-     */
-    protected $yamlParser;
+    protected Parser $yamlParser;
 
-    /**
-     * @var  Dumper Yaml writer.
-     */
-    protected $yamlDumper;
+    protected Dumper $yamlDumper;
 
-    /**
-     * Creates a new YAML based file store.
-     *
-     * @param string $cassettePath Path to the cassette directory.
-     * @param string $cassetteName Path to a file, will be created if not existing.
-     * @param Parser $parser Parser used to decode yaml.
-     * @param Dumper $dumper Dumper used to encode yaml.
-     */
-    public function __construct($cassettePath, $cassetteName, Parser $parser = null, Dumper $dumper = null)
+    public function __construct(string $cassettePath, string $cassetteName, ?Parser $parser = null, ?Dumper $dumper = null)
     {
         parent::__construct($cassettePath, $cassetteName, '');
 
@@ -40,36 +27,24 @@ public function __construct($cassettePath, $cassetteName, Parser $parser = null,
         $this->yamlDumper = $dumper ?: new Dumper();
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function storeRecording(array $recording)
+    public function storeRecording(array $recording): void
     {
-        fseek($this->handle, -1, SEEK_END);
-        fwrite($this->handle, "\n" . $this->yamlDumper->dump(array($recording), 4));
+        fseek($this->handle, -1, \SEEK_END);
+        fwrite($this->handle, "\n".$this->yamlDumper->dump([$recording], 4));
         fflush($this->handle);
     }
 
-    /**
-     * Parses the next record.
-     *
-     * @return void
-     */
-    public function next()
+    public function next(): void
     {
         $recording = $this->yamlParser->parse($this->readNextRecord());
-        if (!is_null($recording)) {
-            $this->current = $recording[0];
-            ++$this->position;
-        }
+        $this->current = $recording[0] ?? null;
+        ++$this->position;
     }
 
     /**
      * Returns the next record in raw format.
-     *
-     * @return string Next record in raw format.
      */
-    private function readNextRecord()
+    private function readNextRecord(): string
     {
         if ($this->isEOF) {
             $this->isValidPosition = false;
@@ -79,10 +54,10 @@ private function readNextRecord()
         $recording = '';
 
         while (false !== ($line = fgets($this->handle))) {
-            $isNewArrayStart = strpos($line, '-') === 0;
+            $isNewArrayStart = str_starts_with($line, '-');
 
             if ($isInRecord && $isNewArrayStart) {
-                fseek($this->handle, -strlen($line), SEEK_CUR);
+                fseek($this->handle, -\strlen($line), \SEEK_CUR);
                 break;
             }
 
@@ -95,19 +70,14 @@ private function readNextRecord()
             }
         }
 
-        if ($line == false) {
+        if (false == $line) {
             $this->isEOF = true;
         }
 
         return $recording;
     }
 
-    /**
-     * Resets the storage to the beginning.
-     *
-     * @return void
-     */
-    public function rewind()
+    public function rewind(): void
     {
         rewind($this->handle);
         $this->isEOF = false;
@@ -115,17 +85,12 @@ public function rewind()
         $this->position = 0;
     }
 
-    /**
-     * Returns true if the current record is valid.
-     *
-     * @return boolean True if the current record is valid.
-     */
-    public function valid()
+    public function valid(): bool
     {
-        if (is_null($this->current)) {
+        if (null === $this->current) {
             $this->next();
         }
 
-        return ! is_null($this->current) && $this->isValidPosition;
+        return null !== $this->current && $this->isValidPosition;
     }
 }
diff --git a/src/VCR/Util/Assertion.php b/src/VCR/Util/Assertion.php
index f5d1c80ec..c6e02c9d7 100644
--- a/src/VCR/Util/Assertion.php
+++ b/src/VCR/Util/Assertion.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\Util;
 
 use Assert\Assertion as BaseAssertion;
@@ -9,22 +11,23 @@ class Assertion extends BaseAssertion
 {
     protected static $exceptionClass = 'VCR\VCRException';
 
-    const INVALID_CALLABLE = 910;
+    public const INVALID_CALLABLE = 910;
 
     /**
      * Assert that the value is callable.
      *
-     * @param  mixed  $value Variable to check for a callable.
-     * @param  string $message Exception message to show if value is not a callable.
-     * @param  null   $propertyPath
-     * @throws \VCR\VCRException If specified value is not a callable.
+     * @param mixed  $value        variable to check for a callable
+     * @param string $message      exception message to show if value is not a callable
+     * @param null   $propertyPath
      *
-     * @return void
+     * @throws VCRException if specified value is not a callable
      */
-    public static function isCallable($value, $message = null, $propertyPath = null)
+    public static function isCallable($value, $message = null, ?string $propertyPath = null): bool
     {
-        if (! is_callable($value)) {
+        if (!\is_callable($value)) {
             throw new VCRException($message, self::INVALID_CALLABLE, $propertyPath);
         }
+
+        return true;
     }
 }
diff --git a/src/VCR/Util/CurlException.php b/src/VCR/Util/CurlException.php
new file mode 100644
index 000000000..15ce0d7f0
--- /dev/null
+++ b/src/VCR/Util/CurlException.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Util;
+
+class CurlException extends \Exception
+{
+    /**
+     * @var array<string,mixed>
+     */
+    private array $info;
+
+    public static function create(\CurlHandle $ch): self
+    {
+        $e = new self(curl_error($ch), curl_errno($ch));
+        $e->info = curl_getinfo($ch);
+
+        return $e;
+    }
+
+    /**
+     * @return array<string,mixed>
+     */
+    public function getInfo(): array
+    {
+        return $this->info;
+    }
+}
diff --git a/src/VCR/Util/CurlHelper.php b/src/VCR/Util/CurlHelper.php
index f96bf31bd..4a4906d11 100644
--- a/src/VCR/Util/CurlHelper.php
+++ b/src/VCR/Util/CurlHelper.php
@@ -5,39 +5,36 @@
 use VCR\Request;
 use VCR\Response;
 
-/**
-* cURL helper class.
-*/
 class CurlHelper
 {
     /**
-     * @var array List of cURL info constants.
+     * @var array<int, string> list of cURL info constants
      */
-    public static $curlInfoList = array(
-        //"certinfo"?
-        CURLINFO_HTTP_CODE => 'http_code',
-        CURLINFO_EFFECTIVE_URL => 'url',
-        CURLINFO_FILETIME => 'filetime',
-        CURLINFO_TOTAL_TIME => 'total_time',
-        CURLINFO_NAMELOOKUP_TIME => 'namelookup_time',
-        CURLINFO_CONNECT_TIME => 'connect_time',
-        CURLINFO_PRETRANSFER_TIME => 'pretransfer_time',
-        CURLINFO_STARTTRANSFER_TIME => 'starttransfer_time',
-        CURLINFO_REDIRECT_COUNT => 'redirect_count',
-        CURLINFO_REDIRECT_TIME => 'redirect_time',
-        CURLINFO_SIZE_UPLOAD => 'size_upload',
-        CURLINFO_SIZE_DOWNLOAD => 'size_download',
-        CURLINFO_SPEED_DOWNLOAD => 'speed_download',
-        CURLINFO_SPEED_UPLOAD => 'speed_upload',
-        CURLINFO_HEADER_SIZE => 'header_size',
-        CURLINFO_HEADER_OUT => 'request_header',
-        CURLINFO_FILETIME => 'filetime',
-        CURLINFO_REQUEST_SIZE => 'request_size',
-        CURLINFO_SSL_VERIFYRESULT => 'ssl_verify_result',
-        CURLINFO_CONTENT_LENGTH_DOWNLOAD => 'download_content_length',
-        CURLINFO_CONTENT_LENGTH_UPLOAD => 'upload_content_length',
-        CURLINFO_CONTENT_TYPE => 'content_type'
-    );
+    public static $curlInfoList = [
+        // "certinfo"?
+        \CURLINFO_HTTP_CODE => 'http_code',
+        \CURLINFO_EFFECTIVE_URL => 'url',
+        \CURLINFO_TOTAL_TIME => 'total_time',
+        \CURLINFO_NAMELOOKUP_TIME => 'namelookup_time',
+        \CURLINFO_CONNECT_TIME => 'connect_time',
+        \CURLINFO_PRETRANSFER_TIME => 'pretransfer_time',
+        \CURLINFO_STARTTRANSFER_TIME => 'starttransfer_time',
+        \CURLINFO_REDIRECT_COUNT => 'redirect_count',
+        \CURLINFO_REDIRECT_TIME => 'redirect_time',
+        \CURLINFO_SIZE_UPLOAD => 'size_upload',
+        \CURLINFO_SIZE_DOWNLOAD => 'size_download',
+        \CURLINFO_SPEED_DOWNLOAD => 'speed_download',
+        \CURLINFO_SPEED_UPLOAD => 'speed_upload',
+        \CURLINFO_HEADER_SIZE => 'header_size',
+        \CURLINFO_HEADER_OUT => 'request_header',
+        \CURLINFO_FILETIME => 'filetime',
+        \CURLINFO_REQUEST_SIZE => 'request_size',
+        \CURLINFO_SSL_VERIFYRESULT => 'ssl_verify_result',
+        \CURLINFO_CONTENT_LENGTH_DOWNLOAD => 'download_content_length',
+        \CURLINFO_CONTENT_LENGTH_UPLOAD => 'upload_content_length',
+        \CURLINFO_CONTENT_TYPE => 'content_type',
+        \CURLINFO_APPCONNECT_TIME => 'appconnect_time',
+    ];
 
     /**
      * Outputs a response depending on the set cURL option.
@@ -47,80 +44,83 @@ class CurlHelper
      *
      * The response header might be passed to a custom function.
      *
-     * @param  Response $response    Response which contains the response body.
-     * @param  array    $curlOptions cURL options which are not stored within the Response.
-     * @param  resource $ch          cURL handle to add headers if needed.
-     *
-     * @return null|string
+     * @param array<int, mixed> $curlOptions cURL options which are not stored within the Response
      */
-    public static function handleOutput(Response $response, array $curlOptions, $ch)
+    public static function handleOutput(Response $response, array $curlOptions, \CurlHandle $ch): ?string
     {
         // If there is a header function set, feed the http status and headers to it.
-        if (isset($curlOptions[CURLOPT_HEADERFUNCTION])) {
-            $headerList = array(HttpUtil::formatAsStatusString($response));
+        if (isset($curlOptions[\CURLOPT_HEADERFUNCTION])) {
+            $headerList = [HttpUtil::formatAsStatusString($response)];
             $headerList = array_merge($headerList, HttpUtil::formatHeadersForCurl($response->getHeaders()));
             $headerList[] = "\r\n";
             foreach ($headerList as $header) {
-                call_user_func($curlOptions[CURLOPT_HEADERFUNCTION], $ch, $header);
+                self::callFunction($curlOptions[\CURLOPT_HEADERFUNCTION], $ch, $header);
             }
         }
 
         $body = $response->getBody();
 
-        if (!empty($curlOptions[CURLOPT_HEADER])) {
-            $body = HttpUtil::formatAsStatusWithHeadersString($response) . $body;
+        if (!empty($curlOptions[\CURLOPT_HEADER])) {
+            $body = HttpUtil::formatAsStatusWithHeadersString($response).$body;
         }
 
-        if (isset($curlOptions[CURLOPT_WRITEFUNCTION])) {
-            call_user_func($curlOptions[CURLOPT_WRITEFUNCTION], $ch, $body);
-        } elseif (isset($curlOptions[CURLOPT_RETURNTRANSFER]) && $curlOptions[CURLOPT_RETURNTRANSFER] == true) {
+        if (isset($curlOptions[\CURLOPT_WRITEFUNCTION])) {
+            self::callFunction($curlOptions[\CURLOPT_WRITEFUNCTION], $ch, $body);
+        } elseif (isset($curlOptions[\CURLOPT_RETURNTRANSFER]) && true == $curlOptions[\CURLOPT_RETURNTRANSFER]) {
             return $body;
-        } elseif (isset($curlOptions[CURLOPT_FILE])) {
-            $fp = $curlOptions[CURLOPT_FILE];
+        } elseif (isset($curlOptions[\CURLOPT_FILE])) {
+            $fp = $curlOptions[\CURLOPT_FILE];
             fwrite($fp, $body);
             fflush($fp);
         } else {
             echo $body;
         }
+
+        return null;
     }
 
     /**
-     * Returns a cURL option from a Response.
+     * @param int $option cURL option to get
      *
-     * @param  Response $response Response to get cURL option from.
-     * @param  integer $option cURL option to get.
+     * @return mixed value of the cURL option
      *
      * @throws \BadMethodCallException
-     * @return mixed Value of the cURL option.
      */
-    public static function getCurlOptionFromResponse(Response $response, $option = 0)
+    public static function getCurlOptionFromResponse(Response $response, ?string $url, int $option = 0)
     {
         switch ($option) {
             case 0: // 0 == array of all curl options
-                $info = array();
+                $info = [];
                 foreach (self::$curlInfoList as $option => $key) {
                     $info[$key] = $response->getCurlInfo($key);
                 }
                 break;
-            case CURLINFO_HTTP_CODE:
-                $info = (int)$response->getStatusCode();
+            case \CURLINFO_HTTP_CODE:
+                $info = (int) $response->getStatusCode();
                 break;
-            case CURLINFO_SIZE_DOWNLOAD:
+            case \CURLINFO_SIZE_DOWNLOAD:
                 $info = $response->getHeader('Content-Length');
                 break;
-            case CURLINFO_HEADER_SIZE:
-                $info =  mb_strlen(HttpUtil::formatAsStatusWithHeadersString($response), 'ISO-8859-1');
+            case \CURLINFO_HEADER_SIZE:
+                $info = mb_strlen(HttpUtil::formatAsStatusWithHeadersString($response), 'ISO-8859-1');
+                break;
+            case \CURLPROXY_HTTPS:
+            case \CURLINFO_APPCONNECT_TIME:
+                $info = '';
+                break;
+            case \CURLINFO_EFFECTIVE_URL:
+                $info = $url;
                 break;
             case CURLINFO_CERTINFO:
                 $curlInfo = $response->getCurlInfo($option);
                 $info = (!is_null($curlInfo)) ? $curlInfo : [];
                 break;
             default:
-                $info = $response->getCurlInfo($option);
+                $info = $response->getCurlInfo(self::$curlInfoList[$option]);
                 break;
         }
 
-        if (!is_null($info)) {
+        if (null !== $info) {
             return $info;
         }
 
@@ -130,35 +130,30 @@ public static function getCurlOptionFromResponse(Response $response, $option = 0
     }
 
     /**
-     * Sets a cURL option on a Request.
-     *
-     * @param Request  $request Request to set cURL option to.
-     * @param integer  $option  cURL option to set.
-     * @param mixed    $value   Value of the cURL option.
-     * @param resource $curlHandle cURL handle where this option is set on (optional).
+     * @param mixed $value value of the cURL option
      */
-    public static function setCurlOptionOnRequest(Request $request, $option, $value, $curlHandle = null)
+    public static function setCurlOptionOnRequest(Request $request, int $option, $value): void
     {
         switch ($option) {
-            case CURLOPT_URL:
+            case \CURLOPT_URL:
                 $request->setUrl($value);
                 break;
-            case CURLOPT_CUSTOMREQUEST:
-                $request->setCurlOption(CURLOPT_CUSTOMREQUEST, $value);
+            case \CURLOPT_CUSTOMREQUEST:
+                $request->setCurlOption(\CURLOPT_CUSTOMREQUEST, $value);
                 break;
-            case CURLOPT_POST:
-                if ($value == true) {
+            case \CURLOPT_POST:
+                if (true == $value) {
                     $request->setMethod('POST');
                 }
                 break;
-            case CURLOPT_POSTFIELDS:
+            case \CURLOPT_POSTFIELDS:
                 // todo: check for file @
-                if (is_array($value)) {
+                if (\is_array($value)) {
                     foreach ($value as $name => $fieldValue) {
                         $request->setPostField($name, $fieldValue);
                     }
 
-                    if (count($value) == 0) {
+                    if (0 == \count($value)) {
                         $request->removeHeader('Content-Type');
                     }
                 } elseif (!empty($value)) {
@@ -168,21 +163,21 @@ public static function setCurlOptionOnRequest(Request $request, $option, $value,
                 }
                 $request->setMethod('POST');
                 break;
-            case CURLOPT_HTTPHEADER:
+            case \CURLOPT_HTTPHEADER:
                 foreach ($value as $header) {
                     $headerParts = explode(': ', $header, 2);
                     if (!isset($headerParts[1])) {
                         $headerParts[0] = rtrim($headerParts[0], ':');
-                        $headerParts[1] = null;
+                        $headerParts[1] = '';
                     }
                     $request->setHeader($headerParts[0], $headerParts[1]);
                 }
                 break;
-            case CURLOPT_FILE:
-            case CURLOPT_HEADER:
-            case CURLOPT_WRITEFUNCTION:
-            case CURLOPT_HEADERFUNCTION:
-            case CURLOPT_UPLOAD:
+            case \CURLOPT_FILE:
+            case \CURLOPT_HEADER:
+            case \CURLOPT_WRITEFUNCTION:
+            case \CURLOPT_HEADERFUNCTION:
+            case \CURLOPT_UPLOAD:
                 // Ignore header, file and writer functions.
                 // These options are stored and will be handled later in handleOutput().
                 break;
@@ -195,14 +190,11 @@ public static function setCurlOptionOnRequest(Request $request, $option, $value,
     /**
      * Makes sure we've properly handled the POST body, such as ensuring that
      * CURLOPT_INFILESIZE is set if CURLOPT_READFUNCTION is set.
-     *
-     * @param Request  $request Request to set cURL option to.
-     * @param resource $curlHandle cURL handle associated with the request.
      */
-    public static function validateCurlPOSTBody(Request $request, $curlHandle = null)
+    public static function validateCurlPOSTBody(Request $request, ?\CurlHandle $curlHandle = null): void
     {
-        $readFunction = $request->getCurlOption(CURLOPT_READFUNCTION);
-        if (is_null($readFunction)) {
+        $readFunction = $request->getCurlOption(\CURLOPT_READFUNCTION);
+        if (null === $readFunction) {
             return;
         }
 
@@ -212,9 +204,32 @@ public static function validateCurlPOSTBody(Request $request, $curlHandle = null
             return;
         }
 
-        $bodySize = $request->getCurlOption(CURLOPT_INFILESIZE);
+        $bodySize = $request->getCurlOption(\CURLOPT_INFILESIZE);
         Assertion::notEmpty($bodySize, 'To set a CURLOPT_READFUNCTION, CURLOPT_INFILESIZE must be set.');
-        $body = call_user_func_array($readFunction, array($curlHandle, fopen('php://memory', 'r'), $bodySize));
+        $body = \call_user_func_array($readFunction, [$curlHandle, fopen('php://memory', 'r'), $bodySize]);
         $request->setBody($body);
     }
+
+    /**
+     * A wrapper around call_user_func that attempts to properly handle private
+     * and protected methods on objects.
+     *
+     * @param mixed $callback The callable to pass to call_user_func
+     * @param mixed $argument The third argument to pass to call_user_func
+     *
+     * @return mixed value returned by the callback function
+     */
+    private static function callFunction($callback, \CurlHandle $curlHandle, $argument)
+    {
+        if (!\is_callable($callback) && \is_array($callback) && 2 === \count($callback)) {
+            // This is probably a private or protected method on an object. Try and
+            // make it accessible.
+            $method = new \ReflectionMethod($callback[0], $callback[1]);
+            $method->setAccessible(true);
+
+            return $method->invoke($callback[0], $curlHandle, $argument);
+        } else {
+            return \call_user_func($callback, $curlHandle, $argument);
+        }
+    }
 }
diff --git a/src/VCR/Util/HttpClient.php b/src/VCR/Util/HttpClient.php
index ca981cb19..ba983be97 100644
--- a/src/VCR/Util/HttpClient.php
+++ b/src/VCR/Util/HttpClient.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\Util;
 
 use VCR\Request;
@@ -13,26 +15,34 @@ class HttpClient
     /**
      * Returns a response for specified HTTP request.
      *
-     * @param Request $request HTTP Request to send.
-     *
-     * @return Response Response for specified request.
+     * @throws CurlException In case of cURL error
      */
-    public function send(Request $request)
+    public function send(Request $request): Response
     {
         $ch = curl_init($request->getUrl());
-        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $request->getMethod());
-        curl_setopt($ch, CURLOPT_HTTPHEADER, HttpUtil::formatHeadersForCurl($request->getHeaders()));
-        if (!is_null($request->getBody())) {
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $request->getBody());
+
+        if ($ch === false) {
+            Assertion::isResource($ch, "Could not init curl with URL '{$request->getUrl()}'");
+        }
+
+        curl_setopt($ch, \CURLOPT_CUSTOMREQUEST, $request->getMethod());
+        curl_setopt($ch, \CURLOPT_HTTPHEADER, HttpUtil::formatHeadersForCurl($request->getHeaders()));
+        if (null !== $request->getBody()) {
+            curl_setopt($ch, \CURLOPT_POSTFIELDS, $request->getBody());
         }
 
         curl_setopt_array($ch, $request->getCurlOptions());
 
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_FAILONERROR, false);
-        curl_setopt($ch, CURLOPT_HEADER, true);
+        curl_setopt($ch, \CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, \CURLOPT_FAILONERROR, false);
+        curl_setopt($ch, \CURLOPT_HEADER, true);
 
-        list($status, $headers, $body) = HttpUtil::parseResponse(curl_exec($ch));
+        /** @var string|false $result */
+        $result = curl_exec($ch);
+        if (false === $result) {
+            throw CurlException::create($ch);
+        }
+        [$status, $headers, $body] = HttpUtil::parseResponse($result);
 
         return new Response(
             HttpUtil::parseStatus($status),
diff --git a/src/VCR/Util/HttpUtil.php b/src/VCR/Util/HttpUtil.php
index c1e8d613d..9dd0c0f52 100644
--- a/src/VCR/Util/HttpUtil.php
+++ b/src/VCR/Util/HttpUtil.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\Util;
 
 use VCR\Response;
@@ -9,38 +11,38 @@ class HttpUtil
     /**
      * Returns key value pairs of response headers.
      *
-     * @param array $headers List of headers. Example: ['Content-Type: text/html', '...']
-     * @return array Key/value pairs of headers, e.g. ['Content-Type' => 'text/html']
+     * @param string[] $headers List of headers. Example: ['Content-Type: text/html', '...']
+     *
+     * @return array<string,string> Key/value pairs of headers, e.g. ['Content-Type' => 'text/html']
      */
-    public static function parseHeaders(array $headers)
+    public static function parseHeaders(array $headers): array
     {
-        $headerGroups = array();
-        $headerList = array();
-
         // Collect matching headers into groups
-        foreach ($headers as $line) {
-            list($key, $value) = explode(': ', $line, 2);
-            if (!isset($headerGroups[$key])) {
-                $headerGroups[$key] = array();
+        foreach ($headers as $i => $line) {
+            [$key, $value] = explode(': ', $line, 2);
+            if (isset($headers[$key])) {
+                if (\is_array($headers[$key])) {
+                    $headers[$key][] = $value;
+                } else {
+                    $headers[$key] = [$headers[$key], $value];
+                }
+            } else {
+                $headers[$key] = $value;
             }
-            $headerGroups[$key][] = $value;
-        }
-        
-        // Collapse groups
-        foreach ($headerGroups as $key => $values) {
-            $headerList[$key] = implode(', ', $values);
+            unset($headers[$i]);
         }
 
-        return $headerList;
+        return $headers;
     }
 
     /**
      * Returns http_version, code and message from a HTTP status line.
      *
      * @param string $status HTTP status line, e.g. HTTP/1.1 200 OK
-     * @return array Parsed 'http_version', 'code' and 'message'.
+     *
+     * @return array<string,string> parsed 'http_version', 'code' and 'message'
      */
-    public static function parseStatus($status)
+    public static function parseStatus(string $status): array
     {
         Assertion::startsWith(
             $status,
@@ -50,39 +52,39 @@ public static function parseStatus($status)
 
         $part = explode(' ', $status, 3);
 
-        return array(
-            'http_version' => substr(strrchr($part[0], '/'), 1),
+        return [
+            'http_version' => substr(strrchr($part[0], '/') ?? '', 1),
             'code' => $part[1],
-            'message' => isset($part[2]) ? $part[2] : ''
-        );
+            'message' => $part[2] ?? '',
+        ];
     }
 
     /**
      * Returns status, headers and body from a HTTP response string.
      *
-     * @param string $response Response including header and body.
-     * @return array Status, headers and body as strings.
+     * @param string $response response including header and body
+     *
+     * @return array<int,mixed> status, headers and body as strings
      */
-    public static function parseResponse($response)
+    public static function parseResponse(string $response): array
     {
         $response = str_replace("HTTP/1.1 100 Continue\r\n\r\n", '', $response);
-            
-        list($rawHeader, $rawBody) = explode("\r\n\r\n", $response, 2);
+
+        [$rawHeader, $rawBody] = explode("\r\n\r\n", $response, 2);
 
         // Parse headers and status.
         $headers = self::parseRawHeader($rawHeader);
         $status = array_shift($headers);
 
-        return array($status, $headers, $rawBody);
+        return [$status, $headers, $rawBody];
     }
 
     /**
      * Returns an array of arrays for specified raw header string.
      *
-     * @param string $header
-     * @return array
+     * @return array<int,string>
      */
-    public static function parseRawHeader($rawHeader)
+    public static function parseRawHeader(string $rawHeader): array
     {
         return explode("\r\n", trim($rawHeader));
     }
@@ -90,15 +92,22 @@ public static function parseRawHeader($rawHeader)
     /**
      * Returns a list of headers from a key/value paired array.
      *
-     * @param array $headers Headers as key/value pairs.
-     * @return array List of headers ['Content-Type: text/html', '...'].
+     * @param array<string,string|array<string,string>|null> $headers Headers as key/value pairs
+     *
+     * @return string[] List of headers ['Content-Type: text/html', '...'].
      */
-    public static function formatHeadersForCurl(array $headers)
+    public static function formatHeadersForCurl(array $headers): array
     {
-        $curlHeaders = array();
-
-        foreach ($headers as $key => $value) {
-            $curlHeaders[] = $key . ': ' . $value;
+        $curlHeaders = [];
+
+        foreach ($headers as $key => $values) {
+            if (\is_array($values)) {
+                foreach ($values as $value) {
+                    $curlHeaders[] = $key.': '.$value . "\r\n";
+                }
+            } else {
+                $curlHeaders[] = $key.': '.$values . "\r\n";
+            }
         }
 
         return $curlHeaders;
@@ -107,26 +116,25 @@ public static function formatHeadersForCurl(array $headers)
     /**
      * Returns a HTTP status line from specified response.
      *
-     * @param Response $response
-     * @return string HTTP status line.
+     * @return string HTTP status line
      */
-    public static function formatAsStatusString(Response $response)
+    public static function formatAsStatusString(Response $response): string
     {
-        return 'HTTP/' . $response->getHttpVersion()
-             . ' ' . $response->getStatusCode()
-             . ' ' . $response->getStatusMessage();
+        return 'HTTP/'.$response->getHttpVersion()
+            .' '.$response->getStatusCode()
+            .' '.$response->getStatusMessage() . "\r\n";
     }
 
     /**
      * Returns a HTTP status line with headers from specified response.
      *
-     * @param Response $response
-     * @return string HTTP status line.
+     * @return string HTTP status line
      */
-    public static function formatAsStatusWithHeadersString(Response $response)
+    public static function formatAsStatusWithHeadersString(Response $response): string
     {
         $headers = self::formatHeadersForCurl($response->getHeaders());
         array_unshift($headers, self::formatAsStatusString($response));
-        return join("\r\n", $headers) . "\r\n\r\n";
+
+        return implode("\r\n", $headers)."\r\n\r\n";
     }
 }
diff --git a/src/VCR/Util/SoapClient.php b/src/VCR/Util/SoapClient.php
index 3be9aab76..e892eb33e 100644
--- a/src/VCR/Util/SoapClient.php
+++ b/src/VCR/Util/SoapClient.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\Util;
 
 use VCR\LibraryHooks\SoapHook;
@@ -10,24 +12,21 @@
  */
 class SoapClient extends \SoapClient
 {
+    protected SoapHook $soapHook;
+
     /**
-     * @var \VCR\LibraryHooks\SoapHook SOAP library hook used to intercept SOAP requests.
+     * @var array<string,mixed>
      */
-    protected $soapHook;
+    protected array $options = [];
 
-    protected $options = array();
+    protected string $response;
 
-    /**
-     * @var string
-     */
-    protected $response;
+    protected string $request;
 
     /**
-     * @var string
+     * @param array<string,mixed> $options
      */
-    protected $request;
-
-    public function __construct($wsdl, $options = array())
+    public function __construct(?string $wsdl, array $options = [])
     {
         $this->options = $options;
         parent::__construct($wsdl, $options);
@@ -37,86 +36,45 @@ public function __construct($wsdl, $options = array())
      * Performs (and may intercepts) SOAP request over HTTP.
      *
      * Requests will be intercepted if the library hook is enabled.
-     *
-     * @param  string  $request  The XML SOAP request.
-     * @param  string  $location The URL to request.
-     * @param  string  $action   The SOAP action.
-     * @param  integer $version  The SOAP version.
-     * @param  integer $one_way  If one_way is set to 1, this method returns nothing.
-     *                           Use this where a response is not expected.
-     * @return string  The XML SOAP response.
      */
-    public function __doRequest($request, $location, $action, $version, $one_way = 0)
+    public function __doRequest(string $request, string $location, string $action, int $version, bool $one_way = false): ?string
     {
-        // Save a copy of the request, not the request itself -- see issue #153
-        $this->request = (string) $request;
+        $this->request = $request;
 
         $soapHook = $this->getLibraryHook();
 
         if ($soapHook->isEnabled()) {
-            $response = $soapHook->doRequest($request, $location, $action, $version, $one_way, $this->options);
+            $this->response = $soapHook->doRequest($request, $location, $action, $version, $one_way, $this->options);
         } else {
-            $response = $this->realDoRequest($request, $location, $action, $version, $one_way);
+            $this->response = $this->realDoRequest($request, $location, $action, $version, $one_way);
         }
 
-        $this->response = $response;
-
-        return $one_way ? null : $response;
+        return $one_way ? null : $this->response;
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function __getLastRequest()
+    public function __getLastRequest(): ?string
     {
-        return $this->request;
+        return $this->request ?? null;
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function __getLastResponse()
+    public function __getLastResponse(): ?string
     {
-        return $this->response;
+        return $this->response ?? null;
     }
 
-    /**
-     * Sets the SOAP library hook which is used to intercept SOAP requests.
-     *
-     * @param SoapHook $hook SOAP library hook to use when intercepting SOAP requests.
-     */
-    public function setLibraryHook(SoapHook $hook)
+    public function setLibraryHook(SoapHook $hook): void
     {
         $this->soapHook = $hook;
     }
 
-    /**
-     * Performs a real SOAP request over HTTP.
-     *
-     * @codeCoverageIgnore
-     * @param  string  $request  The XML SOAP request.
-     * @param  string  $location The URL to request.
-     * @param  string  $action   The SOAP action.
-     * @param  integer $version  The SOAP version.
-     * @param  integer $one_way  If one_way is set to 1, this method returns nothing.
-     *                           Use this where a response is not expected.
-     * @return string  The XML SOAP response.
-     */
-    protected function realDoRequest($request, $location, $action, $version, $one_way = 0)
+    protected function realDoRequest(string $request, string $location, string $action, int $version, bool $one_way = false): string
     {
         return parent::__doRequest($request, $location, $action, $version, $one_way);
     }
 
-    /**
-     * Returns currently used SOAP library hook.
-     *
-     * If no library hook is set, a new one is created.
-     *
-     * @return SoapHook SOAP library hook.
-     */
-    protected function getLibraryHook()
+    protected function getLibraryHook(): SoapHook
     {
-        if (empty($this->soapHook)) {
+        if (!isset($this->soapHook)) {
             $this->soapHook = VCRFactory::get('VCR\LibraryHooks\SoapHook');
         }
 
diff --git a/src/VCR/Util/StreamHelper.php b/src/VCR/Util/StreamHelper.php
index 79e6c80ee..43f626272 100644
--- a/src/VCR/Util/StreamHelper.php
+++ b/src/VCR/Util/StreamHelper.php
@@ -1,12 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\Util;
 
 use VCR\Request;
 
 /**
-* Stream helper class.
-*/
+ * Stream helper class.
+ */
 class StreamHelper
 {
     /**
@@ -15,20 +17,16 @@ class StreamHelper
      * If an existing Request is given, the stream context options
      * are set on the specified Request object.
      *
-     * @param resource $context Stream context resource.
-     * @param string $path Path to use as url.
-     * @param Request $existing Optional, existing request.
-     *
-     * @return Request
+     * @param resource $context stream context resource
      */
-    public static function createRequestFromStreamContext($context, $path, Request $existing = null)
+    public static function createRequestFromStreamContext($context, string $path, ?Request $existing = null): Request
     {
         $http = self::getHttpOptionsFromContext($context);
         $request = $existing;
 
         if (empty($request)) {
             $method = !empty($http['method']) ? $http['method'] : 'GET';
-            $request = new Request($method, $path, array());
+            $request = new Request($method, $path, []);
         }
 
         if (!empty($http['header'])) {
@@ -47,15 +45,15 @@ public static function createRequestFromStreamContext($context, $path, Request $
         }
 
         if (isset($http['follow_location'])) {
-            $request->setCurlOption(CURLOPT_FOLLOWLOCATION, (bool) $http['follow_location']);
+            $request->setCurlOption(\CURLOPT_FOLLOWLOCATION, (bool) $http['follow_location']);
         }
 
         if (isset($http['max_redirects'])) {
-            $request->setCurlOption(CURLOPT_MAXREDIRS, $http['max_redirects']);
+            $request->setCurlOption(\CURLOPT_MAXREDIRS, $http['max_redirects']);
         }
 
         if (isset($http['timeout'])) {
-            $request->setCurlOption(CURLOPT_TIMEOUT, $http['timeout']);
+            $request->setCurlOption(\CURLOPT_TIMEOUT, $http['timeout']);
         }
 
         // TODO: protocol_version
@@ -67,16 +65,19 @@ public static function createRequestFromStreamContext($context, $path, Request $
      * Returns HTTP options from current stream context.
      *
      * @see http://php.net/manual/en/context.http.php
-     * @return array HTTP options.
+     *
+     * @param resource|null $context
+     *
+     * @return array<string,mixed> HTTP options
      */
-    protected static function getHttpOptionsFromContext($context)
+    protected static function getHttpOptionsFromContext($context): array
     {
         if (!$context) {
-            return array();
+            return [];
         }
 
         $options = stream_context_get_options($context);
 
-        return !empty($options['http']) ? $options['http'] : array();
+        return !empty($options['http']) ? $options['http'] : [];
     }
 }
diff --git a/src/VCR/Util/StreamProcessor.php b/src/VCR/Util/StreamProcessor.php
index 1676e526e..0f0c33670 100644
--- a/src/VCR/Util/StreamProcessor.php
+++ b/src/VCR/Util/StreamProcessor.php
@@ -1,63 +1,57 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\Util;
 
-use VCR\Configuration;
 use VCR\CodeTransform\AbstractCodeTransform;
+use VCR\Configuration;
 
 /**
  * Implementation adapted from:
- * https://github.com/antecedent/patchwork/blob/418a9aae80ca3228d6763a2dc6d9a30ade7a4e7e/lib/Preprocessor/Stream.php
+ * https://github.com/antecedent/patchwork/blob/418a9aae80ca3228d6763a2dc6d9a30ade7a4e7e/lib/Preprocessor/Stream.php.
  *
  * @author     Ignas Rudaitis <ignas.rudaitis@gmail.com>
  * @author     Adrian Philipp <mail@adrian-philipp.com>
  * @copyright  2010-2013 Ignas Rudaitis
  * @license    http://www.opensource.org/licenses/mit-license.html
- * @link       http://antecedent.github.com/patchwork
+ *
+ * @see       http://antecedent.github.com/patchwork
  */
 class StreamProcessor
 {
     /**
      * Constant for a stream which was opened while including a file.
      */
-    const STREAM_OPEN_FOR_INCLUDE = 128;
+    public const STREAM_OPEN_FOR_INCLUDE = 128;
 
     /**
      * Stream protocol which is used when registering this wrapper.
      */
-    const PROTOCOL = 'file';
+    public const PROTOCOL = 'file';
 
-    /**
-     * @var Configuration
-     */
-    protected static $configuration;
+    protected static Configuration $configuration;
 
     /**
-     * @var AbstractCodeTransform[] $codeTransformers Transformers which have been appended to this stream processor.
+     * @var AbstractCodeTransform[] transformers which have been appended to this stream processor
      */
-    protected static $codeTransformers = array();
+    protected static array $codeTransformers = [];
 
     /**
-     * @var resource Resource for the currently opened file.
+     * @var resource|false resource for the currently opened file
      */
     protected $resource;
 
     /**
-     * @link http://www.php.net/manual/en/class.streamwrapper.php#streamwrapper.props.context
-     * @var resource The current context, or NULL if no context was passed to the caller function.
+     * @see http://www.php.net/manual/en/class.streamwrapper.php#streamwrapper.props.context
+     *
+     * @var resource|null the current context, or NULL if no context was passed to the caller function
      */
     public $context;
 
-    /**
-     * @var bool
-     */
-    protected $isIntercepting = false;
+    protected bool $isIntercepting = false;
 
-    /**
-     *
-     * @param Configuration $configuration
-     */
-    public function __construct(Configuration $configuration = null)
+    public function __construct(?Configuration $configuration = null)
     {
         if ($configuration) {
             static::$configuration = $configuration;
@@ -66,12 +60,11 @@ public function __construct(Configuration $configuration = null)
 
     /**
      * Registers current class as the PHP file stream wrapper.
-     *
-     * @return void
      */
-    public function intercept()
+    public function intercept(): void
     {
         if (!$this->isIntercepting) {
+            ini_set('opcache.enable', '0');
             stream_wrapper_unregister(self::PROTOCOL);
             $this->isIntercepting = stream_wrapper_register(self::PROTOCOL, __CLASS__);
         }
@@ -79,22 +72,20 @@ public function intercept()
 
     /**
      * Restores the original file stream wrapper status.
-     *
-     * @return void
      */
-    public function restore()
+    public function restore(): void
     {
+        // stream_wrapper_restore can throw when stream_wrapper was never changed, so we unregister first
+        stream_wrapper_unregister(self::PROTOCOL);
         stream_wrapper_restore(self::PROTOCOL);
     }
 
     /**
      * Determines that the provided url is member of a url whitelist.
      *
-     * @param string $uri
-     *
-     * @return bool True if the specified url is whitelisted, false otherwise.
+     * @return bool true if the specified url is whitelisted, false otherwise
      */
-    protected function isWhitelisted($uri)
+    protected function isWhitelisted(string $uri): bool
     {
         $whiteList = static::$configuration->getWhiteList();
 
@@ -105,7 +96,7 @@ protected function isWhitelisted($uri)
         $uri = $this->normalizePath($uri);
 
         foreach ($whiteList as $path) {
-            if (strpos($uri, $path) !== false) {
+            if (str_contains($uri, $path)) {
                 return true;
             }
         }
@@ -116,16 +107,14 @@ protected function isWhitelisted($uri)
     /**
      * Determines that the provided url is member of a url blacklist.
      *
-     * @param string $uri
-     *
-     * @return bool True if the provided url is blacklisted, false otherwise.
+     * @return bool true if the provided url is blacklisted, false otherwise
      */
-    protected function isBlacklisted($uri)
+    protected function isBlacklisted(string $uri): bool
     {
         $uri = $this->normalizePath($uri);
 
         foreach (static::$configuration->getBlackList() as $path) {
-            if (strpos($uri, $path) !== false) {
+            if (str_contains($uri, $path)) {
                 return true;
             }
         }
@@ -135,41 +124,18 @@ protected function isBlacklisted($uri)
 
     /**
      * Determines that the provided uri leads to a PHP file.
-     *
-     * @param string $uri
-     *
-     * @return bool
      */
-    protected function isPhpFile($uri)
+    protected function isPhpFile(string $uri): bool
     {
-        return pathinfo($uri, PATHINFO_EXTENSION) === 'php';
+        return 'php' === pathinfo($uri, \PATHINFO_EXTENSION);
     }
 
-    /**
-     *
-     * @param string $uri
-     *
-     * @return bool
-     */
-    protected function shouldProcess($uri)
+    protected function shouldProcess(string $uri): bool
     {
         return $this->isWhitelisted($uri) && !$this->isBlacklisted($uri) && $this->isPhpFile($uri);
     }
 
-    /**
-     * Opens a stream and attaches registered filters.
-     *
-     * @param  string  $path       Specifies the URL that was passed to the original function.
-     * @param  string  $mode       The mode used to open the file, as detailed for fopen().
-     * @param  integer $options    Holds additional flags set by the streams API.
-     *                             It can hold one or more of the following values OR'd together.
-     * @param  string  $openedPath If the path is opened successfully, and STREAM_USE_PATH is set in options,
-     *                             opened_path should be set to the full path of the file/resource that was
-     *                             actually opened.
-     *
-     * @return boolean Returns TRUE on success or FALSE on failure.
-     */
-    public function stream_open($path, $mode, $options, &$openedPath)
+    public function stream_open(string $path, string $mode, int $options, ?string &$openedPath): bool
     {
         // file_exists catches paths like /dev/urandom that are missed by is_file.
         if ('r' === substr($mode, 0, 1) && !file_exists($path)) {
@@ -179,84 +145,99 @@ public function stream_open($path, $mode, $options, &$openedPath)
         $this->restore();
 
         if (isset($this->context)) {
-            $this->resource = fopen($path, $mode, $options & STREAM_USE_PATH, $this->context);
+            $this->resource = fopen($path, $mode, (bool) ($options & \STREAM_USE_PATH), $this->context);
         } else {
-            $this->resource = fopen($path, $mode, $options & STREAM_USE_PATH);
+            $this->resource = fopen($path, $mode, (bool) ($options & \STREAM_USE_PATH));
         }
 
-        if ($options & self::STREAM_OPEN_FOR_INCLUDE && $this->shouldProcess($path)) {
+        if (false !== $this->resource && $options & self::STREAM_OPEN_FOR_INCLUDE && $this->shouldProcess($path)) {
             $this->appendFiltersToStream($this->resource);
         }
 
         $this->intercept();
 
-        return $this->resource !== false;
+        return false !== $this->resource;
     }
 
     /**
      * Close an resource.
      *
-     * @link http://www.php.net/manual/en/streamwrapper.stream-close.php
-     *
-     * @return boolean
+     * @see http://www.php.net/manual/en/streamwrapper.stream-close.php
      */
-    public function stream_close()
+    public function stream_close(): bool
     {
+        if (false === $this->resource) {
+            return true;
+        }
+
         return fclose($this->resource);
     }
 
     /**
      * Tests for end-of-file on a file pointer.
      *
-     * @link http://www.php.net/manual/en/streamwrapper.stream-eof.php
-     *
-     * @return boolean Should return TRUE if the read/write position is at the end of the stream
-     *                 and if no more data is available to be read, or FALSE otherwise.
+     * @see http://www.php.net/manual/en/streamwrapper.stream-eof.php
      */
-    public function stream_eof()
+    public function stream_eof(): bool
     {
+        if (false === $this->resource) {
+            return false;
+        }
+
         return feof($this->resource);
     }
 
     /**
      * Flushes the output.
      *
-     * @link http://www.php.net/manual/en/streamwrapper.stream-flush.php
-     *
-     * @return boolean
+     * @see http://www.php.net/manual/en/streamwrapper.stream-flush.php
      */
-    public function stream_flush()
+    public function stream_flush(): bool
     {
+        if (false === $this->resource) {
+            return false;
+        }
+
         return fflush($this->resource);
     }
 
     /**
      * Read from stream.
      *
-     * @link http://www.php.net/manual/en/streamwrapper.stream-read.php
-     * @param  int $count How many bytes of data from the current position should be returned.
+     * @see http://www.php.net/manual/en/streamwrapper.stream-read.php
+     *
+     * @param int $count how many bytes of data from the current position should be returned
      *
-     * @return string If there are less than count bytes available, return as many as are available.
-     *                If no more data is available, return either FALSE or an empty string.
+     * @return string|false If there are less than count bytes available, return as many as are available.
+     *                      If no more data is available, return either FALSE or an empty string.
      */
-    public function stream_read($count)
+    public function stream_read(int $count)
     {
+        if (false === $this->resource) {
+            return false;
+        }
+
         return fread($this->resource, $count);
     }
 
     /**
      * Seeks to specific location in a stream.
      *
-     * @param  integer $offset The stream offset to seek to.
-     * @param  integer $whence Possible values:
-     *                         SEEK_SET - Set position equal to offset bytes.
-     *                         SEEK_CUR - Set position to current location plus offset.
-     *                         SEEK_END - Set position to end-of-file plus offset.
-     * @return boolean Return TRUE if the position was updated, FALSE otherwise.
+     * @param int $offset the stream offset to seek to
+     * @param int $whence Possible values:
+     *                    SEEK_SET - Set position equal to offset bytes.
+     *                    SEEK_CUR - Set position to current location plus offset.
+     *                    SEEK_END - Set position to end-of-file plus offset.
+     *
+     * @return bool return TRUE if the position was updated, FALSE otherwise
      */
-    public function stream_seek($offset, $whence = SEEK_SET)
+    public function stream_seek(int $offset, int $whence = \SEEK_SET): bool
     {
-        return fseek($this->resource, $offset, $whence) === 0;
+        if (false === $this->resource) {
+            return false;
+        }
+
+        return 0 === fseek($this->resource, $offset, $whence);
     }
 
     /**
@@ -266,12 +247,20 @@ public function stream_seek($offset, $whence = SEEK_SET)
      * after having all transformations applied. When including files, PHP 7.4 and newer are sensitive
      * to file size reported by stat.
      *
-     * @link http://www.php.net/manual/en/streamwrapper.stream-stat.php
+     * @see http://www.php.net/manual/en/streamwrapper.stream-stat.php
      *
-     * @return array|false See stat().
+     * @return array<int|string, int>|false see stat()
      */
     public function stream_stat()
     {
+        if (false === $this->resource) {
+            return false;
+        }
+
+        if (!$this->shouldProcess(stream_get_meta_data($this->resource)['uri'])) {
+            return fstat($this->resource);
+        }
+
         return false;
     }
 
@@ -280,29 +269,33 @@ public function stream_stat()
      *
      * This method is called in response to fseek() to determine the current position.
      *
-     * @link http://www.php.net/manual/en/streamwrapper.stream-tell.php
+     * @see http://www.php.net/manual/en/streamwrapper.stream-tell.php
      *
-     * @return integer Should return the current position of the stream.
+     * @return int|false should return the current position of the stream
      */
     public function stream_tell()
     {
+        if (false === $this->resource) {
+            return false;
+        }
+
         return ftell($this->resource);
     }
 
     /**
      * Retrieve information about a file.
      *
-     * @link http://www.php.net/manual/en/streamwrapper.url-stat.php
+     * @see http://www.php.net/manual/en/streamwrapper.url-stat.php
      *
-     * @param  string  $path  The file path or URL to stat.
-     * @param  integer $flags Holds additional flags set by the streams API.
+     * @param string $path  the file path or URL to stat
+     * @param int    $flags holds additional flags set by the streams API
      *
-     * @return integer        Should return as many elements as stat() does.
+     * @return array<int|string, int>|false should return as many elements as stat() does
      */
-    public function url_stat($path, $flags)
+    public function url_stat(string $path, int $flags)
     {
         $this->restore();
-        if ($flags & STREAM_URL_STAT_QUIET) {
+        if ($flags & \STREAM_URL_STAT_QUIET) {
             set_error_handler(function () {
                 // Use native error handler
                 return false;
@@ -320,12 +313,16 @@ public function url_stat($path, $flags)
     /**
      * Close directory handle.
      *
-     * @link http://www.php.net/manual/en/streamwrapper.dir-closedir.php
+     * @see http://www.php.net/manual/en/streamwrapper.dir-closedir.php
      *
-     * @return boolean Returns TRUE on success or FALSE on failure.
+     * @return bool returns TRUE on success or FALSE on failure
      */
-    public function dir_closedir()
+    public function dir_closedir(): bool
     {
+        if (false === $this->resource) {
+            return false;
+        }
+
         closedir($this->resource);
 
         return true;
@@ -334,13 +331,13 @@ public function dir_closedir()
     /**
      * Open directory handle.
      *
-     * @link http://www.php.net/manual/en/streamwrapper.dir-opendir.php
+     * @see http://www.php.net/manual/en/streamwrapper.dir-opendir.php
      *
-     * @param  string $path The file path or URL to stat.
+     * @param string $path the file path or URL to stat
      *
-     * @return boolean Returns TRUE on success or FALSE on failure.
+     * @return bool returns TRUE on success or FALSE on failure
      */
-    public function dir_opendir($path)
+    public function dir_opendir(string $path): bool
     {
         $this->restore();
         if (isset($this->context)) {
@@ -350,30 +347,38 @@ public function dir_opendir($path)
         }
         $this->intercept();
 
-        return $this->resource !== false;
+        return false !== $this->resource;
     }
 
     /**
      * Read entry from directory handle.
      *
-     * @link http://www.php.net/manual/en/streamwrapper.dir-readdir.php
+     * @see http://www.php.net/manual/en/streamwrapper.dir-readdir.php
      *
-     * @return mixed Should return string representing the next filename, or FALSE if there is no next file.
+     * @return mixed should return string representing the next filename, or FALSE if there is no next file
      */
     public function dir_readdir()
     {
+        if (false === $this->resource) {
+            return false;
+        }
+
         return readdir($this->resource);
     }
 
     /**
      * Rewind directory handle.
      *
-     * @link http://www.php.net/manual/en/streamwrapper.dir-rewinddir.php
+     * @see http://www.php.net/manual/en/streamwrapper.dir-rewinddir.php
      *
-     * @return boolean Returns TRUE on success or FALSE on failure.
+     * @return bool returns TRUE on success or FALSE on failure
      */
-    public function dir_rewinddir()
+    public function dir_rewinddir(): bool
     {
+        if (false === $this->resource) {
+            return false;
+        }
+
         rewinddir($this->resource);
 
         return true;
@@ -382,21 +387,21 @@ public function dir_rewinddir()
     /**
      * Create a directory.
      *
-     * @link http://www.php.net/manual/en/streamwrapper.mkdir.php
+     * @see http://www.php.net/manual/en/streamwrapper.mkdir.php
      *
-     * @param  string  $path       Directory which should be created.
-     * @param  int     $mode       The value passed to mkdir().
-     * @param  integer $options    A bitwise mask of values, such as STREAM_MKDIR_RECURSIVE.
+     * @param string $path    directory which should be created
+     * @param int    $mode    the value passed to mkdir()
+     * @param int    $options a bitwise mask of values, such as STREAM_MKDIR_RECURSIVE
      *
-     * @return boolean  Returns TRUE on success or FALSE on failure.
+     * @return bool returns TRUE on success or FALSE on failure
      */
-    public function mkdir($path, $mode, $options)
+    public function mkdir(string $path, int $mode, int $options): bool
     {
         $this->restore();
         if (isset($this->context)) {
-            $result = mkdir($path, $mode, $options, $this->context);
+            $result = mkdir($path, $mode, (bool) ($options & \STREAM_MKDIR_RECURSIVE), $this->context);
         } else {
-            $result = mkdir($path, $mode, $options);
+            $result = mkdir($path, $mode, (bool) ($options & \STREAM_MKDIR_RECURSIVE));
         }
         $this->intercept();
 
@@ -406,14 +411,14 @@ public function mkdir($path, $mode, $options)
     /**
      * Renames a file or directory.
      *
-     * @link http://www.php.net/manual/en/streamwrapper.rename.php
+     * @see http://www.php.net/manual/en/streamwrapper.rename.php
      *
-     * @param  string $path_from The URL to the current file.
-     * @param  string $path_to   The URL which the path_from should be renamed to.
+     * @param string $path_from the URL to the current file
+     * @param string $path_to   the URL which the path_from should be renamed to
      *
-     * @return boolean Returns TRUE on success or FALSE on failure.
+     * @return bool returns TRUE on success or FALSE on failure
      */
-    public function rename($path_from, $path_to)
+    public function rename(string $path_from, string $path_to): bool
     {
         $this->restore();
         if (isset($this->context)) {
@@ -427,15 +432,15 @@ public function rename($path_from, $path_to)
     }
 
     /**
-     * Removes a directory
+     * Removes a directory.
      *
-     * @link http://www.php.net/manual/en/streamwrapper.rmdir.php
+     * @see http://www.php.net/manual/en/streamwrapper.rmdir.php
      *
-     * @param  string $path The directory URL which should be removed.
+     * @param string $path the directory URL which should be removed
      *
-     * @return boolean Returns TRUE on success or FALSE on failure.
+     * @return bool returns TRUE on success or FALSE on failure
      */
-    public function rmdir($path)
+    public function rmdir(string $path): bool
     {
         $this->restore();
         if (isset($this->context)) {
@@ -451,13 +456,14 @@ public function rmdir($path)
     /**
      * Retrieve the underlaying resource.
      *
-     * @link http://www.php.net/manual/en/streamwrapper.stream-cast.php
+     * @see http://www.php.net/manual/en/streamwrapper.stream-cast.php
+     *
+     * @param int $cast_as can be STREAM_CAST_FOR_SELECT when stream_select() is calling stream_cast() or
+     *                     STREAM_CAST_AS_STREAM when stream_cast() is called for other uses
      *
-     * @param  integer $cast_as Can be STREAM_CAST_FOR_SELECT when stream_select() is calling stream_cast() or
-     *                          STREAM_CAST_AS_STREAM when stream_cast() is called for other uses.
-     * @return resource         Should return the underlying stream resource used by the wrapper, or FALSE.
+     * @return resource|false should return the underlying stream resource used by the wrapper, or FALSE
      */
-    public function stream_cast($cast_as)
+    public function stream_cast(int $cast_as)
     {
         return $this->resource;
     }
@@ -465,15 +471,20 @@ public function stream_cast($cast_as)
     /**
      * Advisory file locking.
      *
-     * @link http://www.php.net/manual/en/streamwrapper.stream-lock.php
+     * @see http://www.php.net/manual/en/streamwrapper.stream-lock.php
      *
-     * @param  integer $operation One of the operation constantes.
+     * @param int $operation one of the operation constantes
      *
-     * @return boolean Returns TRUE on success or FALSE on failure.
+     * @return bool returns TRUE on success or FALSE on failure
      */
-    public function stream_lock($operation)
+    public function stream_lock(int $operation): bool
     {
-        $operation = ($operation === 0 ? LOCK_EX : $operation);
+        if (false === $this->resource) {
+            return false;
+        }
+
+        $operation = (0 === $operation ? \LOCK_EX : $operation);
+
         return flock($this->resource, $operation);
     }
 
@@ -482,54 +493,68 @@ public function stream_lock($operation)
      *
      * @codeCoverageIgnore
      *
-     * @param  int $option One of STREAM_OPTION_BLOCKING, STREAM_OPTION_READ_TIMEOUT, STREAM_OPTION_WRITE_BUFFER.
-     * @param  int $arg1   Depending on option.
-     * @param  int $arg2   Depending on option.
+     * @param int      $option one of STREAM_OPTION_BLOCKING, STREAM_OPTION_READ_TIMEOUT, STREAM_OPTION_WRITE_BUFFER
+     * @param int      $arg1   depending on option
+     * @param int|null $arg2   depending on option
      *
-     * @return boolean Returns TRUE on success or FALSE on failure. If option is not implemented,
-     *                 FALSE should be returned.
+     * @return bool Returns TRUE on success or FALSE on failure. If option is not implemented,
+     *              FALSE should be returned.
      */
-    public function stream_set_option($option, $arg1, $arg2)
+    public function stream_set_option(int $option, int $arg1, ?int $arg2 = null): bool
     {
+        if (false === $this->resource) {
+            return false;
+        }
+
         switch ($option) {
-            case STREAM_OPTION_BLOCKING:
-                return stream_set_blocking($this->resource, $arg1);
-            case STREAM_OPTION_READ_TIMEOUT:
+            case \STREAM_OPTION_BLOCKING:
+                return stream_set_blocking($this->resource, (bool) $arg1);
+            case \STREAM_OPTION_READ_TIMEOUT:
                 return stream_set_timeout($this->resource, $arg1, $arg2);
-            case STREAM_OPTION_WRITE_BUFFER:
-                return stream_set_write_buffer($this->resource, $arg1);
-            case STREAM_OPTION_READ_BUFFER:
-                return stream_set_read_buffer($this->resource, $arg1);
-            case STREAM_OPTION_CHUNK_SIZE:
-                return stream_set_chunk_size($this->resource, $arg1);
+            case \STREAM_OPTION_WRITE_BUFFER:
+                // stream_set_write_buffer returns 0 in case of success
+                return 0 === stream_set_write_buffer($this->resource, $arg1);
+            case \STREAM_OPTION_READ_BUFFER:
+                // stream_set_read_buffer returns 0 in case of success
+                return 0 === stream_set_read_buffer($this->resource, $arg1);
+                // STREAM_OPTION_CHUNK_SIZE does not exist at all in PHP 7
+                /*case STREAM_OPTION_CHUNK_SIZE:
+                    return stream_set_chunk_size($this->resource, $arg1);*/
         }
+
+        return false;
     }
 
     /**
      * Write to stream.
      *
-     * @throws \BadMethodCallException If called, because this method is not applicable for this stream.
-     * @link http://www.php.net/manual/en/streamwrapper.stream-write.php
+     * @see http://www.php.net/manual/en/streamwrapper.stream-write.php
+     *
+     * @param string $data should be stored into the underlying stream
      *
-     * @param  string $data Should be stored into the underlying stream.
+     * @return int|false
      *
-     * @return int
+     * @throws \BadMethodCallException if called, because this method is not applicable for this stream
      */
-    public function stream_write($data)
+    public function stream_write(string $data)
     {
+        if (false === $this->resource) {
+            return false;
+        }
+
         return fwrite($this->resource, $data);
     }
 
     /**
      * Delete a file.
      *
-     * @link http://www.php.net/manual/en/streamwrapper.unlink.php
+     * @see http://www.php.net/manual/en/streamwrapper.unlink.php
      *
-     * @param  string $path The file URL which should be deleted.
+     * @param string $path the file URL which should be deleted
      *
-     * @return boolean Returns TRUE on success or FALSE on failure.
+     * @return bool returns TRUE on success or FALSE on failure
      */
-    public function unlink($path)
+    public function unlink(string $path): bool
     {
         $this->restore();
         if (isset($this->context)) {
@@ -545,35 +570,36 @@ public function unlink($path)
     /**
      * Change stream options.
      *
-     * @link http://www.php.net/manual/en/streamwrapper.stream-metadata.php
-     * @param  string  $path   The file path or URL to set metadata.
-     * @param  integer $option One of the stream options.
-     * @param  mixed   $value  Value depending on the option.
+     * @see http://www.php.net/manual/en/streamwrapper.stream-metadata.php
      *
-     * @return boolean Returns TRUE on success or FALSE on failure.
+     * @param string $path   the file path or URL to set metadata
+     * @param int    $option one of the stream options
+     * @param mixed  $value  value depending on the option
+     *
+     * @return bool returns TRUE on success or FALSE on failure
      */
-    public function stream_metadata($path, $option, $value)
+    public function stream_metadata(string $path, int $option, $value): bool
     {
         $this->restore();
-        $result = null;
+        $result = false;
 
         switch ($option) {
-            case STREAM_META_TOUCH:
+            case \STREAM_META_TOUCH:
                 if (empty($value)) {
                     $result = touch($path);
                 } else {
                     $result = touch($path, $value[0], $value[1]);
                 }
                 break;
-            case STREAM_META_OWNER_NAME:
-            case STREAM_META_OWNER:
+            case \STREAM_META_OWNER_NAME:
+            case \STREAM_META_OWNER:
                 $result = chown($path, $value);
                 break;
-            case STREAM_META_GROUP_NAME:
-            case STREAM_META_GROUP:
+            case \STREAM_META_GROUP_NAME:
+            case \STREAM_META_GROUP:
                 $result = chgrp($path, $value);
                 break;
-            case STREAM_META_ACCESS:
+            case \STREAM_META_ACCESS:
                 $result = chmod($path, $value);
                 break;
         }
@@ -585,37 +611,33 @@ public function stream_metadata($path, $option, $value)
     /**
      * Truncate stream.
      *
-     * @link http://www.php.net/manual/en/streamwrapper.stream-truncate.php
+     * @see http://www.php.net/manual/en/streamwrapper.stream-truncate.php
      *
-     * @param  integer $new_size The new size.
+     * @param int $new_size the new size
      *
-     * @return boolean Returns TRUE on success or FALSE on failure.
+     * @return bool returns TRUE on success or FALSE on failure
      */
-    public function stream_truncate($new_size)
+    public function stream_truncate(int $new_size): bool
     {
+        if (false === $this->resource) {
+            return false;
+        }
+
         return ftruncate($this->resource, $new_size);
     }
 
     /**
      * Adds code transformer to the stream processor.
-     *
-     * @param AbstractCodeTransform $codeTransformer
-     *
-     * @return void
      */
-    public function appendCodeTransformer(AbstractCodeTransform $codeTransformer)
+    public function appendCodeTransformer(AbstractCodeTransform $codeTransformer): void
     {
         static::$codeTransformers[$codeTransformer::NAME] = $codeTransformer;
     }
 
     /**
      * Removes a code transformer from the stream processor.
-     *
-     * @param AbstractCodeTransform $codeTransformer
-     *
-     * @return void
      */
-    public function detachCodeTransformer(AbstractCodeTransform $codeTransformer)
+    public function detachCodeTransformer(AbstractCodeTransform $codeTransformer): void
     {
         if (!empty(static::$codeTransformers[$codeTransformer::NAME])) {
             unset(static::$codeTransformers[$codeTransformer::NAME]);
@@ -627,24 +649,20 @@ public function detachCodeTransformer(AbstractCodeTransform $codeTransformer)
      *
      * @param resource $stream
      */
-    protected function appendFiltersToStream($stream)
+    protected function appendFiltersToStream($stream): void
     {
         foreach (static::$codeTransformers as $codeTransformer) {
-            stream_filter_append($stream, $codeTransformer::NAME, STREAM_FILTER_READ);
+            stream_filter_append($stream, $codeTransformer::NAME, \STREAM_FILTER_READ);
         }
     }
 
     /**
      * Normalizes the path, to always use the slash as directory separator.
-     *
-     * @param string $path
-     *
-     * @return string
      */
-    private function normalizePath($path)
+    private function normalizePath(string $path): string
     {
-        if (DIRECTORY_SEPARATOR !== '/') {
-            return str_replace(DIRECTORY_SEPARATOR, '/', $path);
+        if (\DIRECTORY_SEPARATOR !== '/') {
+            return str_replace(\DIRECTORY_SEPARATOR, '/', $path);
         }
 
         return $path;
diff --git a/src/VCR/Util/TextUtil.php b/src/VCR/Util/TextUtil.php
index 449016f15..0a87bf52f 100644
--- a/src/VCR/Util/TextUtil.php
+++ b/src/VCR/Util/TextUtil.php
@@ -1,22 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR\Util;
 
-/**
- * TextUtil provides conversions between text based formats.
- */
 class TextUtil
 {
     /**
      * Returns lowercase camelcase from specified underscore text.
      *
      * Example: curl_multi_exec -> curlMultiExec
-     *
-     * @param  string $underscore Lowercased text.
-     *
-     * @return string Lowercase camelcased version of specified text.
      */
-    public static function underscoreToLowerCamelcase($underscore)
+    public static function underscoreToLowerCamelcase(string $underscore): string
     {
         return lcfirst(
             str_replace(
diff --git a/src/VCR/VCR.php b/src/VCR/VCR.php
index f1d2c8bc8..573ef207a 100644
--- a/src/VCR/VCR.php
+++ b/src/VCR/VCR.php
@@ -1,37 +1,48 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR;
 
+use Assert\Assertion;
+
 /**
  * Singleton interface to a Videorecorder.
  *
  * @method static Configuration configure()
- * @method static void insertCassette(string $cassetteName)
- * @method static void turnOn()
- * @method static void turnOff()
- * @method static void eject()
+ * @method static void          insertCassette(string $cassetteName)
+ * @method static void          turnOn()
+ * @method static void          turnOff()
+ * @method static void          eject()
+ *
+ * @mixin Videorecorder
  */
 class VCR
 {
     /**
      * Always allow to do HTTP requests and add to the cassette. Default mode.
      */
-    const MODE_NEW_EPISODES = 'new_episodes';
+    public const MODE_NEW_EPISODES = 'new_episodes';
 
     /**
      * Only allow new HTTP requests when the cassette is newly created.
      */
-    const MODE_ONCE = 'once';
+    public const MODE_ONCE = 'once';
 
     /**
      * Treat the fixtures as read only and never allow new HTTP requests.
      */
-    const MODE_NONE = 'none';
+    public const MODE_NONE = 'none';
 
-    public static function __callStatic($method, $parameters)
+    /**
+     * @param mixed[] $parameters
+     */
+    public static function __callStatic(string $method, array $parameters): mixed
     {
-        $instance = VCRFactory::get('VCR\Videorecorder');
+        $callable = [VCRFactory::get(Videorecorder::class), $method];
+
+        Assertion::isCallable($callable);
 
-        return call_user_func_array(array($instance, $method), $parameters);
+        return \call_user_func_array($callable, $parameters);
     }
 }
diff --git a/src/VCR/VCREvents.php b/src/VCR/VCREvents.php
index 1fb3cf9a5..be1df9a15 100644
--- a/src/VCR/VCREvents.php
+++ b/src/VCR/VCREvents.php
@@ -1,12 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR;
 
 final class VCREvents
 {
-    const VCR_BEFORE_RECORD = 'vcr.before_record';
-    const VCR_BEFORE_PLAYBACK = 'vcr.before_playback';
-    const VCR_AFTER_PLAYBACK = 'vcr.after_playback';
-    const VCR_BEFORE_HTTP_REQUEST = 'vcr.before_http_request';
-    const VCR_AFTER_HTTP_REQUEST = 'vcr.after_http_request';
+    public const VCR_BEFORE_RECORD = 'vcr.before_record';
+    public const VCR_BEFORE_PLAYBACK = 'vcr.before_playback';
+    public const VCR_AFTER_PLAYBACK = 'vcr.after_playback';
+    public const VCR_BEFORE_HTTP_REQUEST = 'vcr.before_http_request';
+    public const VCR_AFTER_HTTP_REQUEST = 'vcr.after_http_request';
 }
diff --git a/src/VCR/VCRException.php b/src/VCR/VCRException.php
index b9e39e801..cae3ca433 100644
--- a/src/VCR/VCRException.php
+++ b/src/VCR/VCRException.php
@@ -1,16 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR;
 
 use Assert\InvalidArgumentException;
 
 class VCRException extends InvalidArgumentException
 {
-    const LIBRARY_HOOK_DISABLED = 500;
-    const REQUEST_ERROR = 600;
-
-    public function __construct($message, $code, $propertyPath = null, $value = null, array $constraints = array())
-    {
-        parent::__construct($message, $code, $propertyPath, $value, $constraints);
-    }
+    public const LIBRARY_HOOK_DISABLED = 500;
+    public const REQUEST_ERROR = 600;
 }
diff --git a/src/VCR/VCRFactory.php b/src/VCR/VCRFactory.php
index 2c173d5d4..012008e0d 100644
--- a/src/VCR/VCRFactory.php
+++ b/src/VCR/VCRFactory.php
@@ -1,32 +1,32 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR;
 
+use Assert\Assertion;
+use VCR\LibraryHooks\CurlHook;
+use VCR\LibraryHooks\SoapHook;
+use VCR\Storage\Storage;
+use VCR\Util\StreamProcessor;
+
 class VCRFactory
 {
-    /**
-     * @var Configuration
-     **/
-    protected $config;
-
-    protected $mapping = array();
-
-    protected static $instance;
+    protected Configuration $config;
 
     /**
-     * Creates a new VCRFactory instance.
-     *
-     * @param Configuration $config
+     * @var array<string, object>
      */
-    protected function __construct($config = null)
+    protected array $mapping = [];
+
+    protected static ?self $instance = null;
+
+    protected function __construct(?Configuration $config = null)
     {
         $this->config = $config ?: $this->getOrCreate('VCR\Configuration');
     }
 
-    /**
-     * @return Videorecorder
-     */
-    protected function createVCRVideorecorder()
+    protected function createVCRVideorecorder(): Videorecorder
     {
         return new Videorecorder(
             $this->config,
@@ -35,48 +35,45 @@ protected function createVCRVideorecorder()
         );
     }
 
-    /**
-     * Provides an instance of the StreamProcessor.
-     *
-     * @return \VCR\Util\StreamProcessor
-     */
-    protected function createVCRUtilStreamProcessor()
+    protected function createVCRUtilStreamProcessor(): StreamProcessor
     {
-        return new Util\StreamProcessor($this->config);
+        return new StreamProcessor($this->config);
     }
 
-    protected function createStorage($cassetteName)
+    /** @return Storage<array> */
+    protected function createStorage(string $cassetteName): Storage
     {
         $dsn = $this->config->getCassettePath();
-        $class = $this->config->getStorage();
+        $className = $this->config->getStorage();
+        Assertion::subclassOf(
+            $className,
+            Storage::class,
+            \sprintf('Storage class "%s" is not a subclass of "%s".', $className, Storage::class)
+        );
+
+        /** @var Storage $storage */
+        $storage = new $className($dsn, $cassetteName);
 
-        return new $class($dsn, $cassetteName);
+        return $storage;
     }
 
-    protected function createVCRLibraryHooksSoapHook()
+    protected function createVCRLibraryHooksSoapHook(): SoapHook
     {
-        return new LibraryHooks\SoapHook(
+        return new SoapHook(
             $this->getOrCreate('VCR\CodeTransform\SoapCodeTransform'),
             $this->getOrCreate('VCR\Util\StreamProcessor')
         );
     }
 
-    protected function createVCRLibraryHooksCurlHook()
+    protected function createVCRLibraryHooksCurlHook(): CurlHook
     {
-        return new LibraryHooks\CurlHook(
+        return new CurlHook(
             $this->getOrCreate('VCR\CodeTransform\CurlCodeTransform'),
             $this->getOrCreate('VCR\Util\StreamProcessor')
         );
     }
 
-    /**
-     * Returns the same VCRFactory instance on ever call (singleton).
-     *
-     * @param  Configuration $config (Optional) configuration.
-     *
-     * @return VCRFactory
-     */
-    public static function getInstance(Configuration $config = null)
+    public static function getInstance(?Configuration $config = null): self
     {
         if (!self::$instance) {
             self::$instance = new self($config);
@@ -88,12 +85,12 @@ public static function getInstance(Configuration $config = null)
     /**
      * Returns an instance for specified class name and parameters.
      *
-     * @param string $className Class name to get a instance for.
-     * @param array $params Constructor arguments for this class.
+     * @param string  $className class name to get a instance for
+     * @param mixed[] $params    constructor arguments for this class
      *
-     * @return mixed An instance for specified class name and parameters.
+     * @return mixed an instance for specified class name and parameters
      */
-    public static function get($className, $params = array())
+    public static function get(string $className, array $params = []): mixed
     {
         return self::getInstance()->getOrCreate($className, $params);
     }
@@ -101,42 +98,36 @@ public static function get($className, $params = array())
     /**
      * Returns an instance for specified classname and parameters.
      *
-     * @param string $className Class name to get a instance for.
-     * @param array $params Constructor arguments for this class.
-     *
-     * @return mixed
+     * @param string  $className class name to get a instance for
+     * @param mixed[] $params    constructor arguments for this class
      */
-    public function getOrCreate($className, $params = array())
+    public function getOrCreate(string $className, array $params = []): mixed
     {
-        $key = $className . join('-', $params);
+        $key = $className.implode('-', $params);
 
         if (isset($this->mapping[$key])) {
             return $this->mapping[$key];
         }
 
-        if (method_exists($this, $this->getMethodName($className))) {
-            $callback = array($this, $this->getMethodName($className));
-            $instance =  call_user_func_array($callback, $params);
+        $callable = [$this, $this->getMethodName($className)];
+
+        if (\is_callable($callable)) {
+            $instance = \call_user_func_array($callable, $params);
         } else {
-            $instance = new $className;
+            $instance = new $className();
         }
 
         return $this->mapping[$key] = $instance;
     }
 
     /**
-     *
-     * Example:
+     * Example:.
      *
      *   ClassName: \Tux\Foo\Linus
      *   Returns: createTuxFooLinus
-     *
-     * @param string $className
-     *
-     * @return string
      */
-    protected function getMethodName($className)
+    protected function getMethodName(string $className): string
     {
-        return 'create' . str_replace('\\', '', $className);
+        return 'create'.str_replace('\\', '', $className);
     }
 }
diff --git a/src/VCR/Videorecorder.php b/src/VCR/Videorecorder.php
index ea8666433..4b672c429 100644
--- a/src/VCR/Videorecorder.php
+++ b/src/VCR/Videorecorder.php
@@ -1,17 +1,19 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VCR;
 
-use VCR\Util\Assertion;
-use VCR\Util\HttpClient;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use VCR\Event\AfterHttpRequestEvent;
 use VCR\Event\AfterPlaybackEvent;
 use VCR\Event\BeforeHttpRequestEvent;
 use VCR\Event\BeforePlaybackEvent;
 use VCR\Event\BeforeRecordEvent;
 use VCR\Event\Event;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\EventDispatcher;
+use VCR\Util\Assertion;
+use VCR\Util\HttpClient;
 
 /**
  * A videorecorder records requests on a cassette.
@@ -29,91 +31,51 @@
  */
 class Videorecorder
 {
-    /**
-     * @var Configuration Config options like which library hooks to use.
-     */
-    protected $config;
+    protected ?Cassette $cassette = null;
 
-    /**
-     * @var HttpClient Client to use to issue HTTP requests.
-     */
-    protected $client;
+    protected bool $isOn = false;
 
-    /**
-     * @var VCRFactory Factory which can create instances and resolve dependencies.
-     */
-    protected $factory;
+    protected EventDispatcherInterface $eventDispatcher;
 
     /**
-     * @var Cassette Cassette on which to store requests and responses.
+     * @var array<string, int>
      */
-    protected $cassette;
+    protected array $indexTable = [];
 
-    /**
-     * @var boolean Flag if this videorecorder is turned on or not.
-     */
-    protected $isOn = false;
-
-    /**
-     * @var EventDispatcherInterface
-     */
-    protected $eventDispatcher;
-
-    /**
-     * Creates a videorecorder instance.
-     *
-     * @param Configuration $config  Config options like which library hooks to use.
-     * @param HttpClient    $client  Client which is used to issue HTTP requests.
-     * @param VCRFactory    $factory Factory which can create instances and resolve dependencies.
-     */
-    public function __construct(Configuration $config, HttpClient $client, VCRFactory $factory)
-    {
-        $this->config = $config;
-        $this->client = $client;
-        $this->factory = $factory;
+    public function __construct(
+        protected Configuration $config,
+        protected HttpClient $client,
+        protected VCRFactory $factory
+    ) {
     }
 
-    /**
-     * @param EventDispatcherInterface $dispatcher
-     */
-    public function setEventDispatcher(EventDispatcherInterface $dispatcher)
+    public function setEventDispatcher(EventDispatcherInterface $dispatcher): void
     {
         $this->eventDispatcher = $dispatcher;
     }
 
-    /**
-     * @return EventDispatcherInterface
-     */
-    public function getEventDispatcher()
+    public function getEventDispatcher(): EventDispatcherInterface
     {
-        if (!$this->eventDispatcher) {
+        if (!isset($this->eventDispatcher)) {
             $this->eventDispatcher = new EventDispatcher();
         }
+
         return $this->eventDispatcher;
     }
 
-    /**
-     * Dispatches an event to all registered listeners.
-     *
-     * @param string $eventName The name of the event to dispatch.
-     * @param Event $event The event to pass to the event handlers/listeners.
-     * @return Event
-     */
-    private function dispatch($eventName, Event $event = null)
+    private function dispatch(Event $event, ?string $eventName = null): Event
     {
-        return $this->getEventDispatcher()->dispatch($event, $eventName);
+        $res = $this->getEventDispatcher()->dispatch($event, $eventName);
+
+        Assertion::isInstanceOf($res, Event::class);
+
+        return $res;
     }
 
     /**
-     * Turns on this videorecorder.
-     *
-     * This enables configured library hooks.
-     *
      * @api
-     *
-     * @return void
      */
-    public function turnOn()
+    public function turnOn(): void
     {
         if ($this->isOn) {
             $this->turnOff();
@@ -124,15 +86,9 @@ public function turnOn()
     }
 
     /**
-     * Turns off this videorecorder.
-     *
-     * Library hooks will be disabled and cassettes ejected.
-     *
      * @api
-     *
-     * @return void
      */
-    public function turnOff()
+    public function turnOff(): void
     {
         if ($this->isOn) {
             $this->disableLibraryHooks();
@@ -142,52 +98,38 @@ public function turnOff()
     }
 
     /**
-     * Eject the currently inserted cassette.
-     *
-     * Recording and playing back requests won't be possible after ejecting.
-     *
      * @api
-     *
-     * @return void
      */
-    public function eject()
+    public function eject(): void
     {
         Assertion::true($this->isOn, 'Please turn on VCR before ejecting a cassette, use: VCR::turnOn().');
+
         $this->cassette = null;
+        $this->resetIndex();
     }
 
     /**
-     * Inserts a cassette to record responses and requests on.
-     *
      * @api
-     *
-     * @param string $cassetteName Name of the cassette (used for the cassette filename).
-     *
-     * @return void
-     * @throws VCRException If videorecorder is turned off when inserting a cassette.
      */
-    public function insertCassette($cassetteName)
+    public function insertCassette(string $cassetteName): void
     {
         Assertion::true($this->isOn, 'Please turn on VCR before inserting a cassette, use: VCR::turnOn().');
 
-        if (!is_null($this->cassette)) {
+        if (null !== $this->cassette) {
             $this->eject();
         }
 
-        $storage = $this->factory->get('Storage', array($cassetteName));
+        $storage = $this->factory->get('Storage', [$cassetteName]);
 
         $this->cassette = new Cassette($cassetteName, $this->config, $storage);
         $this->enableLibraryHooks();
+        $this->resetIndex();
     }
 
     /**
-     * Returns the current Configuration for this videorecorder.
-     *
      * @api
-     *
-     * @return Configuration Configuration for this videorecorder.
      */
-    public function configure()
+    public function configure(): Configuration
     {
         return $this->config;
     }
@@ -198,75 +140,60 @@ public function configure()
      * If a request was already recorded on a cassette it's response is returned,
      * otherwise the request is issued and it's response recorded (and returned).
      *
-     * @api
-     *
-     * @param Request $request Intercepted request.
+     * @throws \LogicException if the mode is set to none or once and
+     *                         the cassette did not have a matching response
      *
-     * @return Response                Response for the intercepted request.
-     * @throws \BadMethodCallException If there was no cassette inserted.
-     * @throws \LogicException         If the mode is set to none or once and
-     *                                 the cassette did not have a matching response.
+     * @api
      */
-    public function handleRequest(Request $request)
+    public function handleRequest(Request $request): Response
     {
-        if ($this->cassette === null) {
-            throw new \BadMethodCallException(
-                'Invalid http request. No cassette inserted. '
-                . 'Please make sure to insert a cassette in your unit test using '
-                . "VCR::insertCassette('name');"
-            );
+        if (null === $this->cassette) {
+            throw new \BadMethodCallException('Invalid http request. No cassette inserted. Please make sure to insert a cassette in your unit test using '."VCR::insertCassette('name');");
         }
 
-        $event = new BeforePlaybackEvent($request, $this->cassette);
-        $this->dispatch(VCREvents::VCR_BEFORE_PLAYBACK, $event);
+        $this->dispatch(new BeforePlaybackEvent($request, $this->cassette), VCREvents::VCR_BEFORE_PLAYBACK);
 
-        $response = $this->cassette->playback($request);
+        // Add an index to the request to allow recording identical requests and play them back in the same sequence.
+        $index = $this->iterateIndex($request);
+        $response = $this->cassette->playback($request, $index);
 
         // Playback succeeded and the recorded response can be returned.
         if (!empty($response)) {
-            $event = new AfterPlaybackEvent($request, $response, $this->cassette);
-            $this->dispatch(VCREvents::VCR_AFTER_PLAYBACK, $event);
+            $this->dispatch(
+                new AfterPlaybackEvent($request, $response, $this->cassette),
+                VCREvents::VCR_AFTER_PLAYBACK
+            );
+
             return $response;
         }
 
         if (VCR::MODE_NONE === $this->config->getMode()
             || VCR::MODE_ONCE === $this->config->getMode()
-            && $this->cassette->isNew() === false
+            && false === $this->cassette->isNew()
         ) {
-            throw new \LogicException(
-                sprintf(
-                    "The request does not match a previously recorded request and the 'mode' is set to '%s'. "
-                    . "If you want to send the request anyway, make sure your 'mode' is set to 'new_episodes'. "
-                    . 'Please see http://php-vcr.github.io/documentation/configuration/#record-modes.'
-                    . "\nCassette: %s \n Request: %s",
-                    $this->config->getMode(),
-                    $this->cassette->getName(),
-                    print_r($request->toArray(), true)
-                )
-            );
+            throw new \LogicException(\sprintf("The request does not match a previously recorded request and the 'mode' is set to '%s'. If you want to send the request anyway, make sure your 'mode' is set to 'new_episodes'. ".'Please see http://php-vcr.github.io/documentation/configuration/#record-modes.'."\nCassette: %s \n Request: %s", $this->config->getMode(), $this->cassette->getName(), print_r($request->toArray(), true)));
         }
 
         $this->disableLibraryHooks();
 
-        $this->dispatch(VCREvents::VCR_BEFORE_HTTP_REQUEST, new BeforeHttpRequestEvent($request));
-        $response = $this->client->send($request);
-        $this->dispatch(VCREvents::VCR_AFTER_HTTP_REQUEST, new AfterHttpRequestEvent($request, $response));
+        try {
+            $this->dispatch(new BeforeHttpRequestEvent($request), VCREvents::VCR_BEFORE_HTTP_REQUEST);
+            $response = $this->client->send($request);
+            $this->dispatch(new AfterHttpRequestEvent($request, $response), VCREvents::VCR_AFTER_HTTP_REQUEST);
 
-        $this->dispatch(VCREvents::VCR_BEFORE_RECORD, new BeforeRecordEvent($request, $response, $this->cassette));
-        $this->cassette->record($request, $response);
-        $this->enableLibraryHooks();
+            $this->dispatch(new BeforeRecordEvent($request, $response, $this->cassette), VCREvents::VCR_BEFORE_RECORD);
+            $this->cassette->record($request, $response, $index);
+        } finally {
+            $this->enableLibraryHooks();
+        }
 
         return $response;
     }
 
     /**
-     * Disables all library hooks.
-     *
      * @api
-     *
-     * @return void
      */
-    protected function disableLibraryHooks()
+    protected function disableLibraryHooks(): void
     {
         foreach ($this->config->getLibraryHooks() as $hookClass) {
             $hook = $this->factory->get($hookClass);
@@ -275,21 +202,15 @@ protected function disableLibraryHooks()
     }
 
     /**
-     * Enables configured library hooks.
-     *
      * @api
-     *
-     * @return void
      */
-    protected function enableLibraryHooks()
+    protected function enableLibraryHooks(): void
     {
         $self = $this;
         foreach ($this->config->getLibraryHooks() as $hookClass) {
             $hook = $this->factory->get($hookClass);
             $hook->enable(
-                function (Request $request) use ($self) {
-                    return $self->handleRequest($request);
-                }
+                fn (Request $request) => $self->handleRequest($request)
             );
         }
     }
@@ -305,4 +226,19 @@ public function __destruct()
             $this->turnOff();
         }
     }
+
+    protected function iterateIndex(Request $request): int
+    {
+        $hash = $request->getHash();
+        if (!isset($this->indexTable[$hash])) {
+            $this->indexTable[$hash] = -1;
+        }
+
+        return ++$this->indexTable[$hash];
+    }
+
+    public function resetIndex(): void
+    {
+        $this->indexTable = [];
+    }
 }
diff --git a/tests/integration/guzzle/6/test/AsyncTest.php b/tests/Integration/Guzzle/AsyncTest.php
similarity index 56%
rename from tests/integration/guzzle/6/test/AsyncTest.php
rename to tests/Integration/Guzzle/AsyncTest.php
index 1344fb040..6fac74c4d 100644
--- a/tests/integration/guzzle/6/test/AsyncTest.php
+++ b/tests/Integration/Guzzle/AsyncTest.php
@@ -1,25 +1,25 @@
 <?php
 
-namespace VCR\Example;
+declare(strict_types=1);
+
+namespace VCR\Tests\Integration\Guzzle;
 
 use GuzzleHttp\Client;
 use org\bovigo\vfs\vfsStream;
+use PHPUnit\Framework\TestCase;
 
-/**
- * Tests example request.
- */
-class AsyncTest extends \PHPUnit_Framework_TestCase
+final class AsyncTest extends TestCase
 {
-    const TEST_GET_URL = 'https://api.chew.pro/trbmb';
-    const TEST_GET_URL_2 = 'https://api.chew.pro/trbmb?foo=42';
+    public const TEST_GET_URL = 'https://httpbin.org/get';
+    public const TEST_GET_URL_2 = 'https://httpbin.org/get?foo=42';
 
-    public function setUp()
+    protected function setUp(): void
     {
         vfsStream::setup('testDir');
         \VCR\VCR::configure()->setCassettePath(vfsStream::url('testDir'));
     }
 
-    public function testAsyncLock()
+    public function testAsyncLock(): void
     {
         \VCR\VCR::turnOn();
         \VCR\VCR::insertCassette('test-cassette.yml');
@@ -32,14 +32,14 @@ public function testAsyncLock()
         // Let's check that we can perform 2 async request on different URLs without locking.
         // Solves https://github.com/php-vcr/php-vcr/issues/211
 
-        $this->assertValidGETResponse(\GuzzleHttp\json_decode($response->getBody()));
+        $this->assertValidGETResponse(\GuzzleHttp\json_decode($response->getBody()->getContents(), true));
 
         \VCR\VCR::turnOff();
     }
 
-    protected function assertValidGETResponse($info)
+    protected function assertValidGETResponse(mixed $info): void
     {
-        $this->assertInternalType('array', $info, 'Response is not an array.');
-        $this->assertArrayHasKey('0', $info, 'API did not return any value.');
+        $this->assertIsArray($info, 'Response is not an array.');
+        $this->assertArrayHasKey('url', $info, 'API did not return any value.');
     }
 }
diff --git a/tests/Integration/Guzzle/ErrorTest.php b/tests/Integration/Guzzle/ErrorTest.php
new file mode 100644
index 000000000..d57d6c6c7
--- /dev/null
+++ b/tests/Integration/Guzzle/ErrorTest.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Integration\Guzzle;
+
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\ConnectException;
+use org\bovigo\vfs\vfsStream;
+use PHPUnit\Framework\TestCase;
+
+final class ErrorTest extends TestCase
+{
+    public const TEST_GET_URL = 'http://localhost:9959';
+
+    protected function setUp(): void
+    {
+        vfsStream::setup('testDir');
+        \VCR\VCR::configure()->setCassettePath(vfsStream::url('testDir'));
+    }
+
+    public function testConnectException(): void
+    {
+        $nonInstrumentedException = null;
+        try {
+            $client = new Client();
+            $client->get(self::TEST_GET_URL);
+        } catch (ConnectException $e) {
+            $nonInstrumentedException = $e;
+        }
+        $this->assertNotNull($nonInstrumentedException);
+        $catched = false;
+        \VCR\VCR::turnOn();
+        \VCR\VCR::insertCassette('test-cassette.yml');
+        try {
+            $client = new Client();
+            $client->get(self::TEST_GET_URL);
+        } catch (ConnectException $e) {
+            $catched = true;
+            $this->assertEquals($e->getMessage(), $nonInstrumentedException->getMessage());
+        }
+        $this->assertTrue($catched);
+        \VCR\VCR::turnOff();
+    }
+}
diff --git a/tests/Integration/Soap/ExampleSoapClient.php b/tests/Integration/Soap/ExampleSoapClient.php
new file mode 100644
index 000000000..0d7c2fb17
--- /dev/null
+++ b/tests/Integration/Soap/ExampleSoapClient.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Integration\Soap;
+
+/**
+ * Converts temperature units from webservicex.
+ *
+ * @see http://www.webservicex.net/New/Home/ServiceDetail/31
+ */
+class ExampleSoapClient
+{
+    public const EXAMPLE_WSDL = 'http://www.dataaccess.com/webservicesserver/numberconversion.wso?WSDL';
+
+    public function call(int $number = 12): string
+    {
+        $client = new \SoapClient(self::EXAMPLE_WSDL, ['soap_version' => \SOAP_1_2]);
+        $response = $client->NumberToWords(['ubiNum' => $number]);
+
+        return trim((string) $response->NumberToWordsResult);
+    }
+
+    public function callBadUrl(): void
+    {
+        // The port is not open. This leads to an error
+        $client = new \SoapClient('http://localhost:9945', ['soap_version' => \SOAP_1_2]);
+    }
+}
diff --git a/tests/Integration/Soap/ExampleSoapClientTest.php b/tests/Integration/Soap/ExampleSoapClientTest.php
new file mode 100644
index 000000000..67b985283
--- /dev/null
+++ b/tests/Integration/Soap/ExampleSoapClientTest.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Integration\Soap;
+
+use org\bovigo\vfs\vfsStream;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Converts temperature units from webservicex.
+ *
+ * @see http://www.webservicex.net/New/Home/ServiceDetail/31
+ */
+final class ExampleSoapClientTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        // Configure virtual filesystem.
+        vfsStream::setup('testDir');
+        \VCR\VCR::configure()->setCassettePath(vfsStream::url('testDir'));
+
+        // Trigger autoload of assertions (broken after VCR is enabled...
+        $this->assertNotNull(1);
+        $this->assertTrue(true);
+    }
+
+    public function testCallDirectly(): void
+    {
+        $actual = $this->callSoap();
+        $this->assertIsString($actual);
+        $this->assertEquals('twelve', $actual);
+    }
+
+    public function testCallIntercepted(): void
+    {
+        $actual = $this->callSoapIntercepted();
+        $this->assertIsString($actual);
+        $this->assertEquals('twelve', $actual);
+    }
+
+    public function testCallDirectlyEqualsIntercepted(): void
+    {
+        $this->assertEquals($this->callSoap(), $this->callSoapIntercepted());
+    }
+
+    protected function callSoap(): mixed
+    {
+        $soapClient = new ExampleSoapClient();
+
+        return $soapClient->call();
+    }
+
+    protected function callSoapIntercepted(): mixed
+    {
+        \VCR\VCR::turnOn();
+        \VCR\VCR::insertCassette('test-cassette.yml');
+        $result = $this->callSoap();
+        \VCR\VCR::turnOff();
+
+        return $result;
+    }
+}
diff --git a/tests/Unit/CassetteTest.php b/tests/Unit/CassetteTest.php
new file mode 100644
index 000000000..761fc2140
--- /dev/null
+++ b/tests/Unit/CassetteTest.php
@@ -0,0 +1,145 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit;
+
+use org\bovigo\vfs\vfsStream;
+use PHPUnit\Framework\TestCase;
+use VCR\Cassette;
+use VCR\Configuration;
+use VCR\Request;
+use VCR\Response;
+use VCR\Storage\Yaml;
+
+final class CassetteTest extends TestCase
+{
+    private Cassette $cassette;
+
+    protected function setUp(): void
+    {
+        vfsStream::setup('test');
+        $this->cassette = new Cassette('test', new Configuration(), new Yaml(vfsStream::url('test/'), 'json_test'));
+    }
+
+    public function testGetName(): void
+    {
+        $this->assertEquals('test', $this->cassette->getName());
+    }
+
+    public function testDontOverwriteRecord(): void
+    {
+        $request = new Request('GET', 'https://example.com');
+        $response1 = new Response('200', [], 'sometest');
+        $response2 = new Response('200', [], 'sometest');
+        $this->cassette->record($request, $response1);
+        $this->cassette->record($request, $response2);
+
+        $this->assertEquals($response1->toArray(), $this->cassette->playback($request)?->toArray());
+    }
+
+    public function testPlaybackAlreadyRecordedRequest(): void
+    {
+        $request = new Request('GET', 'https://example.com');
+        $response = new Response('200', [], 'sometest');
+        $this->cassette->record($request, $response);
+
+        $this->assertEquals($response->toArray(), $this->cassette->playback($request)?->toArray());
+    }
+
+    public function testHasResponseNotFound(): void
+    {
+        $request = new Request('GET', 'https://example.com');
+
+        $this->assertFalse($this->cassette->hasResponse($request), 'Expected false if request not found.');
+    }
+
+    public function testHasResponseFound(): void
+    {
+        $request = new Request('GET', 'https://example.com');
+        $response = new Response('200', [], 'sometest');
+        $this->cassette->record($request, $response);
+
+        $this->assertTrue($this->cassette->hasResponse($request), 'Expected true if request was found.');
+    }
+
+    /**
+     * Ensure that if a second identical request is played back from a legacy
+     * cassette, the first response will be returned.
+     */
+    public function testPlaybackOfIdenticalRequestsFromLegacyCassette(): void
+    {
+        $request1 = new Request('GET', 'https://example.com');
+        $response1 = new Response('200', [], 'response1');
+
+        $request2 = new Request('GET', 'https://example.com');
+        $response2 = new Response('200', [], 'response2');
+
+        // These are legacy recordings with no index keys.
+        $recordings = [
+            [
+                'request' => $request1->toArray(),
+                'response' => $response1->toArray(),
+            ],
+            [
+                'request' => $request2->toArray(),
+                'response' => $response2->toArray(),
+            ],
+        ];
+
+        $cassette = $this->createCassetteWithRecordings($recordings);
+
+        $this->assertEquals($response1->toArray(), $cassette->playback($request1, 0)->toArray());
+        $this->assertEquals($response1->toArray(), $cassette->playback($request2, 1)->toArray());
+    }
+
+    /**
+     * Ensure that if a second identical request is played back from an cassette
+     * with indexed recordings, the response corresponding to the recording
+     * index will be returned.
+     */
+    public function testPlaybackOfIdenticalRequests(): void
+    {
+        $request1 = new Request('GET', 'https://example.com');
+        $response1 = new Response('200', [], 'response1');
+
+        $request2 = new Request('GET', 'https://example.com');
+        $response2 = new Response('200', [], 'response2');
+
+        // These are recordings with index keys which support playback of
+        // multiple identical requests.
+        $recordings = [
+            [
+                'request' => $request1->toArray(),
+                'response' => $response1->toArray(),
+                'index' => 0,
+            ],
+            [
+                'request' => $request2->toArray(),
+                'response' => $response2->toArray(),
+                'index' => 1,
+            ],
+        ];
+
+        $cassette = $this->createCassetteWithRecordings($recordings);
+
+        $this->assertEquals($response1->toArray(), $cassette->playback($request1, 0)->toArray());
+        $this->assertNotEquals($response1->toArray(), $cassette->playback($request2, 1)->toArray());
+        $this->assertEquals($response2->toArray(), $cassette->playback($request2, 1)->toArray());
+    }
+
+    /**
+     * @param array<int,array<string,int|string|array<string,mixed>|null>> $recordings
+     */
+    protected function createCassetteWithRecordings(array $recordings): Cassette
+    {
+        $storage = new Yaml(vfsStream::url('test/'), 'json_test');
+
+        foreach ($recordings as $recording) {
+            $storage->storeRecording($recording);
+        }
+        $configuration = new Configuration();
+
+        return new Cassette('cassette_name', $configuration, $storage);
+    }
+}
diff --git a/tests/Unit/CodeTransform/AbstractCodeTransformTest.php b/tests/Unit/CodeTransform/AbstractCodeTransformTest.php
new file mode 100644
index 000000000..847ba0658
--- /dev/null
+++ b/tests/Unit/CodeTransform/AbstractCodeTransformTest.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit\CodeTransform;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use VCR\CodeTransform\AbstractCodeTransform;
+
+final class AbstractCodeTransformTest extends TestCase
+{
+    /**
+     * @param string[] $methods
+     *
+     * @return AbstractCodeTransform&MockObject
+     */
+    protected function getFilter(array $methods = [])
+    {
+        $defaults = array_merge(
+            ['transformCode'],
+            $methods
+        );
+
+        $filter = $this->getMockBuilder(AbstractCodeTransform::class)
+            ->setMethods($defaults)
+            ->getMockForAbstractClass();
+
+        if (\in_array('transformCode', $methods)) {
+            $filter
+                ->expects($this->once())
+                ->method('transformCode')
+                ->with($this->isType('string'))
+                ->willReturnArgument(0);
+        }
+
+        return $filter;
+    }
+
+    public function testRegisterAlreadyRegistered(): void
+    {
+        $filter = $this->getFilter();
+        $filter->register();
+
+        $this->assertContains(AbstractCodeTransform::NAME, stream_get_filters(), 'First attempt to register failed.');
+
+        $filter->register();
+
+        $this->assertContains(AbstractCodeTransform::NAME, stream_get_filters(), 'Second attempt to register failed.');
+    }
+}
diff --git a/tests/Unit/CodeTransform/CurlCodeTransformTest.php b/tests/Unit/CodeTransform/CurlCodeTransformTest.php
new file mode 100644
index 000000000..4dc9181d6
--- /dev/null
+++ b/tests/Unit/CodeTransform/CurlCodeTransformTest.php
@@ -0,0 +1,75 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit\CodeTransform;
+
+use PHPUnit\Framework\TestCase;
+use VCR\CodeTransform\CurlCodeTransform;
+
+final class CurlCodeTransformTest extends TestCase
+{
+    /**
+     * @dataProvider codeSnippetProvider
+     */
+    public function testTransformCode(string $expected, string $code): void
+    {
+        $codeTransform = new class extends CurlCodeTransform {
+            // A proxy to access the protected transformCode method.
+            public function publicTransformCode(string $code): string
+            {
+                return $this->transformCode($code);
+            }
+        };
+
+        $this->assertEquals($expected, $codeTransform->publicTransformCode($code));
+    }
+
+    /** @return array<string[]> */
+    public function codeSnippetProvider(): array
+    {
+        return [
+            ['\VCR\LibraryHooks\CurlHook::curl_init(', 'CURL_INIT ('],
+            ['\VCR\LibraryHooks\CurlHook::curl_exec(', 'curl_exec('],
+            ['\VCR\LibraryHooks\CurlHook::curl_getinfo(', 'curl_getinfo('],
+            ['\VCR\LibraryHooks\CurlHook::curl_setopt(', 'curl_setopt('],
+            ['\VCR\LibraryHooks\CurlHook::curl_multi_add_handle(', 'curl_multi_add_handle('],
+            ['\VCR\LibraryHooks\CurlHook::curl_multi_remove_handle(', 'curl_multi_remove_handle('],
+            ['\VCR\LibraryHooks\CurlHook::curl_multi_exec(', 'curl_multi_exec('],
+            ['\VCR\LibraryHooks\CurlHook::curl_multi_info_read(', 'curl_multi_info_read('],
+            ['\VCR\LibraryHooks\CurlHook::curl_reset(', 'curl_reset('],
+
+            ['\VCR\LibraryHooks\CurlHook::curl_init(', '\\CURL_INIT ('],
+            ['\VCR\LibraryHooks\CurlHook::curl_exec(', '\\curl_exec('],
+            ['\VCR\LibraryHooks\CurlHook::curl_getinfo(', '\\curl_getinfo('],
+            ['\VCR\LibraryHooks\CurlHook::curl_setopt(', '\\curl_setopt('],
+            ['\VCR\LibraryHooks\CurlHook::curl_multi_add_handle(', '\\curl_multi_add_handle('],
+            ['\VCR\LibraryHooks\CurlHook::curl_multi_remove_handle(', '\\curl_multi_remove_handle('],
+            ['\VCR\LibraryHooks\CurlHook::curl_multi_exec(', '\\curl_multi_exec('],
+            ['\VCR\LibraryHooks\CurlHook::curl_multi_info_read(', '\\curl_multi_info_read('],
+            ['\VCR\LibraryHooks\CurlHook::curl_reset(', '\\curl_reset('],
+
+            ['SomeClass::CURL_INIT (', 'SomeClass::CURL_INIT ('],
+            ['SomeClass::curl_exec(', 'SomeClass::curl_exec('],
+            ['SomeClass::curl_getinfo(', 'SomeClass::curl_getinfo('],
+            ['SomeClass::curl_setopt(', 'SomeClass::curl_setopt('],
+            ['SomeClass::curl_multi_add_handle(', 'SomeClass::curl_multi_add_handle('],
+            ['SomeClass::curl_multi_remove_handle(', 'SomeClass::curl_multi_remove_handle('],
+            ['SomeClass::curl_multi_exec(', 'SomeClass::curl_multi_exec('],
+            ['SomeClass::curl_multi_info_read(', 'SomeClass::curl_multi_info_read('],
+            ['SomeClass::curl_reset(', 'SomeClass::curl_reset('],
+
+            ['$object->CURL_INIT (', '$object->CURL_INIT ('],
+            ['$object->curl_exec(', '$object->curl_exec('],
+            ['$object->curl_getinfo(', '$object->curl_getinfo('],
+            ['$object->curl_setopt(', '$object->curl_setopt('],
+            ['$object->curl_multi_add_handle(', '$object->curl_multi_add_handle('],
+            ['$object->curl_multi_remove_handle(', '$object->curl_multi_remove_handle('],
+            ['$object->curl_multi_exec(', '$object->curl_multi_exec('],
+            ['$object->curl_multi_info_read(', '$object->curl_multi_info_read('],
+            ['$object->curl_reset(', '$object->curl_reset('],
+
+            ['function send_http_asynchronous_curl_exec(', 'function send_http_asynchronous_curl_exec('],
+        ];
+    }
+}
diff --git a/tests/Unit/CodeTransform/SoapCodeTransformTest.php b/tests/Unit/CodeTransform/SoapCodeTransformTest.php
new file mode 100644
index 000000000..dd8ddcf72
--- /dev/null
+++ b/tests/Unit/CodeTransform/SoapCodeTransformTest.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit\CodeTransform;
+
+use PHPUnit\Framework\TestCase;
+use VCR\CodeTransform\SoapCodeTransform;
+
+final class SoapCodeTransformTest extends TestCase
+{
+    /**
+     * @dataProvider codeSnippetProvider
+     */
+    public function testTransformCode(string $expected, string $code): void
+    {
+        $codeTransform = new class extends SoapCodeTransform {
+            // A proxy to access the protected transformCode method.
+            public function publicTransformCode(string $code): string
+            {
+                return $this->transformCode($code);
+            }
+        };
+
+        $this->assertEquals($expected, $codeTransform->publicTransformCode($code));
+    }
+
+    /** @return array<string[]> */
+    public function codeSnippetProvider(): array
+    {
+        return [
+            ['new \VCR\Util\SoapClient(', 'new \SoapClient('],
+            ['new \VCR\Util\SoapClient(', 'new SoapClient('],
+            ['extends \VCR\Util\SoapClient', 'extends \SoapClient'],
+            ["extends \\VCR\\Util\\SoapClient\n", "extends \\SoapClient\n"],
+            ["extends MySoapClientBuilder\n", "extends MySoapClientBuilder\n"],
+            ["extends SoapClientFactory\n", "extends SoapClientFactory\n"],
+            ['new SoapClientExtended(', 'new SoapClientExtended('],
+            ['new \SoapClientExtended(', 'new \SoapClientExtended('],
+        ];
+    }
+}
diff --git a/tests/Unit/ConfigurationTest.php b/tests/Unit/ConfigurationTest.php
new file mode 100644
index 000000000..b875844a3
--- /dev/null
+++ b/tests/Unit/ConfigurationTest.php
@@ -0,0 +1,163 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit;
+
+use PHPUnit\Framework\TestCase;
+use VCR\Configuration;
+use VCR\VCRException;
+
+final class ConfigurationTest extends TestCase
+{
+    private Configuration $config;
+
+    protected function setUp(): void
+    {
+        $this->config = new Configuration();
+    }
+
+    public function testSetCassettePathThrowsErrorOnInvalidPath(): void
+    {
+        $this->expectException(VCRException::class);
+        $this->expectExceptionMessage(
+            "Cassette path 'invalid_path' is not a directory. Please either "
+            .'create it or set a different cassette path using '
+            ."\\VCR\\VCR::configure()->setCassettePath('directory')."
+        );
+        $this->config->setCassettePath('invalid_path');
+    }
+
+    public function testGetLibraryHooks(): void
+    {
+        $this->assertEquals(
+            [
+                'VCR\LibraryHooks\StreamWrapperHook',
+                'VCR\LibraryHooks\CurlHook',
+                'VCR\LibraryHooks\SoapHook',
+            ],
+            $this->config->getLibraryHooks()
+        );
+    }
+
+    public function testEnableLibraryHooks(): void
+    {
+        $this->config->enableLibraryHooks(['stream_wrapper']);
+        $this->assertEquals(
+            [
+                'VCR\LibraryHooks\StreamWrapperHook',
+            ],
+            $this->config->getLibraryHooks()
+        );
+    }
+
+    public function testEnableSingleLibraryHook(): void
+    {
+        $this->config->enableLibraryHooks('stream_wrapper');
+        $this->assertEquals(
+            [
+                'VCR\LibraryHooks\StreamWrapperHook',
+            ],
+            $this->config->getLibraryHooks()
+        );
+    }
+
+    public function testEnableLibraryHooksFailsWithWrongHookName(): void
+    {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage("Library hooks don't exist: non_existing");
+        $this->config->enableLibraryHooks(['non_existing']);
+    }
+
+    public function testEnableRequestMatchers(): void
+    {
+        $this->config->enableRequestMatchers(['body', 'headers']);
+        $this->assertEquals(
+            [
+                ['VCR\RequestMatcher', 'matchHeaders'],
+                ['VCR\RequestMatcher', 'matchBody'],
+            ],
+            $this->config->getRequestMatchers()
+        );
+    }
+
+    public function testEnableRequestMatchersFailsWithNoExistingName(): void
+    {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage("Request matchers don't exist: wrong, name");
+        $this->config->enableRequestMatchers(['wrong', 'name']);
+    }
+
+    public function testAddRequestMatcherFailsWithNoName(): void
+    {
+        $this->expectException(VCRException::class);
+        $this->expectExceptionMessage("A request matchers name must be at least one character long. Found ''");
+        $expected = fn ($first, $second) => true;
+        $this->config->addRequestMatcher('', $expected);
+    }
+
+    public function testAddRequestMatchers(): void
+    {
+        $expected = fn () => true;
+        $this->config->addRequestMatcher('new_matcher', $expected);
+        $this->assertContains($expected, $this->config->getRequestMatchers());
+    }
+
+    /**
+     * @dataProvider availableStorageProvider
+     */
+    public function testSetStorage(string $name, string $className): void
+    {
+        $this->config->setStorage($name);
+        $this->assertEquals($className, $this->config->getStorage(), "$name should be class $className.");
+    }
+
+    /** @return array<string[]> */
+    public function availableStorageProvider(): array
+    {
+        return [
+            ['json', 'VCR\Storage\Json'],
+            ['yaml', 'VCR\Storage\Yaml'],
+        ];
+    }
+
+    public function testSetStorageInvalidName(): void
+    {
+        $this->expectException(VCRException::class);
+        $this->expectExceptionMessage("Storage 'Does not exist' not available.");
+        $this->config->setStorage('Does not exist');
+    }
+
+    public function testGetStorage(): void
+    {
+        $class = $this->config->getStorage();
+        $this->assertContains('Iterator', (array) class_implements($class));
+        $this->assertContains('Traversable', (array) class_implements($class));
+        $this->assertContains('VCR\Storage\AbstractStorage', (array) class_parents($class));
+    }
+
+    public function testWhitelist(): void
+    {
+        $expected = ['Tux', 'Gnu'];
+
+        $this->config->setWhiteList($expected);
+
+        $this->assertEquals($expected, $this->config->getWhiteList());
+    }
+
+    public function testBlacklist(): void
+    {
+        $expected = ['Tux', 'Gnu'];
+
+        $this->config->setBlackList($expected);
+
+        $this->assertEquals($expected, $this->config->getBlackList());
+    }
+
+    public function testSetModeInvalidName(): void
+    {
+        $this->expectException(VCRException::class);
+        $this->expectExceptionMessage("Mode 'invalid' does not exist.");
+        $this->config->setMode('invalid');
+    }
+}
diff --git a/tests/Unit/Event/AfterHttpRequestEventTest.php b/tests/Unit/Event/AfterHttpRequestEventTest.php
new file mode 100644
index 000000000..efa3b43a4
--- /dev/null
+++ b/tests/Unit/Event/AfterHttpRequestEventTest.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit\Event;
+
+use PHPUnit\Framework\TestCase;
+use VCR\Event\AfterHttpRequestEvent;
+use VCR\Request;
+use VCR\Response;
+
+final class AfterHttpRequestEventTest extends TestCase
+{
+    private AfterHttpRequestEvent $event;
+
+    protected function setUp(): void
+    {
+        $this->event = new AfterHttpRequestEvent(new Request('GET', 'http://example.com'), new Response('200'));
+    }
+
+    public function testGetRequest(): void
+    {
+        $this->assertInstanceOf(Request::class, $this->event->getRequest());
+    }
+
+    public function testGetResponse(): void
+    {
+        $this->assertInstanceOf(Response::class, $this->event->getResponse());
+    }
+}
diff --git a/tests/Unit/Event/AfterPlaybackEventTest.php b/tests/Unit/Event/AfterPlaybackEventTest.php
new file mode 100644
index 000000000..71cc1e8f6
--- /dev/null
+++ b/tests/Unit/Event/AfterPlaybackEventTest.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit\Event;
+
+use PHPUnit\Framework\TestCase;
+use VCR\Cassette;
+use VCR\Configuration;
+use VCR\Event\AfterPlaybackEvent;
+use VCR\Request;
+use VCR\Response;
+use VCR\Storage;
+
+final class AfterPlaybackEventTest extends TestCase
+{
+    private AfterPlaybackEvent $event;
+
+    protected function setUp(): void
+    {
+        $this->event = new AfterPlaybackEvent(
+            new Request('GET', 'http://example.com'),
+            new Response('200'),
+            new Cassette('test', new Configuration(), new Storage\Blackhole())
+        );
+    }
+
+    public function testGetRequest(): void
+    {
+        $this->assertInstanceOf(Request::class, $this->event->getRequest());
+    }
+
+    public function testGetResponse(): void
+    {
+        $this->assertInstanceOf(Response::class, $this->event->getResponse());
+    }
+
+    public function testGetCassette(): void
+    {
+        $this->assertInstanceOf(Cassette::class, $this->event->getCassette());
+    }
+}
diff --git a/tests/Unit/Event/BeforeHttpRequestEventTest.php b/tests/Unit/Event/BeforeHttpRequestEventTest.php
new file mode 100644
index 000000000..252302276
--- /dev/null
+++ b/tests/Unit/Event/BeforeHttpRequestEventTest.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit\Event;
+
+use PHPUnit\Framework\TestCase;
+use VCR\Event\BeforeHttpRequestEvent;
+use VCR\Request;
+
+final class BeforeHttpRequestEventTest extends TestCase
+{
+    private BeforeHttpRequestEvent $event;
+
+    protected function setUp(): void
+    {
+        $this->event = new BeforeHttpRequestEvent(new Request('GET', 'http://example.com'));
+    }
+
+    public function testGetRequest(): void
+    {
+        $this->assertInstanceOf(Request::class, $this->event->getRequest());
+    }
+}
diff --git a/tests/Unit/Event/BeforePlaybackEventTest.php b/tests/Unit/Event/BeforePlaybackEventTest.php
new file mode 100644
index 000000000..00d22d0bb
--- /dev/null
+++ b/tests/Unit/Event/BeforePlaybackEventTest.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit\Event;
+
+use PHPUnit\Framework\TestCase;
+use VCR\Cassette;
+use VCR\Configuration;
+use VCR\Event\BeforePlaybackEvent;
+use VCR\Request;
+use VCR\Storage;
+
+final class BeforePlaybackEventTest extends TestCase
+{
+    private BeforePlaybackEvent $event;
+
+    protected function setUp(): void
+    {
+        $this->event = new BeforePlaybackEvent(
+            new Request('GET', 'http://example.com'),
+            new Cassette('test', new Configuration(), new Storage\Blackhole())
+        );
+    }
+
+    public function testGetRequest(): void
+    {
+        $this->assertInstanceOf(Request::class, $this->event->getRequest());
+    }
+
+    public function testGetCassette(): void
+    {
+        $this->assertInstanceOf(Cassette::class, $this->event->getCassette());
+    }
+}
diff --git a/tests/Unit/Event/BeforeRecordEventTest.php b/tests/Unit/Event/BeforeRecordEventTest.php
new file mode 100644
index 000000000..59976b70c
--- /dev/null
+++ b/tests/Unit/Event/BeforeRecordEventTest.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit\Event;
+
+use PHPUnit\Framework\TestCase;
+use VCR\Cassette;
+use VCR\Configuration;
+use VCR\Event\BeforeRecordEvent;
+use VCR\Request;
+use VCR\Response;
+use VCR\Storage;
+
+final class BeforeRecordEventTest extends TestCase
+{
+    private BeforeRecordEvent $event;
+
+    protected function setUp(): void
+    {
+        $this->event = new BeforeRecordEvent(
+            new Request('GET', 'http://example.com'),
+            new Response('200'),
+            new Cassette('test', new Configuration(), new Storage\Blackhole())
+        );
+    }
+
+    public function testGetRequest(): void
+    {
+        $this->assertInstanceOf(Request::class, $this->event->getRequest());
+    }
+
+    public function testGetResponse(): void
+    {
+        $this->assertInstanceOf(Response::class, $this->event->getResponse());
+    }
+
+    public function testGetCassette(): void
+    {
+        $this->assertInstanceOf(Cassette::class, $this->event->getCassette());
+    }
+}
diff --git a/tests/VCR/LibraryHooks/CurlHookTest.php b/tests/Unit/LibraryHooks/CurlHookTest.php
similarity index 54%
rename from tests/VCR/LibraryHooks/CurlHookTest.php
rename to tests/Unit/LibraryHooks/CurlHookTest.php
index 8e08c4d7a..06b9275d8 100644
--- a/tests/VCR/LibraryHooks/CurlHookTest.php
+++ b/tests/Unit/LibraryHooks/CurlHookTest.php
@@ -1,35 +1,34 @@
 <?php
 
-namespace VCR\LibraryHooks;
+declare(strict_types=1);
 
+namespace VCR\Tests\Unit\LibraryHooks;
+
+use Assert\Assertion;
+use PHPUnit\Framework\TestCase;
+use VCR\CodeTransform\CurlCodeTransform;
+use VCR\Configuration;
+use VCR\LibraryHooks\CurlHook;
 use VCR\Request;
 use VCR\Response;
-use VCR\Configuration;
-use VCR\CodeTransform\CurlCodeTransform;
 use VCR\Util\StreamProcessor;
 
-/**
- * Test if intercepting http/https using curl works.
- */
-class CurlHookTest extends \PHPUnit_Framework_TestCase
+final class CurlHookTest extends TestCase
 {
+    /** @var string */
     public $expected = 'example response body';
-    /**
-     * @var \VCR\Configuration
-     */
-    protected $config;
-    /**
-     * @var \VCR\LibraryHooks\CurlHook
-     */
-    protected $curlHook;
 
-    public function setup()
+    protected Configuration $config;
+
+    protected CurlHook $curlHook;
+
+    protected function setup(): void
     {
         $this->config = new Configuration();
         $this->curlHook = new CurlHook(new CurlCodeTransform(), new StreamProcessor($this->config));
     }
 
-    public function testShouldBeEnabledAfterEnabling()
+    public function testShouldBeEnabledAfterEnabling(): void
     {
         $this->assertFalse($this->curlHook->isEnabled(), 'Initially the CurlHook should be disabled.');
 
@@ -40,12 +39,13 @@ public function testShouldBeEnabledAfterEnabling()
         $this->assertFalse($this->curlHook->isEnabled(), 'After disabling the CurlHook should be disabled.');
     }
 
-    public function testShouldInterceptCallWhenEnabled()
+    public function testShouldInterceptCallWhenEnabled(): void
     {
         $this->curlHook->enable($this->getTestCallback());
 
         $curlHandle = curl_init('http://example.com/');
-        curl_setopt($curlHandle, CURLOPT_RETURNTRANSFER, true);
+        Assertion::notSame($curlHandle, false);
+        curl_setopt($curlHandle, \CURLOPT_RETURNTRANSFER, true);
         $actual = curl_exec($curlHandle);
         curl_close($curlHandle);
 
@@ -56,43 +56,49 @@ public function testShouldInterceptCallWhenEnabled()
     /**
      * @group uses_internet
      */
-    public function testShouldNotInterceptCallWhenNotEnabled()
+    public function testShouldNotInterceptCallWhenNotEnabled(): void
     {
         $curlHandle = curl_init('http://example.com/');
-        curl_setopt($curlHandle, CURLOPT_RETURNTRANSFER, true);
+        Assertion::notSame($curlHandle, false);
+        curl_setopt($curlHandle, \CURLOPT_RETURNTRANSFER, true);
         $response = curl_exec($curlHandle);
+        Assertion::string($response);
         curl_close($curlHandle);
 
-        $this->assertContains('Example Domain', $response, 'Response from http://example.com should contain "Example Domain".');
+        $this->assertStringContainsString('Example Domain', $response, 'Response from http://example.com should contain "Example Domain".');
     }
 
     /**
      * @group uses_internet
      */
-    public function testShouldNotInterceptCallWhenDisabled()
+    public function testShouldNotInterceptCallWhenDisabled(): void
     {
-        $testClass = $this;
+        $intercepted = false;
         $this->curlHook->enable(
-            function () use ($testClass) {
-                $testClass->fail('This request should not have been intercepted.');
+            function () use (&$intercepted): void {
+                $intercepted = true;
             }
         );
         $this->curlHook->disable();
 
         $curlHandle = curl_init();
-        curl_setopt($curlHandle, CURLOPT_URL, 'http://example.com/');
-        curl_setopt($curlHandle, CURLOPT_RETURNTRANSFER, true);
+        Assertion::notSame($curlHandle, false);
+        curl_setopt($curlHandle, \CURLOPT_URL, 'http://example.com/');
+        curl_setopt($curlHandle, \CURLOPT_RETURNTRANSFER, true);
         curl_exec($curlHandle);
         curl_close($curlHandle);
+        $this->assertFalse($intercepted, 'This request should not have been intercepted.');
     }
 
-    public function testShouldWriteFileOnFileDownload()
+    public function testShouldWriteFileOnFileDownload(): void
     {
         $this->curlHook->enable($this->getTestCallback());
 
         $curlHandle = curl_init('https://example.com/');
+        Assertion::notSame($curlHandle, false);
         $filePointer = fopen('php://temp/test_file', 'w');
-        curl_setopt($curlHandle, CURLOPT_FILE, $filePointer);
+        Assertion::isResource($filePointer);
+        curl_setopt($curlHandle, \CURLOPT_FILE, $filePointer);
         curl_exec($curlHandle);
         curl_close($curlHandle);
         rewind($filePointer);
@@ -103,12 +109,13 @@ public function testShouldWriteFileOnFileDownload()
         $this->assertEquals($this->expected, $actual, 'Response was not written in file.');
     }
 
-    public function testShouldEchoResponseIfReturnTransferFalse()
+    public function testShouldEchoResponseIfReturnTransferFalse(): void
     {
         $this->curlHook->enable($this->getTestCallback());
 
         $curlHandle = curl_init('http://example.com/');
-        curl_setopt($curlHandle, CURLOPT_RETURNTRANSFER, false);
+        Assertion::notSame($curlHandle, false);
+        curl_setopt($curlHandle, \CURLOPT_RETURNTRANSFER, false);
         ob_start();
         curl_exec($curlHandle);
         $actual = ob_get_contents();
@@ -119,61 +126,66 @@ public function testShouldEchoResponseIfReturnTransferFalse()
         $this->assertEquals($this->expected, $actual, 'Response was not written on stdout.');
     }
 
-    public function testShouldPostFieldsAsArray()
+    public function testShouldPostFieldsAsArray(): void
     {
         $testClass = $this;
         $this->curlHook->enable(
             function (Request $request) use ($testClass) {
                 $testClass->assertEquals(
-                    array('para1' => 'val1', 'para2' => 'val2'),
+                    ['para1' => 'val1', 'para2' => 'val2'],
                     $request->getPostFields(),
                     'Post query string was not parsed and set correctly.'
                 );
-                return new Response(200);
+
+                return new Response('200');
             }
         );
 
         $curlHandle = curl_init('http://example.com');
-        curl_setopt($curlHandle, CURLOPT_POSTFIELDS, array('para1' => 'val1', 'para2' => 'val2'));
+        Assertion::notSame($curlHandle, false);
+        curl_setopt($curlHandle, \CURLOPT_POSTFIELDS, ['para1' => 'val1', 'para2' => 'val2']);
         curl_exec($curlHandle);
         curl_close($curlHandle);
         $this->curlHook->disable();
     }
 
-    public function testShouldPostFieldsAsArrayUsingSetoptarray()
+    public function testShouldPostFieldsAsArrayUsingSetoptarray(): void
     {
         $testClass = $this;
         $this->curlHook->enable(
             function (Request $request) use ($testClass) {
                 $testClass->assertEquals(
-                    array('para1' => 'val1', 'para2' => 'val2'),
+                    ['para1' => 'val1', 'para2' => 'val2'],
                     $request->getPostFields(),
                     'Post query string was not parsed and set correctly.'
                 );
-                return new Response(200);
+
+                return new Response('200');
             }
         );
 
         $curlHandle = curl_init('http://example.com');
+        Assertion::notSame($curlHandle, false);
         curl_setopt_array(
             $curlHandle,
-            array(
-                CURLOPT_POSTFIELDS => array('para1' => 'val1', 'para2' => 'val2')
-            )
+            [
+                \CURLOPT_POSTFIELDS => ['para1' => 'val1', 'para2' => 'val2'],
+            ]
         );
         curl_exec($curlHandle);
         curl_close($curlHandle);
         $this->curlHook->disable();
     }
 
-    public function testShouldReturnCurlInfoStatusCode()
+    public function testShouldReturnCurlInfoStatusCode(): void
     {
         $this->curlHook->enable($this->getTestCallback());
 
         $curlHandle = curl_init('http://example.com');
-        curl_setopt($curlHandle, CURLOPT_RETURNTRANSFER, true);
+        Assertion::notSame($curlHandle, false);
+        curl_setopt($curlHandle, \CURLOPT_RETURNTRANSFER, true);
         curl_exec($curlHandle);
-        $infoHttpCode = curl_getinfo($curlHandle, CURLINFO_HTTP_CODE);
+        $infoHttpCode = curl_getinfo($curlHandle, \CURLINFO_HTTP_CODE);
         curl_close($curlHandle);
 
         $this->assertSame(200, $infoHttpCode, 'HTTP status not set.');
@@ -184,16 +196,17 @@ public function testShouldReturnCurlInfoStatusCode()
     /**
      * @see https://github.com/php-vcr/php-vcr/issues/136
      */
-    public function testShouldReturnCurlInfoStatusCodeAsInteger()
+    public function testShouldReturnCurlInfoStatusCodeAsInteger(): void
     {
         $stringStatusCode = '200';
         $integerStatusCode = 200;
         $this->curlHook->enable($this->getTestCallback($stringStatusCode));
 
         $curlHandle = curl_init('http://example.com');
-        curl_setopt($curlHandle, CURLOPT_RETURNTRANSFER, true);
+        Assertion::notSame($curlHandle, false);
+        curl_setopt($curlHandle, \CURLOPT_RETURNTRANSFER, true);
         curl_exec($curlHandle);
-        $infoHttpCode = curl_getinfo($curlHandle, CURLINFO_HTTP_CODE);
+        $infoHttpCode = curl_getinfo($curlHandle, \CURLINFO_HTTP_CODE);
         curl_close($curlHandle);
 
         $this->assertSame($integerStatusCode, $infoHttpCode, 'HTTP status not set.');
@@ -201,32 +214,34 @@ public function testShouldReturnCurlInfoStatusCodeAsInteger()
         $this->curlHook->disable();
     }
 
-    public function testShouldReturnCurlInfoAll()
+    public function testShouldReturnCurlInfoAll(): void
     {
         $this->curlHook->enable($this->getTestCallback());
 
         $curlHandle = curl_init('http://example.com');
-        curl_setopt($curlHandle, CURLOPT_RETURNTRANSFER, true);
+        Assertion::notSame($curlHandle, false);
+        curl_setopt($curlHandle, \CURLOPT_RETURNTRANSFER, true);
         curl_exec($curlHandle);
         $info = curl_getinfo($curlHandle);
         curl_close($curlHandle);
 
-        $this->assertInternalType('array', $info, 'curl_getinfo() should return an array.');
-        $this->assertCount(21, $info, 'curl_getinfo() should return 21 values.');
+        $this->assertIsArray($info, 'curl_getinfo() should return an array.');
+        $this->assertCount(22, $info, 'curl_getinfo() should return 22 values.');
         $this->curlHook->disable();
     }
 
-    public function testShouldReturnCurlInfoAllKeys()
+    public function testShouldReturnCurlInfoAllKeys(): void
     {
         $this->curlHook->enable($this->getTestCallback());
 
         $curlHandle = curl_init('http://example.com');
-        curl_setopt($curlHandle, CURLOPT_RETURNTRANSFER, true);
+        Assertion::notSame($curlHandle, false);
+        curl_setopt($curlHandle, \CURLOPT_RETURNTRANSFER, true);
         curl_exec($curlHandle);
         $info = curl_getinfo($curlHandle);
         curl_close($curlHandle);
 
-        $this->assertInternalType('array', $info, 'curl_getinfo() should return an array.');
+        $this->assertIsArray($info, 'curl_getinfo() should return an array.');
         $this->assertArrayHasKey('url', $info);
         $this->assertArrayHasKey('content_type', $info);
         $this->assertArrayHasKey('http_code', $info);
@@ -250,20 +265,26 @@ public function testShouldReturnCurlInfoAllKeys()
         $this->curlHook->disable();
     }
 
-    public function testShouldNotThrowErrorWhenDisabledTwice()
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testShouldNotThrowErrorWhenDisabledTwice(): void
     {
         $this->curlHook->disable();
         $this->curlHook->disable();
     }
 
-    public function testShouldNotThrowErrorWhenEnabledTwice()
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testShouldNotThrowErrorWhenEnabledTwice(): void
     {
         $this->curlHook->enable($this->getTestCallback());
         $this->curlHook->enable($this->getTestCallback());
         $this->curlHook->disable();
     }
 
-    public function testShouldInterceptMultiCallWhenEnabled()
+    public function testShouldInterceptMultiCallWhenEnabled(): void
     {
         $testClass = $this;
         $callCount = 0;
@@ -275,22 +296,28 @@ function (Request $request) use ($testClass, &$callCount) {
                     ''
                 );
                 ++$callCount;
-                return new Response(200);
+
+                return new Response('200');
             }
         );
 
         $curlHandle1 = curl_init('http://example.com');
         $curlHandle2 = curl_init('http://example.com');
 
+        Assertion::notSame($curlHandle1, false);
+        Assertion::notSame($curlHandle2, false);
+
         $curlMultiHandle = curl_multi_init();
+        Assertion::notSame($curlMultiHandle, false);
         curl_multi_add_handle($curlMultiHandle, $curlHandle1);
         curl_multi_add_handle($curlMultiHandle, $curlHandle2);
 
-        $mh = curl_multi_exec($curlMultiHandle);
+        $stillRunning = null;
+        curl_multi_exec($curlMultiHandle, $stillRunning);
 
-        $lastInfo       = curl_multi_info_read($mh);
-        $secondLastInfo = curl_multi_info_read($mh);
-        $afterLastInfo  = curl_multi_info_read($mh);
+        $lastInfo = curl_multi_info_read($curlMultiHandle);
+        $secondLastInfo = curl_multi_info_read($curlMultiHandle);
+        $afterLastInfo = curl_multi_info_read($curlMultiHandle);
 
         curl_multi_remove_handle($curlMultiHandle, $curlHandle1);
         curl_multi_remove_handle($curlMultiHandle, $curlHandle2);
@@ -300,13 +327,13 @@ function (Request $request) use ($testClass, &$callCount) {
 
         $this->assertEquals(2, $callCount, 'Hook should have been called twice.');
         $this->assertEquals(
-            array('msg' => 1, 'result' => 0, 'handle' => $curlHandle2),
+            ['msg' => 1, 'result' => 0, 'handle' => $curlHandle2],
             $lastInfo,
             'When called the first time curl_multi_info_read should return last curl info.'
         );
 
         $this->assertEquals(
-            array('msg' => 1, 'result' => 0, 'handle' => $curlHandle1),
+            ['msg' => 1, 'result' => 0, 'handle' => $curlHandle1],
             $secondLastInfo,
             'When called the second time curl_multi_info_read should return second to last curl info.'
         );
@@ -314,29 +341,107 @@ function (Request $request) use ($testClass, &$callCount) {
         $this->assertFalse($afterLastInfo, 'Multi info called the last time should return false.');
     }
 
-    public function testShouldNotInterceptMultiCallWhenDisabled()
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testShouldNotInterceptMultiCallWhenDisabled(): void
     {
         $testClass = $this;
         $this->curlHook->enable(
-            function () use ($testClass) {
+            function () use ($testClass): void {
                 $testClass->fail('This request should not have been intercepted.');
             }
         );
         $this->curlHook->disable();
 
         $curlHandle = curl_init('http://example.com');
+        Assertion::notSame($curlHandle, false);
 
+        $stillRunning = null;
         $curlMultiHandle = curl_multi_init();
+        Assertion::notSame($curlMultiHandle, false);
         curl_multi_add_handle($curlMultiHandle, $curlHandle);
-        curl_multi_exec($curlMultiHandle);
+        curl_multi_exec($curlMultiHandle, $stillRunning);
         curl_multi_remove_handle($curlMultiHandle, $curlHandle);
         curl_multi_close($curlMultiHandle);
     }
 
+    public function testShouldReturnMultiCallValues(): void
+    {
+        $testClass = $this;
+        $callCount = 0;
+        $this->curlHook->enable(
+            function (Request $request) use ($testClass, &$callCount) {
+                $testClass->assertEquals(
+                    'example.com',
+                    $request->getHost(),
+                    ''
+                );
+                ++$callCount;
+
+                return new Response('200', [], $testClass->expected.$callCount);
+            }
+        );
+
+        $curlHandle1 = curl_init('http://example.com');
+        Assertion::notSame($curlHandle1, false);
+        curl_setopt($curlHandle1, \CURLOPT_RETURNTRANSFER, true);
+        $curlHandle2 = curl_init('http://example.com');
+        Assertion::notSame($curlHandle2, false);
+        curl_setopt($curlHandle2, \CURLOPT_RETURNTRANSFER, true);
+        $curlHandle3 = curl_init('http://example.com');
+        Assertion::notSame($curlHandle3, false);
+        curl_setopt($curlHandle3, \CURLOPT_RETURNTRANSFER, false);
+
+        $curlMultiHandle = curl_multi_init();
+        Assertion::notSame($curlMultiHandle, false);
+        curl_multi_add_handle($curlMultiHandle, $curlHandle1);
+        curl_multi_add_handle($curlMultiHandle, $curlHandle2);
+        curl_multi_add_handle($curlMultiHandle, $curlHandle3);
+
+        $stillRunning = null;
+        ob_start();
+        curl_multi_exec($curlMultiHandle, $stillRunning);
+        $output = ob_get_contents();
+        ob_end_clean();
+
+        $returnValue1 = curl_multi_getcontent($curlHandle1);
+        $returnValue2 = curl_multi_getcontent($curlHandle2);
+        $returnValue3 = curl_multi_getcontent($curlHandle3);
+
+        curl_multi_remove_handle($curlMultiHandle, $curlHandle1);
+        curl_multi_remove_handle($curlMultiHandle, $curlHandle2);
+        curl_multi_remove_handle($curlMultiHandle, $curlHandle3);
+        curl_multi_close($curlMultiHandle);
+
+        $this->curlHook->disable();
+
+        $this->assertEquals(3, $callCount, 'Hook should have been called thrice.');
+        $this->assertSame(
+            $this->expected.'1',
+            $returnValue1,
+            'When called with the first handle the curl_multi_getcontent should return the body of the first response.'
+        );
+
+        $this->assertSame(
+            $this->expected.'2',
+            $returnValue2,
+            'When called with the second handle the curl_multi_getcontent should return the body of the second response.'
+        );
+
+        $this->assertNull($returnValue3, 'When called with the third handle the curl_multi_getcontent should return null.');
+
+        $this->assertSame(
+            $this->expected.'3',
+            $output,
+            'The third response was not written on stdout.'
+        );
+    }
+
     /**
      * @requires PHP 5.5.0
      */
-    public function testShouldResetRequest()
+    public function testShouldResetRequest(): void
     {
         $testClass = $this;
         $this->curlHook->enable(
@@ -346,26 +451,24 @@ function (Request $request) use ($testClass) {
                     $request->getMethod(),
                     ''
                 );
-                return new Response(200);
+
+                return new Response('200');
             }
         );
 
         $curlHandle = curl_init('http://example.com');
-        curl_setopt($curlHandle, CURLOPT_CUSTOMREQUEST, 'DELETE');
+        Assertion::notSame($curlHandle, false);
+        curl_setopt($curlHandle, \CURLOPT_CUSTOMREQUEST, 'DELETE');
         curl_reset($curlHandle);
         curl_exec($curlHandle);
 
         $this->curlHook->disable();
     }
 
-    /**
-     * @return \callable
-     */
-    protected function getTestCallback($statusCode = 200)
+    protected function getTestCallback(string $statusCode = '200'): \Closure
     {
         $testClass = $this;
-        return function () use ($statusCode, $testClass) {
-            return new Response($statusCode, array(), $testClass->expected);
-        };
+
+        return \Closure::fromCallable(fn () => new Response($statusCode, [], $testClass->expected));
     }
 }
diff --git a/tests/VCR/LibraryHooks/SoapHookTest.php b/tests/Unit/LibraryHooks/SoapHookTest.php
similarity index 57%
rename from tests/VCR/LibraryHooks/SoapHookTest.php
rename to tests/Unit/LibraryHooks/SoapHookTest.php
index 638ab3b3b..ce91e09cd 100644
--- a/tests/VCR/LibraryHooks/SoapHookTest.php
+++ b/tests/Unit/LibraryHooks/SoapHookTest.php
@@ -1,117 +1,117 @@
 <?php
 
-namespace VCR\LibraryHooks;
+declare(strict_types=1);
 
+namespace VCR\Tests\Unit\LibraryHooks;
+
+use PHPUnit\Framework\TestCase;
+use VCR\CodeTransform\SoapCodeTransform;
+use VCR\Configuration;
+use VCR\LibraryHooks\SoapHook;
 use VCR\Request;
 use VCR\Response;
-use VCR\Configuration;
-use VCR\CodeTransform\SoapCodeTransform;
 use VCR\Util\StreamProcessor;
 
-/**
- * Test if intercepting http/https using soap works.
- */
-class SoapHookTest extends \PHPUnit_Framework_TestCase
+final class SoapHookTest extends TestCase
 {
-    const WSDL = 'https://raw.githubusercontent.com/php-vcr/php-vcr/master/tests/fixtures/soap/wsdl/weather.wsdl';
+    public const WSDL = 'https://raw.githubusercontent.com/php-vcr/php-vcr/master/tests/fixtures/soap/wsdl/weather.wsdl';
 
+    /** @var string */
     public $expected = '<?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://www.w3.org/2003/05/soap-envelope" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><soap:Body><GetCityWeatherByZIPResponse xmlns="http://ws.cdyne.com/WeatherWS/"><GetCityWeatherByZIPResult><Success>true</Success></GetCityWeatherByZIPResult></GetCityWeatherByZIPResponse></soap:Body></soap:Envelope>';
 
-    protected $config;
+    protected Configuration $config;
 
-    /** @var  SoapHook $soapHook */
-    protected $soapHook;
+    protected SoapHook $soapHook;
 
-    public function setup()
+    protected function setup(): void
     {
         $this->config = new Configuration();
         $this->soapHook = new SoapHook(new SoapCodeTransform(), new StreamProcessor($this->config));
     }
 
-    public function testShouldInterceptCallWhenEnabled()
+    public function testShouldInterceptCallWhenEnabled(): void
     {
         $this->soapHook->enable($this->getContentCheckCallback());
 
-        $client = new \SoapClient(self::WSDL, array('soap_version' => SOAP_1_2));
+        /** @var \VCR\Util\SoapClient $client */
+        $client = new \SoapClient(self::WSDL, ['soap_version' => \SOAP_1_2]);
         $client->setLibraryHook($this->soapHook);
-        $actual = $client->GetCityWeatherByZIP(array('ZIP' => '10013'));
+        $actual = $client->GetCityWeatherByZIP(['ZIP' => '10013']);
 
         $this->soapHook->disable();
         $this->assertInstanceOf('\stdClass', $actual, 'Response was not returned.');
         $this->assertTrue($actual->GetCityWeatherByZIPResult->Success, 'Response was not returned.');
     }
 
-    public function testShouldHandleSOAPVersion11()
+    public function testShouldHandleSOAPVersion11(): void
     {
-        $expectedHeaders = array(
-            'Content-Type' => 'text/xml; charset=utf-8;',
+        $expectedHeaders = [
+            'Content-Type' => 'text/xml; charset=utf-8',
             'SOAPAction' => 'http://ws.cdyne.com/WeatherWS/GetCityWeatherByZIP',
-        );
+        ];
         $this->soapHook->enable($this->getHeadersCheckCallback($expectedHeaders));
 
+        /** @var \VCR\Util\SoapClient $client */
         $client = new \SoapClient(
             self::WSDL,
-            array('soap_version' => SOAP_1_1)
+            ['soap_version' => \SOAP_1_1]
         );
         $client->setLibraryHook($this->soapHook);
-        $client->GetCityWeatherByZIP(array('ZIP' => '10013'));
+        $client->GetCityWeatherByZIP(['ZIP' => '10013']);
     }
 
-    public function testShouldHandleSOAPVersion12()
+    public function testShouldHandleSOAPVersion12(): void
     {
-        $expectedHeaders = array(
+        $expectedHeaders = [
             'Content-Type' => 'application/soap+xml; charset=utf-8; action="http://ws.cdyne.com/WeatherWS/GetCityWeatherByZIP"',
-        );
+        ];
 
         $this->soapHook->enable($this->getHeadersCheckCallback($expectedHeaders));
 
+        /** @var \VCR\Util\SoapClient $client */
         $client = new \SoapClient(
             self::WSDL,
-            array('soap_version' => SOAP_1_2)
+            ['soap_version' => \SOAP_1_2]
         );
         $client->setLibraryHook($this->soapHook);
-        $client->GetCityWeatherByZIP(array('ZIP' => '10013'));
+        $client->GetCityWeatherByZIP(['ZIP' => '10013']);
     }
 
-    public function testShouldReturnLastRequestWithTraceOn()
+    public function testShouldReturnLastRequestWithTraceOn(): void
     {
         $this->soapHook->enable($this->getContentCheckCallback());
 
+        /** @var \VCR\Util\SoapClient $client */
         $client = new \SoapClient(
             self::WSDL,
-            array('soap_version' => SOAP_1_1, 'trace' => 1)
+            ['soap_version' => \SOAP_1_1, 'trace' => 1]
         );
         $client->setLibraryHook($this->soapHook);
-        $client->GetCityWeatherByZIP(array('ZIP' => '10013'));
+        $client->GetCityWeatherByZIP(['ZIP' => '10013']);
         $actual = $client->__getLastRequest();
 
         $this->soapHook->disable();
         $this->assertNotNull($actual, '__getLastRequest() returned NULL.');
     }
 
-    /**
-     * @return \callable
-     */
-    protected function getContentCheckCallback()
+    protected function getContentCheckCallback(): \Closure
     {
         $testClass = $this;
-        return function () use ($testClass) {
-            return new Response(200, array(), $testClass->expected);
-        };
+
+        return \Closure::fromCallable(fn () => new Response('200', [], $testClass->expected));
     }
 
-    /**
-     * @param array $expectedHeaders
-     * @return \callable
-     */
-    protected function getHeadersCheckCallback(array $expectedHeaders)
+    /** @param array<mixed> $expectedHeaders */
+    protected function getHeadersCheckCallback(array $expectedHeaders): \Closure
     {
         $test = $this;
-        return function (Request $request) use ($test, $expectedHeaders) {
+
+        return \Closure::fromCallable(function (Request $request) use ($test, $expectedHeaders) {
             foreach ($expectedHeaders as $expectedHeaderName => $expectedHeader) {
                 $test->assertEquals($expectedHeader, $request->getHeader($expectedHeaderName));
             }
-            return new Response(200, array(), '');
-        };
+
+            return new Response('200', [], '');
+        });
     }
 }
diff --git a/tests/VCR/LibraryHooks/StreamWrapperHookTest.php b/tests/Unit/LibraryHooks/StreamWrapperHookTest.php
similarity index 53%
rename from tests/VCR/LibraryHooks/StreamWrapperHookTest.php
rename to tests/Unit/LibraryHooks/StreamWrapperHookTest.php
index e253d1be8..72fd9ca5f 100644
--- a/tests/VCR/LibraryHooks/StreamWrapperHookTest.php
+++ b/tests/Unit/LibraryHooks/StreamWrapperHookTest.php
@@ -1,51 +1,49 @@
 <?php
 
-namespace VCR\LibraryHooks;
+declare(strict_types=1);
 
-use VCR\Request;
+namespace VCR\Tests\Unit\LibraryHooks;
+
+use PHPUnit\Framework\TestCase;
+use VCR\LibraryHooks\StreamWrapperHook;
 use VCR\Response;
 
-/**
- * Test if intercepting http/https using stream wrapper works.
- */
-class StreamWrapperHookTest extends \PHPUnit_Framework_TestCase
+final class StreamWrapperHookTest extends TestCase
 {
-    public function testEnable()
+    public function testEnable(): void
     {
         $streamWrapper = new StreamWrapperHook();
 
         $testClass = $this;
-        $streamWrapper->enable(function ($request) use ($testClass) {
+        $streamWrapper->enable(function ($request) use ($testClass): void {
             $testClass->assertInstanceOf('\VCR\Request', $request);
         });
         $this->assertTrue($streamWrapper->isEnabled());
     }
 
-    public function testDisable()
+    public function testDisable(): void
     {
         $streamWrapper = new StreamWrapperHook();
         $streamWrapper->disable();
         $this->assertFalse($streamWrapper->isEnabled());
     }
 
-    public function testSeek()
+    public function testSeek(): void
     {
         $hook = new StreamWrapperHook();
-        $hook->enable(function ($request) {
-            return new Response(200, array(), 'A Test');
-        });
+        $hook->enable(fn ($request) => new Response('200', [], 'A Test'));
         $hook->stream_open('http://example.com', 'r', 0, $openedPath);
 
-        $this->assertFalse($hook->stream_seek(-1, SEEK_SET));
-        $this->assertTrue($hook->stream_seek(0, SEEK_SET));
+        $this->assertFalse($hook->stream_seek(-1, \SEEK_SET));
+        $this->assertTrue($hook->stream_seek(0, \SEEK_SET));
         $this->assertEquals('A', $hook->stream_read(1));
 
-        $this->assertFalse($hook->stream_seek(-1, SEEK_CUR));
-        $this->assertTrue($hook->stream_seek(1, SEEK_CUR));
+        $this->assertFalse($hook->stream_seek(-1, \SEEK_CUR));
+        $this->assertTrue($hook->stream_seek(1, \SEEK_CUR));
         $this->assertEquals('Test', $hook->stream_read(4));
 
-        $this->assertFalse($hook->stream_seek(-1000, SEEK_END));
-        $this->assertTrue($hook->stream_seek(-4, SEEK_END));
+        $this->assertFalse($hook->stream_seek(-1000, \SEEK_END));
+        $this->assertTrue($hook->stream_seek(-4, \SEEK_END));
         $this->assertEquals('Test', $hook->stream_read(4));
 
         // invalid whence
diff --git a/tests/Unit/RequestMatcherTest.php b/tests/Unit/RequestMatcherTest.php
new file mode 100644
index 000000000..58210ab8d
--- /dev/null
+++ b/tests/Unit/RequestMatcherTest.php
@@ -0,0 +1,177 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit;
+
+use PHPUnit\Framework\TestCase;
+use VCR\Request;
+use VCR\RequestMatcher;
+
+final class RequestMatcherTest extends TestCase
+{
+    public function testMatchingMethod(): void
+    {
+        $first = new Request('GET', 'http://example.com', []);
+        $second = new Request('GET', 'http://example.com', []);
+
+        $this->assertTrue(RequestMatcher::matchMethod($first, $second));
+
+        $first = new Request('GET', 'http://example.com', []);
+        $second = new Request('POST', 'http://example.com', []);
+
+        $this->assertFalse(RequestMatcher::matchMethod($first, $second));
+    }
+
+    public function testMatchingUrl(): void
+    {
+        $first = new Request('GET', 'http://example.com/common/path', []);
+        $second = new Request('GET', 'http://example.com/common/path', []);
+
+        $this->assertTrue(RequestMatcher::matchUrl($first, $second));
+
+        $first = new Request('GET', 'http://example.com/first/path', []);
+        $second = new Request('GET', 'http://example.com/second/path', []);
+
+        $this->assertFalse(RequestMatcher::matchUrl($first, $second));
+
+        $first = new Request('GET', 'http://example.com/second', []);
+        $second = new Request('GET', 'http://example.com/second/path', []);
+
+        $this->assertFalse(RequestMatcher::matchUrl($first, $second));
+    }
+
+    public function testMatchingHost(): void
+    {
+        $first = new Request('GET', 'http://example.com/common/path', []);
+        $second = new Request('GET', 'http://example.com/common/path', []);
+
+        $this->assertTrue(RequestMatcher::matchHost($first, $second));
+
+        $first = new Request('GET', 'http://example.com/first/path', []);
+        $second = new Request('GET', 'http://elpmaxe.com/second/path', []);
+
+        $this->assertFalse(RequestMatcher::matchHost($first, $second));
+    }
+
+    public function testMatchingHeaders(): void
+    {
+        $first = new Request('GET', 'http://example.com', ['Accept' => 'Everything']);
+        $second = new Request('GET', 'http://example.com', ['Accept' => 'Everything']);
+
+        $this->assertTrue(RequestMatcher::matchHeaders($first, $second));
+
+        $first = new Request('GET', 'http://example.com', ['Accept' => 'Everything']);
+        $second = new Request('GET', 'http://example.com', ['Accept' => 'Nothing']);
+
+        $this->assertFalse(RequestMatcher::matchHeaders($first, $second));
+    }
+
+    public function testHeaderMatchingDisallowsMissingHeaders(): void
+    {
+        $first = new Request('GET', 'http://example.com', ['Accept' => 'Everything', 'MyHeader' => 'value']);
+        $second = new Request('GET', 'http://example.com', ['Accept' => 'Everything']);
+
+        $this->assertFalse(RequestMatcher::matchHeaders($first, $second));
+
+        $first = new Request('GET', 'http://example.com', ['Accept' => 'Everything']);
+        $second = new Request('GET', 'http://example.com', ['Accept' => 'Everything', 'MyHeader' => 'value']);
+
+        $this->assertFalse(RequestMatcher::matchHeaders($first, $second));
+    }
+
+    public function testHeaderMatchingAllowsEmptyVals(): void
+    {
+        $first = new Request('GET', 'http://example.com', ['Accept' => null, 'Content-Type' => 'application/json']);
+        $second = new Request('GET', 'http://example.com', ['Accept' => null, 'Content-Type' => 'application/json']);
+
+        $this->assertTrue(RequestMatcher::matchHeaders($first, $second));
+    }
+
+    public function testMatchingPostFields(): void
+    {
+        $mock = [
+            'method' => 'POST',
+            'url' => 'http://example.com',
+            'headers' => [],
+            'post_fields' => [
+                'field1' => 'value1',
+                'field2' => 'value2',
+            ],
+        ];
+
+        $first = Request::fromArray($mock);
+        $second = Request::fromArray($mock);
+
+        $this->assertTrue(RequestMatcher::matchPostFields($first, $second));
+
+        $mock['post_fields']['field2'] = 'changedvalue2';
+        $third = Request::fromArray($mock);
+
+        $this->assertFalse(RequestMatcher::matchPostFields($first, $third));
+    }
+
+    public function testMatchingQueryString(): void
+    {
+        $first = new Request('GET', 'http://example.com/search?query=test', []);
+        $second = new Request('GET', 'http://example.com/search?query=test', []);
+
+        $this->assertTrue(RequestMatcher::matchQueryString($first, $second));
+
+        $first = new Request('GET', 'http://example.com/search?query=first', []);
+        $second = new Request('GET', 'http://example.com/search?query=second', []);
+
+        $this->assertFalse(RequestMatcher::matchQueryString($first, $second));
+    }
+
+    public function testMatchingBody(): void
+    {
+        $first = new Request('GET', 'http://example.com', []);
+        $first->setBody('test');
+        $second = new Request('GET', 'http://example.com', []);
+        $second->setBody('test');
+
+        $this->assertTrue(RequestMatcher::matchBody($first, $second), 'Bodies should be equal');
+
+        $first = new Request('GET', 'http://example.com', []);
+        $first->setBody('test');
+        $second = new Request('POST', 'http://example.com', []);
+        $second->setBody('different');
+
+        $this->assertFalse(RequestMatcher::matchBody($first, $second), 'Bodies are different.');
+    }
+
+    public function testMatchingSoapOperation(): void
+    {
+        $storedRequest = Request::fromArray([
+            'method' => 'POST',
+            'url' => 'http://example.com',
+            'headers' => [],
+            'body' => "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:ns1=\"http://tempuri.org\"><SOAP-ENV:Body><ns1:SearchAdresse><myPtr><cp>45000</cp></myPtr></ns1:SearchAdresse></SOAP-ENV:Body></SOAP-ENV:Envelope>\n",
+        ]);
+
+        $request = Request::fromArray([
+            'method' => 'POST',
+            'url' => 'http://example.com',
+            'headers' => [],
+            'body' => "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:ns1=\"http://tempuri.org\"><SOAP-ENV:Body><ns1:SearchAdresse><myPtr><cp>75008</cp></myPtr></ns1:SearchAdresse></SOAP-ENV:Body></SOAP-ENV:Envelope>\n",
+        ]);
+        $this->assertTrue(RequestMatcher::matchSoapOperation($storedRequest, $request), 'Operations are the same');
+
+        $request = Request::fromArray([
+            'method' => 'POST',
+            'url' => 'http://example.com',
+            'headers' => [],
+            'body' => "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:ns1=\"http://tempuri.org\"><SOAP-ENV:Body><ns1:SearchFoo><myPtr><cp>75008</cp></myPtr></ns1:SearchFoo></SOAP-ENV:Body></SOAP-ENV:Envelope>\n",
+        ]);
+        $this->assertFalse(RequestMatcher::matchSoapOperation($storedRequest, $request), 'Operations are different');
+
+        $request = Request::fromArray([
+            'method' => 'POST',
+            'url' => 'http://example.com',
+            'headers' => [],
+            'body' => '{}',
+        ]);
+        $this->assertTrue(RequestMatcher::matchSoapOperation($storedRequest, $request), 'Operation is not SOAP message');
+    }
+}
diff --git a/tests/Unit/RequestTest.php b/tests/Unit/RequestTest.php
new file mode 100644
index 000000000..6e610fa62
--- /dev/null
+++ b/tests/Unit/RequestTest.php
@@ -0,0 +1,279 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit;
+
+use PHPUnit\Framework\TestCase;
+use VCR\Request;
+
+final class RequestTest extends TestCase
+{
+    protected Request $request;
+
+    protected function setUp(): void
+    {
+        $this->request = new Request('GET', 'http://example.com', ['User-Agent' => 'Unit-Test']);
+    }
+
+    public function testGetHeaders(): void
+    {
+        $this->assertEquals(
+            [
+                'User-Agent' => 'Unit-Test',
+                'Host' => 'example.com',
+            ],
+            $this->request->getHeaders()
+        );
+    }
+
+    public function testSetMethod(): void
+    {
+        $this->request->setMethod('post');
+
+        $this->assertEquals('POST', $this->request->getMethod());
+    }
+
+    public function testSetAuthorization(): void
+    {
+        $this->request->setAuthorization('login', 'password');
+
+        $this->assertEquals('Basic bG9naW46cGFzc3dvcmQ=', $this->request->getHeader('Authorization'));
+    }
+
+    public function testMatches(): void
+    {
+        $request = new Request('GET', 'http://example.com', ['User-Agent' => 'Unit-Test']);
+
+        $this->assertTrue($this->request->matches($request, [['VCR\RequestMatcher', 'matchMethod']]));
+    }
+
+    public function testDoesntMatch(): void
+    {
+        $request = new Request('POST', 'http://example.com', ['User-Agent' => 'Unit-Test']);
+
+        $this->assertFalse($this->request->matches($request, [['VCR\RequestMatcher', 'matchMethod']]));
+    }
+
+    public function testMatchesThrowsExceptionIfMatcherNotFound(): void
+    {
+        $request = new Request('POST', 'http://example.com', ['User-Agent' => 'Unit-Test']);
+        $this->expectException(\BadFunctionCallException::class);
+        $this->expectExceptionMessage("Matcher could not be executed. Array\n(\n    [0] => some\n    [1] => method\n)\n");
+        $this->request->matches($request, [['some', 'method']]);
+    }
+
+    public function testRestoreRequest(): void
+    {
+        $restoredRequest = Request::fromArray($this->request->toArray());
+        $this->assertEquals(
+            [
+                'method' => 'GET',
+                'url' => 'http://example.com',
+                'headers' => [
+                    'User-Agent' => 'Unit-Test',
+                    'Host' => 'example.com',
+                ],
+            ],
+            $restoredRequest->toArray()
+        );
+    }
+
+    public function testStorePostFields(): void
+    {
+        $this->request->setPostFields(['para1' => 'val1']);
+        $this->assertEquals(
+            [
+                'method' => 'GET',
+                'url' => 'http://example.com',
+                'headers' => [
+                    'User-Agent' => 'Unit-Test',
+                    'Host' => 'example.com',
+                ],
+                'post_fields' => ['para1' => 'val1'],
+            ],
+            $this->request->toArray()
+        );
+    }
+
+    public function testRestorePostFields(): void
+    {
+        $this->request->setPostFields(['para1' => 'val1']);
+        $restoredRequest = Request::fromArray($this->request->toArray());
+        $this->assertEquals(
+            [
+                'method' => 'GET',
+                'url' => 'http://example.com',
+                'headers' => [
+                    'User-Agent' => 'Unit-Test',
+                    'Host' => 'example.com',
+                ],
+                'post_fields' => ['para1' => 'val1'],
+            ],
+            $restoredRequest->toArray()
+        );
+    }
+
+    public function testStorePostFile(): void
+    {
+        $file = [
+            'fieldName' => 'field_name',
+            'contentType' => 'application/octet-stream',
+            'filename' => 'tests/fixtures/unittest_curl_test',
+            'postname' => 'unittest_curl_test',
+        ];
+        $this->request->addPostFile($file);
+        $this->assertEquals(
+            [
+                'method' => 'GET',
+                'url' => 'http://example.com',
+                'headers' => [
+                    'User-Agent' => 'Unit-Test',
+                    'Host' => 'example.com',
+                ],
+                'post_files' => [$file],
+            ],
+            $this->request->toArray()
+        );
+    }
+
+    public function testSetPostFiles(): void
+    {
+        $file = [
+            'fieldName' => 'field_name',
+            'contentType' => 'application/octet-stream',
+            'filename' => 'tests/fixtures/unittest_curl_test',
+            'postname' => 'unittest_curl_test',
+        ];
+        $this->request->setPostFiles([$file]);
+        $this->assertEquals(
+            [
+                'method' => 'GET',
+                'url' => 'http://example.com',
+                'headers' => [
+                    'User-Agent' => 'Unit-Test',
+                    'Host' => 'example.com',
+                ],
+                'post_files' => [$file],
+            ],
+            $this->request->toArray()
+        );
+    }
+
+    public function testRestorePostFiles(): void
+    {
+        $file = [
+            'fieldName' => 'field_name',
+            'contentType' => 'application/octet-stream',
+            'filename' => 'tests/fixtures/unittest_curl_test',
+            'postname' => 'unittest_curl_test',
+        ];
+        $this->request->addPostFile($file);
+        $restoredRequest = Request::fromArray($this->request->toArray());
+        $this->assertEquals(
+            [
+                'method' => 'GET',
+                'url' => 'http://example.com',
+                'headers' => [
+                    'User-Agent' => 'Unit-Test',
+                    'Host' => 'example.com',
+                ],
+                'post_files' => [$file],
+            ],
+            $restoredRequest->toArray()
+        );
+    }
+
+    public function testRestoreBody(): void
+    {
+        $this->request->setBody('sometest');
+        $restoredRequest = Request::fromArray($this->request->toArray());
+        $this->assertEquals(
+            [
+                'method' => 'GET',
+                'url' => 'http://example.com',
+                'headers' => [
+                    'User-Agent' => 'Unit-Test',
+                    'Host' => 'example.com',
+                ],
+                'body' => 'sometest',
+            ],
+            $restoredRequest->toArray()
+        );
+    }
+
+    public function testMatchesBody(): void
+    {
+        $this->request->setBody('sometest');
+        $request = new Request('POST', 'http://example.com');
+        $request->setBody('sometest');
+
+        $this->assertTrue(
+            $this->request->matches(
+                Request::fromArray($request->toArray()),
+                [['VCR\RequestMatcher', 'matchBody']]
+            )
+        );
+    }
+
+    public function testDoesntMatchBody(): void
+    {
+        $this->request->setBody('sometest');
+        $request = new Request('POST', 'http://example.com');
+        $request->setBody('not match');
+
+        $this->assertFalse(
+            $this->request->matches(
+                Request::fromArray($request->toArray()),
+                [['VCR\RequestMatcher', 'matchBody']]
+            )
+        );
+    }
+
+    public function testGetHostReturnsBothHostAndPort(): void
+    {
+        $request = new Request('GET', 'http://example.com:5000/foo?param=key');
+        $this->assertEquals('example.com:5000', $request->getHost());
+    }
+
+    public function testDoNotOverwriteHostHeader(): void
+    {
+        $this->request = new Request(
+            'GET',
+            'http://example.com',
+            ['User-Agent' => 'Unit-Test', 'Host' => 'www.example.com']
+        );
+
+        $this->assertEquals(
+            [
+                'User-Agent' => 'Unit-Test',
+                'Host' => 'www.example.com',
+            ],
+            $this->request->getHeaders()
+        );
+    }
+
+    public function testCurlCustomRequestOverridesMethod(): void
+    {
+        $postRequest = new Request('POST', 'http://example.com');
+        $getRequest = new Request('GET', 'http://example.com');
+
+        $this->assertEquals('POST', $postRequest->getMethod());
+        $this->assertEquals('GET', $getRequest->getMethod());
+
+        $postRequest->setCurlOption(\CURLOPT_CUSTOMREQUEST, 'PUT');
+        $getRequest->setCurlOption(\CURLOPT_CUSTOMREQUEST, 'POST');
+
+        $this->assertEquals('PUT', $postRequest->getMethod());
+        $this->assertEquals('POST', $getRequest->getMethod());
+    }
+
+    public function testSetCurlOptions(): void
+    {
+        $getRequest = new Request('GET', 'http://example.com');
+        $getRequest->setCurlOptions([
+            \CURLOPT_CUSTOMREQUEST => 'PUT',
+        ]);
+        $this->assertEquals('PUT', $getRequest->getCurlOption(\CURLOPT_CUSTOMREQUEST));
+    }
+}
diff --git a/tests/Unit/ResponseTest.php b/tests/Unit/ResponseTest.php
new file mode 100644
index 000000000..6ef39a91a
--- /dev/null
+++ b/tests/Unit/ResponseTest.php
@@ -0,0 +1,154 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit;
+
+use PHPUnit\Framework\TestCase;
+use VCR\Response;
+
+final class ResponseTest extends TestCase
+{
+    public function testGetHeaders(): void
+    {
+        $expectedHeaders = [
+            'User-Agent' => 'Unit-Test',
+            'Host' => 'example.com',
+        ];
+
+        $response = Response::fromArray(['headers' => $expectedHeaders]);
+
+        $this->assertEquals($expectedHeaders, $response->getHeaders());
+    }
+
+    public function testGetHeadersNoneDefined(): void
+    {
+        $response = Response::fromArray([]);
+        $this->assertEquals([], $response->getHeaders());
+    }
+
+    public function testRestoreHeadersFromArray(): void
+    {
+        $headers = [
+            'Content-Type' => 'application/json',
+            'Content-Length' => '349',
+            'Connection' => 'close',
+            'Date' => 'Fri, 31 Jan 2014 15:37:13 GMT',
+        ];
+        $response = new Response('200', $headers);
+        $restoredResponse = Response::fromArray($response->toArray());
+
+        $this->assertEquals($headers, $restoredResponse->getHeaders());
+    }
+
+    public function testGetBody(): void
+    {
+        $expectedBody = 'This is test content';
+
+        $response = Response::fromArray(['body' => $expectedBody]);
+
+        $this->assertEquals($expectedBody, $response->getBody());
+    }
+
+    public function testGetBodyNoneDefined(): void
+    {
+        $response = Response::fromArray([]);
+        $this->assertEmpty($response->getBody());
+    }
+
+    public function testRestoreBodyFromArray(): void
+    {
+        $body = 'this is an example body';
+        $response = new Response('200', [], $body);
+        $restoredResponse = Response::fromArray($response->toArray());
+
+        $this->assertEquals($body, $restoredResponse->getBody());
+    }
+
+    public function testBase64EncodeCompressedBody(): void
+    {
+        $body = 'this is an example body';
+        $response = new Response('200', ['Content-Type' => 'application/x-gzip'], $body);
+        $responseArray = $response->toArray();
+
+        $this->assertEquals(base64_encode($body), $responseArray['body']);
+    }
+
+    public function testBase64DecodeCompressedBody(): void
+    {
+        $body = 'this is an example body';
+        $responseArray = [
+            'headers' => ['Content-Type' => 'application/x-gzip'],
+            'body' => base64_encode($body),
+        ];
+        $response = Response::fromArray($responseArray);
+
+        $this->assertEquals($body, $response->getBody());
+    }
+
+    public function testRestoreCompressedBody(): void
+    {
+        $body = 'this is an example body';
+        $response = new Response('200', ['Content-Type' => 'application/x-gzip'], $body);
+        $restoredResponse = Response::fromArray($response->toArray());
+
+        $this->assertEquals($body, $restoredResponse->getBody());
+    }
+
+    public function testGetStatus(): void
+    {
+        $expectedStatus = '200';
+
+        $response = new Response($expectedStatus);
+
+        $this->assertEquals($expectedStatus, $response->getStatusCode());
+    }
+
+    public function testRestoreStatusFromArray(): void
+    {
+        $expectedStatus = '200';
+
+        $response = new Response($expectedStatus);
+        $restoredResponse = Response::fromArray($response->toArray());
+
+        $this->assertEquals($expectedStatus, $restoredResponse->getStatusCode());
+    }
+
+    public function testGetCurlInfo(): void
+    {
+        $curlOptions = ['option' => 'value'];
+        $response = new Response('200', [], null, $curlOptions);
+
+        $this->assertEquals($curlOptions, $response->getCurlInfo());
+    }
+
+    public function testRestoreCurlInfoFromArray(): void
+    {
+        $expectedCurlOptions = ['option' => 'value'];
+        $response = new Response('200', [], null, $expectedCurlOptions);
+        $restoredResponse = Response::fromArray($response->toArray());
+
+        $this->assertEquals($expectedCurlOptions, $response->getCurlInfo());
+    }
+
+    public function testToArray(): void
+    {
+        $expectedArray = [
+            'status' => [
+                'code' => 200,
+                'message' => 'OK',
+            ],
+            'headers' => [
+                'host' => 'example.com',
+            ],
+            'body' => 'Test response',
+            'curl_info' => [
+                'content_type' => 'text/html',
+            ],
+        ];
+
+        $response = Response::fromArray($expectedArray);
+
+        $this->assertEquals($expectedArray, $response->toArray());
+    }
+}
diff --git a/tests/Unit/Storage/AbstractStorageTest.php b/tests/Unit/Storage/AbstractStorageTest.php
new file mode 100644
index 000000000..5ed4ad188
--- /dev/null
+++ b/tests/Unit/Storage/AbstractStorageTest.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit\Storage;
+
+use org\bovigo\vfs\vfsStream;
+use org\bovigo\vfs\vfsStreamDirectory;
+use PHPUnit\Framework\TestCase;
+use VCR\Storage\AbstractStorage;
+
+final class AbstractStorageTest extends TestCase
+{
+    /** @var TestStorage */
+    protected $storage;
+
+    public function testFilePathCreated(): void
+    {
+        $fs = vfsStream::setup('test');
+
+        $this->storage = new TestStorage(vfsStream::url('test/'), 'file');
+        $this->assertTrue($fs->hasChild('file'));
+
+        $this->storage = new TestStorage(vfsStream::url('test/'), 'folder/file');
+        $this->assertTrue($fs->hasChild('folder'));
+        $this->assertInstanceOf(vfsStreamDirectory::class, $child = $fs->getChild('folder'));
+        $this->assertTrue($child->hasChild('file'));
+    }
+
+    public function testRootNotExisting(): void
+    {
+        $this->expectException(\VCR\VCRException::class);
+        $this->expectExceptionMessage("Cassette path 'vfs://test/foo' is not existing or not a directory");
+
+        vfsStream::setup('test');
+        new TestStorage(vfsStream::url('test/foo'), 'file');
+    }
+}
+
+class TestStorage extends AbstractStorage
+{
+    /** @var array<mixed> */
+    private $recording;
+
+    public function storeRecording(array $recording): void
+    {
+        $this->recording = $recording;
+    }
+
+    public function next(): void
+    {
+    }
+
+    public function valid(): bool
+    {
+        return (bool) $this->position;
+    }
+
+    public function rewind(): void
+    {
+        reset($this->recording);
+    }
+}
diff --git a/tests/Unit/Storage/BlackholeTest.php b/tests/Unit/Storage/BlackholeTest.php
new file mode 100644
index 000000000..9383d72eb
--- /dev/null
+++ b/tests/Unit/Storage/BlackholeTest.php
@@ -0,0 +1,73 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit\Storage;
+
+use PHPUnit\Framework\TestCase;
+use VCR\Storage\Blackhole;
+
+final class BlackholeTest extends TestCase
+{
+    protected Blackhole $storage;
+
+    protected function setUp(): void
+    {
+        $this->storage = new Blackhole();
+    }
+
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testStoreRecordingIsCallable(): void
+    {
+        $this->storage->storeRecording([
+            'request' => [
+                'some' => 'request',
+            ],
+            'response' => [
+                'some' => 'response',
+            ],
+        ]);
+    }
+
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testNextIsCallable(): void
+    {
+        $this->storage->next();
+    }
+
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testRewindIsCallable(): void
+    {
+        $this->storage->rewind();
+    }
+
+    public function testKeyIsNotCallable(): void
+    {
+        $this->expectException(\BadMethodCallException::class);
+
+        $this->storage->key();
+    }
+
+    public function testCurrentIsNotCallable(): void
+    {
+        $this->expectException(\BadMethodCallException::class);
+
+        $this->storage->current();
+    }
+
+    public function testValidIsAlwaysFalse(): void
+    {
+        $this->assertFalse($this->storage->valid());
+    }
+
+    public function testIsNewIsAlwaysTrue(): void
+    {
+        $this->assertTrue($this->storage->isNew());
+    }
+}
diff --git a/tests/Unit/Storage/JsonTest.php b/tests/Unit/Storage/JsonTest.php
new file mode 100644
index 000000000..e82ec36d0
--- /dev/null
+++ b/tests/Unit/Storage/JsonTest.php
@@ -0,0 +1,140 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit\Storage;
+
+use org\bovigo\vfs\vfsStream;
+use PHPUnit\Framework\TestCase;
+use VCR\Storage\Json;
+
+final class JsonTest extends TestCase
+{
+    protected string $filePath;
+
+    protected Json $jsonObject;
+
+    protected function setUp(): void
+    {
+        vfsStream::setup('test');
+        $this->filePath = vfsStream::url('test/').'json_test';
+        $this->jsonObject = new Json(vfsStream::url('test/'), 'json_test');
+    }
+
+    public function testIterateOneObject(): void
+    {
+        $this->iterateAndTest(
+            '[{"para1": "val1"}]',
+            [
+                ['para1' => 'val1'],
+            ],
+            'Single json object was not parsed correctly.'
+        );
+    }
+
+    public function testIterateTwoObjects(): void
+    {
+        $this->iterateAndTest(
+            '[{"para1": "val1"}, {"para2": "val2"}]',
+            [
+                ['para1' => 'val1'],
+                ['para2' => 'val2'],
+            ],
+            'Two json objects were not parsed correctly.'
+        );
+    }
+
+    public function testIterateFirstNestedObject(): void
+    {
+        $this->iterateAndTest(
+            '[{"para1": {"para2": "val2"}}, {"para3": "val3"}]',
+            [
+                ['para1' => ['para2' => 'val2']],
+                ['para3' => 'val3'],
+            ],
+            'Nested json objects were not parsed correctly.'
+        );
+    }
+
+    public function testIterateSecondNestedObject(): void
+    {
+        $this->iterateAndTest(
+            '[{"para1": "val1"}, {"para2": {"para3": "val3"}}]',
+            [
+                ['para1' => 'val1'],
+                ['para2' => ['para3' => 'val3']],
+            ],
+            'Nested json objects were not parsed correctly.'
+        );
+    }
+
+    public function testIterateEmpty(): void
+    {
+        $this->iterateAndTest(
+            '[]',
+            [],
+            'Empty json was not parsed correctly.'
+        );
+    }
+
+    public function testStoreRecording(): void
+    {
+        $expected = [
+            'request' => [
+                'some' => 'request',
+            ],
+            'response' => [
+                'some' => 'response',
+            ],
+        ];
+
+        $this->jsonObject->storeRecording($expected);
+
+        $actual = [];
+        foreach ($this->jsonObject as $recording) {
+            $actual[] = $recording;
+        }
+
+        $this->assertEquals($expected, $actual[0], 'Storing and reading a recording failed.');
+    }
+
+    public function testValidJson(): void
+    {
+        $stored = [
+            'request' => 'some request',
+            'response' => 'some response',
+        ];
+        $this->jsonObject->storeRecording($stored);
+        $this->jsonObject->storeRecording($stored);
+
+        $this->assertJson((string) file_get_contents($this->filePath));
+    }
+
+    public function testStoreRecordingWhenBlankFileAlreadyExists(): void
+    {
+        vfsStream::create(['blank_file_test' => '']);
+        $filePath = vfsStream::url('test/').'blank_file_test';
+
+        $jsonObject = new Json(vfsStream::url('test/'), 'blank_file_test');
+        $stored = [
+            'request' => 'some request',
+            'response' => 'some response',
+        ];
+        $jsonObject->storeRecording($stored);
+
+        $this->assertJson((string) file_get_contents($filePath));
+    }
+
+    /** @param array<mixed> $expected */
+    private function iterateAndTest(string $json, $expected, string $message): void
+    {
+        file_put_contents($this->filePath, $json);
+
+        $actual = [];
+        foreach ($this->jsonObject as $object) {
+            $actual[] = $object;
+        }
+
+        $this->assertEquals($expected, $actual, $message);
+    }
+}
diff --git a/tests/Unit/Storage/YamlTest.php b/tests/Unit/Storage/YamlTest.php
new file mode 100644
index 000000000..1e5301298
--- /dev/null
+++ b/tests/Unit/Storage/YamlTest.php
@@ -0,0 +1,140 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit\Storage;
+
+use org\bovigo\vfs\vfsStream;
+use PHPUnit\Framework\TestCase;
+use VCR\Storage\Yaml;
+
+final class YamlTest extends TestCase
+{
+    private string $filePath;
+
+    private Yaml $yamlObject;
+
+    protected function setUp(): void
+    {
+        vfsStream::setup('test');
+        $this->filePath = vfsStream::url('test/').\DIRECTORY_SEPARATOR.'yaml_test';
+        $this->yamlObject = new Yaml(vfsStream::url('test/'), 'yaml_test');
+    }
+
+    public function testIterateOneObject(): void
+    {
+        $this->iterateAndTest(
+            '-'."\n"
+            .'    para1: val1',
+            [
+                ['para1' => 'val1'],
+            ],
+            'Single yaml object was not parsed correctly.'
+        );
+    }
+
+    public function testIterateTwoObjects(): void
+    {
+        $this->iterateAndTest(
+            '-'."\n"
+            .'    para1: val1'."\n"
+            .'-'."\n"
+            .'   para2: val2',
+            [
+                ['para1' => 'val1'],
+                ['para2' => 'val2'],
+            ],
+            'Two yaml objects were not parsed correctly.'
+        );
+    }
+
+    public function testIterateFirstNestedObject(): void
+    {
+        $this->iterateAndTest(
+            '-'."\n"
+            .'    para1:'."\n"
+            .'        para2: val2'."\n"
+            .'-'."\n"
+            .'    para3: val3',
+            [
+                ['para1' => ['para2' => 'val2']],
+                ['para3' => 'val3'],
+            ],
+            'Nested yaml objects were not parsed correctly.'
+        );
+    }
+
+    public function testIterateSecondNestedObject(): void
+    {
+        $this->iterateAndTest(
+            '-'."\n"
+            .'    para1: val1'."\n"
+            .'-'."\n"
+            .'    para2:'."\n"
+            .'        para3: val3'."\n",
+            [
+                ['para1' => 'val1'],
+                ['para2' => ['para3' => 'val3']],
+            ],
+            'Nested yaml objects were not parsed correctly.'
+        );
+    }
+
+    public function testIterateEmpty(): void
+    {
+        $this->iterateAndTest(
+            '',
+            [],
+            'Empty yaml was not parsed correctly.'
+        );
+    }
+
+    public function testStoreRecording(): void
+    {
+        $expected = [
+            'request' => 'some request',
+            'response' => 'some response',
+        ];
+
+        $this->yamlObject->storeRecording($expected);
+
+        $actual = [];
+        foreach ($this->yamlObject as $recording) {
+            $actual[] = $recording;
+        }
+
+        $this->assertEquals($expected, $actual[0], 'Storing and reading a recording failed.');
+    }
+
+    public function testStoreTwoRecording(): void
+    {
+        $expected = [
+            'request' => ['headers' => ['Content-Type' => 'application/json']],
+            'response' => ['body' => 'ok', 'status' => 200],
+        ];
+
+        $this->yamlObject->storeRecording($expected);
+        $this->yamlObject->storeRecording($expected);
+
+        $actual = [];
+        foreach ($this->yamlObject as $recording) {
+            $actual[] = $recording;
+        }
+        $this->assertCount(2, $actual, 'More that two recordings stores.');
+        $this->assertEquals($expected, $actual[0], 'Storing and reading first recording failed.');
+        $this->assertEquals($expected, $actual[1], 'Storing and reading second recording failed.');
+    }
+
+    /** @param array<mixed> $expected */
+    private function iterateAndTest(string $yaml, array $expected, string $message): void
+    {
+        file_put_contents($this->filePath, $yaml);
+
+        $actual = [];
+        foreach ($this->yamlObject as $object) {
+            $actual[] = $object;
+        }
+
+        $this->assertEquals($expected, $actual, $message);
+    }
+}
diff --git a/tests/Unit/Util/CurlHelperTest.php b/tests/Unit/Util/CurlHelperTest.php
new file mode 100644
index 000000000..bada66fb3
--- /dev/null
+++ b/tests/Unit/Util/CurlHelperTest.php
@@ -0,0 +1,579 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit\Util;
+
+use org\bovigo\vfs\vfsStream;
+use PHPUnit\Framework\TestCase;
+use VCR\Exceptions\InvalidHostException;
+use VCR\Request;
+use VCR\Response;
+use VCR\Util\CurlHelper;
+
+final class CurlHelperTest extends TestCase
+{
+    /** @var string[] */
+    private $headersFound;
+
+    /**
+     * @dataProvider getHttpMethodsProvider()
+     */
+    public function testSetCurlOptionMethods(string $method): void
+    {
+        $request = new Request($method, 'http://example.com');
+        $headers = ['Host: example.com'];
+
+        CurlHelper::setCurlOptionOnRequest($request, \CURLOPT_HTTPHEADER, $headers);
+
+        $this->assertEquals($method, $request->getMethod());
+    }
+
+    /**
+     * @return array<string[]>
+     */
+    public function getHttpMethodsProvider(): array
+    {
+        return [
+            ['CONNECT'],
+            ['DELETE'],
+            ['GET'],
+            ['HEAD'],
+            ['OPTIONS'],
+            ['POST'],
+            ['PUT'],
+            ['TRACE'],
+        ];
+    }
+
+    public function testSetCurlOptionOnRequestPostFieldsQueryString(): void
+    {
+        $request = new Request('POST', 'http://example.com');
+        $payload = 'para1=val1&para2=val2';
+
+        CurlHelper::setCurlOptionOnRequest($request, \CURLOPT_POSTFIELDS, $payload);
+
+        $this->assertEquals($payload, (string) $request->getBody());
+    }
+
+    public function testSetCurlOptionOnRequestPostFieldsArray(): void
+    {
+        $request = new Request('POST', 'http://example.com');
+        $payload = ['some' => 'test'];
+
+        CurlHelper::setCurlOptionOnRequest($request, \CURLOPT_POSTFIELDS, $payload);
+
+        $this->assertNull($request->getBody());
+        $this->assertEquals($payload, $request->getPostFields());
+    }
+
+    public function testSetCurlOptionOnRequestPostFieldsString(): void
+    {
+        $request = new Request('POST', 'http://example.com');
+        $payload = json_encode(['some' => 'test']);
+
+        CurlHelper::setCurlOptionOnRequest($request, \CURLOPT_POSTFIELDS, $payload);
+
+        $this->assertEquals($payload, (string) $request->getBody());
+    }
+
+    public function testSetCurlOptionOnRequestPostFieldsEmptyString(): void
+    {
+        $request = new Request('POST', 'http://example.com');
+        $payload = '';
+
+        CurlHelper::setCurlOptionOnRequest($request, \CURLOPT_POSTFIELDS, $payload);
+
+        // This is consistent with how requests are read out of storage using
+        // \VCR\Request::fromArray(array $request).
+        $this->assertNull($request->getBody());
+    }
+
+    public function testSetCurlOptionOnRequestSetSingleHeader(): void
+    {
+        $request = new Request('GET', 'http://example.com');
+        $headers = ['Host: example.com'];
+
+        CurlHelper::setCurlOptionOnRequest($request, \CURLOPT_HTTPHEADER, $headers);
+
+        $this->assertEquals(['Host' => 'example.com'], $request->getHeaders());
+    }
+
+    public function testSetCurlOptionOnRequestSetSingleHeaderTwice(): void
+    {
+        $request = new Request('GET', 'http://example.com');
+        $headers = ['Host: example.com'];
+
+        CurlHelper::setCurlOptionOnRequest($request, \CURLOPT_HTTPHEADER, $headers);
+        CurlHelper::setCurlOptionOnRequest($request, \CURLOPT_HTTPHEADER, $headers);
+
+        $this->assertEquals(['Host' => 'example.com'], $request->getHeaders());
+    }
+
+    public function testSetCurlOptionOnRequestSetMultipleHeadersTwice(): void
+    {
+        $request = new Request('GET', 'http://example.com');
+        $headers = [
+            'Host: example.com',
+            'Content-Type: application/json',
+        ];
+
+        CurlHelper::setCurlOptionOnRequest($request, \CURLOPT_HTTPHEADER, $headers);
+        CurlHelper::setCurlOptionOnRequest($request, \CURLOPT_HTTPHEADER, $headers);
+
+        $expected = [
+            'Host' => 'example.com',
+            'Content-Type' => 'application/json',
+        ];
+        $this->assertEquals($expected, $request->getHeaders());
+    }
+
+    public function testSetCurlOptionOnRequestEmptyPostFieldsRemovesContentType(): void
+    {
+        $request = new Request('GET', 'http://example.com');
+        $headers = [
+            'Host: example.com',
+            'Content-Type: application/json',
+        ];
+
+        CurlHelper::setCurlOptionOnRequest($request, \CURLOPT_HTTPHEADER, $headers);
+        CurlHelper::setCurlOptionOnRequest($request, \CURLOPT_POSTFIELDS, []);
+
+        $expected = [
+            'Host' => 'example.com',
+        ];
+        $this->assertEquals($expected, $request->getHeaders());
+    }
+
+    public function testSetCurlOptionOnRequestPostFieldsSetsPostMethod(): void
+    {
+        $request = new Request('GET', 'http://example.com');
+        $payload = json_encode(['some' => 'test']);
+
+        CurlHelper::setCurlOptionOnRequest($request, \CURLOPT_POSTFIELDS, $payload);
+
+        $this->assertEquals('POST', $request->getMethod());
+    }
+
+    public function testSetCurlOptionReadFunctionToNull(): void
+    {
+        $request = new Request('POST', 'http://example.com');
+
+        CurlHelper::setCurlOptionOnRequest($request, \CURLOPT_READFUNCTION, null);
+
+        $this->assertNull($request->getCurlOption(\CURLOPT_READFUNCTION));
+    }
+
+    public function testInvalidHostException(): void
+    {
+        $this->expectException(InvalidHostException::class);
+        $this->expectExceptionMessage('Could not read host from URL "example.com". Please check the URL syntax.');
+        new Request('POST', 'example.com');
+    }
+
+    public function testSetCurlOptionReadFunctionMissingSize(): void
+    {
+        $this->expectException(\VCR\VCRException::class);
+        $this->expectExceptionMessage('To set a CURLOPT_READFUNCTION, CURLOPT_INFILESIZE must be set.');
+        $request = new Request('POST', 'http://example.com');
+
+        $callback = function ($curlHandle, $fileHandle, $size): void {
+        };
+
+        CurlHelper::setCurlOptionOnRequest($request, \CURLOPT_READFUNCTION, $callback);
+        CurlHelper::validateCurlPOSTBody($request, curl_init());
+    }
+
+    public function testSetCurlOptionReadFunction(): void
+    {
+        $expected = 'test body';
+        $request = new Request('POST', 'http://example.com');
+
+        $test = $this;
+        $callback = function ($curlHandle, $fileHandle, $size) use ($test, $expected) {
+            $test->assertNotFalse($curlHandle);
+            $test->assertIsResource($fileHandle);
+            $test->assertEquals(\strlen($expected), $size);
+
+            return $expected;
+        };
+
+        CurlHelper::setCurlOptionOnRequest($request, \CURLOPT_INFILESIZE, \strlen($expected));
+        CurlHelper::setCurlOptionOnRequest($request, \CURLOPT_READFUNCTION, $callback);
+        CurlHelper::validateCurlPOSTBody($request, curl_init());
+
+        $this->assertEquals($expected, $request->getBody());
+    }
+
+    public function testHandleResponseReturnsBody(): void
+    {
+        $curlOptions = [
+            \CURLOPT_RETURNTRANSFER => true,
+        ];
+        $response = new Response('200', [], 'example response');
+
+        $output = CurlHelper::handleOutput($response, $curlOptions, curl_init());
+
+        $this->assertEquals($response->getBody(), $output);
+    }
+
+    public function testHandleResponseEchosBody(): void
+    {
+        $response = new Response('200', [], 'example response');
+
+        ob_start();
+        CurlHelper::handleOutput($response, [], curl_init());
+        $output = ob_get_clean();
+
+        $this->assertEquals($response->getBody(), $output);
+    }
+
+    public function testHandleResponseIncludesHeader(): void
+    {
+        $curlOptions = [
+            \CURLOPT_HEADER => true,
+            \CURLOPT_RETURNTRANSFER => true,
+        ];
+        $status = [
+            'code' => '200',
+            'message' => 'OK',
+            'http_version' => '1.1',
+        ];
+        $response = new Response($status, [], 'example response');
+
+        $output = CurlHelper::handleOutput($response, $curlOptions, curl_init());
+
+        $this->assertEquals("HTTP/1.1 200 OK\r\n\r\n".$response->getBody(), $output);
+    }
+
+    public function testHandleOutputHeaderFunction(): void
+    {
+        $actualHeaders = [];
+        $curlOptions = [
+            \CURLOPT_HEADERFUNCTION => function ($ch, $header) use (&$actualHeaders): void {
+                $actualHeaders[] = $header;
+            },
+        ];
+        $status = [
+            'code' => '200',
+            'message' => 'OK',
+            'http_version' => '1.1',
+        ];
+        $headers = [
+            'Content-Length' => '0',
+        ];
+        $response = new Response($status, $headers, 'example response');
+        CurlHelper::handleOutput($response, $curlOptions, curl_init());
+
+        $expected = [
+            'HTTP/1.1 200 OK',
+            'Content-Length: 0',
+            '',
+        ];
+        $this->assertEquals($expected, $actualHeaders);
+    }
+
+    public function testHandleOutputHeaderFunctionWithPublicFunction(): void
+    {
+        $this->headersFound = [];
+        $curlOptions = [
+            \CURLOPT_HEADERFUNCTION => [$this, 'publicCurlHeaderFunction'],
+        ];
+        $status = [
+            'code' => '200',
+            'message' => 'OK',
+            'http_version' => '1.1',
+        ];
+        $headers = [
+            'Content-Length' => '0',
+        ];
+        $response = new Response($status, $headers, 'example response');
+        CurlHelper::handleOutput($response, $curlOptions, curl_init());
+
+        $expected = [
+            'HTTP/1.1 200 OK',
+            'Content-Length: 0',
+            '',
+        ];
+        $this->assertEquals($expected, $this->headersFound);
+    }
+
+    public function testHandleOutputHeaderFunctionWithProtectedFunction(): void
+    {
+        $this->headersFound = [];
+        $curlOptions = [
+            \CURLOPT_HEADERFUNCTION => [$this, 'protectedCurlHeaderFunction'],
+        ];
+        $status = [
+            'code' => '200',
+            'message' => 'OK',
+            'http_version' => '1.1',
+        ];
+        $headers = [
+            'Content-Length' => '0',
+        ];
+        $response = new Response($status, $headers, 'example response');
+        CurlHelper::handleOutput($response, $curlOptions, curl_init());
+
+        $expected = [
+            'HTTP/1.1 200 OK',
+            'Content-Length: 0',
+            '',
+        ];
+        $this->assertEquals($expected, $this->headersFound);
+    }
+
+    public function testHandleOutputHeaderFunctionWithPrivateFunction(): void
+    {
+        $this->headersFound = [];
+        $curlOptions = [
+            \CURLOPT_HEADERFUNCTION => [$this, 'privateCurlHeaderFunction'],
+        ];
+        $status = [
+            'code' => '200',
+            'message' => 'OK',
+            'http_version' => '1.1',
+        ];
+        $headers = [
+            'Content-Length' => '0',
+        ];
+        $response = new Response($status, $headers, 'example response');
+        CurlHelper::handleOutput($response, $curlOptions, curl_init());
+
+        $expected = [
+            'HTTP/1.1 200 OK',
+            'Content-Length: 0',
+            '',
+        ];
+        $this->assertEquals($expected, $this->headersFound);
+    }
+
+    public function testHandleResponseUsesWriteFunction(): void
+    {
+        $test = $this;
+        $expectedCh = curl_init();
+        $expectedBody = 'example response';
+        $curlOptions = [
+            \CURLOPT_WRITEFUNCTION => function ($ch, $body) use ($test, $expectedCh, $expectedBody) {
+                $test->assertEquals($expectedCh, $ch);
+                $test->assertEquals($expectedBody, $body);
+
+                return \strlen($body);
+            },
+        ];
+        $response = new Response('200', [], $expectedBody);
+
+        CurlHelper::handleOutput($response, $curlOptions, $expectedCh);
+    }
+
+    public function testHandleResponseUsesWriteFunctionWithPrivateFunction(): void
+    {
+        $test = $this;
+        $expectedCh = curl_init();
+        $expectedBody = 'example response';
+        $curlOptions = [
+            \CURLOPT_WRITEFUNCTION => [$this, 'privateCurlWriteFunction'],
+        ];
+        $response = new Response('200', [], $expectedBody);
+
+        CurlHelper::handleOutput($response, $curlOptions, $expectedCh);
+    }
+
+    public function testHandleResponseWritesFile(): void
+    {
+        vfsStream::setup('test');
+        $expectedBody = 'example response';
+        $testFile = vfsStream::url('test/write_file');
+
+        $curlOptions = [
+            \CURLOPT_FILE => fopen($testFile, 'w+'),
+        ];
+
+        $response = new Response('200', [], $expectedBody);
+
+        CurlHelper::handleOutput($response, $curlOptions, curl_init());
+
+        $this->assertEquals($expectedBody, file_get_contents($testFile));
+    }
+
+    /**
+     * @dataProvider getCurlOptionProvider()
+     *
+     * @param int   $curlOption              cURL option to get
+     * @param mixed $expectedCurlOptionValue Expected value of cURL option
+     */
+    public function testGetCurlOptionFromResponse(Response $response, $curlOption, $expectedCurlOptionValue): void
+    {
+        $this->assertEquals(
+            $expectedCurlOptionValue,
+            CurlHelper::getCurlOptionFromResponse($response, '', $curlOption)
+        );
+    }
+
+    /** @return array<mixed> */
+    public function getCurlOptionProvider(): array
+    {
+        return [
+            [
+                Response::fromArray(
+                    [
+                        'status' => [
+                            'http_version' => '1.1',
+                            'code' => 200,
+                            'message' => 'OK',
+                        ],
+                        'headers' => [
+                            'Host' => 'localhost:8000',
+                            'Connection' => 'close',
+                            'Content-type' => 'text/html; charset=UTF-8',
+                        ],
+                    ]
+                ),
+                \CURLINFO_HEADER_SIZE,
+                100,
+            ],
+            [
+                Response::fromArray(
+                    [
+                        'status' => [
+                            'http_version' => '1.1',
+                            'code' => 404,
+                            'message' => 'Not Found',
+                        ],
+                        'headers' => [
+                            'Host' => 'localhost:8000',
+                            'Connection' => 'close',
+                            'Content-type' => 'text/html; charset=UTF-8',
+                        ],
+                    ]
+                ),
+                \CURLINFO_HEADER_SIZE,
+                107,
+            ],
+            [
+                Response::fromArray(
+                    [
+                        'status' => [
+                            'http_version' => '1.1',
+                            'code' => 200,
+                            'message' => 'OK',
+                        ],
+                        'headers' => [
+                            'Host' => 'localhost:8000',
+                            'Connection' => 'close',
+                            'Content-type' => 'text/html; charset=UTF-8',
+                            'X-Powered-By' => 'PHP/5.6.4-4ubuntu6',
+                        ],
+                    ]
+                ),
+                \CURLINFO_HEADER_SIZE,
+                134,
+            ],
+            [
+                Response::fromArray(
+                    [
+                        'status' => [
+                            'http_version' => '1.1',
+                            'code' => 200,
+                            'message' => 'OK',
+                        ],
+                        'headers' => [
+                            'Host' => 'localhost:8000',
+                            'Connection' => 'close',
+                            'Content-type' => 'text/html; charset=UTF-8',
+                            'Cache-Control' => 'no-cache, must-revalidate',
+                            'Pragma' => 'no-cache',
+                        ],
+                    ]
+                ),
+                \CURLINFO_HEADER_SIZE,
+                160,
+            ],
+            [
+                Response::fromArray(
+                    [
+                        'status' => [
+                            'http_version' => '1.1',
+                            'code' => 200,
+                            'message' => 'OK',
+                        ],
+                        'headers' => [
+                            'Host' => 'localhost:8000',
+                            'Connection' => 'close',
+                            'X-Powered-By' => 'PHP/5.6.4-4ubuntu6',
+                            'Expires' => 'Sat, 26 Jul 1997 05:00:00 GMT',
+                            'Last-Modified' => 'Sat, 13 Jun 2015 20:36:15 GMT',
+                            'Cache-Control' => 'no-store, no-cache, must-revalidate',
+                            'Pragma' => 'no-cache',
+                            'Content-type' => 'text/html; charset=UTF-8',
+                        ],
+                    ]
+                ),
+                \CURLINFO_HEADER_SIZE,
+                290,
+            ],
+        ];
+    }
+
+    public function testSetCurlOptionCustomRequest(): void
+    {
+        $request = new Request('POST', 'http://example.com');
+
+        CurlHelper::setCurlOptionOnRequest($request, \CURLOPT_CUSTOMREQUEST, 'PUT');
+
+        $this->assertEquals('PUT', $request->getCurlOption(\CURLOPT_CUSTOMREQUEST));
+    }
+
+    public function testCurlCustomRequestAlwaysOverridesMethod(): void
+    {
+        $request = new Request('POST', 'http://example.com');
+
+        CurlHelper::setCurlOptionOnRequest($request, \CURLOPT_CUSTOMREQUEST, 'DELETE');
+
+        $this->assertEquals('DELETE', $request->getMethod());
+
+        CurlHelper::setCurlOptionOnRequest($request, \CURLOPT_POSTFIELDS, ['some' => 'test']);
+
+        $this->assertEquals('DELETE', $request->getMethod());
+    }
+
+    /**
+     * Function used for testing CURLOPT_HEADERFUNCTION.
+     *
+     * @param resource $ch
+     */
+    public function publicCurlHeaderFunction($ch, string $header): void
+    {
+        $this->headersFound[] = $header;
+    }
+
+    /**
+     * Function used for testing CURLOPT_HEADERFUNCTION.
+     *
+     * @param resource $ch
+     */
+    protected function protectedCurlHeaderFunction($ch, string $header): void
+    {
+        $this->headersFound[] = $header;
+    }
+
+    /**
+     * Function used for testing CURLOPT_HEADERFUNCTION.
+     *
+     * @param resource $ch
+     */
+    private function privateCurlHeaderFunction($ch, string $header): void
+    {
+        $this->headersFound[] = $header;
+    }
+
+    /**
+     * Function used for testing CURLOPT_WRITEFUNCTION.
+     */
+    private function privateCurlWriteFunction(\CurlHandle $ch, string $body): int
+    {
+        $this->assertEquals('example response', $body);
+
+        return \strlen($body);
+    }
+}
diff --git a/tests/Unit/Util/HttpClientTest.php b/tests/Unit/Util/HttpClientTest.php
new file mode 100644
index 000000000..9a693abb6
--- /dev/null
+++ b/tests/Unit/Util/HttpClientTest.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit\Util;
+
+use PHPUnit\Framework\TestCase;
+use VCR\Request;
+use VCR\Util\CurlException;
+use VCR\Util\HttpClient;
+
+final class HttpClientTest extends TestCase
+{
+    public function testHttpClientOnError(): void
+    {
+        $httpClient = new HttpClient();
+        // Request on a closed port
+        $request = new Request('GET', 'http://localhost:9934');
+
+        $this->expectException(CurlException::class);
+        $httpClient->send($request);
+    }
+}
diff --git a/tests/VCR/Util/HttpUtilTest.php b/tests/Unit/Util/HttpUtilTest.php
similarity index 63%
rename from tests/VCR/Util/HttpUtilTest.php
rename to tests/Unit/Util/HttpUtilTest.php
index debb2c70e..58f8c182f 100644
--- a/tests/VCR/Util/HttpUtilTest.php
+++ b/tests/Unit/Util/HttpUtilTest.php
@@ -1,142 +1,146 @@
 <?php
 
-namespace VCR\Util;
+declare(strict_types=1);
 
-class HttpUtilTest extends \PHPUnit_Framework_TestCase
+namespace VCR\Tests\Unit\Util;
+
+use PHPUnit\Framework\TestCase;
+use VCR\Util\HttpUtil;
+
+final class HttpUtilTest extends TestCase
 {
-    public function testParseResponseBasic()
+    public function testParseResponseBasic(): void
     {
         $raw = "HTTP/1.1 201 Created\r\nContent-Type: text/html\r\nDate: Fri, 19 Jun 2015 16:05:18 GMT\r\nVary: Accept-Encoding\r\nContent-Length: 0\r\n\r\n";
-        list($status, $headers, $body) = HttpUtil::parseResponse($raw);
+        [$status, $headers, $body] = HttpUtil::parseResponse($raw);
 
-        $expectedHeaders = array(
+        $expectedHeaders = [
             'Content-Type: text/html',
             'Date: Fri, 19 Jun 2015 16:05:18 GMT',
             'Vary: Accept-Encoding',
-            'Content-Length: 0'
-        );
+            'Content-Length: 0',
+        ];
 
         $this->assertEquals('HTTP/1.1 201 Created', $status);
-        $this->assertEquals(null, $body);
+        $this->assertEquals('', $body);
         $this->assertEquals($expectedHeaders, $headers);
     }
 
-    public function testParseResponseMultipleHeaders()
+    public function testParseResponseMultipleHeaders(): void
     {
         $raw = "HTTP/1.1 201 Created\r\nContent-Type: text/html\r\nDate: Fri, 19 Jun 2015 16:05:18 GMT\r\nVary: Accept, Accept-Language, Expect\r\nVary: Accept-Encoding\r\nContent-Length: 0\r\n\r\n";
-        list($status, $headers, $body) = HttpUtil::parseResponse($raw);
+        [$status, $headers, $body] = HttpUtil::parseResponse($raw);
 
-        $expectedHeaders = array(
+        $expectedHeaders = [
             'Content-Type: text/html',
             'Date: Fri, 19 Jun 2015 16:05:18 GMT',
             'Vary: Accept, Accept-Language, Expect',
             'Vary: Accept-Encoding',
-            'Content-Length: 0'
-        );
+            'Content-Length: 0',
+        ];
 
         $this->assertEquals('HTTP/1.1 201 Created', $status);
-        $this->assertEquals(null, $body);
+        $this->assertEquals('', $body);
         $this->assertEquals($expectedHeaders, $headers);
     }
 
-    public function testParseContinuePlusResponse()
+    public function testParseContinuePlusResponse(): void
     {
         $raw = "HTTP/1.1 100 Continue\r\n\r\nHTTP/1.1 201 Created\r\nContent-Type: text/html\r\nDate: Fri, 19 Jun 2015 16:05:18 GMT\r\nVary: Accept-Encoding\r\nContent-Length: 0\r\n\r\n";
-        list($status, $headers, $body) = HttpUtil::parseResponse($raw);
+        [$status, $headers, $body] = HttpUtil::parseResponse($raw);
 
-        $expectedHeaders = array(
+        $expectedHeaders = [
             'Content-Type: text/html',
             'Date: Fri, 19 Jun 2015 16:05:18 GMT',
             'Vary: Accept-Encoding',
-            'Content-Length: 0'
-        );
+            'Content-Length: 0',
+        ];
 
         $this->assertEquals('HTTP/1.1 201 Created', $status);
-        $this->assertEquals(null, $body);
+        $this->assertEquals('', $body);
         $this->assertEquals($expectedHeaders, $headers);
     }
 
-    public function testParseiMultipleContinuePlusResponse()
+    public function testParseiMultipleContinuePlusResponse(): void
     {
         $raw = "HTTP/1.1 100 Continue\r\n\r\nHTTP/1.1 100 Continue\r\n\r\nHTTP/1.1 100 Continue\r\n\r\nHTTP/1.1 100 Continue\r\n\r\nHTTP/1.1 201 Created\r\nContent-Type: text/html\r\nDate: Fri, 19 Jun 2015 16:05:18 GMT\r\nVary: Accept-Encoding\r\nContent-Length: 0\r\n\r\n";
-        list($status, $headers, $body) = HttpUtil::parseResponse($raw);
+        [$status, $headers, $body] = HttpUtil::parseResponse($raw);
 
-        $expectedHeaders = array(
+        $expectedHeaders = [
             'Content-Type: text/html',
             'Date: Fri, 19 Jun 2015 16:05:18 GMT',
             'Vary: Accept-Encoding',
-            'Content-Length: 0'
-        );
+            'Content-Length: 0',
+        ];
 
         $this->assertEquals('HTTP/1.1 201 Created', $status);
-        $this->assertEquals(null, $body);
+        $this->assertEquals('', $body);
         $this->assertEquals($expectedHeaders, $headers);
     }
 
-
-    public function testParseContinuePlusResponseMultipleHeaders()
+    public function testParseContinuePlusResponseMultipleHeaders(): void
     {
         $raw = "HTTP/1.1 100 Continue\r\n\r\nHTTP/1.1 201 Created\r\nContent-Type: text/html\r\nDate: Fri, 19 Jun 2015 16:05:18 GMT\r\nVary: Accept, Accept-Language, Expect\r\nVary: Accept-Encoding\r\nContent-Length: 0\r\n\r\n";
-        list($status, $headers, $body) = HttpUtil::parseResponse($raw);
+        [$status, $headers, $body] = HttpUtil::parseResponse($raw);
 
-        $expectedHeaders = array(
+        $expectedHeaders = [
             'Content-Type: text/html',
             'Date: Fri, 19 Jun 2015 16:05:18 GMT',
             'Vary: Accept, Accept-Language, Expect',
             'Vary: Accept-Encoding',
-            'Content-Length: 0'
-        );
+            'Content-Length: 0',
+        ];
 
         $this->assertEquals('HTTP/1.1 201 Created', $status);
-        $this->assertEquals(null, $body);
+        $this->assertEquals('', $body);
         $this->assertEquals($expectedHeaders, $headers);
     }
 
-    public function testParseHeadersBasic()
+    public function testParseHeadersBasic(): void
     {
-        $inputArray = array(
+        $inputArray = [
             'Content-Type: text/html',
             'Date: Fri, 19 Jun 2015 16:05:18 GMT',
             'Vary: Accept-Encoding',
-            'Content-Length: 0'
-        );
-        $excpetedHeaders = array(
+            'Content-Length: 0',
+        ];
+        $excpetedHeaders = [
             'Content-Type' => 'text/html',
             'Date' => 'Fri, 19 Jun 2015 16:05:18 GMT',
             'Vary' => 'Accept-Encoding',
-            'Content-Length' => '0'
-        );
+            'Content-Length' => '0',
+        ];
         $outputArray = HttpUtil::parseHeaders($inputArray);
         $this->assertEquals($excpetedHeaders, $outputArray);
     }
 
-    public function testParseHeadersMultiple()
+    public function testParseHeadersMultiple(): void
     {
-        $inputArray = array(
+        $inputArray = [
             'Content-Type: text/html',
             'Date: Fri, 19 Jun 2015 16:05:18 GMT',
             'Vary: Accept, Accept-Language, Expect',
             'Vary: Accept-Encoding',
-            'Content-Length: 0'
-        );
-        $excpetedHeaders = array(
+            'Content-Length: 0',
+        ];
+        $excpetedHeaders = [
             'Content-Type' => 'text/html',
             'Date' => 'Fri, 19 Jun 2015 16:05:18 GMT',
-            'Vary' => 'Accept, Accept-Language, Expect, Accept-Encoding',
-            'Content-Length' => '0'
-        );
+            'Vary' => ['Accept, Accept-Language, Expect', 'Accept-Encoding'],
+            'Content-Length' => '0',
+        ];
         $outputArray = HttpUtil::parseHeaders($inputArray);
         $this->assertEquals($excpetedHeaders, $outputArray);
     }
 
-    public function testParseHeadersIncludingColons()
+    public function testParseHeadersIncludingColons(): void
     {
-        $inputArray = array(
-            'dropbox-api-result: {"name": "a_file.txt"}'
-        );
-        $excpetedHeaders = array(
-            'dropbox-api-result' => '{"name": "a_file.txt"}'
-        );
+        $inputArray = [
+            'dropbox-api-result: {"name": "a_file.txt"}',
+        ];
+        $excpetedHeaders = [
+            'dropbox-api-result' => '{"name": "a_file.txt"}',
+        ];
         $outputArray = HttpUtil::parseHeaders($inputArray);
         $this->assertEquals($excpetedHeaders, $outputArray);
     }
diff --git a/tests/VCR/Util/SoapClientTest.php b/tests/Unit/Util/SoapClientTest.php
similarity index 60%
rename from tests/VCR/Util/SoapClientTest.php
rename to tests/Unit/Util/SoapClientTest.php
index b99d783f5..5f03b5623 100644
--- a/tests/VCR/Util/SoapClientTest.php
+++ b/tests/Unit/Util/SoapClientTest.php
@@ -1,32 +1,36 @@
 <?php
 
-namespace VCR\Util;
+declare(strict_types=1);
 
-use lapistano\ProxyObject\ProxyBuilder;
-use VCR\VCRException;
+namespace VCR\Tests\Unit\Util;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use VCR\LibraryHooks\SoapHook;
 use VCR\Util\SoapClient;
 
-class SoapClientTest extends \PHPUnit_Framework_TestCase
+final class SoapClientTest extends TestCase
 {
-    const WSDL = 'https://raw.githubusercontent.com/php-vcr/php-vcr/master/tests/fixtures/soap/wsdl/weather.wsdl';
-    const ACTION = 'http://ws.cdyne.com/WeatherWS/GetCityWeatherByZIP';
+    public const WSDL = 'https://raw.githubusercontent.com/php-vcr/php-vcr/master/tests/fixtures/soap/wsdl/weather.wsdl';
+    public const ACTION = 'http://ws.cdyne.com/WeatherWS/GetCityWeatherByZIP';
 
-    protected function getLibraryHookMock($enabled)
+    /** @return SoapHook&MockObject */
+    protected function getLibraryHookMock(bool $enabled)
     {
-        $hookMock = $this->getMockBuilder('\VCR\LibraryHooks\SoapHook')
+        $hookMock = $this->getMockBuilder(SoapHook::class)
             ->disableOriginalConstructor()
-            ->setMethods(array('isEnabled', 'doRequest'))
+            ->setMethods(['isEnabled', 'doRequest'])
             ->getMock();
 
         $hookMock
             ->expects($this->any())
             ->method('isEnabled')
-            ->will($this->returnValue($enabled));
+            ->willReturn($enabled);
 
         return $hookMock;
     }
 
-    public function testDoRequest()
+    public function testDoRequest(): void
     {
         $expected = 'Knorx ist groß';
 
@@ -40,48 +44,48 @@ public function testDoRequest()
                 $this->isType('string'),
                 $this->isType('integer')
             )
-            ->will($this->returnValue($expected));
+            ->willReturn($expected);
 
         $client = new SoapClient(self::WSDL);
         $client->setLibraryHook($hook);
 
         $this->assertEquals(
             $expected,
-            $client->__doRequest('Knorx ist groß', self::WSDL, self::ACTION, SOAP_1_2)
+            $client->__doRequest('Knorx ist groß', self::WSDL, self::ACTION, \SOAP_1_2)
         );
     }
 
-    public function testDoRequestOneWayEnabled()
+    public function testDoRequestOneWayEnabled(): void
     {
         $hook = $this->getLibraryHookMock(true);
-        $hook->expects($this->once())->method('doRequest')->will($this->returnValue('some value'));
+        $hook->expects($this->once())->method('doRequest')->willReturn('some value');
 
         $client = new SoapClient(self::WSDL);
         $client->setLibraryHook($hook);
 
-        $this->assertNull($client->__doRequest('Knorx ist groß', self::WSDL, self::ACTION, SOAP_1_2, 1));
+        $this->assertNull($client->__doRequest('Knorx ist groß', self::WSDL, self::ACTION, \SOAP_1_2, true));
     }
 
-    public function testDoRequestOneWayDisabled()
+    public function testDoRequestOneWayDisabled(): void
     {
         $expected = 'some value';
         $hook = $this->getLibraryHookMock(true);
-        $hook ->expects($this->once()) ->method('doRequest')->will($this->returnValue($expected));
+        $hook->expects($this->once())->method('doRequest')->willReturn($expected);
 
         $client = new SoapClient(self::WSDL);
         $client->setLibraryHook($hook);
 
         $this->assertEquals(
             $expected,
-            $client->__doRequest('Knorx ist groß', self::WSDL, self::ACTION, SOAP_1_2, 0)
+            $client->__doRequest('Knorx ist groß', self::WSDL, self::ACTION, \SOAP_1_2, false)
         );
     }
 
-    public function testDoRequestHandlesHookDisabled()
+    public function testDoRequestHandlesHookDisabled(): void
     {
-        $client = $this->getMockBuilder('\VCR\Util\SoapClient')
+        $client = $this->getMockBuilder(SoapClient::class)
             ->disableOriginalConstructor()
-            ->setMethods(array('realDoRequest'))
+            ->setMethods(['realDoRequest'])
             ->getMock();
 
         $client
@@ -91,17 +95,17 @@ public function testDoRequestHandlesHookDisabled()
                 $this->equalTo('Knorx ist groß'),
                 $this->equalTo(self::WSDL),
                 $this->equalTo(self::ACTION),
-                $this->equalTo(SOAP_1_2),
+                $this->equalTo(\SOAP_1_2),
                 $this->equalTo(0)
             );
 
         $hook = $this->getLibraryHookMock(false);
         $client->setLibraryHook($hook);
 
-        $client->__doRequest('Knorx ist groß', self::WSDL, self::ACTION, SOAP_1_2);
+        $client->__doRequest('Knorx ist groß', self::WSDL, self::ACTION, \SOAP_1_2);
     }
 
-    public function testDoRequestExpectingException()
+    public function testDoRequestExpectingException(): void
     {
         $exception = '\LogicException';
 
@@ -118,29 +122,29 @@ public function testDoRequestExpectingException()
         $client = new SoapClient(self::WSDL);
         $client->setLibraryHook($hook);
 
-        $this->setExpectedException($exception);
+        $this->expectException($exception);
 
-        $client->__doRequest('Knorx ist groß', self::WSDL, self::ACTION, SOAP_1_2);
+        $client->__doRequest('Knorx ist groß', self::WSDL, self::ACTION, \SOAP_1_2);
     }
 
-    public function testLibraryHook()
+    public function testLibraryHook(): void
     {
-        $client = new SoapClient(self::WSDL);
-
-        $proxy = new ProxyBuilder('\VCR\Util\SoapClient');
-        $client = $proxy
-            ->disableOriginalConstructor()
-            ->setMethods(array('getLibraryHook'))
-            ->getProxy();
+        $client = new class(self::WSDL) extends SoapClient {
+            // A proxy to access the protected getLibraryHook method.
+            public function publicGetLibraryHook(): SoapHook
+            {
+                return $this->getLibraryHook();
+            }
+        };
 
-        $this->assertInstanceOf('\VCR\LibraryHooks\SoapHook', $client->getLibraryHook());
+        $this->assertInstanceOf(SoapHook::class, $client->publicGetLibraryHook());
 
         $client->setLibraryHook($this->getLibraryHookMock(true));
 
-        $this->assertInstanceOf('\VCR\LibraryHooks\SoapHook', $client->getLibraryHook());
+        $this->assertInstanceOf(SoapHook::class, $client->publicGetLibraryHook());
     }
 
-    public function testGetLastWhateverBeforeRequest()
+    public function testGetLastWhateverBeforeRequest(): void
     {
         $client = new SoapClient(self::WSDL);
 
@@ -148,18 +152,18 @@ public function testGetLastWhateverBeforeRequest()
         $this->assertNull($client->__getLastResponse());
     }
 
-    public function testGetLastWhateverAfterRequest()
+    public function testGetLastWhateverAfterRequest(): void
     {
-        $request  = 'Knorx ist groß';
+        $request = 'Knorx ist groß';
         $response = 'some value';
 
         $hook = $this->getLibraryHookMock(true);
-        $hook->expects($this->once())->method('doRequest')->will($this->returnValue($response));
+        $hook->expects($this->once())->method('doRequest')->willReturn($response);
 
         $client = new SoapClient(self::WSDL);
         $client->setLibraryHook($hook);
 
-        $client->__doRequest($request, self::WSDL, self::ACTION, SOAP_1_2, 0);
+        $client->__doRequest($request, self::WSDL, self::ACTION, \SOAP_1_2, false);
 
         $this->assertEquals($request, $client->__getLastRequest());
         $this->assertEquals($response, $client->__getLastResponse());
diff --git a/tests/Unit/Util/StreamHelperTest.php b/tests/Unit/Util/StreamHelperTest.php
new file mode 100644
index 000000000..f149b6188
--- /dev/null
+++ b/tests/Unit/Util/StreamHelperTest.php
@@ -0,0 +1,93 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit\Util;
+
+use PHPUnit\Framework\TestCase;
+use VCR\Request;
+use VCR\Util\StreamHelper;
+
+final class StreamHelperTest extends TestCase
+{
+    /** @return array<string, mixed> */
+    public function streamContexts(): array
+    {
+        $test = $this;
+
+        return [
+            'header' => [
+                ['header' => 'Content-Type: application/json'],
+                function (Request $request) use ($test): void {
+                    $test->assertEquals('application/json', $request->getHeader('Content-Type'));
+                },
+            ],
+
+            'header with trailing newline' => [
+                ['header' => "Content-Type: application/json\r\n"],
+                function (Request $request) use ($test): void {
+                    $test->assertEquals('application/json', $request->getHeader('Content-Type'));
+                },
+            ],
+
+            'multiple headers' => [
+                ['header' => "Content-Type: application/json\r\nContent-Length: 123"],
+                function (Request $request) use ($test): void {
+                    $test->assertEquals('application/json', $request->getHeader('Content-Type'));
+                    $test->assertEquals('123', $request->getHeader('Content-Length'));
+                },
+            ],
+
+            'user_agent' => [
+                ['user_agent' => 'example'],
+                function (Request $request) use ($test): void {
+                    $test->assertEquals('example', $request->getHeader('User-Agent'));
+                },
+            ],
+
+            'content' => [
+                ['content' => 'example'],
+                function (Request $request) use ($test): void {
+                    $test->assertEquals('example', $request->getBody());
+                },
+            ],
+
+            'follow_location' => [
+                ['follow_location' => '0'],
+                function (Request $request) use ($test): void {
+                    $test->assertEquals(false, $request->getCurlOption(\CURLOPT_FOLLOWLOCATION));
+                },
+            ],
+
+            'max_redirects' => [
+                ['max_redirects' => '2'],
+                function (Request $request) use ($test): void {
+                    $test->assertEquals('2', $request->getCurlOption(\CURLOPT_MAXREDIRS));
+                },
+            ],
+
+            'timeout' => [
+                ['timeout' => '100'],
+                function (Request $request) use ($test): void {
+                    $test->assertEquals('100', $request->getCurlOption(\CURLOPT_TIMEOUT));
+                },
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider streamContexts
+     *
+     * @param array<mixed> $context
+     * @param callable     $testCallback
+     */
+    public function testStreamHttpContext(array $context, $testCallback): void
+    {
+        $context = stream_context_create([
+            'http' => $context,
+        ]);
+
+        $request = StreamHelper::createRequestFromStreamContext($context, 'http://example.com');
+        $testCallback($request);
+    }
+}
diff --git a/tests/Unit/Util/StreamProcessorTest.php b/tests/Unit/Util/StreamProcessorTest.php
new file mode 100644
index 000000000..a68595eef
--- /dev/null
+++ b/tests/Unit/Util/StreamProcessorTest.php
@@ -0,0 +1,233 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit\Util;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use VCR\Util\StreamProcessor;
+
+final class StreamProcessorTest extends TestCase
+{
+    /**
+     * test flock with file_put_contents.
+     */
+    public function testFlockWithFilePutContents(): void
+    {
+        $processor = new StreamProcessor();
+        $processor->intercept();
+
+        $testData = 'test data';
+        $testFilePath = 'tests/fixtures/file_put_contents';
+        $res = file_put_contents($testFilePath, $testData, \LOCK_EX);
+        unlink($testFilePath);
+
+        $processor->restore();
+        $this->assertEquals(\strlen($testData), $res);
+    }
+
+    public function testSetStreamOptions(): void
+    {
+        $processor = new StreamProcessor();
+        $processor->intercept();
+
+        $handle = fopen('tests/fixtures/file_put_contents', 'w');
+
+        self::assertTrue(stream_set_blocking($handle, true));
+        self::assertFalse(stream_set_timeout($handle, 10));
+        self::assertFalse(stream_set_timeout($handle, 5, 2));
+        self::assertSame(-1, stream_set_write_buffer($handle, 0));
+        self::assertSame(0, stream_set_read_buffer($handle, 0));
+
+        fclose($handle);
+
+        $processor->restore();
+    }
+
+    /**
+     * @dataProvider streamOpenAppendFilterProvider
+     */
+    public function testStreamOpenShouldAppendFilters(bool $expected, int $option, ?bool $shouldProcess = null): void
+    {
+        $mock = $this->getMockBuilder('VCR\Util\StreamProcessor')
+            ->disableOriginalConstructor()
+            ->onlyMethods(['intercept', 'restore', 'appendFiltersToStream', 'shouldProcess'])
+            ->getMock();
+
+        if (null !== $shouldProcess) {
+            $mock->expects($this->once())->method('shouldProcess')->willReturn($shouldProcess);
+        }
+
+        if ($expected) {
+            $mock->expects($this->once())->method('appendFiltersToStream');
+        } else {
+            $mock->expects($this->never())->method('appendFiltersToStream');
+        }
+
+        $mock->stream_open('tests/fixtures/streamprocessor_data', 'r', $option, $fullPath);
+        $mock->stream_close();
+    }
+
+    /** @return array<array<bool|int>> */
+    public function streamOpenAppendFilterProvider(): array
+    {
+        return [
+            [true, StreamProcessor::STREAM_OPEN_FOR_INCLUDE, true],
+            [false, StreamProcessor::STREAM_OPEN_FOR_INCLUDE, false],
+            [false, 0],
+        ];
+    }
+
+    /** @return array<string[]> */
+    public function streamOpenFileModesWhichDoNotCreateFiles(): array
+    {
+        return [
+            ['r'],
+            ['rb'],
+            ['rt'],
+            ['r+'],
+        ];
+    }
+
+    /**
+     * @dataProvider streamOpenFileModesWhichDoNotCreateFiles
+     */
+    public function testStreamOpenShouldNotFailOnNonExistingFile(string $fileMode): void
+    {
+        $test = $this;
+        set_error_handler(function ($errno, $errstr, $errfile, $errline) use ($test): void {
+            $test->fail('should not throw errors');
+        });
+
+        $processor = new StreamProcessor();
+
+        $result = $processor->stream_open('tests/fixtures/unknown', $fileMode, StreamProcessor::STREAM_OPEN_FOR_INCLUDE, $fullPath);
+        $this->assertFalse($result);
+
+        restore_error_handler();
+    }
+
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testUrlStatSuccessfully(): void
+    {
+        $test = $this;
+        set_error_handler(function ($errno, $errstr, $errfile, $errline) use ($test): void {
+            $test->fail('should not throw errors');
+        });
+
+        $processor = new StreamProcessor();
+        $processor->url_stat('tests/fixtures/streamprocessor_data', 0);
+
+        restore_error_handler();
+    }
+
+    public function testUrlStatFileNotFound(): void
+    {
+        $processor = new StreamProcessor();
+
+        set_error_handler(static function (
+            int $errno,
+            string $errstr,
+            string $errfile = '',
+            int $errline = 0
+        ): void {
+            throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
+        }, \E_WARNING);
+
+        try {
+            $this->expectException(\ErrorException::class);
+            $processor->url_stat('file_not_found', 0);
+        } finally {
+            restore_error_handler();
+        }
+    }
+
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testQuietUrlStatFileNotFoundToBeQuiet(): void
+    {
+        $processor = new StreamProcessor();
+        $processor->url_stat('file_not_found', \STREAM_URL_STAT_QUIET);
+    }
+
+    public function testDirOpendir(): void
+    {
+        $processor = new StreamProcessor();
+        $this->assertTrue($processor->dir_opendir('tests/fixtures'));
+        $processor->dir_closedir();
+    }
+
+    public function testDirOpendirNotFound(): void
+    {
+        $test = $this;
+        set_error_handler(function ($errno, $errstr, $errfile, $errline) use ($test): bool {
+            $test->assertStringContainsString('opendir(not_found', $errstr);
+
+            return true;
+        });
+
+        $processor = new StreamProcessor();
+        $this->assertFalse($processor->dir_opendir('not_found'));
+
+        restore_error_handler();
+    }
+
+    public function testMakeDir(): void
+    {
+        $mock = $this->getStreamProcessorMock();
+        $mock->expects($this->exactly(2))->method('restore');
+        $mock->expects($this->exactly(2))->method('intercept');
+
+        $this->assertTrue($mock->mkdir('tests/fixtures/unittest_streamprocessor', 0777, 0));
+        $this->assertTrue($mock->rmdir('tests/fixtures/unittest_streamprocessor'));
+    }
+
+    public function testRename(): void
+    {
+        $mock = $this->getStreamProcessorMock();
+        $mock->expects($this->exactly(3))->method('restore');
+        $mock->expects($this->exactly(3))->method('intercept');
+
+        $this->assertTrue($mock->mkdir('tests/fixtures/unittest_streamprocessor', 0777, 0));
+        $this->assertTrue($mock->rename('tests/fixtures/unittest_streamprocessor', 'tests/fixtures/sp'));
+        $this->assertTrue($mock->rmdir('tests/fixtures/sp'));
+    }
+
+    public function testStreamMetadata(): void
+    {
+        if (!\function_exists('posix_getuid')) {
+            $this->markTestSkipped('Requires "posix_getuid" function.');
+        }
+
+        $mock = $this->getStreamProcessorMock();
+        $mock->expects($this->exactly(8))->method('restore');
+        $mock->expects($this->exactly(8))->method('intercept');
+
+        $path = 'tests/fixtures/unnitest_streamprocessor_metadata';
+        $this->assertTrue($mock->stream_metadata($path, \STREAM_META_TOUCH, null));
+        $this->assertTrue($mock->stream_metadata($path, \STREAM_META_TOUCH, [time(), time()]));
+
+        $this->assertTrue($mock->stream_metadata($path, \STREAM_META_OWNER_NAME, posix_getuid()));
+        $this->assertTrue($mock->stream_metadata($path, \STREAM_META_OWNER, posix_getuid()));
+
+        $this->assertTrue($mock->stream_metadata($path, \STREAM_META_GROUP_NAME, posix_getgid()));
+        $this->assertTrue($mock->stream_metadata($path, \STREAM_META_GROUP, posix_getgid()));
+
+        $this->assertTrue($mock->stream_metadata($path, \STREAM_META_ACCESS, 0777));
+
+        $this->assertTrue($mock->unlink($path));
+    }
+
+    /** @return StreamProcessor&MockObject */
+    protected function getStreamProcessorMock()
+    {
+        return $this->getMockBuilder(StreamProcessor::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['intercept', 'restore'])
+            ->getMock();
+    }
+}
diff --git a/tests/Unit/Util/TextUtilTest.php b/tests/Unit/Util/TextUtilTest.php
new file mode 100644
index 000000000..479e83e29
--- /dev/null
+++ b/tests/Unit/Util/TextUtilTest.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit\Util;
+
+use PHPUnit\Framework\TestCase;
+use VCR\Util\TextUtil;
+
+final class TextUtilTest extends TestCase
+{
+    /**
+     * @dataProvider curlMethodsProvider
+     */
+    public function testUnderscoreToLowerCamelcase(string $expected, string $method): void
+    {
+        $this->assertEquals($expected, TextUtil::underscoreToLowerCamelcase($method));
+    }
+
+    /** @return array<string, string[]> */
+    public function curlMethodsProvider(): array
+    {
+        return [
+            'curl_multi_add_handler' => ['curlMultiAddHandler', 'curl_multi_add_handler'],
+            'curl_add_handler' => ['curlAddHandler', 'curl_add_handler'],
+            'not a curl function' => ['curlExec', 'curl_exec'],
+        ];
+    }
+}
diff --git a/tests/Unit/VCRFactoryTest.php b/tests/Unit/VCRFactoryTest.php
new file mode 100644
index 000000000..ce8a8cdf1
--- /dev/null
+++ b/tests/Unit/VCRFactoryTest.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit;
+
+use org\bovigo\vfs\vfsStream;
+use PHPUnit\Framework\TestCase;
+use VCR\VCRFactory;
+
+final class VCRFactoryTest extends TestCase
+{
+    /**
+     * @dataProvider instanceProvider
+     *
+     * @covers \VCR\VCRFactory::createVCRVideorecorder()
+     *
+     * @param class-string $instance
+     */
+    public function testCreateInstances(string $instance): void
+    {
+        $this->assertInstanceOf($instance, VCRFactory::get($instance));
+    }
+
+    /** @return array<class-string[]> */
+    public function instanceProvider(): array
+    {
+        return [
+            ['VCR\Videorecorder'],
+            ['VCR\Configuration'],
+            ['VCR\Util\StreamProcessor'],
+            ['VCR\Util\HttpClient'],
+            ['VCR\CodeTransform\CurlCodeTransform'],
+            ['VCR\CodeTransform\SoapCodeTransform'],
+            ['VCR\LibraryHooks\CurlHook'],
+            ['VCR\LibraryHooks\SoapHook'],
+            ['VCR\LibraryHooks\StreamWrapperHook'],
+        ];
+    }
+
+    /**
+     * @dataProvider storageProvider
+     *
+     * @param class-string $className
+     */
+    public function testCreateStorage(string $storage, string $className): void
+    {
+        vfsStream::setup('test');
+
+        VCRFactory::get('VCR\Configuration')->setStorage($storage);
+        VCRFactory::get('VCR\Configuration')->setCassettePath(vfsStream::url('test/'));
+
+        $instance = VCRFactory::get('Storage', [(string) random_int(0, getrandmax())]);
+
+        $this->assertInstanceOf($className, $instance);
+    }
+
+    /** @return array<string[]> */
+    public function storageProvider()
+    {
+        return [
+            ['json', 'VCR\Storage\Json'],
+            ['yaml', 'VCR\Storage\Yaml'],
+        ];
+    }
+}
diff --git a/tests/VCR/VCRTest.php b/tests/Unit/VCRTest.php
similarity index 58%
rename from tests/VCR/VCRTest.php
rename to tests/Unit/VCRTest.php
index 9d63c35a7..75ffaf37f 100644
--- a/tests/VCR/VCRTest.php
+++ b/tests/Unit/VCRTest.php
@@ -1,33 +1,37 @@
 <?php
 
-namespace VCR;
+declare(strict_types=1);
 
-use Symfony\Component\EventDispatcher\Event;
+namespace VCR\Tests\Unit;
+
+use Assert\Assertion;
 use org\bovigo\vfs\vfsStream;
+use PHPUnit\Framework\TestCase;
+use VCR\Event\Event;
+use VCR\VCR;
+use VCR\VCREvents;
 
-/**
- * Test integration of PHPVCR with PHPUnit.
- */
-class VCRTest extends \PHPUnit_Framework_TestCase
+final class VCRTest extends TestCase
 {
-    public static function setupBeforeClass()
+    /** @var array<string, Event> */
+    private $events;
+
+    public static function setupBeforeClass(): void
     {
-        VCR::configure()->setCassettePath('tests/fixtures') ;
+        VCR::configure()->setCassettePath('tests/fixtures');
     }
 
-    public function testUseStaticCallsNotInitialized()
+    public function testUseStaticCallsNotInitialized(): void
     {
-        VCR::configure()->enableLibraryHooks(array('stream_wrapper'));
-        $this->setExpectedException(
-            'VCR\VCRException',
-            'Please turn on VCR before inserting a cassette, use: VCR::turnOn()'
-        );
+        VCR::configure()->enableLibraryHooks(['stream_wrapper']);
+        $this->expectException(\VCR\VCRException::class);
+        $this->expectExceptionMessage('Please turn on VCR before inserting a cassette, use: VCR::turnOn()');
         VCR::insertCassette('some_name');
     }
 
-    public function testShouldInterceptStreamWrapper()
+    public function testShouldInterceptStreamWrapper(): void
     {
-        VCR::configure()->enableLibraryHooks(array('stream_wrapper'));
+        VCR::configure()->enableLibraryHooks(['stream_wrapper']);
         VCR::turnOn();
         VCR::insertCassette('unittest_streamwrapper_test');
         $result = file_get_contents('http://example.com');
@@ -36,9 +40,9 @@ public function testShouldInterceptStreamWrapper()
         VCR::turnOff();
     }
 
-    public function testShouldInterceptCurlLibrary()
+    public function testShouldInterceptCurlLibrary(): void
     {
-        VCR::configure()->enableLibraryHooks(array('curl'));
+        VCR::configure()->enableLibraryHooks(['curl']);
         VCR::turnOn();
         VCR::insertCassette('unittest_curl_test');
 
@@ -49,26 +53,28 @@ public function testShouldInterceptCurlLibrary()
         VCR::turnOff();
     }
 
-    private function doCurlGetRequest($url)
+    private function doCurlGetRequest(string $url): string
     {
         $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_POST, false);
+        curl_setopt($ch, \CURLOPT_URL, $url);
+        curl_setopt($ch, \CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, \CURLOPT_POST, false);
         $output = curl_exec($ch);
         curl_close($ch);
 
+        Assertion::string($output);
+
         return $output;
     }
 
-    public function testShouldInterceptSoapLibrary()
+    public function testShouldInterceptSoapLibrary(): void
     {
-        VCR::configure()->enableLibraryHooks(array('soap'));
+        VCR::configure()->enableLibraryHooks(['soap']);
         VCR::turnOn();
         VCR::insertCassette('unittest_soap_test');
 
-        $client = new \SoapClient('https://raw.githubusercontent.com/php-vcr/php-vcr/master/tests/fixtures/soap/wsdl/weather.wsdl', array('soap_version' => SOAP_1_2));
-        $actual = $client->GetCityWeatherByZIP(array('ZIP' => '10013'));
+        $client = new \SoapClient('https://raw.githubusercontent.com/php-vcr/php-vcr/master/tests/fixtures/soap/wsdl/weather.wsdl', ['soap_version' => \SOAP_1_2]);
+        $actual = $client->GetCityWeatherByZIP(['ZIP' => '10013']);
         $temperature = $actual->GetCityWeatherByZIPResult->Temperature;
 
         $this->assertEquals('1337', $temperature, 'Soap call was not intercepted.');
@@ -76,13 +82,16 @@ public function testShouldInterceptSoapLibrary()
         VCR::turnOff();
     }
 
-    public function testShouldNotInterceptCallsToDevUrandom()
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testShouldNotInterceptCallsToDevUrandom(): void
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('/dev/urandom is not supported on Windows');
         }
 
-        VCR::configure()->enableLibraryHooks(array('stream_wrapper'));
+        VCR::configure()->enableLibraryHooks(['stream_wrapper']);
         VCR::turnOn();
         VCR::insertCassette('unittest_urandom_test');
 
@@ -94,48 +103,38 @@ public function testShouldNotInterceptCallsToDevUrandom()
         VCR::turnOff();
     }
 
-    public function testShouldThrowExceptionIfNoCassettePresent()
+    public function testShouldThrowExceptionIfNoCassettePresent(): void
     {
-        $this->setExpectedException(
-            'BadMethodCallException',
+        $this->expectException(\BadMethodCallException::class);
+        $this->expectExceptionMessage(
             'Invalid http request. No cassette inserted. Please make sure to insert '
-            . "a cassette in your unit test using VCR::insertCassette('name');"
+            ."a cassette in your unit test using VCR::insertCassette('name');"
         );
 
-        VCR::configure()->enableLibraryHooks(array('stream_wrapper'));
+        VCR::configure()->enableLibraryHooks(['stream_wrapper']);
         VCR::turnOn();
         // If there is no cassette inserted, a request should throw an exception
         file_get_contents('http://example.com');
         VCR::turnOff();
     }
 
-    public function testInsertMultipleCassettes()
-    {
-        $this->configureVirtualCassette();
-
-        VCR::turnOn();
-        VCR::insertCassette('unittest_cassette1');
-        VCR::insertCassette('unittest_cassette2');
-        // TODO: Check of cassette was changed
-    }
-
-    public function testDoesNotBlockThrowingExceptions()
+    public function testDoesNotBlockThrowingExceptions(): void
     {
         $this->configureVirtualCassette();
 
         VCR::turnOn();
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException('InvalidArgumentException');
         VCR::insertCassette('unittest_cassette1');
         throw new \InvalidArgumentException('test');
     }
 
-    private function configureVirtualCassette()
+    private function configureVirtualCassette(): void
     {
         vfsStream::setup('testDir');
         VCR::configure()->setCassettePath(vfsStream::url('testDir'));
     }
 
-    public function testShouldSetAConfiguration()
+    public function testShouldSetAConfiguration(): void
     {
         VCR::configure()->setCassettePath('tests');
         VCR::turnOn();
@@ -143,10 +142,10 @@ public function testShouldSetAConfiguration()
         VCR::turnOff();
     }
 
-    public function testShouldDispatchBeforeAndAfterPlaybackWhenCassetteHasResponse()
+    public function testShouldDispatchBeforeAndAfterPlaybackWhenCassetteHasResponse(): void
     {
         VCR::configure()
-            ->enableLibraryHooks(array('curl'));
+            ->enableLibraryHooks(['curl']);
         $this->recordAllEvents();
         VCR::turnOn();
         VCR::insertCassette('unittest_curl_test');
@@ -154,19 +153,19 @@ public function testShouldDispatchBeforeAndAfterPlaybackWhenCassetteHasResponse(
         $this->doCurlGetRequest('http://google.com/');
 
         $this->assertEquals(
-            array(VCREvents::VCR_BEFORE_PLAYBACK, VCREvents::VCR_AFTER_PLAYBACK),
+            [VCREvents::VCR_BEFORE_PLAYBACK, VCREvents::VCR_AFTER_PLAYBACK],
             $this->getRecordedEventNames()
         );
         VCR::eject();
         VCR::turnOff();
     }
 
-    public function testShouldDispatchBeforeAfterHttpRequestAndBeforeRecordWhenCassetteHasNoResponse()
+    public function testShouldDispatchBeforeAfterHttpRequestAndBeforeRecordWhenCassetteHasNoResponse(): void
     {
         vfsStream::setup('testDir');
         VCR::configure()
             ->setCassettePath(vfsStream::url('testDir'))
-            ->enableLibraryHooks(array('curl'));
+            ->enableLibraryHooks(['curl']);
         $this->recordAllEvents();
         VCR::turnOn();
         VCR::insertCassette('virtual_cassette');
@@ -174,38 +173,49 @@ public function testShouldDispatchBeforeAfterHttpRequestAndBeforeRecordWhenCasse
         $this->doCurlGetRequest('http://google.com/');
 
         $this->assertEquals(
-            array(
+            [
                 VCREvents::VCR_BEFORE_PLAYBACK,
                 VCREvents::VCR_BEFORE_HTTP_REQUEST,
                 VCREvents::VCR_AFTER_HTTP_REQUEST,
-                VCREvents::VCR_BEFORE_RECORD
-            ),
+                VCREvents::VCR_BEFORE_RECORD,
+            ],
             $this->getRecordedEventNames()
         );
         VCR::eject();
         VCR::turnOff();
     }
 
-    private function recordAllEvents()
+    public function testFinfoWorksCorrectly(): void
     {
-        $allEventsToListen = array(
+        $fileinfo = new \finfo(\FILEINFO_MIME_TYPE);
+
+        $this->assertEquals(
+            'text/plain',
+            $fileinfo->file(__DIR__.'/../../.gitignore')
+        );
+    }
+
+    private function recordAllEvents(): void
+    {
+        $allEventsToListen = [
             VCREvents::VCR_BEFORE_PLAYBACK,
             VCREvents::VCR_AFTER_PLAYBACK,
             VCREvents::VCR_BEFORE_HTTP_REQUEST,
             VCREvents::VCR_AFTER_HTTP_REQUEST,
             VCREvents::VCR_BEFORE_RECORD,
-        );
+        ];
         foreach ($allEventsToListen as $eventToListen) {
-            VCR::getEventDispatcher()->addListener($eventToListen, array($this, 'recordEvent'));
+            VCR::getEventDispatcher()->addListener($eventToListen, [$this, 'recordEvent']);
         }
     }
 
-    public function recordEvent(Event $event, $eventName)
+    public function recordEvent(Event $event, string $eventName): void
     {
         $this->events[$eventName] = $event;
     }
 
-    private function getRecordedEventNames()
+    /** @return string[] */
+    private function getRecordedEventNames(): array
     {
         return array_keys($this->events);
     }
diff --git a/tests/Unit/VideorecorderTest.php b/tests/Unit/VideorecorderTest.php
new file mode 100644
index 000000000..337283ddf
--- /dev/null
+++ b/tests/Unit/VideorecorderTest.php
@@ -0,0 +1,188 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VCR\Tests\Unit;
+
+use org\bovigo\vfs\vfsStream;
+use PHPUnit\Framework\TestCase;
+use VCR\Cassette;
+use VCR\Configuration;
+use VCR\Request;
+use VCR\Response;
+use VCR\Util\HttpClient;
+use VCR\VCR;
+use VCR\VCRFactory;
+use VCR\Videorecorder;
+
+final class VideorecorderTest extends TestCase
+{
+    public function testCreateVideorecorder(): void
+    {
+        $this->assertInstanceOf(
+            Videorecorder::class,
+            new Videorecorder(new Configuration(), new HttpClient(), VCRFactory::getInstance())
+        );
+    }
+
+    public function testInsertCassetteEjectExisting(): void
+    {
+        vfsStream::setup('testDir');
+        $factory = VCRFactory::getInstance();
+        $configuration = $factory->get('VCR\Configuration');
+        $configuration->setCassettePath(vfsStream::url('testDir'));
+        $configuration->enableLibraryHooks([]);
+        $videorecorder = $this->getMockBuilder('\VCR\Videorecorder')
+            ->setConstructorArgs([$configuration, new HttpClient(), VCRFactory::getInstance()])
+            ->setMethods(['eject', 'resetIndex'])
+            ->getMock();
+
+        $videorecorder->expects($this->exactly(2))->method('eject');
+        $videorecorder->expects($this->exactly(2))->method('resetIndex');
+
+        $videorecorder->turnOn();
+        $videorecorder->insertCassette('cassette1');
+        $videorecorder->insertCassette('cassette2');
+        $videorecorder->turnOff();
+    }
+
+    public function testHandleRequestRecordsRequestWhenModeIsNewRecords(): void
+    {
+        $request = new Request('GET', 'http://example.com', ['User-Agent' => 'Unit-Test']);
+        $response = new Response('200', [], 'example response');
+        $client = $this->getClientMock($request, $response);
+        $configuration = new Configuration();
+        $configuration->enableLibraryHooks([]);
+        $configuration->setMode('new_episodes');
+
+        $videorecorder = new class($configuration, $client, VCRFactory::getInstance()) extends Videorecorder {
+            public function setCassette(Cassette $cassette): void
+            {
+                $this->cassette = $cassette;
+            }
+        };
+
+        $videorecorder->setCassette($this->getCassetteMock($request, $response));
+
+        $this->assertEquals($response, $videorecorder->handleRequest($request));
+    }
+
+    public function testHandleRequestThrowsExceptionWhenModeIsNone(): void
+    {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage(
+            "The request does not match a previously recorded request and the 'mode' is set to 'none'. "
+            ."If you want to send the request anyway, make sure your 'mode' is set to 'new_episodes'."
+        );
+
+        $request = new Request('GET', 'http://example.com', ['User-Agent' => 'Unit-Test']);
+        $response = new Response('200', [], 'example response');
+        $client = $this->getMockBuilder('\VCR\Util\HttpClient')->getMock();
+        $configuration = new Configuration();
+        $configuration->enableLibraryHooks([]);
+        $configuration->setMode('none');
+
+        $videorecorder = new class($configuration, $client, VCRFactory::getInstance()) extends Videorecorder {
+            public function setCassette(Cassette $cassette): void
+            {
+                $this->cassette = $cassette;
+            }
+        };
+
+        $videorecorder->setCassette($this->getCassetteMock($request, $response, 'none'));
+
+        $videorecorder->handleRequest($request);
+    }
+
+    public function testHandleRequestRecordsRequestWhenModeIsOnceAndCassetteIsNew(): void
+    {
+        $request = new Request('GET', 'http://example.com', ['User-Agent' => 'Unit-Test']);
+        $response = new Response('200', [], 'example response');
+        $client = $this->getClientMock($request, $response);
+        $configuration = new Configuration();
+        $configuration->enableLibraryHooks([]);
+        $configuration->setMode('once');
+
+        $videorecorder = new class($configuration, $client, VCRFactory::getInstance()) extends Videorecorder {
+            public function setCassette(Cassette $cassette): void
+            {
+                $this->cassette = $cassette;
+            }
+        };
+
+        $videorecorder->setCassette($this->getCassetteMock($request, $response, 'once', true));
+
+        $this->assertEquals($response, $videorecorder->handleRequest($request));
+    }
+
+    public function testHandleRequestThrowsExceptionWhenModeIsOnceAndCassetteIsOld(): void
+    {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage(
+            "The request does not match a previously recorded request and the 'mode' is set to 'once'. "
+            ."If you want to send the request anyway, make sure your 'mode' is set to 'new_episodes'."
+        );
+
+        $request = new Request('GET', 'http://example.com', ['User-Agent' => 'Unit-Test']);
+        $response = new Response('200', [], 'example response');
+        $client = $this->getMockBuilder('\VCR\Util\HttpClient')->getMock();
+        $configuration = new Configuration();
+        $configuration->enableLibraryHooks([]);
+        $configuration->setMode('once');
+
+        $videorecorder = new class($configuration, $client, VCRFactory::getInstance()) extends Videorecorder {
+            public function setCassette(Cassette $cassette): void
+            {
+                $this->cassette = $cassette;
+            }
+        };
+
+        $videorecorder->setCassette($this->getCassetteMock($request, $response, 'once', false));
+
+        $videorecorder->handleRequest($request);
+    }
+
+    protected function getClientMock(Request $request, Response $response): HttpClient
+    {
+        $client = $this->getMockBuilder(HttpClient::class)->setMethods(['send'])->getMock();
+        $client
+            ->expects($this->once())
+            ->method('send')
+            ->with($request)
+            ->willReturn($response);
+
+        return $client;
+    }
+
+    protected function getCassetteMock(Request $request, Response $response, string $mode = VCR::MODE_NEW_EPISODES, bool $isNew = false): Cassette
+    {
+        $cassette = $this->getMockBuilder(Cassette::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['record', 'playback', 'isNew', 'getName'])
+            ->getMock();
+        $cassette
+            ->expects($this->once())
+            ->method('playback')
+            ->with($request)
+            ->willReturn(null);
+        $cassette
+            ->method('getName')
+            ->willReturn('foobar');
+
+        if (VCR::MODE_NEW_EPISODES === $mode || VCR::MODE_ONCE === $mode && true === $isNew) {
+            $cassette
+                ->expects($this->once())
+                ->method('record')
+                ->with($request, $response);
+        }
+
+        if ('once' == $mode) {
+            $cassette
+                ->expects($this->once())
+                ->method('isNew')
+                ->willReturn($isNew);
+        }
+
+        return $cassette;
+    }
+}
diff --git a/tests/VCR/CassetteTest.php b/tests/VCR/CassetteTest.php
deleted file mode 100644
index 8e740def7..000000000
--- a/tests/VCR/CassetteTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-namespace VCR;
-
-use org\bovigo\vfs\vfsStream;
-
-/**
- * Test integration of PHPVCR with PHPUnit.
- */
-class CassetteTest extends \PHPUnit_Framework_TestCase
-{
-
-    /**
-     * @var Cassette
-     */
-    private $cassette;
-
-    public function setUp()
-    {
-        vfsStream::setup('test');
-        $this->cassette = new Cassette('test', new Configuration(), new Storage\Yaml(vfsStream::url('test/'), 'json_test'));
-    }
-
-    public function testInvalidCassetteName()
-    {
-        $this->setExpectedException('\VCR\VCRException', 'Cassette name must be a string, array given.');
-        new Cassette(array(), new Configuration(), new Storage\Yaml(vfsStream::url('test/'), 'json_test'));
-    }
-
-    public function testGetName()
-    {
-        $this->assertEquals('test', $this->cassette->getName());
-    }
-
-    public function testDontOverwriteRecord()
-    {
-        $request = new Request('GET', 'https://example.com');
-        $response1 = new Response(200, array(), 'sometest');
-        $response2 = new Response(200, array(), 'sometest');
-        $this->cassette->record($request, $response1);
-        $this->cassette->record($request, $response2);
-
-        $this->assertEquals($response1->toArray(), $this->cassette->playback($request)->toArray());
-    }
-
-    public function testPlaybackAlreadyRecordedRequest()
-    {
-        $request = new Request('GET', 'https://example.com');
-        $response = new Response(200, array(), 'sometest');
-        $this->cassette->record($request, $response);
-
-        $this->assertEquals($response->toArray(), $this->cassette->playback($request)->toArray());
-    }
-
-    public function testHasResponseNotFound()
-    {
-        $request = new Request('GET', 'https://example.com');
-
-        $this->assertFalse($this->cassette->hasResponse($request), 'Expected false if request not found.');
-    }
-
-    public function testHasResponseFound()
-    {
-        $request = new Request('GET', 'https://example.com');
-        $response = new Response(200, array(), 'sometest');
-        $this->cassette->record($request, $response);
-
-        $this->assertTrue($this->cassette->hasResponse($request), 'Expected true if request was found.');
-    }
-}
diff --git a/tests/VCR/CodeTransform/AbstractCodeTransformTest.php b/tests/VCR/CodeTransform/AbstractCodeTransformTest.php
deleted file mode 100644
index 330d5bc30..000000000
--- a/tests/VCR/CodeTransform/AbstractCodeTransformTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace VCR\CodeTransform;
-
-class AbstractCodeTransformTest extends \PHPUnit_framework_TestCase
-{
-    protected function getFilter(array $methods = array())
-    {
-        $defaults = array_merge(
-            array('transformCode'),
-            $methods
-        );
-
-        $filter = $this->getMockBuilder('\VCR\CodeTransform\AbstractCodeTransform')
-            ->setMethods($defaults)
-            ->getMockForAbstractClass();
-
-        if (in_array('transformCode', $methods)) {
-            $filter
-                ->expects($this->once())
-                ->method('transformCode')
-                ->with($this->isType('string'))
-                ->will($this->returnArgument(0));
-        }
-
-        return $filter;
-    }
-
-    public function testRegisterAlreadyRegistered()
-    {
-        $filter = $this->getFilter();
-        $filter->register();
-
-        $this->assertAttributeSame(true, 'isRegistered', $filter, 'First attempt to register failed.');
-
-        $filter->register();
-
-        $this->assertAttributeSame(true, 'isRegistered', $filter, 'Second attempt to register failed.');
-    }
-}
diff --git a/tests/VCR/CodeTransform/CurlCodeTransformTest.php b/tests/VCR/CodeTransform/CurlCodeTransformTest.php
deleted file mode 100644
index 295c6cd7c..000000000
--- a/tests/VCR/CodeTransform/CurlCodeTransformTest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-namespace VCR\CodeTransform;
-
-use lapistano\ProxyObject\ProxyBuilder;
-
-class CurlCodeTransformTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @dataProvider codeSnippetProvider
-     */
-    public function testTransformCode($expected, $code)
-    {
-        $proxy = new ProxyBuilder('\VCR\CodeTransform\CurlCodeTransform');
-        $filter = $proxy
-            ->setMethods(array('transformCode'))
-            ->getProxy();
-
-        $this->assertEquals($expected, $filter->transformCode($code));
-    }
-
-    public function codeSnippetProvider()
-    {
-        return array(
-            array('\VCR\LibraryHooks\CurlHook::curl_init(', 'CURL_INIT ('),
-            array('\VCR\LibraryHooks\CurlHook::curl_exec(', 'curl_exec('),
-            array('\VCR\LibraryHooks\CurlHook::curl_getinfo(', 'curl_getinfo('),
-            array('\VCR\LibraryHooks\CurlHook::curl_setopt(', 'curl_setopt('),
-            array('\VCR\LibraryHooks\CurlHook::curl_multi_add_handle(', 'curl_multi_add_handle('),
-            array('\VCR\LibraryHooks\CurlHook::curl_multi_remove_handle(', 'curl_multi_remove_handle('),
-            array('\VCR\LibraryHooks\CurlHook::curl_multi_exec(', 'curl_multi_exec('),
-            array('\VCR\LibraryHooks\CurlHook::curl_multi_info_read(', 'curl_multi_info_read('),
-            array('\VCR\LibraryHooks\CurlHook::curl_reset(', 'curl_reset('),
-
-            array('\VCR\LibraryHooks\CurlHook::curl_init(', '\\CURL_INIT ('),
-            array('\VCR\LibraryHooks\CurlHook::curl_exec(', '\\curl_exec('),
-            array('\VCR\LibraryHooks\CurlHook::curl_getinfo(', '\\curl_getinfo('),
-            array('\VCR\LibraryHooks\CurlHook::curl_setopt(', '\\curl_setopt('),
-            array('\VCR\LibraryHooks\CurlHook::curl_multi_add_handle(', '\\curl_multi_add_handle('),
-            array('\VCR\LibraryHooks\CurlHook::curl_multi_remove_handle(', '\\curl_multi_remove_handle('),
-            array('\VCR\LibraryHooks\CurlHook::curl_multi_exec(', '\\curl_multi_exec('),
-            array('\VCR\LibraryHooks\CurlHook::curl_multi_info_read(', '\\curl_multi_info_read('),
-            array('\VCR\LibraryHooks\CurlHook::curl_reset(', '\\curl_reset('),
-
-            array('SomeClass::CURL_INIT (', 'SomeClass::CURL_INIT ('),
-            array('SomeClass::curl_exec(', 'SomeClass::curl_exec('),
-            array('SomeClass::curl_getinfo(', 'SomeClass::curl_getinfo('),
-            array('SomeClass::curl_setopt(', 'SomeClass::curl_setopt('),
-            array('SomeClass::curl_multi_add_handle(', 'SomeClass::curl_multi_add_handle('),
-            array('SomeClass::curl_multi_remove_handle(', 'SomeClass::curl_multi_remove_handle('),
-            array('SomeClass::curl_multi_exec(', 'SomeClass::curl_multi_exec('),
-            array('SomeClass::curl_multi_info_read(', 'SomeClass::curl_multi_info_read('),
-            array('SomeClass::curl_reset(', 'SomeClass::curl_reset('),
-
-            array('$object->CURL_INIT (', '$object->CURL_INIT ('),
-            array('$object->curl_exec(', '$object->curl_exec('),
-            array('$object->curl_getinfo(', '$object->curl_getinfo('),
-            array('$object->curl_setopt(', '$object->curl_setopt('),
-            array('$object->curl_multi_add_handle(', '$object->curl_multi_add_handle('),
-            array('$object->curl_multi_remove_handle(', '$object->curl_multi_remove_handle('),
-            array('$object->curl_multi_exec(', '$object->curl_multi_exec('),
-            array('$object->curl_multi_info_read(', '$object->curl_multi_info_read('),
-            array('$object->curl_reset(', '$object->curl_reset('),
-
-            array('function send_http_asynchronous_curl_exec(', 'function send_http_asynchronous_curl_exec(')
-        );
-    }
-}
diff --git a/tests/VCR/CodeTransform/SoapCodeTransformTest.php b/tests/VCR/CodeTransform/SoapCodeTransformTest.php
deleted file mode 100644
index 259ee851f..000000000
--- a/tests/VCR/CodeTransform/SoapCodeTransformTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace VCR\CodeTransform;
-
-use lapistano\ProxyObject\ProxyBuilder;
-
-class SoapCodeTransformTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @dataProvider codeSnippetProvider
-     */
-    public function testTransformCode($expected, $code)
-    {
-        $proxy = new ProxyBuilder('\VCR\CodeTransform\SoapCodeTransform');
-        $filter = $proxy
-            ->setMethods(array('transformCode'))
-            ->getProxy();
-
-        $this->assertEquals($expected, $filter->transformCode($code));
-    }
-
-    public function codeSnippetProvider()
-    {
-        return array(
-          array('new \VCR\Util\SoapClient(', 'new \SoapClient('),
-          array('new \VCR\Util\SoapClient(', 'new SoapClient('),
-          array('extends \VCR\Util\SoapClient', 'extends \SoapClient'),
-          array("extends \\VCR\\Util\\SoapClient\n", "extends \\SoapClient\n"),
-          array('new SoapClientExtended(', 'new SoapClientExtended('),
-          array('new \SoapClientExtended(', 'new \SoapClientExtended('),
-        );
-    }
-}
diff --git a/tests/VCR/ConfigurationTest.php b/tests/VCR/ConfigurationTest.php
deleted file mode 100644
index 6f06b6baf..000000000
--- a/tests/VCR/ConfigurationTest.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-
-namespace VCR;
-
-/**
- *
- */
-class ConfigurationTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var Configuration
-     */
-    private $config;
-
-    public function setUp()
-    {
-        $this->config = new Configuration;
-    }
-
-    public function testSetCassettePathThrowsErrorOnInvalidPath()
-    {
-        $this->setExpectedException(
-            'VCR\VCRException',
-            "Cassette path 'invalid_path' is not a directory. Please either "
-            . 'create it or set a different cassette path using '
-            . "\\VCR\\VCR::configure()->setCassettePath('directory')."
-        );
-        $this->config->setCassettePath('invalid_path');
-    }
-
-    public function testGetLibraryHooks()
-    {
-        $this->assertEquals(
-            array(
-                'VCR\LibraryHooks\StreamWrapperHook',
-                'VCR\LibraryHooks\CurlHook',
-                'VCR\LibraryHooks\SoapHook',
-            ),
-            $this->config->getLibraryHooks()
-        );
-    }
-
-    public function testEnableLibraryHooks()
-    {
-        $this->config->enableLibraryHooks(array('stream_wrapper'));
-        $this->assertEquals(
-            array(
-                'VCR\LibraryHooks\StreamWrapperHook',
-            ),
-            $this->config->getLibraryHooks()
-        );
-    }
-
-    public function testEnableSingleLibraryHook()
-    {
-        $this->config->enableLibraryHooks('stream_wrapper');
-        $this->assertEquals(
-            array(
-                'VCR\LibraryHooks\StreamWrapperHook',
-            ),
-            $this->config->getLibraryHooks()
-        );
-    }
-
-    public function testEnableLibraryHooksFailsWithWrongHookName()
-    {
-        $this->setExpectedException('InvalidArgumentException', "Library hooks don't exist: non_existing");
-        $this->config->enableLibraryHooks(array('non_existing'));
-    }
-
-    public function testEnableRequestMatchers()
-    {
-        $this->config->enableRequestMatchers(array('body', 'headers'));
-        $this->assertEquals(
-            array(
-                array('VCR\RequestMatcher', 'matchHeaders'),
-                array('VCR\RequestMatcher', 'matchBody'),
-            ),
-            $this->config->getRequestMatchers()
-        );
-    }
-
-    public function testEnableRequestMatchersFailsWithNoExistingName()
-    {
-        $this->setExpectedException('InvalidArgumentException', "Request matchers don't exist: wrong, name");
-        $this->config->enableRequestMatchers(array('wrong', 'name'));
-    }
-
-    public function testAddRequestMatcherFailsWithNoName()
-    {
-        $this->setExpectedException('VCR\VCRException', "A request matchers name must be at least one character long. Found ''");
-        $expected = function ($first, $second) {
-            return true;
-        };
-        $this->config->addRequestMatcher('', $expected);
-    }
-
-    public function testAddRequestMatcherFailsWithWrongCallback()
-    {
-        $this->setExpectedException('VCR\VCRException', "Request matcher 'example' is not callable.");
-        $this->config->addRequestMatcher('example', array());
-    }
-
-    public function testAddRequestMatchers()
-    {
-        $expected = function () {
-            return true;
-        };
-        $this->config->addRequestMatcher('new_matcher', $expected);
-        $this->assertContains($expected, $this->config->getRequestMatchers());
-    }
-
-    /**
-     * @dataProvider availableStorageProvider
-     */
-    public function testSetStorage($name, $className)
-    {
-        $this->config->setStorage($name);
-        $this->assertEquals($className, $this->config->getStorage(), "$name should be class $className.");
-    }
-
-    public function availableStorageProvider()
-    {
-        return array(
-            array('json', 'VCR\Storage\Json'),
-            array('yaml', 'VCR\Storage\Yaml'),
-        );
-    }
-
-    public function testSetStorageInvalidName()
-    {
-        $this->setExpectedException('VCR\VCRException', "Storage 'Does not exist' not available.");
-        $this->config->setStorage('Does not exist');
-    }
-
-    public function testGetStorage()
-    {
-        $class = $this->config->getStorage();
-        $this->assertContains('Iterator', class_implements($class));
-        $this->assertContains('Traversable', class_implements($class));
-        $this->assertContains('VCR\Storage\AbstractStorage', class_parents($class));
-    }
-
-    public function testWhitelist()
-    {
-        $expected = array('Tux', 'Gnu');
-
-        $this->config->setWhiteList($expected);
-
-        $this->assertEquals($expected, $this->config->getWhiteList());
-    }
-
-    public function testBlacklist()
-    {
-        $expected = array('Tux', 'Gnu');
-
-        $this->config->setBlackList($expected);
-
-        $this->assertEquals($expected, $this->config->getBlackList());
-    }
-
-    public function testSetModeInvalidName()
-    {
-        $this->setExpectedException('VCR\VCRException', "Mode 'invalid' does not exist.");
-        $this->config->setMode('invalid');
-    }
-}
diff --git a/tests/VCR/Event/AfterHttpRequestEventTest.php b/tests/VCR/Event/AfterHttpRequestEventTest.php
deleted file mode 100644
index 2987c9109..000000000
--- a/tests/VCR/Event/AfterHttpRequestEventTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace VCR\Event;
-
-use VCR\Request;
-use VCR\Response;
-
-class AfterHttpRequestEventTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var AfterHttpRequestEvent
-     */
-    private $event;
-
-    protected function setUp()
-    {
-        $this->event = new AfterHttpRequestEvent(new Request('GET', 'http://example.com'), new Response(200));
-    }
-
-    public function testGetRequest()
-    {
-        $this->assertInstanceOf('VCR\Request', $this->event->getRequest());
-    }
-
-    public function testGetResponse()
-    {
-        $this->assertInstanceOf('VCR\Response', $this->event->getResponse());
-    }
-}
diff --git a/tests/VCR/Event/AfterPlaybackEventTest.php b/tests/VCR/Event/AfterPlaybackEventTest.php
deleted file mode 100644
index da665d7a1..000000000
--- a/tests/VCR/Event/AfterPlaybackEventTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace VCR\Event;
-
-use VCR\Request;
-use VCR\Cassette;
-use VCR\Configuration;
-use VCR\Storage;
-use VCR\Response;
-
-class AfterPlaybackEventTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var AfterPlaybackEvent
-     */
-    private $event;
-
-    protected function setUp()
-    {
-        $this->event = new AfterPlaybackEvent(
-            new Request('GET', 'http://example.com'),
-            new Response(200),
-            new Cassette('test', new Configuration(), new Storage\Blackhole())
-        );
-    }
-
-    public function testGetRequest()
-    {
-        $this->assertInstanceOf('VCR\Request', $this->event->getRequest());
-    }
-
-    public function testGetResponse()
-    {
-        $this->assertInstanceOf('VCR\Response', $this->event->getResponse());
-    }
-
-    public function testGetCassette()
-    {
-        $this->assertInstanceOf('VCR\Cassette', $this->event->getCassette());
-    }
-}
diff --git a/tests/VCR/Event/BeforeHttpRequestEventTest.php b/tests/VCR/Event/BeforeHttpRequestEventTest.php
deleted file mode 100644
index b3479f66e..000000000
--- a/tests/VCR/Event/BeforeHttpRequestEventTest.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace VCR\Event;
-
-use VCR\Request;
-
-class BeforeHttpRequestEventTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var BeforeHttpRequestEvent
-     */
-    private $event;
-
-    protected function setUp()
-    {
-        $this->event = new BeforeHttpRequestEvent(new Request('GET', 'http://example.com'));
-    }
-
-    public function testGetRequest()
-    {
-        $this->assertInstanceOf('VCR\Request', $this->event->getRequest());
-    }
-}
diff --git a/tests/VCR/Event/BeforePlaybackEventTest.php b/tests/VCR/Event/BeforePlaybackEventTest.php
deleted file mode 100644
index 969a752ef..000000000
--- a/tests/VCR/Event/BeforePlaybackEventTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace VCR\Event;
-
-use VCR\Request;
-use VCR\Cassette;
-use VCR\Configuration;
-use VCR\Storage;
-
-class BeforePlaybackEventTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var BeforePlaybackEvent
-     */
-    private $event;
-
-    protected function setUp()
-    {
-        $this->event = new BeforePlaybackEvent(
-            new Request('GET', 'http://example.com'),
-            new Cassette('test', new Configuration(), new Storage\Blackhole())
-        );
-    }
-
-    public function testGetRequest()
-    {
-        $this->assertInstanceOf('VCR\Request', $this->event->getRequest());
-    }
-
-    public function testGetCassette()
-    {
-        $this->assertInstanceOf('VCR\Cassette', $this->event->getCassette());
-    }
-}
diff --git a/tests/VCR/Event/BeforeRecordEventTest.php b/tests/VCR/Event/BeforeRecordEventTest.php
deleted file mode 100644
index d61d998d3..000000000
--- a/tests/VCR/Event/BeforeRecordEventTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace VCR\Event;
-
-use VCR\Request;
-use VCR\Cassette;
-use VCR\Configuration;
-use VCR\Storage;
-use VCR\Response;
-
-class BeforeRecordEventTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var BeforeRecordEvent
-     */
-    private $event;
-
-    protected function setUp()
-    {
-        $this->event = new BeforeRecordEvent(
-            new Request('GET', 'http://example.com'),
-            new Response(200),
-            new Cassette('test', new Configuration(), new Storage\Blackhole())
-        );
-    }
-
-    public function testGetRequest()
-    {
-        $this->assertInstanceOf('VCR\Request', $this->event->getRequest());
-    }
-
-    public function testGetResponse()
-    {
-        $this->assertInstanceOf('VCR\Response', $this->event->getResponse());
-    }
-
-    public function testGetCassette()
-    {
-        $this->assertInstanceOf('VCR\Cassette', $this->event->getCassette());
-    }
-}
diff --git a/tests/VCR/RequestMatcherTest.php b/tests/VCR/RequestMatcherTest.php
deleted file mode 100644
index 1d8430b85..000000000
--- a/tests/VCR/RequestMatcherTest.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-
-namespace VCR;
-
-class RequestMatcherTest extends \PHPUnit_Framework_TestCase
-{
-    public function testMatchingMethod()
-    {
-        $first = new Request('GET', 'http://example.com', array());
-        $second = new Request('GET', 'http://example.com', array());
-
-        $this->assertTrue(RequestMatcher::matchMethod($first, $second));
-
-        $first = new Request('GET', 'http://example.com', array());
-        $second = new Request('POST', 'http://example.com', array());
-
-        $this->assertFalse(RequestMatcher::matchMethod($first, $second));
-    }
-
-    public function testMatchingUrl()
-    {
-        $first = new Request('GET', 'http://example.com/common/path', array());
-        $second = new Request('GET', 'http://example.com/common/path', array());
-
-        $this->assertTrue(RequestMatcher::matchUrl($first, $second));
-
-        $first = new Request('GET', 'http://example.com/first/path', array());
-        $second = new Request('GET', 'http://example.com/second/path', array());
-
-        $this->assertFalse(RequestMatcher::matchUrl($first, $second));
-
-        $first = new Request('GET', 'http://example.com/second', array());
-        $second = new Request('GET', 'http://example.com/second/path', array());
-
-        $this->assertFalse(RequestMatcher::matchUrl($first, $second));
-    }
-
-    public function testMatchingHost()
-    {
-        $first = new Request('GET', 'http://example.com/common/path', array());
-        $second = new Request('GET', 'http://example.com/common/path', array());
-
-        $this->assertTrue(RequestMatcher::matchHost($first, $second));
-
-        $first = new Request('GET', 'http://example.com/first/path', array());
-        $second = new Request('GET', 'http://elpmaxe.com/second/path', array());
-
-        $this->assertFalse(RequestMatcher::matchHost($first, $second));
-    }
-
-    public function testMatchingHeaders()
-    {
-        $first = new Request('GET', 'http://example.com', array('Accept' => 'Everything'));
-        $second = new Request('GET', 'http://example.com', array('Accept' => 'Everything'));
-
-        $this->assertTrue(RequestMatcher::matchHeaders($first, $second));
-
-        $first = new Request('GET', 'http://example.com', array('Accept' => 'Everything'));
-        $second = new Request('GET', 'http://example.com', array('Accept' => 'Nothing'));
-
-        $this->assertFalse(RequestMatcher::matchHeaders($first, $second));
-    }
-
-    public function testHeaderMatchingDisallowsMissingHeaders()
-    {
-        $first = new Request('GET', 'http://example.com', array('Accept' => 'Everything', 'MyHeader' => 'value'));
-        $second = new Request('GET', 'http://example.com', array('Accept' => 'Everything'));
-
-        $this->assertFalse(RequestMatcher::matchHeaders($first, $second));
-
-        $first = new Request('GET', 'http://example.com', array('Accept' => 'Everything'));
-        $second = new Request('GET', 'http://example.com', array('Accept' => 'Everything', 'MyHeader' => 'value'));
-
-        $this->assertFalse(RequestMatcher::matchHeaders($first, $second));
-    }
-
-    public function testHeaderMatchingAllowsEmptyVals()
-    {
-        $first = new Request('GET', 'http://example.com', array('Accept' => null, 'Content-Type' => 'application/json'));
-        $second = new Request('GET', 'http://example.com', array('Accept' => null, 'Content-Type' => 'application/json'));
-
-        $this->assertTrue(RequestMatcher::matchHeaders($first, $second));
-    }
-
-    public function testMatchingPostFields()
-    {
-        $mock = array(
-            'method' => 'POST',
-            'url' => 'http://example.com',
-            'headers' => array(),
-            'post_fields' => array(
-                'field1' => 'value1',
-                'field2' => 'value2',
-            )
-        );
-
-        $first = Request::fromArray($mock);
-        $second = Request::fromArray($mock);
-
-        $this->assertTrue(RequestMatcher::matchPostFields($first, $second));
-
-        $mock['post_fields']['field2'] = 'changedvalue2';
-        $third = Request::fromArray($mock);
-
-        $this->assertFalse(RequestMatcher::matchPostFields($first, $third));
-    }
-
-    public function testMatchingQueryString()
-    {
-        $first = new Request('GET', 'http://example.com/search?query=test', array());
-        $second = new Request('GET', 'http://example.com/search?query=test', array());
-
-        $this->assertTrue(RequestMatcher::matchQueryString($first, $second));
-
-        $first = new Request('GET', 'http://example.com/search?query=first', array());
-        $second = new Request('GET', 'http://example.com/search?query=second', array());
-
-        $this->assertFalse(RequestMatcher::matchQueryString($first, $second));
-    }
-
-    public function testMatchingBody()
-    {
-        $first = new Request('GET', 'http://example.com', array());
-        $first->setBody('test');
-        $second = new Request('GET', 'http://example.com', array());
-        $second->setBody('test');
-
-        $this->assertTrue(RequestMatcher::matchBody($first, $second), 'Bodies should be equal');
-
-        $first = new Request('GET', 'http://example.com', array());
-        $first->setBody('test');
-        $second = new Request('POST', 'http://example.com', array());
-        $second->setBody('different');
-
-        $this->assertFalse(RequestMatcher::matchBody($first, $second), 'Bodies are different.');
-    }
-}
diff --git a/tests/VCR/RequestTest.php b/tests/VCR/RequestTest.php
deleted file mode 100644
index 3a8379ef6..000000000
--- a/tests/VCR/RequestTest.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-
-namespace VCR;
-
-/**
- * Test integration of PHPVCR with PHPUnit.
- */
-class RequestTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var \VCR\Request
-     */
-    protected $request;
-
-    public function setUp()
-    {
-        $this->request = new Request('GET', 'http://example.com', array('User-Agent' => 'Unit-Test'));
-    }
-
-    public function testGetHeaders()
-    {
-        $this->assertEquals(
-            array(
-                'User-Agent' => 'Unit-Test',
-                'Host'       => 'example.com'
-            ),
-            $this->request->getHeaders()
-        );
-    }
-
-    public function testSetMethod()
-    {
-        $this->request->setMethod('post');
-
-        $this->assertEquals('POST', $this->request->getMethod());
-    }
-
-    public function testSetAuthorization()
-    {
-        $this->request->setAuthorization('login', 'password');
-
-        $this->assertEquals('Basic bG9naW46cGFzc3dvcmQ=', $this->request->getHeader('Authorization'));
-    }
-
-    public function testMatches()
-    {
-        $request = new Request('GET', 'http://example.com', array('User-Agent' => 'Unit-Test'));
-
-        $this->assertTrue($this->request->matches($request, array(array('VCR\RequestMatcher', 'matchMethod'))));
-    }
-
-    public function testDoesntMatch()
-    {
-        $request = new Request('POST', 'http://example.com', array('User-Agent' => 'Unit-Test'));
-
-        $this->assertFalse($this->request->matches($request, array(array('VCR\RequestMatcher', 'matchMethod'))));
-    }
-
-    public function testMatchesThrowsExceptionIfMatcherNotFound()
-    {
-        $request = new Request('POST', 'http://example.com', array('User-Agent' => 'Unit-Test'));
-        $this->setExpectedException(
-            '\BadFunctionCallException',
-            "Matcher could not be executed. Array\n(\n    [0] => some\n    [1] => method\n)\n"
-        );
-        $this->request->matches($request, array(array('some', 'method')));
-    }
-
-    public function testRestoreRequest()
-    {
-        $restoredRequest = Request::fromArray($this->request->toArray());
-        $this->assertEquals(
-            array(
-                'method'      => 'GET',
-                'url'         => 'http://example.com',
-                'headers'     => array(
-                    'User-Agent' => 'Unit-Test',
-                    'Host' => 'example.com',
-                 )
-            ),
-            $restoredRequest->toArray()
-        );
-    }
-
-    public function testStorePostFields()
-    {
-        $this->request->setPostFields(array('para1' => 'val1'));
-        $this->assertEquals(
-            array(
-                'method'      => 'GET',
-                'url'         => 'http://example.com',
-                'headers'     => array(
-                    'User-Agent' => 'Unit-Test',
-                    'Host' => 'example.com',
-                    ),
-                'post_fields' => array('para1' => 'val1'),
-            ),
-            $this->request->toArray()
-        );
-    }
-
-    public function testRestorePostFields()
-    {
-        $this->request->setPostFields(array('para1' => 'val1'));
-        $restoredRequest = Request::fromArray($this->request->toArray());
-        $this->assertEquals(
-            array(
-                'method'      => 'GET',
-                'url'         => 'http://example.com',
-                'headers'     => array(
-                    'User-Agent' => 'Unit-Test',
-                    'Host' => 'example.com',
-                    ),
-                'post_fields' => array('para1' => 'val1'),
-            ),
-            $restoredRequest->toArray()
-        );
-    }
-
-    public function testStorePostFile()
-    {
-        $file = array(
-            'fieldName'   => 'field_name',
-            'contentType' => 'application/octet-stream',
-            'filename'    => 'tests/fixtures/unittest_curl_test',
-            'postname'    => 'unittest_curl_test',
-        );
-        $this->request->addPostFile($file);
-        $this->assertEquals(
-            array(
-                'method'      => 'GET',
-                'url'         => 'http://example.com',
-                'headers'     => array(
-                    'User-Agent'   => 'Unit-Test',
-                    'Host'         => 'example.com',
-                ),
-                'post_files' => array($file),
-            ),
-            $this->request->toArray()
-        );
-    }
-
-    public function testRestorePostFiles()
-    {
-        $file = array(
-            'fieldName'   => 'field_name',
-            'contentType' => 'application/octet-stream',
-            'filename'    => 'tests/fixtures/unittest_curl_test',
-            'postname'    => 'unittest_curl_test',
-        );
-        $this->request->addPostFile($file);
-        $restoredRequest = Request::fromArray($this->request->toArray());
-        $this->assertEquals(
-            array(
-                'method'      => 'GET',
-                'url'         => 'http://example.com',
-                'headers'     => array(
-                    'User-Agent'   => 'Unit-Test',
-                    'Host'         => 'example.com',
-                    ),
-                'post_files' => array($file),
-            ),
-            $restoredRequest->toArray()
-        );
-    }
-
-    public function testRestoreBody()
-    {
-        $this->request->setBody('sometest');
-        $restoredRequest = Request::fromArray($this->request->toArray());
-        $this->assertEquals(
-            array(
-                'method'      => 'GET',
-                'url'         => 'http://example.com',
-                'headers'     => array(
-                    'User-Agent' => 'Unit-Test',
-                    'Host' => 'example.com',
-                ),
-                'body' => 'sometest',
-            ),
-            $restoredRequest->toArray()
-        );
-    }
-
-    public function testMatchesBody()
-    {
-        $this->request->setBody('sometest');
-        $request = new Request('POST', 'http://example.com');
-        $request->setBody('sometest');
-
-        $this->assertTrue(
-            $this->request->matches(
-                Request::fromArray($request->toArray()),
-                array(array('VCR\RequestMatcher', 'matchBody'))
-            )
-        );
-    }
-
-    public function testDoesntMatchBody()
-    {
-        $this->request->setBody('sometest');
-        $request = new Request('POST', 'http://example.com');
-        $request->setBody('not match');
-
-        $this->assertFalse(
-            $this->request->matches(
-                Request::fromArray($request->toArray()),
-                array(array('VCR\RequestMatcher', 'matchBody'))
-            )
-        );
-    }
-
-    public function testGetHostReturnsBothHostAndPort()
-    {
-        $request = new Request('GET', 'http://example.com:5000/foo?param=key');
-        $this->assertEquals('example.com:5000', $request->getHost());
-    }
-
-    public function testDoNotOverwriteHostHeader()
-    {
-        $this->request = new Request(
-          'GET',
-          'http://example.com',
-          array('User-Agent' => 'Unit-Test', 'Host' => 'www.example.com')
-        );
-
-        $this->assertEquals(
-            array(
-                'User-Agent' => 'Unit-Test',
-                'Host'       => 'www.example.com'
-            ),
-            $this->request->getHeaders()
-        );
-    }
-
-    public function testCurlCustomRequestOverridesMethod()
-    {
-        $postRequest = new Request('POST', 'http://example.com');
-        $getRequest = new Request('GET', 'http://example.com');
-
-        $this->assertEquals('POST', $postRequest->getMethod());
-        $this->assertEquals('GET', $getRequest->getMethod());
-
-        $postRequest->setCurlOption(CURLOPT_CUSTOMREQUEST, 'PUT');
-        $getRequest->setCurlOption(CURLOPT_CUSTOMREQUEST, 'POST');
-
-        $this->assertEquals('PUT', $postRequest->getMethod());
-        $this->assertEquals('POST', $getRequest->getMethod());
-    }
-}
diff --git a/tests/VCR/ResponseTest.php b/tests/VCR/ResponseTest.php
deleted file mode 100644
index 90dbe0803..000000000
--- a/tests/VCR/ResponseTest.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-
-namespace VCR;
-
-/**
- * Test VCRs response object.
- */
-class ResponseTest extends \PHPUnit_Framework_TestCase
-{
-    public function testGetHeaders()
-    {
-        $expectedHeaders = array(
-            'User-Agent' => 'Unit-Test',
-            'Host'       => 'example.com'
-        );
-
-        $response = Response::fromArray(array('headers' => $expectedHeaders));
-
-        $this->assertEquals($expectedHeaders, $response->getHeaders());
-    }
-
-    public function testGetHeadersNoneDefined()
-    {
-        $response = Response::fromArray(array());
-        $this->assertEquals(array(), $response->getHeaders());
-    }
-
-    public function testRestoreHeadersFromArray()
-    {
-        $headers = array(
-            'Content-Type'   => 'application/json',
-            'Content-Length' => '349',
-            'Connection'     => 'close',
-            'Date'           => 'Fri, 31 Jan 2014 15:37:13 GMT',
-        );
-        $response = new Response(200, $headers);
-        $restoredResponse = Response::fromArray($response->toArray());
-
-        $this->assertEquals($headers, $restoredResponse->getHeaders());
-    }
-
-    public function testGetBody()
-    {
-        $expectedBody = 'This is test content';
-
-        $response = Response::fromArray(array('body' => $expectedBody));
-
-        $this->assertEquals($expectedBody, $response->getBody(true));
-    }
-
-    public function testGetBodyNoneDefined()
-    {
-        $response = Response::fromArray(array());
-        $this->assertNull($response->getBody(true));
-    }
-
-    public function testRestoreBodyFromArray()
-    {
-        $body = 'this is an example body';
-        $response = new Response(200, array(), $body);
-        $restoredResponse = Response::fromArray($response->toArray());
-
-        $this->assertEquals($body, $restoredResponse->getBody(true));
-    }
-
-    public function testBase64EncodeCompressedBody()
-    {
-        $body = 'this is an example body';
-        $response = new Response(200, array('Content-Type' => 'application/x-gzip'), $body);
-        $responseArray = $response->toArray();
-
-        $this->assertEquals(base64_encode($body), $responseArray['body']);
-    }
-
-    public function testBase64DecodeCompressedBody()
-    {
-        $body = 'this is an example body';
-        $responseArray = array(
-            'headers' => array('Content-Type' => 'application/x-gzip'),
-            'body'    => base64_encode($body)
-        );
-        $response = Response::fromArray($responseArray);
-
-        $this->assertEquals($body, $response->getBody(true));
-    }
-
-    public function testRestoreCompressedBody()
-    {
-        $body = 'this is an example body';
-        $response = new Response(200, array('Content-Type' => 'application/x-gzip'), $body);
-        $restoredResponse = Response::fromArray($response->toArray());
-
-        $this->assertEquals($body, $restoredResponse->getBody(true));
-    }
-
-    public function testGetStatus()
-    {
-        $expectedStatus = 200;
-
-        $response = new Response($expectedStatus);
-
-        $this->assertEquals($expectedStatus, $response->getStatusCode());
-    }
-
-    public function testRestoreStatusFromArray()
-    {
-        $expectedStatus = 200;
-
-        $response = new Response($expectedStatus);
-        $restoredResponse = Response::fromArray($response->toArray());
-
-        $this->assertEquals($expectedStatus, $restoredResponse->getStatusCode());
-    }
-
-    public function testGetCurlInfo()
-    {
-        $curlOptions = array('option' => 'value');
-        $response = new Response(200, array(), null, $curlOptions);
-
-        $this->assertEquals($curlOptions, $response->getCurlInfo());
-    }
-
-    public function testToArray()
-    {
-        $expectedArray = array(
-            'status'    => array(
-                'http_version' => '1.1',
-                'code' => 200,
-                'message' => 'OK',
-            ),
-            'headers'   => array(
-                'host' => 'example.com'
-            ),
-            'body'      => 'Test response'
-        );
-
-        $response = Response::fromArray($expectedArray);
-
-        $this->assertEquals($expectedArray, $response->toArray());
-    }
-}
diff --git a/tests/VCR/Storage/AbstractStorageTest.php b/tests/VCR/Storage/AbstractStorageTest.php
deleted file mode 100644
index f9b1d4102..000000000
--- a/tests/VCR/Storage/AbstractStorageTest.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-namespace VCR\Storage;
-
-use org\bovigo\vfs\vfsStream;
-
-/**
- * Test integration of PHPVCR with PHPUnit.
- */
-class AbstractStorageTest extends \PHPUnit_Framework_TestCase
-{
-    protected $handle;
-    protected $filePath;
-    protected $storage;
-
-    public function testFilePathCreated()
-    {
-        $fs = vfsStream::setup('test');
-
-        $this->storage = new TestStorage(vfsStream::url('test/'), 'file');
-        $this->assertTrue($fs->hasChild('file'));
-
-        $this->storage = new TestStorage(vfsStream::url('test/'), 'folder/file');
-        $this->assertTrue($fs->hasChild('folder'));
-        $this->assertTrue($fs->getChild('folder')->hasChild('file'));
-    }
-
-    public function testRootNotExisting()
-    {
-        $this->setExpectedException('\VCR\VCRException', "Cassette path 'vfs://test/foo' is not existing or not a directory");
-
-        vfsStream::setup('test');
-        new TestStorage(vfsStream::url('test/foo'), 'file');
-    }
-}
-
-class TestStorage extends AbstractStorage
-{
-    private $recording;
-
-    public function storeRecording(array $recording)
-    {
-        $this->recording = $recording;
-    }
-
-    public function next()
-    {
-        list($this->position, $this->current) = each($this->recording);
-
-        return $this->current;
-    }
-
-    public function valid()
-    {
-        return (boolean) $this->position;
-    }
-
-    public function rewind()
-    {
-        reset($this->recording);
-    }
-}
diff --git a/tests/VCR/Storage/BlackholeTest.php b/tests/VCR/Storage/BlackholeTest.php
deleted file mode 100644
index 336b7f63e..000000000
--- a/tests/VCR/Storage/BlackholeTest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace VCR\Storage;
-
-class BlackholeTest extends \PHPUnit_Framework_TestCase
-{
-    protected $storage;
-
-    public function setUp()
-    {
-        $this->storage = new Blackhole();
-    }
-
-    public function testStoreRecordingIsCallable()
-    {
-        $this->assertNull($this->storage->storeRecording(array('empty or not, we don\'t care')));
-    }
-
-    public function testNextIsCallable()
-    {
-        $this->assertNull($this->storage->next());
-    }
-
-    public function testRewindIsCallable()
-    {
-        $this->assertNull($this->storage->rewind());
-    }
-
-    /**
-     * @expectedException BadMethodCallException
-     */
-    public function testKeyIsNotCallable()
-    {
-        $this->storage->key();
-    }
-
-    /**
-     * @expectedException BadMethodCallException
-     */
-    public function testCurrentIsNotCallable()
-    {
-        $this->storage->current();
-    }
-
-    public function testValidIsAlwaysFalse()
-    {
-        $this->assertFalse($this->storage->valid());
-    }
-
-    public function testIsNewIsAlwaysTrue()
-    {
-        $this->assertTrue($this->storage->isNew());
-    }
-}
diff --git a/tests/VCR/Storage/JsonTest.php b/tests/VCR/Storage/JsonTest.php
deleted file mode 100644
index 4d63bc84a..000000000
--- a/tests/VCR/Storage/JsonTest.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-namespace VCR\Storage;
-
-use org\bovigo\vfs\vfsStream;
-
-/**
- * Test integration of PHPVCR with PHPUnit.
- */
-class JsonTest extends \PHPUnit_Framework_TestCase
-{
-    protected $handle;
-    protected $filePath;
-    protected $jsonObject;
-
-    public function setUp()
-    {
-        vfsStream::setup('test');
-        $this->filePath = vfsStream::url('test/') . 'json_test';
-        $this->jsonObject = new Json(vfsStream::url('test/'), 'json_test');
-    }
-
-    public function testIterateOneObject()
-    {
-        $this->iterateAndTest(
-            '[{"para1": "val1"}]',
-            array(
-                array('para1' => 'val1'),
-            ),
-            'Single json object was not parsed correctly.'
-        );
-    }
-
-    public function testIterateTwoObjects()
-    {
-        $this->iterateAndTest(
-            '[{"para1": "val1"}, {"para2": "val2"}]',
-            array(
-                array('para1' => 'val1'),
-                array('para2' => 'val2'),
-            ),
-            'Two json objects were not parsed correctly.'
-        );
-    }
-
-    public function testIterateFirstNestedObject()
-    {
-        $this->iterateAndTest(
-            '[{"para1": {"para2": "val2"}}, {"para3": "val3"}]',
-            array(
-                array('para1' => array('para2' => 'val2')),
-                array('para3' => 'val3'),
-            ),
-            'Nested json objects were not parsed correctly.'
-        );
-    }
-
-    public function testIterateSecondNestedObject()
-    {
-        $this->iterateAndTest(
-            '[{"para1": "val1"}, {"para2": {"para3": "val3"}}]',
-            array(
-                array('para1' => 'val1'),
-                array('para2' => array('para3' => 'val3')),
-            ),
-            'Nested json objects were not parsed correctly.'
-        );
-    }
-
-    public function testIterateEmpty()
-    {
-        $this->iterateAndTest(
-            '[]',
-            array(),
-            'Empty json was not parsed correctly.'
-        );
-    }
-
-    public function testStoreRecording()
-    {
-        $expected = array(
-            'request' => 'some request',
-            'response' => 'some response'
-        );
-
-        $this->jsonObject->storeRecording($expected);
-
-        $actual = array();
-        foreach ($this->jsonObject as $recording) {
-            $actual[] = $recording;
-        }
-
-        $this->assertEquals($expected, $actual[0], 'Storing and reading a recording failed.');
-    }
-
-    public function testValidJson()
-    {
-        $stored = array(
-            'request' => 'some request',
-            'response' => 'some response'
-        );
-        $this->jsonObject->storeRecording($stored);
-        $this->jsonObject->storeRecording($stored);
-
-        $this->assertJson(file_get_contents($this->filePath));
-    }
-
-    public function testStoreRecordingWhenBlankFileAlreadyExists()
-    {
-        vfsStream::create(array('blank_file_test' => ''));
-        $filePath = vfsStream::url('test/') . 'blank_file_test';
-
-        $jsonObject = new Json(vfsStream::url('test/'), 'blank_file_test');
-        $stored = array(
-            'request' => 'some request',
-            'response' => 'some response'
-        );
-        $jsonObject->storeRecording($stored);
-
-        $this->assertJson(file_get_contents($filePath));
-    }
-
-    private function iterateAndTest($json, $expected, $message)
-    {
-        file_put_contents($this->filePath, $json);
-
-        $actual = array();
-        foreach ($this->jsonObject as $object) {
-            $actual[] = $object;
-        }
-
-        $this->assertEquals($expected, $actual, $message);
-    }
-}
diff --git a/tests/VCR/Storage/YamlTest.php b/tests/VCR/Storage/YamlTest.php
deleted file mode 100644
index a4bcc3463..000000000
--- a/tests/VCR/Storage/YamlTest.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-namespace VCR\Storage;
-
-use org\bovigo\vfs\vfsStream;
-
-/**
- * Test integration of PHPVCR with PHPUnit.
- */
-class YamlTest extends \PHPUnit_Framework_TestCase
-{
-    public function setUp()
-    {
-        vfsStream::setup('test');
-        $this->filePath = vfsStream::url('test/') . DIRECTORY_SEPARATOR . 'yaml_test';
-        $this->yamlObject = new Yaml(vfsStream::url('test/'), 'yaml_test');
-    }
-
-    public function testIterateOneObject()
-    {
-        $this->iterateAndTest(
-            '-' . "\n"
-            . '    para1: val1',
-            array(
-                array('para1' => 'val1'),
-            ),
-            'Single yaml object was not parsed correctly.'
-        );
-    }
-
-    public function testIterateTwoObjects()
-    {
-        $this->iterateAndTest(
-            '-' . "\n"
-            . '    para1: val1' . "\n"
-            . '-' . "\n"
-            . '   para2: val2',
-            array(
-                array('para1' => 'val1'),
-                array('para2' => 'val2'),
-            ),
-            'Two yaml objects were not parsed correctly.'
-        );
-    }
-
-    public function testIterateFirstNestedObject()
-    {
-        $this->iterateAndTest(
-            '-' . "\n"
-            . '    para1:' . "\n"
-            . '        para2: val2' . "\n"
-            . '-' . "\n"
-            . '    para3: val3',
-            array(
-                array('para1' => array('para2' => 'val2')),
-                array('para3' => 'val3'),
-            ),
-            'Nested yaml objects were not parsed correctly.'
-        );
-    }
-
-    public function testIterateSecondNestedObject()
-    {
-        $this->iterateAndTest(
-            '-' . "\n"
-            . '    para1: val1' . "\n"
-            . '-' . "\n"
-            . '    para2:' . "\n"
-            . '        para3: val3' . "\n",
-            array(
-                array('para1' => 'val1'),
-                array('para2' => array('para3' => 'val3')),
-            ),
-            'Nested yaml objects were not parsed correctly.'
-        );
-    }
-
-    public function testIterateEmpty()
-    {
-        $this->iterateAndTest(
-            '',
-            array(),
-            'Empty yaml was not parsed correctly.'
-        );
-    }
-
-    public function testStoreRecording()
-    {
-        $expected = array(
-            'request' => 'some request',
-            'response' => 'some response'
-        );
-
-        $this->yamlObject->storeRecording($expected);
-
-        $actual = array();
-        foreach ($this->yamlObject as $recording) {
-            $actual[] = $recording;
-        }
-
-        $this->assertEquals($expected, $actual[0], 'Storing and reading a recording failed.');
-    }
-
-    public function testStoreTwoRecording()
-    {
-        $expected = array(
-            'request'  => array('headers' => array('Content-Type' => 'application/json')),
-            'response' => array('body' => 'ok', 'status' => 200)
-        );
-
-        $this->yamlObject->storeRecording($expected);
-        $this->yamlObject->storeRecording($expected);
-
-        $actual = array();
-        foreach ($this->yamlObject as $recording) {
-            $actual[] = $recording;
-        }
-        $this->assertCount(2, $actual, 'More that two recordings stores.');
-        $this->assertEquals($expected, $actual[0], 'Storing and reading first recording failed.');
-        $this->assertEquals($expected, $actual[1], 'Storing and reading second recording failed.');
-    }
-
-    private function iterateAndTest($yaml, $expected, $message)
-    {
-        file_put_contents($this->filePath, $yaml);
-
-        $actual = array();
-        foreach ($this->yamlObject as $object) {
-            $actual[] = $object;
-        }
-
-        $this->assertEquals($expected, $actual, $message);
-    }
-}
diff --git a/tests/VCR/Util/CurlHelperTest.php b/tests/VCR/Util/CurlHelperTest.php
deleted file mode 100644
index 3f2fac7f0..000000000
--- a/tests/VCR/Util/CurlHelperTest.php
+++ /dev/null
@@ -1,439 +0,0 @@
-<?php
-
-namespace VCR\Util;
-
-use org\bovigo\vfs\vfsStream;
-use VCR\Request;
-use VCR\Response;
-
-class CurlHelperTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @dataProvider getHttpMethodsProvider()
-     */
-    public function testSetCurlOptionMethods($method)
-    {
-        $request = new Request($method, 'example.com');
-        $headers = array('Host: example.com');
-
-        CurlHelper::setCurlOptionOnRequest($request, CURLOPT_HTTPHEADER, $headers);
-
-        $this->assertEquals($method, $request->getMethod());
-    }
-
-    /**
-     * Returns a list of HTTP methods for testing testSetCurlOptionMethods.
-     *
-     * @return array HTTP methods.
-     */
-    public function getHttpMethodsProvider()
-    {
-        return array(
-            array('CONNECT'),
-            array('DELETE'),
-            array('GET'),
-            array('HEAD'),
-            array('OPTIONS'),
-            array('POST'),
-            array('PUT'),
-            array('TRACE'),
-        );
-    }
-
-    public function testSetCurlOptionOnRequestPostFieldsQueryString()
-    {
-        $request = new Request('POST', 'example.com');
-        $payload = 'para1=val1&para2=val2';
-
-        CurlHelper::setCurlOptionOnRequest($request, CURLOPT_POSTFIELDS, $payload);
-
-        $this->assertEquals($payload, (string) $request->getBody());
-    }
-
-    public function testSetCurlOptionOnRequestPostFieldsArray()
-    {
-        $request = new Request('POST', 'example.com');
-        $payload = array('some' => 'test');
-
-        CurlHelper::setCurlOptionOnRequest($request, CURLOPT_POSTFIELDS, $payload);
-
-        $this->assertNull($request->getBody());
-        $this->assertEquals($payload, $request->getPostFields());
-    }
-
-    public function testSetCurlOptionOnRequestPostFieldsString()
-    {
-        $request = new Request('POST', 'example.com');
-        $payload = json_encode(array('some' => 'test'));
-
-        CurlHelper::setCurlOptionOnRequest($request, CURLOPT_POSTFIELDS, $payload);
-
-        $this->assertEquals($payload, (string) $request->getBody());
-    }
-
-    public function testSetCurlOptionOnRequestPostFieldsEmptyString()
-    {
-        $request = new Request('POST', 'example.com');
-        $payload = '';
-
-        CurlHelper::setCurlOptionOnRequest($request, CURLOPT_POSTFIELDS, $payload);
-
-        // This is consistent with how requests are read out of storage using
-        // \VCR\Request::fromArray(array $request).
-        $this->assertNull($request->getBody());
-    }
-
-    public function testSetCurlOptionOnRequestSetSingleHeader()
-    {
-        $request = new Request('GET', 'example.com');
-        $headers = array('Host: example.com');
-
-        CurlHelper::setCurlOptionOnRequest($request, CURLOPT_HTTPHEADER, $headers);
-
-        $this->assertEquals(array('Host' => 'example.com'), $request->getHeaders());
-    }
-
-    public function testSetCurlOptionOnRequestSetSingleHeaderTwice()
-    {
-        $request = new Request('GET', 'example.com');
-        $headers = array('Host: example.com');
-
-        CurlHelper::setCurlOptionOnRequest($request, CURLOPT_HTTPHEADER, $headers);
-        CurlHelper::setCurlOptionOnRequest($request, CURLOPT_HTTPHEADER, $headers);
-
-        $this->assertEquals(array('Host' => 'example.com'), $request->getHeaders());
-    }
-
-    public function testSetCurlOptionOnRequestSetMultipleHeadersTwice()
-    {
-        $request = new Request('GET', 'example.com');
-        $headers = array(
-            'Host: example.com',
-            'Content-Type: application/json',
-        );
-
-        CurlHelper::setCurlOptionOnRequest($request, CURLOPT_HTTPHEADER, $headers);
-        CurlHelper::setCurlOptionOnRequest($request, CURLOPT_HTTPHEADER, $headers);
-
-        $expected = array(
-            'Host' => 'example.com',
-            'Content-Type' => 'application/json'
-        );
-        $this->assertEquals($expected, $request->getHeaders());
-    }
-
-    public function testSetCurlOptionOnRequestEmptyPostFieldsRemovesContentType()
-    {
-        $request = new Request('GET', 'example.com');
-        $headers = array(
-            'Host: example.com',
-            'Content-Type: application/json',
-        );
-
-        CurlHelper::setCurlOptionOnRequest($request, CURLOPT_HTTPHEADER, $headers);
-        CurlHelper::setCurlOptionOnRequest($request, CURLOPT_POSTFIELDS, array());
-
-        $expected = array(
-            'Host' => 'example.com',
-        );
-        $this->assertEquals($expected, $request->getHeaders());
-    }
-
-    public function testSetCurlOptionOnRequestPostFieldsSetsPostMethod()
-    {
-        $request = new Request('GET', 'example.com');
-        $payload = json_encode(array('some' => 'test'));
-
-        CurlHelper::setCurlOptionOnRequest($request, CURLOPT_POSTFIELDS, $payload);
-
-        $this->assertEquals('POST', $request->getMethod());
-    }
-
-    public function testSetCurlOptionReadFunctionToNull()
-    {
-        $request = new Request('POST', 'example.com');
-
-        CurlHelper::setCurlOptionOnRequest($request, CURLOPT_READFUNCTION, null, curl_init());
-
-        $this->assertNull($request->getCurlOption(CURLOPT_READFUNCTION));
-    }
-
-    public function testSetCurlOptionReadFunctionMissingSize()
-    {
-        $this->setExpectedException('\VCR\VCRException', 'To set a CURLOPT_READFUNCTION, CURLOPT_INFILESIZE must be set.');
-        $request = new Request('POST', 'example.com');
-
-        $callback = function ($curlHandle, $fileHandle, $size) {
-        };
-
-        CurlHelper::setCurlOptionOnRequest($request, CURLOPT_READFUNCTION, $callback, curl_init());
-        CurlHelper::validateCurlPOSTBody($request, curl_init());
-    }
-
-    public function testSetCurlOptionReadFunction()
-    {
-        $expected = 'test body';
-        $request = new Request('POST', 'example.com');
-
-        $test = $this;
-        $callback = function ($curlHandle, $fileHandle, $size) use ($test, $expected) {
-            $test->assertInternalType('resource', $curlHandle);
-            $test->assertInternalType('resource', $fileHandle);
-            $test->assertEquals(strlen($expected), $size);
-
-            return $expected;
-        };
-
-        CurlHelper::setCurlOptionOnRequest($request, CURLOPT_INFILESIZE, strlen($expected));
-        CurlHelper::setCurlOptionOnRequest($request, CURLOPT_READFUNCTION, $callback, curl_init());
-        CurlHelper::validateCurlPOSTBody($request, curl_init());
-
-        $this->assertEquals($expected, $request->getBody());
-    }
-
-    public function testHandleResponseReturnsBody()
-    {
-        $curlOptions = array(
-            CURLOPT_RETURNTRANSFER => true
-        );
-        $response = new Response(200, array(), 'example response');
-
-        $output = CurlHelper::handleOutput($response, $curlOptions, curl_init());
-
-        $this->assertEquals($response->getBody(true), $output);
-    }
-
-    public function testHandleResponseEchosBody()
-    {
-        $response = new Response(200, array(), 'example response');
-
-        ob_start();
-        CurlHelper::handleOutput($response, array(), curl_init());
-        $output = ob_get_clean();
-
-        $this->assertEquals($response->getBody(true), $output);
-    }
-
-    public function testHandleResponseIncludesHeader()
-    {
-        $curlOptions = array(
-            CURLOPT_HEADER => true,
-            CURLOPT_RETURNTRANSFER => true,
-        );
-        $status = array(
-            'code' => 200,
-            'message' => 'OK',
-            'http_version' => '1.1'
-        );
-        $response = new Response($status, array(), 'example response');
-
-        $output = CurlHelper::handleOutput($response, $curlOptions, curl_init());
-
-        $this->assertEquals("HTTP/1.1 200 OK\r\n\r\n" . $response->getBody(), $output);
-    }
-
-    public function testHandleOutputHeaderFunction()
-    {
-        $actualHeaders = array();
-        $curlOptions = array(
-            CURLOPT_HEADERFUNCTION => function ($ch, $header) use (&$actualHeaders) {
-                $actualHeaders[] = $header;
-            },
-        );
-        $status = array(
-            'code' => 200,
-            'message' => 'OK',
-            'http_version' => '1.1',
-        );
-        $headers = array(
-            'Content-Length' => 0,
-        );
-        $response = new Response($status, $headers, 'example response');
-        CurlHelper::handleOutput($response, $curlOptions, curl_init());
-
-        $expected = array(
-            'HTTP/1.1 200 OK',
-            'Content-Length: 0',
-            ''
-        );
-        $this->assertEquals($expected, $actualHeaders);
-    }
-
-    public function testHandleResponseUsesWriteFunction()
-    {
-        $test = $this;
-        $expectedCh = curl_init();
-        $expectedBody = 'example response';
-        $curlOptions = array(
-            CURLOPT_WRITEFUNCTION => function ($ch, $body) use ($test, $expectedCh, $expectedBody) {
-                $test->assertEquals($expectedCh, $ch);
-                $test->assertEquals($expectedBody, $body);
-
-                return strlen($body);
-            }
-        );
-        $response = new Response(200, array(), $expectedBody);
-
-        CurlHelper::handleOutput($response, $curlOptions, $expectedCh);
-    }
-
-    public function testHandleResponseWritesFile()
-    {
-        vfsStream::setup('test');
-        $expectedBody = 'example response';
-        $testFile = vfsStream::url('test/write_file');
-
-        $curlOptions = array(
-            CURLOPT_FILE => fopen($testFile, 'w+')
-        );
-
-        $response = new Response(200, array(), $expectedBody);
-
-        CurlHelper::handleOutput($response, $curlOptions, curl_init());
-
-        $this->assertEquals($expectedBody, file_get_contents($testFile));
-    }
-
-    /**
-     * @dataProvider getCurlOptionProvider()
-     *
-     * @param Response $response
-     * @param integer $curlOption cURL option to get.
-     * @param mixed $expectedCurlOptionValue Expected value of cURL option
-     */
-    public function testGetCurlOptionFromResponse(Response $response, $curlOption, $expectedCurlOptionValue)
-    {
-        $this->assertEquals(
-            $expectedCurlOptionValue,
-            CurlHelper::getCurlOptionFromResponse($response, $curlOption)
-        );
-    }
-
-    public function getCurlOptionProvider()
-    {
-        return array(
-            array(
-                Response::fromArray(
-                    array(
-                        'status'    => array(
-                            'http_version' => '1.1',
-                            'code' => 200,
-                            'message' => 'OK',
-                        ),
-                        'headers'   => array(
-                            'Host' => 'localhost:8000',
-                            'Connection' => 'close',
-                            'Content-type' => 'text/html; charset=UTF-8',
-
-                        ),
-                    )
-                ),
-                CURLINFO_HEADER_SIZE,
-                100,
-            ),
-            array(
-                Response::fromArray(
-                    array(
-                        'status'    => array(
-                            'http_version' => '1.1',
-                            'code' => 404,
-                            'message' => 'Not Found',
-                        ),
-                        'headers'   => array(
-                            'Host' => 'localhost:8000',
-                            'Connection' => 'close',
-                            'Content-type' => 'text/html; charset=UTF-8',
-
-                        ),
-                    )
-                ),
-                CURLINFO_HEADER_SIZE,
-                107,
-            ),
-            array(
-                Response::fromArray(
-                    array(
-                        'status'    => array(
-                            'http_version' => '1.1',
-                            'code' => 200,
-                            'message' => 'OK',
-                        ),
-                        'headers'   => array(
-                            'Host' => 'localhost:8000',
-                            'Connection' => 'close',
-                            'Content-type' => 'text/html; charset=UTF-8',
-                            'X-Powered-By' => 'PHP/5.6.4-4ubuntu6',
-                        ),
-                    )
-                ),
-                CURLINFO_HEADER_SIZE,
-                134,
-            ),
-            array(
-                Response::fromArray(
-                    array(
-                        'status'    => array(
-                            'http_version' => '1.1',
-                            'code' => 200,
-                            'message' => 'OK',
-                        ),
-                        'headers'   => array(
-                            'Host' => 'localhost:8000',
-                            'Connection' => 'close',
-                            'Content-type' => 'text/html; charset=UTF-8',
-                            'Cache-Control' => 'no-cache, must-revalidate',
-                            'Pragma' => 'no-cache',
-                        ),
-                    )
-                ),
-                CURLINFO_HEADER_SIZE,
-                160,
-            ),
-            array(
-                Response::fromArray(
-                    array(
-                        'status'    => array(
-                            'http_version' => '1.1',
-                            'code' => 200,
-                            'message' => 'OK',
-                        ),
-                        'headers'   => array(
-                            'Host' => 'localhost:8000',
-                            'Connection' => 'close',
-                            'X-Powered-By' => 'PHP/5.6.4-4ubuntu6',
-                            'Expires' => 'Sat, 26 Jul 1997 05:00:00 GMT',
-                            'Last-Modified' => 'Sat, 13 Jun 2015 20:36:15 GMT',
-                            'Cache-Control' => 'no-store, no-cache, must-revalidate',
-                            'Pragma' => 'no-cache',
-                            'Content-type' => 'text/html; charset=UTF-8',
-                        ),
-                    )
-                ),
-                CURLINFO_HEADER_SIZE,
-                290,
-            ),
-        );
-    }
-
-    public function testSetCurlOptionCustomRequest()
-    {
-        $request = new Request('POST', 'http://example.com');
-
-        CurlHelper::setCurlOptionOnRequest($request, CURLOPT_CUSTOMREQUEST, 'PUT');
-
-        $this->assertEquals('PUT', $request->getCurlOption(CURLOPT_CUSTOMREQUEST));
-    }
-
-    public function testCurlCustomRequestAlwaysOverridesMethod()
-    {
-        $request = new Request('POST', 'http://example.com');
-
-        CurlHelper::setCurlOptionOnRequest($request, CURLOPT_CUSTOMREQUEST, 'DELETE');
-
-        $this->assertEquals('DELETE', $request->getMethod());
-
-        CurlHelper::setCurlOptionOnRequest($request, CURLOPT_POSTFIELDS, array('some' => 'test'));
-
-        $this->assertEquals('DELETE', $request->getMethod());
-    }
-}
diff --git a/tests/VCR/Util/HttpClientTest.php b/tests/VCR/Util/HttpClientTest.php
deleted file mode 100644
index e78c7167b..000000000
--- a/tests/VCR/Util/HttpClientTest.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace VCR\Util;
-
-use VCR\Response;
-use VCR\Request;
-
-class HttpClientTest extends \PHPUnit_Framework_TestCase
-{
-    public function testCreateHttpClient()
-    {
-        $this->assertInstanceOf('\VCR\Util\HttpClient', new HttpClient());
-    }
-
-    public function testCreateHttpClientWithMock()
-    {
-        $this->assertInstanceOf('\VCR\Util\HttpClient', new HttpClient());
-    }
-}
diff --git a/tests/VCR/Util/StreamHelperTest.php b/tests/VCR/Util/StreamHelperTest.php
deleted file mode 100644
index 8686a74c4..000000000
--- a/tests/VCR/Util/StreamHelperTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-namespace VCR\Util;
-
-use VCR\Request;
-
-class StreamHelperTest extends \PHPUnit_Framework_TestCase
-{
-    public function streamContexts()
-    {
-        $test = $this;
-
-        return array(
-            'header' => array(
-                array('header' => 'Content-Type: application/json'),
-                function (Request $request) use ($test) {
-                    $test->assertEquals('application/json', $request->getHeader('Content-Type'));
-                }
-            ),
-
-            'header with trailing newline' => array(
-                array('header' => "Content-Type: application/json\r\n"),
-                function (Request $request) use ($test) {
-                    $test->assertEquals('application/json', $request->getHeader('Content-Type'));
-                }
-            ),
-
-            'multiple headers' => array(
-                array('header' => "Content-Type: application/json\r\nContent-Length: 123"),
-                function (Request $request) use ($test) {
-                    $test->assertEquals('application/json', $request->getHeader('Content-Type'));
-                    $test->assertEquals('123', $request->getHeader('Content-Length'));
-                }
-            ),
-
-            'user_agent' => array(
-                array('user_agent' => 'example'),
-                function (Request $request) use ($test) {
-                    $test->assertEquals('example', $request->getHeader('User-Agent'));
-                }
-            ),
-
-            'content' => array(
-                array('content' => 'example'),
-                function (Request $request) use ($test) {
-                    $test->assertEquals('example', $request->getBody());
-                }
-            ),
-
-            'follow_location' => array(
-                array('follow_location' => '0'),
-                function (Request $request) use ($test) {
-                    $test->assertEquals(false, $request->getCurlOption(CURLOPT_FOLLOWLOCATION));
-                }
-            ),
-
-            'max_redirects' => array(
-                array('max_redirects' => '2'),
-                function (Request $request) use ($test) {
-                    $test->assertEquals('2', $request->getCurlOption(CURLOPT_MAXREDIRS));
-                }
-            ),
-
-            'timeout' => array(
-                array('timeout' => '100'),
-                function (Request $request) use ($test) {
-                    $test->assertEquals('100', $request->getCurlOption(CURLOPT_TIMEOUT));
-                }
-            )
-        );
-    }
-
-    /**
-     * @dataProvider streamContexts
-     * @param $context
-     * @param $testCallback
-     */
-    public function testStreamHttpContext($context, $testCallback)
-    {
-        $context = stream_context_create(array(
-            'http' => $context
-        ));
-
-        $request = StreamHelper::createRequestFromStreamContext($context, 'http://example.com');
-        $testCallback($request);
-    }
-}
diff --git a/tests/VCR/Util/StreamProcessorTest.php b/tests/VCR/Util/StreamProcessorTest.php
deleted file mode 100644
index d76e9ce17..000000000
--- a/tests/VCR/Util/StreamProcessorTest.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-
-namespace VCR\Util;
-
-class StreamProcessorTest extends \PHPUnit_Framework_TestCase
-{
-
-    /**
-     * test flock with file_put_contents
-     */
-    public function testFlockWithFilePutContents()
-    {
-        $processor = new StreamProcessor();
-        $processor->intercept();
-
-        $testData = 'test data';
-        $testFilePath = 'tests/fixtures/file_put_contents';
-        $res = file_put_contents($testFilePath, $testData, LOCK_EX);
-        unlink($testFilePath);
-
-        $processor->restore();
-        $this->assertEquals(strlen($testData), $res);
-    }
-
-    /**
-     * @dataProvider streamOpenAppendFilterProvider
-     * @param  boolean $expected
-     * @param  boolean $shouldProcess
-     * @param  integer $option
-     */
-    public function testStreamOpenShouldAppendFilters($expected, $option, $shouldProcess = null)
-    {
-        $mock = $this->getMockBuilder('VCR\Util\StreamProcessor')
-            ->disableOriginalConstructor()
-            ->setMethods(array('intercept', 'restore', 'appendFiltersToStream', 'shouldProcess'))
-            ->getMock();
-
-        if (!is_null($shouldProcess)) {
-            $mock->expects($this->once())->method('shouldProcess')->will($this->returnValue($shouldProcess));
-        }
-
-        if ($expected) {
-            $mock->expects($this->once())->method('appendFiltersToStream');
-        } else {
-            $mock->expects($this->never())->method('appendFiltersToStream');
-        }
-
-        $mock->stream_open('tests/fixtures/streamprocessor_data', 'r', $option, $fullPath);
-        $mock->stream_close();
-    }
-
-    public function streamOpenAppendFilterProvider()
-    {
-        return array(
-            array(true, StreamProcessor::STREAM_OPEN_FOR_INCLUDE, true),
-            array(false, StreamProcessor::STREAM_OPEN_FOR_INCLUDE, false),
-            array(false, 0),
-        );
-    }
-
-    public function streamOpenFileModesWhichDoNotCreateFiles()
-    {
-        return array(
-            array('r'),
-            array('rb'),
-            array('rt'),
-            array('r+')
-        );
-    }
-    /**
-     * @dataProvider streamOpenFileModesWhichDoNotCreateFiles
-     */
-    public function testStreamOpenShouldNotFailOnNonExistingFile($fileMode)
-    {
-        $test = $this;
-        set_error_handler(function ($errno, $errstr, $errfile, $errline) use ($test) {
-            $test->fail('should not throw errors');
-        });
-
-        $processor = new StreamProcessor();
-
-        $result = $processor->stream_open('tests/fixtures/unknown', $fileMode, StreamProcessor::STREAM_OPEN_FOR_INCLUDE, $fullPath);
-        $this->assertFalse($result);
-
-        restore_error_handler();
-    }
-
-    public function testUrlStatSuccessfully()
-    {
-        $test = $this;
-        set_error_handler(function ($errno, $errstr, $errfile, $errline) use ($test) {
-            $test->fail('should not throw errors');
-        });
-
-        $processor = new StreamProcessor();
-        $processor->url_stat('tests/fixtures/streamprocessor_data', 0);
-
-        restore_error_handler();
-    }
-
-    /**
-     * @expectedException PHPUnit_Framework_Error_Warning
-     */
-    public function testUrlStatFileNotFound()
-    {
-        $processor = new StreamProcessor();
-        $processor->url_stat('file_not_found', 0);
-    }
-
-    public function testQuietUrlStatFileNotFoundToBeQuiet()
-    {
-        $processor = new StreamProcessor();
-        $processor->url_stat('file_not_found', STREAM_URL_STAT_QUIET);
-    }
-
-    public function testDirOpendir()
-    {
-        $processor = new StreamProcessor();
-        $this->assertTrue($processor->dir_opendir('tests/fixtures'));
-        $processor->dir_closedir();
-    }
-
-    public function testDirOpendirNotFound()
-    {
-        $test = $this;
-        set_error_handler(function ($errno, $errstr, $errfile, $errline) use ($test) {
-            $test->assertContains('opendir(not_found', $errstr);
-        });
-
-        $processor = new StreamProcessor();
-        $this->assertFalse($processor->dir_opendir('not_found'));
-
-        restore_error_handler();
-    }
-
-    public function testMakeDir()
-    {
-        $mock = $this->getStreamProcessorMock();
-        $mock->expects($this->exactly(2))->method('restore');
-        $mock->expects($this->exactly(2))->method('intercept');
-
-        $this->assertTrue($mock->mkdir('tests/fixtures/unittest_streamprocessor', 0777, false));
-        $this->assertTrue($mock->rmdir('tests/fixtures/unittest_streamprocessor'));
-    }
-
-    public function testRename()
-    {
-        $mock = $this->getStreamProcessorMock();
-        $mock->expects($this->exactly(3))->method('restore');
-        $mock->expects($this->exactly(3))->method('intercept');
-
-        $this->assertTrue($mock->mkdir('tests/fixtures/unittest_streamprocessor', 0777, false));
-        $this->assertTrue($mock->rename('tests/fixtures/unittest_streamprocessor', 'tests/fixtures/sp'));
-        $this->assertTrue($mock->rmdir('tests/fixtures/sp'));
-    }
-
-    public function testStreamMetadata()
-    {
-        if (version_compare(PHP_VERSION, '5.4.0', '<')) {
-            $this->markTestSkipped('Behavior is only applicable and testable for PHP 5.4+');
-        }
-
-        if (!function_exists('posix_getuid')) {
-            $this->markTestSkipped('Requires "posix_getuid" function.');
-        }
-
-        $mock = $this->getStreamProcessorMock();
-        $mock->expects($this->exactly(8))->method('restore');
-        $mock->expects($this->exactly(8))->method('intercept');
-
-        $path = 'tests/fixtures/unnitest_streamprocessor_metadata';
-        $this->assertTrue($mock->stream_metadata($path, STREAM_META_TOUCH, null));
-        $this->assertTrue($mock->stream_metadata($path, STREAM_META_TOUCH, array(time(), time())));
-
-        $this->assertTrue($mock->stream_metadata($path, STREAM_META_OWNER_NAME, posix_getuid()));
-        $this->assertTrue($mock->stream_metadata($path, STREAM_META_OWNER, posix_getuid()));
-
-        $this->assertTrue($mock->stream_metadata($path, STREAM_META_GROUP_NAME, posix_getgid()));
-        $this->assertTrue($mock->stream_metadata($path, STREAM_META_GROUP, posix_getgid()));
-
-        $this->assertTrue($mock->stream_metadata($path, STREAM_META_ACCESS, 0777));
-
-        $this->assertTrue($mock->unlink($path));
-    }
-
-    protected function getStreamProcessorMock()
-    {
-        return $this->getMockBuilder('VCR\Util\StreamProcessor')
-            ->disableOriginalConstructor()
-            ->setMethods(array('intercept', 'restore'))
-            ->getMock();
-    }
-}
diff --git a/tests/VCR/Util/TextUtilTest.php b/tests/VCR/Util/TextUtilTest.php
deleted file mode 100644
index 694b20bc3..000000000
--- a/tests/VCR/Util/TextUtilTest.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace VCR\Util;
-
-/**
- * Tests TextUtil methods.
- */
-class TextUtilTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @dataProvider curlMethodsProvider
-     */
-    public function testUnderscoreToLowerCamelcase($expected, $method)
-    {
-        $this->assertEquals($expected, TextUtil::underscoreToLowerCamelcase($method));
-    }
-
-    public function curlMethodsProvider()
-    {
-        return array(
-            'curl_multi_add_handler' => array('curlMultiAddHandler', 'curl_multi_add_handler'),
-            'curl_add_handler' => array('curlAddHandler', 'curl_add_handler'),
-            'not a curl function' => array('curlExec', 'curl_exec'),
-        );
-    }
-}
diff --git a/tests/VCR/VCRFactoryTest.php b/tests/VCR/VCRFactoryTest.php
deleted file mode 100644
index 967bb6b20..000000000
--- a/tests/VCR/VCRFactoryTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace VCR;
-
-use org\bovigo\vfs\vfsStream;
-
-/**
- * Test instance creation.
- */
-class VCRFactoryTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @dataProvider instanceProvider
-     * @covers VCR\VCRFactory::createVCRVideorecorder()
-     */
-    public function testCreateInstances($instance)
-    {
-        $this->assertInstanceOf($instance, VCRFactory::get($instance));
-    }
-
-    public function instanceProvider()
-    {
-        return array(
-            array('VCR\Videorecorder'),
-            array('VCR\Configuration'),
-            array('VCR\Util\StreamProcessor'),
-            array('VCR\Util\HttpClient'),
-            array('VCR\CodeTransform\CurlCodeTransform'),
-            array('VCR\CodeTransform\SoapCodeTransform'),
-            array('VCR\LibraryHooks\CurlHook'),
-            array('VCR\LibraryHooks\SoapHook'),
-            array('VCR\LibraryHooks\StreamWrapperHook'),
-        );
-    }
-
-    /**
-     * @dataProvider storageProvider
-     */
-    public function testCreateStorage($storage, $className)
-    {
-        vfsStream::setup('test');
-
-        VCRFactory::get('VCR\Configuration')->setStorage($storage);
-        VCRFactory::get('VCR\Configuration')->setCassettePath(vfsStream::url('test/'));
-
-        $instance = VCRFactory::get('Storage', array(rand()));
-
-        $this->assertInstanceOf($className, $instance);
-    }
-
-    public function storageProvider()
-    {
-        return array(
-            array('json', 'VCR\Storage\Json'),
-            array('yaml', 'VCR\Storage\Yaml'),
-        );
-    }
-}
diff --git a/tests/VCR/VideorecorderTest.php b/tests/VCR/VideorecorderTest.php
deleted file mode 100644
index 6ab030443..000000000
--- a/tests/VCR/VideorecorderTest.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-namespace VCR;
-
-use lapistano\ProxyObject\ProxyBuilder;
-use org\bovigo\vfs\vfsStream;
-
-/**
- * Test Videorecorder.
- */
-class VideorecorderTest extends \PHPUnit_Framework_TestCase
-{
-    public function testCreateVideorecorder()
-    {
-        $this->assertInstanceOf(
-            '\VCR\Videorecorder',
-            new Videorecorder(new Configuration(), new Util\HttpClient(), VCRFactory::getInstance())
-        );
-    }
-
-    public function testInsertCassetteEjectExisting()
-    {
-        vfsStream::setup('testDir');
-        $factory = VCRFactory::getInstance();
-        $configuration = $factory->get('VCR\Configuration');
-        $configuration->setCassettePath(vfsStream::url('testDir'));
-        $configuration->enableLibraryHooks(array());
-        $videorecorder = $this->getMockBuilder('\VCR\Videorecorder')
-            ->setConstructorArgs(array($configuration, new Util\HttpClient(), VCRFactory::getInstance()))
-            ->setMethods(array('eject'))
-            ->getMock();
-
-        $videorecorder->expects($this->exactly(2))->method('eject');
-
-        $videorecorder->turnOn();
-        $videorecorder->insertCassette('cassette1');
-        $videorecorder->insertCassette('cassette2');
-        $videorecorder->turnOff();
-    }
-
-    public function testHandleRequestRecordsRequestWhenModeIsNewRecords()
-    {
-        $request = new Request('GET', 'http://example.com', array('User-Agent' => 'Unit-Test'));
-        $response = new Response(200, array(), 'example response');
-        $client = $this->getClientMock($request, $response);
-        $configuration = new Configuration();
-        $configuration->enableLibraryHooks(array());
-        $configuration->setMode('new_episodes');
-
-        $proxy = new ProxyBuilder('\VCR\Videorecorder');
-        $videorecorder = $proxy
-            ->setConstructorArgs(array($configuration, $client, VCRFactory::getInstance()))
-            ->setProperties(array('cassette', 'client'))
-            ->getProxy();
-        $videorecorder->client = $client;
-        $videorecorder->cassette = $this->getCassetteMock($request, $response);
-
-        $this->assertEquals($response, $videorecorder->handleRequest($request));
-    }
-
-    public function testHandleRequestThrowsExceptionWhenModeIsNone()
-    {
-        $this->setExpectedException(
-            'LogicException',
-            "The request does not match a previously recorded request and the 'mode' is set to 'none'. "
-            . "If you want to send the request anyway, make sure your 'mode' is set to 'new_episodes'."
-        );
-
-        $request = new Request('GET', 'http://example.com', array('User-Agent' => 'Unit-Test'));
-        $response = new Response(200, array(), 'example response');
-        $client = $this->getMockBuilder('\VCR\Util\HttpClient')->getMock();
-        $configuration = new Configuration();
-        $configuration->enableLibraryHooks(array());
-        $configuration->setMode('none');
-
-        $proxy = new ProxyBuilder('\VCR\Videorecorder');
-        $videorecorder = $proxy
-            ->setConstructorArgs(array($configuration, $client, VCRFactory::getInstance()))
-            ->setProperties(array('cassette', 'client'))
-            ->getProxy();
-        $videorecorder->client = $client;
-
-        $videorecorder->cassette = $this->getCassetteMock($request, $response, 'none');
-
-        $videorecorder->handleRequest($request);
-    }
-
-    public function testHandleRequestRecordsRequestWhenModeIsOnceAndCassetteIsNew()
-    {
-        $request = new Request('GET', 'http://example.com', array('User-Agent' => 'Unit-Test'));
-        $response = new Response(200, array(), 'example response');
-        $client = $this->getClientMock($request, $response);
-        $configuration = new Configuration();
-        $configuration->enableLibraryHooks(array());
-        $configuration->setMode('once');
-
-        $proxy = new ProxyBuilder('\VCR\Videorecorder');
-        $videorecorder = $proxy
-            ->setConstructorArgs(array($configuration, $client, VCRFactory::getInstance()))
-            ->setProperties(array('cassette', 'client'))
-            ->getProxy();
-        $videorecorder->client = $client;
-
-        $videorecorder->cassette = $this->getCassetteMock($request, $response, 'once', true);
-
-        $this->assertEquals($response, $videorecorder->handleRequest($request));
-    }
-
-    public function testHandleRequestThrowsExceptionWhenModeIsOnceAndCassetteIsOld()
-    {
-        $this->setExpectedException(
-            'LogicException',
-            "The request does not match a previously recorded request and the 'mode' is set to 'once'. "
-            . "If you want to send the request anyway, make sure your 'mode' is set to 'new_episodes'."
-        );
-
-        $request = new Request('GET', 'http://example.com', array('User-Agent' => 'Unit-Test'));
-        $response = new Response(200, array(), 'example response');
-        $client = $this->getMockBuilder('\VCR\Util\HttpClient')->getMock();
-        $configuration = new Configuration();
-        $configuration->enableLibraryHooks(array());
-        $configuration->setMode('once');
-
-        $proxy = new ProxyBuilder('\VCR\Videorecorder');
-        $videorecorder = $proxy
-            ->setConstructorArgs(array($configuration, $client, VCRFactory::getInstance()))
-            ->setProperties(array('cassette', 'client'))
-            ->getProxy();
-        $videorecorder->client = $client;
-
-        $videorecorder->cassette = $this->getCassetteMock($request, $response, 'once', false);
-
-        $videorecorder->handleRequest($request);
-    }
-
-    protected function getClientMock($request, $response)
-    {
-        $client = $this->getMockBuilder('\VCR\Util\HttpClient')->setMethods(array('send'))->getMock();
-        $client
-            ->expects($this->once())
-            ->method('send')
-            ->with($request)
-            ->will($this->returnValue($response));
-
-        return $client;
-    }
-
-    protected function getCassetteMock($request, $response, $mode = VCR::MODE_NEW_EPISODES, $isNew = false)
-    {
-        $cassette = $this->getMockBuilder('\VCR\Cassette')
-            ->disableOriginalConstructor()
-            ->setMethods(array('record', 'playback', 'isNew'))
-            ->getMock();
-        $cassette
-            ->expects($this->once())
-            ->method('playback')
-            ->with($request)
-            ->will($this->returnValue(null));
-
-        if (VCR::MODE_NEW_EPISODES === $mode || VCR::MODE_ONCE === $mode && $isNew === true) {
-            $cassette
-                ->expects($this->once())
-                ->method('record')
-                ->with($request, $response);
-        }
-
-        if ($mode == 'once') {
-            $cassette
-                ->expects($this->once())
-                ->method('isNew')
-                ->will($this->returnValue($isNew));
-        }
-
-        return $cassette;
-    }
-}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index c2600cb62..89d939b42 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,15 +1,8 @@
 <?php
 
-if (!file_exists(__DIR__ . '/../vendor/autoload.php')) {
-    die(
-        "\n[ERROR] You need to run composer before running the test suite.\n" .
-        "To do so run the following commands:\n" .
-        "    curl -s http://getcomposer.org/installer | php\n" .
-        "    php composer.phar install\n\n"
-    );
-}
+declare(strict_types=1);
 
-require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
-\VCR\VCR::turnOn();
-\VCR\VCR::turnOff();
+VCR\VCR::turnOn();
+VCR\VCR::turnOff();
diff --git a/tests/fixtures/unittest_curl_test b/tests/fixtures/unittest_curl_test
index 9203eff64..3fc26b047 100644
--- a/tests/fixtures/unittest_curl_test
+++ b/tests/fixtures/unittest_curl_test
@@ -11,11 +11,153 @@
         headers:
             Location: 'http://www.google.com/'
             Content-Type: 'text/html; charset=UTF-8'
-            Date: 'Mon, 13 May 2013 08:15:58 GMT'
-            Expires: 'Wed, 12 Jun 2013 08:15:58 GMT'
+            Date: 'Wed, 18 Oct 2017 18:59:08 GMT'
+            Expires: 'Wed, 17 Nov 2017 18:59:08 GMT'
             Cache-Control: 'public, max-age=2592000'
             Server: gws
             Content-Length: '219'
             X-XSS-Protection: '1; mode=block'
             X-Frame-Options: SAMEORIGIN
         body: "This is a curl test dummy."
+        curl_info:
+            url: 'http://google.com/'
+            content_type: 'text/html; charset=UTF-8'
+            http_code: 301
+            header_size: 249
+            request_size: 49
+            filetime: -1
+            ssl_verify_result: 0
+            redirect_count: 0
+            total_time: 0.194497
+            namelookup_time: 0.132455
+            connect_time: 0.164555
+            pretransfer_time: 0.164586
+            size_upload: !!float 0
+            size_download: !!float 268
+            speed_download: !!float 1377
+            speed_upload: !!float 0
+            download_content_length: !!float 268
+            upload_content_length: !!float -1
+            starttransfer_time: 0.194476
+            certinfo: {  }
+            primary_port: 80
+-
+    request:
+        method: GET
+        url: 'http://google.com/'
+        headers:
+            Host: google.com
+    response:
+        status:
+            http_version: '1.1'
+            code: '301'
+            message: 'Moved Permanently'
+        headers:
+            Location: 'http://www.google.com/'
+            Content-Type: 'text/html; charset=UTF-8'
+            Date: 'Mon, 04 Oct 2021 14:21:19 GMT'
+            Expires: 'Wed, 03 Nov 2021 14:21:19 GMT'
+            Cache-Control: 'public, max-age=2592000'
+            Server: gws
+            Content-Length: '219'
+            X-XSS-Protection: '0'
+            X-Frame-Options: SAMEORIGIN
+        body: "<HTML><HEAD><meta http-equiv=\"content-type\" content=\"text/html;charset=utf-8\">\n<TITLE>301 Moved</TITLE></HEAD><BODY>\n<H1>301 Moved</H1>\nThe document has moved\n<A HREF=\"http://www.google.com/\">here</A>.\r\n</BODY></HTML>\r\n"
+        curl_info:
+            url: 'http://google.com/'
+            content_type: 'text/html; charset=UTF-8'
+            http_code: 301
+            header_size: 309
+            request_size: 49
+            filetime: -1
+            ssl_verify_result: 0
+            redirect_count: 0
+            total_time: 0.06217
+            namelookup_time: 0.017595
+            connect_time: 0.034427
+            pretransfer_time: 0.034588
+            size_upload: !!float 0
+            size_download: !!float 219
+            speed_download: !!float 3532
+            speed_upload: !!float 0
+            download_content_length: !!float 219
+            upload_content_length: !!float 0
+            starttransfer_time: 0.062072
+            redirect_time: !!float 0
+            redirect_url: 'http://www.google.com/'
+            primary_ip: 142.251.36.14
+            certinfo: {  }
+            primary_port: 80
+            local_ip: 172.20.0.2
+            local_port: 33950
+            http_version: 2
+            protocol: 1
+            ssl_verifyresult: 0
+            scheme: HTTP
+            appconnect_time_us: 0
+            connect_time_us: 34427
+            namelookup_time_us: 17595
+            pretransfer_time_us: 34588
+            redirect_time_us: 0
+            starttransfer_time_us: 62072
+            total_time_us: 62170
+-
+    request:
+        method: GET
+        url: 'http://google.com/'
+        headers:
+            Host: google.com
+    response:
+        status:
+            http_version: '1.1'
+            code: '301'
+            message: 'Moved Permanently'
+        headers:
+            Location: 'http://www.google.com/'
+            Content-Type: 'text/html; charset=UTF-8'
+            Date: 'Mon, 04 Oct 2021 14:21:19 GMT'
+            Expires: 'Wed, 03 Nov 2021 14:21:19 GMT'
+            Cache-Control: 'public, max-age=2592000'
+            Server: gws
+            Content-Length: '219'
+            X-XSS-Protection: '0'
+            X-Frame-Options: SAMEORIGIN
+        body: "<HTML><HEAD><meta http-equiv=\"content-type\" content=\"text/html;charset=utf-8\">\n<TITLE>301 Moved</TITLE></HEAD><BODY>\n<H1>301 Moved</H1>\nThe document has moved\n<A HREF=\"http://www.google.com/\">here</A>.\r\n</BODY></HTML>\r\n"
+        curl_info:
+            url: 'http://google.com/'
+            content_type: 'text/html; charset=UTF-8'
+            http_code: 301
+            header_size: 309
+            request_size: 49
+            filetime: -1
+            ssl_verify_result: 0
+            redirect_count: 0
+            total_time: 0.04403
+            namelookup_time: 0.001969
+            connect_time: 0.016764
+            pretransfer_time: 0.016885
+            size_upload: !!float 0
+            size_download: !!float 219
+            speed_download: !!float 4977
+            speed_upload: !!float 0
+            download_content_length: !!float 219
+            upload_content_length: !!float 0
+            starttransfer_time: 0.043945
+            redirect_time: !!float 0
+            redirect_url: 'http://www.google.com/'
+            primary_ip: 142.251.36.14
+            certinfo: {  }
+            primary_port: 80
+            local_ip: 172.20.0.2
+            local_port: 33952
+            http_version: 2
+            protocol: 1
+            ssl_verifyresult: 0
+            scheme: HTTP
+            appconnect_time_us: 0
+            connect_time_us: 16764
+            namelookup_time_us: 1969
+            pretransfer_time_us: 16885
+            redirect_time_us: 0
+            starttransfer_time_us: 43945
+            total_time_us: 44030
diff --git a/tests/fixtures/unittest_streamwrapper_test b/tests/fixtures/unittest_streamwrapper_test
index 5ec78271e..689b336ca 100644
--- a/tests/fixtures/unittest_streamwrapper_test
+++ b/tests/fixtures/unittest_streamwrapper_test
@@ -21,3 +21,65 @@
             x-ec-custom-error: '1'
             Content-Length: '1270'
         body: "This is a stream wrapper test dummy."
+-
+    request:
+        method: GET
+        url: 'http://example.com'
+        headers:
+            Host: example.com
+    response:
+        status:
+            http_version: '1.1'
+            code: '200'
+            message: OK
+        headers:
+            Age: '598777'
+            Cache-Control: max-age=604800
+            Content-Type: 'text/html; charset=UTF-8'
+            Date: 'Mon, 04 Oct 2021 14:21:18 GMT'
+            Etag: '"3147526947+ident"'
+            Expires: 'Mon, 11 Oct 2021 14:21:18 GMT'
+            Last-Modified: 'Thu, 17 Oct 2019 07:18:26 GMT'
+            Server: 'ECS (dcb/7ECA)'
+            Vary: Accept-Encoding
+            X-Cache: HIT
+            Content-Length: '1256'
+        body: "<!doctype html>\n<html>\n<head>\n    <title>Example Domain</title>\n\n    <meta charset=\"utf-8\" />\n    <meta http-equiv=\"Content-type\" content=\"text/html; charset=utf-8\" />\n    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />\n    <style type=\"text/css\">\n    body {\n        background-color: #f0f0f2;\n        margin: 0;\n        padding: 0;\n        font-family: -apple-system, system-ui, BlinkMacSystemFont, \"Segoe UI\", \"Open Sans\", \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n        \n    }\n    div {\n        width: 600px;\n        margin: 5em auto;\n        padding: 2em;\n        background-color: #fdfdff;\n        border-radius: 0.5em;\n        box-shadow: 2px 3px 7px 2px rgba(0,0,0,0.02);\n    }\n    a:link, a:visited {\n        color: #38488f;\n        text-decoration: none;\n    }\n    @media (max-width: 700px) {\n        div {\n            margin: 0 auto;\n            width: auto;\n        }\n    }\n    </style>    \n</head>\n\n<body>\n<div>\n    <h1>Example Domain</h1>\n    <p>This domain is for use in illustrative examples in documents. You may use this\n    domain in literature without prior coordination or asking for permission.</p>\n    <p><a href=\"https://www.iana.org/domains/example\">More information...</a></p>\n</div>\n</body>\n</html>\n"
+        curl_info:
+            url: 'http://example.com/'
+            content_type: 'text/html; charset=UTF-8'
+            http_code: 200
+            header_size: 335
+            request_size: 50
+            filetime: -1
+            ssl_verify_result: 0
+            redirect_count: 0
+            total_time: 0.200784
+            namelookup_time: 0.000519
+            connect_time: 0.098396
+            pretransfer_time: 0.098542
+            size_upload: !!float 0
+            size_download: !!float 1256
+            speed_download: !!float 6280
+            speed_upload: !!float 0
+            download_content_length: !!float 1256
+            upload_content_length: !!float 0
+            starttransfer_time: 0.20076
+            redirect_time: !!float 0
+            redirect_url: ''
+            primary_ip: 93.184.216.34
+            certinfo: {  }
+            primary_port: 80
+            local_ip: 172.20.0.2
+            local_port: 53712
+            http_version: 2
+            protocol: 1
+            ssl_verifyresult: 0
+            scheme: HTTP
+            appconnect_time_us: 0
+            connect_time_us: 98396
+            namelookup_time_us: 519
+            pretransfer_time_us: 98542
+            redirect_time_us: 0
+            starttransfer_time_us: 200760
+            total_time_us: 200784
diff --git a/tests/integration/guzzle/3/ExampleHttpClient.php b/tests/integration/guzzle/3/ExampleHttpClient.php
deleted file mode 100644
index 6cf864080..000000000
--- a/tests/integration/guzzle/3/ExampleHttpClient.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace VCR\Example;
-
-use Guzzle\Http\Client;
-use Guzzle\Http\Exception\ClientErrorResponseException;
-
-class ExampleHttpClient
-{
-    public function get($url)
-    {
-        $client = new Client();
-
-        try {
-            $request = $client->get($url);
-            $response = $request->send();
-
-            return json_decode($response->getBody(), true);
-        } catch (ClientErrorResponseException $e) {
-            if ($e->getResponse()->getStatusCode() !== 404) {
-                throw $e;
-            }
-        }
-
-        return null;
-    }
-    
-    public function post($url, $body)
-    {
-        $client = new Client();
-        
-        try {
-            $request = $client->post($url);
-            $request->setBody($body, 'application/json');
-            $response = $request->send();
-
-            return json_decode($response->getBody(), true);
-        } catch (ClientErrorResponseException $e) {
-            if ($e->getResponse()->getStatusCode() !== 404) {
-                throw $e;
-            }
-        }
-
-        return null;
-    }
-}
diff --git a/tests/integration/guzzle/3/composer.json b/tests/integration/guzzle/3/composer.json
deleted file mode 100644
index cdd97e7f7..000000000
--- a/tests/integration/guzzle/3/composer.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "require": {
-        "guzzlehttp/guzzle": "~3.0"
-    }
-}
diff --git a/tests/integration/guzzle/3/composer.lock b/tests/integration/guzzle/3/composer.lock
deleted file mode 100644
index e3ba8eda3..000000000
--- a/tests/integration/guzzle/3/composer.lock
+++ /dev/null
@@ -1,168 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
-        "This file is @generated automatically"
-    ],
-    "hash": "68366044f967cdb769d600d4f2977188",
-    "packages": [
-        {
-            "name": "guzzlehttp/guzzle",
-            "version": "v3.8.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "4de0618a01b34aa1c8c33a3f13f396dcd3882eba"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/4de0618a01b34aa1c8c33a3f13f396dcd3882eba",
-                "reference": "4de0618a01b34aa1c8c33a3f13f396dcd3882eba",
-                "shasum": ""
-            },
-            "require": {
-                "ext-curl": "*",
-                "php": ">=5.3.3",
-                "symfony/event-dispatcher": ">=2.1"
-            },
-            "replace": {
-                "guzzle/batch": "self.version",
-                "guzzle/cache": "self.version",
-                "guzzle/common": "self.version",
-                "guzzle/http": "self.version",
-                "guzzle/inflection": "self.version",
-                "guzzle/iterator": "self.version",
-                "guzzle/log": "self.version",
-                "guzzle/parser": "self.version",
-                "guzzle/plugin": "self.version",
-                "guzzle/plugin-async": "self.version",
-                "guzzle/plugin-backoff": "self.version",
-                "guzzle/plugin-cache": "self.version",
-                "guzzle/plugin-cookie": "self.version",
-                "guzzle/plugin-curlauth": "self.version",
-                "guzzle/plugin-error-response": "self.version",
-                "guzzle/plugin-history": "self.version",
-                "guzzle/plugin-log": "self.version",
-                "guzzle/plugin-md5": "self.version",
-                "guzzle/plugin-mock": "self.version",
-                "guzzle/plugin-oauth": "self.version",
-                "guzzle/service": "self.version",
-                "guzzle/stream": "self.version"
-            },
-            "require-dev": {
-                "doctrine/cache": "*",
-                "monolog/monolog": "1.*",
-                "phpunit/phpunit": "3.7.*",
-                "psr/log": "1.0.*",
-                "symfony/class-loader": "*",
-                "zendframework/zend-cache": "<2.3",
-                "zendframework/zend-log": "<2.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Guzzle": "src/",
-                    "Guzzle\\Tests": "tests/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                },
-                {
-                    "name": "Guzzle Community",
-                    "homepage": "https://github.com/guzzle/guzzle/contributors"
-                }
-            ],
-            "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
-            "homepage": "http://guzzlephp.org/",
-            "keywords": [
-                "client",
-                "curl",
-                "framework",
-                "http",
-                "http client",
-                "rest",
-                "web service"
-            ],
-            "time": "2014-01-28 22:29:15"
-        },
-        {
-            "name": "symfony/event-dispatcher",
-            "version": "v2.6.1",
-            "target-dir": "Symfony/Component/EventDispatcher",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/EventDispatcher.git",
-                "reference": "720fe9bca893df7ad1b4546649473b5afddf0216"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/720fe9bca893df7ad1b4546649473b5afddf0216",
-                "reference": "720fe9bca893df7ad1b4546649473b5afddf0216",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~2.0",
-                "symfony/dependency-injection": "~2.6",
-                "symfony/expression-language": "~2.6",
-                "symfony/stopwatch": "~2.2"
-            },
-            "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\EventDispatcher\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Symfony EventDispatcher Component",
-            "homepage": "http://symfony.com",
-            "time": "2014-12-02 20:19:20"
-        }
-    ],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": []
-}
diff --git a/tests/integration/guzzle/3/phpunit.xml b/tests/integration/guzzle/3/phpunit.xml
deleted file mode 100644
index 30e6c463b..000000000
--- a/tests/integration/guzzle/3/phpunit.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<phpunit bootstrap="../test/bootstrap.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
->
-
-    <testsuites>
-        <testsuite>
-            <directory>../test</directory>
-        </testsuite>
-    </testsuites>
-
-</phpunit>
diff --git a/tests/integration/guzzle/4/ExampleHttpClient.php b/tests/integration/guzzle/4/ExampleHttpClient.php
deleted file mode 100644
index 9a0730887..000000000
--- a/tests/integration/guzzle/4/ExampleHttpClient.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace VCR\Example;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\ClientException;
-
-class ExampleHttpClient
-{
-    public function get($url)
-    {
-        $client = new Client();
-
-        try {
-            $response = $client->get($url);
-            return $response->json();
-        } catch (ClientException $e) {
-            if ($e->getCode() !== 404) {
-                throw $e;
-            }
-        }
-
-        return null;
-    }
-
-    public function post($url, $body)
-    {
-        $client = new Client();
-        
-        try {
-            $response = $client->post($url, array('body' => $body));
-            return $response->json();
-        } catch (ClientErrorResponseException $e) {
-            if ($e->getCode() !== 404) {
-                throw $e;
-            }
-        }
-
-        return null;
-    }
-}
diff --git a/tests/integration/guzzle/4/composer.json b/tests/integration/guzzle/4/composer.json
deleted file mode 100644
index 1291254e1..000000000
--- a/tests/integration/guzzle/4/composer.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "require": {
-        "guzzlehttp/guzzle": "~4.0"
-    }
-}
diff --git a/tests/integration/guzzle/4/composer.lock b/tests/integration/guzzle/4/composer.lock
deleted file mode 100644
index 7aa5d2e09..000000000
--- a/tests/integration/guzzle/4/composer.lock
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
-        "This file is @generated automatically"
-    ],
-    "hash": "e500b5a216f42ba9ab567e0e9034749f",
-    "packages": [
-        {
-            "name": "guzzlehttp/guzzle",
-            "version": "4.2.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "66fd916e9f9130bc22c51450476823391cb2f67c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/66fd916e9f9130bc22c51450476823391cb2f67c",
-                "reference": "66fd916e9f9130bc22c51450476823391cb2f67c",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "guzzlehttp/streams": "~2.1",
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "ext-curl": "*",
-                "phpunit/phpunit": "~4.0",
-                "psr/log": "~1.0"
-            },
-            "suggest": {
-                "ext-curl": "Guzzle will use specific adapters if cURL is present"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\": "src/"
-                },
-                "files": [
-                    "src/functions.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
-            "homepage": "http://guzzlephp.org/",
-            "keywords": [
-                "client",
-                "curl",
-                "framework",
-                "http",
-                "http client",
-                "rest",
-                "web service"
-            ],
-            "time": "2014-10-05 19:29:14"
-        },
-        {
-            "name": "guzzlehttp/streams",
-            "version": "2.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/streams.git",
-                "reference": "f91b721d73f0e561410903b3b3c90a5d0e40b534"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/streams/zipball/f91b721d73f0e561410903b3b3c90a5d0e40b534",
-                "reference": "f91b721d73f0e561410903b3b3c90a5d0e40b534",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Stream\\": "src/"
-                },
-                "files": [
-                    "src/functions.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "description": "Provides a simple abstraction over streams of data (Guzzle 4+)",
-            "homepage": "http://guzzlephp.org/",
-            "keywords": [
-                "Guzzle",
-                "stream"
-            ],
-            "time": "2014-08-17 21:15:53"
-        }
-    ],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": []
-}
diff --git a/tests/integration/guzzle/4/phpunit.xml b/tests/integration/guzzle/4/phpunit.xml
deleted file mode 100644
index 30e6c463b..000000000
--- a/tests/integration/guzzle/4/phpunit.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<phpunit bootstrap="../test/bootstrap.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
->
-
-    <testsuites>
-        <testsuite>
-            <directory>../test</directory>
-        </testsuite>
-    </testsuites>
-
-</phpunit>
diff --git a/tests/integration/guzzle/5/ExampleHttpClient.php b/tests/integration/guzzle/5/ExampleHttpClient.php
deleted file mode 100644
index 9a0730887..000000000
--- a/tests/integration/guzzle/5/ExampleHttpClient.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace VCR\Example;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\ClientException;
-
-class ExampleHttpClient
-{
-    public function get($url)
-    {
-        $client = new Client();
-
-        try {
-            $response = $client->get($url);
-            return $response->json();
-        } catch (ClientException $e) {
-            if ($e->getCode() !== 404) {
-                throw $e;
-            }
-        }
-
-        return null;
-    }
-
-    public function post($url, $body)
-    {
-        $client = new Client();
-        
-        try {
-            $response = $client->post($url, array('body' => $body));
-            return $response->json();
-        } catch (ClientErrorResponseException $e) {
-            if ($e->getCode() !== 404) {
-                throw $e;
-            }
-        }
-
-        return null;
-    }
-}
diff --git a/tests/integration/guzzle/5/composer.json b/tests/integration/guzzle/5/composer.json
deleted file mode 100644
index 255565722..000000000
--- a/tests/integration/guzzle/5/composer.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "require": {
-        "guzzlehttp/guzzle": "~5.0"
-    }
-}
diff --git a/tests/integration/guzzle/5/composer.lock b/tests/integration/guzzle/5/composer.lock
deleted file mode 100644
index 1ecd2825d..000000000
--- a/tests/integration/guzzle/5/composer.lock
+++ /dev/null
@@ -1,220 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
-        "This file is @generated automatically"
-    ],
-    "hash": "3dc2ee230cecf4c3dd15b49672e806db",
-    "packages": [
-        {
-            "name": "guzzlehttp/guzzle",
-            "version": "5.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "f1085bb4e023766a66b7b051914ec73bdf7202b5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f1085bb4e023766a66b7b051914ec73bdf7202b5",
-                "reference": "f1085bb4e023766a66b7b051914ec73bdf7202b5",
-                "shasum": ""
-            },
-            "require": {
-                "guzzlehttp/ringphp": "~1.0",
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "ext-curl": "*",
-                "phpunit/phpunit": "~4.0",
-                "psr/log": "~1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
-            "homepage": "http://guzzlephp.org/",
-            "keywords": [
-                "client",
-                "curl",
-                "framework",
-                "http",
-                "http client",
-                "rest",
-                "web service"
-            ],
-            "time": "2014-12-19 20:27:15"
-        },
-        {
-            "name": "guzzlehttp/ringphp",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/RingPHP.git",
-                "reference": "a903f51b692427318bc813217c0e6505287e79a4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/a903f51b692427318bc813217c0e6505287e79a4",
-                "reference": "a903f51b692427318bc813217c0e6505287e79a4",
-                "shasum": ""
-            },
-            "require": {
-                "guzzlehttp/streams": "~3.0",
-                "php": ">=5.4.0",
-                "react/promise": "~2.0"
-            },
-            "require-dev": {
-                "ext-curl": "*",
-                "phpunit/phpunit": "~4.0"
-            },
-            "suggest": {
-                "ext-curl": "Guzzle will use specific adapters if cURL is present"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Ring\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "time": "2014-12-11 05:50:32"
-        },
-        {
-            "name": "guzzlehttp/streams",
-            "version": "3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/streams.git",
-                "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/streams/zipball/47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
-                "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Stream\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "description": "Provides a simple abstraction over streams of data",
-            "homepage": "http://guzzlephp.org/",
-            "keywords": [
-                "Guzzle",
-                "stream"
-            ],
-            "time": "2014-10-12 19:18:40"
-        },
-        {
-            "name": "react/promise",
-            "version": "v2.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/reactphp/promise.git",
-                "reference": "365fcee430dfa4ace1fbc75737ca60ceea7eeeef"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/promise/zipball/365fcee430dfa4ace1fbc75737ca60ceea7eeeef",
-                "reference": "365fcee430dfa4ace1fbc75737ca60ceea7eeeef",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "React\\Promise\\": "src/"
-                },
-                "files": [
-                    "src/functions_include.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jan Sorgalla",
-                    "email": "jsorgalla@googlemail.com"
-                }
-            ],
-            "description": "A lightweight implementation of CommonJS Promises/A for PHP",
-            "time": "2014-12-30 13:32:42"
-        }
-    ],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": []
-}
diff --git a/tests/integration/guzzle/5/phpunit.xml b/tests/integration/guzzle/5/phpunit.xml
deleted file mode 100644
index 30e6c463b..000000000
--- a/tests/integration/guzzle/5/phpunit.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<phpunit bootstrap="../test/bootstrap.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
->
-
-    <testsuites>
-        <testsuite>
-            <directory>../test</directory>
-        </testsuite>
-    </testsuites>
-
-</phpunit>
diff --git a/tests/integration/guzzle/6/ExampleHttpClient.php b/tests/integration/guzzle/6/ExampleHttpClient.php
deleted file mode 100644
index a32298248..000000000
--- a/tests/integration/guzzle/6/ExampleHttpClient.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace VCR\Example;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\ClientException;
-
-class ExampleHttpClient
-{
-    public function get($url)
-    {
-        $client = new Client();
-
-        try {
-            $response = $client->get($url);
-            return json_decode($response->getBody(), true);
-        } catch (ClientException $e) {
-            if ($e->getCode() !== 404) {
-                throw $e;
-            }
-        }
-
-        return null;
-    }
-
-    public function post($url, $body)
-    {
-        $client = new Client();
-        
-        try {
-            $response = $client->post($url, array('body' => $body));
-            return json_decode($response->getBody(), true);
-        } catch (ClientException $e) {
-            if ($e->getCode() !== 404) {
-                throw $e;
-            }
-        }
-
-        return null;
-    }
-}
diff --git a/tests/integration/guzzle/6/composer.json b/tests/integration/guzzle/6/composer.json
deleted file mode 100644
index 391331801..000000000
--- a/tests/integration/guzzle/6/composer.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "require": {
-        "guzzlehttp/guzzle": "~6.0"
-    }
-}
diff --git a/tests/integration/guzzle/6/phpunit.xml b/tests/integration/guzzle/6/phpunit.xml
deleted file mode 100644
index 312b9f174..000000000
--- a/tests/integration/guzzle/6/phpunit.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<phpunit bootstrap="../test/bootstrap.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
->
-
-    <testsuites>
-        <testsuite>
-            <directory>../test</directory>
-            <directory>test</directory>
-        </testsuite>
-    </testsuites>
-
-</phpunit>
diff --git a/tests/integration/guzzle/Readme.md b/tests/integration/guzzle/Readme.md
deleted file mode 100644
index 18af40f05..000000000
--- a/tests/integration/guzzle/Readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Integration tests for Guzzle
-============================
-
-There is a folder for each major Guzzle version which includes a composer file and an example implementation
-of the `ExampleHttpClient` class.
-
-The tests in the `./test/` folder are run for each Guzzle version.
diff --git a/tests/integration/guzzle/test/VCR/Example/ExampleHttpClientTest.php b/tests/integration/guzzle/test/VCR/Example/ExampleHttpClientTest.php
deleted file mode 100644
index 4f6ac8875..000000000
--- a/tests/integration/guzzle/test/VCR/Example/ExampleHttpClientTest.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-namespace VCR\Example;
-
-use org\bovigo\vfs\vfsStream;
-
-/**
- * Tests example request.
- */
-class ExampleHttpClientTest extends \PHPUnit_Framework_TestCase
-{
-    const TEST_GET_URL = 'https://api.chew.pro/trbmb';
-    const TEST_POST_URL = 'https://httpbin.org/post';
-    const TEST_POST_BODY = '{"foo":"bar"}';
-
-    protected $ignoreHeaders = array(
-        'Accept',
-        'Connect-Time',
-        'Total-Route-Time',
-        'X-Request-Id',
-    );
-
-    public function setUp()
-    {
-        vfsStream::setup('testDir');
-        \VCR\VCR::configure()->setCassettePath(vfsStream::url('testDir'));
-    }
-
-    public function testRequestGET()
-    {
-        \VCR\VCR::turnOn();
-        \VCR\VCR::insertCassette('test-cassette.yml');
-        $originalRequest = $this->requestGET();
-        $this->assertValidGETResponse($originalRequest);
-        $interceptedRequest = $this->requestGET();
-        $this->assertValidGETResponse($interceptedRequest);
-        $this->assertEquals($originalRequest, $interceptedRequest);
-        $repeatInterceptedRequest = $this->requestGET();
-        $this->assertEquals($interceptedRequest, $repeatInterceptedRequest);
-        \VCR\VCR::turnOff();
-    }
-
-    public function testRequestPOST()
-    {
-        \VCR\VCR::turnOn();
-        \VCR\VCR::insertCassette('test-cassette.yml');
-        $originalRequest = $this->requestPOST();
-        $this->assertValidPOSTResponse($originalRequest);
-        $interceptedRequest = $this->requestPOST();
-        $this->assertValidPOSTResponse($interceptedRequest);
-        $this->assertEquals($originalRequest, $interceptedRequest);
-        $repeatInterceptedRequest = $this->requestPOST();
-        $this->assertEquals($interceptedRequest, $repeatInterceptedRequest);
-        \VCR\VCR::turnOff();
-    }
-
-    protected function requestGET()
-    {
-        $exampleClient = new ExampleHttpClient();
-
-        $response = $exampleClient->get(self::TEST_GET_URL);
-
-        return $response;
-    }
-
-    protected function requestPOST()
-    {
-        $exampleClient = new ExampleHttpClient();
-
-        $response = $exampleClient->post(self::TEST_POST_URL, self::TEST_POST_BODY);
-        foreach ($this->ignoreHeaders as $header) {
-            unset($response['headers'][$header]);
-        }
-        unset($response['origin']);
-
-        return $response;
-    }
-
-    protected function requestPOSTIntercepted()
-    {
-        \VCR\VCR::turnOn();
-        \VCR\VCR::insertCassette('test-cassette.yml');
-        $info = $this->requestPOST();
-        \VCR\VCR::turnOff();
-
-        return $info;
-    }
-
-    protected function assertValidGETResponse($info)
-    {
-        $this->assertInternalType('array', $info, 'Response is not an array.');
-        $this->assertArrayHasKey('0', $info, 'API did not return any value.');
-    }
-
-    protected function assertValidPOSTResponse($info)
-    {
-        $this->assertInternalType('array', $info, 'Response is not an array.');
-        $this->assertArrayHasKey('url', $info, "Key 'url' not found.");
-        $this->assertEquals(self::TEST_POST_URL, $info['url'], "Value for key 'url' wrong.");
-        $this->assertArrayHasKey('headers', $info, "Key 'headers' not found.");
-        $this->assertInternalType('array', $info['headers'], 'Headers is not an array.');
-        $this->assertEquals(self::TEST_POST_BODY, $info['data'], 'Correct request body was not sent.');
-    }
-}
diff --git a/tests/integration/guzzle/test/bootstrap.php b/tests/integration/guzzle/test/bootstrap.php
deleted file mode 100644
index 9857972ce..000000000
--- a/tests/integration/guzzle/test/bootstrap.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-require_once __DIR__ . '/../../../../vendor/autoload.php';
-$loader = require_once 'vendor/autoload.php';
-
-/**
- * @var \Composer\Autoload\ClassLoader
- */
-$loader->addClassMap(array(
-    'VCR\\Example\\ExampleHttpClient' => 'ExampleHttpClient.php'
-));
-
-\VCR\VCR::turnOn();
-\VCR\VCR::turnOff();
diff --git a/tests/integration/soap/composer.json b/tests/integration/soap/composer.json
deleted file mode 100644
index 3ce01e23c..000000000
--- a/tests/integration/soap/composer.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "require": {
-        "ext-soap": "*"
-    },
-    "autoload": {
-        "classmap": ["src/"]
-    }
-}
diff --git a/tests/integration/soap/phpunit.xml b/tests/integration/soap/phpunit.xml
deleted file mode 100644
index e952df760..000000000
--- a/tests/integration/soap/phpunit.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<phpunit bootstrap="./test/bootstrap.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
->
-
-    <testsuites>
-        <testsuite>
-            <directory>./test</directory>
-        </testsuite>
-    </testsuites>
-
-</phpunit>
diff --git a/tests/integration/soap/src/VCR/Example/ExampleSoapClient.php b/tests/integration/soap/src/VCR/Example/ExampleSoapClient.php
deleted file mode 100644
index 429b8b143..000000000
--- a/tests/integration/soap/src/VCR/Example/ExampleSoapClient.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace VCR\Example;
-
-/**
- * Converts temperature units from webservicex
- *
- * @link http://www.webservicex.net/New/Home/ServiceDetail/31
- */
-class ExampleSoapClient
-{
-    const EXAMPLE_WSDL = 'http://www.dataaccess.com/webservicesserver/numberconversion.wso?WSDL';
-
-    public function call($number = 12)
-    {
-        $client = new \SoapClient(self::EXAMPLE_WSDL, array('soap_version' => SOAP_1_2));
-        $response = $client->NumberToWords(array('ubiNum' => $number));
-
-        return trim((string) $response->NumberToWordsResult);
-    }
-}
diff --git a/tests/integration/soap/test/VCR/Example/ExampleSoapClientTest.php b/tests/integration/soap/test/VCR/Example/ExampleSoapClientTest.php
deleted file mode 100644
index b699c8df7..000000000
--- a/tests/integration/soap/test/VCR/Example/ExampleSoapClientTest.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace VCR\Example;
-
-use org\bovigo\vfs\vfsStream;
-
-/**
- * Converts temperature units from webservicex
- *
- * @link http://www.webservicex.net/New/Home/ServiceDetail/31
- */
-class ExampleSoapClientTest extends \PHPUnit_Framework_TestCase
-{
-    public function setUp()
-    {
-        // Configure virtual filesystem.
-        vfsStream::setup('testDir');
-        \VCR\VCR::configure()->setCassettePath(vfsStream::url('testDir'));
-    }
-
-    public function testCallDirectly()
-    {
-        $actual = $this->callSoap();
-        $this->assertInternalType('string', $actual);
-        $this->assertEquals('twelve', $actual);
-    }
-
-    public function testCallIntercepted()
-    {
-        $actual = $this->callSoapIntercepted();
-        $this->assertInternalType('string', $actual);
-        $this->assertEquals('twelve', $actual);
-    }
-
-    public function testCallDirectlyEqualsIntercepted()
-    {
-        $this->assertEquals($this->callSoap(), $this->callSoapIntercepted());
-    }
-
-    protected function callSoap()
-    {
-        $soapClient = new ExampleSoapClient();
-        return $soapClient->call(12);
-    }
-
-    protected function callSoapIntercepted()
-    {
-        \VCR\VCR::turnOn();
-        \VCR\VCR::insertCassette('test-cassette.yml');
-        $result = $this->callSoap();
-        \VCR\VCR::turnOff();
-
-        return $result;
-    }
-}
diff --git a/tests/integration/soap/test/bootstrap.php b/tests/integration/soap/test/bootstrap.php
deleted file mode 100644
index d73a1d83e..000000000
--- a/tests/integration/soap/test/bootstrap.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-require_once __DIR__ . '/../../../../vendor/autoload.php';
-$loader = require_once 'vendor/autoload.php';
-
-\VCR\VCR::turnOn();
-\VCR\VCR::turnOff();