Merge pull request #134 from jolicode/fix/reminder-date-selection

Fix forecast reminder date selection

config/packages/bugsnag.yaml

@@ -5,6 +5,7 @@ bugsnag:
     notify_release_stages:
         - production
     discard_classes:
+        - Symfony\Component\HttpKernel\Exception\HttpException\RedirectException
         - Symfony\Component\HttpKernel\Exception\NotFoundHttpException
         - Symfony\Component\Security\Core\Exception\AccessDeniedException
 

config/services.yaml

@@ -36,7 +36,7 @@ services:
         arguments:
             $invoicingStateMachine: '@state_machine.invoicing'
 
-    Http\Client\HttpClient:
+    Psr\Http\Client\ClientInterface:
         alias: Http\Client\Curl\Client
 
     Http\Client\Curl\Client: ~

rector.php

@@ -31,9 +31,9 @@
         DoctrineSetList::ANNOTATIONS_TO_ATTRIBUTES,
         LevelSetList::UP_TO_PHP_82,
         SymfonySetList::ANNOTATIONS_TO_ATTRIBUTES,
-        SymfonySetList::SYMFONY_62,
+        SymfonySetList::SYMFONY_63,
         SymfonySetList::SYMFONY_CODE_QUALITY,
         SymfonySetList::SYMFONY_CONSTRUCTOR_INJECTION,
-        SensiolabsSetList::FRAMEWORK_EXTRA_61,
+        SensiolabsSetList::ANNOTATIONS_TO_ATTRIBUTES,
     ]);
 };

src/Controller/AuthController.php

@@ -18,15 +18,15 @@
 class AuthController extends AbstractController
 {
     #[Route(path: '/connect', name: 'connect_harvest')]
-    public function connectAction(ClientRegistry $clientRegistry): \Symfony\Component\HttpFoundation\Response
+    public function connect(ClientRegistry $clientRegistry): \Symfony\Component\HttpFoundation\Response
     {
         return $clientRegistry
             ->getClient('harvest')
             ->redirect(['all'], []);
     }
 
     #[Route(path: '/connect/check', name: 'connect_harvest_check')]
-    public function connectCheckAction(): void
+    public function connectCheck(): void
     {
     }
 }

src/Controller/Organization/ReminderController.php

@@ -32,6 +32,7 @@ public function index(Request $request, ForecastAccount $forecastAccount, UserRe
         if (null === $forecastReminder) {
             $forecastReminder = new ForecastReminder();
             $forecastReminder->setForecastAccount($forecastAccount);
+            $forecastAccount->setForecastReminder($forecastReminder);
         }
 
         $form = $this->createForm(ForecastReminderType::class, $forecastReminder, [

src/DataSelector/HarvestDataSelector.php

@@ -298,7 +298,7 @@ public function getOutdatedProjects(array $doNotCleanupClientIds): array
 
                 $lastProjectInvoices = array_filter($invoices, function (Invoice $invoice) use ($project) {
                     foreach ($invoice->getLineItems() as $lineItem) {
-                        if ($lineItem->getProject() && $lineItem->getProject()->getId() === $project->getId()) {
+                        if (null !== $lineItem->getProject() && $lineItem->getProject()->getId() === $project->getId()) {
                             return true;
                         }
                     }

src/Entity/ForecastReminder.php

@@ -15,6 +15,7 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use Gedmo\Mapping\Annotation as Gedmo;
 
 #[ORM\Entity(repositoryClass: \App\Repository\ForecastReminderRepository::class)]
 class ForecastReminder implements \Stringable
@@ -34,8 +35,11 @@ class ForecastReminder implements \Stringable
     #[ORM\JoinColumn(nullable: true, onDelete: 'SET NULL')]
     private ?User $updatedBy = null;
 
+    /**
+     * @Gedmo\Timestampable(on="update")
+     */
     #[ORM\Column(type: 'datetime')]
-    private \DateTimeInterface $updatedAt;
+    private ?\DateTimeInterface $updatedAt = null;
 
     #[ORM\Column(type: 'datetime', nullable: true)]
     private ?\DateTimeInterface $lastTimeSentAt = null;

src/ForecastReminder/Handler.php

@@ -83,7 +83,7 @@ private function extractStartDateFromtext(string $text): \DateTime
         $text = str_replace(' and ', ', ' . $sign, $text);
         $datetime = new \DateTime($text);
 
-        if (0 === \DateTime::getLastErrors()['warning_count'] && 0 === \DateTime::getLastErrors()['error_count']) {
+        if (false === \DateTime::getLastErrors()) {
             return $datetime;
         }