Replace dropped calls with checker, factory and security replacements

[airbundle] / Entity / User.php

diff --git a/Entity/User.php b/Entity/User.php
index 1fb9f1ae33588692a5345a441d3b1b22d5bf69d3..4b3d4e3e177cf1dbae72a952d9885896ed102c87 100644 (file)
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -11,73 +11,94 @@
 
 namespace Rapsys\AirBundle\Entity;
 
 
 namespace Rapsys\AirBundle\Entity;
 

+use Doctrine\Common\Collections\Collection;

 use Doctrine\Common\Collections\ArrayCollection;
 
 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\Civility;

 use Rapsys\UserBundle\Entity\User as BaseUser;
 
 class User extends BaseUser {
        /**
 use Rapsys\UserBundle\Entity\User as BaseUser;
 
 class User extends BaseUser {
        /**

-        * @var string
+        * @var ?string

         */
         */

-       protected $pseudonym;
+       private ?string $city;

 
        /**
 
        /**

-        * @var string
+        * @var ?string

         */
         */

-       protected $phone;
+       private ?string $phone;

 
        /**
 
        /**

-        * @var string
+        * @var Country

         */
         */

-       protected $slug;
+       private ?Country $country;

 
        /**
 
        /**

-        * @var ArrayCollection
+        * @var ?string

         */
         */

-       private $applications;
+       private ?string $pseudonym;

 
        /**
 
        /**

-        * @var ArrayCollection
+        * @var ?string

         */
         */

-       private $dances;
+       private ?string $zipcode;

 
        /**
 
        /**

-        * @var ArrayCollection
+        * @var \Doctrine\Common\Collections\Collection

         */
         */

-       private $locations;
+       private Collection $applications;

 
        /**
 
        /**

-        * @var ArrayCollection
+        * @var \Doctrine\Common\Collections\Collection

         */
         */

-       private $snippets;
+       private Collection $dances;

 
        /**
 
        /**

-        * @var ArrayCollection
+        * @var \Doctrine\Common\Collections\Collection

         */
         */

-       private $subscribers;
+       private Collection $locations;

 
        /**
 
        /**

-        * @var ArrayCollection
+        * @var \Doctrine\Common\Collections\Collection

         */
         */

-       private $subscriptions;
+       private Collection $snippets;
+
+       /**
+        * @var \Doctrine\Common\Collections\Collection
+        */
+       private Collection $subscribers;
+
+       /**
+        * @var \Doctrine\Common\Collections\Collection
+        */
+       private Collection $subscriptions;
+
+       /**
+        * @var \Doctrine\Common\Collections\Collection
+        */
+       private Collection $googleTokens;

 
        /**
         * Constructor
         *
         * @param string $mail The user mail
 
        /**
         * Constructor
         *
         * @param string $mail The user mail

-        */
-       public function __construct(string $mail) {
+        * @param string $password The user password
+        * @param ?Civility $civility The user civility
+        * @param ?string $forename The user forename
+        * @param ?string $surname The user surname
+        * @param bool $active The user active
+        * @param bool $enable The user enable
+        */
+       public function __construct(protected string $mail, protected string $password, protected ?Civility $civility = null, protected ?string $forename = null, protected ?string $surname = null, protected bool $active = false, protected bool $enable = true) {

                //Call parent constructor
                //Call parent constructor

-               parent::__construct($mail);
+               parent::__construct($this->mail, $this->password, $this->civility, $this->forename, $this->surname, $this->active, $this->enable);

 
                //Set defaults
 
                //Set defaults

-               $this->pseudonym = null;
+               $this->city = null;
+               $this->country = null;

                $this->phone = null;
                $this->phone = null;

-               $this->slug = null;
+               $this->pseudonym = null;
+               $this->zipcode = null;

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


@@ -86,28 +107,51 @@ class User extends BaseUser {
                $this->snippets = new ArrayCollection();
                $this->subscribers = new ArrayCollection();
                $this->subscriptions = new ArrayCollection();
                $this->snippets = new ArrayCollection();
                $this->subscribers = new ArrayCollection();
                $this->subscriptions = new ArrayCollection();

+               $this->googleTokens = new ArrayCollection();

        }
 
        /**
        }
 
        /**

-        * Set pseudonym
+        * Set city

         *
         *

-        * @param string $pseudonym
+        * @param string $city

         *
         * @return User
         */
         *
         * @return User
         */

-       public function setPseudonym(?string $pseudonym): User {
-               $this->pseudonym = $pseudonym;
+       public function setCity(?string $city): User {
+               $this->city = $city;

 
                return $this;
        }
 
        /**
 
                return $this;
        }
 
        /**

-        * Get pseudonym
+        * Get city

         *
         * @return string
         */
         *
         * @return string
         */

-       public function getPseudonym(): ?string {
-               return $this->pseudonym;
+       public function getCity(): ?string {
+               return $this->city;
+       }
+
+       /**
+        * Set country
+        *
+        * @param Country $country
+        *
+        * @return User
+        */
+       public function setCountry(?Country $country): User {
+               $this->country = $country;
+
+               return $this;
+       }
+
+       /**
+        * Get country
+        *
+        * @return Country
+        */
+       public function getCountry(): ?Country {
+               return $this->country;

        }
 
        /**
        }
 
        /**


@@ -133,87 +177,78 @@ class User extends BaseUser {
        }
 
        /**
        }
 
        /**

-        * Set slug
+        * Set pseudonym

         *
         *

-        * @param string $slug
+        * @param string $pseudonym

         *
         * @return User
         */
         *
         * @return User
         */

-       public function setSlug(?string $slug): User {
-               $this->slug = $slug;
+       public function setPseudonym(?string $pseudonym): User {
+               $this->pseudonym = $pseudonym;

 
                return $this;
        }
 
        /**
 
                return $this;
        }
 
        /**

-        * Get slug
+        * Get pseudonym

         *
         * @return string
         */
         *
         * @return string
         */

-       public function getSlug(): ?string {
-               return $this->slug;
+       public function getPseudonym(): ?string {
+               return $this->pseudonym;

        }
 
        /**
        }
 
        /**

-        * Add application
+        * Set zipcode

         *
         *

-        * @param Application $application
+        * @param string $zipcode

         *
         * @return User
         */
         *
         * @return User
         */

-       public function addApplication(Application $application): User {
-               $this->applications[] = $application;
+       public function setZipcode(?string $zipcode): User {
+               $this->zipcode = $zipcode;

 
                return $this;
        }
 
        /**
 
                return $this;
        }
 
        /**

-        * Remove application
-        *
-        * @param Application $application
-        */
-       public function removeApplication(Application $application): bool {
-               return $this->applications->removeElement($application);
-       }
-
-       /**
-        * Get applications
+        * Get zipcode

         *
         *

-        * @return ArrayCollection
+        * @return string

         */
         */

-       public function getApplications(): ArrayCollection {
-               return $this->applications;
+       public function getZipcode(): ?string {
+               return $this->zipcode;

        }
 
        /**
        }
 
        /**

-        * Add snippet
+        * Add application

         *
         *

-        * @param Snippet $snippet
+        * @param Application $application

         *
         * @return User
         */
         *
         * @return User
         */

-       public function addSnippet(Snippet $snippet): User {
-               $this->snippets[] = $snippet;
+       public function addApplication(Application $application): User {
+               $this->applications[] = $application;

 
                return $this;
        }
 
        /**
 
                return $this;
        }
 
        /**

-        * Remove snippet
+        * Remove application

         *
         *

-        * @param Snippet $snippet
+        * @param Application $application

         */
         */

-       public function removeSnippet(Snippet $snippet): bool {
-               return $this->snippets->removeElement($snippet);
+       public function removeApplication(Application $application): bool {
+               return $this->applications->removeElement($application);

        }
 
        /**
        }
 
        /**

-        * Get snippets
+        * Get applications

         *
         *

-        * @return ArrayCollection
+        * @return \Doctrine\Common\Collections\Collection

         */
         */

-       public function getSnippets(): ArrayCollection {
-               return $this->snippets;
+       public function getApplications(): Collection {
+               return $this->applications;

        }
 
        /**
        }
 
        /**


@@ -243,9 +278,9 @@ class User extends BaseUser {
        /**
         * Get dances
         *
        /**
         * Get dances
         *

-        * @return ArrayCollection
+        * @return \Doctrine\Common\Collections\Collection

         */
         */

-       public function getDances(): ArrayCollection {
+       public function getDances(): Collection {

                return $this->dances;
        }
 
                return $this->dances;
        }
 


@@ -274,12 +309,43 @@ class User extends BaseUser {
        /**
         * Get locations
         *
        /**
         * Get locations
         *

-        * @return ArrayCollection
+        * @return \Doctrine\Common\Collections\Collection

         */
         */

-       public function getLocations(): ArrayCollection {
+       public function getLocations(): Collection {

                return $this->locations;
        }
 
                return $this->locations;
        }
 

+       /**
+        * Add snippet
+        *
+        * @param Snippet $snippet
+        *
+        * @return User
+        */
+       public function addSnippet(Snippet $snippet): User {
+               $this->snippets[] = $snippet;
+
+               return $this;
+       }
+
+       /**
+        * Remove snippet
+        *
+        * @param Snippet $snippet
+        */
+       public function removeSnippet(Snippet $snippet): bool {
+               return $this->snippets->removeElement($snippet);
+       }
+
+       /**
+        * Get snippets
+        *
+        * @return \Doctrine\Common\Collections\Collection
+        */
+       public function getSnippets(): Collection {
+               return $this->snippets;
+       }
+

        /**
         * Add subscriber
         *
        /**
         * Add subscriber
         *


@@ -288,6 +354,9 @@ class User extends BaseUser {
         * @return User
         */
        public function addSubscriber(User $subscriber): User {
         * @return User
         */
        public function addSubscriber(User $subscriber): User {

+               //Add from owning side
+               $subscriber->addSubscription($this);
+

                $this->subscribers[] = $subscriber;
 
                return $this;
                $this->subscribers[] = $subscriber;
 
                return $this;


@@ -299,15 +368,22 @@ class User extends BaseUser {
         * @param User $subscriber
         */
        public function removeSubscriber(User $subscriber): bool {
         * @param User $subscriber
         */
        public function removeSubscriber(User $subscriber): bool {

+               if (!$this->subscriptions->contains($subscriber)) {
+                       return true;
+               }
+
+               //Remove from owning side
+               $subscriber->removeSubscription($this);
+

                return $this->subscribers->removeElement($subscriber);
        }
 
        /**
         * Get subscribers
         *
                return $this->subscribers->removeElement($subscriber);
        }
 
        /**
         * Get subscribers
         *

-        * @return ArrayCollection
+        * @return \Doctrine\Common\Collections\Collection

         */
         */

-       public function getSubscribers(): ArrayCollection {
+       public function getSubscribers(): Collection {

                return $this->subscribers;
        }
 
                return $this->subscribers;
        }
 


@@ -336,9 +412,40 @@ class User extends BaseUser {
        /**
         * Get subscriptions
         *
        /**
         * Get subscriptions
         *

-        * @return ArrayCollection
+        * @return \Doctrine\Common\Collections\Collection

         */
         */

-       public function getSubscriptions(): ArrayCollection {
+       public function getSubscriptions(): Collection {

                return $this->subscriptions;
        }
                return $this->subscriptions;
        }

+
+       /**
+        * Add google token
+        *
+        * @param GoogleToken $googleToken
+        *
+        * @return User
+        */
+       public function addGoogleToken(GoogleToken $googleToken): User {
+               $this->googleTokens[] = $googleToken;
+
+               return $this;
+       }
+
+       /**
+        * Remove google token
+        *
+        * @param GoogleToken $googleToken
+        */
+       public function removeGoogleToken(GoogleToken $googleToken): bool {
+               return $this->googleTokens->removeElement($googleToken);
+       }
+
+       /**
+        * Get googleTokens
+        *
+        * @return \Doctrine\Common\Collections\Collection
+        */
+       public function getGoogleTokens(): Collection {
+               return $this->googleTokens;
+       }

 }
 }