Skip to content

Merge 4.4.0 develop into 5.0.0 develop #1199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 19, 2022
Merged

Merge 4.4.0 develop into 5.0.0 develop #1199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
893d6bf
1179: moved graphql dependent actions to the withJsGraphQl.xml config…
VitaliyBoyko Sep 16, 2022
adfae0d
Merge pull request #1193 from magento/1179-graphql-dependent-actions-…
bohdan-harniuk Sep 16, 2022
20082f2
1196: Fixed customer EAV attribute generation for Magento 2.4.4
bohdan-harniuk Sep 19, 2022
18b03d4
Merge pull request #1197 from bohdan-harniuk/1196-fix-customer-eav-at…
VitaliyBoyko Sep 19, 2022
bfeccc2
Merge branch '4.4.0-develop' of github.com:magento/magento2-phpstorm-…
bohdan-harniuk Sep 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions resources/META-INF/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
<separator/>
<!-- Context dependent actions -->
<action id="MagentoCreateAclFile" class="com.magento.idea.magento2plugin.actions.context.xml.NewAclXmlAction"/>
<action id="MagentoCreateGraphQlSchemaFile" class="com.magento.idea.magento2plugin.actions.context.xml.NewGraphQLSchemaAction"/>
<action id="MagentoCreateConfigFile" class="com.magento.idea.magento2plugin.actions.context.xml.NewConfigXmlAction"/>
<action id="MagentoCreateCrontabFile" class="com.magento.idea.magento2plugin.actions.context.xml.NewCrontabXmlAction"/>
<action id="MagentoCreateDiFile" class="com.magento.idea.magento2plugin.actions.context.xml.NewDiXmlAction"/>
Expand Down Expand Up @@ -92,7 +91,6 @@
<action id="MagentoCreateACronjob" class="com.magento.idea.magento2plugin.actions.generation.NewCronjobAction" />
<action id="MagentoCreateACronGroup" class="com.magento.idea.magento2plugin.actions.generation.NewCronGroupAction" />
<action id="MagentoCreateAViewModel" class="com.magento.idea.magento2plugin.actions.generation.NewViewModelAction" />
<action id="MagentoCreateAGraphQlResolver" class="com.magento.idea.magento2plugin.actions.generation.NewGraphQlResolverAction" />
<action id="MagentoCreateCLICommand" class="com.magento.idea.magento2plugin.actions.generation.NewCLICommandAction" />
<action id="MagentoCreateEmailTemplate" class="com.magento.idea.magento2plugin.actions.generation.NewEmailTemplateAction" />
<action id="MagentoCreateUiComponentGrid" class="com.magento.idea.magento2plugin.actions.generation.NewUiComponentGridAction" />
Expand Down Expand Up @@ -622,7 +620,6 @@
<internalFileTemplate name="Magento Regular Class"/>
<internalFileTemplate name="Magento Observer Class"/>
<internalFileTemplate name="Magento Events XML"/>
<internalFileTemplate name="Magento GraphQL Resolver Class"/>
<internalFileTemplate name="Magento Cron Job Class"/>
<internalFileTemplate name="Magento Cron Tab XML"/>
<internalFileTemplate name="Magento CLI Command Class"/>
Expand All @@ -636,7 +633,6 @@
<internalFileTemplate name="Magento Routes XML"/>
<internalFileTemplate name="Magento Layout XML"/>
<internalFileTemplate name="Magento ACL XML"/>
<internalFileTemplate name="Magento GraphQL Schema"/>
<internalFileTemplate name="Magento Collection Class"/>
<internalFileTemplate name="Magento Model Class"/>
<internalFileTemplate name="Magento Resource Model Class"/>
Expand Down
16 changes: 16 additions & 0 deletions resources/META-INF/withJsGraphQl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,19 @@
-->

<idea-plugin>
<actions>
<group id="GraphQL.MagentoContextBasedActionsGroup">
<add-to-group group-id="MagentoContextBasedActionsGroup" anchor="last"/>
<action id="MagentoCreateGraphQlSchemaFile"
class="com.magento.idea.magento2plugin.actions.context.xml.NewGraphQLSchemaAction"/>
</group>
<group id="GraphQL.MagentoNewModuleFileGroup"
text="GraphQL"
popup="false">
<add-to-group group-id="MagentoNewModuleFileGroup" anchor="last"/>
<action id="MagentoCreateAGraphQlResolver" class="com.magento.idea.magento2plugin.actions.generation.NewGraphQlResolverAction" />
</group>
</actions>
<extensions defaultExtensionNs="com.intellij">
<fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.graphql.GraphQlResolverIndex" />
<codeInsight.lineMarkerProvider language="PHP" implementationClass="com.magento.idea.magento2plugin.linemarker.php.GraphQlResolverUsageLineMarkerProvider"/>
Expand All @@ -22,5 +35,8 @@
enabledByDefault="true"
level="ERROR"
implementationClass="com.magento.idea.magento2plugin.inspections.graphqls.SchemaResolverInspection"/>

<internalFileTemplate name="Magento GraphQL Resolver Class"/>
<internalFileTemplate name="Magento GraphQL Schema"/>
</extensions>
</idea-plugin>
2 changes: 1 addition & 1 deletion resources/fileTemplates/internal/Magento Customer Eav Attribute Data Patch Class.php.ft
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class ${CLASS_NAME} implements ${IMPLEMENTS}
$eavSetup->addAttributeToSet(
${CUSTOMER_METADATA_INTERFACE}::ENTITY_TYPE_CUSTOMER,
${CUSTOMER_METADATA_INTERFACE}::ATTRIBUTE_SET_ID_CUSTOMER,
null,
'Default',
'${ATTRIBUTE_CODE}'
);

Expand Down
2 changes: 1 addition & 1 deletion ...chGenerator/generateMultiselectAttributeDataPatch/AddMultiselectTestCustomerAttribute.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public function apply()
$eavSetup->addAttributeToSet(
CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER,
CustomerMetadataInterface::ATTRIBUTE_SET_ID_CUSTOMER,
null,
'Default',
'multiselect_test'
);

Expand Down