Add city, country and zipcode

Drop slug
Cleanup

diff --git a/Entity/User.php b/Entity/User.php
index 189e0ea98795c062d82b41a0874b5a12f344d6b7..fe838c38cf6e18179d8a0f82a47c03e2a9cbb5a3 100644 (file)
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -13,27 +13,33 @@ namespace Rapsys\AirBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 
-use Rapsys\AirBundle\Entity\Application;
-use Rapsys\AirBundle\Entity\Group;
-use Rapsys\AirBundle\Entity\Link;
-use Rapsys\AirBundle\Entity\Snippet;
 use Rapsys\UserBundle\Entity\User as BaseUser;
 
 class User extends BaseUser {
        /**
         * @var string
         */
-       protected $pseudonym;
+       protected $city;
 
        /**
         * @var string
         */
        protected $phone;
 
+       /**
+        * @var Country
+        */
+       protected $country;
+
+       /**
+        * @var string
+        */
+       protected $pseudonym;
+
        /**
         * @var string
         */
-       protected $slug;
+       protected $zipcode;
 
        /**
         * @var ArrayCollection
@@ -75,9 +81,11 @@ class User extends BaseUser {
                parent::__construct($mail);
 
                //Set defaults
-               $this->pseudonym = null;
+               $this->city = null;
+               $this->country = null;
                $this->phone = null;
-               $this->slug = null;
+               $this->pseudonym = null;
+               $this->zipcode = null;
 
                //Set collections
                $this->applications = new ArrayCollection();
@@ -89,25 +97,47 @@ class User extends BaseUser {
        }
 
        /**
-        * Set pseudonym
+        * Set country
         *
-        * @param string $pseudonym
+        * @param Country $country
+        *
+        * @return Snippet
+        */
+       public function setCountry(Country $country) {
+               $this->country = $country;
+
+               return $this;
+       }
+
+       /**
+        * Get country
+        *
+        * @return Country
+        */
+       public function getCountry() {
+               return $this->country;
+       }
+
+       /**
+        * Set city
+        *
+        * @param string $city
         *
         * @return User
         */
-       public function setPseudonym(?string $pseudonym): User {
-               $this->pseudonym = $pseudonym;
+       public function setCity(?string $city): User {
+               $this->city = $city;
 
                return $this;
        }
 
        /**
-        * Get pseudonym
+        * Get city
         *
         * @return string
         */
-       public function getPseudonym(): ?string {
-               return $this->pseudonym;
+       public function getCity(): ?string {
+               return $this->city;
        }
 
        /**
@@ -133,25 +163,47 @@ class User extends BaseUser {
        }
 
        /**
-        * Set slug
+        * Set pseudonym
+        *
+        * @param string $pseudonym
+        *
+        * @return User
+        */
+       public function setPseudonym(?string $pseudonym): User {
+               $this->pseudonym = $pseudonym;
+
+               return $this;
+       }
+
+       /**
+        * Get pseudonym
+        *
+        * @return string
+        */
+       public function getPseudonym(): ?string {
+               return $this->pseudonym;
+       }
+
+       /**
+        * Set zipcode
         *
-        * @param string $slug
+        * @param string $zipcode
         *
         * @return User
         */
-       public function setSlug(?string $slug): User {
-               $this->slug = $slug;
+       public function setZipcode(?string $zipcode): User {
+               $this->zipcode = $zipcode;
 
                return $this;
        }
 
        /**
-        * Get slug
+        * Get zipcode
         *
         * @return string
         */
-       public function getSlug(): ?string {
-               return $this->slug;
+       public function getZipcode(): ?string {
+               return $this->zipcode;
        }
 
        /**