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
index dd7983d3d..eda412b6c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,11 +5,14 @@ charset = utf-8
 end_of_line = lf
 insert_final_newline = true
 indent_style = space
-indent_size = 4
+indent_size = 2
 trim_trailing_whitespace = true
 
+[*.php]
+indent_size = 4
+
 [*.md]
 trim_trailing_whitespace = false
 
-[*.{yml,yaml,neon}]
-indent_size = 2
+[*.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..0f88bd335
--- /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/.github/workflows/tests.yml b/.github/workflows/tests.yml
deleted file mode 100644
index 017138f36..000000000
--- a/.github/workflows/tests.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-name: "tests"
-
-on:
-  push:
-    branches:
-      - "master"
-  pull_request:
-
-jobs:
-  phpstan:
-    name: "PHPStan"
-    runs-on: "ubuntu-latest"
-    steps:
-      - name: "Checkout code"
-        uses: "actions/checkout@v2"
-
-      - name: "Setup PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          php-version: "8.0"
-          extensions: "curl, soap"
-          tools: "composer:v2"
-
-      - name: "Check Composer configuration"
-        run: "composer validate --strict"
-
-      - name: "Install dependencies"
-        run: "composer update --prefer-dist --no-interaction --no-progress"
-
-      - name: "Execute static analysis"
-        run: "composer run-script phpstan"
-
-  lint:
-    name: "PHP-CS-Fixer"
-    runs-on: "ubuntu-latest"
-    steps:
-      - name: "Checkout code"
-        uses: "actions/checkout@v2"
-
-      - name: "Setup PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          php-version: "8.0"
-          extensions: "curl, soap"
-          tools: "composer:v2"
-
-      - name: "Check Composer configuration"
-        run: "composer validate --strict"
-
-      - name: "Install dependencies"
-        run: "composer update --prefer-dist --no-interaction --no-progress"
-
-      - name: "Execute linting"
-        run: "composer run-script lint"
-
-  tests:
-    strategy:
-      fail-fast: true
-      matrix:
-        php: ["8.0"]
-        composer_flags: ["", "--prefer-lowest"]
-
-    name: "Tests PHP ${{ matrix.php }} ${{ matrix.composer_flags}}"
-
-    runs-on: "ubuntu-latest"
-
-    steps:
-      - name: "Checkout code"
-        uses: "actions/checkout@v2"
-
-      - name: "Setup PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          php-version: "${{ matrix.php }}"
-          extensions: "curl, soap"
-          tools: "composer:v2"
-          coverage: "pcov"
-
-      - name: "Check Composer configuration"
-        run: "composer validate --strict"
-
-      - name: "Install dependencies"
-        run: "composer update -o ${{ matrix.composer_flags }} --prefer-dist --no-interaction --no-progress"
-
-      - name: "Execute tests"
-        run: "vendor/bin/phpunit --coverage-clover=coverage.clover"
-
-      - name: Upload Scrutinizer coverage
-        uses: sudo-bot/action-scrutinizer@latest
-        with:
-          cli-args: "--format=php-clover coverage.clover"
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 be1cc9da3..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://github.com/php-vcr/php-vcr/actions/workflows/tests.yml/badge.svg)](https://github.com/php-vcr/php-vcr/actions/workflows/tests.yml)
+[![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/)
 
@@ -14,7 +14,7 @@ Disclaimer: Doing this in PHP is not as easy as in programming languages which s
 
 * Automatically records and replays your HTTP(s) interactions with minimal setup/configuration code.
 * Supports common http functions and extensions
-  * 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)
+  * 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.
@@ -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 bfee961d4..c27427ad5 100644
--- a/composer.json
+++ b/composer.json
@@ -4,9 +4,10 @@
     "license": "MIT",
     "scripts": {
         "test": "./vendor/bin/phpunit",
-        "lint": "./vendor/bin/php-cs-fixer fix --verbose --diff --dry-run",
-        "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"
+        "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": [
         {
@@ -18,22 +19,25 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8,<8.2|>=8.2.9,<8.5",
         "ext-curl": "*",
         "beberlei/assert": "^3.2.5",
-        "symfony/yaml": "^3.0|^4.0|^5.0|^6.0",
-        "symfony/event-dispatcher": "^5.0|^6.0"
+        "symfony/yaml": "^3|^4|^5|^6|^7",
+        "symfony/event-dispatcher": "^4|^5|^6|^7",
+        "symfony/event-dispatcher-contracts": "^1|^2|^3"
     },
     "require-dev": {
-        "guzzlehttp/guzzle": "^7.0",
-        "phpunit/phpunit": "^9.5.0",
+        "ext-soap": "*",
+        "guzzlehttp/guzzle": "^7",
+        "phpunit/phpunit": "^9.5.10",
         "mikey179/vfsstream": "^1.6.10",
-        "phpstan/phpstan": "^0.12.92",
-        "phpstan/phpstan-beberlei-assert": "^0.12.0",
-        "thecodingmachine/phpstan-strict-rules": "^0.12",
+        "phpstan/phpstan": "^1",
+        "phpstan/phpstan-beberlei-assert": "^1",
+        "thecodingmachine/phpstan-strict-rules": "^1",
         "friendsofphp/php-cs-fixer": "^3.0",
-        "phpstan/phpstan-phpunit": "^0.12.22",
-        "phpstan/extension-installer": "^1.1"
+        "phpstan/phpstan-phpunit": "^1",
+        "phpstan/extension-installer": "^1.1",
+        "editorconfig-checker/editorconfig-checker": "^10.3"
     },
     "autoload": {
         "psr-4": {
diff --git a/docker-compose.yaml b/docker-compose.yaml
index ca06f8f53..21cf8bade 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,12 +1,55 @@
 version: "3.8"
 services:
-  workspace:
+  workspace80:
     tty: true
     build:
-      context: resources/docker/workspace
+      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
index ec2babc4b..ef2b8b4ef 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1,20 +1,45 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Access to an undefined property object\\:\\:\\$data\\.$#"
-			count: 2
-			path: src/VCR/CodeTransform/AbstractCodeTransform.php
+			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: src/VCR/Util/HttpUtil.php
 
 		-
-			message: "#^Access to an undefined property object\\:\\:\\$datalen\\.$#"
+			message: "#^Method VCR\\\\Util\\\\HttpUtil\\:\\:parseHeaders\\(\\) should return array\\<string, string\\> but returns array\\<array\\<int, string\\>\\|string\\>\\.$#"
 			count: 1
-			path: src/VCR/CodeTransform/AbstractCodeTransform.php
+			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
@@ -25,3 +50,52 @@ parameters:
 			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
+
+		-
+			message: "#^Unreachable statement - code above always terminates.#"
+			count: 3
+			path: tests/Integration/Soap/ExampleSoapClientTest.php
diff --git a/phpstan.neon b/phpstan.neon
index d9e3594d6..492460e87 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -2,7 +2,7 @@ includes:
 	- phpstan-baseline.neon
 
 parameters:
-    level: max
-    paths:
-        - src
-        - tests
+	level: 8
+	paths:
+		- src
+		- tests
diff --git a/resources/docker/workspace/Dockerfile b/resources/docker/workspace/8.0/Dockerfile
similarity index 77%
rename from resources/docker/workspace/Dockerfile
rename to resources/docker/workspace/8.0/Dockerfile
index 7e8595696..d52603324 100644
--- a/resources/docker/workspace/Dockerfile
+++ b/resources/docker/workspace/8.0/Dockerfile
@@ -8,6 +8,8 @@ RUN apk add --no-cache --virtual .build-deps \
     $PHPIZE_DEPS \
     # for soap
     libxml2-dev \
+    # for xdebug \
+    linux-headers \
     && \
     apk add --no-cache \
     bash \
@@ -22,9 +24,12 @@ RUN apk add --no-cache --virtual .build-deps \
     # 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 /usr/bin/composer /usr/bin/composer
+COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
 
 WORKDIR /var/www/html
 
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 9f7bcc708..273e20935 100644
--- a/src/VCR/Cassette.php
+++ b/src/VCR/Cassette.php
@@ -21,16 +21,21 @@ public function __construct(
     ) {
     }
 
-    public function hasResponse(Request $request): bool
+    public function hasResponse(Request $request, int $index = 0): bool
     {
-        return null !== $this->playback($request);
+        return null !== $this->playback($request, $index);
     }
 
-    public function playback(Request $request): ?Response
+    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']);
             }
         }
@@ -38,15 +43,16 @@ public function playback(Request $request): ?Response
         return null;
     }
 
-    public function record(Request $request, Response $response): void
+    public function record(Request $request, Response $response, int $index = 0): void
     {
-        if ($this->hasResponse($request)) {
+        if ($this->hasResponse($request, $index)) {
             return;
         }
 
         $this->storage->storeRecording([
             'request' => $request->toArray(),
             'response' => $response->toArray(),
+            'index' => $index,
         ]);
     }
 
diff --git a/src/VCR/CodeTransform/AbstractCodeTransform.php b/src/VCR/CodeTransform/AbstractCodeTransform.php
index c4d225ec9..f305ca419 100644
--- a/src/VCR/CodeTransform/AbstractCodeTransform.php
+++ b/src/VCR/CodeTransform/AbstractCodeTransform.php
@@ -4,7 +4,6 @@
 
 namespace VCR\CodeTransform;
 
-use function stream_get_filters;
 use VCR\Util\Assertion;
 
 /**
@@ -14,6 +13,8 @@ abstract class AbstractCodeTransform extends \php_user_filter
 {
     public const NAME = 'vcr_abstract_filter';
 
+    private string $data = '';
+
     /**
      * Attaches the current filter to a stream.
      */
@@ -21,7 +22,10 @@ public function register(): void
     {
         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));
+            Assertion::true(
+                $isRegistered,
+                \sprintf('Failed registering stream filter "%s" on stream "%s"', static::class, static::NAME)
+            );
         }
     }
 
@@ -31,7 +35,6 @@ public function register(): void
      * @param resource $in
      * @param resource $out
      * @param int      &$consumed
-     * @param bool     $closing
      *
      * @return int PSFS_PASS_ON
      *
@@ -39,12 +42,19 @@ public function register(): void
      */
     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;
         }
 
+        $bucket = stream_bucket_new($this->stream, $this->transformCode($this->data));
+        $this->data = '';
+        stream_bucket_append($out, $bucket);
+
         return \PSFS_PASS_ON;
     }
 
diff --git a/src/VCR/CodeTransform/CurlCodeTransform.php b/src/VCR/CodeTransform/CurlCodeTransform.php
index b67fdf836..3b7c3c248 100644
--- a/src/VCR/CodeTransform/CurlCodeTransform.php
+++ b/src/VCR/CodeTransform/CurlCodeTransform.php
@@ -29,9 +29,6 @@ class CurlCodeTransform extends AbstractCodeTransform
         '/(?<!::|->|\w_)\\\?curl_errno\s*\(/i' => '\VCR\LibraryHooks\CurlHook::curl_errno(',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function transformCode(string $code): string
     {
         $transformedCode = preg_replace(array_keys(self::$patterns), array_values(self::$patterns), $code);
diff --git a/src/VCR/CodeTransform/SoapCodeTransform.php b/src/VCR/CodeTransform/SoapCodeTransform.php
index c5de74a8b..746a8b285 100644
--- a/src/VCR/CodeTransform/SoapCodeTransform.php
+++ b/src/VCR/CodeTransform/SoapCodeTransform.php
@@ -26,9 +26,6 @@ class SoapCodeTransform extends AbstractCodeTransform
         '@extends\s+\\\?SoapClient\b@i',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function transformCode(string $code): string
     {
         $transformedCode = preg_replace(self::$patterns, self::$replacements, $code);
diff --git a/src/VCR/Configuration.php b/src/VCR/Configuration.php
index b6d488cff..d2b0a9a3b 100644
--- a/src/VCR/Configuration.php
+++ b/src/VCR/Configuration.php
@@ -23,7 +23,7 @@ class Configuration
      *
      * A value of null means all hooks are enabled.
      *
-     * @see \VCR\LibraryHooks\LibraryHook
+     * @see LibraryHooks\LibraryHook
      *
      * @var string[]|null list of enabled LibraryHook names
      */
diff --git a/src/VCR/Event/Event.php b/src/VCR/Event/Event.php
index e6bb0c02a..f9b3de8e0 100644
--- a/src/VCR/Event/Event.php
+++ b/src/VCR/Event/Event.php
@@ -4,6 +4,8 @@
 
 namespace VCR\Event;
 
-abstract class Event extends \Symfony\Contracts\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
index 4623ad09d..ca1b37f82 100644
--- a/src/VCR/Exceptions/InvalidHostException.php
+++ b/src/VCR/Exceptions/InvalidHostException.php
@@ -4,12 +4,10 @@
 
 namespace VCR\Exceptions;
 
-use InvalidArgumentException;
-
-class InvalidHostException extends InvalidArgumentException
+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));
+        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 d8b12fe6d..eea98b399 100644
--- a/src/VCR/LibraryHooks/CurlHook.php
+++ b/src/VCR/LibraryHooks/CurlHook.php
@@ -4,8 +4,6 @@
 
 namespace VCR\LibraryHooks;
 
-use CurlHandle;
-use CurlMultiHandle;
 use VCR\CodeTransform\AbstractCodeTransform;
 use VCR\Request;
 use VCR\Response;
@@ -37,12 +35,12 @@ class CurlHook implements LibraryHook
     protected static array $curlOptions = [];
 
     /**
-     * @var array<int, 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 array $multiHandles = [];
 
     /**
-     * @var array<int, array> last active curl_multi_exec() handles
+     * @var array<\CurlHandle> last active curl_multi_exec() handles
      */
     protected static array $multiExecLastChs = [];
 
@@ -62,9 +60,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function enable(\Closure $requestCallback): void
     {
         if (self::ENABLED == static::$status) {
@@ -80,9 +75,6 @@ public function enable(\Closure $requestCallback): void
         static::$status = self::ENABLED;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function disable(): void
     {
         self::$requestCallback = null;
@@ -90,9 +82,6 @@ public function disable(): void
         static::$status = self::DISABLED;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isEnabled(): bool
     {
         return self::ENABLED == self::$status;
@@ -137,7 +126,7 @@ public static function __callStatic($method, array $args)
     /**
      * @see http://www.php.net/manual/en/function.curl-init.php
      */
-    public static function curlInit(?string $url = null): CurlHandle|false
+    public static function curlInit(?string $url = null): \CurlHandle|false
     {
         $curlHandle = curl_init($url);
         if (false !== $curlHandle) {
@@ -151,7 +140,7 @@ public static function curlInit(?string $url = null): CurlHandle|false
     /**
      * @see http://www.php.net/manual/en/function.curl-reset.php
      */
-    public static function curlReset(CurlHandle $curlHandle): void
+    public static function curlReset(\CurlHandle $curlHandle): void
     {
         curl_reset($curlHandle);
         self::$requests[(int) $curlHandle] = new Request('GET', null);
@@ -168,7 +157,7 @@ public static function curlReset(CurlHandle $curlHandle): void
      *               However, if the CURLOPT_RETURNTRANSFER option is set, it will return the
      *               result on success, FALSE on failure.
      */
-    public static function curlExec(CurlHandle $curlHandle)
+    public static function curlExec(\CurlHandle $curlHandle)
     {
         try {
             $request = self::$requests[(int) $curlHandle];
@@ -195,7 +184,7 @@ public static function curlExec(CurlHandle $curlHandle)
      *
      * @see http://www.php.net/manual/en/function.curl-multi-add-handle.php
      */
-    public static function curlMultiAddHandle(CurlMultiHandle $multiHandle, CurlHandle $curlHandle): void
+    public static function curlMultiAddHandle(\CurlMultiHandle $multiHandle, \CurlHandle $curlHandle): void
     {
         if (!isset(self::$multiHandles[(int) $multiHandle])) {
             self::$multiHandles[(int) $multiHandle] = [];
@@ -209,7 +198,7 @@ public static function curlMultiAddHandle(CurlMultiHandle $multiHandle, CurlHand
      *
      * @see http://www.php.net/manual/en/function.curl-multi-remove-handle.php
      */
-    public static function curlMultiRemoveHandle(CurlMultiHandle $multiHandle, CurlHandle $curlHandle): void
+    public static function curlMultiRemoveHandle(\CurlMultiHandle $multiHandle, \CurlHandle $curlHandle): void
     {
         if (isset(self::$multiHandles[(int) $multiHandle][(int) $curlHandle])) {
             unset(self::$multiHandles[(int) $multiHandle][(int) $curlHandle]);
@@ -221,7 +210,7 @@ public static function curlMultiRemoveHandle(CurlMultiHandle $multiHandle, CurlH
      *
      * @see http://www.php.net/manual/en/function.curl-multi-exec.php
      */
-    public static function curlMultiExec(CurlMultiHandle $multiHandle, ?int &$stillRunning): int
+    public static function curlMultiExec(\CurlMultiHandle $multiHandle, ?int &$stillRunning): int
     {
         if (isset(self::$multiHandles[(int) $multiHandle])) {
             foreach (self::$multiHandles[(int) $multiHandle] as $curlHandle) {
@@ -264,7 +253,7 @@ public static function curlMultiInfoRead()
      *
      * @return string|null return the content of a cURL handle if CURLOPT_RETURNTRANSFER is set
      */
-    public static function curlMultiGetcontent(CurlHandle $curlHandle): ?string
+    public static function curlMultiGetcontent(\CurlHandle $curlHandle): ?string
     {
         return self::$multiReturnValues[(int) $curlHandle] ?? null;
     }
@@ -273,10 +262,8 @@ public static function curlMultiGetcontent(CurlHandle $curlHandle): ?string
      * Get information regarding a specific transfer.
      *
      * @see http://www.php.net/manual/en/function.curl-getinfo.php
-     *
-     * @return mixed
      */
-    public static function curlGetinfo(CurlHandle $curlHandle, int $option = 0)
+    public static function curlGetinfo(\CurlHandle $curlHandle, int $option = 0): mixed
     {
         if (isset(self::$responses[(int) $curlHandle])) {
             return CurlHelper::getCurlOptionFromResponse(
@@ -298,7 +285,7 @@ public static function curlGetinfo(CurlHandle $curlHandle, int $option = 0)
      *
      * @param mixed $value the value to be set on option
      */
-    public static function curlSetopt(CurlHandle $curlHandle, int $option, $value): bool
+    public static function curlSetopt(\CurlHandle $curlHandle, int $option, $value): bool
     {
         CurlHelper::setCurlOptionOnRequest(self::$requests[(int) $curlHandle], $option, $value);
 
@@ -314,7 +301,7 @@ public static function curlSetopt(CurlHandle $curlHandle, int $option, $value):
      *
      * @param array<int, mixed> $options an array specifying which options to set and their values
      */
-    public static function curlSetoptArray(CurlHandle $curlHandle, array $options): void
+    public static function curlSetoptArray(\CurlHandle $curlHandle, array $options): void
     {
         foreach ($options as $option => $value) {
             static::curlSetopt($curlHandle, $option, $value);
@@ -326,7 +313,7 @@ public static function curlSetoptArray(CurlHandle $curlHandle, array $options):
      *
      * @see https://php.net/manual/en/function.curl-error.php
      */
-    public static function curlError(CurlHandle $curlHandle): string
+    public static function curlError(\CurlHandle $curlHandle): string
     {
         if (isset(self::$lastErrors[(int) $curlHandle])) {
             return self::$lastErrors[(int) $curlHandle]->getMessage();
@@ -340,7 +327,7 @@ public static function curlError(CurlHandle $curlHandle): string
      *
      * @see https://php.net/manual/en/function.curl-errno.php
      */
-    public static function curlErrno(CurlHandle $curlHandle): int
+    public static function curlErrno(\CurlHandle $curlHandle): int
     {
         if (isset(self::$lastErrors[(int) $curlHandle])) {
             return self::$lastErrors[(int) $curlHandle]->getCode();
diff --git a/src/VCR/LibraryHooks/SoapHook.php b/src/VCR/LibraryHooks/SoapHook.php
index 084e3d5a6..285d90765 100644
--- a/src/VCR/LibraryHooks/SoapHook.php
+++ b/src/VCR/LibraryHooks/SoapHook.php
@@ -44,12 +44,12 @@ public function doRequest(string $request, string $location, string $action, int
         $vcrRequest = new Request('POST', $location);
 
         if (\SOAP_1_1 === $version) {
-            $vcrRequest->setHeader('Content-Type', 'text/xml; charset=utf-8;');
+            $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)
             );
         }
 
@@ -67,9 +67,6 @@ public function doRequest(string $request, string $location, string $action, int
         return $response->getBody();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function enable(\Closure $requestCallback): void
     {
         self::$requestCallback = $requestCallback;
@@ -85,9 +82,6 @@ public function enable(\Closure $requestCallback): void
         $this->status = self::ENABLED;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function disable(): void
     {
         self::$requestCallback = null;
@@ -95,9 +89,6 @@ public function disable(): void
         $this->status = self::DISABLED;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isEnabled(): bool
     {
         return self::ENABLED == $this->status;
diff --git a/src/VCR/LibraryHooks/StreamWrapperHook.php b/src/VCR/LibraryHooks/StreamWrapperHook.php
index 77e17b85a..1377f08bf 100644
--- a/src/VCR/LibraryHooks/StreamWrapperHook.php
+++ b/src/VCR/LibraryHooks/StreamWrapperHook.php
@@ -17,19 +17,13 @@ class StreamWrapperHook implements LibraryHook
 
     protected string $status = self::DISABLED;
 
-    /**
-     * @var Response
-     */
-    protected $response;
+    protected Response $response;
 
     /**
      * @var resource current stream context
      */
     public $context;
 
-    /**
-     * {@inheritdoc}
-     */
     public function enable(\Closure $requestCallback): void
     {
         self::$requestCallback = $requestCallback;
@@ -42,9 +36,6 @@ public function enable(\Closure $requestCallback): void
         $this->status = self::ENABLED;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function disable(): void
     {
         self::$requestCallback = null;
@@ -54,9 +45,6 @@ public function disable(): void
         $this->status = self::DISABLED;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isEnabled(): bool
     {
         return self::ENABLED == $this->status;
diff --git a/src/VCR/Request.php b/src/VCR/Request.php
index 01b680afe..15396f17e 100644
--- a/src/VCR/Request.php
+++ b/src/VCR/Request.php
@@ -217,10 +217,7 @@ public function getCurlOptions(): array
         return $this->curlOptions;
     }
 
-    /**
-     * @return mixed
-     */
-    public function getCurlOption(int $key)
+    public function getCurlOption(int $key): mixed
     {
         if (empty($this->curlOptions[$key])) {
             return null;
@@ -278,18 +275,12 @@ public function removeHeader(string $key): void
         unset($this->headers[$key]);
     }
 
-    /**
-     * @param mixed $value
-     */
-    public function setPostField(string $key, $value): void
+    public function setPostField(string $key, mixed $value): void
     {
         $this->postFields[$key] = $value;
     }
 
-    /**
-     * @param mixed $value
-     */
-    public function setCurlOption(int $key, $value): void
+    public function setCurlOption(int $key, mixed $value): void
     {
         $this->curlOptions[$key] = $value;
     }
@@ -301,4 +292,14 @@ 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/Response.php b/src/VCR/Response.php
index 6bd342159..51a52deb5 100644
--- a/src/VCR/Response.php
+++ b/src/VCR/Response.php
@@ -18,20 +18,14 @@ class Response
     /**
      * @var array<string,string>
      */
-    protected $headers = [];
-    /**
-     * @var string|null
-     */
-    protected $body;
+    protected array $headers = [];
+    protected ?string $body;
     /**
      * @var array<string,mixed>
      */
-    protected $curlInfo = [];
+    protected array $curlInfo = [];
 
-    /**
-     * @var mixed
-     */
-    protected $httpVersion;
+    protected mixed $httpVersion = null;
 
     /**
      * @param string|array<string, string> $status
@@ -57,11 +51,9 @@ public function toArray(): array
         // Base64 encode when binary
         if (
             null !== $this->getContentType()
-            &&
-            (
+            && (
                 str_contains($this->getContentType(), 'application/x-gzip')
-                ||
-                'binary' == $this->getHeader('Content-Transfer-Encoding')
+                || 'binary' == $this->getHeader('Content-Transfer-Encoding')
             )
         ) {
             $body = base64_encode($body);
@@ -118,7 +110,7 @@ public function getBody(): string
     /**
      * @return array<string,mixed>|mixed|null
      */
-    public function getCurlInfo(?string $option = null)
+    public function getCurlInfo(?string $option = null): mixed
     {
         if (empty($option)) {
             return $this->curlInfo;
@@ -157,10 +149,7 @@ public function getHeader(string $key): ?string
         return $this->headers[$key];
     }
 
-    /**
-     * @return mixed
-     */
-    public function getHttpVersion()
+    public function getHttpVersion(): mixed
     {
         return $this->httpVersion;
     }
diff --git a/src/VCR/Storage/AbstractStorage.php b/src/VCR/Storage/AbstractStorage.php
index 971fe0c57..6ba79170d 100644
--- a/src/VCR/Storage/AbstractStorage.php
+++ b/src/VCR/Storage/AbstractStorage.php
@@ -68,7 +68,7 @@ public function __construct(string $cassettePath, string $cassetteName, string $
      *
      * @return array<string,mixed>|null parsed current record
      */
-    public function current(): mixed
+    public function current(): ?array
     {
         return $this->current;
     }
diff --git a/src/VCR/Storage/Blackhole.php b/src/VCR/Storage/Blackhole.php
index 09e8ac2d9..3812ccf4d 100644
--- a/src/VCR/Storage/Blackhole.php
+++ b/src/VCR/Storage/Blackhole.php
@@ -9,16 +9,10 @@
  */
 class Blackhole implements Storage
 {
-    /**
-     * {@inheritdoc}
-     */
     public function storeRecording(array $recording): void
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isNew(): bool
     {
         return true;
@@ -35,7 +29,6 @@ public function key(): int
         throw new \BadMethodCallException('Not implemented');
     }
 
-    /** @return void */
     public function next(): void
     {
     }
diff --git a/src/VCR/Storage/Json.php b/src/VCR/Storage/Json.php
index b9a40eac7..34fc822d2 100644
--- a/src/VCR/Storage/Json.php
+++ b/src/VCR/Storage/Json.php
@@ -12,9 +12,6 @@
  */
 class Json extends AbstractStorage
 {
-    /**
-     * {@inheritdoc}
-     */
     public function storeRecording(array $recording): void
     {
         fseek($this->handle, -1, \SEEK_END);
diff --git a/src/VCR/Storage/Storage.php b/src/VCR/Storage/Storage.php
index 4182f33e2..c8156ba98 100644
--- a/src/VCR/Storage/Storage.php
+++ b/src/VCR/Storage/Storage.php
@@ -15,7 +15,7 @@
 interface Storage extends \Iterator
 {
     /**
-     * @param array<string,string|array<string,mixed>|null> $recording
+     * @param array<string,int|string|array<string,mixed>|null> $recording
      */
     public function storeRecording(array $recording): void;
 
diff --git a/src/VCR/Storage/Yaml.php b/src/VCR/Storage/Yaml.php
index f033d392e..b1a826f81 100644
--- a/src/VCR/Storage/Yaml.php
+++ b/src/VCR/Storage/Yaml.php
@@ -19,7 +19,7 @@ class Yaml extends AbstractStorage
 
     protected Dumper $yamlDumper;
 
-    public function __construct(string $cassettePath, string $cassetteName, Parser $parser = null, Dumper $dumper = null)
+    public function __construct(string $cassettePath, string $cassetteName, ?Parser $parser = null, ?Dumper $dumper = null)
     {
         parent::__construct($cassettePath, $cassetteName, '');
 
@@ -27,9 +27,6 @@ public function __construct(string $cassettePath, string $cassetteName, Parser $
         $this->yamlDumper = $dumper ?: new Dumper();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function storeRecording(array $recording): void
     {
         fseek($this->handle, -1, \SEEK_END);
diff --git a/src/VCR/Util/Assertion.php b/src/VCR/Util/Assertion.php
index 522da3a87..c6e02c9d7 100644
--- a/src/VCR/Util/Assertion.php
+++ b/src/VCR/Util/Assertion.php
@@ -20,9 +20,9 @@ class Assertion extends BaseAssertion
      * @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
+     * @throws VCRException if specified value is not a callable
      */
-    public static function isCallable($value, $message = null, string $propertyPath = null): bool
+    public static function isCallable($value, $message = null, ?string $propertyPath = null): bool
     {
         if (!\is_callable($value)) {
             throw new VCRException($message, self::INVALID_CALLABLE, $propertyPath);
diff --git a/src/VCR/Util/CurlException.php b/src/VCR/Util/CurlException.php
index 443e00cbe..15ce0d7f0 100644
--- a/src/VCR/Util/CurlException.php
+++ b/src/VCR/Util/CurlException.php
@@ -4,8 +4,6 @@
 
 namespace VCR\Util;
 
-use CurlHandle;
-
 class CurlException extends \Exception
 {
     /**
@@ -13,7 +11,7 @@ class CurlException extends \Exception
      */
     private array $info;
 
-    public static function create(CurlHandle $ch): self
+    public static function create(\CurlHandle $ch): self
     {
         $e = new self(curl_error($ch), curl_errno($ch));
         $e->info = curl_getinfo($ch);
diff --git a/src/VCR/Util/CurlHelper.php b/src/VCR/Util/CurlHelper.php
index fa7a4839e..e43728ada 100644
--- a/src/VCR/Util/CurlHelper.php
+++ b/src/VCR/Util/CurlHelper.php
@@ -4,7 +4,6 @@
 
 namespace VCR\Util;
 
-use CurlHandle;
 use VCR\Request;
 use VCR\Response;
 
@@ -14,7 +13,7 @@ class CurlHelper
      * @var array<int, string> list of cURL info constants
      */
     private static $curlInfoList = [
-        //"certinfo"?
+        // "certinfo"?
         \CURLINFO_HTTP_CODE => 'http_code',
         \CURLINFO_EFFECTIVE_URL => 'url',
         \CURLINFO_TOTAL_TIME => 'total_time',
@@ -40,9 +39,9 @@ class CurlHelper
     ];
 
     /**
-     * How many items we expect in the curlinfo array - should correspond to the above list count
+     * How many items we expect in the curlinfo array - should correspond to the above list count.
      */
-    const CURLINFO_ITEMS_COUNT = 22;
+    public const CURLINFO_ITEMS_COUNT = 22;
 
     /**
      * Outputs a response depending on the set cURL option.
@@ -54,7 +53,7 @@ class CurlHelper
      *
      * @param array<int, mixed> $curlOptions cURL options which are not stored within the Response
      */
-    public static function handleOutput(Response $response, array $curlOptions, CurlHandle $ch): ?string
+    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])) {
@@ -92,9 +91,9 @@ public static function handleOutput(Response $response, array $curlOptions, Curl
      * @param string|null $url      the URL this response is for
      * @param int         $option   cURL option to get
      *
-     * @throws \BadMethodCallException
-     *
      * @return mixed value of the cURL option
+     *
+     * @throws \BadMethodCallException
      */
     public static function getCurlOptionFromResponse(Response $response, ?string $url, int $option = 0)
     {
@@ -118,7 +117,7 @@ public static function getCurlOptionFromResponse(Response $response, ?string $ur
             case \CURLINFO_APPCONNECT_TIME:
                 $info = '';
                 break;
-          case \CURLINFO_EFFECTIVE_URL:
+            case \CURLINFO_EFFECTIVE_URL:
                 $info = $url;
                 break;
             default:
@@ -197,7 +196,7 @@ public static function setCurlOptionOnRequest(Request $request, int $option, $va
      * Makes sure we've properly handled the POST body, such as ensuring that
      * CURLOPT_INFILESIZE is set if CURLOPT_READFUNCTION is set.
      */
-    public static function validateCurlPOSTBody(Request $request, CurlHandle $curlHandle = null): void
+    public static function validateCurlPOSTBody(Request $request, ?\CurlHandle $curlHandle = null): void
     {
         $readFunction = $request->getCurlOption(\CURLOPT_READFUNCTION);
         if (null === $readFunction) {
@@ -225,7 +224,7 @@ public static function validateCurlPOSTBody(Request $request, CurlHandle $curlHa
      *
      * @return mixed value returned by the callback function
      */
-    private static function callFunction($callback, CurlHandle $curlHandle, $argument)
+    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
diff --git a/src/VCR/Util/HttpUtil.php b/src/VCR/Util/HttpUtil.php
index 7d1a7b880..99c91f2a6 100644
--- a/src/VCR/Util/HttpUtil.php
+++ b/src/VCR/Util/HttpUtil.php
@@ -53,7 +53,7 @@ public static function parseStatus(string $status): array
         $part = explode(' ', $status, 3);
 
         return [
-            'http_version' => substr(strrchr($part[0], '/'), 1),
+            'http_version' => substr(strrchr($part[0], '/') ?? '', 1),
             'code' => $part[1],
             'message' => $part[2] ?? '',
         ];
@@ -132,8 +132,8 @@ public static function formatHeadersForCurl(array $headers): array
     public static function formatAsStatusString(Response $response): string
     {
         return 'HTTP/'.$response->getHttpVersion()
-             .' '.$response->getStatusCode()
-             .' '.$response->getStatusMessage();
+            .' '.$response->getStatusCode()
+            .' '.$response->getStatusMessage();
     }
 
     /**
diff --git a/src/VCR/Util/SoapClient.php b/src/VCR/Util/SoapClient.php
index 0780795a4..e892eb33e 100644
--- a/src/VCR/Util/SoapClient.php
+++ b/src/VCR/Util/SoapClient.php
@@ -24,10 +24,9 @@ class SoapClient extends \SoapClient
     protected string $request;
 
     /**
-     * @param mixed               $wsdl
      * @param array<string,mixed> $options
      */
-    public function __construct($wsdl, array $options = [])
+    public function __construct(?string $wsdl, array $options = [])
     {
         $this->options = $options;
         parent::__construct($wsdl, $options);
@@ -53,17 +52,11 @@ public function __doRequest(string $request, string $location, string $action, i
         return $one_way ? null : $this->response;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function __getLastRequest(): ?string
     {
         return $this->request ?? null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function __getLastResponse(): ?string
     {
         return $this->response ?? null;
diff --git a/src/VCR/Util/StreamHelper.php b/src/VCR/Util/StreamHelper.php
index a10c4b351..43f626272 100644
--- a/src/VCR/Util/StreamHelper.php
+++ b/src/VCR/Util/StreamHelper.php
@@ -19,7 +19,7 @@ class StreamHelper
      *
      * @param resource $context stream context resource
      */
-    public static function createRequestFromStreamContext($context, string $path, Request $existing = null): Request
+    public static function createRequestFromStreamContext($context, string $path, ?Request $existing = null): Request
     {
         $http = self::getHttpOptionsFromContext($context);
         $request = $existing;
diff --git a/src/VCR/Util/StreamProcessor.php b/src/VCR/Util/StreamProcessor.php
index 4535648c6..0f0c33670 100644
--- a/src/VCR/Util/StreamProcessor.php
+++ b/src/VCR/Util/StreamProcessor.php
@@ -45,13 +45,13 @@ class StreamProcessor
     /**
      * @see 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
+     * @var resource|null the current context, or NULL if no context was passed to the caller function
      */
     public $context;
 
     protected bool $isIntercepting = false;
 
-    public function __construct(Configuration $configuration = null)
+    public function __construct(?Configuration $configuration = null)
     {
         if ($configuration) {
             static::$configuration = $configuration;
@@ -493,14 +493,14 @@ public function stream_lock(int $operation): bool
      *
      * @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 bool Returns TRUE on success or FALSE on failure. If option is not implemented,
      *              FALSE should be returned.
      */
-    public function stream_set_option(int $option, int $arg1, int $arg2): bool
+    public function stream_set_option(int $option, int $arg1, ?int $arg2 = null): bool
     {
         if (false === $this->resource) {
             return false;
@@ -517,9 +517,9 @@ public function stream_set_option(int $option, int $arg1, int $arg2): bool
             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);*/
+                // 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;
@@ -528,13 +528,13 @@ public function stream_set_option(int $option, int $arg1, int $arg2): bool
     /**
      * Write to stream.
      *
-     * @throws \BadMethodCallException if called, because this method is not applicable for this stream
-     *
      * @see http://www.php.net/manual/en/streamwrapper.stream-write.php
      *
      * @param string $data should be stored into the underlying stream
      *
      * @return int|false
+     *
+     * @throws \BadMethodCallException if called, because this method is not applicable for this stream
      */
     public function stream_write(string $data)
     {
diff --git a/src/VCR/VCR.php b/src/VCR/VCR.php
index 843a821fe..573ef207a 100644
--- a/src/VCR/VCR.php
+++ b/src/VCR/VCR.php
@@ -10,10 +10,11 @@
  * 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
@@ -35,10 +36,8 @@ class VCR
 
     /**
      * @param mixed[] $parameters
-     *
-     * @return mixed
      */
-    public static function __callStatic(string $method, array $parameters)
+    public static function __callStatic(string $method, array $parameters): mixed
     {
         $callable = [VCRFactory::get(Videorecorder::class), $method];
 
diff --git a/src/VCR/VCRFactory.php b/src/VCR/VCRFactory.php
index fe36461b4..012008e0d 100644
--- a/src/VCR/VCRFactory.php
+++ b/src/VCR/VCRFactory.php
@@ -4,6 +4,7 @@
 
 namespace VCR;
 
+use Assert\Assertion;
 use VCR\LibraryHooks\CurlHook;
 use VCR\LibraryHooks\SoapHook;
 use VCR\Storage\Storage;
@@ -16,14 +17,11 @@ class VCRFactory
     /**
      * @var array<string, object>
      */
-    protected $mapping = [];
+    protected array $mapping = [];
 
-    /**
-     * @var self|null
-     */
-    protected static $instance;
+    protected static ?self $instance = null;
 
-    protected function __construct(Configuration $config = null)
+    protected function __construct(?Configuration $config = null)
     {
         $this->config = $config ?: $this->getOrCreate('VCR\Configuration');
     }
@@ -46,14 +44,22 @@ protected function createVCRUtilStreamProcessor(): StreamProcessor
     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)
+        );
 
-        return new $class($dsn, $cassetteName);
+        /** @var Storage $storage */
+        $storage = new $className($dsn, $cassetteName);
+
+        return $storage;
     }
 
     protected function createVCRLibraryHooksSoapHook(): SoapHook
     {
-        return new LibraryHooks\SoapHook(
+        return new SoapHook(
             $this->getOrCreate('VCR\CodeTransform\SoapCodeTransform'),
             $this->getOrCreate('VCR\Util\StreamProcessor')
         );
@@ -61,13 +67,13 @@ protected function createVCRLibraryHooksSoapHook(): SoapHook
 
     protected function createVCRLibraryHooksCurlHook(): CurlHook
     {
-        return new LibraryHooks\CurlHook(
+        return new CurlHook(
             $this->getOrCreate('VCR\CodeTransform\CurlCodeTransform'),
             $this->getOrCreate('VCR\Util\StreamProcessor')
         );
     }
 
-    public static function getInstance(Configuration $config = null): self
+    public static function getInstance(?Configuration $config = null): self
     {
         if (!self::$instance) {
             self::$instance = new self($config);
@@ -84,7 +90,7 @@ public static function getInstance(Configuration $config = null): self
      *
      * @return mixed an instance for specified class name and parameters
      */
-    public static function get(string $className, array $params = [])
+    public static function get(string $className, array $params = []): mixed
     {
         return self::getInstance()->getOrCreate($className, $params);
     }
@@ -94,10 +100,8 @@ public static function get(string $className, array $params = [])
      *
      * @param string  $className class name to get a instance for
      * @param mixed[] $params    constructor arguments for this class
-     *
-     * @return mixed
      */
-    public function getOrCreate(string $className, array $params = [])
+    public function getOrCreate(string $className, array $params = []): mixed
     {
         $key = $className.implode('-', $params);
 
diff --git a/src/VCR/Videorecorder.php b/src/VCR/Videorecorder.php
index 265fb417e..4b672c429 100644
--- a/src/VCR/Videorecorder.php
+++ b/src/VCR/Videorecorder.php
@@ -5,7 +5,7 @@
 namespace VCR;
 
 use Symfony\Component\EventDispatcher\EventDispatcher;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use VCR\Event\AfterHttpRequestEvent;
 use VCR\Event\AfterPlaybackEvent;
 use VCR\Event\BeforeHttpRequestEvent;
@@ -37,6 +37,11 @@ class Videorecorder
 
     protected EventDispatcherInterface $eventDispatcher;
 
+    /**
+     * @var array<string, int>
+     */
+    protected array $indexTable = [];
+
     public function __construct(
         protected Configuration $config,
         protected HttpClient $client,
@@ -58,7 +63,7 @@ public function getEventDispatcher(): EventDispatcherInterface
         return $this->eventDispatcher;
     }
 
-    private function dispatch(Event $event, string $eventName = null): Event
+    private function dispatch(Event $event, ?string $eventName = null): Event
     {
         $res = $this->getEventDispatcher()->dispatch($event, $eventName);
 
@@ -98,7 +103,9 @@ public function turnOff(): void
     public function eject(): void
     {
         Assertion::true($this->isOn, 'Please turn on VCR before ejecting a cassette, use: VCR::turnOn().');
+
         $this->cassette = null;
+        $this->resetIndex();
     }
 
     /**
@@ -116,6 +123,7 @@ public function insertCassette(string $cassetteName): void
 
         $this->cassette = new Cassette($cassetteName, $this->config, $storage);
         $this->enableLibraryHooks();
+        $this->resetIndex();
     }
 
     /**
@@ -131,26 +139,30 @@ public function configure(): Configuration
      *
      * 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
-
      *
      * @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): Response
     {
         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');");
+            throw new \BadMethodCallException('Invalid http request. No cassette inserted. Please make sure to insert a cassette in your unit test using '."VCR::insertCassette('name');");
         }
 
         $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)) {
-            $this->dispatch(new AfterPlaybackEvent($request, $response, $this->cassette), VCREvents::VCR_AFTER_PLAYBACK);
+            $this->dispatch(
+                new AfterPlaybackEvent($request, $response, $this->cassette),
+                VCREvents::VCR_AFTER_PLAYBACK
+            );
 
             return $response;
         }
@@ -159,7 +171,7 @@ public function handleRequest(Request $request): Response
             || VCR::MODE_ONCE === $this->config->getMode()
             && 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();
@@ -170,7 +182,7 @@ public function handleRequest(Request $request): Response
             $this->dispatch(new AfterHttpRequestEvent($request, $response), VCREvents::VCR_AFTER_HTTP_REQUEST);
 
             $this->dispatch(new BeforeRecordEvent($request, $response, $this->cassette), VCREvents::VCR_BEFORE_RECORD);
-            $this->cassette->record($request, $response);
+            $this->cassette->record($request, $response, $index);
         } finally {
             $this->enableLibraryHooks();
         }
@@ -214,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/Soap/ExampleSoapClientTest.php b/tests/Integration/Soap/ExampleSoapClientTest.php
index 67b985283..6185574cb 100644
--- a/tests/Integration/Soap/ExampleSoapClientTest.php
+++ b/tests/Integration/Soap/ExampleSoapClientTest.php
@@ -27,6 +27,8 @@ protected function setUp(): void
 
     public function testCallDirectly(): void
     {
+        $this->markTestSkipped('There is a problem with soap tests: SoapClient::__doRequest(): SSL: Connection reset by peer');
+
         $actual = $this->callSoap();
         $this->assertIsString($actual);
         $this->assertEquals('twelve', $actual);
@@ -34,6 +36,8 @@ public function testCallDirectly(): void
 
     public function testCallIntercepted(): void
     {
+        $this->markTestSkipped('There is a problem with soap tests: SoapClient::__doRequest(): SSL: Connection reset by peer');
+
         $actual = $this->callSoapIntercepted();
         $this->assertIsString($actual);
         $this->assertEquals('twelve', $actual);
@@ -41,6 +45,8 @@ public function testCallIntercepted(): void
 
     public function testCallDirectlyEqualsIntercepted(): void
     {
+        $this->markTestSkipped('There is a problem with soap tests: SoapClient::__doRequest(): SSL: Connection reset by peer');
+
         $this->assertEquals($this->callSoap(), $this->callSoapIntercepted());
     }
 
diff --git a/tests/Unit/CassetteTest.php b/tests/Unit/CassetteTest.php
index fbbeb5b49..761fc2140 100644
--- a/tests/Unit/CassetteTest.php
+++ b/tests/Unit/CassetteTest.php
@@ -62,4 +62,84 @@ public function testHasResponseFound(): void
 
         $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/CurlCodeTransformTest.php b/tests/Unit/CodeTransform/CurlCodeTransformTest.php
index 90671aa08..4dc9181d6 100644
--- a/tests/Unit/CodeTransform/CurlCodeTransformTest.php
+++ b/tests/Unit/CodeTransform/CurlCodeTransformTest.php
@@ -14,7 +14,7 @@ final class CurlCodeTransformTest extends TestCase
      */
     public function testTransformCode(string $expected, string $code): void
     {
-        $codeTransform = new class() extends CurlCodeTransform {
+        $codeTransform = new class extends CurlCodeTransform {
             // A proxy to access the protected transformCode method.
             public function publicTransformCode(string $code): string
             {
diff --git a/tests/Unit/CodeTransform/SoapCodeTransformTest.php b/tests/Unit/CodeTransform/SoapCodeTransformTest.php
index 354e8f5d5..dd8ddcf72 100644
--- a/tests/Unit/CodeTransform/SoapCodeTransformTest.php
+++ b/tests/Unit/CodeTransform/SoapCodeTransformTest.php
@@ -14,7 +14,7 @@ final class SoapCodeTransformTest extends TestCase
      */
     public function testTransformCode(string $expected, string $code): void
     {
-        $codeTransform = new class() extends SoapCodeTransform {
+        $codeTransform = new class extends SoapCodeTransform {
             // A proxy to access the protected transformCode method.
             public function publicTransformCode(string $code): string
             {
@@ -29,14 +29,14 @@ public function publicTransformCode(string $code): 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('],
+            ['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
index 8f0405631..b875844a3 100644
--- a/tests/Unit/ConfigurationTest.php
+++ b/tests/Unit/ConfigurationTest.php
@@ -90,7 +90,7 @@ public function testEnableRequestMatchersFailsWithNoExistingName(): void
 
     public function testAddRequestMatcherFailsWithNoName(): void
     {
-        $this->expectException(\VCR\VCRException::class);
+        $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);
@@ -123,7 +123,7 @@ public function availableStorageProvider(): array
 
     public function testSetStorageInvalidName(): void
     {
-        $this->expectException(\VCR\VCRException::class);
+        $this->expectException(VCRException::class);
         $this->expectExceptionMessage("Storage 'Does not exist' not available.");
         $this->config->setStorage('Does not exist');
     }
@@ -156,7 +156,7 @@ public function testBlacklist(): void
 
     public function testSetModeInvalidName(): void
     {
-        $this->expectException(\VCR\VCRException::class);
+        $this->expectException(VCRException::class);
         $this->expectExceptionMessage("Mode 'invalid' does not exist.");
         $this->config->setMode('invalid');
     }
diff --git a/tests/Unit/LibraryHooks/CurlHookTest.php b/tests/Unit/LibraryHooks/CurlHookTest.php
index c7a669628..c9ddeb775 100644
--- a/tests/Unit/LibraryHooks/CurlHookTest.php
+++ b/tests/Unit/LibraryHooks/CurlHookTest.php
@@ -5,7 +5,6 @@
 namespace VCR\Tests\Unit\LibraryHooks;
 
 use Assert\Assertion;
-use Closure;
 use PHPUnit\Framework\TestCase;
 use VCR\CodeTransform\CurlCodeTransform;
 use VCR\Configuration;
@@ -230,7 +229,7 @@ public function testShouldReturnCurlInfoAll(): void
         $expectedCount = CurlHelper::CURLINFO_ITEMS_COUNT;
 
         $this->assertIsArray($info, 'curl_getinfo() should return an array.');
-        $this->assertCount($expectedCount, $info, 'curl_getinfo() should return '. $expectedCount .' values.');
+        $this->assertCount($expectedCount, $info, 'curl_getinfo() should return '.$expectedCount.' values.');
         $this->curlHook->disable();
     }
 
@@ -469,10 +468,10 @@ function (Request $request) use ($testClass) {
         $this->curlHook->disable();
     }
 
-    protected function getTestCallback(string $statusCode = '200'): Closure
+    protected function getTestCallback(string $statusCode = '200'): \Closure
     {
         $testClass = $this;
 
-        return Closure::fromCallable(fn () => new Response($statusCode, [], $testClass->expected));
+        return \Closure::fromCallable(fn () => new Response($statusCode, [], $testClass->expected));
     }
 }
diff --git a/tests/Unit/LibraryHooks/SoapHookTest.php b/tests/Unit/LibraryHooks/SoapHookTest.php
index 63f261c3d..ce91e09cd 100644
--- a/tests/Unit/LibraryHooks/SoapHookTest.php
+++ b/tests/Unit/LibraryHooks/SoapHookTest.php
@@ -4,7 +4,6 @@
 
 namespace VCR\Tests\Unit\LibraryHooks;
 
-use Closure;
 use PHPUnit\Framework\TestCase;
 use VCR\CodeTransform\SoapCodeTransform;
 use VCR\Configuration;
@@ -47,7 +46,7 @@ public function testShouldInterceptCallWhenEnabled(): void
     public function testShouldHandleSOAPVersion11(): void
     {
         $expectedHeaders = [
-            'Content-Type' => 'text/xml; charset=utf-8;',
+            'Content-Type' => 'text/xml; charset=utf-8',
             'SOAPAction' => 'http://ws.cdyne.com/WeatherWS/GetCityWeatherByZIP',
         ];
         $this->soapHook->enable($this->getHeadersCheckCallback($expectedHeaders));
@@ -95,19 +94,19 @@ public function testShouldReturnLastRequestWithTraceOn(): void
         $this->assertNotNull($actual, '__getLastRequest() returned NULL.');
     }
 
-    protected function getContentCheckCallback(): Closure
+    protected function getContentCheckCallback(): \Closure
     {
         $testClass = $this;
 
-        return Closure::fromCallable(fn () => new Response('200', [], $testClass->expected));
+        return \Closure::fromCallable(fn () => new Response('200', [], $testClass->expected));
     }
 
     /** @param array<mixed> $expectedHeaders */
-    protected function getHeadersCheckCallback(array $expectedHeaders): Closure
+    protected function getHeadersCheckCallback(array $expectedHeaders): \Closure
     {
         $test = $this;
 
-        return Closure::fromCallable(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));
             }
diff --git a/tests/Unit/RequestTest.php b/tests/Unit/RequestTest.php
index 8c77dc158..6e610fa62 100644
--- a/tests/Unit/RequestTest.php
+++ b/tests/Unit/RequestTest.php
@@ -4,7 +4,6 @@
 
 namespace VCR\Tests\Unit;
 
-use const CURLOPT_CUSTOMREQUEST;
 use PHPUnit\Framework\TestCase;
 use VCR\Request;
 
@@ -61,7 +60,6 @@ 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");
-        /* @phpstan-ignore-next-line */
         $this->request->matches($request, [['some', 'method']]);
     }
 
@@ -75,7 +73,7 @@ public function testRestoreRequest(): void
                 'headers' => [
                     'User-Agent' => 'Unit-Test',
                     'Host' => 'example.com',
-                 ],
+                ],
             ],
             $restoredRequest->toArray()
         );
@@ -91,7 +89,7 @@ public function testStorePostFields(): void
                 'headers' => [
                     'User-Agent' => 'Unit-Test',
                     'Host' => 'example.com',
-                    ],
+                ],
                 'post_fields' => ['para1' => 'val1'],
             ],
             $this->request->toArray()
@@ -109,7 +107,7 @@ public function testRestorePostFields(): void
                 'headers' => [
                     'User-Agent' => 'Unit-Test',
                     'Host' => 'example.com',
-                    ],
+                ],
                 'post_fields' => ['para1' => 'val1'],
             ],
             $restoredRequest->toArray()
@@ -179,7 +177,7 @@ public function testRestorePostFiles(): void
                 'headers' => [
                     'User-Agent' => 'Unit-Test',
                     'Host' => 'example.com',
-                    ],
+                ],
                 'post_files' => [$file],
             ],
             $restoredRequest->toArray()
@@ -263,8 +261,8 @@ public function testCurlCustomRequestOverridesMethod(): void
         $this->assertEquals('POST', $postRequest->getMethod());
         $this->assertEquals('GET', $getRequest->getMethod());
 
-        $postRequest->setCurlOption(CURLOPT_CUSTOMREQUEST, 'PUT');
-        $getRequest->setCurlOption(CURLOPT_CUSTOMREQUEST, 'POST');
+        $postRequest->setCurlOption(\CURLOPT_CUSTOMREQUEST, 'PUT');
+        $getRequest->setCurlOption(\CURLOPT_CUSTOMREQUEST, 'POST');
 
         $this->assertEquals('PUT', $postRequest->getMethod());
         $this->assertEquals('POST', $getRequest->getMethod());
@@ -274,8 +272,8 @@ public function testSetCurlOptions(): void
     {
         $getRequest = new Request('GET', 'http://example.com');
         $getRequest->setCurlOptions([
-            CURLOPT_CUSTOMREQUEST => 'PUT',
+            \CURLOPT_CUSTOMREQUEST => 'PUT',
         ]);
-        $this->assertEquals('PUT', $getRequest->getCurlOption(CURLOPT_CUSTOMREQUEST));
+        $this->assertEquals('PUT', $getRequest->getCurlOption(\CURLOPT_CUSTOMREQUEST));
     }
 }
diff --git a/tests/Unit/Storage/BlackholeTest.php b/tests/Unit/Storage/BlackholeTest.php
index c6044ec7a..9383d72eb 100644
--- a/tests/Unit/Storage/BlackholeTest.php
+++ b/tests/Unit/Storage/BlackholeTest.php
@@ -31,9 +31,12 @@ public function testStoreRecordingIsCallable(): void
         ]);
     }
 
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testNextIsCallable(): void
     {
-        $this->assertNull($this->storage->next());
+        $this->storage->next();
     }
 
     /**
diff --git a/tests/Unit/Util/CurlHelperTest.php b/tests/Unit/Util/CurlHelperTest.php
index 13ee00db2..bada66fb3 100644
--- a/tests/Unit/Util/CurlHelperTest.php
+++ b/tests/Unit/Util/CurlHelperTest.php
@@ -4,7 +4,6 @@
 
 namespace VCR\Tests\Unit\Util;
 
-use CurlHandle;
 use org\bovigo\vfs\vfsStream;
 use PHPUnit\Framework\TestCase;
 use VCR\Exceptions\InvalidHostException;
@@ -571,7 +570,7 @@ private function privateCurlHeaderFunction($ch, string $header): void
     /**
      * Function used for testing CURLOPT_WRITEFUNCTION.
      */
-    private function privateCurlWriteFunction(CurlHandle $ch, string $body): int
+    private function privateCurlWriteFunction(\CurlHandle $ch, string $body): int
     {
         $this->assertEquals('example response', $body);
 
diff --git a/tests/Unit/Util/StreamProcessorTest.php b/tests/Unit/Util/StreamProcessorTest.php
index e2edf3eee..a68595eef 100644
--- a/tests/Unit/Util/StreamProcessorTest.php
+++ b/tests/Unit/Util/StreamProcessorTest.php
@@ -27,6 +27,24 @@ public function testFlockWithFilePutContents(): void
         $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
      */
@@ -34,7 +52,7 @@ public function testStreamOpenShouldAppendFilters(bool $expected, int $option, ?
     {
         $mock = $this->getMockBuilder('VCR\Util\StreamProcessor')
             ->disableOriginalConstructor()
-            ->setMethods(['intercept', 'restore', 'appendFiltersToStream', 'shouldProcess'])
+            ->onlyMethods(['intercept', 'restore', 'appendFiltersToStream', 'shouldProcess'])
             ->getMock();
 
         if (null !== $shouldProcess) {
@@ -109,8 +127,22 @@ public function testUrlStatSuccessfully(): void
     public function testUrlStatFileNotFound(): void
     {
         $processor = new StreamProcessor();
-        $this->expectWarning();
-        $processor->url_stat('file_not_found', 0);
+
+        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();
+        }
     }
 
     /**
@@ -195,7 +227,7 @@ protected function getStreamProcessorMock()
     {
         return $this->getMockBuilder(StreamProcessor::class)
             ->disableOriginalConstructor()
-            ->setMethods(['intercept', 'restore'])
+            ->onlyMethods(['intercept', 'restore'])
             ->getMock();
     }
 }
diff --git a/tests/Unit/VCRFactoryTest.php b/tests/Unit/VCRFactoryTest.php
index a75bad419..ce8a8cdf1 100644
--- a/tests/Unit/VCRFactoryTest.php
+++ b/tests/Unit/VCRFactoryTest.php
@@ -12,6 +12,7 @@ final class VCRFactoryTest extends TestCase
 {
     /**
      * @dataProvider instanceProvider
+     *
      * @covers \VCR\VCRFactory::createVCRVideorecorder()
      *
      * @param class-string $instance
diff --git a/tests/Unit/VideorecorderTest.php b/tests/Unit/VideorecorderTest.php
index 487a85e0e..337283ddf 100644
--- a/tests/Unit/VideorecorderTest.php
+++ b/tests/Unit/VideorecorderTest.php
@@ -34,10 +34,11 @@ public function testInsertCassetteEjectExisting(): void
         $configuration->enableLibraryHooks([]);
         $videorecorder = $this->getMockBuilder('\VCR\Videorecorder')
             ->setConstructorArgs([$configuration, new HttpClient(), VCRFactory::getInstance()])
-            ->setMethods(['eject'])
+            ->setMethods(['eject', 'resetIndex'])
             ->getMock();
 
         $videorecorder->expects($this->exactly(2))->method('eject');
+        $videorecorder->expects($this->exactly(2))->method('resetIndex');
 
         $videorecorder->turnOn();
         $videorecorder->insertCassette('cassette1');
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 623e17619..89d939b42 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -4,5 +4,5 @@
 
 require_once __DIR__.'/../vendor/autoload.php';
 
-\VCR\VCR::turnOn();
-\VCR\VCR::turnOff();
+VCR\VCR::turnOn();
+VCR\VCR::turnOff();