Skip to content

Commit 71cfee9

Browse files
authored
Revert "Mainline EAV attribute generators"
1 parent e4083aa commit 71cfee9

File tree

85 files changed

+5
-7598
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+5
-7598
lines changed

.github/workflows/gradle.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: Run automated tests
55

66
on:
77
pull_request:
8-
branches: [ master, '*-develop', 'mainline*' ]
8+
branches: [ master, 4.3.0-develop ]
99

1010
jobs:
1111
build-linux:
@@ -107,7 +107,6 @@ jobs:
107107
run: ./gradlew checkstyleCI -i --no-daemon
108108
env:
109109
MODIFIED_FILES: ${{ steps.file_changes.outputs.files}}
110-
ACTIONS_STEP_DEBUG: true
111110
- name: Run PMD Quality Check
112111
run: ./gradlew pmdCI -i --no-daemon
113112
env:

resources/META-INF/plugin.xml

-9
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,6 @@
101101
<add-to-group group-id="NewGroup" anchor="last"/>
102102
</group>
103103

104-
<!-- Eav Attribute generators -->
105-
<group id="NewEavAttributeGroup" class="com.magento.idea.magento2plugin.actions.groups.NewEavAttributeGroup" text="Magento 2 EAV Attribute" popup="true">
106-
<action id="NewProductEavAttribute" class="com.magento.idea.magento2plugin.actions.generation.eavattribute.NewProductEavAttributeAction" />
107-
<action id="NewCatalogEavAttribute" class="com.magento.idea.magento2plugin.actions.generation.eavattribute.NewCategoryEavAttributeAction" />
108-
<action id="NewCustomerAttribute" class="com.magento.idea.magento2plugin.actions.generation.NewCustomerEavAttributeAction" />
109-
<add-to-group group-id="MagentoNewModuleFileGroup" anchor="last"/>
110-
</group>
111-
112104
<!-- Complex generators -->
113105
<group id="MagentoNewGroup">
114106
<action id="Magento2NewModule" class="com.magento.idea.magento2plugin.actions.generation.NewModuleAction"/>
@@ -208,7 +200,6 @@
208200
<fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.xml.MenuIndex" />
209201
<fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.xml.DeclarativeSchemaElementsIndex" />
210202
<fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.xml.UIComponentIndex" />
211-
<fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.xml.ProductTypeIndex" />
212203

213204
<codeInsight.lineMarkerProvider language="PHP" implementationClass="com.magento.idea.magento2plugin.linemarker.php.PluginLineMarkerProvider"/>
214205
<codeInsight.lineMarkerProvider language="PHP" implementationClass="com.magento.idea.magento2plugin.linemarker.php.PluginTargetLineMarkerProvider"/>

resources/fileTemplates/code/Magento Category Admin Form XML Decoration.xml.ft

-7
This file was deleted.

resources/fileTemplates/internal/Magento Category Admin Form XML.xml.ft

-4
This file was deleted.

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

-122
This file was deleted.

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

-15
This file was deleted.

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

-87
This file was deleted.

resources/fileTemplates/internal/Magento Source Model Class.php.ft

-22
This file was deleted.

resources/magento2/validation.properties

-1
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,3 @@ validator.arrayValuesDialog.namesMustBeUnique=Duplicated items names
4747
validator.arrayValuesDialog.nameMustNotBeEmpty=The array name cannot be empty
4848
validator.layoutNameRuleInvalid=The layout name is invalid
4949
validator.layoutNameUnderscoreQtyInvalid=Wrong layout name, please check
50-
validator.commaSeparatedString.isNotValid=The {0} field must contain comma separated string without whitespaces

src/com/magento/idea/magento2plugin/actions/generation/NewCustomerEavAttributeAction.java

-31
This file was deleted.

0 commit comments

Comments
 (0)