sf4 deprecated: migrate Doctrine ORM mapping to annotation

Entity/User.php

@@ -2,85 +2,126 @@
 
 namespace Chill\MainBundle\Entity;
 
-use Symfony\Component\Security\Core\User\AdvancedUserInterface;
+use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
+use Symfony\Component\Security\Core\User\AdvancedUserInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
  * User
+ *
+ * @ORM\Entity(repositoryClass="Chill\MainBundle\Repository\UserRepository")
+ * @ORM\Table(name="users")
+ * @ORM\Cache(usage="NONSTRICT_READ_WRITE", region="acl_cache_region")
  */
 class User implements AdvancedUserInterface {
     
     /**
      * @var integer
+     *
+     * @ORM\Id
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
      */
     protected $id;
 
     /**
      * @var string
+     *
+     * @ORM\Column(type="string", length=80)
      */
     private $username;
     
     /**
-     *
      * @var string
+     *
+     * @ORM\Column(
+     *     type="string",
+     *     length=80,
+     *     unique=true)
      */
     private $usernameCanonical;
     
     /**
-     *
      * @var string
+     *
+     * @ORM\Column(type="string", length=150, nullable=true)
      */
     private $email;
     
     /**
-     *
      * @var string
+     *
+     * @ORM\Column(
+     *     type="string",
+     *     length=150,
+     *     nullable=true,
+     *     unique=true)
      */
     private $emailCanonical;
     
     /**
+     * @var string
      *
-     * @var string 
+     * @ORM\Column(type="string", length=255)
      */
     private $password;
     
     /**
-     *
      * @var string
-     * @internal must be set to null if we use bcrypt 
+     * @internal must be set to null if we use bcrypt
+     *
+     * @ORM\Column(type="string", length=255, nullable=true)
      */
     private $salt = null;
     
     /**
-     *
      * @var boolean
+     *
+     * @ORM\Column(type="boolean")
+     *      sf4 check: in yml was false by default !?
      */
     private $locked = true;
     
     /**
-     *
      * @var boolean
+     *
+     * @ORM\Column(type="boolean")
      */
     private $enabled = true;
     
     /**
+     * @var Collection
      *
-     * @var Collection 
+     * @ORM\ManyToMany(
+     *     targetEntity="Chill\MainBundle\Entity\GroupCenter",
+     *     inversedBy="users")
+     * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
      */
     private $groupCenters;
     
+    
+    /**
+     * User constructor.
+     */
     public function __construct()
     {
         $this->groupCenters = new ArrayCollection();
     }
     
-    
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->getUsername();
+    }
+
     /**
      * Get id
      *
-     * @return integer 
+     * @return integer
      */
     public function getId()
     {
@@ -100,76 +141,95 @@ class User implements AdvancedUserInterface {
         return $this;
     }
     
-    public function __toString() {
-        return $this->getUsername();
-    }
-
-    public function eraseCredentials()
-    {
-        
-    }
-
     /**
-     * 
      * @return string
      */
-    public function getPassword()
-    {
-        return $this->password;
-    }
-
-    public function getRoles()
-    {
-        return array('ROLE_USER');
-    }
-
-    public function getSalt()
-    {
-        return $this->salt;
-    }
-
     public function getUsername()
     {
         return $this->username;
     }
     
-    public function getUsernameCanonical()
+    /**
+     */
+    public function eraseCredentials() {}
+    
+    /**
+     * @return array
+     */
+    public function getRoles()
     {
-        return $this->usernameCanonical;
+        return array('ROLE_USER');
     }
-
-    public function getEmail()
+    
+    /**
+     * @return null|string
+     */
+    public function getSalt()
     {
-        return $this->email;
+        return $this->salt;
     }
-
-    public function getEmailCanonical()
-    {
-        return $this->emailCanonical;
-    }
-
+    
+    /**
+     * @param $usernameCanonical
+     * @return $this
+     */
     public function setUsernameCanonical($usernameCanonical)
     {
         $this->usernameCanonical = $usernameCanonical;
         
         return $this;
     }
-
+    
+    /**
+     * @return string
+     */
+    public function getUsernameCanonical()
+    {
+        return $this->usernameCanonical;
+    }
+    
+    /**
+     * @param $email
+     * @return $this
+     */
     public function setEmail($email)
     {
         $this->email = $email;
         
         return $this;
     }
-
+    
+    /**
+     * @return string
+     */
+    public function getEmail()
+    {
+        return $this->email;
+    }
+    
+    /**
+     * @param $emailCanonical
+     * @return $this
+     */
     public function setEmailCanonical($emailCanonical)
     {
         $this->emailCanonical = $emailCanonical;
         
         return $this;
     }
-
-        
+    
+    /**
+     * @return string
+     */
+    public function getEmailCanonical()
+    {
+        return $this->emailCanonical;
+    }
+    
+    /**
+     * @param $password
+     * @return $this
+     */
     function setPassword($password)
     {
         $this->password =  $password;
@@ -177,45 +237,50 @@ class User implements AdvancedUserInterface {
         return $this;
     }
 
+    /**
+     * @return string
+     */
+    public function getPassword()
+    {
+        return $this->password;
+    }
+    
+    /**
+     * @param $salt
+     * @return $this
+     */
     function setSalt($salt)
     {
         $this->salt = $salt;
         return $this;
     }
-
+    
     /**
-     * {@inheritdoc}
-     * 
-     * @return boolean
+     * @return bool
      */
     public function isAccountNonExpired()
     {
         return true;
     }
-
+    
     /**
-     * {@inheritdoc}
-     * 
+     * @return bool
      */
     public function isAccountNonLocked()
     {
         return $this->locked;
     }
-
+    
     /**
-     * {@inheritdoc}
-     * 
-     * @return boolean
+     * @return bool
      */
     public function isCredentialsNonExpired()
     {
         return true;
     }
-
+    
     /**
-     * {@inheritdoc}
-     * 
-     * @return boolean
+     * @return bool
      */
     public function isEnabled()
     {
@@ -223,7 +288,6 @@ class User implements AdvancedUserInterface {
     }
     
     /**
-     * 
      * @param bool $enabled
      */
     public function setEnabled($enabled)
@@ -234,8 +298,7 @@ class User implements AdvancedUserInterface {
     }
     
     /**
-     * 
-     * @return GroupCenter[]
+     * @return GroupCenter
      */
     public function getGroupCenters()
     {
@@ -243,7 +306,6 @@ class User implements AdvancedUserInterface {
     }
     
     /**
-     * 
      * @param \Chill\MainBundle\Entity\GroupCenter $groupCenter
      * @return \Chill\MainBundle\Entity\User
      */
@@ -254,7 +316,6 @@ class User implements AdvancedUserInterface {
     }
     
     /**
-     * 
      * @param \Chill\MainBundle\Entity\GroupCenter $groupCenter
      * @throws \RuntimeException if the groupCenter is not in the collection
      */