fixed oembed detection, added a simple request caching system, fixed canonical urls that returns 404

Author: oscarotero

src/Adapters/Adapter.php

@@ -77,8 +77,14 @@ public function __construct(Request $request, array $config = null)
         $this->run();
 
         if ($request->url->getUrl() !== $this->url) {
-            $this->request = $request->createRequest($this->url);
-            $this->run();
+            $subRequest = $request->createRequest($this->url);
+
+            if ($subRequest->isValid()) {
+                $this->request = $subRequest;
+                $this->run();
+            } else {
+                $this->url = $request->url->getUrl();
+            }
         }
     }
 

src/Providers/OEmbed.php

@@ -24,11 +24,11 @@ public function run()
         $endPoint = null;
         $params = $this->config['parameters'];
 
-        if (($html = $this->request->getHtmlContent()) && ($endPoint = self::getEndPointFromDom($html))) {
-            $params['url'] = $this->request->url->getUrl();
-        } elseif (($info = self::getEndPointFromRequest($this->request, $this->config))) {
-            $endPoint = $info['endPoint'];
-            $params += $info['params'];
+        if (!($html = $this->request->getHtmlContent()) || !($endPoint = self::getEndPointFromDom($html))) {
+            if (($info = self::getEndPointFromRequest($this->request, $this->config))) {
+                $endPoint = $info['endPoint'];
+                $params += $info['params'];
+            }
         }
 
         if (!$endPoint) {
@@ -38,6 +38,10 @@ public function run()
         $endPointRequest = $this->request->createRequest($endPoint);
         $endPointRequest->startingUrl->setParameter($params);
 
+        if (!$endPointRequest->startingUrl->hasParameter('url')) {
+            $endPointRequest->startingUrl->setParameter('url', $this->request->url->getUrl());
+        }
+
         // extract from xml
         if (($endPointRequest->url->getExtension() === 'xml') || ($endPointRequest->url->getParameter('format') === 'xml')) {
             if ($parameters = $endPointRequest->getXmlContent()) {

src/Request.php

@@ -11,6 +11,7 @@ class Request
 {
     public $startingUrl;
 
+    private static $cache = [];
     private $resolverClass = 'Embed\\RequestResolvers\\Curl';
     private $resolverConfig;
 
@@ -48,7 +49,13 @@ public function __get($name)
                 return $this->url = new Url($this->resolver->getUrl());
 
             case 'resolver':
-                $this->resolver = new $this->resolverClass(UrlRedirect::resolve($this->startingUrl->getUrl()));
+                $url = UrlRedirect::resolve($this->startingUrl->getUrl());
+
+                if (isset(self::$cache[$url])) {
+                    $this->resolver = self::$cache[$url];
+                } else {
+                    $this->resolver = self::$cache[$url] = new $this->resolverClass($url);
+                }
 
                 if (is_array($this->resolverConfig)) {
                     $this->resolver->setConfig($this->resolverConfig);