Merge branch 'unstable' into feature/mynetwork

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "vendor/gedmo-doctrine-extensions"]
+	path = vendor/gedmo-doctrine-extensions
+	url = git://github.com/l3pp4rd/DoctrineExtensions.git
+[submodule "vendor/bundles/Stof/DoctrineExtensionsBundle"]
+	path = vendor/bundles/Stof/DoctrineExtensionsBundle
+	url = git://github.com/stof/StofDoctrineExtensionsBundle.git

app/AppKernel.php

@@ -19,6 +19,7 @@ class AppKernel extends Kernel
             new JMS\SecurityExtraBundle\JMSSecurityExtraBundle(),
             new FOS\UserBundle\FOSUserBundle(),
             new Symfony\Bundle\DoctrineFixturesBundle\DoctrineFixturesBundle(),
+            new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
             new Muzich\CoreBundle\MuzichCoreBundle(),
             new Muzich\UserBundle\MuzichUserBundle(),
             new Muzich\IndexBundle\MuzichIndexBundle(),

app/autoload.php

@@ -18,6 +18,8 @@ $loader->registerNamespaces(array(
     //'Muzich'           => __DIR__.'/../vendor/src',
     'Doctrine\\Common\\DataFixtures' => __DIR__.'/../vendor/doctrine-fixtures/lib',
     'Doctrine\\Common' => __DIR__.'/../vendor/doctrine-common/lib',
+    'Stof'  => __DIR__.'/../vendor/bundles',
+    'Gedmo' => __DIR__.'/../vendor/gedmo-doctrine-extensions/lib',
 ));
 $loader->registerPrefixes(array(
     'Twig_Extensions_' => __DIR__.'/../vendor/twig-extensions/lib',

src/Muzich/CoreBundle/DataFixtures/ORM/LoadElementData.php

@@ -37,19 +37,13 @@ class LoadElementData  extends AbstractFixture implements OrderedFixtureInterfac
   /**
    *  
    */
-  protected function createElement($reference_id, $name, $url, $tags, $type, $owner, $group = null, $date = null)
-  {
-    if (!$date)
-    {
-      $date = new \DateTime();
-    }
-    
+  protected function createElement($reference_id, $name, $url, $tags, $type, $owner, $group = null)
+  {    
     $element = new Element();
     $element->setName(ucfirst($name));
     $element->setUrl($url);
     $element->setType($type);
     $element->setOwner($owner);
-    $element->setDateAdded($date);
     if ($group)
       $element->setGroup($group);
     $this->addReference('element_'.$reference_id, $element);
@@ -65,7 +59,16 @@ class LoadElementData  extends AbstractFixture implements OrderedFixtureInterfac
   public function load($entity_manager)
   {
     $this->entity_manager = $entity_manager;
+    
+    // Timestampable stuff
+    $evm = new \Doctrine\Common\EventManager();
+    // ORM and ORM
+    $timestampableListener = new \Gedmo\Timestampable\TimestampableListener();
+    $evm->addEventSubscriber($timestampableListener);
+    // now this event manager should be passed to entity manager constructor
+    $this->entity_manager->getEventManager()->addEventSubscriber($timestampableListener);
 
+    // 
     $bux  = $this->entity_manager->merge($this->getReference('user_bux'));
     $jean = $this->entity_manager->merge($this->getReference('user_jean'));
     $paul = $this->entity_manager->merge($this->getReference('user_paul'));

src/Muzich/CoreBundle/DataFixtures/ORM/LoadGroupData.php

@@ -79,6 +79,14 @@ class LoadGroupData  extends AbstractFixture implements OrderedFixtureInterface,
   {
     $this->entity_manager = $entity_manager;
 
+    // Slug stuff
+    $evm = new \Doctrine\Common\EventManager();
+    // ORM and ODM
+    $sluggableListener = new \Gedmo\Sluggable\SluggableListener();
+    $evm->addEventSubscriber($sluggableListener);
+    // now this event manager should be passed to entity manager constructor
+    $entity_manager->getEventManager()->addEventSubscriber($sluggableListener);
+    
     // Création des groupes
     
     $group_dudeldrum = $this->createGroup('dudeldrum', 'DUDELDRUM', 

src/Muzich/CoreBundle/Entity/Element.php

@@ -4,6 +4,7 @@ namespace Muzich\CoreBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use \Doctrine\Common\Collections\ArrayCollection;
+use Gedmo\Mapping\Annotation as Gedmo;
 
 
 /**
@@ -83,12 +84,20 @@ class Element
   protected $name;
   
   /**
-   * Date d'ajout dans le réseau
-   * 
+   * @var datetime $created
+   *
+   * @Gedmo\Timestampable(on="create")
    * @ORM\Column(type="datetime")
-   * @var type string
    */
-  protected $date_added;
+  private $created;
+
+  /**
+   * @var datetime $updated
+   *
+   * @ORM\Column(type="datetime")
+   * @Gedmo\Timestampable(on="update")
+   */
+  private $updated;
   
 
   /**
@@ -140,26 +149,6 @@ class Element
   {
     return $this->name;
   }
-
-  /**
-   * Set date_added
-   *
-   * @param datetime $dateAdded
-   */
-  public function setDateAdded($dateAdded)
-  {
-    $this->date_added = $dateAdded;
-  }
-
-  /**
-   * Get date_added
-   *
-   * @return datetime 
-   */
-  public function getDateAdded()
-  {
-    return $this->date_added;
-  }
   
   /**
    * Set type
@@ -267,4 +256,44 @@ class Element
   {
       return $this->group;
   }
+
+  /**
+   * Set created
+   *
+   * @param date $created
+   */
+  public function setCreated($created)
+  {
+      $this->created = $created;
+  }
+
+  /**
+   * Get created
+   *
+   * @return date 
+   */
+  public function getCreated()
+  {
+      return $this->created;
+  }
+
+  /**
+   * Set updated
+   *
+   * @param datetime $updated
+   */
+  public function setUpdated($updated)
+  {
+      $this->updated = $updated;
+  }
+
+  /**
+   * Get updated
+   *
+   * @return datetime 
+   */
+  public function getUpdated()
+  {
+      return $this->updated;
+  }
 }

src/Muzich/CoreBundle/Entity/Group.php

@@ -4,6 +4,7 @@ namespace Muzich\CoreBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use \Doctrine\Common\Collections\ArrayCollection;
+use Gedmo\Mapping\Annotation as Gedmo;
 
 /**
  * Le groupe est une sorte de liste de diffusion, a laquelle les
@@ -35,6 +36,12 @@ class Group
   protected $name;
   
   /**
+   * @Gedmo\Slug(fields={"name"})
+   * @ORM\Column(length=128, unique=true)
+   */
+  protected $slug;
+  
+  /**
    * Description
    * 
    * @ORM\Column(type="text")

src/Muzich/CoreBundle/Entity/User.php

@@ -5,6 +5,7 @@ namespace Muzich\CoreBundle\Entity;
 use FOS\UserBundle\Entity\User as BaseUser;
 use Doctrine\ORM\Mapping as ORM;
 use \Doctrine\Common\Collections\ArrayCollection;
+use Gedmo\Mapping\Annotation as Gedmo;
 
 /**
  * Cet entité est l'utilisateur ayant effectué la requête.
@@ -24,6 +25,12 @@ class User extends BaseUser
   protected $id;
   
   /**
+   * @Gedmo\Slug(fields={"username"})
+   * @ORM\Column(length=128, unique=true)
+   */
+  protected $slug;
+  
+  /**
    * Cet attribut contient les enregistrements UsersTagsFavorites lié 
    * a cet utilisateur dans le cadre des Tags Favoris.
    * 
@@ -245,6 +252,16 @@ class User extends BaseUser
     return $this->groups;
   }
   
+  public function getSlug()
+  {
+    return $this->slug;
+  }
+  
+  public function setSlug($slug)
+  {
+    $this->slug = $slug;
+  }
+  
   /*
    * 
    * 

src/Muzich/UserBundle/DataFixtures/ORM/LoadUserData.php

@@ -67,9 +67,19 @@ class LoadUserData extends AbstractFixture implements OrderedFixtureInterface, C
   
   public function load($entity_manager)
   {
+    
     $this->entity_manager = $entity_manager;
     $this->user_manager = $this->container->get('fos_user.user_manager');
     
+    // Slug stuff
+    $evm = new \Doctrine\Common\EventManager();
+    // ORM and ODM
+    $sluggableListener = new \Gedmo\Sluggable\SluggableListener();
+    $evm->addEventSubscriber($sluggableListener);
+    // now this event manager should be passed to entity manager constructor
+    $entity_manager->getEventManager()->addEventSubscriber($sluggableListener);
+    
+    
     // Création des Users
     $admin  = $this->createUser('admin', 'admin@root', 'toor');
     $bux    = $this->createUser('bux', 'bux@root', 'toor');

vendor/bundles/FOS/UserBundle

@@ -1 +1 @@
-Subproject commit ce316132d0701fd96cac7df3b1998be0d4986ac7
+Subproject commit a21cb51441a2fe9738f60fbf3470970512a83a33

vendor/bundles/Stof/DoctrineExtensionsBundle

@@ -0,0 +1 @@
+Subproject commit a82ae9a667dc95aa64865512566aeac9cbe515c1

vendor/bundles/Symfony/Bundle/DoctrineFixturesBundle

@@ -1 +1 @@
-Subproject commit 275e33be3ed4aa76afc21ff0aa5517b0e4795ba1
+Subproject commit a66be2f077f3a4e5c3801b356b42b8782f1abbd6

vendor/doctrine-fixtures

@@ -1 +1 @@
-Subproject commit 4a8464ef83093de2378cef2770e13da7e4858ffc
+Subproject commit 76f8221609129651937f52553f3e1b2bd915fd3e

vendor/gedmo-doctrine-extensions

@@ -0,0 +1 @@
+Subproject commit a4e25dcf884b1e8a7d92d4e6bddfc8aadf362f7f