Migrate service definitions

PrestaShop · Jan 31, 2023 · eaeb0d4 · eaeb0d4
1 parent 0ede6d4
commit eaeb0d4
Show file tree

Hide file tree

Showing 6 changed files with 511 additions and 1,726 deletions.
diff --git a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderStates/OrderStateType.php b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderStates/OrderStateType.php
@@ -40,7 +40,6 @@
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Routing\Router;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
@@ -53,11 +52,6 @@ class OrderStateType extends TranslatorAwareType
      */
     private $templates;
 
-    /**
-     * @var Router
-     */
-    private $routing;
-
     /**
      * @var array
      */
@@ -67,7 +61,6 @@ class OrderStateType extends TranslatorAwareType
      * @param TranslatorInterface $translator
      * @param array $locales
      * @param ThemeCatalogInterface $themeCatalog
-     * @param Router $routing
      * @param Configuration $configuration
      *
      * @throws \PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException
@@ -76,11 +69,9 @@ public function __construct(
         TranslatorInterface $translator,
         array $locales,
         ThemeCatalogInterface $themeCatalog,
-        Router $routing,
         Configuration $configuration
     ) {
         parent::__construct($translator, $locales);
-        $this->routing = $routing;
         $mailTheme = $configuration->get('PS_MAIL_THEME', 'modern');
 
         $mailLayouts = $themeCatalog->getByName($mailTheme)->getLayouts();

diff --git a/src/PrestaShopBundle/Form/Admin/Product/ProductWarehouseCombination.php b/src/PrestaShopBundle/Form/Admin/Product/ProductWarehouseCombination.php
@@ -32,6 +32,7 @@
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * This form class is responsible to generate the basic product Warehouse combinations form.
@@ -43,9 +44,9 @@ class ProductWarehouseCombination extends CommonAbstractType
     /**
      * Constructor.
      *
-     * @param object $translator
+     * @param TranslatorInterface $translator
      */
-    public function __construct($translator)
+    public function __construct(TranslatorInterface $translator)
     {
         $this->translator = $translator;
     }

diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/PricingType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/PricingType.php
@@ -28,7 +28,6 @@
 
 namespace PrestaShopBundle\Form\Admin\Sell\Product\Pricing;
 
-use Currency;
 use PrestaShopBundle\Form\Admin\Type\IconButtonType;
 use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
@@ -46,22 +45,22 @@
 class PricingType extends TranslatorAwareType
 {
     /**
-     * @var Currency
+     * @var string
      */
-    private $defaultCurrency;
+    private $defaultCurrencyIsoCode;
 
     /**
      * @param TranslatorInterface $translator
      * @param array $locales
-     * @param Currency $defaultCurrency
+     * @param string $defaultCurrencyIsoCode
      */
     public function __construct(
         TranslatorInterface $translator,
         array $locales,
-        Currency $defaultCurrency
+        string $defaultCurrencyIsoCode
     ) {
         parent::__construct($translator, $locales);
-        $this->defaultCurrency = $defaultCurrency;
+        $this->defaultCurrencyIsoCode = $defaultCurrencyIsoCode;
     }
 
     /**
@@ -80,7 +79,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label_tag_name' => 'h3',
                 'label_subtitle' => $this->trans('Cost price (tax excl.)', 'Admin.Catalog.Feature'),
                 'attr' => ['data-display-price-precision' => self::PRESTASHOP_DECIMALS],
-                'currency' => $this->defaultCurrency->iso_code,
+                'currency' => $this->defaultCurrencyIsoCode,
                 'modify_all_shops' => true,
                 'constraints' => [
                     new NotBlank(),

diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/UnitPriceType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/UnitPriceType.php
@@ -28,7 +28,6 @@
 
 namespace PrestaShopBundle\Form\Admin\Sell\Product\Pricing;
 
-use Currency;
 use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
 use Symfony\Component\Form\Extension\Core\Type\MoneyType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -46,22 +45,22 @@ class UnitPriceType extends TranslatorAwareType
     private const ENABLED_GROUP = 'enabled_group';
 
     /**
-     * @var Currency
+     * @var string
      */
-    private $defaultCurrency;
+    private $defaultCurrencyIsoCode;
 
     /**
      * @param TranslatorInterface $translator
      * @param array $locales
-     * @param Currency $defaultCurrency
+     * @param string $defaultCurrencyIsoCode
      */
     public function __construct(
         TranslatorInterface $translator,
         array $locales,
-        Currency $defaultCurrency
+        string $defaultCurrencyIsoCode
     ) {
         parent::__construct($translator, $locales);
-        $this->defaultCurrency = $defaultCurrency;
+        $this->defaultCurrencyIsoCode = $defaultCurrencyIsoCode;
     }
 
     /**
@@ -74,7 +73,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'required' => false,
                 'label' => $this->trans('Retail price per unit (tax excl.)', 'Admin.Catalog.Feature'),
                 'attr' => ['data-display-price-precision' => self::PRESTASHOP_DECIMALS],
-                'currency' => $this->defaultCurrency->iso_code,
+                'currency' => $this->defaultCurrencyIsoCode,
                 'constraints' => [
                     new NotBlank(),
                     new Type(['type' => 'float']),
@@ -90,7 +89,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'required' => false,
                 'label' => $this->trans('Retail price per unit (tax incl.)', 'Admin.Catalog.Feature'),
                 'attr' => ['data-display-price-precision' => self::PRESTASHOP_DECIMALS],
-                'currency' => $this->defaultCurrency->iso_code,
+                'currency' => $this->defaultCurrencyIsoCode,
                 'constraints' => [
                     new NotBlank(),
                     new Type(['type' => 'float']),