Merge pull request sonata-project#945 from clytemnestra/patch-1

Possibility to create youtube videos Media from mobile
ksom · Feb 11, 2016 · 84f51ed · 84f51ed
2 parents 975b104 + 957fa2a
commit 84f51ed
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/Provider/YouTubeProvider.php b/Provider/YouTubeProvider.php
@@ -215,7 +215,7 @@ protected function fixBinaryContent(MediaInterface $media)
             return;
         }
 
-        if (preg_match("/^(?:http(?:s)?:\/\/)?(?:www\.)?(?:youtu\.be\/|youtube\.com\/(?:(?:watch)?\?(?:.*&)?v(?:i)?=|(?:embed|v|vi|user)\/))([^\#\?&\"'>]+)/", $media->getBinaryContent(), $matches)) {
+        if (preg_match("/^(?:http(?:s)?:\/\/)?(?:www\.)?(?:m\.)?(?:youtu\.be\/|youtube\.com\/(?:(?:watch)?\?(?:.*&)?v(?:i)?=|(?:embed|v|vi|user)\/))([^\#\?&\"'>]+)/", $media->getBinaryContent(), $matches)) {
             $media->setBinaryContent($matches[1]);
         }
     }

diff --git a/Tests/Provider/YouTubeProviderTest.php b/Tests/Provider/YouTubeProviderTest.php
@@ -151,13 +151,17 @@ public function testTransformWithUrl($url)
     public static function getUrls()
     {
         return array(
-            array('BDYAbAtaDzA'),
-            array('http://www.youtube.com/watch?v=BDYAbAtaDzA&feature=feedrec_grec_index'),
-            array('http://www.youtube.com/v/BDYAbAtaDzA?fs=1&amp;hl=en_US&amp;rel=0'),
-            array('http://www.youtube.com/watch?v=BDYAbAtaDzA#t=0m10s'),
-            array('http://www.youtube.com/embed/BDYAbAtaDzA?rel=0'),
-            array('http://www.youtube.com/watch?v=BDYAbAtaDzA'),
-            array('http://youtu.be/BDYAbAtaDzA'),
+	    array('BDYAbAtaDzA'),
+	    array('http://www.youtube.com/watch?v=BDYAbAtaDzA&feature=feedrec_grec_index'),
+	    array('http://www.youtube.com/v/BDYAbAtaDzA?fs=1&amp;hl=en_US&amp;rel=0'),
+	    array('http://www.youtube.com/watch?v=BDYAbAtaDzA#t=0m10s'),
+	    array('http://www.youtube.com/embed/BDYAbAtaDzA?rel=0'),
+	    array('http://www.youtube.com/watch?v=BDYAbAtaDzA'),
+	    array('http://www.m.youtube.com/watch?v=BDYAbAtaDzA'),
+	    array('http://m.youtube.com/watch?v=BDYAbAtaDzA'),
+	    array('https://www.m.youtube.com/watch?v=BDYAbAtaDzA'),
+	    array('https://m.youtube.com/watch?v=BDYAbAtaDzA'),
+	    array('http://youtu.be/BDYAbAtaDzA'),
         );
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -215,7 +215,7 @@ protected function fixBinaryContent(MediaInterface $media) @@
                 return;
             }
-            if (preg_match("/^(?:http(?:s)?:\/\/)?(?:www\.)?(?:youtu\.be\/|youtube\.com\/(?:(?:watch)?\?(?:.*&)?v(?:i)?=|(?:embed|v|vi|user)\/))([^\#\?&\"'>]+)/", $media->getBinaryContent(), $matches)) {
+            if (preg_match("/^(?:http(?:s)?:\/\/)?(?:www\.)?(?:m\.)?(?:youtu\.be\/|youtube\.com\/(?:(?:watch)?\?(?:.*&)?v(?:i)?=|(?:embed|v|vi|user)\/))([^\#\?&\"'>]+)/", $media->getBinaryContent(), $matches)) {
                 $media->setBinaryContent($matches[1]);
             }
         }
@@ Expand Down @@