Skip to content

Repeat process only if alternative URL is valid #228

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

Merged
merged 3 commits into from
Jun 27, 2017
Merged

Repeat process only if alternative URL is valid #228

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0d362a
Repeat process if no embed code was found, but only if alternative UR…
raymondelferink Jun 27, 2017
ace9847
using try/catch
raymondelferink Jun 27, 2017
1ef0735
and... taking out superfluous code:-)
raymondelferink Jun 27, 2017
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
11 changes: 9 additions & 2 deletions src/Embed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,14 @@ public static function create($url, array $config = null, DispatcherInterface $d
$to = preg_replace('|^(\w+://)|', '', rtrim($info->url, '/'));

if ($from !== $to && empty($info->code)) {
return self::process(Url::create($info->url), $config, $dispatcher);

//accept new result if valid
try {
return self::process(Url::create($info->url), $config, $dispatcher);
} catch (\Exception $e) {
return $info;
}

}

return $info;
Expand Down Expand Up @@ -114,7 +121,7 @@ private static function process(Url $url, array $config, DispatcherInterface $di
if (Adapters\Webpage::check($response)) {
return new Adapters\Webpage($response, $config, $dispatcher);
}

if ($response->getError() === null) {
$exception = new Exceptions\InvalidUrlException(sprintf("Invalid url '%s' (Status code %s)", (string) $url, $response->getStatusCode()));
} else {
Expand Down