From 5dd7c5c50d4c79519b9791352e1cb6c2d5d4defb Mon Sep 17 00:00:00 2001 From: bohdan-harniuk Date: Mon, 5 Jul 2021 16:38:54 +0300 Subject: [PATCH] Added XML file header include, modified all existed xml files to include XML file header --- .../includes/XML File Header.xml.ft | 0 .../includes/XML File Header.xml.html | 84 +++++++++++++++++++ .../internal/Magento ACL XML.xml.ft | 1 + .../internal/Magento Cron Groups XML.xml.ft | 3 +- .../internal/Magento Cron Tab XML.xml.ft | 1 + .../internal/Magento DI XML.xml.ft | 1 + .../internal/Magento Events XML.xml.ft | 1 + .../internal/Magento Layout XML.xml.ft | 2 + .../internal/Magento Menu XML.xml.ft | 1 + ...gento Module Declarative Schema XML.xml.ft | 1 + .../Magento Module Email Templates Xml.xml.ft | 2 +- .../internal/Magento Module XML.xml.ft | 1 + .../Magento New Entity Layout XML.xml.ft | 2 + .../Magento Queue Communication XML.xml.ft | 1 + .../Magento Queue Consumer XML.xml.ft | 1 + .../Magento Queue Publisher XML.xml.ft | 1 + .../Magento Queue Topology XML.xml.ft | 1 + .../internal/Magento Routes XML.xml.ft | 1 + .../Magento UI Component Form XML.xml.ft | 1 + .../Magento UI Component Grid XML.xml.ft | 1 + .../internal/Magento Web API XML.xml.ft | 1 + .../customroute_entity_view.xml | 1 + .../cron_groups.xml | 2 +- .../cron_groups.xml | 2 +- .../generateEmptyCronGroup/cron_groups.xml | 2 +- .../email_templates.xml | 1 - .../email_templates.xml | 1 - .../email_templates.xml | 1 - .../book_book_new.xml | 1 + 29 files changed, 111 insertions(+), 8 deletions(-) create mode 100644 resources/fileTemplates/includes/XML File Header.xml.ft create mode 100644 resources/fileTemplates/includes/XML File Header.xml.html diff --git a/resources/fileTemplates/includes/XML File Header.xml.ft b/resources/fileTemplates/includes/XML File Header.xml.ft new file mode 100644 index 000000000..e69de29bb diff --git a/resources/fileTemplates/includes/XML File Header.xml.html b/resources/fileTemplates/includes/XML File Header.xml.html new file mode 100644 index 000000000..78f3423b1 --- /dev/null +++ b/resources/fileTemplates/includes/XML File Header.xml.html @@ -0,0 +1,84 @@ + + + + + + +
This is a built-in template. It contains a code fragment that can be included into file templates + (Templates tab) with the help of the #parse directive.
+ The template is editable. Along with the static text, code and comments, you can also use the predefined variables + that will be then expanded like macros into the corresponding values.
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Predefined variables will take the following values:
+ ${FILE_NAME} +  current file name
+ ${DATE} +  current system date
+ ${TIME} +  current system time
${YEAR} current year
${MONTH} current month
${MONTH_NAME_SHORT} first 3 letters of the current month name. Example: Jan, Feb, etc.
${MONTH_NAME_FULL} full name of the current month. Example: January, February, etc.
${DAY} current day of the month
${HOUR} current hour
${MINUTE} current minute
${SECOND} current second
${PROJECT_NAME} the name of the current project
+ + diff --git a/resources/fileTemplates/internal/Magento ACL XML.xml.ft b/resources/fileTemplates/internal/Magento ACL XML.xml.ft index ea7a0f716..e71b822e9 100644 --- a/resources/fileTemplates/internal/Magento ACL XML.xml.ft +++ b/resources/fileTemplates/internal/Magento ACL XML.xml.ft @@ -1,3 +1,4 @@ +#parse("XML File Header.xml") diff --git a/resources/fileTemplates/internal/Magento Cron Groups XML.xml.ft b/resources/fileTemplates/internal/Magento Cron Groups XML.xml.ft index 86de0d770..507911942 100644 --- a/resources/fileTemplates/internal/Magento Cron Groups XML.xml.ft +++ b/resources/fileTemplates/internal/Magento Cron Groups XML.xml.ft @@ -1,3 +1,4 @@ +#parse("XML File Header.xml") - \ No newline at end of file + diff --git a/resources/fileTemplates/internal/Magento Cron Tab XML.xml.ft b/resources/fileTemplates/internal/Magento Cron Tab XML.xml.ft index 2d9d36491..36fe2288e 100644 --- a/resources/fileTemplates/internal/Magento Cron Tab XML.xml.ft +++ b/resources/fileTemplates/internal/Magento Cron Tab XML.xml.ft @@ -1,3 +1,4 @@ +#parse("XML File Header.xml") diff --git a/resources/fileTemplates/internal/Magento DI XML.xml.ft b/resources/fileTemplates/internal/Magento DI XML.xml.ft index 5de0638f6..7f1b496d4 100644 --- a/resources/fileTemplates/internal/Magento DI XML.xml.ft +++ b/resources/fileTemplates/internal/Magento DI XML.xml.ft @@ -1,3 +1,4 @@ +#parse("XML File Header.xml") diff --git a/resources/fileTemplates/internal/Magento Events XML.xml.ft b/resources/fileTemplates/internal/Magento Events XML.xml.ft index bfb5e9669..97e00c64c 100644 --- a/resources/fileTemplates/internal/Magento Events XML.xml.ft +++ b/resources/fileTemplates/internal/Magento Events XML.xml.ft @@ -1,3 +1,4 @@ +#parse("XML File Header.xml") diff --git a/resources/fileTemplates/internal/Magento Layout XML.xml.ft b/resources/fileTemplates/internal/Magento Layout XML.xml.ft index 97dd76d5c..46efc847d 100644 --- a/resources/fileTemplates/internal/Magento Layout XML.xml.ft +++ b/resources/fileTemplates/internal/Magento Layout XML.xml.ft @@ -1,2 +1,4 @@ + +#parse("XML File Header.xml") diff --git a/resources/fileTemplates/internal/Magento Menu XML.xml.ft b/resources/fileTemplates/internal/Magento Menu XML.xml.ft index afe1a504b..7212efe6e 100644 --- a/resources/fileTemplates/internal/Magento Menu XML.xml.ft +++ b/resources/fileTemplates/internal/Magento Menu XML.xml.ft @@ -1,4 +1,5 @@ + #parse("XML File Header.xml") diff --git a/resources/fileTemplates/internal/Magento Module Declarative Schema XML.xml.ft b/resources/fileTemplates/internal/Magento Module Declarative Schema XML.xml.ft index 936509e1e..d17521c99 100644 --- a/resources/fileTemplates/internal/Magento Module Declarative Schema XML.xml.ft +++ b/resources/fileTemplates/internal/Magento Module Declarative Schema XML.xml.ft @@ -1,4 +1,5 @@ +#parse("XML File Header.xml") diff --git a/resources/fileTemplates/internal/Magento Module Email Templates Xml.xml.ft b/resources/fileTemplates/internal/Magento Module Email Templates Xml.xml.ft index ed3c17ff9..f0067f85a 100644 --- a/resources/fileTemplates/internal/Magento Module Email Templates Xml.xml.ft +++ b/resources/fileTemplates/internal/Magento Module Email Templates Xml.xml.ft @@ -1,4 +1,4 @@ - +#parse("XML File Header.xml") diff --git a/resources/fileTemplates/internal/Magento Module XML.xml.ft b/resources/fileTemplates/internal/Magento Module XML.xml.ft index ad60f0efe..e5303592a 100644 --- a/resources/fileTemplates/internal/Magento Module XML.xml.ft +++ b/resources/fileTemplates/internal/Magento Module XML.xml.ft @@ -1,4 +1,5 @@ +#parse("XML File Header.xml") #if (${SEQUENCES}) #if (${SETUP_VERSION}) diff --git a/resources/fileTemplates/internal/Magento New Entity Layout XML.xml.ft b/resources/fileTemplates/internal/Magento New Entity Layout XML.xml.ft index 0e2b03c76..a637446e4 100644 --- a/resources/fileTemplates/internal/Magento New Entity Layout XML.xml.ft +++ b/resources/fileTemplates/internal/Magento New Entity Layout XML.xml.ft @@ -1,3 +1,5 @@ + +#parse("XML File Header.xml") diff --git a/resources/fileTemplates/internal/Magento Queue Communication XML.xml.ft b/resources/fileTemplates/internal/Magento Queue Communication XML.xml.ft index efc3ec094..7dc97006c 100644 --- a/resources/fileTemplates/internal/Magento Queue Communication XML.xml.ft +++ b/resources/fileTemplates/internal/Magento Queue Communication XML.xml.ft @@ -1,4 +1,5 @@ +#parse("XML File Header.xml") diff --git a/resources/fileTemplates/internal/Magento Queue Consumer XML.xml.ft b/resources/fileTemplates/internal/Magento Queue Consumer XML.xml.ft index a20377ed1..4a35e5105 100644 --- a/resources/fileTemplates/internal/Magento Queue Consumer XML.xml.ft +++ b/resources/fileTemplates/internal/Magento Queue Consumer XML.xml.ft @@ -1,4 +1,5 @@ +#parse("XML File Header.xml") diff --git a/resources/fileTemplates/internal/Magento Queue Publisher XML.xml.ft b/resources/fileTemplates/internal/Magento Queue Publisher XML.xml.ft index bd8c544e5..81875774e 100644 --- a/resources/fileTemplates/internal/Magento Queue Publisher XML.xml.ft +++ b/resources/fileTemplates/internal/Magento Queue Publisher XML.xml.ft @@ -1,4 +1,5 @@ +#parse("XML File Header.xml") diff --git a/resources/fileTemplates/internal/Magento Queue Topology XML.xml.ft b/resources/fileTemplates/internal/Magento Queue Topology XML.xml.ft index f316f98b7..6b4cd8d17 100644 --- a/resources/fileTemplates/internal/Magento Queue Topology XML.xml.ft +++ b/resources/fileTemplates/internal/Magento Queue Topology XML.xml.ft @@ -1,4 +1,5 @@ +#parse("XML File Header.xml") diff --git a/resources/fileTemplates/internal/Magento Routes XML.xml.ft b/resources/fileTemplates/internal/Magento Routes XML.xml.ft index 5d44d48ee..55d92b380 100644 --- a/resources/fileTemplates/internal/Magento Routes XML.xml.ft +++ b/resources/fileTemplates/internal/Magento Routes XML.xml.ft @@ -1,4 +1,5 @@ +#parse("XML File Header.xml") diff --git a/resources/fileTemplates/internal/Magento UI Component Form XML.xml.ft b/resources/fileTemplates/internal/Magento UI Component Form XML.xml.ft index 6fe7739ac..1b1763ae7 100644 --- a/resources/fileTemplates/internal/Magento UI Component Form XML.xml.ft +++ b/resources/fileTemplates/internal/Magento UI Component Form XML.xml.ft @@ -1,4 +1,5 @@ +#parse("XML File Header.xml")
diff --git a/resources/fileTemplates/internal/Magento UI Component Grid XML.xml.ft b/resources/fileTemplates/internal/Magento UI Component Grid XML.xml.ft index e502f3088..d42fc0b52 100644 --- a/resources/fileTemplates/internal/Magento UI Component Grid XML.xml.ft +++ b/resources/fileTemplates/internal/Magento UI Component Grid XML.xml.ft @@ -1,4 +1,5 @@ +#parse("XML File Header.xml") diff --git a/resources/fileTemplates/internal/Magento Web API XML.xml.ft b/resources/fileTemplates/internal/Magento Web API XML.xml.ft index 6a40b771b..a5abc693c 100644 --- a/resources/fileTemplates/internal/Magento Web API XML.xml.ft +++ b/resources/fileTemplates/internal/Magento Web API XML.xml.ft @@ -1,4 +1,5 @@ +#parse("XML File Header.xml") diff --git a/testData/actions/generation/generator/LayoutXmlGenerator/generateLayoutXmlFile/customroute_entity_view.xml b/testData/actions/generation/generator/LayoutXmlGenerator/generateLayoutXmlFile/customroute_entity_view.xml index 0530a9361..b2a2d05d6 100644 --- a/testData/actions/generation/generator/LayoutXmlGenerator/generateLayoutXmlFile/customroute_entity_view.xml +++ b/testData/actions/generation/generator/LayoutXmlGenerator/generateLayoutXmlFile/customroute_entity_view.xml @@ -1,3 +1,4 @@ + diff --git a/testData/actions/generation/generator/ModuleCronGroupXmlGenerator/addTwoCronGroupsToCronGroupsXmlFile/cron_groups.xml b/testData/actions/generation/generator/ModuleCronGroupXmlGenerator/addTwoCronGroupsToCronGroupsXmlFile/cron_groups.xml index b69e32665..b9ee80b45 100644 --- a/testData/actions/generation/generator/ModuleCronGroupXmlGenerator/addTwoCronGroupsToCronGroupsXmlFile/cron_groups.xml +++ b/testData/actions/generation/generator/ModuleCronGroupXmlGenerator/addTwoCronGroupsToCronGroupsXmlFile/cron_groups.xml @@ -12,4 +12,4 @@ 600 1 - \ No newline at end of file + diff --git a/testData/actions/generation/generator/ModuleCronGroupXmlGenerator/generateCronGroupWithAllOptions/cron_groups.xml b/testData/actions/generation/generator/ModuleCronGroupXmlGenerator/generateCronGroupWithAllOptions/cron_groups.xml index 135de42ae..0e846734f 100644 --- a/testData/actions/generation/generator/ModuleCronGroupXmlGenerator/generateCronGroupWithAllOptions/cron_groups.xml +++ b/testData/actions/generation/generator/ModuleCronGroupXmlGenerator/generateCronGroupWithAllOptions/cron_groups.xml @@ -10,4 +10,4 @@ 600 1 - \ No newline at end of file + diff --git a/testData/actions/generation/generator/ModuleCronGroupXmlGenerator/generateEmptyCronGroup/cron_groups.xml b/testData/actions/generation/generator/ModuleCronGroupXmlGenerator/generateEmptyCronGroup/cron_groups.xml index 6ea58458d..f7342b0aa 100644 --- a/testData/actions/generation/generator/ModuleCronGroupXmlGenerator/generateEmptyCronGroup/cron_groups.xml +++ b/testData/actions/generation/generator/ModuleCronGroupXmlGenerator/generateEmptyCronGroup/cron_groups.xml @@ -3,4 +3,4 @@ xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/cron_groups.xsd"> - \ No newline at end of file + diff --git a/testData/actions/generation/generator/ModuleEmailTemplatesXmlGenerator/addTwoEmailTemplatesToEmailTemplatesXmlFile/email_templates.xml b/testData/actions/generation/generator/ModuleEmailTemplatesXmlGenerator/addTwoEmailTemplatesToEmailTemplatesXmlFile/email_templates.xml index 4bcb42774..80f3a65f2 100644 --- a/testData/actions/generation/generator/ModuleEmailTemplatesXmlGenerator/addTwoEmailTemplatesToEmailTemplatesXmlFile/email_templates.xml +++ b/testData/actions/generation/generator/ModuleEmailTemplatesXmlGenerator/addTwoEmailTemplatesToEmailTemplatesXmlFile/email_templates.xml @@ -1,5 +1,4 @@ -