Merge branch 'opt/factory' into unstable

src/Muzich/CoreBundle/Command/CheckModerateCommand.php

@@ -8,7 +8,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-use Muzich\CoreBundle\ElementFactory\ElementManager;
+use Muzich\CoreBundle\Managers\ElementManager;
 
 class CheckModerateCommand extends ContainerAwareCommand
 {

src/Muzich/CoreBundle/Command/RefreshEmbedsCommand.php

@@ -8,7 +8,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-use Muzich\CoreBundle\ElementFactory\ElementManager;
+use Muzich\CoreBundle\Managers\ElementManager;
 
 class RefreshEmbedsCommand extends ContainerAwareCommand
 {

src/Muzich/CoreBundle/Command/UpdateTagSlugsCommand.php

@@ -8,7 +8,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-use Muzich\CoreBundle\ElementFactory\ElementManager;
+use Muzich\CoreBundle\Managers\ElementManager;
 
 class UpdateTagSlugsCommand extends ContainerAwareCommand
 {

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -8,7 +8,7 @@ use Muzich\CoreBundle\Entity\FollowUser;
 use Muzich\CoreBundle\Entity\FollowGroup;
 //use Doctrine\ORM\Query;
 use Muzich\CoreBundle\Form\Element\ElementAddForm;
-use Muzich\CoreBundle\ElementFactory\ElementManager;
+use Muzich\CoreBundle\Managers\ElementManager;
 use Muzich\CoreBundle\Entity\Element;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Muzich\CoreBundle\Form\Search\ElementSearchForm;

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -3,7 +3,7 @@
 namespace Muzich\CoreBundle\Controller;
 
 use Muzich\CoreBundle\lib\Controller;
-use Muzich\CoreBundle\ElementFactory\ElementManager;
+use Muzich\CoreBundle\Managers\ElementManager;
 use Muzich\CoreBundle\Propagator\EventElement;
 use Muzich\CoreBundle\Entity\ElementTagsProposition;
 

src/Muzich/CoreBundle/ElementFactory/Site/DailymotioncomFactory.php

@@ -1,69 +0,0 @@
-<?php
-
-namespace Muzich\CoreBundle\ElementFactory\Site;
-
-use Muzich\CoreBundle\ElementFactory\Site\base\BaseFactory;
-
-/**
- * 
- *
- * @author bux
- */
-class DailymotioncomFactory extends BaseFactory
-{
-  public function getEmbedCode()
-  {
-    $url = $this->getCleanedUrl();
-    $embed_url = null;
-    
-    // /video/xnqcwx_le-nazisme-dans-le-couple_fun#hp-v-v2
-    if (preg_match("#(video\/)([a-zA-Z0-9]+)([a-zA-Z0-9_-]*)#", $url, $chaines))
-    {
-      $embed_url = 'http://www.dailymotion.com/embed/video/'.$chaines[2];
-    }
-    
-    if ($embed_url)
-    {
-      $width = $this->container->getParameter('dailymotion_player_width');
-      $height = $this->container->getParameter('dailymotion_player_height');
-      return '<iframe frameborder="0" width="'.$width.'" height="'.$height.'" '
-        .'src="'.$embed_url.'"></iframe>';
-    }
-    
-    return null;
-  }
-  
-  /*
-   * http://www.dailymotion.com/doc/api/obj-video.html
-   */
-  public function getThumbnailUrl()
-  {
-    // https://api.dailymotion.com/video/xmi3i1&fields=thumbnail_medium_url
-    $url_object = $this->getCleanedUrl();
-    $url = null;
-    
-    if (preg_match("#(video\/)([a-zA-Z0-9]+)([a-zA-Z0-9_-]*)#", $url_object, $chaines))
-    {
-      $ch = curl_init('https://api.dailymotion.com/video/'.$chaines[2].'&fields=thumbnail_medium_url');
-      
-      $options = array(
-        CURLOPT_RETURNTRANSFER => true,
-        CURLOPT_HTTPHEADER => array('Content-type: application/json')
-      );
-      
-      curl_setopt_array( $ch, $options );
-      $result = json_decode(curl_exec($ch));
-      
-      if (isset($result->thumbnail_medium_url))
-      {
-        $url = $result->thumbnail_medium_url;
-      }
-      
-    }
-    
-    return $url;
-  }
-  
-}
-
-?>

src/Muzich/CoreBundle/ElementFactory/Site/DeezercomFactory.php

@@ -1,87 +0,0 @@
-<?php
-
-namespace Muzich\CoreBundle\ElementFactory\Site;
-
-use Muzich\CoreBundle\ElementFactory\Site\base\BaseFactory;
-
-/**
- * 
- *
- * @author bux
- */
-class DeezercomFactory extends BaseFactory
-{
-  
-  protected function getCleanedUrl($decode = false)
-  {
-    $data = parent::getCleanedUrl(true);
-    $data = str_replace(' ', '-', $data);
-    $data = strtolower($data);
-    
-    return $data;
-  }
-  
-  public function getEmbedCode()
-  {
-    $data = $this->getCleanedUrl(true);
-    
-    $embed = null;
-    $element_id = null;
-    $type = null;
-    // album
-    // http://www.deezer.com/fr/music/pantera/far-beyond-driven-80398
-    if (preg_match("#^\/[a-zA-Z_-]+\/music\/[a-zA-Z0-9_-]+\/[a-zA-Z0-9_-]+-([0-9]+)#", $data, $chaines))
-    {
-      $element_id = $chaines[1];
-      $type = 'album';
-    }
-    // playlist
-    // http://www.deezer.com/fr/music/playlist/18701350
-    else if (preg_match("#^\/[a-zA-Z_-]+\/music\/playlist\/([0-9]+)#", $data, $chaines))
-    {
-      $element_id = $chaines[1];
-      $type = 'playlist';
-    }
-    
-    if ($element_id)
-    {
-      $width = $this->container->getParameter('deezer_player_width');
-      $heigth = $this->container->getParameter('deezer_player_height');
-      $embed = '<iframe scrolling="no" frameborder="0" allowTransparency="true" '
-        .'src="http://www.deezer.com/fr/plugins/player?autoplay=false&playlist=true'
-        .'&width='.$width.'&height='.$heigth.'&cover=true&btn_popup=true&type='.$type.'&id='.$element_id.'&title=" '
-        .'width="'.$width.'" height="'.$heigth.'"></iframe>'
-      ;
-    }
-    
-    return $embed;
-  }
-  
-  public function getThumbnailUrl()
-  {
-    $url_object = $this->getCleanedUrl();
-    $url = null;
-    
-    // album
-    // http://www.deezer.com/fr/music/pantera/far-beyond-driven-80398
-    if (preg_match("#^\/[a-zA-Z_-]+\/music\/[a-zA-Z0-9_-]+\/[a-zA-Z0-9_-]+-([0-9]+)#", $url_object, $chaines))
-    {
-      $id = $chaines[1];
-      $ch = curl_init('http://api.deezer.com/2.0/album/'.$id);
-      $options = array(
-        CURLOPT_RETURNTRANSFER => true,
-        CURLOPT_HTTPHEADER => array('Content-type: application/json')
-      );
-      curl_setopt_array( $ch, $options );
-      $result = json_decode(curl_exec($ch));
-      
-      if (isset($result->cover))
-      {
-        $url = $result->cover;
-      }
-    }
-    
-    return $url;
-  }
-  
-}

src/Muzich/CoreBundle/ElementFactory/Site/JamendocomFactory.php

@@ -1,123 +0,0 @@
-<?php
-
-namespace Muzich\CoreBundle\ElementFactory\Site;
-
-use Muzich\CoreBundle\ElementFactory\Site\base\BaseFactory;
-
-/**
- * 
- *
- * @author bux
- */
-class JamendocomFactory extends BaseFactory
-{
-  public function getEmbedCode()
-  {
-    $data = $this->getCleanedUrl();
-    
-    $embed_url = null;
-    // http://www.jamendo.com/fr/album/30661
-    if (preg_match("#^\/[a-zA-Z0-9_-]+\/album\/([0-9]+)#", $data, $chaines))
-    {
-      $id_album = $chaines[1];
-      $embed_url = "http://widgets.jamendo.com/fr/album/?album_id=$id_album&playertype=2008";
-    }
-    // http://www.jamendo.com/fr/track/207079
-    else if (preg_match("#^\/[a-zA-Z0-9_-]+\/track\/([0-9]+)#", $data, $chaines))
-    {
-      $id_track = $chaines[1];
-      $embed_url = "http://widgets.jamendo.com/fr/track/?playertype=2008&track_id=$id_track";
-    }
-    
-    if ($embed_url)
-    {
-      $height = $this->container->getParameter('jamendo_player_height');
-      $width = $this->container->getParameter('jamendo_player_width');
-      return  '
-          <object width="'.$width.'" height="'.$height.'" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0" align="middle">
-            <param name="allowScriptAccess" value="always" />
-            <param name="wmode" value="transparent" />
-            <param name="movie" value="'.$embed_url.'" />
-            <param name="quality" value="high" />
-            <param name="bgcolor" value="#FFFFFF" />
-            <embed src="'.$embed_url.'" quality="high" wmode="transparent" bgcolor="#FFFFFF" width="'.$width.'" height="'.$height.'" align="middle" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer">
-              &nbsp;
-            </embed>
-            &nbsp;
-          </object>
-          <a href="http://pro.jamendo.com/" style="display:block;font-size:8px !important;">Catalogue professionnel de musique libre</a>
-        ';
-    }
-    
-    return null;
-  }
-  
-  public function getThumbnailUrl()
-  {
-    $url_object = $this->getCleanedUrl();
-    $get_url = null;
-    $url = null;
-    
-    // http://www.jamendo.com/fr/album/30661
-    if (preg_match("#^\/[a-zA-Z0-9_-]+\/album\/([0-9]+)#", $url_object, $chaines))
-    {
-      $id_album = $chaines[1];
-      $get_url = "http://api.jamendo.com/get2/image/album/json/?id=".$id_album;
-    }
-    // http://www.jamendo.com/fr/track/207079
-    else if (preg_match("#^\/[a-zA-Z0-9_-]+\/track\/([0-9]+)#", $url_object, $chaines))
-    {
-      /*
-      * Pour une track c'est un peu différent
-      */
-      $id_track = $chaines[1];
-      $get_album_url = "http://www.jamendo.com/get/album/id/track/page/json/".$id_track.'/';
-      
-      $ch = curl_init($get_album_url);
-      curl_setopt_array($ch, array(
-        CURLOPT_RETURNTRANSFER => true,
-        CURLOPT_HTTPHEADER => array('Content-type: application/json')
-      ));
-      $result = json_decode(curl_exec($ch));
-      if (count($result))
-      {
-        $album_url = str_replace('http://www.jamendo.com', '', $result[0]);
-        
-        $expl_alb = null;
-        if (preg_match("#^\/album\/([0-9]+)#", $album_url, $expl_alb))
-        {
-          $id_album = $expl_alb[1];
-          $get_url = "http://api.jamendo.com/get2/image/album/json/?id=".$id_album;
-        }
-      }
-    }
-    
-    if ($get_url)
-    {
-      $ch = curl_init($get_url);
-      $options = array(
-        CURLOPT_RETURNTRANSFER => true,
-        CURLOPT_HTTPHEADER => array('Content-type: text/plain')
-      );
-      curl_setopt_array( $ch, $options );
-      $result = json_decode(curl_exec($ch));
-      
-      if (count($result))
-      {
-        $url = $result[0];
-      }
-    }
-    
-      
-    /**
-     * www.jamendo.com/get/album/id/track/page/plain/2000/
-     * api.jamendo.com/get2/image/track/json/?id=
-     * 
-     * api.jamendo.com/get2/album/id/track/json/?id=
-     * 
-     */
-     
-    return $url;
-  }
-  
-}

src/Muzich/CoreBundle/ElementFactory/Site/SoundcloudcomFactory.php

@@ -1,94 +0,0 @@
-<?php
-
-namespace Muzich\CoreBundle\ElementFactory\Site;
-
-use Muzich\CoreBundle\ElementFactory\Site\base\BaseFactory;
-use Muzich\CoreBundle\Entity\Element;
-use Symfony\Component\DependencyInjection\Container;
-
-/**
- * 
- *
- * @author bux
- */
-class SoundcloudcomFactory extends BaseFactory
-{
-  public function getEmbedCode()
-  {
-    $url = str_replace('www.', '', $this->element->getUrl());
-    $data = $this->getCleanedUrl();
-    $embed_url = null;
-    
-    // http://soundcloud.com/matas/sets/library-project
-    if (preg_match("#^\/[a-zA-Z0-9_-]+\/sets\/[a-zA-Z0-9_-]+#", $data, $chaines))
-    {
-      $embed_url = $url;
-    }
-    // http://soundcloud.com/matas/anadrakonic-waltz
-    else if (preg_match("#^\/[a-zA-Z0-9_-]+\/[a-zA-Z0-9_-]+#", $data, $chaines))
-    {
-      $embed_url = $url;
-    }
-        
-    // Si c'est une recherche, on gère pas !
-    // /search?q[fulltext]=tatou
-    // /tracks/search?q%5Bfulltext%5D=EEK+A+MOUSSE&q%5Btype%5D=&q%5Bduration%5D=
-    if (preg_match("#\/search\?q#", $data, $chaines))
-    {
-      $embed_url = null;
-    }
-    
-    if ($embed_url)
-    {
-      // l'url est valide pour l'api javascript que l'on utilise
-      
-      $id = md5($url);
-      $height = $this->container->getParameter('soundcloud_player_height');
-      $embed = 
-        '<object height="'.$height.'" width="100%" id="embed_'.$id.'" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000">
-          <param name="movie" value="http://player.soundcloud.com/player.swf?url='.$embed_url.'&amp;enable_api=true&amp;object_id=embed_'.$id.'"></param>
-          <param name="allowscriptaccess" value="always"></param>
-          <embed allowscriptaccess="always" height="'.$height.'" src="http://player.soundcloud.com/player.swf?url='.$embed_url.'&amp;enable_api=true&amp;object_id=embed_'.$id.'" type="application/x-shockwave-flash" width="100%" name="embed_'.$id.'"></embed>
-        </object>
-        ';
-      
-      return $embed;
-    }
-    
-    return null;
-  }
-  
-  public function getThumbnailUrl()
-  {
-    
-    
-    $url_object = $this->element->getUrl();
-    $url = null;
-    
-    $ch = curl_init('http://api.soundcloud.com/resolve.json?url='.$url_object.'&client_id=39946ea18e3d78d64c0ac95a025794e1');
-      
-    $options = array(
-      CURLOPT_RETURNTRANSFER => true,
-      CURLOPT_HTTPHEADER => array('Content-type: application/json')
-    );
-
-    curl_setopt_array( $ch, $options );
-    $result = json_decode(curl_exec($ch));
-    
-    if (isset($result->errors))
-    {
-      if (count($result->errors))
-      {
-        return null;
-      }
-    }
-    
-    $getjsonurl = $result->location;
-    $ch = curl_init($getjsonurl);
-    curl_setopt_array($ch, $options);
-    $result = json_decode(curl_exec($ch));
-    
-    $url = $result->artwork_url;
-    return $url;
-  }
-}

src/Muzich/CoreBundle/ElementFactory/Site/YoutubeFactory.php

@@ -1,49 +0,0 @@
-<?php
-
-namespace Muzich\CoreBundle\ElementFactory\Site;
-
-use Muzich\CoreBundle\ElementFactory\Site\base\BaseFactory;
-
-/**
- * 
- *
- * @author bux
- */
-class YoutubeFactory extends BaseFactory
-{
-  public function getEmbedCode()
-  {
-    $url = $this->getCleanedUrl();
-    $embed_url = null;
-    
-    // http://youtu.be/9hQVA2sloGc
-    if (preg_match("#\/([a-zA-Z0-9]+)#", $url, $chaines))
-    {
-      $embed_url = 'http://www.youtube.com/embed/'.$chaines[1];
-    }
-        
-    if ($embed_url)
-    {
-      $width = $this->container->getParameter('youtube_player_width');
-      $height = $this->container->getParameter('youtube_player_height');
-      return '<iframe width="'.$width.'" height="'.$height.'" src="'.$embed_url.'" '
-        .'frameborder="0" allowfullscreen></iframe>';
-    }
-    
-    return null;
-  }
-  
-  public function getThumbnailUrl()
-  {
-    $url_object = $this->getCleanedUrl();
-    $url = null;
-    
-    // http://youtu.be/9hQVA2sloGc
-    if (preg_match("#\/([a-zA-Z0-9]+)#", $url_object, $chaines))
-    {
-      $url = 'http://img.youtube.com/vi/'.$chaines[1].'/default.jpg';
-    }
-    
-    return $url;
-  }
-}

src/Muzich/CoreBundle/ElementFactory/Site/YoutubecomFactory.php

@@ -1,57 +0,0 @@
-<?php
-
-namespace Muzich\CoreBundle\ElementFactory\Site;
-
-use Muzich\CoreBundle\ElementFactory\Site\base\BaseFactory;
-
-/**
- * 
- *
- * @author bux
- */
-class YoutubecomFactory extends BaseFactory
-{
-  public function getEmbedCode()
-  {
-    $url = $this->getCleanedUrl();
-    $embed_url = null;
-    
-    // '/watch?v=kOLQIV22JAs&feature=feedrec_grec_index'
-    if (preg_match("#(v\/|watch\?v=)([\w\-]+)#", $url, $chaines))
-    {
-      $embed_url = 'http://www.youtube.com/embed/'.$chaines[2];
-    }
-    else if (preg_match("#(v=|watch\?v=)([\w\-]+)#", $url, $chaines))
-    {
-      $embed_url = 'http://www.youtube.com/embed/'.$chaines[2];
-    }
-    
-    if ($embed_url)
-    {
-      $width = $this->container->getParameter('youtube_player_width');
-      $height = $this->container->getParameter('youtube_player_height');
-      return '<iframe width="'.$width.'" height="'.$height.'" src="'.$embed_url.'" '
-        .'frameborder="0" allowfullscreen></iframe>';
-    }
-    
-    return null;
-  }
-  
-  public function getThumbnailUrl()
-  {
-    $url_object = $this->getCleanedUrl();
-    $url = null;
-    
-    // '/watch?v=kOLQIV22JAs&feature=feedrec_grec_index'
-    if (preg_match("#(v\/|watch\?v=)([\w\-]+)#", $url_object, $chaines))
-    {
-      $url = 'http://img.youtube.com/vi/'.$chaines[2].'/default.jpg';
-    }
-    else if (preg_match("#(v=|watch\?v=)([\w\-]+)#", $url_object, $chaines))
-    {
-      $url = 'http://img.youtube.com/vi/'.$chaines[2].'/default.jpg';
-    }
-    
-    return $url;
-  }
-}

src/Muzich/CoreBundle/ElementFactory/Site/base/FactoryInterface.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace Muzich\CoreBundle\ElementFactory\Site\base;
-
-use Muzich\CoreBundle\Entity\Element;
-use Symfony\Component\DependencyInjection\Container;
-
-interface FactoryInterface
-{
-  
-  public function __construct(Element $element, Container $container);
-  
-  public function getEmbedCode();
-  
-}
-
-?>

src/Muzich/CoreBundle/Entity/Element.php

@@ -206,6 +206,14 @@ class Element
   protected $count_comment_report = false;
 
   /**
+   * Données de l'objet chez le service externe
+   * 
+   * @ORM\Column(type="text", nullable=true)
+   * @var type string
+   */
+  protected $datas;
+  
+  /**
    * Get id
    *
    * @return integer 
@@ -503,6 +511,59 @@ class Element
     $this->comments = json_encode($comments);
   }
   
+  
+  
+  /**
+   *
+   * @return type array
+   */
+  public function getDatas()
+  {
+    if ($this->datas === null)
+    {
+      return array();
+    }
+    return json_decode($this->datas, true);
+  }
+  
+  /**
+   *
+   * @param string $data_id
+   * @return all 
+   */
+  public function getData($data_id)
+  {
+    $datas = $this->getDatas();
+    if (array_key_exists($data_id, $datas))
+    {
+      return $datas[$data_id];
+    }
+    
+    return null;
+  }
+  
+  
+  /**
+   *
+   * @param array $datas 
+   */
+  public function setDatas($datas)
+  {
+    $this->datas = json_encode($datas);
+  }
+  
+  /**
+   *
+   * @param string $data_id
+   * @param all $data_value 
+   */
+  public function setData($data_id, $data_value)
+  {
+    $datas = $this->getDatas();
+    $datas[$data_id] = $data_value;
+    $this->setDatas($datas);
+  }
+  
   public function setHasTagProposition($has_prop)
   {
     $this->has_tags_proposition = $has_prop;

src/Muzich/CoreBundle/ElementFactory/Site/base/BaseFactory.php → src/Muzich/CoreBundle/Factory/ElementFactory.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Muzich\CoreBundle\ElementFactory\Site\base;
+namespace Muzich\CoreBundle\Factory;
 
 use Muzich\CoreBundle\Entity\Element;
 use Symfony\Component\DependencyInjection\Container;
@@ -10,9 +10,13 @@ use \Exception;
  *
  * @author bux
  */
-class BaseFactory implements FactoryInterface
+abstract class ElementFactory
 {
   
+  /**
+   *
+   * @var Element 
+   */
   protected $element;
   protected $container;
   
@@ -27,11 +31,6 @@ class BaseFactory implements FactoryInterface
     $this->container = $container;
   }
   
-  public function getEmbedCode()
-  {
-    return null;
-  }
-  
   /**
    * Retourne l'url relative dans le site
    * 
@@ -52,9 +51,19 @@ class BaseFactory implements FactoryInterface
     return $url;
   }
   
-  public function getThumbnailUrl()
+  public function retrieveDatas()
+  {
+    $this->element->setDatas(array());
+  }
+  
+  public function proceedEmbedCode()
+  {
+    $this->element->setEmbed(null);
+  }
+  
+  public function proceedThumbnailUrl()
   {
-    return null;
+    $this->element->setThumbnailUrl(null);
   }
   
 }

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

@@ -0,0 +1,74 @@
+<?php
+
+namespace Muzich\CoreBundle\Factory\Elements;
+
+use Muzich\CoreBundle\Factory\ElementFactory;
+
+/**
+ * 
+ *
+ * @author bux
+ */
+class Dailymotioncom extends ElementFactory
+{
+  
+  /**
+   * URL_API: http://www.dailymotion.com/doc/api/obj-video.html
+   * URL_TYPE: /video/xnqcwx_le-nazisme-dans-le-couple_fun#hp-v-v2 (c'est quoi cette url ^^ ?) 
+   */
+  public function retrieveDatas()
+  {
+    $url_clean = $this->getCleanedUrl();
+    $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))
+    {
+      $ref_id = $preg_result[2];
+      $this->element->setData('ref_id', $ref_id);
+    }
+    
+    // Récupération de données auprés de l'API
+    if ($ref_id)
+    {
+      $api_url = curl_init('https://api.dailymotion.com/video/'.$ref_id
+        .'&fields=thumbnail_medium_url');
+      
+      $options = array(
+        CURLOPT_RETURNTRANSFER => true,
+        CURLOPT_HTTPHEADER => array('Content-type: application/json')
+      );
+      
+      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))
+      {
+        $this->element->setData('thumb_medium_url', $api_result->thumbnail_medium_url);
+      }
+    }
+  }
+  
+  public function proceedEmbedCode()
+  {
+    if (($ref_id = $this->element->getData('ref_id')))
+    {
+      $width = $this->container->getParameter('dailymotion_player_width');
+      $height = $this->container->getParameter('dailymotion_player_height');
+      $this->element->setEmbed(
+        '<iframe frameborder="0" width="'.$width.'" height="'.$height.'" '
+        .'src="http://www.dailymotion.com/embed/video/'.$ref_id.'"></iframe>'
+      );
+    }
+  }
+  
+  public function proceedThumbnailUrl()
+  {
+    if (($thumb = $this->element->getData('thumb_medium_url')))
+    {
+      $this->element->setThumbnailUrl($thumb);
+    }
+  }
+  
+}

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

@@ -0,0 +1,91 @@
+<?php
+
+namespace Muzich\CoreBundle\Factory\Elements;
+
+use Muzich\CoreBundle\Factory\ElementFactory;
+
+/**
+ * 
+ *
+ * @author bux
+ */
+class Deezercom extends ElementFactory
+{
+  
+  protected function getCleanedUrl($decode = false)
+  {
+    $data = parent::getCleanedUrl($decode);
+    $data = str_replace(' ', '-', $data);
+    $data = strtolower($data);
+    
+    return $data;
+  }
+  
+  /**
+   *  URL_PLAYLIST: http://www.deezer.com/fr/music/playlist/18701350
+   *  URL_ALBUM:    http://www.deezer.com/fr/music/pantera/far-beyond-driven-80398
+   */
+  public function retrieveDatas()
+  {
+    $url_clean = $this->getCleanedUrl(true);
+    
+    // album
+    $type   = null;
+    $ref_id = null;
+    if (preg_match("#^\/[a-zA-Z_-]+\/music\/[a-zA-Z0-9_-]+\/[a-zA-Z0-9_-]+-([0-9]+)#", $url_clean, $chaines))
+    {
+      $type   = 'album';
+      $ref_id = $chaines[1];
+    }
+    // playlist
+    else if (preg_match("#^\/[a-zA-Z_-]+\/music\/playlist\/([0-9]+)#", $url_clean, $chaines))
+    {
+      $type = 'playlist';
+      $ref_id = $chaines[1];
+    }
+    
+    $this->element->setData('type'  , $type);
+    $this->element->setData('ref_id', $ref_id);
+    
+    if ($type && $ref_id)
+    {
+      // Récupération d'infos auprès de l'API
+      $ch = curl_init('http://api.deezer.com/2.0/'.$type.'/'.$ref_id);
+      $options = array(
+        CURLOPT_RETURNTRANSFER => true,
+        CURLOPT_HTTPHEADER => array('Content-type: application/json')
+      );
+      curl_setopt_array( $ch, $options );
+      $result = json_decode(curl_exec($ch));
+
+      if (isset($result->cover))
+      {
+        $this->element->setData('cover_url', $result->cover);
+      }
+    }
+  }
+  
+  public function proceedEmbedCode()
+  {
+    if (($ref_id = $this->element->getData('ref_id')) && ($type = $this->element->getData('type')))
+    {
+      $width = $this->container->getParameter('deezer_player_width');
+      $heigth = $this->container->getParameter('deezer_player_height');
+      $this->element->setEmbed(
+        '<iframe scrolling="no" frameborder="0" allowTransparency="true" '
+        .'src="http://www.deezer.com/fr/plugins/player?autoplay=false&playlist=true'
+        .'&width='.$width.'&height='.$heigth.'&cover=true&btn_popup=true&type='.$type.'&id='.$ref_id.'&title=" '
+        .'width="'.$width.'" height="'.$heigth.'"></iframe>'
+      );
+    }
+  }
+  
+  public function proceedThumbnailUrl()
+  {
+    if (($thumb = $this->element->getData('cover_url')))
+    {
+      $this->element->setThumbnailUrl($thumb);
+    }
+  }
+  
+}

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

@@ -0,0 +1,127 @@
+<?php
+
+namespace Muzich\CoreBundle\Factory\Elements;
+
+use Muzich\CoreBundle\Factory\ElementFactory;
+
+/**
+ * 
+ *
+ * @author bux
+ */
+class Jamendocom extends ElementFactory
+{
+  
+  /**
+   *  ALBUM = http://www.jamendo.com/fr/album/30661
+   *  TRACK = http://www.jamendo.com/fr/track/207079
+   */
+  public function retrieveDatas()
+  {
+    $url_clean = $this->getCleanedUrl();
+    
+    // album
+    $type   = null;
+    $ref_id = null;
+    if (preg_match("#^\/[a-zA-Z0-9_-]+\/album\/([0-9]+)#", $url_clean, $chaines))
+    {
+      $type   = 'album';
+      $ref_id = $chaines[1];
+    }
+    // track
+    else if (preg_match("#^\/[a-zA-Z0-9_-]+\/track\/([0-9]+)#", $url_clean, $chaines))
+    {
+      $type = 'track';
+      $ref_id = $chaines[1];
+    }
+    
+    $this->element->setData('type'  , $type);
+    $this->element->setData('ref_id', $ref_id);
+    
+    // Récupération de données avec l'API
+    $api_url = null;
+    switch ($type)
+    {
+      case 'album':
+        $api_url = "http://api.jamendo.com/get2/image/album/json/?id=".$ref_id;
+      break;
+    
+      /**
+       * Lorsque l'on a une track, il faut récupérer les infos sur l'album dans laquelle
+       * est la track
+       */
+      case 'track':
+        $get_album_url = "http://www.jamendo.com/get/album/id/track/page/json/".$ref_id.'/';
+
+        $ch = curl_init($get_album_url);
+        curl_setopt_array($ch, array(
+          CURLOPT_RETURNTRANSFER => true,
+          CURLOPT_HTTPHEADER => array('Content-type: application/json')
+        ));
+        $result = json_decode(curl_exec($ch));
+        if (count($result))
+        {
+          $album_url = str_replace('http://www.jamendo.com', '', $result[0]);
+
+          $expl_alb = null;
+          if (preg_match("#^\/album\/([0-9]+)#", $album_url, $expl_alb))
+          {
+            $id_album = $expl_alb[1];
+            $api_url = "http://api.jamendo.com/get2/image/album/json/?id=".$id_album;
+          }
+        }
+      break;
+    }
+    
+    if ($api_url)
+    {
+      $ch = curl_init($api_url);
+      $options = array(
+        CURLOPT_RETURNTRANSFER => true,
+        CURLOPT_HTTPHEADER => array('Content-type: text/plain')
+      );
+      curl_setopt_array( $ch, $options );
+      $result = json_decode(curl_exec($ch));
+      
+      if (count($result))
+      {
+        $this->element->setData('thumb_url', $result[0]);
+      }
+    }
+  }
+  
+  public function proceedEmbedCode()
+  {
+    if (($ref_id = $this->element->getData('ref_id')) && ($type = $this->element->getData('type')))
+    {
+      $height = $this->container->getParameter('jamendo_player_height');
+      $width = $this->container->getParameter('jamendo_player_width');
+      $embed_url = "http://widgets.jamendo.com/fr/$type/?".$type."_id=$ref_id&playertype=2008";
+      $this->element->setEmbed(
+        '<object width="'.$width.'" height="'.$height.'" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"'
+            .' codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0" align="middle">
+            <param name="allowScriptAccess" value="always" />
+            <param name="wmode" value="transparent" />
+            <param name="movie" value="'.$embed_url.'" />
+            <param name="quality" value="high" />
+            <param name="bgcolor" value="#FFFFFF" />
+            <embed src="'.$embed_url.'" quality="high" wmode="transparent" bgcolor="#FFFFFF"'
+            .' width="'.$width.'" height="'.$height.'" align="middle" allowScriptAccess="always"'
+            .' type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer">
+              &nbsp;
+            </embed>
+            &nbsp;
+          </object>'  
+      );
+    }
+  }
+  
+  public function proceedThumbnailUrl()
+  {
+    if (($thumb = $this->element->getData('thumb_url')))
+    {
+      $this->element->setThumbnailUrl($thumb);
+    }
+  }
+  
+}

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

@@ -0,0 +1,106 @@
+<?php
+
+namespace Muzich\CoreBundle\Factory\Elements;
+
+use Muzich\CoreBundle\Factory\ElementFactory;
+
+/**
+ * 
+ *
+ * @author bux
+ */
+class Soundcloudcom extends ElementFactory
+{
+  
+  /**
+   * ??SET = http://soundcloud.com/matas/sets/library-project
+   * ??    = http://soundcloud.com/matas/anadrakonic-waltz
+   */
+  public function retrieveDatas()
+  {
+    $url_clean = $this->getCleanedUrl();
+    
+    $ref_id = null;
+    // ??SET
+    if (preg_match("#^\/[a-zA-Z0-9_-]+\/sets\/[a-zA-Z0-9_-]+#", $url_clean, $chaines))
+    {
+      $ref_id = $url_clean;
+    }
+    // ???
+    else if (preg_match("#^\/[a-zA-Z0-9_-]+\/[a-zA-Z0-9_-]+#", $url_clean, $chaines))
+    {
+      $ref_id = $url_clean;
+    }
+    
+    // On en gère pas encore les recherches
+    if (preg_match("#\/search\?q#", $url_clean, $chaines))
+    {
+      $ref_id = null;
+    }
+    
+    $this->element->setData('ref_id', $ref_id);
+    
+    // récupération de données avec l'API
+    if ($ref_id)
+    {
+      $ch = curl_init('http://api.soundcloud.com/resolve.json?url='.$ref_id.'&client_id=39946ea18e3d78d64c0ac95a025794e1');
+
+      $options = array(
+        CURLOPT_RETURNTRANSFER => true,
+        CURLOPT_HTTPHEADER => array('Content-type: application/json')
+      );
+
+      curl_setopt_array( $ch, $options );
+      $result = json_decode(curl_exec($ch));
+
+      if (isset($result->errors))
+      {
+        if (count($result->errors))
+        {
+          return null;
+        }
+      }
+
+      $getjsonurl = $result->location;
+      $ch = curl_init($getjsonurl);
+      curl_setopt_array($ch, $options);
+      $result = json_decode(curl_exec($ch));
+
+      if (isset($result->artwork_url))
+      {
+        $this->element->setData('artwork_url', $result->artwork_url);
+      }
+    }
+  }
+  
+  public function proceedEmbedCode()
+  {
+    if (($ref_id = $this->element->getData('ref_id')))
+    {
+      $ref_id = 'http://soundcloud.com'.$ref_id;
+      $embed_id = md5($ref_id);
+      $height = $this->container->getParameter('soundcloud_player_height');
+      $this->element->setEmbed(
+        '<object height="'.$height.'" width="100%" id="embed_'.$embed_id.'" '
+          .'classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000">
+          <param name="movie" value="http://player.soundcloud.com/player.swf?url='.$ref_id.'&amp;'
+          .'enable_api=true&amp;object_id=embed_'.$embed_id.'"></param>
+          <param name="allowscriptaccess" value="always"></param>
+          <embed allowscriptaccess="always" height="'.$height.'" '
+          .'src="http://player.soundcloud.com/player.swf?url='.$ref_id.'&amp;enable_api=true'
+          .'&amp;object_id=embed_'.$embed_id.'" type="application/x-shockwave-flash" '
+          .'width="100%" name="embed_'.$embed_id.'"></embed>
+        </object>'
+      );
+    }
+  }
+  
+  public function proceedThumbnailUrl()
+  {
+    if (($thumb = $this->element->getData('artwork_url')))
+    {
+      $this->element->setThumbnailUrl($thumb);
+    }
+  }
+  
+}

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

@@ -0,0 +1,34 @@
+<?php
+
+namespace Muzich\CoreBundle\Factory\Elements;
+
+use Muzich\CoreBundle\Factory\Elements\Youtubecom;
+
+/**
+ * 
+ *
+ * @author bux
+ */
+class Youtube extends Youtubecom
+{
+  
+  public function retrieveDatas()
+  {
+    $url_clean = $this->getCleanedUrl();
+    $ref_id = null;
+    
+    if (preg_match("#\/([a-zA-Z0-9]+)#", $url_clean, $chaines))
+    {
+      $ref_id = $chaines[1];
+    }
+    
+    $this->element->setData('ref_id', $ref_id);
+    
+    // Données API
+    if ($ref_id)
+    {
+      
+    }
+  }
+  
+}

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

@@ -0,0 +1,61 @@
+<?php
+
+namespace Muzich\CoreBundle\Factory\Elements;
+
+use Muzich\CoreBundle\Factory\ElementFactory;
+
+/**
+ * 
+ *
+ * @author bux
+ */
+class Youtubecom extends ElementFactory
+{
+  
+  public function retrieveDatas()
+  {
+    $url_clean = $this->getCleanedUrl();
+    $ref_id = null;
+    
+    if (preg_match("#(v\/|watch\?v=)([\w\-]+)#", $url_clean, $chaines))
+    {
+      $ref_id = $chaines[2];
+    }
+    else if (preg_match("#(v=|watch\?v=)([\w\-]+)#", $url_clean, $chaines))
+    {
+      $ref_id = $chaines[2];
+    }
+    
+    $this->element->setData('ref_id', $ref_id);
+    
+    // Données API TODO: REFACTORISER
+    if ($ref_id)
+    {
+      
+    }
+  }
+  
+  public function proceedEmbedCode()
+  {
+    if (($ref_id = $this->element->getData('ref_id')))
+    {
+      $width = $this->container->getParameter('youtube_player_width');
+      $height = $this->container->getParameter('youtube_player_height');
+      $this->element->setEmbed(
+        '<iframe width="'.$width.'" height="'.$height.'" '
+        .'src="http://www.youtube.com/embed/'.$ref_id.'" '
+        .'frameborder="0" allowfullscreen></iframe>'
+      );
+    }
+  }
+  
+  public function proceedThumbnailUrl()
+  {
+    if (($ref_id = $this->element->getData('ref_id')))
+    {
+      $this->element->setThumbnailUrl(
+        'http://img.youtube.com/vi/'.$ref_id.'/default.jpg'        
+      );
+    }
+  }
+}

src/Muzich/CoreBundle/ElementFactory/ElementManager.php → src/Muzich/CoreBundle/Managers/ElementManager.php

@@ -1,18 +1,18 @@
 <?php
 
-namespace Muzich\CoreBundle\ElementFactory;
+namespace Muzich\CoreBundle\Managers;
 
 use Muzich\CoreBundle\Entity\Element;
 use Muzich\CoreBundle\Entity\User;
 use Doctrine\ORM\EntityManager;
 use Symfony\Component\DependencyInjection\Container;
 
-use Muzich\CoreBundle\ElementFactory\Site\YoutubecomFactory;
-use Muzich\CoreBundle\ElementFactory\Site\YoutubeFactory;
-use Muzich\CoreBundle\ElementFactory\Site\DailymotioncomFactory;
-use Muzich\CoreBundle\ElementFactory\Site\JamendocomFactory;
-use Muzich\CoreBundle\ElementFactory\Site\SoundcloudcomFactory;
-use Muzich\CoreBundle\ElementFactory\Site\DeezercomFactory;
+use Muzich\CoreBundle\Factory\Elements\Youtubecom;
+use Muzich\CoreBundle\Factory\Elements\Youtube;
+use Muzich\CoreBundle\Factory\Elements\Dailymotioncom;
+use Muzich\CoreBundle\Factory\Elements\Jamendocom;
+use Muzich\CoreBundle\Factory\Elements\Soundcloudcom;
+use Muzich\CoreBundle\Factory\Elements\Deezercom;
 
 /**
  * 
@@ -130,8 +130,11 @@ class ElementManager
     if (in_array($this->element->getType(), $this->factories))
     {
       $site_factory = $this->getFactory();
-      $this->element->setEmbed($site_factory->getEmbedCode());
-      $this->element->setThumbnailUrl($site_factory->getThumbnailUrl());
+      // On récupères les datas de l'élément
+      $site_factory->retrieveDatas();
+      // On procède a la construction de nos informations
+      $site_factory->proceedEmbedCode();
+      $site_factory->proceedThumbnailUrl();
     }
     
   }
@@ -144,22 +147,22 @@ class ElementManager
     switch ($this->element->getType())
     {
       case 'youtube.com':
-        return new YoutubecomFactory($this->element, $this->container);
+        return new Youtubecom($this->element, $this->container);
       break;
       case 'youtu.be':
-        return new YoutubeFactory($this->element, $this->container);
+        return new Youtube($this->element, $this->container);
       break;
       case 'soundcloud.com':
-        return new SoundcloudcomFactory($this->element, $this->container);
+        return new Soundcloudcom($this->element, $this->container);
       break;
       case 'jamendo.com':
-        return new JamendocomFactory($this->element, $this->container);
+        return new Jamendocom($this->element, $this->container);
       break;
       case 'dailymotion.com':
-        return new DailymotioncomFactory($this->element, $this->container);
+        return new Dailymotioncom($this->element, $this->container);
       break;
       case 'deezer.com':
-        return new DeezercomFactory($this->element, $this->container);
+        return new Deezercom($this->element, $this->container);
       break;
       default:
         throw new \Exception("La Factory n'est pas prise en charge pour ce type.");

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

@@ -4,7 +4,7 @@ namespace Muzich\CoreBundle\Tests\Searcher;
 
 use Muzich\CoreBundle\lib\UnitTest;
 use Muzich\CoreBundle\Entity\Element;
-use Muzich\CoreBundle\ElementFactory\ElementManager;
+use Muzich\CoreBundle\Managers\ElementManager;
 use Doctrine\Common\Collections\ArrayCollection;
 
 class ElementFactoryTest extends UnitTest
@@ -122,32 +122,43 @@ class ElementFactoryTest extends UnitTest
     /*
      * - soundcloud.com
      */
-    $id = md5('http://soundcloud.com/matas/sets/library-project');
+    $url_id = 'http://soundcloud.com/matas/sets/library-project';
+    $embed_id = md5($url_id);
     $this->proceed_elementAndFill(
       $bux, 
       'faez7tf8re9h4gf5j64dssz', 
       'http://soundcloud.com/matas/sets/library-project', 
       array($hardtek->getId(), $tribe->getId()), 
-      '<object height="'.$this->getParam('soundcloud_player_height').'" width="100%" id="embed_'.$id.'" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000">
-          <param name="movie" value="http://player.soundcloud.com/player.swf?url=http://soundcloud.com/matas/sets/library-project&amp;enable_api=true&amp;object_id=embed_'.$id.'"></param>
+      '<object height="'.$this->getParam('soundcloud_player_height').'" width="100%" id="embed_'.$embed_id.'" '
+          .'classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000">
+          <param name="movie" value="http://player.soundcloud.com/player.swf?url='.$url_id.'&amp;'
+          .'enable_api=true&amp;object_id=embed_'.$embed_id.'"></param>
           <param name="allowscriptaccess" value="always"></param>
-          <embed allowscriptaccess="always" height="'.$this->getParam('soundcloud_player_height').'" src="http://player.soundcloud.com/player.swf?url=http://soundcloud.com/matas/sets/library-project&amp;enable_api=true&amp;object_id=embed_'.$id.'" type="application/x-shockwave-flash" width="100%" name="embed_'.$id.'"></embed>
-        </object>
-        '
+          <embed allowscriptaccess="always" height="'.$this->getParam('soundcloud_player_height').'" '
+          .'src="http://player.soundcloud.com/player.swf?url='.$url_id.'&amp;enable_api=true'
+          .'&amp;object_id=embed_'.$embed_id.'" type="application/x-shockwave-flash" '
+          .'width="100%" name="embed_'.$embed_id.'"></embed>
+        </object>'
     );
     
-    $id = md5('http://soundcloud.com/matas/above-hyperion-redux');
+    $url_id = 'http://soundcloud.com/matas/above-hyperion-redux';
+    $embed_id = md5($url_id);
     $this->proceed_elementAndFill(
       $bux, 
       'faez7tf8re9h4gf5j64dssz', 
       'http://soundcloud.com/matas/above-hyperion-redux', 
       array($hardtek->getId(), $tribe->getId()), 
-      '<object height="'.$this->getParam('soundcloud_player_height').'" width="100%" id="embed_'.$id.'" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000">
-          <param name="movie" value="http://player.soundcloud.com/player.swf?url=http://soundcloud.com/matas/above-hyperion-redux&amp;enable_api=true&amp;object_id=embed_'.$id.'"></param>
+      
+        '<object height="'.$this->getParam('soundcloud_player_height').'" width="100%" id="embed_'.$embed_id.'" '
+          .'classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000">
+          <param name="movie" value="http://player.soundcloud.com/player.swf?url='.$url_id.'&amp;'
+          .'enable_api=true&amp;object_id=embed_'.$embed_id.'"></param>
           <param name="allowscriptaccess" value="always"></param>
-          <embed allowscriptaccess="always" height="'.$this->getParam('soundcloud_player_height').'" src="http://player.soundcloud.com/player.swf?url=http://soundcloud.com/matas/above-hyperion-redux&amp;enable_api=true&amp;object_id=embed_'.$id.'" type="application/x-shockwave-flash" width="100%" name="embed_'.$id.'"></embed>
-        </object>
-        '
+          <embed allowscriptaccess="always" height="'.$this->getParam('soundcloud_player_height').'" '
+          .'src="http://player.soundcloud.com/player.swf?url='.$url_id.'&amp;enable_api=true'
+          .'&amp;object_id=embed_'.$embed_id.'" type="application/x-shockwave-flash" '
+          .'width="100%" name="embed_'.$embed_id.'"></embed>
+        </object>'
     );
     
     $this->proceed_elementAndFill(
@@ -183,20 +194,21 @@ class ElementFactoryTest extends UnitTest
       'gthyk456+liszz', 
       'http://www.jamendo.com/fr/album/30661', 
       array($hardtek->getId(), $tribe->getId()), 
-      '
-          <object width="'.$this->getParam('jamendo_player_width').'" height="'.$this->getParam('jamendo_player_height').'" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0" align="middle">
+      
+        '<object width="'.$this->getParam('jamendo_player_width').'" height="'.$this->getParam('jamendo_player_height').'" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"'
+            .' codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0" align="middle">
             <param name="allowScriptAccess" value="always" />
             <param name="wmode" value="transparent" />
             <param name="movie" value="http://widgets.jamendo.com/fr/album/?album_id=30661&playertype=2008" />
             <param name="quality" value="high" />
             <param name="bgcolor" value="#FFFFFF" />
-            <embed src="http://widgets.jamendo.com/fr/album/?album_id=30661&playertype=2008" quality="high" wmode="transparent" bgcolor="#FFFFFF" width="'.$this->getParam('jamendo_player_width').'" height="'.$this->getParam('jamendo_player_height').'" align="middle" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer">
+            <embed src="http://widgets.jamendo.com/fr/album/?album_id=30661&playertype=2008" quality="high" wmode="transparent" bgcolor="#FFFFFF"'
+            .' width="'.$this->getParam('jamendo_player_width').'" height="'.$this->getParam('jamendo_player_height').'" align="middle" allowScriptAccess="always"'
+            .' type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer">
               &nbsp;
             </embed>
             &nbsp;
-          </object>
-          <a href="http://pro.jamendo.com/" style="display:block;font-size:8px !important;">Catalogue professionnel de musique libre</a>
-        '
+          </object>' 
     );
     
     $this->proceed_elementAndFill(
@@ -204,20 +216,21 @@ class ElementFactoryTest extends UnitTest
       'gthyk456+liszz', 
       'http://www.jamendo.com/fr/track/207079', 
       array($hardtek->getId(), $tribe->getId()), 
-      '
-          <object width="'.$this->getParam('jamendo_player_width').'" height="'.$this->getParam('jamendo_player_height').'" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0" align="middle">
+      
+      '<object width="'.$this->getParam('jamendo_player_width').'" height="'.$this->getParam('jamendo_player_height').'" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"'
+      .' codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0" align="middle">
             <param name="allowScriptAccess" value="always" />
             <param name="wmode" value="transparent" />
-            <param name="movie" value="http://widgets.jamendo.com/fr/track/?playertype=2008&track_id=207079" />
+            <param name="movie" value="http://widgets.jamendo.com/fr/track/?track_id=207079&playertype=2008" />
             <param name="quality" value="high" />
             <param name="bgcolor" value="#FFFFFF" />
-            <embed src="http://widgets.jamendo.com/fr/track/?playertype=2008&track_id=207079" quality="high" wmode="transparent" bgcolor="#FFFFFF" width="'.$this->getParam('jamendo_player_width').'" height="'.$this->getParam('jamendo_player_height').'" align="middle" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer">
+            <embed src="http://widgets.jamendo.com/fr/track/?track_id=207079&playertype=2008" quality="high" wmode="transparent" bgcolor="#FFFFFF"'
+      .' width="'.$this->getParam('jamendo_player_width').'" height="'.$this->getParam('jamendo_player_height').'" align="middle" allowScriptAccess="always"'
+      .' type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer">
               &nbsp;
             </embed>
             &nbsp;
-          </object>
-          <a href="http://pro.jamendo.com/" style="display:block;font-size:8px !important;">Catalogue professionnel de musique libre</a>
-        '
+          </object>' 
     );
     
     $this->proceed_elementAndFill(

src/Muzich/CoreBundle/lib/UnitTest.php

@@ -4,7 +4,7 @@ namespace Muzich\CoreBundle\lib;
 
 require_once(__DIR__ . "/../../../../app/AppKernel.php");
 use Muzich\CoreBundle\Entity\Element;
-use Muzich\CoreBundle\ElementFactory\ElementManager;
+use Muzich\CoreBundle\Managers\ElementManager;
 
 class UnitTest extends \PHPUnit_Framework_TestCase
 {