From 9dbf3bf5cd3c5e4db3e88f250946a45bba79c5a5 Mon Sep 17 00:00:00 2001
From: Tomanhez <tomek.sut@gmail.com>
Date: Fri, 18 Sep 2020 21:59:09 +0200
Subject: [PATCH 1/2] Fix broken steps

---
 .../Ui/Admin/ManagingProductVariantsContext.php      | 12 ++++++------
 .../Context/Ui/Admin/ManagingProductsContext.php     |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Sylius/Behat/Context/Ui/Admin/ManagingProductVariantsContext.php b/src/Sylius/Behat/Context/Ui/Admin/ManagingProductVariantsContext.php
index 49fc0b2c491..6cb821fb242 100644
--- a/src/Sylius/Behat/Context/Ui/Admin/ManagingProductVariantsContext.php
+++ b/src/Sylius/Behat/Context/Ui/Admin/ManagingProductVariantsContext.php
@@ -234,16 +234,16 @@ public function theVariantWithCodeShouldBePricedAtForChannel(ProductVariantInter
     }
 
     /**
-     * @Then /^the (variant with code "[^"]+") should be originally priced at (?:€|£|\$)([^"]+) for channel "([^"]+)"$/
+     * @Then /^the (variant with code "[^"]+") should be originally priced at (?:€|£|\$)([^"]+) for (channel "[^"]+")$/
      */
     public function theVariantWithCodeShouldBeOriginalPricedAtForChannel(
         ProductVariantInterface $productVariant,
         string $price,
-        string $channelName
+        ChannelInterface $channel
     ): void {
         $this->updatePage->open(['id' => $productVariant->getId(), 'productId' => $productVariant->getProduct()->getId()]);
 
-        Assert::same($this->updatePage->getOriginalPriceForChannel($channelName), $price);
+        Assert::same($this->updatePage->getOriginalPriceForChannel($channel), $price);
     }
 
     /**
@@ -578,16 +578,16 @@ public function iShouldNotHaveConfiguredPriceForChannel(ChannelInterface $channe
     }
 
     /**
-     * @Then I should have original price equal to :price in :channelName channel
+     * @Then I should have original price equal to :price in :channel channel
      */
-    public function iShouldHaveOriginalPriceEqualInChannel(string $price, string $channelName): void
+    public function iShouldHaveOriginalPriceEqualInChannel(string $price, ChannelInterface $channel): void
     {
         /** @var ProductVariantInterface $product */
         $productVariant = $this->sharedStorage->get('variant');
 
         $this->updatePage->open(['productId' => $productVariant->getProduct()->getId(), 'id' => $productVariant->getId()]);
 
-        Assert::contains($price, $this->updatePage->getOriginalPriceForChannel($channelName));
+        Assert::contains($price, $this->updatePage->getOriginalPriceForChannel($channel));
     }
 
     /**
diff --git a/src/Sylius/Behat/Context/Ui/Admin/ManagingProductsContext.php b/src/Sylius/Behat/Context/Ui/Admin/ManagingProductsContext.php
index 30489ed354f..6e48ff3eb47 100644
--- a/src/Sylius/Behat/Context/Ui/Admin/ManagingProductsContext.php
+++ b/src/Sylius/Behat/Context/Ui/Admin/ManagingProductsContext.php
@@ -1137,11 +1137,11 @@ public function iShouldNotHaveConfiguredPriceForChannel(ChannelInterface $channe
     }
 
     /**
-     * @Then I should have original price equal to :price in :channelName channel
+     * @Then I should have original price equal to :price in :channel channel
      */
-    public function iShouldHaveOriginalPriceEqualInChannel(string $price, string $channelName): void
+    public function iShouldHaveOriginalPriceEqualInChannel(string $price, ChannelInterface $channel): void
     {
-        Assert::contains($price, $this->updateSimpleProductPage->getOriginalPriceForChannel($channelName));
+        Assert::contains($price, $this->updateSimpleProductPage->getOriginalPriceForChannel($channel));
     }
 
     /**

From 3b527272aaa61bc846131b02e4be53ab797992c0 Mon Sep 17 00:00:00 2001
From: Adam Kasperczak <adamkasperczak123@gmail.com>
Date: Fri, 18 Sep 2020 11:50:43 +0200
Subject: [PATCH 2/2] Add missing migration to CoreBundle

---
 .../Migrations/Version20200916093101.php      | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 src/Sylius/Bundle/CoreBundle/Migrations/Version20200916093101.php

diff --git a/src/Sylius/Bundle/CoreBundle/Migrations/Version20200916093101.php b/src/Sylius/Bundle/CoreBundle/Migrations/Version20200916093101.php
new file mode 100644
index 00000000000..b40b4fb4390
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/Migrations/Version20200916093101.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20200916093101 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Make a price on channel pricing nullable';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('ALTER TABLE sylius_channel_pricing CHANGE price price INT DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('ALTER TABLE sylius_channel_pricing CHANGE price price INT NOT NULL');
+    }
+}