diff --git a/.gitattributes b/.gitattributes
index 14c3c35..84c7add 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,4 @@
 /Tests export-ignore
 /phpunit.xml.dist export-ignore
-/.git* export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index 4689c4d..0000000
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Please do not submit any Pull Requests here. They will be closed.
----
-
-Please submit your PR here instead:
-https://github.com/symfony/symfony
-
-This repository is what we call a "subtree split": a read-only subset of that main repository.
-We're looking forward to your PR there!
diff --git a/.github/workflows/check-subtree-split.yml b/.github/workflows/check-subtree-split.yml
deleted file mode 100644
index 16be48b..0000000
--- a/.github/workflows/check-subtree-split.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: Check subtree split
-
-on:
-  pull_request_target:
-
-jobs:
-  close-pull-request:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Close pull request
-      uses: actions/github-script@v6
-      with:
-        script: |
-          if (context.repo.owner === "symfony") {
-            github.rest.issues.createComment({
-              owner: "symfony",
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-              body: `
-          Thanks for your Pull Request! We love contributions.
-
-          However, you should instead open your PR on the main repository:
-          https://github.com/symfony/symfony
-
-          This repository is what we call a "subtree split": a read-only subset of that main repository.
-          We're looking forward to your PR there!
-          `
-            });
-
-            github.rest.pulls.update({
-              owner: "symfony",
-              repo: context.repo.repo,
-              pull_number: context.issue.number,
-              state: "closed"
-            });
-          }
diff --git a/DeprecationErrorHandler.php b/DeprecationErrorHandler.php
index 79d8a88..7ec293a 100644
--- a/DeprecationErrorHandler.php
+++ b/DeprecationErrorHandler.php
@@ -376,6 +376,12 @@ private static function getPhpUnitErrorHandler(): callable
 
         if ('PHPUnit\Util\ErrorHandler::handleError' === $eh) {
             return $eh;
+        } elseif (ErrorHandler::class === $eh) {
+            return function (int $errorNumber, string $errorString, string $errorFile, int $errorLine) {
+                ErrorHandler::instance()($errorNumber, $errorString, $errorFile, $errorLine);
+
+                return true;
+            };
         }
 
         foreach (debug_backtrace(\DEBUG_BACKTRACE_PROVIDE_OBJECT | \DEBUG_BACKTRACE_IGNORE_ARGS) as $frame) {
diff --git a/composer.json b/composer.json
index 6c92a3c..9febfdb 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,8 @@
         "files": [ "bootstrap.php" ],
         "psr-4": { "Symfony\\Bridge\\PhpUnit\\": "" },
         "exclude-from-classmap": [
-            "/Tests/"
+            "/Tests/",
+            "/bin/"
         ]
     },
     "bin": [