From a2d72aec034484566da50152bd02fc669c947a3d Mon Sep 17 00:00:00 2001 From: Thomas Landauer Date: Tue, 7 Dec 2021 17:37:34 +0100 Subject: [PATCH 1/2] Bumping `lib-innerbrowser` dependency to "^1.4|^2.0" I'm just guessing this - so if it's wrong, just close it :-) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 82aeb1d5..303b343d 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "require": { "php": "^7.4 | ^8.0", "ext-json": "*", - "codeception/lib-innerbrowser": "^1.4", + "codeception/lib-innerbrowser": "^1.4|^2.0", "codeception/codeception": "^4.0" }, "require-dev": { From 06813df977ac548e5d5e46603195d34beaa6b4b9 Mon Sep 17 00:00:00 2001 From: TavoNiievez Date: Tue, 7 Dec 2021 21:39:58 -0500 Subject: [PATCH 2/2] Update dependencies --- composer.json | 10 +++++----- src/Codeception/Module/Symfony.php | 5 ++--- .../Module/Symfony/ParameterAssertionsTrait.php | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 303b343d..d1f94fa0 100644 --- a/composer.json +++ b/composer.json @@ -18,12 +18,12 @@ "require": { "php": "^7.4 | ^8.0", "ext-json": "*", - "codeception/lib-innerbrowser": "^1.4|^2.0", - "codeception/codeception": "^4.0" + "codeception/lib-innerbrowser": "^2.0", + "codeception/codeception": "^4.1" }, "require-dev": { - "codeception/module-asserts": "^1.3", - "codeception/module-doctrine2": "^1.1", + "codeception/module-asserts": "^2.0", + "codeception/module-doctrine2": "^2.0", "doctrine/orm": "^2.10", "symfony/form": "^4.4 | ^5.0", "symfony/framework-bundle": "^4.4 | ^5.0", @@ -32,7 +32,7 @@ "symfony/routing": "^4.4 | ^5.0", "symfony/security-bundle": "^4.4 | ^5.0", "symfony/twig-bundle": "^4.4 | ^5.0", - "vlucas/phpdotenv": "^4.2 | ^5.3" + "vlucas/phpdotenv": "^4.2 | ^5.4" }, "suggest": { "codeception/module-asserts": "Include traditional PHPUnit assertions in your tests", diff --git a/src/Codeception/Module/Symfony.php b/src/Codeception/Module/Symfony.php index 78ecd898..bea67e14 100644 --- a/src/Codeception/Module/Symfony.php +++ b/src/Codeception/Module/Symfony.php @@ -29,6 +29,7 @@ use ReflectionClass; use ReflectionException; use Symfony\Bundle\SecurityBundle\DataCollector\SecurityDataCollector; +use Symfony\Component\BrowserKit\AbstractBrowser; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\Finder\Finder; use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface; @@ -148,7 +149,7 @@ class Symfony extends Framework implements DoctrineProvider, PartedModule /** * @var SymfonyConnector */ - public $client; + public ?AbstractBrowser $client = null; /** * @var array @@ -444,8 +445,6 @@ protected function debugResponse($url): void /** * Returns a list of recognized domain names. - * - * @return mixed[] */ protected function getInternalDomains(): array { diff --git a/src/Codeception/Module/Symfony/ParameterAssertionsTrait.php b/src/Codeception/Module/Symfony/ParameterAssertionsTrait.php index 35534804..cb5bcad2 100644 --- a/src/Codeception/Module/Symfony/ParameterAssertionsTrait.php +++ b/src/Codeception/Module/Symfony/ParameterAssertionsTrait.php @@ -17,7 +17,7 @@ trait ParameterAssertionsTrait * ``` * * @param string $name - * @return mixed|null + * @return array|bool|float|int|string|null */ public function grabParameter(string $name) { @@ -29,4 +29,4 @@ protected function grabParameterBagService(): ParameterBagInterface { return $this->grabService('parameter_bag'); } -} \ No newline at end of file +}