From 9fbcda26f2e18ccc3451257fd6009fd55833dbe7 Mon Sep 17 00:00:00 2001 From: Aivaras Gotovskis Date: Tue, 16 Jun 2020 13:53:30 +0300 Subject: [PATCH 1/2] Fix Element::resolveParameters for non css selectors --- src/Element/Element.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Element/Element.php b/src/Element/Element.php index 3afdf1e..15f26ef 100644 --- a/src/Element/Element.php +++ b/src/Element/Element.php @@ -120,18 +120,19 @@ private function getSelectorAsXpath($selector, SelectorsHandler $selectorsHandle return $selectorsHandler->selectorToXpath($selectorType, $locator); } - private function resolveParameters(string $name, array $parameters, array $definedElements): string + /** + * @return array|string + */ + private function resolveParameters(string $name, array $parameters, array $definedElements) { if (!is_array($definedElements[$name])) { return strtr($definedElements[$name], $parameters); } - array_map( + return array_map( function ($definedElement) use ($parameters): string { return strtr($definedElement, $parameters); }, $definedElements[$name] ); - - return $definedElements[$name]; } } From 4cb3e7f8b20aadc03460c592bb50f231ff8f2580 Mon Sep 17 00:00:00 2001 From: Aivaras Gotovskis Date: Tue, 16 Jun 2020 13:56:48 +0300 Subject: [PATCH 2/2] Fix Page::resolveParameters for non css selectors --- src/Page/Page.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Page/Page.php b/src/Page/Page.php index 5051241..1c1f750 100644 --- a/src/Page/Page.php +++ b/src/Page/Page.php @@ -192,18 +192,19 @@ private function getSelectorAsXpath($selector, SelectorsHandler $selectorsHandle return $selectorsHandler->selectorToXpath($selectorType, $locator); } - private function resolveParameters(string $name, array $parameters, array $definedElements): string + /** + * @return array|string + */ + private function resolveParameters(string $name, array $parameters, array $definedElements) { if (!is_array($definedElements[$name])) { return strtr($definedElements[$name], $parameters); } - array_map( + return array_map( function ($definedElement) use ($parameters) { return strtr($definedElement, $parameters); }, $definedElements[$name] ); - - return $definedElements[$name]; } }