Merge branch 'master' into v2.7

oscarotero · oscarotero · commit 997f27d03dc2 · 2016-05-09T16:50:30.000+02:00
diff --git a/src/Url.php b/src/Url.php
@@ -415,10 +415,20 @@ protected function buildUrl()
             $url .= $this->info['scheme'].'://';
         }
 
+        $user = isset($this->info['user']) ? $this->info['user'] : '';
+        $pass = isset($this->info['pass']) ? ':'.$this->info['pass']  : '';
+        if ($user || $pass) {
+            $url .= $user.$pass.'@';
+        }
+
         if (isset($this->info['host'])) {
             $url .= $this->info['host'];
         }
 
+        if (isset($this->info['port'])) {
+            $url .= ':'.$this->info['port'];
+        }
+
         $url .= $this->getPath();
 
         if (!empty($this->info['query'])) {
diff --git a/tests/CodepenTest.php b/tests/CodepenTest.php
@@ -9,7 +9,7 @@ public function testAnonymous()
             [
                 'imageWidth' => 400,
                 'imageHeight' => 225,
-                'code' => '<iframe id="cp_embed_QwPVNW" src="https://codepen.io/anon/embed/preview/QwPVNW?height=300&amp;slug-hash=QwPVNW&amp;default-tab=result&amp;host=http%3A%2F%2Fcodepen.io" scrolling="no" frameborder="0" height="300" allowtransparency="true" class="cp_embed_iframe" style="width: 100%; overflow: hidden;"></iframe>',
+                'code' => '<iframe id="cp_embed_QwPVNW" src="https://codepen.io/anon/embed/preview/QwPVNW?height=300&amp;amp;slug-hash=QwPVNW&amp;amp;default-tabs=css,result&amp;amp;host=http%3A%2F%2Fcodepen.io&amp;amp;embed-version=2" scrolling="no" frameborder="0" height="300" allowtransparency="true" class="cp_embed_iframe" style="width: 100%; overflow: hidden;"></iframe>',
                 'type' => 'rich',
             ]
         );
@@ -23,7 +23,7 @@ public function testNormal()
                 'title' => 'TheaterJS',
                 'imageWidth' => 384,
                 'imageHeight' => 225,
-                'code' => '<iframe id="cp_embed_JoRazP" src="https://codepen.io/Zhouzi/embed/preview/JoRazP?height=300&amp;slug-hash=JoRazP&amp;default-tab=result&amp;host=http%3A%2F%2Fcodepen.io" scrolling="no" frameborder="0" height="300" allowtransparency="true" class="cp_embed_iframe" style="width: 100%; overflow: hidden;"></iframe>',
+                'code' => '<iframe id="cp_embed_JoRazP" src="https://codepen.io/Zhouzi/embed/preview/JoRazP?height=300&amp;amp;slug-hash=JoRazP&amp;amp;default-tabs=js,result&amp;amp;host=http%3A%2F%2Fcodepen.io&amp;amp;embed-version=2" scrolling="no" frameborder="0" height="300" allowtransparency="true" class="cp_embed_iframe" style="width: 100%; overflow: hidden;"></iframe>',
                 'type' => 'rich',
             ]
         );
diff --git a/tests/KickstarterTest.php b/tests/KickstarterTest.php
@@ -10,7 +10,7 @@ public function testOne()
                 'title' => 'Good Seed Craft Veggie Burgers',
                 'description' => 'Nutrient-dense Real Food! Good Seed hemp patties transform the veggie burger with bold flavor blends & sprouted superfood ingredients.',
                 'width' => 480,
-                'height' => 360,
+                'height' => 270,
                 'authorName' => 'Oliver Ponce and Erin Shotwell',
                 'providerName' => 'Kickstarter',
             ]
diff --git a/tests/RedirectionsTest.php b/tests/RedirectionsTest.php
@@ -9,13 +9,6 @@ public function testGoogleTranslate()
         $this->assertString($info1->url, $info2->url);
     }
 
-    public function testRdio()
-    {
-        $info1 = Embed\Embed::create('http://rd.io/x/Q1IjXC8s');
-        $info2 = Embed\Embed::create('https://www.rdio.com/artist/Soundgarden/album/Superunknown/?utm_campaign=share&utm_medium=Album&utm_source=13&utm_content=224371');
-        $this->assertString($info1->url, $info2->url);
-    }
-
     public function testTwitter()
     {
         $info1 = Embed\Embed::create('https://twitter.com/#!/twitter/status/99530515043983360');
diff --git a/tests/SoundcloudTest.php b/tests/SoundcloudTest.php
@@ -7,7 +7,7 @@ public function testOne()
         $this->assertEmbed(
             'https://soundcloud.com/zedsdead/zeds-dead-twin-shadow-lost-you-feat-dangelo-lacy',
             [
-                'title' => "Zeds Dead - Lost You (feat. Twin Shadow & D'Angelo Lacy) by Zeds Dead",
+                'title' => 'Lost You by Zeds Dead',
                 'type' => 'rich',
                 'code' => '<iframe width="100%" height="400" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?visual=true&url=https%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F150745932&show_artwork=true"></iframe>',
                 'providerName' => 'SoundCloud',
@@ -51,7 +51,7 @@ public function testMobile()
         $this->assertEmbed(
             'https://m.soundcloud.com/zedsdead/zeds-dead-twin-shadow-lost-you-feat-dangelo-lacy',
             [
-                'title' => "Zeds Dead - Lost You (feat. Twin Shadow & D'Angelo Lacy) by Zeds Dead",
+                'title' => 'Lost You by Zeds Dead',
                 'type' => 'rich',
                 'code' => '<iframe width="100%" height="400" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?visual=true&url=https%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F150745932&show_artwork=true"></iframe>',
                 'providerName' => 'SoundCloud',
diff --git a/tests/UrlTest.php b/tests/UrlTest.php
@@ -15,6 +15,9 @@ public function urlsParserProvider()
             ['https://animoto.com/oembeds/create.xml?automated=true&options=start_hq', 'https://animoto.com/oembeds/create.xml?automated=true&options=start_hq'],
             ['http://static2.politico.com/dims4/default/28fb355/2147483647/resize/1160x%3E/quality/90/?url=http%3A%2F%2Fs3-origin-images.politico.com%2F2013%2F12%2F18%2F131218_george_w_bush_barack_obama_ap_60', 'http://static2.politico.com/dims4/default/28fb355/2147483647/resize/1160x%3E/quality/90/?url=http%3A%2F%2Fs3-origin-images.politico.com%2F2013%2F12%2F18%2F131218_george_w_bush_barack_obama_ap_60'],
             ['https://plus.google.com/+carlsenverlag/posts/2hibgWrmhp1', 'https://plus.google.com/+carlsenverlag/posts/2hibgWrmhp1'],
+            ['http://test.drupal.dd:8083/tests/localport.html', 'http://test.drupal.dd:8083/tests/localport.html'],
+            ['http://testuser@test.drupal.dd:8083/tests/identified.html', 'http://testuser@test.drupal.dd:8083/tests/identified.html'],
+            ['http://testuser:testpass@test.drupal.dd:8083/tests/authenticated.html', 'http://testuser:testpass@test.drupal.dd:8083/tests/authenticated.html'],
         ];
     }
 
diff --git a/tests/UstreamTest.php b/tests/UstreamTest.php
@@ -12,7 +12,6 @@ public function testOne()
                 'imageHeight' => 90,
                 'type' => 'video',
                 'authorName' => 'redsh0es',
-                'authorUrl' => 'http://www.ustream.tv/user/redsh0es',
                 'providerName' => 'Ustream',
                 'providerUrl' => 'http://www.ustream.tv/',
             ]

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public function testAnonymous()`
`9`	`9`	`[`
`10`	`10`	`'imageWidth' => 400,`
`11`	`11`	`'imageHeight' => 225,`
`12`		`- 'code' => '<iframe id="cp_embed_QwPVNW" src="https://codepen.io/anon/embed/preview/QwPVNW?height=300&slug-hash=QwPVNW&default-tab=result&host=http%3A%2F%2Fcodepen.io" scrolling="no" frameborder="0" height="300" allowtransparency="true" class="cp_embed_iframe" style="width: 100%; overflow: hidden;"></iframe>',`
	`12`	`+ 'code' => '<iframe id="cp_embed_QwPVNW" src="https://codepen.io/anon/embed/preview/QwPVNW?height=300&amp;slug-hash=QwPVNW&amp;default-tabs=css,result&amp;host=http%3A%2F%2Fcodepen.io&amp;embed-version=2" scrolling="no" frameborder="0" height="300" allowtransparency="true" class="cp_embed_iframe" style="width: 100%; overflow: hidden;"></iframe>',`
`13`	`13`	`'type' => 'rich',`
`14`	`14`	`]`
`15`	`15`	`);`
`@@ -23,7 +23,7 @@ public function testNormal()`
`23`	`23`	`'title' => 'TheaterJS',`
`24`	`24`	`'imageWidth' => 384,`
`25`	`25`	`'imageHeight' => 225,`
`26`		`- 'code' => '<iframe id="cp_embed_JoRazP" src="https://codepen.io/Zhouzi/embed/preview/JoRazP?height=300&slug-hash=JoRazP&default-tab=result&host=http%3A%2F%2Fcodepen.io" scrolling="no" frameborder="0" height="300" allowtransparency="true" class="cp_embed_iframe" style="width: 100%; overflow: hidden;"></iframe>',`
	`26`	`+ 'code' => '<iframe id="cp_embed_JoRazP" src="https://codepen.io/Zhouzi/embed/preview/JoRazP?height=300&amp;slug-hash=JoRazP&amp;default-tabs=js,result&amp;host=http%3A%2F%2Fcodepen.io&amp;embed-version=2" scrolling="no" frameborder="0" height="300" allowtransparency="true" class="cp_embed_iframe" style="width: 100%; overflow: hidden;"></iframe>',`
`27`	`27`	`'type' => 'rich',`
`28`	`28`	`]`
`29`	`29`	`);`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public function testOne()`
`10`	`10`	`'title' => 'Good Seed Craft Veggie Burgers',`
`11`	`11`	`'description' => 'Nutrient-dense Real Food! Good Seed hemp patties transform the veggie burger with bold flavor blends & sprouted superfood ingredients.',`
`12`	`12`	`'width' => 480,`
`13`		`- 'height' => 360,`
	`13`	`+ 'height' => 270,`
`14`	`14`	`'authorName' => 'Oliver Ponce and Erin Shotwell',`
`15`	`15`	`'providerName' => 'Kickstarter',`
`16`	`16`	`]`
Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,6 @@ public function testGoogleTranslate()`
`9`	`9`	`$this->assertString($info1->url, $info2->url);`
`10`	`10`	`}`
`11`	`11`
`12`		`- public function testRdio()`
`13`		`- {`
`14`		`- $info1 = Embed\Embed::create('http://rd.io/x/Q1IjXC8s');`
`15`		`- $info2 = Embed\Embed::create('https://www.rdio.com/artist/Soundgarden/album/Superunknown/?utm_campaign=share&utm_medium=Album&utm_source=13&utm_content=224371');`
`16`		`- $this->assertString($info1->url, $info2->url);`
`17`		`- }`
`18`		`-`
`19`	`12`	`public function testTwitter()`
`20`	`13`	`{`
`21`	`14`	`$info1 = Embed\Embed::create('https://twitter.com/#!/twitter/status/99530515043983360');`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,9 @@ public function urlsParserProvider()`
`15`	`15`	`['https://animoto.com/oembeds/create.xml?automated=true&options=start_hq', 'https://animoto.com/oembeds/create.xml?automated=true&options=start_hq'],`
`16`	`16`	`['http://static2.politico.com/dims4/default/28fb355/2147483647/resize/1160x%3E/quality/90/?url=http%3A%2F%2Fs3-origin-images.politico.com%2F2013%2F12%2F18%2F131218_george_w_bush_barack_obama_ap_60', 'http://static2.politico.com/dims4/default/28fb355/2147483647/resize/1160x%3E/quality/90/?url=http%3A%2F%2Fs3-origin-images.politico.com%2F2013%2F12%2F18%2F131218_george_w_bush_barack_obama_ap_60'],`
`17`	`17`	`['https://plus.google.com/+carlsenverlag/posts/2hibgWrmhp1', 'https://plus.google.com/+carlsenverlag/posts/2hibgWrmhp1'],`
	`18`	`+ ['http://test.drupal.dd:8083/tests/localport.html', 'http://test.drupal.dd:8083/tests/localport.html'],`
	`19`	`+ ['http://testuser@test.drupal.dd:8083/tests/identified.html', 'http://testuser@test.drupal.dd:8083/tests/identified.html'],`
	`20`	`+ ['http://testuser:testpass@test.drupal.dd:8083/tests/authenticated.html', 'http://testuser:testpass@test.drupal.dd:8083/tests/authenticated.html'],`
`18`	`21`	`];`
`19`	`22`	`}`
`20`	`23`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ public function testOne()`
`12`	`12`	`'imageHeight' => 90,`
`13`	`13`	`'type' => 'video',`
`14`	`14`	`'authorName' => 'redsh0es',`
`15`		`- 'authorUrl' => 'http://www.ustream.tv/user/redsh0es',`
`16`	`15`	`'providerName' => 'Ustream',`
`17`	`16`	`'providerUrl' => 'http://www.ustream.tv/',`
`18`	`17`	`]`