Merge pull request #7559 from pamil/twig-extension-names

Improve Twig extensions

src/Sylius/Bundle/AddressingBundle/Twig/CountryNameExtension.php

@@ -43,12 +43,4 @@ public function translateCountryIsoCode($country, $locale = null)
 
         return Intl::getRegionBundle()->getCountryName($country, $locale);
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'sylius_country_name';
-    }
 }

src/Sylius/Bundle/AddressingBundle/Twig/ProvinceNamingExtension.php

@@ -38,36 +38,8 @@ public function __construct(ProvinceNamingProviderInterface $provinceNamingProvi
     public function getFilters()
     {
         return [
-            new \Twig_SimpleFilter('sylius_province_name', [$this, 'getProvinceName']),
-            new \Twig_SimpleFilter('sylius_province_abbreviation', [$this, 'getProvinceAbbreviation']),
+            new \Twig_SimpleFilter('sylius_province_name', [$this->provinceNamingProvider, 'getName']),
+            new \Twig_SimpleFilter('sylius_province_abbreviation', [$this->provinceNamingProvider, 'getAbbreviation']),
         ];
     }
-
-    /**
-     * @param AddressInterface $address
-     *
-     * @return string
-     */
-    public function getProvinceName(AddressInterface $address)
-    {
-        return $this->provinceNamingProvider->getName($address);
-    }
-
-    /**
-     * @param AddressInterface $address
-     *
-     * @return string
-     */
-    public function getProvinceAbbreviation(AddressInterface $address)
-    {
-        return $this->provinceNamingProvider->getAbbreviation($address);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'sylius_province_naming';
-    }
 }

src/Sylius/Bundle/AddressingBundle/spec/Twig/CountryNameExtensionSpec.php

@@ -20,14 +20,9 @@
  */
 final class CountryNameExtensionSpec extends ObjectBehavior
 {
-    function it_is_initializable()
-    {
-        $this->shouldHaveType(CountryNameExtension::class);
-    }
-
     function it_is_a_twig_extension()
     {
-        $this->shouldHaveType('Twig_Extension');
+        $this->shouldHaveType(\Twig_Extension::class);
     }
 
     function it_translates_country_iso_code_into_name()
@@ -46,9 +41,4 @@ function it_translates_country_code_to_name_according_to_locale()
     {
         $this->translateCountryIsoCode('IE', 'es')->shouldReturn('Irlanda');
     }
-
-    function it_has_name()
-    {
-        $this->getName()->shouldReturn('sylius_country_name');
-    }
 }

src/Sylius/Bundle/CoreBundle/Twig/CheckoutStepsExtension.php

@@ -41,12 +41,4 @@ public function getFunctions()
             new \Twig_SimpleFunction('sylius_is_payment_required', [$this->checkoutStepsHelper, 'isPaymentRequired']),
         ];
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'sylius_shipping_steps';
-    }
 }

src/Sylius/Bundle/CoreBundle/Twig/PriceExtension.php

@@ -40,12 +40,4 @@ public function getFilters()
             new \Twig_SimpleFilter('sylius_calculate_price', [$this->helper, 'getPrice']),
         ];
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'sylius_calculate_price';
-    }
 }

src/Sylius/Bundle/CoreBundle/Twig/ProductVariantsPricesExtension.php

@@ -40,12 +40,4 @@ public function getFunctions()
             new \Twig_SimpleFunction('sylius_product_variant_prices', [$this->productVariantsPricesHelper, 'getPrices']),
         ];
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'sylius_product_variant_prices';
-    }
 }

src/Sylius/Bundle/CoreBundle/Twig/VariantResolverExtension.php

@@ -40,12 +40,4 @@ public function getFilters()
             new \Twig_SimpleFilter('sylius_resolve_variant', [$this->helper, 'resolveVariant']),
         ];
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'sylius_resolve_variant';
-    }
 }

src/Sylius/Bundle/CurrencyBundle/Twig/CurrencyExtension.php

@@ -40,12 +40,4 @@ public function getFilters()
             new \Twig_SimpleFilter('sylius_currency_symbol', [$this->helper, 'convertCurrencyCodeToSymbol']),
         ];
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'sylius_currency';
-    }
 }

src/Sylius/Bundle/GridBundle/Twig/GridExtension.php

@@ -43,12 +43,4 @@ public function getFunctions()
             new \Twig_SimpleFunction('sylius_grid_render_filter', [$this->gridHelper, 'renderFilter'], ['is_safe' => ['html']]),
         ];
     }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return 'sylius_grid';
-    }
 }

src/Sylius/Bundle/InventoryBundle/Twig/InventoryExtension.php

@@ -41,12 +41,4 @@ public function getFunctions()
              new \Twig_SimpleFunction('sylius_inventory_is_sufficient', [$this->helper, 'isStockSufficient']),
         ];
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'sylius_inventory';
-    }
 }

src/Sylius/Bundle/LocaleBundle/Twig/LocaleExtension.php

@@ -41,12 +41,4 @@ public function getFilters()
             new \Twig_SimpleFilter('sylius_locale_name', [$this->localeHelper, 'convertCodeToName']),
         ];
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'sylius_locale';
-    }
 }