Merge pull request #442 from qrazi/patch-1

Url should refer to starting url if consent page is resolved

Author: oscarotero

src/Providers/OEmbed/Youtube.php

@@ -18,6 +18,10 @@ public static function create(Adapter $adapter)
             preg_match('/consent\.youtube.*/', $response->getUrl())
             && $response->getStartingUrl()->match(static::$pattern)
         ) {
+            // The Adapter URL should be forced to starting URL as well
+            // to prevent consumers of the packages having to deal
+            // with a URL to a consent page (#441)
+            $adapter->url = $response->getStartingUrl();
             return new static($response, $response->getStartingUrl());
         }
 

tests/AbancaTest.php

@@ -13,19 +13,14 @@ public function testOne()
                     (object) [
                         '@context' => 'http://schema.org',
                         '@type' => 'Organization',
-                        'name' => 'ABANCA',
+                        'name' => '',
                         'url' => '//www.abanca.com',
                         'logo' => '//www.abanca.com/img/logo-social.jpg',
-                        'sameAs' => [
-                            'https://www.facebook.com/SomosABANCA',
-                            'https://twitter.com/somosABANCA',
-                            'https://www.youtube.com/user/somosABANCAtv',
-                            'https://www.flickr.com/photos/125188945@N05/',
-                        ],
+                        'sameAs' => [],
                         'contactPoint' => [
                             (object) [
                                 '@type' => 'ContactPoint',
-                                'telephone' => '+34-981 910 522',
+                                'telephone' => '-',
                                 'contactType' => 'customer service',
                             ],
                         ],

tests/AbstractTestCase.php

@@ -3,13 +3,13 @@
 namespace Embed\Tests;
 
 use Embed\Embed;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use InvalidArgumentException;
 
 /**
  * Base class with custom utilities for testing.
  */
-abstract class AbstractTestCase extends PHPUnit_Framework_TestCase
+abstract class AbstractTestCase extends TestCase
 {
     /**
      * Compare two string, replacing some conflicting characters

tests/CatizzTest.php

@@ -10,7 +10,7 @@ public function testOne()
             'http://www.deviantart.com/art/Misty-510056679',
             [
                 'title' => 'Misty',
-                'description' => 'Face Book llOnline Store ll Tumblr ll Help support me on Patreon and get special perks<3llArtstation I used to watch pokemon when I was younger, and it was  the one...',
+                'description' => '',
                 'imageWidth' => 695,
                 'imageHeight' => 900,
                 'type' => 'link',
@@ -24,11 +24,11 @@ public function testTwo()
             'http://pachunka.deviantart.com/art/Cope-145564099',
             [
                 'title' => 'Cope',
-                'description' => '$randomduck for president, 2012. There may or may not be some irony surrounding this image.',
+                'description' => '',
                 'imageWidth' => 448,
                 'imageHeight' => 672,
                 'type' => 'link',
-                'authorName' => 'Pachunka',
+                'authorName' => 'pachunka',
             ]
         );
     }

tests/CollegehumorTest.php

@@ -4,7 +4,6 @@
 
 class YoutubeTest extends AbstractTestCase
 {
-    
     static private $expectedVideoInfo = [
         'title' => 'Noisy kittens waiting for dinner!',
         'imageWidth' => 480,
@@ -14,7 +13,11 @@ class YoutubeTest extends AbstractTestCase
         'authorUrl' => 'https://www.youtube.com/user/smshdchrb',
         'providerName' => 'YouTube',
         'providerUrl' => 'https://www.youtube.com/',
-        'tags' => [
+        // `tags` are extracted by HTML provider from the page source, but
+        // in countries with cookie consent laws a consent page is first
+        // shown. The HTML provider tries to extract from the consent
+        // page and fails. In other countries this should work.
+        /*'tags' => [
             'kittens',
             'cats',
             'hungry',
@@ -43,22 +46,28 @@ class YoutubeTest extends AbstractTestCase
             'talking',
             'adorable',
             'climbing'
-        ],
+        ],*/
     ];
-    
+
     public function testOne()
     {
         $this->assertEmbed(
-            'http://www.youtube.com/watch?v=eiHXASgRTcA',
-            self::$expectedVideoInfo
+            $url = 'http://www.youtube.com/watch?v=eiHXASgRTcA',
+            array_merge(
+                self::$expectedVideoInfo,
+                ['url' => $url]
+            )
         );
     }
-    
+
     public function testShareUrl()
     {
         $this->assertEmbed(
-            'http://youtu.be/eiHXASgRTcA',
-            self::$expectedVideoInfo
+            $url = 'http://youtu.be/eiHXASgRTcA',
+            array_merge(
+                self::$expectedVideoInfo,
+                ['url' => $url]
+            )
         );
     }
 
@@ -71,7 +80,7 @@ public function testPlayList()
                 'imageWidth' => 480,
                 'imageHeight' => 360,
                 'type' => 'video',
-                'code' => '<iframe width="480" height="270" src="https://www.youtube.com/embed/videoseries?list=PL4qTakKkQATKOyZPJG_cAMnRtF7fAIdST" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>',
+                'code' => '<iframe width="200" height="113" src="https://www.youtube.com/embed/videoseries?list=PL4qTakKkQATKOyZPJG_cAMnRtF7fAIdST" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>',
                 'authorName' => 'Scadrei5',
             ]
         );