fix #603 [CoreBundle]: Try to move name field to domain accessor table

unite-cms · May 20, 2019 · b376abe · b376abe
1 parent ecadd62
commit b376abe
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 74 deletions.
diff --git a/src/Bundle/CoreBundle/Entity/ApiKey.php b/src/Bundle/CoreBundle/Entity/ApiKey.php
@@ -21,14 +21,6 @@ class ApiKey extends DomainAccessor implements UserInterface, \Serializable
 {
     static function getType() : string { return 'api_key'; }
 
-    /**
-     * @var string
-     * @Assert\NotBlank(message="not_blank")
-     * @Assert\Length(max="255", maxMessage="too_long")
-     * @ORM\Column(name="name", type="string", length=255)
-     */
-    private $name;
-
     /**
      * @var string
      * @Assert\NotBlank(message="not_blank")
@@ -61,35 +53,6 @@ static function getType() : string { return 'api_key'; }
      */
     private $created;
 
-    public function __toString()
-    {
-        return ''.$this->getName();
-    }
-
-    /**
-     * Set name
-     *
-     * @param string $name
-     *
-     * @return ApiKey
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    /**
-     * Get name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
     /**
      * @return Organization
      */

diff --git a/src/Bundle/CoreBundle/Entity/DomainAccessor.php b/src/Bundle/CoreBundle/Entity/DomainAccessor.php
@@ -30,6 +30,14 @@ abstract class DomainAccessor
      */
     protected $id;
 
+    /**
+     * @var string
+     * @Assert\NotBlank(message="not_blank")
+     * @Assert\Length(max="255", maxMessage="too_long")
+     * @ORM\Column(name="name", type="string", length=255)
+     */
+    protected $name;
+
     /**
      * @var DomainMember[]
      * @Assert\Valid()
@@ -49,6 +57,11 @@ public function __construct()
         $this->domains = new ArrayCollection();
     }
 
+    public function __toString()
+    {
+        return ''.$this->getName();
+    }
+
     /**
      * Get id
      *
@@ -59,6 +72,30 @@ public function getId()
         return $this->id;
     }
 
+    /**
+     * Set name
+     *
+     * @param string $name
+     *
+     * @return DomainAccessor
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Get name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
     /**
      * @return DomainMember[]|ArrayCollection
      */

diff --git a/src/Bundle/CoreBundle/Entity/User.php b/src/Bundle/CoreBundle/Entity/User.php
@@ -35,14 +35,6 @@ static function getType() : string { return 'user'; }
      */
     private $email;
 
-    /**
-     * @var string
-     * @Assert\NotBlank(message="not_blank")
-     * @Assert\Length(max="255", maxMessage="too_long")
-     * @ORM\Column(name="name", type="string", length=255)
-     */
-    private $name;
-
     /**
      * @var string
      * @Assert\NotBlank(message="not_blank", groups={"CREATE"})
@@ -86,11 +78,6 @@ public function __construct()
         $this->roles = [self::ROLE_USER];
     }
 
-    public function __toString()
-    {
-        return ''.$this->getName();
-    }
-
     /**
      * Set email
      *
@@ -115,30 +102,6 @@ public function getEmail()
         return $this->email;
     }
 
-    /**
-     * Set name
-     *
-     * @param string $name
-     *
-     * @return User
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    /**
-     * Get name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
     /**
      * @param array $roles
      *