#12695: Unable to change attribute type from swatch to dropdown

- fixes regarding comments @sidolov

Author: eugene-shab

app/code/Magento/Swatches/Model/SwatchAttributesProvider.php

@@ -18,10 +18,6 @@
  */
 class SwatchAttributesProvider
 {
-    /**
-     * @var \Magento\Swatches\Helper\Data
-     */
-    protected $swatchesHelper;
     /**
      * @var Configurable
      */
@@ -48,18 +44,15 @@ class SwatchAttributesProvider
      *
      * @param Configurable         $typeConfigurable
      * @param SwatchAttributeCodes $swatchAttributeCodes
-     * @param SwatchesHelper|null    $swatchHelper
      * @param SwatchAttributeType|null $swatchTypeChecker
      */
     public function __construct(
         Configurable $typeConfigurable,
         SwatchAttributeCodes $swatchAttributeCodes,
-        SwatchesHelper $swatchHelper = null,
         SwatchAttributeType $swatchTypeChecker = null
     ) {
         $this->typeConfigurable = $typeConfigurable;
         $this->swatchAttributeCodes = $swatchAttributeCodes;
-        $this->swatchesHelper = $swatchHelper ?: ObjectManager::getInstance()->create(SwatchesHelper::class);
         $this->swatchTypeChecker = $swatchTypeChecker
             ?: ObjectManager::getInstance()->create(SwatchAttributeType::class);
     }

app/code/Magento/Swatches/Test/Unit/Model/SwatchAttributesProviderTest.php

@@ -30,11 +30,6 @@ class SwatchAttributesProviderTest extends \PHPUnit\Framework\TestCase
      */
     private $swatchAttributeCodes;
 
-    /**
-     * @var \Magento\Swatches\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $swatchHelper;
-
     /**
      * @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -56,10 +51,6 @@ protected function setUp()
 
         $this->productMock = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['getId', 'getTypeId']);
         $this->swatchTypeChecker = $this->createMock(SwatchAttributeType::class);
-        $this->swatchHelper = $this->createPartialMock(
-            \Magento\Swatches\Helper\Data::class,
-            ['isSwatchAttribute']
-        );
 
         $this->swatchAttributeProvider = (new ObjectManager($this))->getObject(SwatchAttributesProvider::class, [
             'typeConfigurable' => $this->typeConfigurable,

app/code/Magento/Swatches/etc/di.xml

@@ -81,9 +81,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="\Magento\Swatches\Model\SwatchAttributesProvider">
-        <arguments>
-            <argument name="swatchHelper" xsi:type="object">\Magento\Swatches\Helper\Data\Proxy</argument>
-        </arguments>
-    </type>
 </config>