ENGCOM-3603: Fixed upgrade issue if manufacturer attribute not exist in the database #19514

magento-engcom-team · magento-engcom-team · commit d34ae4928978 · 2018-12-11T08:34:11.000-06:00
- Merge Pull Request #19514 from suneet64/magento2:2.3-develop - Merged commits: 1. 2c3a0ef 2. b3a21c4 3. d53ae02 4. 7b1455d
diff --git a/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/UpdateManufacturerAttribute.php b/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/UpdateManufacturerAttribute.php
@@ -15,8 +15,7 @@
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 
 /**
- * Class UpdateManufacturerAttribute
- * @package Magento\ConfigurableProduct\Setup\Patch
+ * Update manufacturer attribute if it's presented in system.
  */
 class UpdateManufacturerAttribute implements DataPatchInterface, PatchVersionInterface
 {
@@ -31,7 +30,6 @@ class UpdateManufacturerAttribute implements DataPatchInterface, PatchVersionInt
     private $eavSetupFactory;
 
     /**
-     * UpdateTierPriceAttribute constructor.
      * @param ModuleDataSetupInterface $moduleDataSetup
      * @param EavSetupFactory $eavSetupFactory
      */
@@ -44,7 +42,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -74,7 +72,7 @@ public function apply()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -84,15 +82,15 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}\
+     * @inheritdoc
      */
     public static function getVersion()
     {
         return '2.2.1';
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,7 @@`
`15`	`15`	`use Magento\ConfigurableProduct\Model\Product\Type\Configurable;`
`16`	`16`
`17`	`17`	`/**`
`18`		`- * Class UpdateManufacturerAttribute`
`19`		`- * @package Magento\ConfigurableProduct\Setup\Patch`
	`18`	`+ * Update manufacturer attribute if it's presented in system.`
`20`	`19`	`*/`
`21`	`20`	`class UpdateManufacturerAttribute implements DataPatchInterface, PatchVersionInterface`
`22`	`21`	`{`
`@@ -31,7 +30,6 @@ class UpdateManufacturerAttribute implements DataPatchInterface, PatchVersionInt`
`31`	`30`	`private $eavSetupFactory;`
`32`	`31`
`33`	`32`	`/**`
`34`		`- * UpdateTierPriceAttribute constructor.`
`35`	`33`	`* @param ModuleDataSetupInterface $moduleDataSetup`
`36`	`34`	`* @param EavSetupFactory $eavSetupFactory`
`37`	`35`	`*/`
`@@ -44,7 +42,7 @@ public function __construct(`
`44`	`42`	`}`
`45`	`43`
`46`	`44`	`/**`
`47`		`- * {@inheritdoc}`
	`45`	`+ * @inheritdoc`
`48`	`46`	`*/`
`49`	`47`	`public function apply()`
`50`	`48`	`{`
`@@ -74,7 +72,7 @@ public function apply()`
`74`	`72`	`}`
`75`	`73`
`76`	`74`	`/**`
`77`		`- * {@inheritdoc}`
	`75`	`+ * @inheritdoc`
`78`	`76`	`*/`
`79`	`77`	`public static function getDependencies()`
`80`	`78`	`{`
`@@ -84,15 +82,15 @@ public static function getDependencies()`
`84`	`82`	`}`
`85`	`83`
`86`	`84`	`/**`
`87`		`- * {@inheritdoc}\`
	`85`	`+ * @inheritdoc`
`88`	`86`	`*/`
`89`	`87`	`public static function getVersion()`
`90`	`88`	`{`
`91`	`89`	`return '2.2.1';`
`92`	`90`	`}`
`93`	`91`
`94`	`92`	`/**`
`95`		`- * {@inheritdoc}`
	`93`	`+ * @inheritdoc`
`96`	`94`	`*/`
`97`	`95`	`public function getAliases()`
`98`	`96`	`{`