From 9874619ea4e9f1d750c478d9b332abe8693ab20e Mon Sep 17 00:00:00 2001
From: Gintautas Miselis <gintautas@miselis.lt>
Date: Sat, 19 Nov 2022 22:24:26 +0200
Subject: [PATCH] Remove Laravel6\ExceptionHandlerDecorator

Because Laravel 6 is no longer supported
---
 src/Codeception/Lib/Connector/Laravel.php     | 10 +-
 .../Laravel6/ExceptionHandlerDecorator.php    | 94 -------------------
 2 files changed, 1 insertion(+), 103 deletions(-)
 delete mode 100644 src/Codeception/Lib/Connector/Laravel6/ExceptionHandlerDecorator.php

diff --git a/src/Codeception/Lib/Connector/Laravel.php b/src/Codeception/Lib/Connector/Laravel.php
index ff6499c..ab07df3 100644
--- a/src/Codeception/Lib/Connector/Laravel.php
+++ b/src/Codeception/Lib/Connector/Laravel.php
@@ -6,7 +6,6 @@
 
 use Closure;
 use Codeception\Lib\Connector\Laravel\ExceptionHandlerDecorator as LaravelExceptionHandlerDecorator;
-use Codeception\Lib\Connector\Laravel6\ExceptionHandlerDecorator as Laravel6ExceptionHandlerDecorator;
 use Codeception\Module\Laravel as LaravelModule;
 use Codeception\Stub;
 use Dotenv\Dotenv;
@@ -154,14 +153,7 @@ private function initialize(SymfonyRequest $request = null): void
 
         $this->getEvents()->listen('*', $listener);
 
-        // Replace the Laravel exception handler with our decorated exception handler,
-        // so exceptions can be intercepted for the disable_exception_handling functionality.
-        if (version_compare(Application::VERSION, '7.0.0', '<')) {
-            $decorator = new Laravel6ExceptionHandlerDecorator($this->getExceptionHandler());
-        } else {
-            $decorator = new LaravelExceptionHandlerDecorator($this->getExceptionHandler());
-        }
-
+        $decorator = new LaravelExceptionHandlerDecorator($this->getExceptionHandler());
         $decorator->exceptionHandlingDisabled($this->exceptionHandlingDisabled);
         $this->app->instance(ExceptionHandler::class, $decorator);
 
diff --git a/src/Codeception/Lib/Connector/Laravel6/ExceptionHandlerDecorator.php b/src/Codeception/Lib/Connector/Laravel6/ExceptionHandlerDecorator.php
deleted file mode 100644
index 2bca70c..0000000
--- a/src/Codeception/Lib/Connector/Laravel6/ExceptionHandlerDecorator.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Codeception\Lib\Connector\Laravel6;
-
-use Exception;
-use Illuminate\Contracts\Debug\ExceptionHandler as ExceptionHandlerContract;
-use Illuminate\Http\Request;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\HttpFoundation\Response;
-use function strpos;
-
-class ExceptionHandlerDecorator implements ExceptionHandlerContract
-{
-    private ExceptionHandlerContract $laravelExceptionHandler;
-
-    private bool $exceptionHandlingDisabled = true;
-
-    public function __construct(ExceptionHandlerContract $exceptionHandler)
-    {
-        $this->laravelExceptionHandler = $exceptionHandler;
-    }
-
-    public function exceptionHandlingDisabled(bool $exceptionHandlingDisabled): void
-    {
-        $this->exceptionHandlingDisabled = $exceptionHandlingDisabled;
-    }
-
-    /**
-     * Report or log an exception.
-     *
-     * @throws Exception
-     */
-    public function report(Exception $e): void
-    {
-        $this->laravelExceptionHandler->report($e);
-    }
-
-    /**
-     * Determine if the exception should be reported.
-     */
-    public function shouldReport(Exception $e): bool
-    {
-        return $this->exceptionHandlingDisabled;
-    }
-
-    /**
-     * Render an exception into an HTTP response.
-     *
-     * @param Request $request
-     * @throws Exception
-     */
-    public function render($request, Exception $e): Response
-    {
-        $response = $this->laravelExceptionHandler->render($request, $e);
-
-        if ($this->exceptionHandlingDisabled && $this->isSymfonyExceptionHandlerOutput($response->getContent())) {
-            // If content was generated by the \Symfony\Component\Debug\ExceptionHandler class
-            // the Laravel application could not handle the exception,
-            // so re-throw this exception if the Codeception user disabled Laravel exception handling.
-            throw $e;
-        }
-
-        return $response;
-    }
-
-    /**
-     * Check if the response content is HTML output of the Symfony exception handler class.
-     */
-    private function isSymfonyExceptionHandlerOutput(string $content): bool
-    {
-        return strpos($content, '<div id="sf-resetcontent" class="sf-reset">') !== false ||
-            strpos($content, '<div class="exception-summary">') !== false;
-    }
-
-    /**
-     * Render an exception to the console.
-     *
-     * @param OutputInterface $output
-     */
-    public function renderForConsole($output, Exception $e): void
-    {
-        $this->laravelExceptionHandler->renderForConsole($output, $e);
-    }
-
-    /**
-     * @param string|callable $method
-     */
-    public function __call($method, array $args)
-    {
-        return call_user_func_array([$this->laravelExceptionHandler, $method], $args);
-    }
-}

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/Codeception/module-laravel/pull/48.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/Codeception/module-laravel/pull/48.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/Codeception/module-laravel/pull/48.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/Codeception/module-laravel/pull/48.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>