Review

Author: mbabker

composer.json

@@ -9,6 +9,7 @@
         "sylius/sylius": "~1.11.2",
         "symfony/config": "^5.4",
         "symfony/dependency-injection": "^5.4",
+        "symfony/expression-language": "^5.4",
         "symfony/event-dispatcher-contracts": "^2.5",
         "symfony/form": "^5.4",
         "symfony/framework-bundle": "^5.4",

src/Resources/config/services.php

@@ -6,7 +6,6 @@
 
 use BabDev\SyliusShippingEstimatePlugin\Controller\ShippingEstimatorController;
 use BabDev\SyliusShippingEstimatePlugin\Form\Type\ShippingEstimatorType;
-use Sylius\Component\Shipping\Calculator\DelegatingCalculatorInterface;
 
 return static function (ContainerConfigurator $container): void {
     $services = $container->services();
@@ -20,7 +19,7 @@
             service('sylius.factory.address'),
             service('sylius.factory.adjustment'),
             service('sylius.shipping_methods_resolver'),
-            service(DelegatingCalculatorInterface::class),
+            service('sylius.shipping_calculator'),
             service('sylius.money_formatter'),
             service('event_dispatcher'),
         ])

tests/Behat/Context/Ui/Shop/ShippingEstimatorContext.php

@@ -33,15 +33,15 @@ public function customerSeesTheShippingEstimator(): void
     /**
      * @When I choose :countryName as my country
      */
-    public function iChooseAsMyCountry($countryName): void
+    public function iChooseAsMyCountry(string $countryName): void
     {
         $this->summaryPage->selectCountry($countryName);
     }
 
     /**
      * @When I specify :postcode as my postcode
      */
-    public function iSpecifyAsMyPostcode($postcode): void
+    public function iSpecifyAsMyPostcode(string $postcode): void
     {
         $this->summaryPage->specifyPostcode($postcode);
     }
@@ -89,8 +89,8 @@ public function theNoShippingOptionsMessageIsNotVisible(): void
     /**
      * @When I see :count shipping options available
      */
-    public function iSeeShippingOptions($count): void
+    public function iSeeShippingOptions(int $count): void
     {
-        $this->summaryPage->seeShippingOptions((int) $count);
+        $this->summaryPage->seeShippingOptions($count);
     }
 }

tests/Behat/Page/Shop/SummaryPage.php

@@ -16,56 +16,44 @@ public function hasShippingEstimator(): bool
 
     public function doesNotHaveAddressMessage(): bool
     {
-        $message = $this->getElement('enter_address_message');
-
-        return $message->hasClass('hidden');
+        return $this->getElement('enter_address_message')->hasClass('hidden');
     }
 
     public function hasAddressMessage(): bool
     {
-        $message = $this->getElement('enter_address_message');
-
-        return !$message->hasClass('hidden');
+        return !$this->getElement('enter_address_message')->hasClass('hidden');
     }
 
     public function doesNotHaveNoShippingOptionsMessage(): bool
     {
-        $message = $this->getElement('no_shipping_options_message');
-
-        return $message->hasClass('hidden');
+        return $this->getElement('no_shipping_options_message')->hasClass('hidden');
     }
 
     public function hasNoShippingOptionsMessage(): bool
     {
-        $message = $this->getElement('no_shipping_options_message');
-
-        return !$message->hasClass('hidden');
+        return !$this->getElement('no_shipping_options_message')->hasClass('hidden');
     }
 
     public function seeShippingOptions(int $count): bool
     {
-        $table = $this->getElement('shipping_options_table');
-        $options = $table->findAll('css', 'tbody tr');
+        $options = $this->getElement('shipping_options_table')->findAll('css', 'tbody tr');
 
         return count($options) === $count;
     }
 
     public function selectCountry(string $value): void
     {
-        $country = $this->getElement('shipping_estimator_country');
-        $country->selectOption($value);
+        $this->getElement('shipping_estimator_country')->selectOption($value);
     }
 
     public function specifyPostcode(string $value): void
     {
-        $postcode = $this->getElement('shipping_estimator_postcode');
-        $postcode->setValue($value);
+        $this->getElement('shipping_estimator_postcode')->setValue($value);
     }
 
     public function clickEstimateShippingButton(): void
     {
-        $button = $this->getElement('estimate_shipping_button');
-        $button->click();
+        $this->getElement('estimate_shipping_button')->click();
 
         JQueryHelper::waitForFormToStopLoading($this->getDocument());
     }