Skip to content

Commit 64d8b6a

Browse files
author
Vitaliy
authored
Merge branch '2.1.0-develop' into models-generation
2 parents df1d9ee + 274caf2 commit 64d8b6a

File tree

7 files changed

+76
-99
lines changed

7 files changed

+76
-99
lines changed

‎resources/fileTemplates/code/Magento Module UI Component Form Field Xml.xml.html‎

Lines changed: 1 addition & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -6,54 +6,5 @@
66
-->
77
<html lang="en">
88
<body>
9-
<p face="verdana" size="-1">
10-
The <a href="https://devdocs.magento.com/guides/v2.4/ui_comp_guide/components/ui-form.html">Form component</a> configuration.
11-
</p>
12-
13-
<table width="100%" border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse">
14-
<tr>
15-
<td colspan="3"><font face="verdana" size="-1">Predefined variables will take the following values:</font></td>
16-
</tr>
17-
<tr>
18-
<td valign="top"><nobr><font face="verdana" size="-2"><b>${NAME}</b></font></nobr></td>
19-
<td width="10">&nbsp;</td>
20-
<td width="100%" valign="top"><font face="verdana" size="-1">Name for the UI Component Form. The name will be used for configuration file.</font></td>
21-
</tr>
22-
<tr>
23-
<td valign="top"><nobr><font face="verdana" size="-2"><b>${LABEL}</b></font></nobr></td>
24-
<td width="10">&nbsp;</td>
25-
<td width="100%" valign="top"><font face="verdana" size="-1">Label for form elements (fieldset, button, input, etc..)</font></td>
26-
</tr>
27-
<tr>
28-
<td valign="top"><nobr><font face="verdana" size="-2"><b>${BUTTONS}</b></font></nobr></td>
29-
<td width="10">&nbsp;</td>
30-
<td width="100%" valign="top"><font face="verdana" size="-1">Buttons that should be added to form.</font></td>
31-
</tr>
32-
<tr>
33-
<td valign="top"><nobr><font face="verdana" size="-2"><b>${ROUTE}</b></font></nobr></td>
34-
<td width="10">&nbsp;</td>
35-
<td width="100%" valign="top"><font face="verdana" size="-1">Route name</font></td>
36-
</tr>
37-
<tr>
38-
<td valign="top"><nobr><font face="verdana" size="-2"><b>${SUBMIT_CONTROLLER}</b></font></nobr></td>
39-
<td width="10">&nbsp;</td>
40-
<td width="100%" valign="top"><font face="verdana" size="-1">Class name for the controller.</font></td>
41-
</tr>
42-
<tr>
43-
<td valign="top"><nobr><font face="verdana" size="-2"><b>${SUBMIT_ACTION}</b></font></nobr></td>
44-
<td width="10">&nbsp;</td>
45-
<td width="100%" valign="top"><font face="verdana" size="-1">Specifies the action class name.</font></td>
46-
</tr>
47-
<tr>
48-
<td valign="top"><nobr><font face="verdana" size="-2"><b>${DATA_PROVIDER}</b></font></nobr></td>
49-
<td width="10">&nbsp;</td>
50-
<td width="100%" valign="top"><font face="verdana" size="-1">Class name for the data provider class.</font></td>
51-
</tr>
52-
<tr>
53-
<td valign="top"><nobr><font face="verdana" size="-2"><b>${PRIMARY_FIELD}</b></font></nobr></td>
54-
<td width="10">&nbsp;</td>
55-
<td width="100%" valign="top"><font face="verdana" size="-1">Resource model primary field name.</font></td>
56-
</tr>
57-
</table>
589
</body>
59-
</html>
10+
</html>

‎resources/fileTemplates/internal/Magento Form Button Block Class.php.html‎

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -6,54 +6,5 @@
66
-->
77
<html lang="en">
88
<body>
9-
<p face="verdana" size="-1">
10-
The <a href="https://devdocs.magento.com/guides/v2.4/ui_comp_guide/components/ui-form.html">Form component</a> configuration.
11-
</p>
12-
13-
<table width="100%" border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse">
14-
<tr>
15-
<td colspan="3"><font face="verdana" size="-1">Predefined variables will take the following values:</font></td>
16-
</tr>
17-
<tr>
18-
<td valign="top"><nobr><font face="verdana" size="-2"><b>${NAME}</b></font></nobr></td>
19-
<td width="10">&nbsp;</td>
20-
<td width="100%" valign="top"><font face="verdana" size="-1">Name for the UI Component Form. The name will be used for configuration file.</font></td>
21-
</tr>
22-
<tr>
23-
<td valign="top"><nobr><font face="verdana" size="-2"><b>${LABEL}</b></font></nobr></td>
24-
<td width="10">&nbsp;</td>
25-
<td width="100%" valign="top"><font face="verdana" size="-1">Label for form elements (fieldset, button, input, etc..)</font></td>
26-
</tr>
27-
<tr>
28-
<td valign="top"><nobr><font face="verdana" size="-2"><b>${BUTTONS}</b></font></nobr></td>
29-
<td width="10">&nbsp;</td>
30-
<td width="100%" valign="top"><font face="verdana" size="-1">Buttons that should be added to form.</font></td>
31-
</tr>
32-
<tr>
33-
<td valign="top"><nobr><font face="verdana" size="-2"><b>${ROUTE}</b></font></nobr></td>
34-
<td width="10">&nbsp;</td>
35-
<td width="100%" valign="top"><font face="verdana" size="-1">Route name</font></td>
36-
</tr>
37-
<tr>
38-
<td valign="top"><nobr><font face="verdana" size="-2"><b>${SUBMIT_CONTROLLER}</b></font></nobr></td>
39-
<td width="10">&nbsp;</td>
40-
<td width="100%" valign="top"><font face="verdana" size="-1">Class name for the controller.</font></td>
41-
</tr>
42-
<tr>
43-
<td valign="top"><nobr><font face="verdana" size="-2"><b>${SUBMIT_ACTION}</b></font></nobr></td>
44-
<td width="10">&nbsp;</td>
45-
<td width="100%" valign="top"><font face="verdana" size="-1">Specifies the action class name.</font></td>
46-
</tr>
47-
<tr>
48-
<td valign="top"><nobr><font face="verdana" size="-2"><b>${DATA_PROVIDER}</b></font></nobr></td>
49-
<td width="10">&nbsp;</td>
50-
<td width="100%" valign="top"><font face="verdana" size="-1">Class name for the data provider class.</font></td>
51-
</tr>
52-
<tr>
53-
<td valign="top"><nobr><font face="verdana" size="-2"><b>${PRIMARY_FIELD}</b></font></nobr></td>
54-
<td width="10">&nbsp;</td>
55-
<td width="100%" valign="top"><font face="verdana" size="-1">Resource model primary field name.</font></td>
56-
</tr>
57-
</table>
589
</body>
5910
</html>

‎testData/completion/xml/ConstructorArgumentCompletionRegistrar/diXmlMustHaveCompletion/di.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config>
9+
<type name="Magento\Backend\Model\Source\YesNo">
10+
<arguments>
11+
<argument name="<caret>" xsi:type="object">Foo\Bar\Model\Logger</argument>
12+
</arguments>
13+
</type>
14+
</config>

‎testData/completion/xml/PhpClassMemberCompletionRegistrar/diXmlMustHaveCompletion/di.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config>
9+
<type name="Magento\Backend\Model\Source\YesNo">
10+
<arguments>
11+
<argument name="logger" xsi:type="init_parameter">Magento\Backend\Model\Source\YesNo::<caret></argument>
12+
</arguments>
13+
</type>
14+
</config>

‎testData/project/magento2/vendor/magento/module-backend/Model/Source/YesNo.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ class YesNo implements ArrayInterface
1515
*/
1616
private $logger;
1717

18+
/**
19+
* Constant to hold test string
20+
*/
21+
public const TEST_STRING = "Test string";
22+
1823
/**
1924
* YesNo constructor.
2025
*

‎tests/com/magento/idea/magento2plugin/completion/xml/ConstructorArgumentCompletionRegistrarTest.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/**
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
6+
package com.magento.idea.magento2plugin.completion.xml;
7+
8+
import com.magento.idea.magento2plugin.magento.files.ModuleDiXml;
9+
10+
public class ConstructorArgumentCompletionRegistrarTest extends CompletionXmlFixtureTestCase {
11+
12+
/**
13+
* Tests for completion of constructor argument in di.xml.
14+
*/
15+
public void testDiXmlMustHaveCompletion() {
16+
final String filePath = this.getFixturePath(ModuleDiXml.FILE_NAME);
17+
myFixture.copyFileToProject(filePath);
18+
19+
assertFileContainsCompletions(filePath, "logger");
20+
}
21+
}

‎tests/com/magento/idea/magento2plugin/completion/xml/PhpClassMemberCompletionRegistrarTest.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/*
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
6+
package com.magento.idea.magento2plugin.completion.xml;
7+
8+
import com.magento.idea.magento2plugin.magento.files.ModuleDiXml;
9+
10+
public class PhpClassMemberCompletionRegistrarTest extends CompletionXmlFixtureTestCase {
11+
12+
/**
13+
* Tests for completion of init_parameter argument value in di.xml.
14+
*/
15+
public void testDiXmlMustHaveCompletion() {
16+
final String filePath = this.getFixturePath(ModuleDiXml.FILE_NAME);
17+
myFixture.configureByFile(filePath);
18+
19+
assertCompletionContains(filePath, "Magento\\Backend\\Model\\Source\\YesNo::TEST_STRING");
20+
}
21+
}

0 commit comments

Comments
 (0)