Change implementations to new interface when necessary

Inventis · May 12, 2020 · b37206e · b37206e
1 parent 04a7f14
commit b37206e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/src/Sylius/Bundle/CoreBundle/Templating/Helper/PriceHelper.php b/src/Sylius/Bundle/CoreBundle/Templating/Helper/PriceHelper.php
@@ -13,17 +13,17 @@
 
 namespace Sylius\Bundle\CoreBundle\Templating\Helper;
 
-use Sylius\Component\Core\Calculator\ProductVariantPriceCalculatorInterface;
+use Sylius\Component\Core\Calculator\ProductVariantPricesCalculatorInterface;
 use Sylius\Component\Core\Model\ProductVariantInterface;
 use Symfony\Component\Templating\Helper\Helper;
 use Webmozart\Assert\Assert;
 
 class PriceHelper extends Helper
 {
-    /** @var ProductVariantPriceCalculatorInterface */
+    /** @var ProductVariantPricesCalculatorInterface */
     private $productVariantPriceCalculator;
 
-    public function __construct(ProductVariantPriceCalculatorInterface $productVariantPriceCalculator)
+    public function __construct(ProductVariantPricesCalculatorInterface $productVariantPriceCalculator)
     {
         $this->productVariantPriceCalculator = $productVariantPriceCalculator;
     }

diff --git a/src/Sylius/Bundle/CoreBundle/spec/Templating/Helper/PriceHelperSpec.php b/src/Sylius/Bundle/CoreBundle/spec/Templating/Helper/PriceHelperSpec.php
@@ -14,14 +14,14 @@
 namespace spec\Sylius\Bundle\CoreBundle\Templating\Helper;
 
 use PhpSpec\ObjectBehavior;
-use Sylius\Component\Core\Calculator\ProductVariantPriceCalculatorInterface;
+use Sylius\Component\Core\Calculator\ProductVariantPricesCalculatorInterface;
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Model\ProductVariantInterface;
 use Symfony\Component\Templating\Helper\Helper;
 
 final class PriceHelperSpec extends ObjectBehavior
 {
-    function let(ProductVariantPriceCalculatorInterface $productVariantPriceCalculator): void
+    function let(ProductVariantPricesCalculatorInterface $productVariantPriceCalculator): void
     {
         $this->beConstructedWith($productVariantPriceCalculator);
     }
@@ -34,7 +34,7 @@ function it_is_helper(): void
     function it_returns_variant_price_for_channel_given_in_context(
         ChannelInterface $channel,
         ProductVariantInterface $productVariant,
-        ProductVariantPriceCalculatorInterface $productVariantPriceCalculator
+        ProductVariantPricesCalculatorInterface $productVariantPriceCalculator
     ): void {
         $context = ['channel' => $channel];
 
@@ -45,7 +45,7 @@ function it_returns_variant_price_for_channel_given_in_context(
 
     function it_throws_invalid_argument_exception_when_channel_key_is_not_present_in_context(
         ProductVariantInterface $productVariant,
-        ProductVariantPriceCalculatorInterface $productVariantPriceCalculator
+        ProductVariantPricesCalculatorInterface $productVariantPriceCalculator
     ): void {
         $context = ['lennahc' => ''];
 
@@ -57,7 +57,7 @@ function it_throws_invalid_argument_exception_when_channel_key_is_not_present_in
     function it_returns_variant_original_price_for_channel_given_in_context(
         ChannelInterface $channel,
         ProductVariantInterface $productVariant,
-        ProductVariantPriceCalculatorInterface $productVariantPriceCalculator
+        ProductVariantPricesCalculatorInterface $productVariantPriceCalculator
     ): void {
         $context = ['channel' => $channel];
 
@@ -68,7 +68,7 @@ function it_returns_variant_original_price_for_channel_given_in_context(
 
     function it_throws_invalid_argument_exception_when_channel_key_is_not_present_in_context_when_getting_original_price(
         ProductVariantInterface $productVariant,
-        ProductVariantPriceCalculatorInterface $productVariantPriceCalculator
+        ProductVariantPricesCalculatorInterface $productVariantPriceCalculator
     ): void {
         $context = ['lennahc' => ''];
 
@@ -80,7 +80,7 @@ function it_throws_invalid_argument_exception_when_channel_key_is_not_present_in
     function it_returns_true_if_variant_is_discounted_for_channel_given_in_context(
         ChannelInterface $channel,
         ProductVariantInterface $productVariant,
-        ProductVariantPriceCalculatorInterface $productVariantPriceCalculator
+        ProductVariantPricesCalculatorInterface $productVariantPriceCalculator
     ): void {
         $context = ['channel' => $channel];
 
@@ -93,7 +93,7 @@ function it_returns_true_if_variant_is_discounted_for_channel_given_in_context(
     function it_returns_false_if_variant_is_not_discounted_for_channel_given_in_context(
         ChannelInterface $channel,
         ProductVariantInterface $productVariant,
-        ProductVariantPriceCalculatorInterface $productVariantPriceCalculator
+        ProductVariantPricesCalculatorInterface $productVariantPriceCalculator
     ): void {
         $context = ['channel' => $channel];
 
@@ -105,7 +105,7 @@ function it_returns_false_if_variant_is_not_discounted_for_channel_given_in_cont
 
     function it_throws_invalid_argument_exception_when_channel_key_is_not_present_in_context_when_checking_if_variant_is_discounted(
         ProductVariantInterface $productVariant,
-        ProductVariantPriceCalculatorInterface $productVariantPriceCalculator
+        ProductVariantPricesCalculatorInterface $productVariantPriceCalculator
     ): void {
         $context = ['lennahc' => ''];
 

diff --git a/src/Sylius/Component/Core/Calculator/ProductVariantPricesCalculatorInterface.php b/src/Sylius/Component/Core/Calculator/ProductVariantPricesCalculatorInterface.php
@@ -16,12 +16,8 @@
 use Sylius\Component\Core\Exception\MissingChannelConfigurationException;
 use Sylius\Component\Core\Model\ProductVariantInterface;
 
-interface ProductVariantPricesCalculatorInterface
+interface ProductVariantPricesCalculatorInterface extends ProductVariantPriceCalculatorInterface
 {
-    /**
-     * @throws MissingChannelConfigurationException when price for given channel does not exist
-     */
-    public function calculate(ProductVariantInterface $productVariant, array $context): int;
 
     /**
      * @throws MissingChannelConfigurationException when price for given channel does not exist

diff --git a/src/Sylius/Component/Core/spec/Calculator/ProductVariantPriceCalculatorSpec.php b/src/Sylius/Component/Core/spec/Calculator/ProductVariantPriceCalculatorSpec.php
@@ -14,7 +14,7 @@
 namespace spec\Sylius\Component\Core\Calculator;
 
 use PhpSpec\ObjectBehavior;
-use Sylius\Component\Core\Calculator\ProductVariantPriceCalculatorInterface;
+use Sylius\Component\Core\Calculator\ProductVariantPricesCalculatorInterface;
 use Sylius\Component\Core\Exception\MissingChannelConfigurationException;
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Model\ChannelPricingInterface;
@@ -24,7 +24,7 @@ final class ProductVariantPriceCalculatorSpec extends ObjectBehavior
 {
     function it_implements_product_variant_price_calculator_interface(): void
     {
-        $this->shouldImplement(ProductVariantPriceCalculatorInterface::class);
+        $this->shouldImplement(ProductVariantPricesCalculatorInterface::class);
     }
 
     function it_gets_price_for_product_variant_in_given_channel(