Skip to content

Fix resolveParameters for non css selectors #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GrandLTU wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix resolveParameters for non css selectors #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fbcda2
Fix Element::resolveParameters for non css selectors
GrandLTU Jun 16, 2020
4cb3e7f
Fix Page::resolveParameters for non css selectors
GrandLTU Jun 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/Element/Element.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}
}
9 changes: 5 additions & 4 deletions src/Page/Page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}
}