Rename rapsysair:calendar2 command to rapsysair:calendar

[airbundle] / Entity / User.php

diff --git a/Entity/User.php b/Entity/User.php
index 7a82144e9c3790f222f15e1ef451bc60a4f96353..178bcec8a9799c96a517b1974ccbfe7803dec95e 100644 (file)
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -17,31 +17,34 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Rapsys\UserBundle\Entity\Civility;
 use Rapsys\UserBundle\Entity\User as BaseUser;
 
 use Rapsys\UserBundle\Entity\Civility;
 use Rapsys\UserBundle\Entity\User as BaseUser;
 

+/**
+ * {@inheritdoc}
+ */

 class User extends BaseUser {
        /**
         * City
         */
 class User extends BaseUser {
        /**
         * City
         */

-       private ?string $city;
+       private ?string $city = null;

 
        /**
 
        /**

-        * Phone
+        * Country

         */
         */

-       private ?string $phone;
+       private ?Country $country = null;

 
        /**
 
        /**

-        * Country
+        * Phone

         */
         */

-       private ?Country $country;
+       private ?string $phone = null;

 
        /**
         * Pseudonym
         */
 
        /**
         * Pseudonym
         */

-       private ?string $pseudonym;
+       private ?string $pseudonym = null;

 
        /**
         * Zipcode
         */
 
        /**
         * Zipcode
         */

-       private ?string $zipcode;
+       private ?string $zipcode = null;

 
        /**
         * Applications collection
 
        /**
         * Applications collection


@@ -93,13 +96,6 @@ class User extends BaseUser {
                //Call parent constructor
                parent::__construct($this->mail, $this->password, $this->civility, $this->forename, $this->surname, $this->active, $this->enable);
 
                //Call parent constructor
                parent::__construct($this->mail, $this->password, $this->civility, $this->forename, $this->surname, $this->active, $this->enable);
 

-               //Set defaults
-               $this->city = null;
-               $this->country = null;
-               $this->phone = null;
-               $this->pseudonym = null;
-               $this->zipcode = null;
-

                //Set collections
                $this->applications = new ArrayCollection();
                $this->dances = new ArrayCollection();
                //Set collections
                $this->applications = new ArrayCollection();
                $this->dances = new ArrayCollection();