Merge remote-tracking branch 'upstream/2.3-develop' into 2.3.0-release-sync2

Author: joanhe

.github/ISSUE_TEMPLATE.md

@@ -5,19 +5,20 @@
      - Information on your environment,
      - Steps to reproduce,
      - Expected and actual results,
+    Fields marked with (*) are required. Please don't remove the template.
 
     Please also have a look at our guidelines article before adding a new issue https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
 -->
 
-### Preconditions
+### Preconditions (*)
 <!---
     Please provide as detailed information about your environment as possible.
     For example Magento version, tag, HEAD, PHP & MySQL version, etc..
 -->
 1. 
 2. 
 
-### Steps to reproduce
+### Steps to reproduce (*)
 <!---
     It is important to provide a set of clear steps to reproduce this bug.
     If relevant please include code samples
@@ -26,10 +27,10 @@
 2. 
 3. 
 
-### Expected result
+### Expected result (*)
 <!--- Tell us what should happen -->
 1. [Screenshots, logs or description]
 
-### Actual result
+### Actual result (*)
 <!--- Tell us what happens instead -->
 1. [Screenshots, logs or description]

.github/ISSUE_TEMPLATE/bug_report.md

@@ -6,28 +6,29 @@ about: Technical issue with the Magento 2 core components
 
 <!---
 Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
+Fields marked with (*) are required. Please don't remove the template.
 -->
 
-### Preconditions
+### Preconditions (*)
 <!---
 Provide the exact Magento version (example: 2.2.5) and any important information on the environment where bug is reproducible.
 -->
 1.
 2.
 
-### Steps to reproduce
+### Steps to reproduce (*)
 <!---
 Important: Provide a set of clear steps to reproduce this bug. We can not provide support without clear instructions on how to reproduce.
 -->
 1.
 2.
 
-### Expected result
+### Expected result (*)
 <!--- Tell us what do you expect to happen. -->
 1. [Screenshots, logs or description]
 2.
 
-### Actual result
+### Actual result (*)
 <!--- Tell us what happened instead. Include error messages and issues. -->
 1. [Screenshots, logs or description]
 2.

.github/ISSUE_TEMPLATE/developer-experience-issue.md

@@ -6,12 +6,13 @@ about: Issues related to customization, extensibility, modularity
 
 <!---
 Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
+Fields marked with (*) are required. Please don't remove the template.
 -->
 
-### Summary
+### Summary (*)
 <!--- Describe the issue you are experiencing. Include general information, error messages, environments, and so on. -->
 
-### Examples
+### Examples (*)
 <!--- Provide code examples or a patch with a test (recommended) to clearly indicate the problem. -->
 
 ### Proposed solution

.github/ISSUE_TEMPLATE/feature_request.md

@@ -5,13 +5,13 @@ about: Please consider reporting directly to https://github.com/magento/communit
 ---
 
 <!---
-Important: This repository is intended only for Magento 2 Technical Issues. Enter Feature Requests at https://github.com/magento/community-features. Project stakeholders monitor and manage requests. Feature requests entered using this form may be moved to the forum.
+Important: This repository is intended only for Magento 2 Technical Issues. Enter Feature Requests at https://github.com/magento/community-features. Project stakeholders monitor and manage requests. Feature requests entered using this form may be moved to the forum. Fields marked with (*) are required. Please don't remove the template.
 -->
 
-### Description
+### Description (*)
 <!--- Describe the feature you would like to add. -->
 
-### Expected behavior
+### Expected behavior (*)
 <!--- What is the expected behavior of this feature? How is it going to work? -->
 
 ### Benefits

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,12 +3,13 @@
     To help us process this pull request we recommend that you add the following information:
      - Summary of the pull request,
      - Issue(s) related to the changes made,
-     - Manual testing scenarios,
+     - Manual testing scenarios
+    Fields marked with (*) are required. Please don't remove the template.
 -->
 
 <!--- Please provide a general summary of the Pull Request in the Title above -->
 
-### Description
+### Description (*)
 <!---
     Please provide a description of the changes proposed in the pull request.
     Letting us know what has changed and why it needed changing will help us validate this pull request.
@@ -22,15 +23,15 @@
 1. magento/magento2#<issue_number>: Issue title
 2. ...
 
-### Manual testing scenarios
+### Manual testing scenarios (*)
 <!---
     Please provide a set of unambiguous steps to test the proposed code change.
     Giving us manual testing scenarios will help with the processing and validation process.
 -->
 1. ...
 2. ...
 
-### Contribution checklist
+### Contribution checklist (*)
  - [ ] Pull request has a meaningful description of its purpose
  - [ ] All commits are accompanied by meaningful commit messages
  - [ ] All new or changed code is covered with unit/integration tests (if applicable)

README.md

@@ -1,17 +1,16 @@
 [![Build Status](https://travis-ci.org/magento/magento2.svg?branch=2.3-develop)](https://travis-ci.org/magento/magento2)
 [![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
-[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.png)](https://crowdin.com/project/magento-2)
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.svg)](https://crowdin.com/project/magento-2)
 <h2>Welcome</h2>
 Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
 
 ## Magento system requirements
-[Magento system requirements](http://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html)
+[Magento system requirements](http://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html).
 
 ## Install Magento
-To install Magento, see either:
 
-*	[Installation guide](http://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html)
+*	[Installation guide](http://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).
 
 <h2>Contributing to the Magento 2 code base</h2>
 Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
@@ -52,7 +51,7 @@ Stay up-to-date on the latest security news and patches for Magento by signing u
 
 <h2>License</h2>
 
-Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
+Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license.
 
 http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 Please see LICENSE.txt for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.

app/code/Magento/Backend/Block/Widget/Form.php

@@ -3,8 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Block\Widget;
 
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Backend form widget
  *
@@ -27,13 +30,23 @@ class Form extends \Magento\Backend\Block\Widget
      */
     protected $_template = 'Magento_Backend::widget/form.phtml';
 
+    /** @var Form\Element\ElementCreator */
+    private $creator;
+
     /**
+     * Constructs form
+     *
      * @param \Magento\Backend\Block\Template\Context $context
      * @param array $data
+     * @param Form\Element\ElementCreator|null $creator
      */
-    public function __construct(\Magento\Backend\Block\Template\Context $context, array $data = [])
-    {
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        array $data = [],
+        Form\Element\ElementCreator $creator = null
+    ) {
         parent::__construct($context, $data);
+        $this->creator = $creator ?: ObjectManager::getInstance()->get(Form\Element\ElementCreator::class);
     }
 
     /**
@@ -148,6 +161,7 @@ protected function _beforeToHtml()
 
     /**
      * Initialize form fields values
+     *
      * Method will be called after prepareForm and can be used for field values initialization
      *
      * @return $this
@@ -173,32 +187,11 @@ protected function _setFieldset($attributes, $fieldset, $exclude = [])
             if (!$this->_isAttributeVisible($attribute)) {
                 continue;
             }
-            if (($inputType = $attribute->getFrontend()->getInputType()) && !in_array(
-                $attribute->getAttributeCode(),
-                $exclude
-            ) && ('media_image' != $inputType || $attribute->getAttributeCode() == 'image')
+            if (($inputType = $attribute->getFrontend()->getInputType())
+                && !in_array($attribute->getAttributeCode(), $exclude)
+                && ('media_image' !== $inputType || $attribute->getAttributeCode() == 'image')
             ) {
-                $fieldType = $inputType;
-                $rendererClass = $attribute->getFrontend()->getInputRendererClass();
-                if (!empty($rendererClass)) {
-                    $fieldType = $inputType . '_' . $attribute->getAttributeCode();
-                    $fieldset->addType($fieldType, $rendererClass);
-                }
-
-                $element = $fieldset->addField(
-                    $attribute->getAttributeCode(),
-                    $fieldType,
-                    [
-                        'name' => $attribute->getAttributeCode(),
-                        'label' => $attribute->getFrontend()->getLocalizedLabel(),
-                        'class' => $attribute->getFrontend()->getClass(),
-                        'required' => $attribute->getIsRequired(),
-                        'note' => $attribute->getNote()
-                    ]
-                )->setEntityAttribute(
-                    $attribute
-                );
-
+                $element = $this->creator->create($fieldset, $attribute);
                 $element->setAfterElementHtml($this->_getAdditionalElementHtml($element));
 
                 $this->_applyTypeSpecificConfig($inputType, $element, $attribute);

app/code/Magento/Backend/Block/Widget/Form/Element/ElementCreator.php

@@ -0,0 +1,136 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Block\Widget\Form\Element;
+
+use Magento\Eav\Model\Entity\Attribute;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Data\Form\Element\Fieldset;
+
+/**
+ * Class ElementCreator
+ *
+ * @deprecated 100.3.0 in favour of UI component implementation
+ * @package Magento\Backend\Block\Widget\Form\Element
+ */
+class ElementCreator
+{
+    /**
+     * @var array
+     */
+    private $modifiers;
+
+    /**
+     * ElementCreator constructor.
+     *
+     * @param array $modifiers
+     */
+    public function __construct(array $modifiers = [])
+    {
+        $this->modifiers = $modifiers;
+    }
+
+    /**
+     * Creates element
+     *
+     * @param Fieldset $fieldset
+     * @param Attribute $attribute
+     *
+     * @return AbstractElement
+     */
+    public function create(Fieldset $fieldset, Attribute $attribute): AbstractElement
+    {
+        $config = $this->getElementConfig($attribute);
+
+        if (!empty($config['rendererClass'])) {
+            $fieldType = $config['inputType'] . '_' . $attribute->getAttributeCode();
+            $fieldset->addType($fieldType, $config['rendererClass']);
+        }
+
+        return $fieldset
+            ->addField($config['attribute_code'], $config['inputType'], $config)
+            ->setEntityAttribute($attribute);
+    }
+
+    /**
+     * Returns element config
+     *
+     * @param Attribute $attribute
+     * @return array
+     */
+    private function getElementConfig(Attribute $attribute): array
+    {
+        $defaultConfig = $this->createDefaultConfig($attribute);
+        $config = $this->modifyConfig($defaultConfig);
+
+        $config['label'] = __($config['label']);
+
+        return $config;
+    }
+
+    /**
+     * Returns default config
+     *
+     * @param Attribute $attribute
+     * @return array
+     */
+    private function createDefaultConfig(Attribute $attribute): array
+    {
+        return [
+            'inputType' => $attribute->getFrontend()->getInputType(),
+            'rendererClass' => $attribute->getFrontend()->getInputRendererClass(),
+            'attribute_code' => $attribute->getAttributeCode(),
+            'name' => $attribute->getAttributeCode(),
+            'label' => $attribute->getFrontend()->getLabel(),
+            'class' => $attribute->getFrontend()->getClass(),
+            'required' => $attribute->getIsRequired(),
+            'note' => $attribute->getNote(),
+        ];
+    }
+
+    /**
+     *  Modify config
+     *
+     * @param array $config
+     * @return array
+     */
+    private function modifyConfig(array $config): array
+    {
+        if ($this->isModified($config['attribute_code'])) {
+            return $this->applyModifier($config);
+        }
+        return $config;
+    }
+
+    /**
+     * Returns bool if attribute need to modify
+     *
+     * @param string $attribute_code
+     * @return bool
+     */
+    private function isModified($attribute_code): bool
+    {
+        return isset($this->modifiers[$attribute_code]);
+    }
+
+    /**
+     * Apply modifier to config
+     *
+     * @param array $config
+     * @return array
+     */
+    private function applyModifier(array $config): array
+    {
+        $modifiedConfig = $this->modifiers[$config['attribute_code']];
+        foreach (array_keys($config) as $key) {
+            if (isset($modifiedConfig[$key])) {
+                $config[$key] = $modifiedConfig[$key];
+            }
+        }
+        return $config;
+    }
+}