Merge remote-tracking branch 'upstream/master' into show-path-optional

Author: fredden

Plugin/ConfigFieldPlugin.php

@@ -87,24 +87,18 @@ public function afterGetTooltip(Subject $subject, $result)
 
     /**
      * @param Subject $subject
-     * @param string $result
-     * @return string
+     * @param array $result
+     * @return array
      */
-    public function afterGetComment(Subject $subject, $result)
-    {
+    public function afterGetData(
+        Subject $subject,
+        array $result
+    ) {
         if (!$this->scopeConfig->isSetFlag(self::CONFIG_SHOW_PATH)) {
             return $result;
         }
 
-        if ($result instanceof Phrase) {
-            $result = (string) $result;
-        }
-
-        if (strlen(trim($result))) {
-            $result .= '<br />';
-        }
-
-        $result .= __('Path: <code>%1</code>', $this->getPath($subject));
+        $result['path_hint'] = '<small>' . __('Path: <code>%1</code>', $this->getPath($subject) . '</small>');
 
         return $result;
     }

Plugin/ConfigFormFieldPlugin.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace AvS\ScopeHint\Plugin;
+
+use Magento\Config\Block\System\Config\Form\Field;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+
+class ConfigFormFieldPlugin
+{
+    /**
+     * @param Field $subject
+     * @param AbstractElement $element
+     *
+     * @return array
+     */
+    public function beforeRender(
+        Field $subject,
+        AbstractElement $element
+    ): array {
+        $element->setData(
+            'after_element_html',
+            $element->getData('after_element_html') . $element->getData('field_config')['path_hint']
+        );
+
+        return [$element];
+    }
+}

etc/adminhtml/di.xml

@@ -7,4 +7,11 @@
     <type name="Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav">
         <plugin name="avs_scopehint_plugin_field" type="AvS\ScopeHint\Plugin\ProductEavDataProviderPlugin" sortOrder="1" disabled="false" />
     </type>
-</config>
+
+    <type name="Magento\Config\Block\System\Config\Form\Field">
+        <plugin name="avs_scopehint_plugin_add_config_path"
+                type="AvS\ScopeHint\Plugin\ConfigFormFieldPlugin"
+                sortOrder="1"
+                disabled="false"/>
+    </type>
+</config>