invoices: unified money, number and date formats and fully respect configured language (#1814)

src/Invoice/DefaultInvoiceFormatter.php

@@ -10,8 +10,7 @@
 namespace App\Invoice;
 
 use App\Twig\DateExtensions;
-use App\Twig\Extensions;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use App\Twig\LocaleExtensions;
 
 final class DefaultInvoiceFormatter implements InvoiceFormatter
 {
@@ -19,25 +18,13 @@ final class DefaultInvoiceFormatter implements InvoiceFormatter
      * @var DateExtensions
      */
     private $dateExtension;
-
     /**
-     * @var Extensions
+     * @var LocaleExtensions
      */
     private $extension;
 
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
-
-    /**
-     * @param TranslatorInterface $translator
-     * @param DateExtensions $dateExtension
-     * @param Extensions $extensions
-     */
-    public function __construct(TranslatorInterface $translator, DateExtensions $dateExtension, Extensions $extensions)
+    public function __construct(DateExtensions $dateExtension, LocaleExtensions $extensions)
     {
-        $this->translator = $translator;
         $this->dateExtension = $dateExtension;
         $this->extension = $extensions;
     }
@@ -60,23 +47,24 @@ final class DefaultInvoiceFormatter implements InvoiceFormatter
         return $this->dateExtension->time($date);
     }
 
-    /**
-     * @param int $amount
-     * @param string $currency
-     * @return string
-     */
-    public function getFormattedMoney($amount, $currency)
-    {
-        return $this->extension->money($amount, $currency);
-    }
-
     /**
      * @param \DateTime $date
      * @return mixed
      */
     public function getFormattedMonthName(\DateTime $date)
     {
-        return $this->translator->trans($this->dateExtension->monthName($date));
+        return $this->dateExtension->monthName($date);
+    }
+
+    /**
+     * @param float|int $amount
+     * @param string|null $currency
+     * @param bool $withCurrency
+     * @return string
+     */
+    public function getFormattedMoney($amount, ?string $currency, bool $withCurrency = true)
+    {
+        return $this->extension->money($amount, $currency, $withCurrency);
     }
 
     /**