Merge branch 'stable/v0.8' into feature/v0.8/addelement

src/Muzich/CoreBundle/Factory/Elements/Dailymotioncom.php

@@ -23,7 +23,7 @@ class Dailymotioncom extends ElementFactory
     $ref_id = null;
     
     // Récupération de l'id
-    if (preg_match("#(video\/)([a-zA-Z0-9]+)([a-zA-Z0-9_-]*)#", $url_clean, $preg_result))
+    if (preg_match("#\/(video\/)([a-zA-Z0-9]+)([a-zA-Z0-9_-]*)#", $url_clean, $preg_result))
     {
       $ref_id = $preg_result[2];
       $this->element->setData(Element::DATA_REF_ID, $ref_id);
@@ -42,7 +42,7 @@ class Dailymotioncom extends ElementFactory
       
       curl_setopt_array($api_url, $options);
       $api_result = json_decode(curl_exec($api_url));
-      
+            
       // On récupère l'url du thumbnail
       if (isset($api_result->thumbnail_medium_url))
       {

src/Muzich/CoreBundle/Factory/Elements/Soundcloudcom.php

@@ -61,10 +61,20 @@ class Soundcloudcom extends ElementFactory
       {
         if (count($result->errors))
         {
-          return null;
+          return;  
         }
       }
-
+      
+      if (!isset($result->location))
+      {
+        return;
+      }
+      
+      if (!$result->location)
+      {
+        return;
+      }
+      
       $getjsonurl = $result->location;
       // On a maintenant la bonne url pour demander les infos
       $ch = curl_init($getjsonurl);

src/Muzich/CoreBundle/Factory/Elements/Youtubecom.php

@@ -16,11 +16,23 @@ class Youtubecom extends ElementFactory
   protected function proceedAPIDatas($ref_id)
   {
     $video_data_dom = new \DOMDocument;
-    $video_data_dom->load("http://gdata.youtube.com/feeds/api/videos/". $ref_id);
-    
-    if (($title = $video_data_dom->getElementsByTagName("title")->item(0)->nodeValue))
+    try {
+      $video_data_dom->load("http://gdata.youtube.com/feeds/api/videos/". $ref_id);
+
+      if ($video_data_dom->getElementsByTagName("title"))
+      {
+        if ($video_data_dom->getElementsByTagName("title")->item(0))
+        {
+          if (($title = $video_data_dom->getElementsByTagName("title")->item(0)->nodeValue))
+          {
+            $this->element->setData(Element::DATA_TITLE, $title);
+          }
+        }
+      }
+    }
+    catch (\ErrorException $e)
     {
-      $this->element->setData(Element::DATA_TITLE, $title);
+      // Api injoignable
     }
   }
   

src/Muzich/CoreBundle/Tests/ElementFactory/ElementFactoryTest.php

@@ -353,7 +353,7 @@ class ElementFactoryTest extends UnitTest
     $this->assertEquals(array(
       'data_ref_id' => 3770,
       'data_title' => 'Library Project',
-      'data_thumb_url' => 'http://i1.sndcdn.com/artworks-000000514203-fsvbcj-large.jpg?04ad178',
+      'data_thumb_url' => 'http://i1.sndcdn.com/artworks-000000514203-fsvbcj-large.jpg?51826bf',
       'data_type' => 'playlist',
       'data_download' => null,
       'data_download_url' => 'http://soundcloud.com/matas/sets/library-project/download',
@@ -368,7 +368,7 @@ class ElementFactoryTest extends UnitTest
     $this->assertEquals(array(
       'data_ref_id' => 3154252,
       'data_title' => 'Above Hyperion (redux)',
-      'data_thumb_url' => 'http://i1.sndcdn.com/artworks-000001536693-gb1n5v-large.jpg?04ad178',
+      'data_thumb_url' => 'http://i1.sndcdn.com/artworks-000001536693-gb1n5v-large.jpg?51826bf',
       'data_type' => 'track',
       'data_download' => false,
       'data_download_url' => 'http://soundcloud.com/matas/above-hyperion-redux/download',