Merge remote-tracking branch 'git-36978/no-author/framework-02' into bluetooth_delivery

engcom-Echo · engcom-Echo · commit f78e59c56040 · 2023-10-04T07:17:48.000+05:30
diff --git 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
@@ -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
@@ -1,16 +1,16 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Data\Form\Element;
 
 use Magento\Framework\Escaper;
 
 /**
  * Form checkbox element
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Checkbox extends AbstractElement
 {
@@ -32,6 +32,8 @@ public function __construct(
     }
 
     /**
+     * Get HTML attributes
+     *
      * @return string[]
      */
     public function getHtmlAttributes()
@@ -53,6 +55,8 @@ public function getHtmlAttributes()
     }
 
     /**
+     * Get Element HTML
+     *
      * @return string
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
@@ -63,13 +67,15 @@ public function getElementHtml()
         } else {
             $this->unsetData('checked');
         }
+
         return parent::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/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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
@@ -8,8 +9,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;
 
@@ -70,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
@@ -142,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/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
@@ -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
@@ -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
@@ -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
@@ -1,18 +1,17 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
-/**
- * Form hidden element
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Framework\Data\Form\Element;
 
 use Magento\Framework\Escaper;
 
+/**
+ * Form hidden element
+ */
 class Hidden extends AbstractElement
 {
     /**
@@ -33,6 +32,8 @@ public function __construct(
     }
 
     /**
+     * Get default HTML
+     *
      * @return mixed
      */
     public function getDefaultHtml()
@@ -41,6 +42,7 @@ public function getDefaultHtml()
         if ($html === null) {
             $html = $this->getElementHtml();
         }
+
         return $html;
     }
 }
diff --git 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
@@ -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
@@ -1,13 +1,12 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
 /**
  * Form multiline text elements
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Framework\Data\Form\Element;
 
@@ -33,6 +32,8 @@ public function __construct(
     }
 
     /**
+     * Get HTML attributes
+     *
      * @return string[]
      */
     public function getHtmlAttributes()
@@ -53,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;
     }
 
     /**
@@ -78,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 .
@@ -97,12 +103,16 @@ public function getElementHtml()
             if ($i == 0) {
                 $html .= $this->getAfterElementHtml();
             }
+
             $html .= '</div>';
         }
+
         return $html;
     }
 
     /**
+     * Get default HTML
+     *
      * @return mixed
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -129,6 +139,7 @@ public function getDefaultHtml()
                 $this->setClass('input-text');
                 $html .= '<label>&nbsp;</label>' . "\n";
             }
+
             $html .= '<input id="' .
                 $this->getHtmlId() .
                 $i .
@@ -146,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/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
@@ -1,18 +1,17 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
-/**
- * Form note element
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Framework\Data\Form\Element;
 
 use Magento\Framework\Escaper;
 
+/**
+ * Form note element
+ */
 class Note extends AbstractElement
 {
     /**
@@ -32,6 +31,8 @@ public function __construct(
     }
 
     /**
+     * Get element HTML
+     *
      * @return string
      */
     public function getElementHtml()
diff --git 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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`*`
`19`	`19`	`* phpcs:disable Magento2.Classes.AbstractApi`
`20`	`20`	`* @api`
`21`		`- * @author Magento Core Team <core@magentocommerce.com>`
`22`	`21`	`* @SuppressWarnings(PHPMD.NumberOfChildren)`
`23`	`22`	`* @since 100.0.2`
`24`	`23`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,6 @@`
`9`	`9`
`10`	`10`	`/**`
`11`	`11`	`* Form select element`
`12`		`- *`
`13`		`- * @author Magento Core Team <core@magentocommerce.com>`
`14`	`12`	`*/`
`15`	`13`	`class Checkboxes extends AbstractElement`
`16`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,6 @@`
`10`	`10`
`11`	`11`	`/**`
`12`	`12`	`* Form element collection`
`13`		`- *`
`14`		`- * @author Magento Core Team <core@magentocommerce.com>`
`15`	`13`	`*/`
`16`	`14`	`class Collection implements \ArrayAccess, \IteratorAggregate, \Countable`
`17`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@`
`13`	`13`
`14`	`14`	`/**`
`15`	`15`	`* Form editor element`
`16`		`- *`
`17`		`- * @author Magento Core Team <core@magentocommerce.com>`
`18`	`16`	`*/`
`19`	`17`	`class Editor extends Textarea`
`20`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`* Form fieldset`
`13`	`13`	`*`
`14`	`14`	`* @api`
`15`		`- * @author Magento Core Team <core@magentocommerce.com>`
`16`	`15`	`* @since 100.0.2`
`17`	`16`	`*/`
`18`	`17`	`class Fieldset extends AbstractElement`