Merge pull request #476 from jan-stanek/opravy-modelu

oprava chyb modelu
skaut · Jan 3, 2018 · d425ce5 · d425ce5
2 parents 37a71ff + 58c1276
commit d425ce5
Show file tree

Hide file tree

Showing 20 changed files with 46 additions and 144 deletions.
diff --git a/app/model/ACL/Permission.php b/app/model/ACL/Permission.php
@@ -85,7 +85,7 @@ class Permission
 
     /**
      * Prostředek oprávnění.
-     * @ORM\ManyToOne(targetEntity="\App\Model\ACL\Resource", inversedBy="permissions", cascade={"persist"})
+     * @ORM\ManyToOne(targetEntity="\App\Model\ACL\Resource", inversedBy="permissions")
      * @var Resource
      */
     protected $resource;

diff --git a/app/model/ACL/Resource.php b/app/model/ACL/Resource.php
@@ -121,12 +121,4 @@ public function getPermissions()
     {
         return $this->permissions;
     }
-
-    /**
-     * @param Collection $permissions
-     */
-    public function setPermissions($permissions)
-    {
-        $this->permissions = $permissions;
-    }
 }
diff --git a/app/model/ACL/Role.php b/app/model/ACL/Role.php
@@ -102,7 +102,7 @@ class Role
 
     /**
      * Oprávnění role.
-     * @ORM\ManyToMany(targetEntity="Permission", inversedBy="roles", cascade={"persist"})
+     * @ORM\ManyToMany(targetEntity="Permission", inversedBy="roles")
      * @var Collection
      */
     protected $permissions;
@@ -197,7 +197,7 @@ class Role
 
     /**
      * Role vyžadované touto rolí.
-     * @ORM\ManyToMany(targetEntity="Role", inversedBy="requiredByRole", cascade={"persist"})
+     * @ORM\ManyToMany(targetEntity="Role", inversedBy="requiredByRole")
      * @ORM\JoinTable(name="role_role_required",
      *      joinColumns={@ORM\JoinColumn(name="role_id", referencedColumnName="id")},
      *      inverseJoinColumns={@ORM\JoinColumn(name="required_role_id", referencedColumnName="id")}
@@ -299,7 +299,9 @@ public function getPermissions(): Collection
      */
     public function setPermissions(Collection $permissions): void
     {
-        $this->permissions = $permissions;
+        $this->permissions->clear();
+        foreach ($permissions as $permission)
+            $this->permissions->add($permission);
     }
 
     public function addPermission(Permission $permission): void
@@ -318,7 +320,7 @@ public function getPages(): Collection
     /**
      * @param Collection $pages
      */
-    public function setPages(Collection $pages): void
+    public function setPages(Collection $pages): void //TODO kontrola
     {
         foreach ($this->getPages() as $page) {
             if (!$pages->contains($page))
@@ -518,7 +520,7 @@ public function getIncompatibleRoles(): Collection
     /**
      * @param Collection $incompatibleRoles
      */
-    public function setIncompatibleRoles(Collection $incompatibleRoles): void
+    public function setIncompatibleRoles(Collection $incompatibleRoles): void //TODO kontrola
     {
         foreach ($this->getIncompatibleRoles() as $role) {
             if (!$incompatibleRoles->contains($role))
@@ -601,7 +603,7 @@ public function getRequiredRoles(): Collection
     /**
      * @param Collection $requiredRoles
      */
-    public function setRequiredRoles(Collection $requiredRoles): void
+    public function setRequiredRoles(Collection $requiredRoles): void //TODO kontrola
     {
         $this->requiredRoles = $requiredRoles;
     }

diff --git a/app/model/CMS/Content/CapacitiesContent.php b/app/model/CMS/Content/CapacitiesContent.php
@@ -63,7 +63,7 @@ public function getRoles()
     /**
      * @param Collection $roles
      */
-    public function setRoles($roles)
+    public function setRoles($roles) //TODO kontrola
     {
         $this->roles = $roles;
     }

diff --git a/app/model/CMS/Content/Content.php b/app/model/CMS/Content/Content.php
@@ -156,7 +156,7 @@ abstract class Content implements IContent
 
     /**
      * Stránka, na které je obsah umístěn.
-     * @ORM\ManyToOne(targetEntity="\App\Model\CMS\Page", inversedBy="contents", cascade={"persist"})
+     * @ORM\ManyToOne(targetEntity="\App\Model\CMS\Page", inversedBy="contents")
      * @var Page
      */
     protected $page;

diff --git a/app/model/CMS/Document/Document.php b/app/model/CMS/Document/Document.php
@@ -27,7 +27,7 @@ class Document
 
     /**
      * Tagy dokumentu.
-     * @ORM\ManyToMany(targetEntity="Tag", inversedBy="documents", cascade={"persist"})
+     * @ORM\ManyToMany(targetEntity="Tag", inversedBy="documents")
      * @var Collection
      */
     protected $tags;
@@ -88,7 +88,7 @@ public function getTags()
     /**
      * @param Collection $tags
      */
-    public function setTags($tags)
+    public function setTags($tags) //TODO kontrola
     {
         $this->tags = $tags;
     }

diff --git a/app/model/CMS/Faq.php b/app/model/CMS/Faq.php
@@ -28,7 +28,7 @@ class Faq
 
     /**
      * Autor otázky.
-     * @ORM\ManyToOne(targetEntity="\App\Model\User\User", cascade={"persist"})
+     * @ORM\ManyToOne(targetEntity="\App\Model\User\User")
      * @var User
      */
     protected $author;

diff --git a/app/model/CMS/Page.php b/app/model/CMS/Page.php
@@ -54,7 +54,7 @@ class Page
 
     /**
      * Role, které mají na stránku přístup.
-     * @ORM\ManyToMany(targetEntity="\App\Model\ACL\Role", inversedBy="pages", cascade={"persist"})
+     * @ORM\ManyToMany(targetEntity="\App\Model\ACL\Role", inversedBy="pages")
      * @var Collection
      */
     protected $roles;
@@ -164,7 +164,7 @@ public function getRoles()
     /**
      * @param Collection $roles
      */
-    public function setRoles($roles)
+    public function setRoles($roles) //TODO kontrola
     {
         $this->roles = $roles;
     }
@@ -213,7 +213,7 @@ public function hasContents($area)
     /**
      * @param $content
      */
-    public function addContent($content)
+    public function addContent($content) //TODO kontrola
     {
         $criteria = Criteria::create()
             ->where(Criteria::expr()->eq('area', $content->getArea()));

diff --git a/app/model/Mailing/Mail.php b/app/model/Mailing/Mail.php
@@ -92,7 +92,9 @@ public function getRecipientRoles()
      */
     public function setRecipientRoles($recipientRoles)
     {
-        $this->recipientRoles = $recipientRoles;
+        $this->recipientRoles->clear();
+        foreach ($recipientRoles as $recipientRole)
+            $this->recipientRoles->add($recipientRole);
     }
 
     /**
@@ -121,7 +123,9 @@ public function getRecipientUsers()
      */
     public function setRecipientUsers($recipientUsers)
     {
-        $this->recipientUsers = $recipientUsers;
+        $this->recipientUsers->clear();
+        foreach ($recipientUsers as $recipientUser)
+            $this->recipientUsers->add($recipientUser);
     }
 
     /**

diff --git a/app/model/Mailing/Template.php b/app/model/Mailing/Template.php
@@ -220,14 +220,6 @@ public function getVariables()
         return $this->variables;
     }
 
-    /**
-     * @param Collection $variables
-     */
-    public function setVariables($variables)
-    {
-        $this->variables = $variables;
-    }
-
     /**
      * @return bool
      */

diff --git a/app/model/Program/Block.php b/app/model/Program/Block.php
@@ -39,21 +39,21 @@ class Block
 
     /**
      * Lektor.
-     * @ORM\ManyToOne(targetEntity="\App\Model\User\User", inversedBy="lecturersBlocks", cascade={"persist"})
+     * @ORM\ManyToOne(targetEntity="\App\Model\User\User", inversedBy="lecturersBlocks")
      * @var User
      */
     protected $lector;
 
     /**
      * Kategorie bloku.
-     * @ORM\ManyToOne(targetEntity="Category", inversedBy="blocks", cascade={"persist"})
+     * @ORM\ManyToOne(targetEntity="Category", inversedBy="blocks")
      * @var Category
      */
     protected $category;
 
     /**
      * Podakce bloku.
-     * @ORM\ManyToOne(targetEntity="\App\Model\Structure\Subevent", inversedBy="blocks", cascade={"persist"})
+     * @ORM\ManyToOne(targetEntity="\App\Model\Structure\Subevent", inversedBy="blocks")
      * @var Subevent
      */
     protected $subevent;
@@ -141,14 +141,6 @@ public function getPrograms()
         return $this->programs;
     }
 
-    /**
-     * @param Collection $programs
-     */
-    public function setPrograms($programs)
-    {
-        $this->programs = $programs;
-    }
-
     /**
      * Vrací seznam účastníků bloku.
      * @return Collection

diff --git a/app/model/Program/Category.php b/app/model/Program/Category.php
@@ -29,7 +29,7 @@ class Category
 
     /**
      * Role, které si mohou přihlašovat programy z kategorie.
-     * @ORM\ManyToMany(targetEntity="\App\Model\ACL\Role", inversedBy="registerableCategories", cascade={"persist"})
+     * @ORM\ManyToMany(targetEntity="\App\Model\ACL\Role", inversedBy="registerableCategories")
      * @var Collection
      */
     protected $registerableRoles;
@@ -87,7 +87,7 @@ public function getRegisterableRoles()
     /**
      * @param Collection $registerableRoles
      */
-    public function setRegisterableRoles($registerableRoles)
+    public function setRegisterableRoles($registerableRoles) //TODO kontrola
     {
         $this->registerableRoles = $registerableRoles;
     }
@@ -108,12 +108,4 @@ public function getBlocks()
     {
         return $this->blocks;
     }
-
-    /**
-     * @param Collection $blocks
-     */
-    public function setBlocks($blocks)
-    {
-        $this->blocks = $blocks;
-    }
 }
diff --git a/app/model/Program/Program.php b/app/model/Program/Program.php
@@ -23,7 +23,7 @@ class Program
 
     /**
      * Programový blok.
-     * @ORM\ManyToOne(targetEntity="Block", inversedBy="programs", cascade={"persist"})
+     * @ORM\ManyToOne(targetEntity="Block", inversedBy="programs")
      * @var Block
      */
     protected $block;
@@ -37,7 +37,7 @@ class Program
 
     /**
      * Místnost.
-     * @ORM\ManyToOne(targetEntity="Room", inversedBy="programs", cascade={"persist"})
+     * @ORM\ManyToOne(targetEntity="Room", inversedBy="programs")
      * @var Room
      */
     protected $room;
@@ -96,20 +96,17 @@ public function getAttendees()
     public function setAttendees(Collection $attendees)
     {
         $this->removeAllAttendees();
-        foreach ($attendees as $attendee) {
+        foreach ($attendees as $attendee)
             $this->addAttendee($attendee);
-        }
     }
 
     /**
      * @param $user
      */
     public function addAttendee(User $user)
     {
-        if (!$this->attendees->contains($user)) {
-            $this->attendees->add($user);
+        if (!$this->attendees->contains($user))
             $user->addProgram($this);
-        }
     }
 
     /**

diff --git a/app/model/Program/Room.php b/app/model/Program/Room.php
@@ -97,12 +97,4 @@ public function getPrograms()
     {
         return $this->programs;
     }
-
-    /**
-     * @param mixed $programs
-     */
-    public function setPrograms($programs)
-    {
-        $this->programs = $programs;
-    }
 }
diff --git a/app/model/Settings/CustomInput/CustomInput.php b/app/model/Settings/CustomInput/CustomInput.php
@@ -167,12 +167,4 @@ public function getCustomInputValues()
     {
         return $this->customInputValues;
     }
-
-    /**
-     * @param Collection $customInputValues
-     */
-    public function setCustomInputValues($customInputValues)
-    {
-        $this->customInputValues = $customInputValues;
-    }
 }
diff --git a/app/model/Structure/Subevent.php b/app/model/Structure/Subevent.php
@@ -85,7 +85,7 @@ class Subevent
 
     /**
      * Podakce vyžadované touto podakcí.
-     * @ORM\ManyToMany(targetEntity="Subevent", inversedBy="requiredBySubevent", cascade={"persist"})
+     * @ORM\ManyToMany(targetEntity="Subevent", inversedBy="requiredBySubevent")
      * @ORM\JoinTable(name="subevent_subevent_required",
      *      joinColumns={@ORM\JoinColumn(name="subevent_id", referencedColumnName="id")},
      *      inverseJoinColumns={@ORM\JoinColumn(name="required_subevent_id", referencedColumnName="id")}
@@ -155,14 +155,6 @@ public function getBlocks() : Collection
         return $this->blocks;
     }
 
-    /**
-     * @param Collection $blocks
-     */
-    public function setBlocks(Collection $blocks) : void
-    {
-        $this->blocks = $blocks;
-    }
-
     /**
      * @return int
      */
@@ -298,7 +290,7 @@ public function getRequiredSubevents() : Collection
     /**
      * @param $requiredSubevents
      */
-    public function setRequiredSubevents(Collection $requiredSubevents) : void
+    public function setRequiredSubevents(Collection $requiredSubevents) : void //TODO kontrola
     {
         $this->requiredSubevents = $requiredSubevents;
     }

diff --git a/app/model/User/Application/Application.php b/app/model/User/Application/Application.php
@@ -59,7 +59,7 @@ abstract class Application
 
     /**
      * Role.
-     * @ORM\ManyToMany(targetEntity="\App\Model\ACL\Role")
+     * @ORM\ManyToMany(targetEntity="\App\Model\ACL\Role", cascade={"persist"})
      * @var Collection
      */
     protected $roles;

diff --git a/app/model/User/CustomInputValue/CustomInputValue.php b/app/model/User/CustomInputValue/CustomInputValue.php
@@ -29,14 +29,14 @@ abstract class CustomInputValue
 
     /**
      * Vlastní pole přihlášky.
-     * @ORM\ManyToOne(targetEntity="\App\Model\Settings\CustomInput\CustomInput", inversedBy="customInputValues", cascade={"persist"})
+     * @ORM\ManyToOne(targetEntity="\App\Model\Settings\CustomInput\CustomInput", inversedBy="customInputValues")
      * @var CustomInput
      */
     protected $input;
 
     /**
      * Uživatel.
-     * @ORM\ManyToOne(targetEntity="\App\Model\User\User", inversedBy="customInputValues", cascade={"persist"})
+     * @ORM\ManyToOne(targetEntity="\App\Model\User\User", inversedBy="customInputValues")
      * @var User
      */
     protected $user;