From f7d2cbd01d8f5ad988a3683ec805ba809c3f11f2 Mon Sep 17 00:00:00 2001
From: Dan Wallis <dan@wallis.nz>
Date: Tue, 7 Mar 2023 14:18:40 +0000
Subject: [PATCH 1/2] Remove forbidden @author tag

---
 .../Magento/Framework/Data/Form/Element/AbstractElement.php     | 1 -
 lib/internal/Magento/Framework/Data/Form/Element/Button.php     | 2 --
 lib/internal/Magento/Framework/Data/Form/Element/Checkbox.php   | 2 --
 lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php | 2 --
 lib/internal/Magento/Framework/Data/Form/Element/Collection.php | 2 --
 lib/internal/Magento/Framework/Data/Form/Element/Column.php     | 2 --
 lib/internal/Magento/Framework/Data/Form/Element/Date.php       | 2 --
 .../Magento/Framework/Data/Form/Element/Editablemultiselect.php | 2 --
 lib/internal/Magento/Framework/Data/Form/Element/Editor.php     | 2 --
 lib/internal/Magento/Framework/Data/Form/Element/Fieldset.php   | 1 -
 lib/internal/Magento/Framework/Data/Form/Element/File.php       | 2 --
 lib/internal/Magento/Framework/Data/Form/Element/Gallery.php    | 2 --
 lib/internal/Magento/Framework/Data/Form/Element/Hidden.php     | 2 --
 lib/internal/Magento/Framework/Data/Form/Element/Imagefile.php  | 2 --
 lib/internal/Magento/Framework/Data/Form/Element/Link.php       | 2 --
 lib/internal/Magento/Framework/Data/Form/Element/Multiline.php  | 2 --
 .../Magento/Framework/Data/Form/Element/Multiselect.php         | 2 --
 lib/internal/Magento/Framework/Data/Form/Element/Note.php       | 2 --
 lib/internal/Magento/Framework/Data/Form/Element/Obscure.php    | 2 --
 lib/internal/Magento/Framework/Data/Form/Element/Password.php   | 2 --
 lib/internal/Magento/Framework/Data/Form/Element/Radio.php      | 2 --
 lib/internal/Magento/Framework/Data/Form/Element/Radios.php     | 2 --
 22 files changed, 42 deletions(-)

diff --git a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
index 34d065c42c9d8..3fdd38dc00241 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
@@ -18,7 +18,6 @@
  *
  * phpcs:disable Magento2.Classes.AbstractApi
  * @api
- * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @since 100.0.2
  */
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Button.php b/lib/internal/Magento/Framework/Data/Form/Element/Button.php
index ba0368ef298a6..0cd6bfb1e710f 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Button.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Button.php
@@ -6,8 +6,6 @@
 
 /**
  * Form button element
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Framework\Data\Form\Element;
 
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Checkbox.php b/lib/internal/Magento/Framework/Data/Form/Element/Checkbox.php
index 8be40b41fd737..81cdbb0623e5b 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Checkbox.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Checkbox.php
@@ -9,8 +9,6 @@
 
 /**
  * Form checkbox element
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Checkbox extends AbstractElement
 {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php b/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
index ce6639a98db2c..366f4216100e2 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
@@ -9,8 +9,6 @@
 
 /**
  * Form select element
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Checkboxes extends AbstractElement
 {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Collection.php b/lib/internal/Magento/Framework/Data/Form/Element/Collection.php
index e1b45feb99a3d..4a73ffd5014c2 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Collection.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Collection.php
@@ -10,8 +10,6 @@
 
 /**
  * Form element collection
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Collection implements \ArrayAccess, \IteratorAggregate, \Countable
 {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Column.php b/lib/internal/Magento/Framework/Data/Form/Element/Column.php
index 3232ef35dc804..6ff45a6ceada0 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Column.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Column.php
@@ -6,8 +6,6 @@
 
 /**
  * Form column
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Framework\Data\Form\Element;
 
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Date.php b/lib/internal/Magento/Framework/Data/Form/Element/Date.php
index 222f9588a1ccc..3e8ed3e625586 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Date.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Date.php
@@ -6,8 +6,6 @@
 
 /**
  * Magento data selector form element
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 
 namespace Magento\Framework\Data\Form\Element;
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php b/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php
index 5847ab6eedd0b..01d48995ad3c8 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php
@@ -8,8 +8,6 @@
  * Form editable select element
  *
  * Element allows inline modification of textual data within select
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Framework\Data\Form\Element;
 
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
index 7eaf7f0f4af37..65fc4810085a2 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
@@ -13,8 +13,6 @@
 
 /**
  * Form editor element
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Editor extends Textarea
 {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Fieldset.php b/lib/internal/Magento/Framework/Data/Form/Element/Fieldset.php
index d2c44c0f112a6..9a3a350ffb548 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Fieldset.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Fieldset.php
@@ -12,7 +12,6 @@
  * Form fieldset
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Fieldset extends AbstractElement
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/File.php b/lib/internal/Magento/Framework/Data/Form/Element/File.php
index 0d09c023959e1..4f49d3a248fdb 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/File.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/File.php
@@ -6,8 +6,6 @@
 
 /**
  * Form file element
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Framework\Data\Form\Element;
 
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php b/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
index 4d62a3f667dfe..90b916ed0b7d2 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
@@ -6,8 +6,6 @@
 
 /**
  * Category form input image element
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Framework\Data\Form\Element;
 
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Hidden.php b/lib/internal/Magento/Framework/Data/Form/Element/Hidden.php
index 1c0f051d30492..fb574675eddf0 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Hidden.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Hidden.php
@@ -6,8 +6,6 @@
 
 /**
  * Form hidden element
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Framework\Data\Form\Element;
 
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Imagefile.php b/lib/internal/Magento/Framework/Data/Form/Element/Imagefile.php
index 16716565f1a46..9ed4cd7134ef9 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Imagefile.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Imagefile.php
@@ -6,8 +6,6 @@
 
 /**
  * Form image file element
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Framework\Data\Form\Element;
 
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Link.php b/lib/internal/Magento/Framework/Data/Form/Element/Link.php
index 24e7a8253cdcd..76ca51b72ff1a 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Link.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Link.php
@@ -6,8 +6,6 @@
 
 /**
  * Magento Form element renderer to display link element
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Framework\Data\Form\Element;
 
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Multiline.php b/lib/internal/Magento/Framework/Data/Form/Element/Multiline.php
index 92ba31cde69a3..57da75497af29 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Multiline.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Multiline.php
@@ -6,8 +6,6 @@
 
 /**
  * Form multiline text elements
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Framework\Data\Form\Element;
 
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php b/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
index 5fc40bc3b70a8..0a915372d6264 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
@@ -6,8 +6,6 @@
 
 /**
  * Form select element
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Framework\Data\Form\Element;
 
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Note.php b/lib/internal/Magento/Framework/Data/Form/Element/Note.php
index 9973f842adc34..dd2c241e61647 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Note.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Note.php
@@ -6,8 +6,6 @@
 
 /**
  * Form note element
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Framework\Data\Form\Element;
 
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Obscure.php b/lib/internal/Magento/Framework/Data/Form/Element/Obscure.php
index a8e3fcb12ee0f..0814c92ee276c 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Obscure.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Obscure.php
@@ -6,8 +6,6 @@
 
 /**
  * Form text element
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Framework\Data\Form\Element;
 
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Password.php b/lib/internal/Magento/Framework/Data/Form/Element/Password.php
index df95133b4abf2..bac394bc1015e 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Password.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Password.php
@@ -6,8 +6,6 @@
 
 /**
  * Form password element
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Framework\Data\Form\Element;
 
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Radio.php b/lib/internal/Magento/Framework/Data/Form/Element/Radio.php
index aa009b1c5bc62..2813c56c0be5e 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Radio.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Radio.php
@@ -6,8 +6,6 @@
 
 /**
  * Form radio element
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Framework\Data\Form\Element;
 
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Radios.php b/lib/internal/Magento/Framework/Data/Form/Element/Radios.php
index d7ac0d115a3f2..afbb57b80bc54 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Radios.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Radios.php
@@ -6,8 +6,6 @@
 
 /**
  * Radio buttons collection
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Framework\Data\Form\Element;
 

From b3ebb03120853ddbe21ae0411e0ab62d96bd1afa Mon Sep 17 00:00:00 2001
From: Dan Wallis <dan@wallis.nz>
Date: Mon, 20 Mar 2023 22:31:41 +0000
Subject: [PATCH 2/2] Adhere to coding standard

---
 .../Framework/Data/Form/Element/Checkbox.php  |  8 ++++++++
 .../Data/Form/Element/Editablemultiselect.php |  6 ++++--
 .../Framework/Data/Form/Element/Hidden.php    | 10 +++++++---
 .../Framework/Data/Form/Element/Multiline.php | 19 +++++++++++++++++--
 .../Framework/Data/Form/Element/Note.php      |  9 ++++++---
 5 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Checkbox.php b/lib/internal/Magento/Framework/Data/Form/Element/Checkbox.php
index 81cdbb0623e5b..f0cd404637d37 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Checkbox.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Checkbox.php
@@ -1,8 +1,10 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Data\Form\Element;
 
 use Magento\Framework\Escaper;
@@ -30,6 +32,8 @@ public function __construct(
     }
 
     /**
+     * Get HTML attributes
+     *
      * @return string[]
      */
     public function getHtmlAttributes()
@@ -51,6 +55,8 @@ public function getHtmlAttributes()
     }
 
     /**
+     * Get Element HTML
+     *
      * @return string
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
@@ -61,6 +67,7 @@ public function getElementHtml()
         } else {
             $this->unsetData('checked');
         }
+
         return parent::getElementHtml();
     }
 
@@ -68,6 +75,7 @@ public function getElementHtml()
      * Set check status of checkbox
      *
      * @param bool $value
+     *
      * @return Checkbox
      */
     public function setIsChecked($value = false)
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php b/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php
index 01d48995ad3c8..9aba8ea8ba196 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
@@ -68,7 +69,7 @@ public function __construct(
      *
      * This class must define init() method and receive configuration in the constructor
      */
-    const DEFAULT_ELEMENT_JS_CLASS = 'EditableMultiselect';
+    public const DEFAULT_ELEMENT_JS_CLASS = 'EditableMultiselect';
 
     /**
      * Retrieve HTML markup of the element
@@ -140,11 +141,12 @@ function check( tries, delay ){
      *
      * @param array $option
      * @param string[] $selected
+     *
      * @return string
      */
     protected function _optionToHtml($option, $selected)
     {
-        $optionId = 'optId' .$this->random->getRandomString(8);
+        $optionId = 'optId' . $this->random->getRandomString(8);
         $html = '<option value="' . $this->_escape($option['value']) . '" id="' . $optionId . '" ';
         $html .= isset($option['title']) ? 'title="' . $this->_escape($option['title']) . '"' : '';
         if (in_array((string)$option['value'], $selected)) {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Hidden.php b/lib/internal/Magento/Framework/Data/Form/Element/Hidden.php
index fb574675eddf0..633c4fb7efa7a 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Hidden.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Hidden.php
@@ -1,16 +1,17 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
-/**
- * Form hidden element
- */
 namespace Magento\Framework\Data\Form\Element;
 
 use Magento\Framework\Escaper;
 
+/**
+ * Form hidden element
+ */
 class Hidden extends AbstractElement
 {
     /**
@@ -31,6 +32,8 @@ public function __construct(
     }
 
     /**
+     * Get default HTML
+     *
      * @return mixed
      */
     public function getDefaultHtml()
@@ -39,6 +42,7 @@ public function getDefaultHtml()
         if ($html === null) {
             $html = $this->getElementHtml();
         }
+
         return $html;
     }
 }
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Multiline.php b/lib/internal/Magento/Framework/Data/Form/Element/Multiline.php
index 57da75497af29..98e8a8202f14b 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Multiline.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Multiline.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
@@ -31,6 +32,8 @@ public function __construct(
     }
 
     /**
+     * Get HTML attributes
+     *
      * @return string[]
      */
     public function getHtmlAttributes()
@@ -51,13 +54,17 @@ public function getHtmlAttributes()
     }
 
     /**
+     * Get label HTML
+     *
      * @param int $suffix
      * @param string $scopeLabel
+     *
      * @return string
      */
     public function getLabelHtml($suffix = 0, $scopeLabel = '')
     {
-        return parent::getLabelHtml($suffix, $scopeLabel);
+        $html = parent::getLabelHtml($suffix, $scopeLabel);
+        return $html;
     }
 
     /**
@@ -76,6 +83,7 @@ public function getElementHtml()
             } else {
                 $this->setClass('input-text admin__control-text');
             }
+
             $html .= '<div class="multi-input admin__field-control"><input id="' .
                 $this->getHtmlId() .
                 $i .
@@ -95,12 +103,16 @@ public function getElementHtml()
             if ($i == 0) {
                 $html .= $this->getAfterElementHtml();
             }
+
             $html .= '</div>';
         }
+
         return $html;
     }
 
     /**
+     * Get default HTML
+     *
      * @return mixed
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -127,6 +139,7 @@ public function getDefaultHtml()
                 $this->setClass('input-text');
                 $html .= '<label>&nbsp;</label>' . "\n";
             }
+
             $html .= '<input id="' .
                 $this->getHtmlId() .
                 $i .
@@ -144,13 +157,15 @@ public function getDefaultHtml()
             if ($i == 0) {
                 $html .= $this->getAfterElementHtml();
             }
+
             $html .= $this->getNoSpan() === true ? '' : '</span>' . "\n";
         }
+
         return $html;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getEscapedValue($index = null)
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Note.php b/lib/internal/Magento/Framework/Data/Form/Element/Note.php
index dd2c241e61647..8159fa9e92a7c 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Note.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Note.php
@@ -1,16 +1,17 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
-/**
- * Form note element
- */
 namespace Magento\Framework\Data\Form\Element;
 
 use Magento\Framework\Escaper;
 
+/**
+ * Form note element
+ */
 class Note extends AbstractElement
 {
     /**
@@ -30,6 +31,8 @@ public function __construct(
     }
 
     /**
+     * Get element HTML
+     *
      * @return string
      */
     public function getElementHtml()