From 9b606791efa186031068f51701ad92e839124d1b Mon Sep 17 00:00:00 2001 From: hossein Bagherzdegan Talkhouncheh Date: Tue, 25 Jul 2023 18:55:09 +0200 Subject: [PATCH] - fix composer issue --- .../FriendsOfBehatSymfonyExtensionExtension.php | 5 +++-- src/Mink/MinkParameters.php | 17 ++++++++--------- src/ServiceContainer/SymfonyExtension.php | 12 ++++-------- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/src/Bundle/DependencyInjection/FriendsOfBehatSymfonyExtensionExtension.php b/src/Bundle/DependencyInjection/FriendsOfBehatSymfonyExtensionExtension.php index 790ea1f..45a61f1 100644 --- a/src/Bundle/DependencyInjection/FriendsOfBehatSymfonyExtensionExtension.php +++ b/src/Bundle/DependencyInjection/FriendsOfBehatSymfonyExtensionExtension.php @@ -10,6 +10,7 @@ use FriendsOfBehat\SymfonyExtension\Mink\MinkParameters; use FriendsOfBehat\SymfonyExtension\ServiceContainer\SymfonyExtension; use Symfony\Bundle\FrameworkBundle\KernelBrowser; +use Symfony\Component\BrowserKit\Client; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -78,8 +79,8 @@ private function provideBrowserKitIntegration(ContainerBuilder $container): void return; } - if (class_exists(\Symfony\Component\BrowserKit\AbstractBrowser::class)) { - $container->setAlias(\Symfony\Component\BrowserKit\AbstractBrowser::class, 'test.client'); + if (class_exists(Client::class)) { + $container->setAlias(Client::class, 'test.client'); } $container->setAlias(KernelBrowser::class, 'test.client'); diff --git a/src/Mink/MinkParameters.php b/src/Mink/MinkParameters.php index 6e93f6d..28ae204 100644 --- a/src/Mink/MinkParameters.php +++ b/src/Mink/MinkParameters.php @@ -4,17 +4,13 @@ namespace FriendsOfBehat\SymfonyExtension\Mink; -use ArrayAccess; -use IteratorAggregate; use ReturnTypeWillChange; -/** - * @template-implements ArrayAccess - * @template-implements IteratorAggregate - */ -final class MinkParameters implements \Countable, IteratorAggregate, ArrayAccess +/** @final */ +class MinkParameters implements \Countable, \IteratorAggregate, \ArrayAccess { - private array $minkParameters; + /** @var array */ + private $minkParameters; public function __construct(array $minkParameters) { @@ -31,8 +27,11 @@ public function offsetExists($offset): bool return array_key_exists($offset, $this->minkParameters); } + /** + * @return mixed + */ #[ReturnTypeWillChange] - public function offsetGet($offset): mixed + public function offsetGet($offset) { return $this->minkParameters[$offset] ?? null; } diff --git a/src/ServiceContainer/SymfonyExtension.php b/src/ServiceContainer/SymfonyExtension.php index 3c270c9..5b8258e 100644 --- a/src/ServiceContainer/SymfonyExtension.php +++ b/src/ServiceContainer/SymfonyExtension.php @@ -37,7 +37,8 @@ final class SymfonyExtension implements Extension */ public const DRIVER_KERNEL_ID = 'fob_symfony.driver_kernel'; - private bool $minkExtensionFound = false; + /** @var bool */ + private $minkExtensionFound = false; public function getConfigKey(): string { @@ -48,18 +49,13 @@ public function initialize(ExtensionManager $extensionManager): void { $this->registerMinkDriver($extensionManager); } - /** - * @psalm-suppress UndefinedInterfaceMethod - */ + public function configure(ArrayNodeDefinition $builder): void { - $builder ->addDefaultsIfNotSet() ->children() - ->scalarNode('bootstrap') - ->defaultNull() - ->end() + ->scalarNode('bootstrap')->defaultNull()->end() ->arrayNode('kernel') ->addDefaultsIfNotSet() ->children()