Release 1.6.2 (#1289)

* include user teams in user entity
* prevent unauthorized access via API
* improve teamlead permission handling in team timesheets
* add team data to user entity
* add security tests
* highlight menu for invoice template copy
* unified handling of invoice data across all templates
* access to the current users data in invoice templates
* permission improvement in invoice form
* allow to skip record rows
* allow to add new invoice locations without overwriting the global ones
* allow to order user preferences
* change permission for normal users with access to view_other_timesheets
* properly validate invoice template field length
* allow to replace multiple variables in cell values text
* upgraded office invoice template
* doctrine deprecation fix
* upgrade phpoffice/phpword
* fix future begin check for default rounding rules
* dashboard widget counter: respect visibility and teams - fixes #1161
* fix future begin check for default rounding rules
* added new events for pre and post invoice rendering
* fix permission issue for users without team seeing all records
* prevent error in spreadsheet renderer for empty invoices

src/Invoice/Renderer/AbstractRenderer.php

@@ -9,93 +9,54 @@
 
 namespace App\Invoice\Renderer;
 
-use App\Twig\DateExtensions;
-use App\Twig\Extensions;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use App\Entity\InvoiceDocument;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 
+/**
+ * @internal
+ */
 abstract class AbstractRenderer
 {
-    use RendererTrait;
-
     /**
-     * @var DateExtensions
+     * @return string[]
      */
-    protected $dateExtension;
+    abstract protected function getFileExtensions();
 
     /**
-     * @var Extensions
-     */
-    protected $extension;
-
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
-
-    /**
-     * @param TranslatorInterface $translator
-     * @param DateExtensions $dateExtension
-     * @param Extensions $extensions
-     */
-    public function __construct(TranslatorInterface $translator, DateExtensions $dateExtension, Extensions $extensions)
-    {
-        $this->translator = $translator;
-        $this->dateExtension = $dateExtension;
-        $this->extension = $extensions;
-    }
-
-    /**
-     * @param \DateTime $date
-     * @return mixed
-     */
-    protected function getFormattedDateTime(\DateTime $date)
-    {
-        return $this->dateExtension->dateShort($date);
-    }
-
-    /**
-     * @param \DateTime $date
-     * @return mixed
-     */
-    protected function getFormattedTime(\DateTime $date)
-    {
-        return $this->dateExtension->time($date);
-    }
-
-    /**
-     * @param int $amount
-     * @param string $currency
      * @return string
      */
-    protected function getFormattedMoney($amount, $currency)
+    abstract protected function getContentType();
+
+    /**
+     * @param InvoiceDocument $document
+     * @return bool
+     */
+    public function supports(InvoiceDocument $document): bool
     {
-        return $this->extension->money($amount, $currency);
+        foreach ($this->getFileExtensions() as $extension) {
+            if (stripos($document->getFilename(), $extension) !== false) {
+                return true;
+            }
+        }
+
+        return false;
     }
 
     /**
-     * @param \DateTime $date
-     * @return mixed
+     * @param mixed $file
+     * @param string $filename
+     * @return BinaryFileResponse
      */
-    protected function getFormattedMonthName(\DateTime $date)
+    protected function getFileResponse($file, $filename)
     {
-        return $this->translator->trans($this->dateExtension->monthName($date));
-    }
+        $response = new BinaryFileResponse($file);
+        $disposition = $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $filename);
 
-    /**
-     * @param int $seconds
-     * @return mixed
-     */
-    protected function getFormattedDuration($seconds)
-    {
-        return $this->extension->duration($seconds);
-    }
+        $response->headers->set('Content-Type', $this->getContentType());
+        $response->headers->set('Content-Disposition', $disposition);
+        $response->deleteFileAfterSend(true);
 
-    /**
-     * @param int $seconds
-     * @return mixed
-     */
-    protected function getFormattedDecimalDuration($seconds)
-    {
-        return $this->extension->durationDecimal($seconds);
+        return $response;
     }
 }