Merge pull request #587 from eduard13/eav-generators-improvements-2

Fixing the EAV selected scope for the generated attributes

Author: Vitaliy

resources/fileTemplates/internal/Magento Eav Attribute Data Patch Class.php.ft

@@ -40,8 +40,6 @@ class ${CLASS_NAME} implements ${IMPLEMENTS} {
      * means run PatchInterface::revert()
      *
      * If we speak about data, under revert means: $transaction->rollback()
-     *
-     * @return $this
      */
      public function apply()
      {

src/com/magento/idea/magento2plugin/actions/generation/dialog/util/eavdialog/AttributeUtil.java

@@ -54,7 +54,7 @@ public static String getSourceClassBySelectedItem(
      */
     public static String getScopeClassBySelectedItem(final ComboBoxItemData selectedScopeItem) {
         if (selectedScopeItem != null) {
-            selectedScopeItem.getKey().trim();
+            return selectedScopeItem.getKey().trim();
         }
 
         return AttributeScope.GLOBAL.getScope();

testData/actions/generation/generator/CategoryAttributePropertySetupPatchGenerator/generateFile/AddTestAttributeCategoryAttribute.php

@@ -2,6 +2,7 @@
 
 namespace Foo\Bar\Setup\Patch\Data;
 
+use Magento\Catalog\Model\Category;
 use Magento\Eav\Setup\EavSetup;
 use Magento\Eav\Setup\EavSetupFactory;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
@@ -39,16 +40,14 @@ public function __construct(
      * means run PatchInterface::revert()
      *
      * If we speak about data, under revert means: $transaction->rollback()
-     *
-     * @return $this
      */
     public function apply()
     {
         /** @var EavSetup $eavSetup */
         $eavSetup = $this->eavSetupFactory->create(['setup' => $this->moduleDataSetup]);
 
         $eavSetup->addAttribute(
-            \Magento\Catalog\Model\Category::ENTITY,
+            Category::ENTITY,
             'test_attribute',
             [
                 'input' => 'text',

testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFile/AddTestAttribute.php

@@ -40,8 +40,6 @@ public function __construct(
      * means run PatchInterface::revert()
      *
      * If we speak about data, under revert means: $transaction->rollback()
-     *
-     * @return $this
      */
     public function apply()
     {

testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFileWithApplyToAttribute/AddAppliedToAttribute.php

@@ -40,8 +40,6 @@ public function __construct(
      * means run PatchInterface::revert()
      *
      * If we speak about data, under revert means: $transaction->rollback()
-     *
-     * @return $this
      */
     public function apply()
     {

testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFileWithBooleanSourceModel/AddBooleanInputAttributeAttribute.php

@@ -40,8 +40,6 @@ public function __construct(
      * means run PatchInterface::revert()
      *
      * If we speak about data, under revert means: $transaction->rollback()
-     *
-     * @return $this
      */
     public function apply()
     {

testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFileWithGeneratedSourceModel/AddAttributeWithCustomSourceAttribute.php

@@ -40,8 +40,6 @@ public function __construct(
      * means run PatchInterface::revert()
      *
      * If we speak about data, under revert means: $transaction->rollback()
-     *
-     * @return $this
      */
     public function apply()
     {

testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFileWithOptions/AddAttributeWithOptionsAttribute.php

@@ -40,8 +40,6 @@ public function __construct(
      * means run PatchInterface::revert()
      *
      * If we speak about data, under revert means: $transaction->rollback()
-     *
-     * @return $this
      */
     public function apply()
     {