diff --git a/shim.php b/shim.php index 7ba3df6e31..fe91a096ad 100644 --- a/shim.php +++ b/shim.php @@ -69,4 +69,9 @@ class WebDriverTimeouts extends Facebook\WebDriver\WebDriverTimeouts {}; class WebDriverWindow extends Facebook\WebDriver\WebDriverWindow {}; interface WebDriverElement extends Facebook\WebDriver\WebDriverElement {}; } + + //Alias for Symfony < 4.3 + if (!class_exists('Symfony\Component\BrowserKit\AbstractBrowser') && class_exists('Symfony\Component\BrowserKit\Client')) { + class_alias('Symfony\Component\BrowserKit\Client', 'Symfony\Component\BrowserKit\AbstractBrowser'); + } } diff --git a/src/Codeception/Lib/Connector/Guzzle.php b/src/Codeception/Lib/Connector/Guzzle.php index 6088c8911e..fddcf2c8df 100644 --- a/src/Codeception/Lib/Connector/Guzzle.php +++ b/src/Codeception/Lib/Connector/Guzzle.php @@ -14,7 +14,7 @@ use GuzzleHttp\Psr7\Request as Psr7Request; use GuzzleHttp\Psr7\Response as Psr7Response; use GuzzleHttp\Psr7\Uri as Psr7Uri; -use Symfony\Component\BrowserKit\Client; +use Symfony\Component\BrowserKit\AbstractBrowser as Client; use Symfony\Component\BrowserKit\Cookie; use Symfony\Component\BrowserKit\Request as BrowserKitRequest; use Symfony\Component\BrowserKit\Response as BrowserKitResponse; diff --git a/src/Codeception/Lib/Connector/Laravel5.php b/src/Codeception/Lib/Connector/Laravel5.php index e38e9d48c7..b299e468f1 100644 --- a/src/Codeception/Lib/Connector/Laravel5.php +++ b/src/Codeception/Lib/Connector/Laravel5.php @@ -10,7 +10,12 @@ use Illuminate\Http\UploadedFile; use Symfony\Component\HttpFoundation\Request as SymfonyRequest; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\HttpKernel\Client; +use Symfony\Component\HttpKernel\HttpKernelBrowser as Client; + +//Alias for Symfony < 4.3 +if (!class_exists('Symfony\Component\HttpKernel\HttpKernelBrowser') && class_exists('Symfony\Component\HttpKernel\Client')) { + class_alias('Symfony\Component\HttpKernel\Client', 'Symfony\Component\HttpKernel\HttpKernelBrowser'); +} class Laravel5 extends Client { diff --git a/src/Codeception/Lib/Connector/Lumen.php b/src/Codeception/Lib/Connector/Lumen.php index 1b690c930d..b12a7d33e7 100644 --- a/src/Codeception/Lib/Connector/Lumen.php +++ b/src/Codeception/Lib/Connector/Lumen.php @@ -8,9 +8,14 @@ use Illuminate\Support\Facades\Facade; use Symfony\Component\HttpFoundation\Request as SymfonyRequest; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\HttpKernel\Client; +use Symfony\Component\HttpKernel\HttpKernelBrowser as Client; use Illuminate\Http\UploadedFile; +//Alias for Symfony < 4.3 +if (!class_exists('Symfony\Component\HttpKernel\HttpKernelBrowser') && class_exists('Symfony\Component\HttpKernel\Client')) { + class_alias('Symfony\Component\HttpKernel\Client', 'Symfony\Component\HttpKernel\HttpKernelBrowser'); +} + class Lumen extends Client { use LaravelCommon; diff --git a/src/Codeception/Lib/Connector/Phalcon.php b/src/Codeception/Lib/Connector/Phalcon.php index 92cc877a05..64b4cd4534 100644 --- a/src/Codeception/Lib/Connector/Phalcon.php +++ b/src/Codeception/Lib/Connector/Phalcon.php @@ -9,7 +9,7 @@ use Codeception\Util\Stub; use Phalcon\Mvc\Application; use Symfony\Component\BrowserKit\Cookie; -use Symfony\Component\BrowserKit\Client; +use Symfony\Component\BrowserKit\AbstractBrowser as Client; use Phalcon\Mvc\Micro as MicroApplication; use Symfony\Component\BrowserKit\Response; use Codeception\Lib\Connector\Shared\PhpSuperGlobalsConverter; diff --git a/src/Codeception/Lib/Connector/Symfony.php b/src/Codeception/Lib/Connector/Symfony.php index 515d51dbf0..9cf5259440 100644 --- a/src/Codeception/Lib/Connector/Symfony.php +++ b/src/Codeception/Lib/Connector/Symfony.php @@ -1,7 +1,14 @@