fixed url parsing. related: #112

Author: oscarotero

src/Providers/Api/Wikipedia.php

@@ -68,7 +68,7 @@ public function getDescription()
         if ($pages) {
             $page = current($pages);
 
-            return strip_tags($page['extract']);
+            return isset($page['extract']) ? strip_tags($page['extract']) : null;
         }
     }
 
@@ -86,14 +86,16 @@ public function getImagesUrls()
 
             $imgs = [];
 
-            foreach ($page['images'] as $image) {
-                switch (strrchr($image['title'], '.')) {
-                    case '.png':
-                    case '.jpg':
-                    case '.gif':
-                    case '.jpeg':
-                        $imgs[] = $image['title'];
-                        break;
+            if (isset($page['images'])) {
+                foreach ($page['images'] as $image) {
+                    switch (strrchr($image['title'], '.')) {
+                        case '.png':
+                        case '.jpg':
+                        case '.gif':
+                        case '.jpeg':
+                            $imgs[] = $image['title'];
+                            break;
+                    }
                 }
             }
 

src/Url.php

@@ -536,5 +536,14 @@ private function setPath($path)
         $this->info['file'] = isset($parts['filename']) ? $parts['filename'] : null;
         $this->info['extension'] = isset($parts['extension']) ? $parts['extension'] : null;
         $this->info['content'] = null;
+
+        // bugfix /wiki/Supernatural_(U.S._TV_series) is parsed as:
+        // path: /wiki/
+        // file: Supernatural_(U.S
+        // extension: _TV_series)
+        if (!empty($this->info['extension']) && !preg_match('/^\w+$/', $this->info['extension'])) {
+            $this->info['file'] .= '.'.$this->info['extension'];
+            $this->info['extension'] = null;
+        }
     }
 }

tests/UrlTest.php

@@ -53,4 +53,12 @@ public function testDomain()
         $this->assertSame('domain', $url->getDomain());
         $this->assertSame('domain.com.au', $url->getDomain(1));
     }
+
+    public function testPathsWithDots()
+    {
+        $url = new Embed\Url('https://en.wikipedia.org/wiki/Supernatural_(U.S._TV_series)');
+        $this->assertNull($url->getExtension());
+        $this->assertSame('/wiki/Supernatural_(U.S._TV_series)', $url->getPath());
+        $this->assertSame('Supernatural_(U.S._TV_series)', $url->getDirectoryPosition(1));
+    }
 }