fix BeneficiaryService & MembershipService

src/AppBundle/Service/BeneficiaryService.php

@@ -7,16 +7,18 @@
 use AppBundle\Entity\Registration;
 use AppBundle\Entity\Shift;
 use AppBundle\Entity\ShiftBucket;
+use AppBundle\Service\MembershipService;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use phpDocumentor\Reflection\Types\Array_;
 use Symfony\Component\DependencyInjection\Container;
 
 class BeneficiaryService
 {
-
     protected $em;
+    private $membershipService;
 
-    public function __construct($em, $membershipService)
+    public function __construct(EntityManagerInterface $em, MembershipService $membershipService)
     {
         $this->em = $em;
         $this->membershipService = $membershipService;

src/AppBundle/Service/MembershipService.php

@@ -14,7 +14,6 @@
 
 class MembershipService
 {
-
     protected $em;
     protected $registration_duration;
     protected $registration_every_civil_year;
@@ -117,7 +116,7 @@ public function getStartOfCycle(Membership $membership, $cycleOffset = 0)
             // Set date to monday of week A
             $date->modify('-'. (7 * $week) . ' days');
         } else {
-            $firstDate = $this->getFirstShiftDate();
+            $firstDate = $membership->getFirstShiftDate();
             if ($firstDate) {
                 $now = new DateTime('now');
                 $date = clone($firstDate);
@@ -127,7 +126,7 @@ public function getStartOfCycle(Membership $membership, $cycleOffset = 0)
                     $currentCycleCount = intval($diff / 28);
                     $date->modify("+" . (28 * $currentCycleCount) . " days");
                 }
-            }else{
+            } else {
                 $date = new DateTime('now');
             }
         }
@@ -154,5 +153,4 @@ public function getEndOfCycle(Membership $membership, $cycleOffset = 0)
         $date->setTime(23, 59, 59);
         return $date;
     }
-
 }