Merge remote-tracking branch 'git-36981/no-author/url-user-variable-w…

…eee' into bluetooth_delivery

app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php

@@ -12,8 +12,6 @@
 
 /**
  * Categories tree block for URL rewrites editing process
- *
- * @author     Magento Core Team <[email protected]>
  */
 class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
 {

app/code/Magento/UrlRewrite/Block/Catalog/Product/Grid.php

@@ -8,7 +8,6 @@
 /**
  * Products grid for URL rewrites editing
  *
- * @author     Magento Core Team <[email protected]>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  */
 class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid

app/code/Magento/UrlRewrite/Block/Cms/Page/Grid.php

@@ -8,7 +8,6 @@
 /**
  * CMS pages grid for URL rewrites
  *
- * @author     Magento Core Team <[email protected]>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  */
 class Grid extends \Magento\Cms\Block\Adminhtml\Page\Grid

app/code/Magento/User/Block/Role.php

@@ -9,7 +9,6 @@
  * Magento_User role block
  *
  * @api
- * @author      Magento Core Team <[email protected]>
  * @since 100.0.2
  */
 class Role extends \Magento\Backend\Block\Widget\Grid\Container
@@ -37,6 +36,8 @@ protected function _construct()
     }
 
     /**
+     * Get a URL to create a role
+     *
      * @return string
      */
     public function getCreateUrl()
@@ -45,6 +46,8 @@ public function getCreateUrl()
     }
 
     /**
+     * Prepare the layout
+     *
      * @return $this
      */
     protected function _prepareLayout()

app/code/Magento/User/Block/User.php

@@ -9,7 +9,6 @@
  * User block
  *
  * @api
- * @author     Magento Core Team <[email protected]>
  * @since 100.0.2
  */
 class User extends \Magento\Backend\Block\Widget\Grid\Container

app/code/Magento/User/Block/User/Edit.php

@@ -10,14 +10,11 @@
  * User edit page
  *
  * @api
- * @author      Magento Core Team <[email protected]>
  * @since 100.0.2
  */
 class Edit extends \Magento\Backend\Block\Widget\Form\Container
 {
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $_coreRegistry = null;
@@ -121,6 +118,8 @@ public function getObjectId()
     }
 
     /**
+     * Get text to be used in the header
+     *
      * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()

app/code/Magento/User/Block/User/Edit/Tabs.php

@@ -9,7 +9,6 @@
  * User page left menu
  *
  * @api
- * @author      Magento Core Team <[email protected]>
  * @since 100.0.2
  */
 class Tabs extends \Magento\Backend\Block\Widget\Tabs
@@ -28,6 +27,8 @@ protected function _construct()
     }
 
     /**
+     * Add tabs to the HTML
+     *
      * @return $this
      */
     protected function _beforeToHtml()

app/code/Magento/User/Model/ResourceModel/Role/User/Collection.php

@@ -7,8 +7,6 @@
 
 /**
  * Admin role users collection
- *
- * @author      Magento Core Team <[email protected]>
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {

app/code/Magento/User/Model/ResourceModel/User/Locked/Collection.php

@@ -7,8 +7,6 @@
 
 /**
  * Admin user collection
- *
- * @author      Magento Core Team <[email protected]>
  */
 class Collection extends \Magento\User\Model\ResourceModel\User\Collection
 {
@@ -22,5 +20,7 @@ protected function _initSelect()
     {
         parent::_initSelect();
         $this->addFieldToFilter('lock_expires', ['notnull' => true]);
+
+        return $this;
     }
 }

app/code/Magento/Variable/Model/ResourceModel/Variable.php

@@ -8,8 +8,6 @@
 
 /**
  * Custom variable resource model
- *
- * @author      Magento Core Team <[email protected]>
  */
 class Variable extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {

app/code/Magento/Variable/Model/ResourceModel/Variable/Collection.php

@@ -7,14 +7,10 @@
 
 /**
  * Custom variable collection
- *
- * @author      Magento Core Team <[email protected]>
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
     /**
-     * Store Id
-     *
      * @var int
      */
     protected $_storeId = 0;

app/code/Magento/Weee/Block/Item/Price/Renderer.php

@@ -6,7 +6,7 @@
 namespace Magento\Weee\Block\Item\Price;
 
 use Magento\Framework\Pricing\PriceCurrencyInterface;
-use Magento\Sales\Model\Order\CreditMemo\Item as CreditMemoItem;
+use Magento\Sales\Model\Order\Creditmemo\Item as CreditMemoItem;
 use Magento\Sales\Model\Order\Invoice\Item as InvoiceItem;
 use Magento\Sales\Model\Order\Item as OrderItem;
 use Magento\Weee\Model\Tax as WeeeDisplayConfig;
@@ -15,7 +15,6 @@
  * Item price render block
  *
  * @api
- * @author      Magento Core Team <[email protected]>
  * @since 100.0.2
  */
 class Renderer extends \Magento\Tax\Block\Item\Price\Renderer

app/code/Magento/Weee/Model/ResourceModel/Attribute/Backend/Weee/Tax.php

@@ -7,8 +7,6 @@
 
 /**
  * Catalog product WEEE tax backend attribute model
- *
- * @author      Magento Core Team <[email protected]>
  */
 class Tax extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {