Add default values to class member variables

[airbundle] / Entity / Dance.php

diff --git a/Entity/Dance.php b/Entity/Dance.php
index 59896cdad505495196db859127b24a081cda5c7b..0b132c8418cd76f59846514ffb62784aaa222743 100644 (file)
--- a/Entity/Dance.php
+++ b/Entity/Dance.php
@@ -210,7 +210,7 @@ class Dance {
         */
        public function addUser(User $user): Dance {
                //Add from owning side
-               $user->addSubscriber($this);
+               $user->addDance($this);
 
                $this->users[] = $user;
 
@@ -225,8 +225,12 @@ class Dance {
         * @return bool
         */
        public function removeUser(User $user): bool {
+               if (!$this->dances->contains($user)) {
+                       return true;
+               }
+
                //Remove from owning side
-               $user->removeSubscriber($this);
+               $user->removeDance($this);
 
                return $this->users->removeElement($user);
        }
@@ -245,7 +249,7 @@ class Dance {
         */
        public function preUpdate(PreUpdateEventArgs $eventArgs) {
                //Check that we have a dance instance
-               if (($dance = $eventArgs->getEntity()) instanceof Dance) {
+               if (($dance = $eventArgs->getObject()) instanceof Dance) {
                        //Set updated value
                        $dance->setUpdated(new \DateTime('now'));
                }