Refactoring : renommer EventKindController en AdminEventKindController (

elefan-grenoble#962) * Rename EventKindController to AdminEventKindController. Cleanup * Other cleanup
Les400Coop · Jan 20, 2024 · e78dce8 · e78dce8
1 parent f78f6c4
commit e78dce8
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 14 deletions.
diff --git a/...Bundle/Controller/EventKindController.php → ...e/Controller/AdminEventKindController.php b/...Bundle/Controller/EventKindController.php → ...e/Controller/AdminEventKindController.php
@@ -12,11 +12,11 @@
 
 
 /**
- * EventKind controller.
+ * AdminEventKind controller
  *
  * @Route("admin/event/kinds")
  */
-class EventKindController extends Controller
+class AdminEventKindController extends Controller
 {
  /**
  * Lists all event kinds

diff --git a/src/AppBundle/Entity/Commission.php b/src/AppBundle/Entity/Commission.php
@@ -60,19 +60,22 @@ class Commission
 
  /**
  * Many Commissions have Many Beneficiaries.
+ * 
  * @ORM\ManyToMany(targetEntity="Beneficiary", mappedBy="commissions")
  */
  private $beneficiaries;
 
  /**
  * Many Commissions have Many Tasks.
+ * 
  * @ORM\ManyToMany(targetEntity="Task", mappedBy="commissions")
  * @OrderBy({"closed" = "ASC","dueDate" = "ASC"})
  */
  private $tasks;
 
  /**
  * One Commission has Many Owners (Beneficiary).
+ * 
  * @ORM\OneToMany(targetEntity="Beneficiary", mappedBy="own",cascade={"persist"})
  */
  private $owners;

diff --git a/src/AppBundle/Entity/Event.php b/src/AppBundle/Entity/Event.php
@@ -133,9 +133,9 @@ class Event
  private $createdBy;
 
  /**
- * @ORM\Column(type="datetime")
- *
  * @var \DateTime
+ * 
+ * @ORM\Column(type="datetime")
  */
  private $updatedAt;
 

diff --git a/src/AppBundle/Entity/EventKind.php b/src/AppBundle/Entity/EventKind.php
@@ -44,8 +44,6 @@ class EventKind
  private $createdAt;
 
  /**
- * Define toString.
- *
  * @return string
  */
  public function __toString()
@@ -62,7 +60,7 @@ public function setCreatedAtValue()
  }
 
  /**
- * Get id.
+ * Get id
  *
  * @return int
  */
@@ -72,7 +70,7 @@ public function getId()
  }
 
  /**
- * Set name.
+ * Set name
  *
  * @param string $name
  *
@@ -86,7 +84,7 @@ public function setName($name)
  }
 
  /**
- * Get name.
+ * Get name
  *
  * @return string
  */
@@ -96,7 +94,7 @@ public function getName()
  }
 
  /**
- * Get events.
+ * Get events
  *
  * @return \Doctrine\Common\Collections\Collection
  */
@@ -106,7 +104,7 @@ public function getEvents()
  }
 
  /**
- * Get createdAt.
+ * Get createdAt
  *
  * @return \DateTime
  */

diff --git a/src/AppBundle/Entity/Membership.php b/src/AppBundle/Entity/Membership.php
@@ -31,8 +31,8 @@ class Membership
  protected $id;
 
  /**
- * @ORM\Column(type="bigint")
  * @Assert\NotBlank(message="Merci d'entrer votre numéro d'adhérent")
+ * @ORM\Column(type="bigint")
  */
  protected $member_number;
 
@@ -83,10 +83,12 @@ class Membership
 
  /**
  * @var Beneficiary
+ * 
  * One Membership has One Main Beneficiary.
+ * 
+ * @Assert\Valid
  * @ORM\OneToOne(targetEntity="Beneficiary",cascade={"persist", "remove"})
  * @ORM\JoinColumn(name="main_beneficiary_id", referencedColumnName="id", onDelete="SET NULL")
- * @Assert\Valid
  */
  private $mainBeneficiary;
 

diff --git a/src/AppBundle/Entity/MembershipShiftExemption.php b/src/AppBundle/Entity/MembershipShiftExemption.php
@@ -59,9 +59,9 @@ class MembershipShiftExemption
 
  /**
  * @Assert\Date
+ * @Assert\GreaterThan(propertyPath="start")
  *
  * @ORM\Column(name="end", type="date")
- * @Assert\GreaterThan(propertyPath="start")
  */
  private $end;
 

diff --git a/src/AppBundle/Entity/User.php b/src/AppBundle/Entity/User.php
@@ -38,13 +38,15 @@ class User extends BaseUser
 
  /**
  * Beneficiary's user.
+ * 
  * @Assert\Valid()
  * @ORM\OneToOne(targetEntity="Beneficiary", mappedBy="user", fetch="EAGER")
  */
  private $beneficiary;
 
  /**
  * Many Users have Many clients.
+ * 
  * @ORM\ManyToMany(targetEntity="Client", inversedBy="users")
  * @ORM\JoinTable(name="users_clients")
  */