Drop entity short syntax removed upstream

[airbundle] / Entity / User.php

diff --git a/Entity/User.php b/Entity/User.php
index 387b1964e33963ef4356d1d838add7238ce3890e..4b3d4e3e177cf1dbae72a952d9885896ed102c87 100644 (file)
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -14,6 +14,7 @@ namespace Rapsys\AirBundle\Entity;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
 
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
 

+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 {


@@ -81,10 +82,16 @@ class User extends BaseUser {
         * 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
                $this->city = null;
 
                //Set defaults
                $this->city = null;


@@ -347,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;


@@ -358,6 +368,13 @@ 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);
        }
 
                return $this->subscribers->removeElement($subscriber);
        }
 


@@ -378,9 +395,6 @@ class User extends BaseUser {
         * @return User
         */
        public function addSubscription(User $subscription): User {
         * @return User
         */
        public function addSubscription(User $subscription): User {

-               //Add from owning side
-               $subscription->addSubscriber($this);
-

                $this->subscriptions[] = $subscription;
 
                return $this;
                $this->subscriptions[] = $subscription;
 
                return $this;


@@ -392,13 +406,6 @@ class User extends BaseUser {
         * @param User $subscription
         */
        public function removeSubscription(User $subscription): bool {
         * @param User $subscription
         */
        public function removeSubscription(User $subscription): bool {

-               if (!$this->users->contains($user)) {
-                       return true;
-               }
-
-               //Remove from owning side
-               $subscription->removeSubscriber($this);
-

                return $this->subscriptions->removeElement($subscription);
        }
 
                return $this->subscriptions->removeElement($subscription);
        }