diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
index 92ebe6f204e3a..b2ce3ed4ab3b4 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
@@ -69,11 +69,11 @@ protected function _getConfigUrl()
         ) {
             $output = $this->_urlBuilder->getUrl('adminhtml/system_config/edit', ['section' => 'web']);
         } else {
-            /** @var $dataCollection \Magento\Config\Model\ResourceModel\Config\Data\Collection */
+            /** @var \Magento\Config\Model\ResourceModel\Config\Data\Collection $dataCollection */
             $dataCollection = $this->_configValueFactory->create()->getCollection();
             $dataCollection->addValueFilter(\Magento\Store\Model\Store::BASE_URL_PLACEHOLDER);
 
-            /** @var $data \Magento\Framework\App\Config\ValueInterface */
+            /** @var \Magento\Framework\App\Config\ValueInterface $data */
             foreach ($dataCollection as $data) {
                 if ($data->getScope() == 'stores') {
                     $code = $this->_storeManager->getStore($data->getScopeId())->getCode();
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Security.php b/app/code/Magento/AdminNotification/Model/System/Message/Security.php
index 7d9b7b3ee0bd6..d5a30aa9578c5 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Security.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Security.php
@@ -110,7 +110,7 @@ private function _isFileAccessible()
     {
         $unsecureBaseURL = $this->_config->getValue(Store::XML_PATH_UNSECURE_BASE_URL, 'default');
 
-        /** @var $http Curl */
+        /** @var Curl $http */
         $http = $this->_curlFactory->create();
         $http->setOptions(['timeout' => $this->_verificationTimeOut]);
         $http->write(Request::METHOD_POST, $unsecureBaseURL . $this->_filePath);
diff --git a/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php b/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php
index 90beb45759f93..09e9be3f2bb22 100644
--- a/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php
+++ b/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php
@@ -46,7 +46,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
     {
         if ($this->_backendAuthSession->isLoggedIn()) {
             $feedModel = $this->_feedFactory->create();
-            /* @var $feedModel \Magento\AdminNotification\Model\Feed */
+            /** @var \Magento\AdminNotification\Model\Feed $feedModel */
             $feedModel->checkUpdate();
         }
     }
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml
index c051ba9bd3226..ae75794c80124 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml
@@ -30,7 +30,7 @@
             class="admin__action-dropdown-menu"
             data-mark-as-read-url="<?= $escaper->escapeUrl($block->getUrl('adminhtml/notification/ajaxMarkAsRead')) ?>">
             <?php foreach ($block->getLatestUnreadNotifications() as $notification): ?>
-                <?php /** @var $notification \Magento\AdminNotification\Model\Inbox */ ?>
+                <?php /** @var \Magento\AdminNotification\Model\Inbox $notification */ ?>
                 <li class="notifications-entry<?php if ($notification->getSeverity() == 1): ?> notifications-critical<?php endif; ?>"
                     data-notification-id="<?= $escaper->escapeHtmlAttr($notification->getId()) ?>"
                     data-notification-severity="<?php if ($notification->getSeverity() == 1): ?>1<?php endif; ?>">
diff --git a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php b/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php
index eccdd0f0f0c96..2a96d09b26f01 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php
@@ -43,9 +43,9 @@ public function execute()
                 }
                 /** @var \Magento\Framework\View\Result\Layout $resultLayout */
                 $resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT);
-                /** @var $attrFilterBlock \Magento\ImportExport\Block\Adminhtml\Export\Filter */
+                /** @var \Magento\ImportExport\Block\Adminhtml\Export\Filter $attrFilterBlock */
                 $attrFilterBlock = $resultLayout->getLayout()->getBlock('export.filter');
-                /** @var $export \Magento\ImportExport\Model\Export */
+                /** @var \Magento\ImportExport\Model\Export $export */
                 $export = $this->_objectManager->create(\Magento\ImportExport\Model\Export::class);
                 $export->setData($data);
                 $attrFilterBlock->prepareCollection($this->filtersProvider->getFilters($export));
diff --git a/app/code/Magento/Authorization/Model/ResourceModel/Rules.php b/app/code/Magento/Authorization/Model/ResourceModel/Rules.php
index f7154d217c29c..c3cd5964181d5 100644
--- a/app/code/Magento/Authorization/Model/ResourceModel/Rules.php
+++ b/app/code/Magento/Authorization/Model/ResourceModel/Rules.php
@@ -114,7 +114,7 @@ public function saveRel(\Magento\Authorization\Model\Rules $rule)
                     /** Give basic admin permissions to any admin */
                     $postedResources[] = AbstractAction::ADMIN_RESOURCE;
                     $acl = $this->_aclBuilder->getAcl();
-                    /** @var $resource \Magento\Framework\Acl\AclResource */
+                    /** @var \Magento\Framework\Acl\AclResource $resource */
                     foreach ($acl->getResources() as $resourceId) {
                         $row['permission'] = in_array($resourceId, $postedResources) ? 'allow' : 'deny';
                         $row['resource_id'] = $resourceId;
diff --git a/app/code/Magento/Backend/App/AbstractAction.php b/app/code/Magento/Backend/App/AbstractAction.php
index 25b8aec4efec6..669dc298eb1e4 100644
--- a/app/code/Magento/Backend/App/AbstractAction.php
+++ b/app/code/Magento/Backend/App/AbstractAction.php
@@ -241,12 +241,12 @@ protected function getMessageManager()
      */
     protected function _setActiveMenu($itemId)
     {
-        /** @var $menuBlock \Magento\Backend\Block\Menu */
+        /** @var \Magento\Backend\Block\Menu $menuBlock */
         $menuBlock = $this->_view->getLayout()->getBlock('menu');
         $menuBlock->setActive($itemId);
         $parents = $menuBlock->getMenuModel()->getParentItems($itemId);
         foreach ($parents as $item) {
-            /** @var $item \Magento\Backend\Model\Menu\Item */
+            /** @var \Magento\Backend\Model\Menu\Item $item */
             $this->_view->getPage()->getConfig()->getTitle()->prepend($item->getTitle());
         }
         return $this;
diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php
index 1e14ec2699c47..3d6a9a5c71082 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php
@@ -50,7 +50,7 @@ protected function _construct()
     protected function _prepareCollection()
     {
         $collection = $this->_collectionFactory->create();
-        /* @var $collection \Magento\Reports\Model\ResourceModel\Order\Collection */
+        /** @var \Magento\Reports\Model\ResourceModel\Order\Collection $collection */
         $collection->groupByCustomer()->addOrdersCount()->joinCustomerName();
 
         $storeFilter = 0;
diff --git a/app/code/Magento/Backend/Block/Dashboard/Totals.php b/app/code/Magento/Backend/Block/Dashboard/Totals.php
index 52e3fed6f3e34..b203016c3bc46 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Totals.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Totals.php
@@ -75,7 +75,7 @@ protected function _prepareLayout()
         $firstPeriod = array_key_first($this->period->getDatePeriods());
         $period = $this->getRequest()->getParam('period', $firstPeriod);
 
-        /* @var $collection Collection */
+        /** @var Collection $collection */
         $collection = $this->_collectionFactory->create()->addCreateAtPeriodFilter(
             $period
         )->calculateTotals(
diff --git a/app/code/Magento/Backend/Block/Menu.php b/app/code/Magento/Backend/Block/Menu.php
index 6099c5601e146..0ce546dbc8f3f 100644
--- a/app/code/Magento/Backend/Block/Menu.php
+++ b/app/code/Magento/Backend/Block/Menu.php
@@ -276,7 +276,7 @@ public function renderMenu($menu, $level = 0)
     {
         $output = '<ul ' . (0 == $level ? 'id="nav" role="menubar"' : '') . ' >';
 
-        /** @var $menuItem \Magento\Backend\Model\Menu\Item  */
+        /** @var \Magento\Backend\Model\Menu\Item $menuItem */
         foreach ($this->_getMenuIterator($menu) as $menuItem) {
             $output .= '<li ' . $this->_renderMouseEvent(
                 $menuItem
@@ -309,7 +309,7 @@ protected function _countItems($items)
     {
         $total = count($items);
         foreach ($items as $item) {
-            /** @var $item \Magento\Backend\Model\Menu\Item */
+            /** @var \Magento\Backend\Model\Menu\Item $item */
             if ($item->hasChildren()) {
                 $total += $this->_countItems($item->getChildren());
             }
@@ -400,7 +400,7 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
         $outputStart = '<ul ' . (0 == $level ? 'id="nav" role="menubar"' : 'role="menu"') . ' >';
         $output = '';
 
-        /** @var $menuItem \Magento\Backend\Model\Menu\Item  */
+        /** @var \Magento\Backend\Model\Menu\Item $menuItem */
         foreach ($this->_getMenuIterator($menu) as $menuItem) {
             $menuId = $menuItem->getId();
             $itemName = substr($menuId, strrpos($menuId, '::') + 2);
diff --git a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php
index 3c332a7503ff0..8296513344e71 100644
--- a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php
+++ b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php
@@ -56,7 +56,7 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
      */
     public function getHintHtml()
     {
-        /** @var $storeSwitcher \Magento\Backend\Block\Store\Switcher */
+        /** @var \Magento\Backend\Block\Store\Switcher $storeSwitcher */
         $storeSwitcher = $this->_layout->getBlockSingleton(\Magento\Backend\Block\Store\Switcher::class);
         return $storeSwitcher->getHintHtml();
     }
diff --git a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php
index 7cf31a70816e8..ae25d625d2f21 100644
--- a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php
+++ b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php
@@ -54,7 +54,7 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
      */
     public function getHintHtml()
     {
-        /** @var $storeSwitcher \Magento\Backend\Block\Store\Switcher */
+        /** @var \Magento\Backend\Block\Store\Switcher $storeSwitcher */
         $storeSwitcher = $this->_layout->getBlockSingleton(\Magento\Backend\Block\Store\Switcher::class);
         return $storeSwitcher->getHintHtml();
     }
diff --git a/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php b/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
index 52e5c2602fde5..38632d8211fe4 100644
--- a/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
+++ b/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
@@ -78,7 +78,7 @@ protected function _prepareForm()
             );
         }
 
-        /** @var $label \Magento\Framework\View\Design\Theme\Label */
+        /** @var \Magento\Framework\View\Design\Theme\Label $label */
         $label = $this->_labelFactory->create();
         $options = $label->getLabelsCollection(__('-- Please Select --'));
         $fieldset->addField(
diff --git a/app/code/Magento/Backend/Block/System/Store/Edit/Form/Website.php b/app/code/Magento/Backend/Block/System/Store/Edit/Form/Website.php
index 42a1592accec2..560adefaf8f34 100644
--- a/app/code/Magento/Backend/Block/System/Store/Edit/Form/Website.php
+++ b/app/code/Magento/Backend/Block/System/Store/Edit/Form/Website.php
@@ -54,7 +54,7 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
             $websiteModel->setData($postData['website']);
         }
         $fieldset = $form->addFieldset('website_fieldset', ['legend' => __('Web Site Information')]);
-        /* @var $fieldset \Magento\Framework\Data\Form */
+        /** @var \Magento\Framework\Data\Form $fieldset */
 
         $fieldset->addField(
             'website_name',
diff --git a/app/code/Magento/Backend/Block/Widget/Form.php b/app/code/Magento/Backend/Block/Widget/Form.php
index 5fcd8a0ec1438..2a09c3c2703ca 100644
--- a/app/code/Magento/Backend/Block/Widget/Form.php
+++ b/app/code/Magento/Backend/Block/Widget/Form.php
@@ -183,7 +183,7 @@ protected function _setFieldset($attributes, $fieldset, $exclude = [])
     {
         $this->_addElementTypes($fieldset);
         foreach ($attributes as $attribute) {
-            /* @var $attribute \Magento\Eav\Model\Entity\Attribute */
+            /** @var \Magento\Eav\Model\Entity\Attribute $attribute */
             if (!$this->_isAttributeVisible($attribute)) {
                 continue;
             }
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php b/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
index 0eaa928a86915..fee914d7f686c 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
@@ -104,7 +104,7 @@ public function addFieldMap($fieldId, $fieldName)
     public function addFieldDependence($fieldName, $fieldNameFrom, $refField)
     {
         if (!is_object($refField)) {
-            /** @var $refField \Magento\Config\Model\Config\Structure\Element\Dependency\Field */
+            /** @var \Magento\Config\Model\Config\Structure\Element\Dependency\Field $refField */
             $refField = $this->_fieldFactory->create(
                 ['fieldData' => ['value' => (string)$refField], 'fieldPrefix' => '']
             );
@@ -159,7 +159,7 @@ protected function _getDependsJson()
         $result = [];
         foreach ($this->_depends as $to => $row) {
             foreach ($row as $from => $field) {
-                /** @var $field \Magento\Config\Model\Config\Structure\Element\Dependency\Field */
+                /** @var \Magento\Config\Model\Config\Structure\Element\Dependency\Field $field */
                 $result[$this->_fields[$to]][$this->_fields[$from]] = [
                     'values' => $field->getValues(),
                     'negative' => $field->isNegative(),
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
index 4e5ad773c1349..7721c6e998714 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
@@ -38,7 +38,7 @@ public function getValue($index = null)
             $datetimeTo = $value['to'];
 
             //calculate end date considering timezone specification
-            /** @var $datetimeTo \DateTime */
+            /** @var \DateTime $datetimeTo */
             $datetimeTo->setTimezone(
                 new \DateTimeZone(
                     $this->_scopeConfig->getValue(
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
index d12cb59544aa2..a9e077a6cffe0 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
@@ -67,7 +67,7 @@ public function getOptions()
     {
         $options = $this->getColumn()->getOptions();
         if (empty($options) || !is_array($options)) {
-            /** @var $label \Magento\Framework\View\Design\Theme\Label */
+            /** @var \Magento\Framework\View\Design\Theme\Label $label */
             $label = $this->_labelFactory->create();
             $options = $label->getLabelsCollection();
         }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php b/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
index 81a6f16600039..eae7a656a246d 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
@@ -597,7 +597,7 @@ public function updateItemByFirstMultiRow(\Magento\Framework\DataObject $item)
     {
         $multiRows = $this->getMultipleRows($item);
         if (is_object($multiRows) && $multiRows instanceof \Magento\Framework\Data\Collection) {
-            /** @var $multiRows \Magento\Framework\Data\Collection */
+            /** @var \Magento\Framework\Data\Collection $multiRows */
             $item->addData($multiRows->getFirstItem()->getData());
         } elseif (is_array($multiRows)) {
             $firstItem = $multiRows[0];
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Export.php b/app/code/Magento/Backend/Block/Widget/Grid/Export.php
index 7ae81bbf0e429..57e2774dd28d2 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Export.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Export.php
@@ -256,7 +256,7 @@ protected function _getExportTotals()
      */
     public function _exportIterateCollection($callback, array $args)
     {
-        /** @var $originalCollection \Magento\Framework\Data\Collection */
+        /** @var \Magento\Framework\Data\Collection $originalCollection */
         $originalCollection = $this->getParentBlock()->getPreparedCollection();
         $count = null;
         $page = 1;
@@ -526,13 +526,13 @@ protected function _getRowCollection(?\Magento\Framework\Data\Collection $baseCo
         }
         $collection = $this->_collectionFactory->create();
 
-        /** @var $item \Magento\Framework\DataObject */
+        /** @var \Magento\Framework\DataObject $item */
         foreach ($baseCollection as $item) {
             if ($item->getIsEmpty()) {
                 continue;
             }
             if ($item->hasChildren() && count($item->getChildren()) > 0) {
-                /** @var $subItem \Magento\Framework\DataObject */
+                /** @var \Magento\Framework\DataObject $subItem */
                 foreach ($item->getChildren() as $subItem) {
                     $tmpItem = clone $item;
                     $tmpItem->unsChildren();
@@ -554,7 +554,7 @@ protected function _getRowCollection(?\Magento\Framework\Data\Collection $baseCo
      */
     public function _getPreparedCollection()
     {
-        /** @var $collection \Magento\Framework\Data\Collection */
+        /** @var \Magento\Framework\Data\Collection $collection */
         $collection = $this->getParentBlock()->getPreparedCollection();
         $collection->setPageSize(0);
         $collection->load();
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
index 3c1b9b01c4c8d..9079d8f6a76f2 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
@@ -383,7 +383,7 @@ public function prepareMassactionColumn()
         $gridBlock = $this->getParentBlock();
         $massactionColumn->setSelected($this->getSelected())->setGrid($gridBlock)->setId($columnId);
 
-        /** @var $columnSetBlock ColumnSet */
+        /** @var ColumnSet $columnSetBlock */
         $columnSetBlock = $gridBlock->getColumnSet();
         $childNames = $columnSetBlock->getChildNames();
         $siblingElement = count($childNames) ? current($childNames) : 0;
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php
index e7a9c8308802b..b91c21dc93460 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php
@@ -24,7 +24,7 @@ class FlushAll extends \Magento\Backend\Controller\Adminhtml\Cache implements Ht
     public function execute()
     {
         $this->_eventManager->dispatch('adminhtml_cache_flush_all');
-        /** @var $cacheFrontend \Magento\Framework\Cache\FrontendInterface */
+        /** @var \Magento\Framework\Cache\FrontendInterface $cacheFrontend */
         foreach ($this->_cacheFrontendPool as $cacheFrontend) {
             $cacheFrontend->getBackend()->clean();
         }
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php
index 0a9f530910ace..08ad05e366d83 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php
@@ -23,7 +23,7 @@ class FlushSystem extends \Magento\Backend\Controller\Adminhtml\Cache implements
      */
     public function execute()
     {
-        /** @var $cacheFrontend \Magento\Framework\Cache\FrontendInterface */
+        /** @var \Magento\Framework\Cache\FrontendInterface $cacheFrontend */
         foreach ($this->_cacheFrontendPool as $cacheFrontend) {
             $cacheFrontend->clean();
         }
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Tunnel.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Tunnel.php
index c7f1bdc295185..dbf221c69a40d 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Tunnel.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Tunnel.php
@@ -59,7 +59,7 @@ public function execute()
         /** @var Raw $resultRaw */
         $resultRaw = $this->resultRawFactory->create();
         if ($gaData && $gaHash) {
-            /** @var $helper Data */
+            /** @var Data $helper */
             $helper = $this->_objectManager->get(Data::class);
             $newHash = $helper->getChartDataHash($gaData);
             if (Security::compareStrings($newHash, $gaHash)) {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
index 663f60d3b3fdc..44ad0f5b7f3bc 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
@@ -54,7 +54,7 @@ public function execute()
         $passwordConfirmation = (string)$this->getRequest()->getParam('password_confirmation');
         $interfaceLocale = (string)$this->getRequest()->getParam('interface_locale', false);
 
-        /** @var $user \Magento\User\Model\User */
+        /** @var \Magento\User\Model\User $user */
         $user = $this->_objectManager->create(\Magento\User\Model\User::class)->load($userId);
 
         $user->setId($userId)
diff --git a/app/code/Magento/Backend/Cron/CleanCache.php b/app/code/Magento/Backend/Cron/CleanCache.php
index edfd5eca77520..67375cf74cc26 100644
--- a/app/code/Magento/Backend/Cron/CleanCache.php
+++ b/app/code/Magento/Backend/Cron/CleanCache.php
@@ -31,7 +31,7 @@ public function __construct(
      */
     public function execute()
     {
-        /** @var $cacheFrontend \Magento\Framework\Cache\FrontendInterface */
+        /** @var \Magento\Framework\Cache\FrontendInterface $cacheFrontend */
         foreach ($this->cacheFrontendPool as $cacheFrontend) {
             // Magento cache frontend does not support the 'old' cleaning mode, that's why backend is used directly
             $cacheFrontend->getBackend()->clean(\Zend_Cache::CLEANING_MODE_OLD);
diff --git a/app/code/Magento/Backend/Model/Menu/Builder.php b/app/code/Magento/Backend/Model/Menu/Builder.php
index e7dddbf48d2df..761283166b0b0 100644
--- a/app/code/Magento/Backend/Model/Menu/Builder.php
+++ b/app/code/Magento/Backend/Model/Menu/Builder.php
@@ -56,7 +56,7 @@ public function processCommand(\Magento\Backend\Model\Menu\Builder\AbstractComma
      */
     public function getResult(\Magento\Backend\Model\Menu $menu)
     {
-        /** @var $items \Magento\Backend\Model\Menu\Item[] */
+        /** @var \Magento\Backend\Model\Menu\Item[] $items */
         $params = [];
         $items = [];
 
diff --git a/app/code/Magento/Backend/Model/Url.php b/app/code/Magento/Backend/Model/Url.php
index 324b511965db2..c566e533b1517 100644
--- a/app/code/Magento/Backend/Model/Url.php
+++ b/app/code/Magento/Backend/Model/Url.php
@@ -338,7 +338,7 @@ public function getStartupPageUrl()
      */
     public function findFirstAvailableMenu()
     {
-        /* @var $menu \Magento\Backend\Model\Menu\Item */
+        /** @var \Magento\Backend\Model\Menu\Item $menu */
         $menu = $this->_getMenu();
         $item = $menu->getFirstAvailable();
         $action = $item ? $item->getAction() : null;
diff --git a/app/code/Magento/Backend/Model/View/Result/Page.php b/app/code/Magento/Backend/Model/View/Result/Page.php
index 14625c70271ad..fe9c2b98b6189 100644
--- a/app/code/Magento/Backend/Model/View/Result/Page.php
+++ b/app/code/Magento/Backend/Model/View/Result/Page.php
@@ -22,12 +22,12 @@ class Page extends View\Result\Page
      */
     public function setActiveMenu($itemId)
     {
-        /** @var $menuBlock \Magento\Backend\Block\Menu */
+        /** @var \Magento\Backend\Block\Menu $menuBlock */
         $menuBlock = $this->layout->getBlock('menu');
         $menuBlock->setActive($itemId);
         $parents = $menuBlock->getMenuModel()->getParentItems($itemId);
         foreach ($parents as $item) {
-            /** @var $item \Magento\Backend\Model\Menu\Item */
+            /** @var \Magento\Backend\Model\Menu\Item $item */
             $this->getConfig()->getTitle()->prepend($item->getTitle());
         }
         return $this;
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml
index e830644282d4f..08232adae4117 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 ?>
-<?php /** @var $block \Magento\Backend\Block\Page */ ?>
+<?php /** @var \Magento\Backend\Block\Page $block */ ?>
 <!doctype html>
 <html lang="<?= $block->escapeHtmlAttr($block->getLang()) ?>" class="no-js">
 
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml b/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml
index 1e4d1e45b3977..7ddfcab974566 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml
@@ -5,7 +5,7 @@
  */
 
 // phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
-/** @var $block \Magento\Backend\Block\Media\Uploader */
+/** @var \Magento\Backend\Block\Media\Uploader $block */
 /** @var \Magento\Framework\Escaper $escaper */
 ?>
 
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
index 82e9950cdffbb..05f30a2b39cb2 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Backend\Block\Page\Header */
+/** @var \Magento\Backend\Block\Page\Header $block */
 $part = $block->getShowPart();
 ?>
 <?php if ($part === 'logo') : ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/js/components.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/js/components.phtml
index fb547f59c53fd..2a34953a61763 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/js/components.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/js/components.phtml
@@ -11,5 +11,5 @@
  */
 ?>
 
-<?php /** @var $block \Magento\Framework\View\Element\Js\Components */ ?>
+<?php /** @var \Magento\Framework\View\Element\Js\Components $block */ ?>
 <?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
index 41ea0c54756ca..5c520e54c5f82 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/* @var $block \Magento\Backend\Block\Store\Switcher */
+/** @var \Magento\Backend\Block\Store\Switcher $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php if ($websites = $block->getWebsites()): ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml
index f53ab6fe637f5..35ed6720ad599 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml
@@ -5,7 +5,7 @@
  */
 ?>
 <?php
-/* @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element */
+/** @var \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element $block */
 $element = $block->getElement();
 $note = $element->getNote() ? '<div class="note">' . $element->getNote() . '</div>' : '';
 $elementBeforeLabel = $element->getExtType() == 'checkbox' || $element->getExtType() == 'radio';
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml
index c33e6b1ee9832..860c22a3ece6a 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml
@@ -9,7 +9,7 @@
 use Magento\Backend\Block\GlobalSearch;
 use Magento\Framework\Json\Helper\Data;
 
-/** @var $block GlobalSearch */
+/** @var GlobalSearch $block */
 /** @var Data $helper */
 $helper = $this->helper(Data::class);
 
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml
index 9f28208d418c4..7af866b57b1bb 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml
@@ -5,7 +5,7 @@
  */
 ?>
 <?php
-/** @var $block \Magento\Backend\Block\Widget\Button\SplitButton */
+/** @var \Magento\Backend\Block\Widget\Button\SplitButton $block */
 ?>
 
 <div <?= $block->getAttributesHtml() ?>>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml
index 6a0f556a616d4..df0c413f19553 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Backend\Block\Widget\Form */
+/** @var \Magento\Backend\Block\Widget\Form $block */
 ?>
 <?php /* @todo replace .form-inline with better class name */?>
 <?php /* ToDo UI: check if we need this wrapper in the process of global forms refactoring */ ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml
index b1e5d2a3ac539..49f67e82d18ee 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Backend\Block\Widget\Form\Container */
+/** @var \Magento\Backend\Block\Widget\Form\Container $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?= /* @noEscape */ $block->getFormInitScripts() ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml
index 204ad071aa072..d7ad9245a7ef2 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml
@@ -5,7 +5,7 @@
  */
 ?>
 <?php
-/** @var $element \Magento\Framework\Data\Form\Element\Fieldset */
+/** @var \Magento\Framework\Data\Form\Element\Fieldset $element */
 $element = $block->getElement();
 $containerId = $element->getFieldsetContainerId();
 $id = $element->getHtmlId();
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml
index 7f10fd302dcb4..88fd53008d9a5 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml
@@ -5,7 +5,7 @@
  */
 ?>
 <?php
-/* @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element */
+/** @var \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element $block */
 $element = $block->getElement();
 $note = $element->getNote() ? '<div class="note admin__field-note" id="' . $element->getId() . '-note">' . $element->getNote() . '</div>' : '';
 $elementBeforeLabel = $element->getExtType() == 'checkbox admin__control-checkbox' || $element->getExtType() == 'radio admin__control-radio';
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
index 2dd923fb999a3..82a884ed7d84a 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
@@ -16,7 +16,7 @@
  *  getVarNamePage()
  *
  */
-/* @var $block \Magento\Backend\Block\Widget\Grid */
+/** @var \Magento\Backend\Block\Widget\Grid $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 
 $numColumns = $block->getColumns() !== null ? count($block->getColumns()): 0;
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml
index 976668c42b02e..5ef7846674033 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml
@@ -22,7 +22,7 @@ $numColumns = count($block->getColumns());
             <?php if ($block->isHeaderVisible() || $block->getFilterVisibility()) : ?>
                 <tr>
                 <?php foreach ($block->getColumns() as $_column) : ?>
-                    <?php /* @var $_column \Magento\Backend\Block\Widget\Grid\Column */ ?>
+                    <?php /** @var \Magento\Backend\Block\Widget\Grid\Column $_column */ ?>
                     <?php if ($_column->getHeaderHtml() == '&nbsp;') :?>
                         <th class="data-grid-th" data-column="<?= $block->escapeHtmlAttr($_column->getId()) ?>"
                             <?= $_column->getHeaderHtmlProperty() ?>>&nbsp;</th>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
index 6de8fb9a9d297..904a5d61ee78a 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Backend\Block\Widget\Tabs */
+/** @var \Magento\Backend\Block\Widget\Tabs $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php if (!empty($tabs)): ?>
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Download.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Download.php
index 08a6eab5a17a1..c51744f1e15c0 100644
--- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Download.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Download.php
@@ -51,7 +51,7 @@ public function __construct(
      */
     public function execute()
     {
-        /* @var $backup \Magento\Backup\Model\Backup */
+        /** @var \Magento\Backup\Model\Backup $backup */
         $backup = $this->_backupModelFactory->create(
             $this->getRequest()->getParam('time'),
             $this->getRequest()->getParam('type')
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php
index 25da907e4ca32..977e8cf840240 100644
--- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php
@@ -38,7 +38,7 @@ public function execute()
         $response = new \Magento\Framework\DataObject();
 
         try {
-            /* @var $backup \Magento\Backup\Model\Backup */
+            /** @var \Magento\Backup\Model\Backup $backup */
             $backup = $this->_backupModelFactory->create(
                 $this->getRequest()->getParam('time'),
                 $this->getRequest()->getParam('type')
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
index f6db07c92c512..903a2a8dabd94 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
@@ -170,7 +170,7 @@ public function getJsonConfig()
 
         $position = 0;
         foreach ($optionsArray as $optionItem) {
-            /* @var $optionItem Option */
+            /** @var Option $optionItem */
             if (!$optionItem->getSelections()) {
                 continue;
             }
@@ -319,7 +319,7 @@ private function getSelections(Option $option, Product $product)
         $selections = [];
         $selectionCount = count($option->getSelections());
         foreach ($option->getSelections() as $selectionItem) {
-            /* @var $selectionItem Product */
+            /** @var Product $selectionItem */
             $selectionId = $selectionItem->getSelectionId();
             $selections[$selectionId] = $this->getSelectionItemData($product, $selectionItem);
 
diff --git a/app/code/Magento/Bundle/Model/LinkManagement.php b/app/code/Magento/Bundle/Model/LinkManagement.php
index b7233be590de0..1c5bcfef9940c 100644
--- a/app/code/Magento/Bundle/Model/LinkManagement.php
+++ b/app/code/Magento/Bundle/Model/LinkManagement.php
@@ -385,7 +385,7 @@ public function addChild(
             );
         }
 
-        /* @var $resource Bundle */
+        /** @var Bundle $resource */
         $resource = $this->bundleFactory->create();
         $selections = $resource->getSelectionsData($product->getData($linkField));
         return $this->processLinkedProduct(
@@ -427,7 +427,7 @@ public function addChildren(
             );
         }
 
-        /* @var $resource Bundle */
+        /** @var Bundle $resource */
         $resource = $this->bundleFactory->create();
         $selections = $resource->getSelectionsData($product->getData($linkField));
 
@@ -467,7 +467,7 @@ public function removeChild($sku, $optionId, $childSku)
             );
         }
         $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
-        /* @var $resource Bundle */
+        /** @var Bundle $resource */
         $resource = $this->bundleFactory->create();
         $resource->dropAllUnneededSelections($product->getData($linkField), $excludeSelectionIds);
         $resource->removeProductRelations($product->getData($linkField), array_unique($usedProductIds));
diff --git a/app/code/Magento/Bundle/Model/Product/Price.php b/app/code/Magento/Bundle/Model/Product/Price.php
index 58bef81e67c30..fa36db6c708cc 100644
--- a/app/code/Magento/Bundle/Model/Product/Price.php
+++ b/app/code/Magento/Bundle/Model/Product/Price.php
@@ -260,7 +260,7 @@ public function getTotalPrices($product, $which = null, $includeTax = null, $tak
 
             if ($options) {
                 foreach ($options as $option) {
-                    /* @var $option \Magento\Bundle\Model\Option */
+                    /** @var \Magento\Bundle\Model\Option $option */
                     $selections = $option->getSelections();
                     if (empty($selections)) {
                         continue;
@@ -269,7 +269,7 @@ public function getTotalPrices($product, $which = null, $includeTax = null, $tak
                     $selectionMaximalPrices = [];
 
                     foreach ($option->getSelections() as $selection) {
-                        /* @var $selection \Magento\Bundle\Model\Selection */
+                        /** @var \Magento\Bundle\Model\Selection $selection */
                         if (!$selection->isSalable()) {
                             /**
                              * @todo CatalogInventory Show out of stock Products
@@ -336,12 +336,12 @@ public function getTotalPrices($product, $which = null, $includeTax = null, $tak
             $customOptions = $product->getOptions();
             if ($product->getPriceType() == self::PRICE_TYPE_FIXED && $customOptions) {
                 foreach ($customOptions as $customOption) {
-                    /* @var $customOption \Magento\Catalog\Model\Product\Option */
+                    /** @var \Magento\Catalog\Model\Product\Option $customOption */
                     $values = $customOption->getValues();
                     if ($values) {
                         $prices = [];
                         foreach ($values as $value) {
-                            /* @var $value \Magento\Catalog\Model\Product\Option\Value */
+                            /** @var \Magento\Catalog\Model\Product\Option\Value $value */
                             $valuePrice = $value->getPrice(true);
 
                             $prices[] = $valuePrice;
diff --git a/app/code/Magento/Bundle/Model/Product/ReadHandler.php b/app/code/Magento/Bundle/Model/Product/ReadHandler.php
index efa2149176b9d..b09cc374480e3 100644
--- a/app/code/Magento/Bundle/Model/Product/ReadHandler.php
+++ b/app/code/Magento/Bundle/Model/Product/ReadHandler.php
@@ -36,7 +36,7 @@ public function __construct(OptionRepository $optionRepository)
      */
     public function execute($entity, $arguments = [])
     {
-        /** @var $entity \Magento\Catalog\Api\Data\ProductInterface */
+        /** @var \Magento\Catalog\Api\Data\ProductInterface $entity */
         if ($entity->getTypeId() != \Magento\Bundle\Model\Product\Type::TYPE_CODE) {
             return $entity;
         }
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index b529bcac9dbbb..0e26e9db6b514 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -1081,7 +1081,7 @@ public function checkProductBuyState($product)
 
         $skipSaleableCheck = $this->_catalogProduct->getSkipSaleableCheck();
         foreach ($selectionIds as $selectionId) {
-            /* @var $selection \Magento\Bundle\Model\Selection */
+            /** @var \Magento\Bundle\Model\Selection $selection */
             $selection = $productSelections->getItemById($selectionId);
             if (!$selection || !$selection->isSalable() && !$skipSaleableCheck) {
                 throw new \Magento\Framework\Exception\LocalizedException(
diff --git a/app/code/Magento/Bundle/Observer/AppendUpsellProductsObserver.php b/app/code/Magento/Bundle/Observer/AppendUpsellProductsObserver.php
index b25676de51567..a7ec0d4c4a450 100644
--- a/app/code/Magento/Bundle/Observer/AppendUpsellProductsObserver.php
+++ b/app/code/Magento/Bundle/Observer/AppendUpsellProductsObserver.php
@@ -62,7 +62,7 @@ public function __construct(
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
-        /* @var $product \Magento\Catalog\Model\Product */
+        /** @var \Magento\Catalog\Model\Product $product */
         $product = $observer->getEvent()->getProduct();
 
         /**
@@ -72,7 +72,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             return $this;
         }
 
-        /* @var $collection \Magento\Catalog\Model\ResourceModel\Product\Link\Product\Collection */
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Link\Product\Collection $collection */
         $collection = $observer->getEvent()->getCollection();
         $limit = $observer->getEvent()->getLimit();
         if (is_array($limit)) {
@@ -83,7 +83,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             }
         }
 
-        /* @var $resource \Magento\Bundle\Model\ResourceModel\Selection */
+        /** @var \Magento\Bundle\Model\ResourceModel\Selection $resource */
         $resource = $this->bundleSelection;
 
         $productIds = array_keys($collection->getItems());
@@ -100,7 +100,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             return $this;
         }
 
-        /* @var $bundleCollection \Magento\Catalog\Model\ResourceModel\Product\Collection */
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $bundleCollection */
         $bundleCollection = $product->getCollection();
         $bundleCollection->addAttributeToSelect(
             $this->config->getProductAttributes()
diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
index aa891c51b3beb..45a161ef857e1 100644
--- a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
+++ b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
@@ -288,7 +288,7 @@ public function calculateBundleAmount($basePriceValue, $bundleProduct, $selectio
     protected function calculateFixedBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude)
     {
         $fullAmount = $basePriceValue;
-        /** @var $option Option */
+        /** @var Option $option */
         foreach ($selectionPriceList as $selectionPrice) {
             $fullAmount += ($selectionPrice->getValue() * $selectionPrice->getQuantity());
         }
@@ -377,7 +377,7 @@ public function createSelectionPriceList($option, $bundleProduct, $useRegularPri
         if ($selections === null) {
             return $priceList;
         }
-        /* @var $selection \Magento\Bundle\Model\Selection|\Magento\Catalog\Model\Product */
+        /** @var \Magento\Bundle\Model\Selection|\Magento\Catalog\Model\Product $selection */
         foreach ($selections as $selection) {
             if (!$selection->isSalable()) {
                 // @todo CatalogInventory Show out of stock Products
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml
index df3853c35caf0..0c96a65186f84 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes\Extend */
+/** @var \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes\Extend $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 $elementHtml = $block->getParentElementHtml();
 
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml
index af04f6a62b677..f0cbb46da2f26 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml
@@ -6,7 +6,7 @@
 ?>
 
 <?php
-/* @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Bundle */
+/** @var \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Bundle $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml
index 6fc3a1091e49b..bd55a9f9e5564 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml
@@ -5,7 +5,7 @@
  */
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
-<?php /* @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Checkbox */ ?>
+<?php /** @var \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Checkbox $block */ ?>
 <?php $_option = $block->getOption(); ?>
 <?php $_selections = $_option->getSelections(); ?>
 <?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml
index a567f69708772..02039ee28121f 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml
@@ -5,7 +5,7 @@
  */
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
-<?php /* @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Multi */ ?>
+<?php /** @var \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Multi $block */ ?>
 <?php $_option = $block->getOption(); ?>
 <?php $_selections = $_option->getSelections(); ?>
 <?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml
index 12307fa0cae86..7b1062f86f1ad 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml
@@ -5,7 +5,7 @@
  */
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
-<?php /* @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Radio */ ?>
+<?php /** @var \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Radio $block */ ?>
 <?php $_option = $block->getOption(); ?>
 <?php $_selections  = $_option->getSelections(); ?>
 <?php $_default = $_option->getDefaultSelection(); ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml
index 4c276081ece94..3e4e1f0fc654f 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml
@@ -5,7 +5,7 @@
  */
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
-<?php /* @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Select */ ?>
+<?php /** @var \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Select $block */ ?>
 <?php $_option      = $block->getOption(); ?>
 <?php $_selections  = $_option->getSelections(); ?>
 <?php $_default     = $_option->getDefaultSelection(); ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml
index 7fd0269a9643d..63fa654dfade1 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle */
+/** @var \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
index 34ad85c5db6f8..d92e031dd8d17 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
@@ -5,7 +5,7 @@
  */
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 // phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
-/** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option */
+/** @var \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <script id="bundle-option-template" type="text/x-magento-template">
@@ -309,11 +309,11 @@ bOption = new Bundle.Option(optionTemplate);
 script;
 
 foreach ($block->getOptions() as $_option) {
-    /** @var $_option \Magento\Bundle\Model\Option */
+    /** @var \Magento\Bundle\Model\Option $_option */
     $scriptString .= /* @noEscape */ 'optionIndex = bOption.add('. $_option->toJson() . ');' . PHP_EOL;
     if ($_option->getSelections()) {
         foreach ($_option->getSelections() as $_selection) {
-            /** @var $_selection \Magento\Catalog\Model\Product */
+            /** @var \Magento\Catalog\Model\Product $_selection */
             $_selection->setName($block->escapeHtml($_selection->getName()));
             $scriptString .= /* @noEscape */ 'bSelection.addRow(optionIndex,' . $_selection->toJson() . ');' . PHP_EOL;
         }
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/search.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/search.phtml
index a026454ca0ab1..90b92faf8eae5 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/search.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/search.phtml
@@ -4,6 +4,6 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option\Search */
+/** @var \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option\Search $block */
 ?>
 <?= $block->getChildHtml();
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml
index 14ef7b22b524c..ed19519fec345 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml
@@ -5,7 +5,7 @@
  */
 
 // phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
-/** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option\Selection */
+/** @var \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option\Selection $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <script id="bundle-option-selection-box-template" type="text/x-magento-template">
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
index 1c68dbe176389..190786159356d 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
@@ -7,7 +7,7 @@
 /**
  * @see \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer
  */
-/** @var $block \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer */
+/** @var \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
index 46a31a61ef368..89297f2ac9d4f 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
@@ -7,7 +7,7 @@
 /**
  * @see \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer
  */
-/** @var $block \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer */
+/** @var \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
index 9cc917ce8359d..6db2070c77de5 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
@@ -7,7 +7,7 @@
 /**
  * @see \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer
  */
-/** @var $block \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer */
+/** @var \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
index 8ce9cf90ef0d7..836f4035db007 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
@@ -7,7 +7,7 @@
 /**
  * @see \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer
  */
-/** @var $block \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer */
+/** @var \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
index f2451442ada60..870ad706df4df 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
@@ -7,7 +7,7 @@
 /**
  * @see \Magento\Bundle\Block\Adminhtml\Sales\Order\View\Items\Renderer
  */
-/** @var $block \Magento\Bundle\Block\Adminhtml\Sales\Order\View\Items\Renderer */
+/** @var \Magento\Bundle\Block\Adminhtml\Sales\Order\View\Items\Renderer $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
index 97dba63903a76..60d48a0854d96 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer */
+/** @var \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
index 21ebf138f3af6..c85507f16a981 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer */
+/** @var \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle.phtml
index 128a957c5269a..cb1a934090190 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle */
+/** @var \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle $block */
 ?>
 <?php $_product = $block->getProduct() ?>
 <?php if ($block->displayProductStockStatus()) : ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml
index 7e5db9aa6ec84..afa0eba5894e3 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 ?>
-<?php /* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi */ ?>
+<?php /** @var \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi $block */ ?>
 <?php $_option = $block->getOption() ?>
 <?php $_selections = $_option->getSelections() ?>
 <div class="field option <?= ($_option->getRequired()) ? ' required': '' ?>">
@@ -16,7 +16,7 @@
             <?= /* @noEscape */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
             <input type="hidden"
                    name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-                   value="<?= $block->escapeHtmlAttr($_selections[0]->getSelectionId()) ?>" 
+                   value="<?= $block->escapeHtmlAttr($_selections[0]->getSelectionId()) ?>"
                    class="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?> bundle option"/>
         <?php else : ?>
             <select multiple="multiple"
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
index 68b326aad2780..03f1d24fb76c7 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
@@ -7,7 +7,7 @@ use Magento\Bundle\ViewModel\ValidateQuantity;
 
 // phpcs:disable Generic.Files.LineLength.TooLong
 ?>
-<?php /* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio */ ?>
+<?php /** @var \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio $block */ ?>
 <?php $_option = $block->getOption(); ?>
 <?php $_selections  = $_option->getSelections(); ?>
 <?php $_default     = $_option->getDefaultSelection(); ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
index 9d417f3368f50..86e79097a67a3 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
@@ -5,7 +5,7 @@
  */
 use Magento\Bundle\ViewModel\ValidateQuantity;
 ?>
-<?php /* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select */ ?>
+<?php /** @var \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select $block */ ?>
 <?php $_option      = $block->getOption(); ?>
 <?php $_selections  = $_option->getSelections(); ?>
 <?php $_default     = $_option->getDefaultSelection(); ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
index 6059616f0ffd6..e443f774aabc4 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
@@ -5,7 +5,7 @@
  */
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
-<?php /** @var $block Magento\Bundle\Block\Catalog\Product\View\Type\Bundle */ ?>
+<?php /** @var Magento\Bundle\Block\Catalog\Product\View\Type\Bundle $block */ ?>
 <?php
 $product = $block->getProduct();
 $helper = $this->helper(Magento\Catalog\Helper\Output::class);
diff --git a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml
index 685a789912b3a..98b0f891ff244 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml
@@ -5,7 +5,7 @@
  */
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
-<?php /** @var $block \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
+<?php /** @var \Magento\Bundle\Block\Sales\Order\Items\Renderer $block */ ?>
 <?php $parentItem = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrder(); ?>
 
diff --git a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml
index e7128d803f2dd..2ae2e1c6320b4 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml
@@ -5,7 +5,7 @@
  */
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
-<?php /** @var $block \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
+<?php /** @var \Magento\Bundle\Block\Sales\Order\Items\Renderer $block */ ?>
 
 <?php $parentItem = $block->getItem() ?>
 <?php $items = $block->getChildren($parentItem) ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml
index 748b0f991b3fd..edfbe249395eb 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml
@@ -5,7 +5,7 @@
  */
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
-<?php /** @var $block \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
+<?php /** @var \Magento\Bundle\Block\Sales\Order\Items\Renderer $block */ ?>
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getOrder() ?>
 
diff --git a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/shipment/default.phtml b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/shipment/default.phtml
index d94d92280709e..ed7cb1ce62ee0 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/shipment/default.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/shipment/default.phtml
@@ -5,7 +5,7 @@
  */
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
-<?php /** @var $block \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
+<?php /** @var \Magento\Bundle\Block\Sales\Order\Items\Renderer $block */ ?>
 
 <?php $parentItem = $block->getItem() ?>
 
diff --git a/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml
index b3bc1c263abcd..de0a1b7dfb9c8 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml
@@ -7,7 +7,7 @@
 // phpcs:disable Generic.Files.LineLength
 /** @var \Magento\Framework\Locale\LocaleFormatter $localeFormatter */
 ?>
-<?php /** @var $block \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
+<?php /** @var \Magento\Bundle\Block\Sales\Order\Items\Renderer $block */ ?>
 <?php $parentItem = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
 
diff --git a/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php b/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php
index 4b4fa965d75ca..f98ec47b777ca 100644
--- a/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php
+++ b/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php
@@ -808,7 +808,7 @@ protected function clear()
     private function getStoreIdByCode(string $storeCode): int
     {
         if (!isset($this->storeCodeToId[$storeCode])) {
-            /** @var $store Store */
+            /** @var Store $store */
             foreach ($this->storeManager->getStores() as $store) {
                 $this->storeCodeToId[$store->getCode()] = (int)$store->getId();
             }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
index 6ff7ad7b8a172..9c3ac2d32412d 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
@@ -147,7 +147,7 @@ public function getSuggestedCategoriesJson($namePart)
     {
         $storeId = $this->getRequest()->getParam('store', $this->_getDefaultStoreId());
 
-        /* @var $collection Collection */
+        /** @var Collection $collection */
         $collection = $this->_categoryFactory->create()->getCollection();
 
         $matchingNamesCollection = clone $collection;
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php
index 3657bb690c1b5..0b546e237b671 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php
@@ -106,7 +106,7 @@ private function getAdditionalFrontendInputTypes(): array
     private function removeUnusedFields(): void
     {
         $form = $this->getForm();
-        /* @var $fieldset Fieldset */
+        /** @var Fieldset $fieldset */
         $fieldset = $form->getElement('base_fieldset');
         $fieldsToRemove = ['attribute_code', 'is_unique', 'frontend_class'];
         foreach ($fieldset->getElements() as $element) {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
index 04043a0a80530..813d5d8125c82 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
@@ -220,12 +220,12 @@ public function getGroupTreeJson()
         $items = [];
         $setId = $this->_getSetId();
 
-        /* @var $groups \Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\Collection */
+        /** @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\Collection $groups */
         $groups = $this->_groupFactory->create()->getResourceCollection()->setAttributeSetFilter(
             $setId
         )->setSortOrder()->load();
 
-        /* @var $node \Magento\Eav\Model\Entity\Attribute\Group */
+        /** @var \Magento\Eav\Model\Entity\Attribute\Group $node */
         foreach ($groups as $node) {
             $item = [];
             $item['text'] = $this->escapeHtml($node->getAttributeGroupName());
@@ -264,7 +264,7 @@ public function getAttributeTreeJson()
         $collection = $this->_collectionFactory->create()->setAttributeSetFilter($setId)->load();
 
         $attributesIds = ['0'];
-        /* @var $item \Magento\Eav\Model\Entity\Attribute */
+        /** @var \Magento\Eav\Model\Entity\Attribute $item */
         foreach ($collection->getItems() as $item) {
             $attributesIds[] = $item->getAttributeId();
         }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset.php
index 5008252ea9a85..f513d3c7b7e5c 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset.php
@@ -25,7 +25,7 @@ protected function _toHtml()
         $total = count($children);
         $i = 0;
         $this->setText('');
-        /** @var $block \Magento\Framework\View\Element\AbstractBlock  */
+        /** @var \Magento\Framework\View\Element\AbstractBlock $block */
         foreach ($children as $block) {
             $i++;
             $block->setIsLastFieldset($i == $total);
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
index ed0db1ca044fd..8d449a3b5d54f 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
@@ -358,7 +358,7 @@ public function getAttributesAllowedForAutogeneration()
      */
     protected function _getAttributes()
     {
-        /** @var $product \Magento\Catalog\Model\Product */
+        /** @var \Magento\Catalog\Model\Product $product */
         $product = $this->getProduct();
         $attributes = [];
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
index 07f61ac9af906..cf53d5dec8191 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
@@ -26,7 +26,7 @@ protected function _prepareLayout()
         $accordion = $this->getLayout()->createBlock(
             \Magento\Backend\Block\Widget\Accordion::class
         )->setId('productAlerts');
-        /* @var $accordion \Magento\Backend\Block\Widget\Accordion */
+        /** @var \Magento\Backend\Block\Widget\Accordion $accordion */
 
         $alertPriceAllow = $this->_scopeConfig->getValue(
             'catalog/productalert/allow_price',
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes.php
index c9bb5e29bfc80..917fd48b878d5 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes.php
@@ -26,7 +26,7 @@ class Attributes extends \Magento\Catalog\Block\Adminhtml\Form
      */
     protected function _prepareForm()
     {
-        /** @var $group \Magento\Eav\Model\Entity\Attribute\Group */
+        /** @var \Magento\Eav\Model\Entity\Attribute\Group $group */
         $group = $this->getGroup();
         if ($group) {
             /** @var \Magento\Framework\Data\Form $form */
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
index cfc43e19b8e0f..a7d152a999b10 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
@@ -100,7 +100,7 @@ public function getSuggestedAttributes($labelPart, $templateId = null)
             $labelPart,
             ['position' => 'any']
         );
-        /** @var $collection \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection */
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection $collection */
         $collection = $this->_collectionFactory->create()->addFieldToFilter(
             'frontend_label',
             ['like' => $escapedLabelPart]
@@ -110,7 +110,7 @@ public function getSuggestedAttributes($labelPart, $templateId = null)
 
         $result = [];
         foreach ($collection->getItems() as $attribute) {
-            /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+            /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
             $result[] = [
                 'id' => $attribute->getId(),
                 'label' => $attribute->getFrontendLabel(),
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
index 9895b7a093c34..e1dce105faddf 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
@@ -156,7 +156,7 @@ protected function _addColumnFilterToCollection($column)
      */
     protected function _prepareCollection()
     {
-        /* @var $collection \Magento\Catalog\Model\ResourceModel\Product\Link\Product\Collection */
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Link\Product\Collection $collection */
         $collection = $this->_linkFactory->create()->useCrossSellLinks()->getProductCollection()->setProduct(
             $this->getProduct()
         )->addAttributeToSelect(
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
index 5ea884a1b2cd8..99602ee623617 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
@@ -329,7 +329,7 @@ public function getOptionValues()
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
             foreach ($optionsArr as $option) {
-                /* @var $option \Magento\Catalog\Model\Product\Option */
+                /** @var \Magento\Catalog\Model\Product\Option $option */
 
                 $this->setItemCount($option->getOptionId());
 
@@ -399,7 +399,7 @@ private function getOptionValueOfGroupSelect($value, $option, $showPrice, $scope
         $i = 0;
         $itemCount = 0;
         foreach ($option->getValues() as $_value) {
-            /* @var $_value \Magento\Catalog\Model\Product\Option\Value */
+            /** @var \Magento\Catalog\Model\Product\Option\Value $_value */
             $value['optionValues'][$i] = [
                 'item_count' => max($itemCount, $_value->getOptionTypeId()),
                 'option_id' => $_value->getOptionId(),
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php
index 7e2110367c027..c69e9c0a9d97d 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php
@@ -264,7 +264,7 @@ public function getWebsites()
         ];
 
         if (!$this->isScopeGlobal() && $this->getProduct()->getStoreId()) {
-            /** @var $website \Magento\Store\Model\Website */
+            /** @var \Magento\Store\Model\Website $website */
             $website = $this->_storeManager->getStore($this->getProduct()->getStoreId())->getWebsite();
 
             $this->_websites[$website->getId()] = [
@@ -275,7 +275,7 @@ public function getWebsites()
             $websites = $this->_storeManager->getWebsites();
             $productWebsiteIds = $this->getProduct()->getWebsiteIds();
             foreach ($websites as $website) {
-                /** @var $website \Magento\Store\Model\Website */
+                /** @var \Magento\Store\Model\Website $website */
                 if (!in_array($website->getId(), $productWebsiteIds)) {
                     continue;
                 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
index 2630eb6744b96..184b4b8f807f1 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
@@ -144,7 +144,7 @@ public function getImageValue(string $type)
      */
     public function getContentHtml()
     {
-        /* @var $content \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content */
+        /** @var \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content $content */
         $content = $this->getChildBlock('content');
         $content->setId($this->getHtmlId() . '_content')->setElement($this);
         $content->setFormName($this->formName);
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
index d422f9fa5d131..7f59f4a382a3f 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
@@ -240,7 +240,7 @@ public function getImagesValuesJson()
     {
         $values = [];
         foreach ($this->getMediaAttributes() as $attribute) {
-            /* @var $attribute \Magento\Eav\Model\Entity\Attribute */
+            /** @var \Magento\Eav\Model\Entity\Attribute $attribute */
             $values[$attribute->getAttributeCode()] = $this->getElement()->getDataObject()->getData(
                 $attribute->getAttributeCode()
             );
@@ -257,7 +257,7 @@ public function getImageTypes()
     {
         $imageTypes = [];
         foreach ($this->getMediaAttributes() as $attribute) {
-            /* @var $attribute \Magento\Eav\Model\Entity\Attribute */
+            /** @var \Magento\Eav\Model\Entity\Attribute $attribute */
             $value = $this->getElement()->getDataObject()->getData($attribute->getAttributeCode())
                 ?: $this->getElement()->getImageValue($attribute->getAttributeCode());
             $imageTypes[$attribute->getAttributeCode()] = [
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Options/Ajax.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Options/Ajax.php
index 1f41822c1231d..681eb4751cfc1 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Options/Ajax.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Options/Ajax.php
@@ -60,7 +60,7 @@ public function __construct(
     protected function _toHtml()
     {
         $results = [];
-        /** @var $optionsBlock \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Option */
+        /** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Option $optionsBlock */
         $optionsBlock = $this->getLayout()->createBlock(
             \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Option::class
         )->setIgnoreCaching(
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser.php
index c026b603f6fc0..6470d30e5f4a3 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser.php
@@ -234,7 +234,7 @@ protected function _addColumnFilterToCollection($column)
      */
     protected function _prepareCollection()
     {
-        /* @var $collection \Magento\Catalog\Model\ResourceModel\Product\Collection */
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
         $collection = $this->_collectionFactory->create()->setStoreId(0)->addAttributeToSelect('name');
 
         if ($categoryId = $this->getCategoryId()) {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php b/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
index ca41739e9a0f1..15a177c6ca63e 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
@@ -60,7 +60,7 @@ public function getRssData()
         $data = ['title' => $title, 'description' => $title, 'link' => $newUrl, 'charset' => 'UTF-8'];
 
         foreach ($this->rssModel->getProductsCollection() as $item) {
-            /* @var $item \Magento\Catalog\Model\Product */
+            /** @var \Magento\Catalog\Model\Product $item */
             $url = $this->getUrl(
                 'catalog/product/edit',
                 ['id' => $item->getId(), '_secure' => true, '_nosecret' => true]
diff --git a/app/code/Magento/Catalog/Block/Product/ListProduct.php b/app/code/Magento/Catalog/Block/Product/ListProduct.php
index c40f4a1dbc44d..6985c8d440a32 100644
--- a/app/code/Magento/Catalog/Block/Product/ListProduct.php
+++ b/app/code/Magento/Catalog/Block/Product/ListProduct.php
@@ -485,7 +485,7 @@ protected function getPriceRender()
     private function initializeProductCollection()
     {
         $layer = $this->getLayer();
-        /* @var $layer Layer */
+        /** @var Layer $layer */
         if ($this->getShowRootCategory()) {
             $this->setCategoryId($this->_storeManager->getStore()->getRootCategoryId());
         }
diff --git a/app/code/Magento/Catalog/Block/Product/NewProduct.php b/app/code/Magento/Catalog/Block/Product/NewProduct.php
index 47ba3b1a0f86e..2c80bdc76632a 100644
--- a/app/code/Magento/Catalog/Block/Product/NewProduct.php
+++ b/app/code/Magento/Catalog/Block/Product/NewProduct.php
@@ -114,7 +114,7 @@ protected function _getProductCollection()
         $todayStartOfDayDate = $this->_localeDate->date()->setTime(0, 0, 0)->format('Y-m-d H:i:s');
         $todayEndOfDayDate = $this->_localeDate->date()->setTime(23, 59, 59)->format('Y-m-d H:i:s');
 
-        /** @var $collection \Magento\Catalog\Model\ResourceModel\Product\Collection */
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
         $collection = $this->_productCollectionFactory->create();
         $collection->setVisibility($this->_catalogProductVisibility->getVisibleInCatalogIds());
 
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Crosssell.php b/app/code/Magento/Catalog/Block/Product/ProductList/Crosssell.php
index 09b41c6c43fe2..c7a54621bbebf 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Crosssell.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Crosssell.php
@@ -29,7 +29,7 @@ class Crosssell extends \Magento\Catalog\Block\Product\AbstractProduct
     protected function _prepareData()
     {
         $product = $this->getProduct();
-        /* @var $product \Magento\Catalog\Model\Product */
+        /** @var \Magento\Catalog\Model\Product $product */
 
         $this->_itemCollection = $product->getCrossSellProductCollection()->addAttributeToSelect(
             $this->_catalogConfig->getProductAttributes()
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Related.php b/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
index 0e0ce7219be77..a58625acb41b5 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
@@ -88,7 +88,7 @@ public function __construct(
     protected function _prepareData()
     {
         $product = $this->getProduct();
-        /* @var $product Product */
+        /** @var Product $product */
 
         $this->_itemCollection = $product->getRelatedProductCollection()->addAttributeToSelect(
             'required_options'
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index dd2697eb49a94..6b6cc69e01e1f 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -697,7 +697,7 @@ public function getPagerHtml()
         $pagerBlock = $this->getChildBlock('product_list_toolbar_pager');
 
         if ($pagerBlock instanceof \Magento\Framework\DataObject) {
-            /* @var $pagerBlock \Magento\Theme\Block\Html\Pager */
+            /** @var \Magento\Theme\Block\Html\Pager $pagerBlock */
             $pagerBlock->setAvailableLimit($this->getAvailableLimit());
 
             $pagerBlock->setUseContainer(
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php b/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
index 281b681eda794..06e0780658ddd 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
@@ -103,7 +103,7 @@ public function __construct(
     protected function _prepareData()
     {
         $product = $this->getProduct();
-        /* @var $product Product */
+        /** @var Product $product */
         $this->_itemCollection = $product->getUpSellProductCollection()->setPositionOrder()->addStoreFilter();
         if ($this->moduleManager->isEnabled('Magento_Checkout')) {
             $this->_addProductAttributesAndPrices($this->_itemCollection);
diff --git a/app/code/Magento/Catalog/Block/Product/View.php b/app/code/Magento/Catalog/Block/Product/View.php
index 6fa5c0cb8a47a..a4f0f1d747d81 100644
--- a/app/code/Magento/Catalog/Block/Product/View.php
+++ b/app/code/Magento/Catalog/Block/Product/View.php
@@ -174,7 +174,7 @@ public function getAddToCartUrl($product, $additional = [])
      */
     public function getJsonConfig()
     {
-        /* @var $product \Magento\Catalog\Model\Product */
+        /** @var \Magento\Catalog\Model\Product $product */
         $product = $this->getProduct();
         $tierPrices = [];
         $priceInfo = $product->getPriceInfo();
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options.php b/app/code/Magento/Catalog/Block/Product/View/Options.php
index 83380bdac6462..a5a9897d9272b 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options.php
@@ -229,7 +229,7 @@ public function getJsonConfig()
     {
         $config = [];
         foreach ($this->getOptions() as $option) {
-            /* @var $option \Magento\Catalog\Model\Product\Option */
+            /** @var \Magento\Catalog\Model\Product\Option $option */
             if ($option->hasValues()) {
                 $tmpPriceValues = [];
                 foreach ($option->getValues() as $valueId => $value) {
diff --git a/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php b/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php
index 943434bbb9822..a29fc953471c9 100644
--- a/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php
+++ b/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php
@@ -107,7 +107,7 @@ protected function _getProductCollection()
      */
     protected function _getRecentlyAddedProductsCollection()
     {
-        /** @var $collection \Magento\Catalog\Model\ResourceModel\Product\Collection */
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
         $collection = $this->_productCollectionFactory->create();
         $collection->setVisibility($this->_catalogProductVisibility->getVisibleInCatalogIds());
 
diff --git a/app/code/Magento/Catalog/Block/Rss/Category.php b/app/code/Magento/Catalog/Block/Rss/Category.php
index 84591ab27685b..8e61f0ac944ac 100644
--- a/app/code/Magento/Catalog/Block/Rss/Category.php
+++ b/app/code/Magento/Catalog/Block/Rss/Category.php
@@ -124,7 +124,7 @@ public function getRssData()
         $attributes = $this->_viewConfig
             ->getViewConfig()
             ->getMediaAttributes('Magento_Catalog', $this->imageHelper::MEDIA_TYPE_CONFIG_NODE, 'rss_thumbnail');
-        /** @var $product \Magento\Catalog\Model\Product */
+        /** @var \Magento\Catalog\Model\Product $product */
         foreach ($this->rssModel->getProductCollection($category, $this->getStoreId()) as $product) {
             $product->setAllowedInRss(true);
             $product->setAllowedPriceInRss(true);
@@ -241,7 +241,7 @@ public function getFeeds()
     {
         $result = [];
         if ($this->isAllowed()) {
-            /** @var $category \Magento\Catalog\Model\Category */
+            /** @var \Magento\Catalog\Model\Category $category */
             $category = $this->categoryFactory->create();
             $treeModel = $category->getTreeModel()->loadNode($this->storeManager->getStore()->getRootCategoryId());
             $nodes = $treeModel->loadChildren()->getChildren();
@@ -251,7 +251,7 @@ public function getFeeds()
                 $nodeIds[] = $node->getId();
             }
 
-            /* @var $collection \Magento\Catalog\Model\ResourceModel\Category\Collection */
+            /** @var \Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
             $collection = $category->getResourceCollection();
             $collection->addIdFilter($nodeIds)
                 ->addAttributeToSelect('url_key')
diff --git a/app/code/Magento/Catalog/Block/Rss/Product/NewProducts.php b/app/code/Magento/Catalog/Block/Rss/Product/NewProducts.php
index 8a34acf20a680..5a867a6f0cfbe 100644
--- a/app/code/Magento/Catalog/Block/Rss/Product/NewProducts.php
+++ b/app/code/Magento/Catalog/Block/Rss/Product/NewProducts.php
@@ -94,7 +94,7 @@ public function getRssData()
         ];
 
         foreach ($this->rssModel->getProductsCollection($this->getStoreId()) as $item) {
-            /** @var $item \Magento\Catalog\Model\Product */
+            /** @var \Magento\Catalog\Model\Product $item */
             $item->setAllowedInRss(true);
             $item->setAllowedPriceInRss(true);
 
diff --git a/app/code/Magento/Catalog/Block/Rss/Product/Special.php b/app/code/Magento/Catalog/Block/Rss/Product/Special.php
index c8e3eda75c07f..4974a73499098 100644
--- a/app/code/Magento/Catalog/Block/Rss/Product/Special.php
+++ b/app/code/Magento/Catalog/Block/Rss/Product/Special.php
@@ -128,7 +128,7 @@ public function getRssData()
 
         $currentDate = (new \DateTime())->setTime(0, 0, 0);
         foreach ($this->rssModel->getProductsCollection($this->getStoreId(), $this->getCustomerGroupId()) as $item) {
-            /** @var $item \Magento\Catalog\Model\Product */
+            /** @var \Magento\Catalog\Model\Product $item */
             $item->setAllowedInRss(true);
             $item->setAllowedPriceInRss(true);
 
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
index d77d7c96ee469..70573f39e2b4d 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
@@ -61,7 +61,7 @@ public function execute()
          */
         $prevNodeId = $this->getRequest()->getPost('aid', false);
 
-        /** @var $block \Magento\Framework\View\Element\Messages */
+        /** @var \Magento\Framework\View\Element\Messages $block */
         $block = $this->layoutFactory->create()->getMessagesBlock();
         $error = false;
 
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
index 84e5562b8d882..024acd7124fcf 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
@@ -256,7 +256,7 @@ public function execute()
         if ($this->getRequest()->getPost('return_session_messages_only')) {
             $category->load($category->getId());
             // to obtain truncated category name
-            /** @var $block \Magento\Framework\View\Element\Messages */
+            /** @var \Magento\Framework\View\Element\Messages $block */
             $block = $this->layoutFactory->create()->getMessagesBlock();
             $block->setMessages($this->messageManager->getMessages(true));
 
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php
index d5cb18bcd705b..03ddbfd7a068c 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php
@@ -16,7 +16,7 @@ class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute imple
     public function execute()
     {
         $id = $this->getRequest()->getParam('attribute_id');
-        /** @var $model \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+        /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $model */
         $model = $this->_objectManager->create(
             \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
         )->setEntityTypeId(
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
index 05d53ad3df7bd..99215e76b3964 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
@@ -169,7 +169,7 @@ public function execute()
 
         if ($this->getRequest()->has('new_attribute_set_name')) {
             $setName = $this->getRequest()->getParam('new_attribute_set_name');
-            /** @var $attributeSet Set */
+            /** @var Set $attributeSet */
             $attributeSet = $this->_objectManager->create(Set::class);
             $attributeSet->setEntityTypeId($this->_entityTypeId)->load($setName, 'attribute_set_name');
             if ($attributeSet->getId()) {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
index 5296931155f04..103e66070bb90 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
@@ -137,7 +137,7 @@ public function build(RequestInterface $request): ProductInterface
      */
     private function createEmptyProduct($typeId, $attributeSetId, $storeId): Product
     {
-        /** @var $product \Magento\Catalog\Model\Product */
+        /** @var \Magento\Catalog\Model\Product $product */
         $product = $this->productFactory->create();
         $product->setData('_edit_mode', true);
 
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php
index ed76f7c64bc62..e52a3ca48dcc8 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php
@@ -96,7 +96,7 @@ public function execute()
         $attributeSetId = $this->getRequest()->getParam('id', false);
         $isNewSet = $this->getRequest()->getParam('gotoEdit', false) == '1';
 
-        /* @var $model \Magento\Eav\Model\Entity\Attribute\Set */
+        /** @var \Magento\Eav\Model\Entity\Attribute\Set $model */
         $model = $this->attributeSetFactory->create()->setEntityTypeId($entityTypeId);
 
         try {
@@ -141,7 +141,7 @@ public function execute()
 
         if ($isNewSet) {
             if ($this->getRequest()->getPost('return_session_messages_only')) {
-                /** @var $block \Magento\Framework\View\Element\Messages */
+                /** @var \Magento\Framework\View\Element\Messages $block */
                 $block = $this->layoutFactory->create()->getMessagesBlock();
                 $block->setMessages($this->messageManager->getMessages(true));
                 $body = [
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php
index a9701054efe94..25dde5f5cb03e 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php
@@ -122,7 +122,7 @@ public function execute()
             $storeId = $this->getRequest()->getParam('store', 0);
             $store = $this->getStoreManager()->getStore($storeId);
             $this->getStoreManager()->setCurrentStore($store->getCode());
-            /* @var $product \Magento\Catalog\Model\Product */
+            /** @var \Magento\Catalog\Model\Product $product */
             $product = $this->productFactory->create();
             $product->setData('_edit_mode', true);
             if ($storeId) {
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php b/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php
index 33e7d03fb49f3..8445920f52eb7 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php
@@ -34,7 +34,7 @@ public function execute()
             }
 
             if ($product && (int)$product->getStatus() !== Status::STATUS_DISABLED) {
-                /** @var $item \Magento\Catalog\Model\Product\Compare\Item */
+                /** @var \Magento\Catalog\Model\Product\Compare\Item $item */
                 $item = $this->_compareItemFactory->create();
                 if ($this->_customerSession->isLoggedIn()) {
                     $item->setCustomerId($this->_customerSession->getCustomerId());
@@ -45,7 +45,7 @@ public function execute()
                 }
 
                 $item->loadByProduct($product);
-                /** @var $helper \Magento\Catalog\Helper\Product\Compare */
+                /** @var \Magento\Catalog\Helper\Product\Compare $helper */
                 $helper = $this->_objectManager->get(\Magento\Catalog\Helper\Product\Compare::class);
                 if ($item->getId()) {
                     $item->delete();
diff --git a/app/code/Magento/Catalog/Helper/Data.php b/app/code/Magento/Catalog/Helper/Data.php
index f37481ef7bd2a..c6d3930bb08a2 100644
--- a/app/code/Magento/Catalog/Helper/Data.php
+++ b/app/code/Magento/Catalog/Helper/Data.php
@@ -342,7 +342,7 @@ public function getLastViewedUrl()
             } catch (NoSuchEntityException $e) {
                 return '';
             }
-            /* @var $product \Magento\Catalog\Model\Product */
+            /** @var \Magento\Catalog\Model\Product $product */
             if ($this->_catalogProduct->canShow($product, 'catalog')) {
                 return $product->getProductUrl();
             }
@@ -354,7 +354,7 @@ public function getLastViewedUrl()
             } catch (NoSuchEntityException $e) {
                 return '';
             }
-            /* @var $category \Magento\Catalog\Model\Category */
+            /** @var \Magento\Catalog\Model\Category $category */
             if (!$this->_catalogCategory->canShow($category)) {
                 return '';
             }
diff --git a/app/code/Magento/Catalog/Helper/Product/Compare.php b/app/code/Magento/Catalog/Helper/Product/Compare.php
index 536bf64d7d001..a3f9d1c820357 100644
--- a/app/code/Magento/Catalog/Helper/Product/Compare.php
+++ b/app/code/Magento/Catalog/Helper/Product/Compare.php
@@ -314,7 +314,7 @@ public function getItemCollection()
      */
     public function calculate($logout = false)
     {
-        /** @var $collection Collection */
+        /** @var Collection $collection */
         $collection = $this->_itemCollectionFactory->create()
             ->useProductItem();
         if (!$logout && $this->_customerSession->isLoggedIn()) {
diff --git a/app/code/Magento/Catalog/Helper/Product/Configuration.php b/app/code/Magento/Catalog/Helper/Product/Configuration.php
index 0365d01e8dd78..59ae7dab9172a 100644
--- a/app/code/Magento/Catalog/Helper/Product/Configuration.php
+++ b/app/code/Magento/Catalog/Helper/Product/Configuration.php
@@ -91,7 +91,7 @@ public function getCustomOptions(ItemInterface $item) //phpcs:ignore Generic.Met
                 $option = $product->getOptionById($optionId);
                 if ($option) {
                     $itemOption = $item->getOptionByCode('option_' . $option->getId());
-                    /** @var $group \Magento\Catalog\Model\Product\Option\Type\DefaultType */
+                    /** @var \Magento\Catalog\Model\Product\Option\Type\DefaultType $group */
                     $group = $option->groupFactory($option->getType())
                         ->setOption($option)
                         ->setConfigurationItem($item)
diff --git a/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php b/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
index b7e5d4af2b8d8..a886ff2ae75de 100644
--- a/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
+++ b/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
@@ -179,7 +179,7 @@ public function getAttributes()
             // check product type apply to limitation and remove attributes that impossible to change in mass-update
             $productTypeIds = $this->getProducts()->getProductTypeIds();
             foreach ($this->_attributes as $attribute) {
-                /* @var $attribute \Magento\Catalog\Model\Entity\Attribute */
+                /** @var \Magento\Catalog\Model\Entity\Attribute $attribute */
                 foreach ($productTypeIds as $productTypeId) {
                     $applyTo = $attribute->getApplyTo();
                     if (count($applyTo) > 0 && !in_array($productTypeId, $applyTo)) {
diff --git a/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php b/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
index 040200f536243..d85b872d509c9 100644
--- a/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
+++ b/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
@@ -248,7 +248,7 @@ public function getFlatColumns()
         if ($this->_columns === null) {
             $this->_columns = $this->getFlatColumnsDdlDefinition();
             foreach ($this->getAttributes() as $attribute) {
-                /** @var $attribute \Magento\Eav\Model\Entity\Attribute\AbstractAttribute */
+                /** @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute */
                 $columns = $attribute->setFlatAddFilterableAttributes(
                     $this->isAddFilterableAttributes()
                 )->setFlatAddChildData(
@@ -410,7 +410,7 @@ public function getFlatIndexes()
             ];
 
             foreach ($this->getAttributes() as $attribute) {
-                /** @var $attribute \Magento\Eav\Model\Entity\Attribute */
+                /** @var \Magento\Eav\Model\Entity\Attribute $attribute */
                 $indexes = $attribute->setFlatAddFilterableAttributes(
                     $this->isAddFilterableAttributes()
                 )->setFlatAddChildData(
@@ -435,7 +435,7 @@ public function getTablesStructure(array $attributes)
     {
         $eavAttributes = [];
         $flatColumnsList = $this->getFlatColumns();
-        /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+        /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
         foreach ($attributes as $attribute) {
             $eavTable = $attribute->getBackend()->getTable();
             $attributeCode = $attribute->getAttributeCode();
diff --git a/app/code/Magento/Catalog/Model/Config.php b/app/code/Magento/Catalog/Model/Config.php
index 7e345e44b82fd..9f2132f785733 100644
--- a/app/code/Magento/Catalog/Model/Config.php
+++ b/app/code/Magento/Catalog/Model/Config.php
@@ -481,7 +481,7 @@ public function getAttributeUsedForSortByArray()
     {
         $options = ['position' => __('Position')];
         foreach ($this->getAttributesUsedForSortBy() as $attribute) {
-            /* @var $attribute \Magento\Eav\Model\Entity\Attribute\AbstractAttribute */
+            /** @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute */
             $options[$attribute->getAttributeCode()] = $attribute->getStoreLabel();
         }
 
diff --git a/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php b/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php
index 6742e5637ab0c..4e26f2e4b942e 100644
--- a/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php
+++ b/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php
@@ -72,7 +72,7 @@ public function getPrefixes()
         // use cached eav config
         $entityTypeId = $this->_eavConfig->getEntityType(\Magento\Catalog\Model\Product::ENTITY)->getId();
 
-        /* @var $collection \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection */
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection $collection */
         $collection = $this->_attributeCollectionFactory->create();
         $collection->setEntityTypeFilter($entityTypeId);
         $collection->setFrontendInputTypeFilter('media_image');
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php
index f8e3440a631f7..089109b61ddab 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php
@@ -44,7 +44,7 @@ protected function populateFlatTables(array $stores)
         $rootId = \Magento\Catalog\Model\Category::TREE_ROOT_ID;
         $categories = [];
         $categoriesIds = [];
-        /* @var $store \Magento\Store\Model\Store */
+        /** @var \Magento\Store\Model\Store $store */
         foreach ($stores as $store) {
             if (!isset($categories[$store->getRootCategoryId()])) {
                 $select = $this->connection->select()->from(
@@ -128,7 +128,7 @@ protected function createTables(array $stores = [])
         if (empty($stores)) {
             $stores = $this->storeManager->getStores();
         }
-        /* @var $store \Magento\Store\Model\Store */
+        /** @var \Magento\Store\Model\Store $store */
         foreach ($stores as $store) {
             $this->createTable($store->getId());
         }
@@ -144,7 +144,7 @@ protected function createTables(array $stores = [])
      */
     protected function switchTables(array $stores = [])
     {
-        /** @var $store \Magento\Store\Model\Store */
+        /** @var \Magento\Store\Model\Store $store */
         foreach ($stores as $store) {
             $activeTableName = $this->getMainStoreTable($store->getId());
             $temporaryTableName = $this->addTemporaryTableSuffix($this->getMainStoreTable($store->getId()));
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/AttributeSet/IndexableAttributeFilter.php b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/AttributeSet/IndexableAttributeFilter.php
index eed11d007d989..93a189da51f11 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/AttributeSet/IndexableAttributeFilter.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/AttributeSet/IndexableAttributeFilter.php
@@ -34,9 +34,9 @@ public function filter(\Magento\Eav\Model\Entity\Attribute\Set $set)
         $groups = $set->getGroups();
         if (is_array($groups)) {
             foreach ($groups as $group) {
-                /** @var $group \Magento\Eav\Model\Entity\Attribute\Group */
+                /** @var \Magento\Eav\Model\Entity\Attribute\Group $group */
                 foreach ($group->getAttributes() as $attribute) {
-                    /** @var $attribute \Magento\Eav\Model\Entity\Attribute */
+                    /** @var \Magento\Eav\Model\Entity\Attribute $attribute */
                     $catalogResource->load($attribute->getId());
                     if ($catalogResource->isIndexable()) {
                         // Attribute requires to be cloned for new dataset to maintain attribute set changes
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
index 4c53659c91f8f..e8da7ca265713 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
@@ -203,7 +203,7 @@ protected function _updateRelationProducts($storeId, $productIds = null)
         $metadata = $this->getMetadataPool()->getMetadata(ProductInterface::class);
 
         foreach ($this->_getProductTypeInstances() as $typeInstance) {
-            /** @var $typeInstance \Magento\Catalog\Model\Product\Type\AbstractType */
+            /** @var \Magento\Catalog\Model\Product\Type\AbstractType $typeInstance */
             if (!$typeInstance->isComposite(null)) {
                 continue;
             }
@@ -217,7 +217,7 @@ protected function _updateRelationProducts($storeId, $productIds = null)
                     $columns['child_id'],
                     $columns['is_child']
                 );
-                /** @var $select \Magento\Framework\DB\Select */
+                /** @var \Magento\Framework\DB\Select $select */
                 $select = $this->_connection->select()->from(
                     ['t' => $this->_productIndexerHelper->getTable($relation->getTable())],
                     ['entity_table.entity_id', $relation->getChildFieldName(), new \Zend_Db_Expr('1')]
@@ -266,7 +266,7 @@ protected function _cleanRelationProducts($storeId)
         $metadata = $this->getMetadataPool()->getMetadata(ProductInterface::class);
 
         foreach ($this->_getProductTypeInstances() as $typeInstance) {
-            /** @var $typeInstance \Magento\Catalog\Model\Product\Type\AbstractType */
+            /** @var \Magento\Catalog\Model\Product\Type\AbstractType $typeInstance */
             if (!$typeInstance->isComposite(null)) {
                 continue;
             }
@@ -289,7 +289,7 @@ protected function _cleanRelationProducts($storeId)
                 }
 
                 $entitySelect = new \Zend_Db_Expr($select->__toString());
-                /** @var $select \Magento\Framework\DB\Select */
+                /** @var \Magento\Framework\DB\Select $select */
                 $select = $this->_connection->select()->from(
                     ['e' => $this->_productIndexerHelper->getFlatTableName($storeId)],
                     null
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
index 6bc30564c8732..976c289b13ca9 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
@@ -86,7 +86,7 @@ public function removeDeletedProducts(array &$ids, $storeId)
      */
     public function removeDisabledProducts(array &$ids, $storeId)
     {
-        /* @var $statusAttribute \Magento\Eav\Model\Entity\Attribute */
+        /** @var \Magento\Eav\Model\Entity\Attribute $statusAttribute */
         $statusAttribute = $this->productIndexerHelper->getAttribute('status');
 
         /** @var \Magento\Framework\EntityManager\EntityMetadataInterface $metadata */
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
index ef737e39c68b9..d285b1288ea7e 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
@@ -88,7 +88,7 @@ public function write($storeId, $productId, $valueFieldSuffix = '')
                         ]
                     );
 
-                    /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+                    /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
                     foreach ($columns as $columnName => $attribute) {
                         if (isset($describe[$columnName])) {
                             $ids[$attribute->getId()] = $columnName;
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
index 69898c71b749a..712bee99095e9 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
@@ -99,7 +99,7 @@ public function execute($id = null)
                 $this->flatItemEraser->removeDisabledProducts($ids, $store->getId());
             }
 
-            /* @var $status \Magento\Eav\Model\Entity\Attribute */
+            /** @var \Magento\Eav\Model\Entity\Attribute $status */
             $status = $this->_productIndexerHelper->getAttribute(ProductInterface::STATUS);
             $statusTable = $status->getBackend()->getTable();
             $catalogProductEntityTable = $this->_productIndexerHelper->getTable('catalog_product_entity');
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
index 7f5b75e70af0a..5fb12678aecc8 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
@@ -176,7 +176,7 @@ protected function _createTemporaryFlatTable($storeId)
         }
         $indexesNeed = array_combine($indexKeys, $indexProps);
 
-        /** @var $table Table */
+        /** @var Table $table */
         $table = $this->_connection->newTable(
             $this->_getTemporaryTableName($this->_productIndexerHelper->getFlatTableName($storeId))
         );
@@ -247,7 +247,7 @@ protected function _fillTemporaryFlatTable(array $tables, $storeId, $valueFieldS
             )
         );
 
-        /* @var $status Attribute */
+        /** @var Attribute $status */
         $status = $this->_productIndexerHelper->getAttribute('status');
         $statusTable = $this->_getTemporaryTableName($status->getBackendTable());
         $statusConditions = [
@@ -333,7 +333,7 @@ protected function _updateTemporaryTableByStoreValues(
         $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
         foreach ($tables as $tableName => $columns) {
             foreach ($columns as $attribute) {
-                /* @var $attribute Attribute */
+                /** @var Attribute $attribute */
                 $attributeCode = $attribute->getAttributeCode();
                 if ($attribute->getBackend()->getType() != 'static') {
                     $joinCondition = sprintf('t.%s = e.%s', $linkField, $linkField) .
@@ -342,7 +342,7 @@ protected function _updateTemporaryTableByStoreValues(
                         ' AND t.store_id = ' .
                         $storeId .
                         ' AND t.value IS NOT NULL';
-                    /** @var $select Select */
+                    /** @var Select $select */
                     $select = $this->_connection->select()
                         ->joinInner(
                             ['e' => $this->resource->getTableName('catalog_product_entity')],
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
index 578af4e8b7b96..9bfd4bb49858f 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
@@ -85,7 +85,7 @@ public function build($storeId, $changedIds, $valueFieldSuffix)
         $temporaryEavAttributes = $eavAttributes;
 
         //add status global value to the base table
-        /* @var $status \Magento\Eav\Model\Entity\Attribute */
+        /** @var \Magento\Eav\Model\Entity\Attribute $status */
         $status = $this->_productIndexerHelper->getAttribute('status');
         $temporaryEavAttributes[$status->getBackendTable()]['status'] = $status;
         //Create list of temporary tables based on available attributes attributes
@@ -168,7 +168,7 @@ protected function _createTemporaryTable($tableName, array $columns, $valueField
                 ['unsigned'=>true]
             );
 
-            /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+            /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
             foreach ($columns as $columnName => $attribute) {
                 $attributeCode = $attribute->getAttributeCode();
                 if (isset($flatColumns[$attributeCode])) {
@@ -316,7 +316,7 @@ protected function _fillTemporaryTable(
 
                 $selectValue->from(['e' => $temporaryTableName], $keyColumn);
 
-                /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+                /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
                 foreach ($columnsList as $columnName => $attribute) {
                     $countTableName = 't' . ($iterationNum++);
                     $joinCondition = 'e.%3$s = %1$s.%3$s AND %1$s.attribute_id = %2$d AND %1$s.store_id = %4$d';
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
index 9ef32a6a498fa..1b560e228baff 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
@@ -224,7 +224,7 @@ protected function _prepareWebsiteDateTable()
 
         $data = [];
         foreach ($this->getConnection()->fetchAll($select) as $item) {
-            /** @var $website Website */
+            /** @var Website $website */
             $website = $this->_storeManager->getWebsite($item['website_id']);
 
             if ($website->getBaseCurrencyCode() != $baseCurrency) {
@@ -240,7 +240,7 @@ protected function _prepareWebsiteDateTable()
                 $rate = 1;
             }
 
-            /** @var $store Store */
+            /** @var Store $store */
             $store = $this->_storeManager->getStore($item['store_id']);
             if ($store) {
                 $timestamp = $this->_localeDate->scopeTimeStamp($store);
diff --git a/app/code/Magento/Catalog/Model/Layer/Category/FilterableAttributeList.php b/app/code/Magento/Catalog/Model/Layer/Category/FilterableAttributeList.php
index 7c4ffe906cb8d..df11d4ffa9c69 100644
--- a/app/code/Magento/Catalog/Model/Layer/Category/FilterableAttributeList.php
+++ b/app/code/Magento/Catalog/Model/Layer/Category/FilterableAttributeList.php
@@ -41,7 +41,7 @@ public function __construct(
      */
     public function getList()
     {
-        /** @var $collection \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection */
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection $collection */
         $collection = $this->collectionFactory->create();
         $collection->setItemObjectClass(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
             ->addStoreLabel($this->storeManager->getStore()->getId())
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/AttributeSetFinder.php b/app/code/Magento/Catalog/Model/Product/Attribute/AttributeSetFinder.php
index fcd1215259f96..21502c59b9a3e 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/AttributeSetFinder.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/AttributeSetFinder.php
@@ -31,7 +31,7 @@ public function __construct(CollectionFactory $productCollectionFactory)
      */
     public function findAttributeSetIdsByProductIds(array $productIds)
     {
-        /** @var $collection Collection */
+        /** @var Collection $collection */
         $collection = $this->productCollectionFactory->create();
         $select = $collection
             ->getSelect()
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
index b0607532afd82..c0c976e48c73a 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
@@ -103,7 +103,7 @@ protected function _getWebsiteCurrencyRates()
                 'default'
             );
             foreach ($this->_storeManager->getWebsites() as $website) {
-                /* @var $website \Magento\Store\Model\Website */
+                /** @var \Magento\Store\Model\Website $website */
                 $websiteBaseCurrency = $website->getBaseCurrencyCode();
                 if ($websiteBaseCurrency !== $baseCurrency) {
                     $rate = $this->_currencyFactory->create()->load(
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
index 5b2a691bb03f2..1e36fedffd9a6 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
@@ -119,7 +119,7 @@ public function setScope($attribute)
      */
     public function afterSave($object)
     {
-        /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+        /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
         $attribute = $this->getAttribute();
         $attributeCode = $attribute->getAttributeCode();
         $value = $object->getData($attributeCode);
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Group.php b/app/code/Magento/Catalog/Model/Product/Attribute/Group.php
index 46685ab2432e4..2d9c9fc98ecd1 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Group.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Group.php
@@ -72,7 +72,7 @@ public function __construct(
     public function hasSystemAttributes()
     {
         $result = false;
-        /** @var $attributesCollection \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection */
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection $attributesCollection */
         $attributesCollection = $this->_attributeCollectionFactory->create();
         $attributesCollection->setAttributeGroupFilter($this->getId());
         foreach ($attributesCollection as $attribute) {
diff --git a/app/code/Magento/Catalog/Model/Product/Compare/ListCompare.php b/app/code/Magento/Catalog/Model/Product/Compare/ListCompare.php
index bb7eb8241e257..9e691bd197054 100644
--- a/app/code/Magento/Catalog/Model/Product/Compare/ListCompare.php
+++ b/app/code/Magento/Catalog/Model/Product/Compare/ListCompare.php
@@ -88,7 +88,7 @@ public function __construct(
      */
     public function addProduct($product)
     {
-        /* @var $item \Magento\Catalog\Model\Product\Compare\Item */
+        /** @var \Magento\Catalog\Model\Product\Compare\Item $item */
         $item = $this->_compareItemFactory->create();
         $this->_addVisitorToItem($item);
         $item->loadByProduct($product);
@@ -154,7 +154,7 @@ public function getItemCollection()
      */
     public function removeProduct($product)
     {
-        /* @var $item \Magento\Catalog\Model\Product\Compare\Item */
+        /** @var \Magento\Catalog\Model\Product\Compare\Item $item */
         $item = $this->_compareItemFactory->create();
         $this->_addVisitorToItem($item);
         $item->loadByProduct($product);
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
index 8f37974c84392..dbac507517b61 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
@@ -119,7 +119,7 @@ public function __construct(
      */
     public function create($sku, ProductAttributeMediaGalleryEntryInterface $entry)
     {
-        /** @var $entry ProductAttributeMediaGalleryEntryInterface */
+        /** @var ProductAttributeMediaGalleryEntryInterface $entry */
         $entryContent = $entry->getContent();
 
         if (!$this->contentValidator->isValid($entryContent)) {
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php b/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php
index 45bb2e2c1e092..a5b102a730f15 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php
@@ -175,7 +175,7 @@ public function addImage(
         $destinationFile = $this->mediaConfig->getTmpMediaPath($fileName);
 
         try {
-            /** @var $storageHelper \Magento\MediaStorage\Helper\File\Storage\Database */
+            /** @var \Magento\MediaStorage\Helper\File\Storage\Database $storageHelper */
             $storageHelper = $this->fileStorageDb;
             if ($move) {
                 $this->mediaDirectory->renameFile($file, $destinationFile);
diff --git a/app/code/Magento/Catalog/Model/Product/Option/ReadHandler.php b/app/code/Magento/Catalog/Model/Product/Option/ReadHandler.php
index 85dc405796270..2b25227f6ed2f 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/ReadHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/ReadHandler.php
@@ -39,7 +39,7 @@ public function __construct(
     public function execute($entity, $arguments = [])
     {
         $options = [];
-        /** @var $entity \Magento\Catalog\Api\Data\ProductInterface */
+        /** @var \Magento\Catalog\Api\Data\ProductInterface $entity */
         foreach ($this->optionRepository->getProductOptions($entity) as $option) {
             $option->setProduct($entity);
             $options[] = $option;
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Repository.php b/app/code/Magento/Catalog/Model/Product/Option/Repository.php
index 4acc01287951c..4eaacdd6c4688 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Repository.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Repository.php
@@ -230,7 +230,7 @@ protected function markRemovedValues($newValues, $originalValues)
                 $existingValuesIds[] = $newValue['option_type_id'];
             }
         }
-        /** @var $originalValue \Magento\Catalog\Model\Product\Option\Value */
+        /** @var \Magento\Catalog\Model\Product\Option\Value $originalValue */
         foreach ($originalValues as $originalValue) {
             if (!in_array($originalValue->getData('option_type_id'), $existingValuesIds)) {
                 $originalValue->setData('is_delete', 1);
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
index 3c0364a737008..e43a65195f075 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
@@ -369,14 +369,14 @@ public function getProductOptions()
             $options = $this->getProduct()->getOptions();
             if ($options != null) {
                 foreach ($options as $_option) {
-                    /* @var $option Option */
+                    /** @var Option $option */
                     $this->_productOptions[$this->getProduct()->getId()][$_option->getTitle()] = [
                         'option_id' => $_option->getId(),
                     ];
                     if ($_option->getGroupByType() == ProductCustomOptionInterface::OPTION_GROUP_SELECT) {
                         $optionValues = [];
                         foreach ($_option->getValues() as $_value) {
-                            /* @var $value Value */
+                            /** @var Value $value */
                             $optionValues[$_value->getTitle()] = $_value->getId();
                         }
                         $this->_productOptions[$this
diff --git a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
index 28cbf01b6b448..c5d273daaf469 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
@@ -495,7 +495,7 @@ public function processFileQueue()
                     case 'receive_uploaded_file':
                         $src = $queueOptions['src_name'] ?? '';
                         $dst = $queueOptions['dst_name'] ?? '';
-                        /** @var $uploader Http */
+                        /** @var Http $uploader */
                         $uploader = $queueOptions['uploader'] ?? null;
                         $isUploaded = false;
                         if ($uploader && $uploader->isValid($src)) {
@@ -583,7 +583,7 @@ protected function _prepareOptions(\Magento\Framework\DataObject $buyRequest, $p
             $results = [];
             $optionsFromRequest = $buyRequest->getOptions();
             foreach ($options as $option) {
-                /* @var $option \Magento\Catalog\Model\Product\Option */
+                /** @var \Magento\Catalog\Model\Product\Option $option */
                 try {
                     $group = $option->groupFactory($option->getType())
                         ->setOption($option)
diff --git a/app/code/Magento/Catalog/Model/ProductOptions/Config/Converter.php b/app/code/Magento/Catalog/Model/ProductOptions/Config/Converter.php
index ca3694fc01a21..06ad85fbaf3e7 100644
--- a/app/code/Magento/Catalog/Model/ProductOptions/Config/Converter.php
+++ b/app/code/Magento/Catalog/Model/ProductOptions/Config/Converter.php
@@ -18,7 +18,7 @@ public function convert($source)
     {
         $output = [];
 
-        /** @var $optionNode \DOMNode */
+        /** @var \DOMNode $optionNode */
         foreach ($source->getElementsByTagName('option') as $optionNode) {
             $optionName = $this->_getAttributeValue($optionNode, 'name');
             $data = [];
@@ -26,7 +26,7 @@ public function convert($source)
             $data['label'] = $this->_getAttributeValue($optionNode, 'label');
             $data['renderer'] = $this->_getAttributeValue($optionNode, 'renderer');
 
-            /** @var $childNode \DOMNode */
+            /** @var \DOMNode $childNode */
             foreach ($optionNode->childNodes as $childNode) {
                 if ($childNode->nodeType != XML_ELEMENT_NODE) {
                     continue;
diff --git a/app/code/Magento/Catalog/Model/ProductTypes/Config/Converter.php b/app/code/Magento/Catalog/Model/ProductTypes/Config/Converter.php
index 23124361deee2..f80843e7b13ad 100644
--- a/app/code/Magento/Catalog/Model/ProductTypes/Config/Converter.php
+++ b/app/code/Magento/Catalog/Model/ProductTypes/Config/Converter.php
@@ -21,7 +21,7 @@ public function convert($source)
         $output = [];
         $xpath = new \DOMXPath($source);
         $types = $xpath->evaluate('/config/type');
-        /** @var $typeNode \DOMNode */
+        /** @var \DOMNode $typeNode */
         foreach ($types as $typeNode) {
             $typeName = $this->_getAttributeValue($typeNode, 'name');
             $isComposite = $this->_getAttributeValue($typeNode, 'composite', 'false');
@@ -37,7 +37,7 @@ public function convert($source)
             $data['is_qty'] = !empty($isQty) && 'false' !== $isQty;
             $data['sort_order'] = (int)$this->_getAttributeValue($typeNode, 'sortOrder', 0);
 
-            /** @var $childNode \DOMNode */
+            /** @var \DOMNode $childNode */
             foreach ($typeNode->childNodes as $childNode) {
                 if ($childNode->nodeType != XML_ELEMENT_NODE) {
                     continue;
@@ -54,7 +54,7 @@ public function convert($source)
                         $data['stock_indexer'] = $this->_getAttributeValue($childNode, 'instance');
                         break;
                     case 'allowedSelectionTypes':
-                        /** @var $selectionsTypes \DOMNode */
+                        /** @var \DOMNode $selectionsTypes */
                         foreach ($childNode->childNodes as $selectionsTypes) {
                             if ($selectionsTypes->nodeType != XML_ELEMENT_NODE) {
                                 continue;
@@ -64,7 +64,7 @@ public function convert($source)
                         }
                         break;
                     case 'customAttributes':
-                        /** @var $customAttributes \DOMNode */
+                        /** @var \DOMNode $customAttributes */
                         foreach ($childNode->childNodes as $customAttributes) {
                             if ($customAttributes->nodeType != XML_ELEMENT_NODE) {
                                 continue;
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
index ac3eb10d27b2d..33e7a137ec0d9 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
@@ -533,7 +533,7 @@ public function getAttributeRawValue($entityId, $attribute, $store)
         $connection = $this->getConnection();
 
         foreach ($attribute as $item) {
-            /* @var $attribute \Magento\Catalog\Model\Entity\Attribute */
+            /** @var \Magento\Catalog\Model\Entity\Attribute $attribute */
             $item = $this->getAttribute($item);
             if (!$item) {
                 continue;
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category.php b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
index 88b0c4d96e80a..f526faa6658da 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
@@ -717,7 +717,7 @@ public function getProductCount($category)
     public function getCategories($parent, $recursionLevel = 0, $sorted = false, $asCollection = false, $toLoad = true)
     {
         $tree = $this->_categoryTreeFactory->create();
-        /* @var $tree \Magento\Catalog\Model\ResourceModel\Category\Tree */
+        /** @var \Magento\Catalog\Model\ResourceModel\Category\Tree $tree */
         $nodes = $tree->loadNode($parent)->loadChildren($recursionLevel)->getChildren();
 
         $tree->addCollectionData(null, $sorted, $parent, $toLoad, true);
@@ -805,7 +805,7 @@ public function getParentDesignCategory($category)
     public function getChildrenCategories($category)
     {
         $collection = $category->getCollection();
-        /* @var $collection \Magento\Catalog\Model\ResourceModel\Category\Collection */
+        /** @var \Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
         $collection->addAttributeToSelect(
             'url_key'
         )->addAttributeToSelect(
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Tree.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Tree.php
index 1089b4b348041..a1e7c9b75c20a 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Tree.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Tree.php
@@ -586,7 +586,7 @@ protected function _createCollectionDataSelect($sorted = true, $optionalAttribut
         }
         $resource = $this->_catalogCategory;
         foreach ($attributes as $attributeCode) {
-            /* @var $attribute \Magento\Eav\Model\Entity\Attribute */
+            /** @var \Magento\Eav\Model\Entity\Attribute $attribute */
             $attribute = $resource->getAttribute($attributeCode);
             // join non-static attribute table
             if (!$attribute->getBackend()->isStatic()) {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Image.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Image.php
index b390bf076f1be..7e55837c6e2bc 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Image.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Image.php
@@ -58,7 +58,7 @@ public function afterSave($object)
         }
 
         try {
-            /** @var $uploader \Magento\MediaStorage\Model\File\Uploader */
+            /** @var \Magento\MediaStorage\Model\File\Uploader $uploader */
             $uploader = $this->_fileUploaderFactory->create(['fileId' => $this->getAttribute()->getName()]);
             $uploader->setAllowedExtensions(['jpg', 'jpeg', 'gif', 'png']);
             $uploader->setAllowRenameFiles(true);
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
index c76f4fe47ee72..9b608c97abe98 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
@@ -739,7 +739,7 @@ protected function _afterLoad()
     protected function prepareStoreId()
     {
         if ($this->getStoreId() !== null) {
-            /** @var $item \Magento\Catalog\Model\Product */
+            /** @var \Magento\Catalog\Model\Product $item */
             foreach ($this->_items as $item) {
                 $item->setStoreId($this->getStoreId());
             }
@@ -756,7 +756,7 @@ protected function prepareStoreId()
     protected function _prepareUrlDataObject()
     {
         $objects = [];
-        /** @var $item \Magento\Catalog\Model\Product */
+        /** @var \Magento\Catalog\Model\Product $item */
         foreach ($this->_items as $item) {
             if ($this->getFlag('do_not_use_category_id')) {
                 $item->setDoNotUseCategoryId(true);
@@ -1139,7 +1139,7 @@ public function getAttributeValueCount($attribute)
      */
     public function getAllAttributeValues($attribute)
     {
-        /** @var $select \Magento\Framework\DB\Select */
+        /** @var \Magento\Framework\DB\Select $select */
         $select = clone $this->getSelect();
         $attribute = $this->getEntity()->getAttribute($attribute);
 
@@ -1403,7 +1403,7 @@ public function addCountToCategories($categoryCollection)
     public function getSetIds()
     {
         $select = clone $this->getSelect();
-        /** @var $select \Magento\Framework\DB\Select */
+        /** @var \Magento\Framework\DB\Select $select */
         $select->reset(Select::COLUMNS);
         $select->reset(Select::ORDER);
         $select->distinct(true);
@@ -1419,7 +1419,7 @@ public function getSetIds()
     public function getProductTypeIds()
     {
         $select = clone $this->getSelect();
-        /** @var $select \Magento\Framework\DB\Select */
+        /** @var \Magento\Framework\DB\Select $select */
         $select->reset(\Magento\Framework\DB\Select::COLUMNS);
         $select->distinct(true);
         $select->columns('type_id');
@@ -2260,9 +2260,9 @@ public function addTierPriceDataByGroupId($customerGroupId)
      */
     private function getTierPriceSelect(array $productIds)
     {
-        /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+        /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
         $attribute = $this->getAttribute('tier_price');
-        /* @var $backend \Magento\Catalog\Model\Product\Attribute\Backend\Tierprice */
+        /** @var \Magento\Catalog\Model\Product\Attribute\Backend\Tierprice $backend */
         $backend = $attribute->getBackend();
         $websiteId = 0;
         if (!$attribute->isScopeGlobal() && null !== $this->getStoreId()) {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php
index 8ca5a1d4ebbd8..d44db2380e936 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php
@@ -180,7 +180,7 @@ protected function _saveValuePrices(AbstractModel $object)
                 foreach ($storeIds as $storeId) {
                     if ($priceType == 'fixed') {
                         $storeCurrency = $this->_storeManager->getStore($storeId)->getBaseCurrencyCode();
-                        /** @var $currencyModel Currency */
+                        /** @var Currency $currencyModel */
                         $currencyModel = $this->_currencyFactory->create();
                         $currencyModel->load($websiteBaseCurrency);
                         $rate = $currencyModel->getRate($storeCurrency);
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Url.php b/app/code/Magento/Catalog/Model/ResourceModel/Url.php
index ba07cf0ed2ef2..46244b9467fe0 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Url.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Url.php
@@ -369,14 +369,14 @@ protected function _prepareStoreRootCategories($stores)
     {
         $rootCategoryIds = [];
         foreach ($stores as $store) {
-            /* @var $store \Magento\Store\Model\Store */
+            /** @var \Magento\Store\Model\Store $store */
             $rootCategoryIds[$store->getRootCategoryId()] = $store->getRootCategoryId();
         }
         if ($rootCategoryIds) {
             $categories = $this->_getCategories($rootCategoryIds);
         }
         foreach ($stores as $store) {
-            /* @var $store \Magento\Store\Model\Store */
+            /** @var \Magento\Store\Model\Store $store */
             $rootCategoryId = $store->getRootCategoryId();
             if (isset($categories[$rootCategoryId])) {
                 $store->setRootCategoryPath($categories[$rootCategoryId]->getPath());
diff --git a/app/code/Magento/Catalog/Model/Rss/Category.php b/app/code/Magento/Catalog/Model/Rss/Category.php
index 92eab08798d68..17e0a4e31b91c 100644
--- a/app/code/Magento/Catalog/Model/Rss/Category.php
+++ b/app/code/Magento/Catalog/Model/Rss/Category.php
@@ -49,7 +49,7 @@ public function __construct(
      */
     public function getProductCollection(\Magento\Catalog\Model\Category $category, $storeId)
     {
-        /** @var $layer \Magento\Catalog\Model\Layer */
+        /** @var \Magento\Catalog\Model\Layer $layer */
         $layer = $this->catalogLayer->setStore($storeId);
         $collection = $category->getResourceCollection();
         $collection->addAttributeToSelect('url_key')
@@ -58,7 +58,7 @@ public function getProductCollection(\Magento\Catalog\Model\Category $category,
             ->addAttributeToFilter('is_active', 1)
             ->addIdFilter($category->getChildren())
             ->load();
-        /** @var $productCollection \Magento\Catalog\Model\ResourceModel\Product\Collection */
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection */
         $productCollection = $this->collectionFactory->create();
 
         $currentCategory = $layer->setCurrentCategory($category);
diff --git a/app/code/Magento/Catalog/Model/Rss/Product/NewProducts.php b/app/code/Magento/Catalog/Model/Rss/Product/NewProducts.php
index 864b2b7fa9323..78644b813b88d 100644
--- a/app/code/Magento/Catalog/Model/Rss/Product/NewProducts.php
+++ b/app/code/Magento/Catalog/Model/Rss/Product/NewProducts.php
@@ -47,7 +47,7 @@ public function __construct(
      */
     public function getProductsCollection($storeId)
     {
-        /** @var $product \Magento\Catalog\Model\Product */
+        /** @var \Magento\Catalog\Model\Product $product */
         $product = $this->productFactory->create();
         $todayStartOfDayDate = $this->localeDate->date()
             ->setTime(0, 0)
@@ -56,7 +56,7 @@ public function getProductsCollection($storeId)
         $todayEndOfDayDate = $this->localeDate->date()
             ->setTime(23, 59, 59)
             ->format('Y-m-d H:i:s');
-        /** @var $products \Magento\Catalog\Model\ResourceModel\Product\Collection */
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $products */
         $products = $product->getResourceCollection();
         $products->setStoreId($storeId);
         $products->addStoreFilter()->addAttributeToFilter(
diff --git a/app/code/Magento/Catalog/Model/Rss/Product/NotifyStock.php b/app/code/Magento/Catalog/Model/Rss/Product/NotifyStock.php
index ae927e6906e6a..d28213a497e92 100644
--- a/app/code/Magento/Catalog/Model/Rss/Product/NotifyStock.php
+++ b/app/code/Magento/Catalog/Model/Rss/Product/NotifyStock.php
@@ -56,11 +56,11 @@ public function __construct(
      */
     public function getProductsCollection()
     {
-        /* @var $product \Magento\Catalog\Model\Product */
+        /** @var \Magento\Catalog\Model\Product $product */
         $product = $this->productFactory->create();
-        /* @var $collection \Magento\Catalog\Model\ResourceModel\Product\Collection */
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
         $collection = $product->getCollection();
-        /** @var $resourceStock \Magento\CatalogInventory\Model\ResourceModel\Stock */
+        /** @var \Magento\CatalogInventory\Model\ResourceModel\Stock $resourceStock */
         $resourceStock = $this->stockFactory->create();
         $resourceStock->addLowStockFilter(
             $collection,
diff --git a/app/code/Magento/Catalog/Model/Rss/Product/Special.php b/app/code/Magento/Catalog/Model/Rss/Product/Special.php
index 8e46fb227fb5d..b0019e6a7c5d3 100644
--- a/app/code/Magento/Catalog/Model/Rss/Product/Special.php
+++ b/app/code/Magento/Catalog/Model/Rss/Product/Special.php
@@ -42,7 +42,7 @@ public function getProductsCollection($storeId, $customerGroupId)
     {
         $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
 
-        /** @var $product \Magento\Catalog\Model\Product */
+        /** @var \Magento\Catalog\Model\Product $product */
         $product = $this->productFactory->create();
         $product->setStoreId($storeId);
 
diff --git a/app/code/Magento/Catalog/Observer/ImageResizeAfterProductSave.php b/app/code/Magento/Catalog/Observer/ImageResizeAfterProductSave.php
index 02a2184bdac49..2eacc53ecda99 100644
--- a/app/code/Magento/Catalog/Observer/ImageResizeAfterProductSave.php
+++ b/app/code/Magento/Catalog/Observer/ImageResizeAfterProductSave.php
@@ -80,7 +80,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             return;
         }
 
-        /** @var $product \Magento\Catalog\Model\Product */
+        /** @var \Magento\Catalog\Model\Product $product */
         $product = $observer->getEvent()->getProduct();
 
         if ($this->state->isAreaCodeEmulated()) {
diff --git a/app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php b/app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php
index e52913775692c..17380853cb682 100644
--- a/app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php
+++ b/app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php
@@ -36,7 +36,7 @@ public function __construct(TimezoneInterface $localeDate)
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
-        /** @var  $product \Magento\Catalog\Model\Product */
+        /** @var \Magento\Catalog\Model\Product $product */
         $product = $observer->getEvent()->getProduct();
         if ($product->getSpecialPrice() && $product->getSpecialFromDate() === null) {
             // Set the special_from_date to the current date with time 00:00:00 when a special price is defined
diff --git a/app/code/Magento/Catalog/Pricing/Price/ConfiguredOptions.php b/app/code/Magento/Catalog/Pricing/Price/ConfiguredOptions.php
index 24d9f088e828b..9393781ee04ab 100644
--- a/app/code/Magento/Catalog/Pricing/Price/ConfiguredOptions.php
+++ b/app/code/Magento/Catalog/Pricing/Price/ConfiguredOptions.php
@@ -32,7 +32,7 @@ public function getItemOptionsValue(float $basePrice, ItemInterface $item): floa
                 $option = $product->getOptionById($optionId);
                 if ($option !== null) {
                     $itemOption = $item->getOptionByCode('option_' . $option->getId());
-                    /** @var $group \Magento\Catalog\Model\Product\Option\Type\DefaultType */
+                    /** @var \Magento\Catalog\Model\Product\Option\Type\DefaultType $group */
                     $group = $option->groupFactory($option->getType())
                         ->setOption($option)
                         ->setConfigurationItem($item)
diff --git a/app/code/Magento/Catalog/Pricing/Price/ConfiguredPrice.php b/app/code/Magento/Catalog/Pricing/Price/ConfiguredPrice.php
index 9b108c62ce4c4..f3cfb06e44f82 100644
--- a/app/code/Magento/Catalog/Pricing/Price/ConfiguredPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/ConfiguredPrice.php
@@ -82,7 +82,7 @@ protected function getOptionsValue(): float
                 $option = $product->getOptionById($optionId);
                 if ($option) {
                     $itemOption = $this->item->getOptionByCode('option_' . $option->getId());
-                    /** @var $group \Magento\Catalog\Model\Product\Option\Type\DefaultType */
+                    /** @var \Magento\Catalog\Model\Product\Option\Type\DefaultType $group */
                     $group = $option->groupFactory($option->getType())
                         ->setOption($option)
                         ->setConfigurationItem($this->item)
diff --git a/app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php b/app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php
index 9086bb13966f7..f23199b118fce 100644
--- a/app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php
@@ -75,7 +75,7 @@ public function getValue($priceCode = \Magento\Catalog\Pricing\Price\BasePrice::
         $optionValues = [];
         $options = $this->product->getOptions();
         if ($options) {
-            /** @var $optionItem \Magento\Catalog\Model\Product\Option */
+            /** @var \Magento\Catalog\Model\Product\Option $optionItem */
             foreach ($options as $optionItem) {
                 $min = null;
                 if (!$optionItem->getIsRequire()) {
@@ -93,7 +93,7 @@ public function getValue($priceCode = \Magento\Catalog\Pricing\Price\BasePrice::
                         $max = $price;
                     }
                 } else {
-                    /** @var $optionValue \Magento\Catalog\Model\Product\Option\Value */
+                    /** @var \Magento\Catalog\Model\Product\Option\Value $optionValue */
                     foreach ($optionItem->getValues() as $optionValue) {
                         $price =
                             $this->customOptionPriceCalculator->getOptionPriceByPriceCode($optionValue, $priceCode);
@@ -226,9 +226,9 @@ public function getOptions()
         $this->priceOptions = [];
         $options = $this->product->getOptions();
         if ($options) {
-            /** @var $optionItem \Magento\Catalog\Model\Product\Option */
+            /** @var \Magento\Catalog\Model\Product\Option $optionItem */
             foreach ($options as $optionItem) {
-                /** @var $optionValue \Magento\Catalog\Model\Product\Option\Value */
+                /** @var \Magento\Catalog\Model\Product\Option\Value $optionValue */
                 foreach ($optionItem->getValues() as $optionValue) {
                     $price = $optionValue->getPrice($optionValue->getPriceType() == Value::TYPE_PERCENT);
                     $this->priceOptions[$optionValue->getId()][$price] = [
diff --git a/app/code/Magento/Catalog/Pricing/Render/ConfiguredPriceBox.php b/app/code/Magento/Catalog/Pricing/Render/ConfiguredPriceBox.php
index 7efe66f2831b8..734f2912bba9d 100644
--- a/app/code/Magento/Catalog/Pricing/Render/ConfiguredPriceBox.php
+++ b/app/code/Magento/Catalog/Pricing/Render/ConfiguredPriceBox.php
@@ -70,9 +70,9 @@ public function __construct(
      */
     protected function _prepareLayout()
     {
-        /** @var $price \Magento\Catalog\Pricing\Price\ConfiguredPrice */
+        /** @var \Magento\Catalog\Pricing\Price\ConfiguredPrice $price */
         $price = $this->getPrice();
-        /** @var $renderBlock \Magento\Catalog\Pricing\Render */
+        /** @var \Magento\Catalog\Pricing\Render $renderBlock */
         $renderBlock = $this->getRenderBlock();
         if ($renderBlock && $renderBlock->getItem() instanceof ItemInterface) {
             $price->setItem($renderBlock->getItem());
diff --git a/app/code/Magento/Catalog/Ui/Component/Product/Form/Categories/Options.php b/app/code/Magento/Catalog/Ui/Component/Product/Form/Categories/Options.php
index 78dd6a20fa536..7ff92185a5232 100644
--- a/app/code/Magento/Catalog/Ui/Component/Product/Form/Categories/Options.php
+++ b/app/code/Magento/Catalog/Ui/Component/Product/Form/Categories/Options.php
@@ -59,7 +59,7 @@ protected function getCategoriesTree()
     {
         if ($this->categoriesTree === null) {
             $storeId = $this->request->getParam('store');
-            /* @var $matchingNamesCollection \Magento\Catalog\Model\ResourceModel\Category\Collection */
+            /** @var \Magento\Catalog\Model\ResourceModel\Category\Collection $matchingNamesCollection */
             $matchingNamesCollection = $this->categoryCollectionFactory->create();
 
             $matchingNamesCollection->addAttributeToSelect('path')
@@ -76,7 +76,7 @@ protected function getCategoriesTree()
                 }
             }
 
-            /* @var $collection \Magento\Catalog\Model\ResourceModel\Category\Collection */
+            /** @var \Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
             $collection = $this->categoryCollectionFactory->create();
 
             $collection->addAttributeToFilter('entity_id', ['in' => array_keys($shownCategoriesIds)])
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php
index 85333e0b736fa..f28eb4befc9db 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php
@@ -405,7 +405,7 @@ private function getCategoriesTreeCacheId(int $storeId, string $filter = ''): st
      */
     private function retrieveShownCategoriesIds(int $storeId, string $filter = '') : array
     {
-        /* @var $matchingNamesCollection \Magento\Catalog\Model\ResourceModel\Category\Collection */
+        /** @var \Magento\Catalog\Model\ResourceModel\Category\Collection $matchingNamesCollection */
         $matchingNamesCollection = $this->categoryCollectionFactory->create();
 
         if (!empty($filter)) {
@@ -441,7 +441,7 @@ private function retrieveShownCategoriesIds(int $storeId, string $filter = '') :
      */
     private function retrieveCategoriesTree(int $storeId, array $shownCategoriesIds) : ?array
     {
-        /* @var $collection \Magento\Catalog\Model\ResourceModel\Category\Collection */
+        /** @var \Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
         $collection = $this->categoryCollectionFactory->create();
 
         $collection->addAttributeToFilter('entity_id', ['in' => array_keys($shownCategoriesIds)])
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
index b93124ece8a33..f4013f3a99e94 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Catalog\Block\Adminhtml\Category\Tree */
+/** @var \Magento\Catalog\Block\Adminhtml\Category\Tree $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php $root = $block->getRoot(); ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml
index 616ca4df8c1bc..1a762f0b77fe7 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml
@@ -5,11 +5,11 @@
  */
 ?>
 <?php
-/** @var $block \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element */
+/** @var \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php
-/* @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element */
+/** @var \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element $block */
 $element = $block->getElement();
 $note = $element->getNote() ?
     '<div class="note admin__field-note">' . $block->escapeHtml($element->getNote()) . '</div>' : '';
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml
index 6cb52de7c067d..14e2fde17d0bb 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml
@@ -7,7 +7,7 @@ use Magento\Catalog\Helper\Data;
 
 /** @var \Magento\Backend\Block\Template $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
-/** @var $escaper \Magento\Framework\Escaper */
+/** @var \Magento\Framework\Escaper $escaper */
 ?>
 
 <?php
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml
index cc86cf21eceeb..03a7132876083 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Labels  */
+/** @var \Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Labels $block */
 ?>
 
 <div class="fieldset-wrapper admin__collapsible-block-wrapper opened" id="manage-titles-wrapper">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml
index d5a4fba2178a2..61d0e779031f9 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main */
+/** @var Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 /** @var \Magento\Framework\Escaper $escaper */
 ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options.phtml
index a5ea0b0ad4824..054ef4401457b 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options.phtml
@@ -5,7 +5,7 @@
  */
 ?>
 
-<?php /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Options */ ?>
+<?php /** @var \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Options $block */ ?>
 <?php $options = $block->decorateArray($block->getOptions()); ?>
 <?php if (count($options)) :?>
 
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
index e2c4879601f8e..816e1cc5d198d 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Date */
+/** @var \Magento\Catalog\Block\Product\View\Options\Type\Date $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 /** @var \Magento\Framework\Escaper $escaper */
 ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/default.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/default.phtml
index 8839f435ac56b..542687f38c90d 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/default.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/default.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 ?>
-<?php /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Options */ ?>
+<?php /** @var \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Options $block */ ?>
 <?php $option = $block->getOption(); ?>
 <div class="admin__field field">
     <label class="admin__field-label label">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
index 656ae3e860ebb..cb6399b65c452 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/* @var $block \Magento\Catalog\Block\Product\View\Options\Type\File */
+/** @var \Magento\Catalog\Block\Product\View\Options\Type\File $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php $_option = $block->getOption(); ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml
index 7b3bca0b04034..235b730167782 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 ?>
-<?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Select */ ?>
+<?php /** @var \Magento\Catalog\Block\Product\View\Options\Type\Select $block */ ?>
 <?php $_option = $block->getOption(); ?>
 <div class="admin__field field<?= $_option->getIsRequire() ? ' _required' : '' ?>">
     <label class="label admin__field-label">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml
index 570d614453d46..74b97c5d4d6a1 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 ?>
-<?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Text */ ?>
+<?php /** @var \Magento\Catalog\Block\Product\View\Options\Type\Text $block */ ?>
 <?php $_option = $block->getOption(); ?>
 <div class="field admin__field<?= $_option->getIsRequire() ? ' required _required' : '' ?>">
     <label class="admin__field-label label">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/qty.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/qty.phtml
index 0ff5224f863b8..175831f3329e1 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/qty.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/qty.phtml
@@ -5,7 +5,7 @@
  */
 ?>
 
-<?php /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Qty */ ?>
+<?php /** @var \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Qty $block */ ?>
 
 <fieldset id="product_composite_configure_fields_qty"
           class="fieldset product-composite-qty-block admin__fieldset <?= $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml
index e8b98934451a1..ef4a2cd09a4aa 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute */
+/** @var Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute $block */
 ?>
 
 <form action="<?= $block->escapeUrl($block->getSaveUrl()) ?>"
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml
index bc05586b7b567..f625d29ce4132 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute\Tab\Websites */
+/** @var Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute\Tab\Websites $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml
index 4e0d96f466d78..ecb7e501d26fc 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml
@@ -7,7 +7,7 @@
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 // phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
 
-/* @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\AttributeSet */
+/** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\AttributeSet $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <script id="product-template-selector-template" type="text/x-magento-template">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml
index 6598d2da848a8..5f0878e3aefe7 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml
@@ -3,7 +3,7 @@
  * Copyright 2014 Adobe
  * All Rights Reserved.
  */
-/* @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\NewCategory */
+/** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\NewCategory $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div id="<?= $block->escapeHtmlAttr($block->getNameInLayout()) ?>">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml
index 05227715c634e..43aa5f4790d6f 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options */
+/** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
index 70fd512acd2e2..e823b8393c9c6 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
@@ -7,7 +7,7 @@
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 // phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
 
-/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Option */
+/** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Option $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?= $block->getTemplatesHtml() ?>
@@ -143,7 +143,7 @@ jQuery(function ($) {
     fieldSet.customOptions({$customOptions});
     //adding data to templates
 script;
-/** @var $_value \Magento\Framework\DataObject */
+/** @var \Magento\Framework\DataObject $_value */
 foreach ($block->getOptionValues() as $_value):
     $scriptString .= " fieldSet.customOptions('addOption', " . /* @noEscape */ $_value->toJson() . ');' . PHP_EOL;
 endforeach;
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml
index a3b1c5d288217..36964990641ed 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml
@@ -6,7 +6,7 @@
 
 // phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
 ?>
-<?php /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Date */ ?>
+<?php /** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Date $block */ ?>
 <script id="custom-option-date-type-template" type="text/x-magento-template">
     <div id="product_option_<%- data.option_id %>_type_<%- data.group %>" class="fieldset">
         <table class="data-table">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml
index 3217bd3e6b449..81f1c96ef1039 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml
@@ -5,7 +5,7 @@
  */
 
 // phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
-/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\File */
+/** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\File $block */
 ?>
 <script id="custom-option-file-type-template" type="text/x-magento-template">
     <div id="product_option_<%- data.option_id %>_type_<%- data.group %>" class="fieldset">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/select.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/select.phtml
index 32903ba1181ba..9a79421c94d6e 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/select.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/select.phtml
@@ -6,7 +6,7 @@
 
 // phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
 ?>
-<?php /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Select */ ?>
+<?php /** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Select $block */ ?>
 <script id="custom-option-select-type-template" type="text/x-magento-template">
     <div id="product_option_<%- data.option_id %>_type_<%- data.group %>" class="fieldset">
         <table class="data-table">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/text.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/text.phtml
index 514d86be197de..9acaa82362d15 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/text.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/text.phtml
@@ -6,7 +6,7 @@
 
 // phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
 ?>
-<?php /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Text */ ?>
+<?php /** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Text $block */ ?>
 <script id="custom-option-text-type-template" type="text/x-magento-template">
     <div id="product_option_<%- data.option_id %>_type_<%- data.group %>" class="fieldset">
         <table class="data-table">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml
index 39225f46329d3..6422611d5dff3 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml
@@ -6,7 +6,7 @@
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 
-/* @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Tier */
+/** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Tier $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 $element = $block->getElement();
 ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/serializer.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/serializer.phtml
index dd09df81304e1..c7ba85bcfe9a8 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/serializer.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/serializer.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Ajax\Serializer */
+/** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Ajax\Serializer $block */
 ?>
 
 // phpcs:disable Magento2.Security.InsecureFunction.DiscouragedWithAlternative
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml
index 04546e1c1fb52..809c1f305d712 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Websites */
+/** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Websites $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <fieldset id="grop_fields" class="fieldset">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml
index b1694c714e3e1..2d49cc5a54e53 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml
@@ -5,7 +5,7 @@
  */
 
 // phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
-/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content */
+/** @var \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 $elementName = $block->getElement()->getName() . '[images]';
 $formName = $block->getFormName();
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
index a2c251c0a0f46..9762f3cf37758 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Inventory */
+/** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Inventory $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php if ($block->isReadonly()):?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml
index 6561dfda88049..7ffd41bea74e9 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml
@@ -5,7 +5,7 @@
  */
 
 // phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
-/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes\Search */
+/** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes\Search $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div id="product-attribute-search-container" class="suggest-expandable attribute-selector">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs.phtml
index 4b8e4eadcde14..7a99249f447e2 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs */
+/** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs $block */
 ?>
 <?php if (!empty($tabs)) :?>
     <?php $tabGroups = [
@@ -55,7 +55,7 @@
 
                 <ul <?= /* @noEscape */ $block->getUiId('tab', $tabGroupId) ?> class="tabs admin__page-nav-items" data-role="content">
                     <?php foreach ($tabs as $_tab) :?>
-                        <?php /** @var $_tab \Magento\Backend\Block\Widget\Tab\TabInterface */ ?>
+                        <?php /** @var \Magento\Backend\Block\Widget\Tab\TabInterface $_tab */ ?>
                         <?php if (!$block->canShowTab($_tab) || $_tab->getParentTab()
                             || ($_tab->getGroupCode() && $_tab->getGroupCode() != $tabGroupCode)
                             || (!$_tab->getGroupCode() && $isBasic)) : continue;
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs/child_tab.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs/child_tab.phtml
index 8e47d7bb64418..36a4d01b5c44d 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs/child_tab.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs/child_tab.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\ChildTab */
+/** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\ChildTab $block */
 ?>
 <div class="fieldset-wrapper admin__collapsible-block-wrapper" data-tab="<?= /* @noEscape */ $block->getTabId() ?>"
      id="<?= /* @noEscape */ $block->getTabId() ?>-wrapper" data-mage-init='{"collapsible":{
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml
index 0e1802dd8f959..7ca5d5307b506 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Grid */
+/** @var \Magento\Catalog\Block\Adminhtml\Product\Grid $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div id="<?= $block->getHtmlId() ?>" class="admin__grid-massaction">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
index c5711feec7647..ccb02030000b4 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Backend\Block\Template */
+/** @var \Magento\Backend\Block\Template $block */
 ?>
 <script type="text/x-magento-init">
     {
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/rss/grid/link.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/rss/grid/link.phtml
index e8c834750fc81..01ff1dd07c98d 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/rss/grid/link.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/rss/grid/link.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Catalog\Block\Adminhtml\Rss\Grid\Link */
+/** @var \Magento\Catalog\Block\Adminhtml\Rss\Grid\Link $block */
 ?>
 <?php if ($block->isRssAllowed() && $block->getLink()) :?>
 <a href="<?= $block->escapeUrl($block->getLink()) ?>" class="link-feed"><?= $block->escapeHtml($block->getLabel()) ?></a>
diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml
index d8073929c847c..ceb89a918d510 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml
@@ -5,7 +5,7 @@
  */
 ?>
 
-<?php /** @var $block \Magento\Framework\Pricing\Render\Amount */ ?>
+<?php /** @var \Magento\Framework\Pricing\Render\Amount $block */ ?>
 
 <span class="price-container <?= $block->escapeHtmlAttr($block->getAdjustmentCssClasses()) ?>"
         <?= $block->getSchema() ? ' itemprop="offers" itemscope itemtype="http://schema.org/Offer"' : '' ?>>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/rss.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/rss.phtml
index edcf545674406..cf6bf6112cf0e 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/rss.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/rss.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Catalog\Block\Category\Rss\Link */
+/** @var \Magento\Catalog\Block\Category\Rss\Link $block */
 ?>
 <?php if ($block->isRssAllowed() && $block->getLink() && $block->isTopCategory()) :?>
     <a href="<?= $block->escapeUrl($block->getLink()) ?>"
diff --git a/app/code/Magento/Catalog/view/frontend/templates/frontend_storage_manager.phtml b/app/code/Magento/Catalog/view/frontend/templates/frontend_storage_manager.phtml
index 004bfb930d1b3..b678cd5367906 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/frontend_storage_manager.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/frontend_storage_manager.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block Magento\Catalog\Block\FrontendStorageManager */
+/** @var Magento\Catalog\Block\FrontendStorageManager $block */
 ?>
 <script type="text/x-magento-init">
         {
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml
index 685bbbe50df96..5047c33ef7d93 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block Magento\Framework\View\Element\Template */
+/** @var Magento\Framework\View\Element\Template $block */
 ?>
 <li class="item link compare" data-bind="scope: 'compareProducts'" data-role="compare-products-link">
     <a class="action compare no-display" title="<?= $block->escapeHtmlAttr(__('Compare Products')) ?>"
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
index cd4d82da939d5..a6ea6b0017443 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
@@ -8,7 +8,7 @@
 // phpcs:disable PSR2.ControlStructures.SwitchDeclaration
 // phpcs:disable Generic.WhiteSpace.ScopeIndent
 
-/* @var $block \Magento\Catalog\Block\Product\Compare\ListCompare */
+/** @var \Magento\Catalog\Block\Product\Compare\ListCompare $block */
 ?>
 <?php $total = $block->getItems()->getSize() ?>
 <?php if ($total) :?>
@@ -45,7 +45,7 @@
                 <tr>
                     <?php $index = 0; ?>
                     <?php $helper = $this->helper(Magento\Catalog\Helper\Output::class); ?>
-                    <?php /** @var $item \Magento\Catalog\Model\Product */ ?>
+                    <?php /** @var \Magento\Catalog\Model\Product $item */ ?>
                     <?php foreach ($block->getItems() as $item) :?>
                         <?php if ($index++ == 0) :?>
                             <th scope="row" class="cell label product">
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
index 666bd9e277af1..5d6773a191600 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
@@ -6,7 +6,7 @@
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 
-/* @var $block \Magento\Framework\View\Element\Template */
+/** @var \Magento\Framework\View\Element\Template $block */
 ?>
 <div class="block block-compare" data-bind="scope: 'compareProducts'" data-role="compare-products-sidebar">
     <div class="block-title">
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml
index f2d4f10d018f8..0e385306bb6c2 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml
@@ -5,8 +5,8 @@
  */
 ?>
 <?php
-/** @var $block \Magento\Catalog\Block\Product\Image */
-/** @var $escaper \Magento\Framework\Escaper */
+/** @var \Magento\Catalog\Block\Product\Image $block */
+/** @var \Magento\Framework\Escaper $escaper */
 ?>
 <!--deprecated template as image_with_borders is a primary one-->
 <img class="photo image <?= $escaper->escapeHtmlAttr($block->getClass()) ?>"
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
index ba0ab0c91f393..ad2842fc48be1 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
@@ -5,8 +5,8 @@
  */
 ?>
 <?php
-/** @var $block \Magento\Catalog\Block\Product\Image */
-/** @var $escaper \Magento\Framework\Escaper */
+/** @var \Magento\Catalog\Block\Product\Image $block */
+/** @var \Magento\Framework\Escaper $escaper */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 $width = (int)$block->getWidth();
 $height = (int)$block->getHeight();
@@ -35,7 +35,7 @@ $styles = <<<STYLE
     height: 100%;
     width: 100%;
 }
-@supports not (aspect-ratio: auto) { 
+@supports not (aspect-ratio: auto) {
     .product-image-container-{$block->getProductId()} span.product-image-wrapper {
         padding-bottom: {$paddingBottom}%;
     }
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
index 1cdb359130da8..bf0637f066777 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
@@ -46,7 +46,7 @@ $_helper = $block->getData('outputHelper');
     ?>
     <div class="products wrapper <?= /* @noEscape */ $viewMode ?> products-<?= /* @noEscape */ $viewMode ?>">
         <ol class="products list items product-items">
-            <?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
+            <?php /** @var \Magento\Catalog\Model\Product $_product */ ?>
             <?php foreach ($_productCollection as $_product): ?>
             <li class="item product product-item">
                 <div class="product-item-info"
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/addto/compare.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/addto/compare.phtml
index 7949ff6e3d21a..9c0826293fccd 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/addto/compare.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/addto/compare.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block Magento\Catalog\Block\Product\ProductList\Item\AddTo\Compare */
+/** @var Magento\Catalog\Block\Product\ProductList\Item\AddTo\Compare $block */
 ?>
 <a href="#"
    class="action tocompare"
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
index b2ffc1cd93825..ab917c6e7035a 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
@@ -7,7 +7,7 @@
 use Magento\Catalog\ViewModel\Product\Listing\PreparePostData;
 use Magento\Framework\App\ActionInterface;
 
-/* @var $block \Magento\Catalog\Block\Product\AbstractProduct */
+/** @var \Magento\Catalog\Block\Product\AbstractProduct $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
@@ -261,7 +261,7 @@ $_item = null;
                                                         </button>
                                                     <?php else :?>
                                                         <?php
-                                                        /** @var $viewModel PreparePostData */
+                                                        /** @var PreparePostData $viewModel */
                                                         $viewModel = $block->getViewModel();
                                                         $postArray = $viewModel->getPostData(
                                                             $block->escapeUrl($block->getAddToCartUrl($_item)),
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/additional.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/additional.phtml
index 6c8a62aecb6b2..deed122077265 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/additional.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/additional.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Catalog\Block\Product\View\Additional */
+/** @var \Magento\Catalog\Block\Product\View\Additional $block */
 ?>
 <?php foreach ($block->getChildHtmlList() as $_html) :?>
     <?= /* @noEscape */ $_html ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml
index fe35f3563c944..fefe0a16c2517 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Catalog\Block\Product\View\Addto\Compare */
+/** @var \Magento\Catalog\Block\Product\View\Addto\Compare $block */
 ?>
 
 <?php $viewModel = $block->getData('addToCompareViewModel'); ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
index 5eba48884e01a..5876c4823aff7 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Catalog\Block\Product\View */
+/** @var \Magento\Catalog\Block\Product\View $block */
 ?>
 <?php $_product = $block->getProduct(); ?>
 <?php $buttonTitle = __('Add to Cart'); ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/currency.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/currency.phtml
index 2759539e240ce..5edaa48be4d8f 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/currency.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/currency.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Directory\Block\Currency */
+/** @var \Magento\Directory\Block\Currency $block */
 ?>
 <meta property="product:price:currency"
       content="<?= /* @noEscape */ $block->stripTags($block->getCurrentCurrencyCode()) ?>"/>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml
index bfd1b3132df5a..66d2e71a24ede 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml
@@ -4,8 +4,8 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Catalog\Block\Product\View */
-/** @var $escaper \Magento\Framework\Escaper */
+/** @var \Magento\Catalog\Block\Product\View $block */
+/** @var \Magento\Framework\Escaper $escaper */
 
 $product = $block->getProduct();
 ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
index 1a2cac012fb7d..8b3c5ab7f1867 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/* @var $block \Magento\Catalog\Block\Product\View\Options */
+/** @var \Magento\Catalog\Block\Product\View\Options $block */
 ?>
 
 <?php $_options = $block->decorateArray($block->getOptions()) ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml
index 90b01176d71d1..0eb3856224834 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 ?>
-<?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Date */ ?>
+<?php /** @var \Magento\Catalog\Block\Product\View\Options\Type\Date $block */ ?>
 <?php $_option = $block->getOption() ?>
 <?php $_optionId = $block->escapeHtmlAttr($_option->getId()) ?>
 <?php $class = ($_option->getIsRequire()) ? ' required' : ''; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
index 26650f4c0ce8e..ba40bab85aec8 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/* @var $block \Magento\Catalog\Block\Product\View\Options\Type\File */
+/** @var \Magento\Catalog\Block\Product\View\Options\Type\File $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php $_option = $block->getOption(); ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/select.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/select.phtml
index 4a5f984fed3a9..12373649fb29e 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/select.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/select.phtml
@@ -5,7 +5,7 @@
  */
 ?>
 
-<?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Select */ ?>
+<?php /** @var \Magento\Catalog\Block\Product\View\Options\Type\Select $block */ ?>
 <?php
 $_option = $block->getOption();
 $class = ($_option->getIsRequire()) ? ' required' : '';
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml
index 10ecdd89dc8d0..d2b2cabb1c718 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 ?>
-<?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Text */ ?>
+<?php /** @var \Magento\Catalog\Block\Product\View\Options\Type\Text $block */ ?>
 <?php
 $_option = $block->getOption();
 $class = ($_option->getIsRequire()) ? ' required' : '';
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper.phtml
index 39f7dfe4e549e..2dd1b1a748575 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block Magento\Catalog\Block\Product\View */
+/** @var Magento\Catalog\Block\Product\View $block */
 ?>
 <?php
 $required = '';
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/review.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/review.phtml
index 03293201fd77b..043e3ff3bf4db 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/review.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/review.phtml
@@ -4,5 +4,5 @@
  * All Rights Reserved.
  */
 ?>
-<?php /** @var $block \Magento\Catalog\Block\Product\AbstractProduct */ ?>
+<?php /** @var \Magento\Catalog\Block\Product\AbstractProduct $block */ ?>
 <?= $block->getReviewsSummaryHtml($block->getProduct(), false, true) ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/type/default.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/type/default.phtml
index 386d277e3fdf0..6a8c3898bb6ea 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/type/default.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/type/default.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 ?>
-<?php /* @var $block \Magento\Catalog\Block\Product\View\AbstractView */?>
+<?php /** @var \Magento\Catalog\Block\Product\View\AbstractView $block */?>
 <?php $_product = $block->getProduct() ?>
 
 <?php if ($block->displayProductStockStatus()) :?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/grid.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/grid.phtml
index 642b39fdaa711..d2a0618475126 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/grid.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/grid.phtml
@@ -7,7 +7,7 @@
 <?php
 // phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
 
-/** @var $block \Magento\Ui\Block\Wrapper */
+/** @var \Magento\Ui\Block\Wrapper $block */
 ?>
 
 <?php /* @noEscape */ echo $block->renderApp(
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/list.phtml
index f46cf169d30fe..bf193d6758a26 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/list.phtml
@@ -7,7 +7,7 @@
 <?php
 // phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
 
-/** @var $block \Magento\Ui\Block\Wrapper */
+/** @var \Magento\Ui\Block\Wrapper $block */
 ?>
 
 <?php /* @noEscape */ echo $block->renderApp(
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/sidebar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/sidebar.phtml
index edf03960f638f..ddccd96d1d3d9 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/sidebar.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/sidebar.phtml
@@ -7,7 +7,7 @@
 <?php
 // phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
 
-/** @var $block \Magento\Ui\Block\Wrapper */
+/** @var \Magento\Ui\Block\Wrapper $block */
 ?>
 
 <?php /* @noEscape */ echo $block->renderApp(
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/grid.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/grid.phtml
index 2cd50a1ac8083..47f0d907e0a5a 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/grid.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/grid.phtml
@@ -8,7 +8,7 @@
 // phpcs:disable Magento2.Security.LanguageConstruct.DirectOutput
 // phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
 
-/** @var $block \Magento\Ui\Block\Wrapper */
+/** @var \Magento\Ui\Block\Wrapper $block */
 ?>
 
 <?php /* @noEscape */ echo $block->renderApp([
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/list.phtml
index 3d97becf256c6..9d85f0d9e4a2a 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/list.phtml
@@ -8,7 +8,7 @@
 // phpcs:disable Magento2.Security.LanguageConstruct.DirectOutput
 // phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
 
-/** @var $block \Magento\Ui\Block\Wrapper */
+/** @var \Magento\Ui\Block\Wrapper $block */
 ?>
 
 <?php /* @noEscape */ echo $block->renderApp([
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/sidebar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/sidebar.phtml
index 4972b8d2ebc08..490bbd251643a 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/sidebar.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/sidebar.phtml
@@ -7,7 +7,7 @@
 <?php
 // phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
 
-/** @var $block \Magento\Ui\Block\Wrapper */
+/** @var \Magento\Ui\Block\Wrapper $block */
 ?>
 
 <?php /* @noEscape */ echo $block->renderApp(
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CategoryHtmlAttribute.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CategoryHtmlAttribute.php
index c0a0a52063755..7cb4899911c35 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CategoryHtmlAttribute.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CategoryHtmlAttribute.php
@@ -47,7 +47,7 @@ public function resolve(
             throw new LocalizedException(__('"model" value should be specified'));
         }
 
-        /* @var $category Category */
+        /** @var Category $category */
         $category = $value['model'];
         $fieldName = $field->getName();
         $renderedValue = $this->outputHelper->categoryAttribute($category, $category->getData($fieldName), $fieldName);
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductComplexTextAttribute.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductComplexTextAttribute.php
index 38f3c334f7b11..44d17d192f07f 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductComplexTextAttribute.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductComplexTextAttribute.php
@@ -47,7 +47,7 @@ public function resolve(
             throw new LocalizedException(__('"model" value should be specified'));
         }
 
-        /* @var $product Product */
+        /** @var Product $product */
         $product = $value['model'];
         $fieldName = $field->getName();
         $renderedValue = $this->outputHelper->productAttribute($product, $product->getData($fieldName), $fieldName);
diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
index ba352d26ef017..5bb5a76ee1483 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -477,7 +477,7 @@ protected function initAttributeSets()
     protected function initCategories()
     {
         $collection = $this->_categoryColFactory->create()->addNameToResult();
-        /* @var $collection \Magento\Catalog\Model\ResourceModel\Category\Collection */
+        /** @var \Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
         $collection->setStoreId(\Magento\Store\Model\Store::DEFAULT_STORE_ID);
         foreach ($collection as $category) {
             $structure = preg_split('#/+#', $category->getPath());
@@ -551,7 +551,7 @@ protected function initTypeModels()
      */
     protected function initWebsites()
     {
-        /** @var $website \Magento\Store\Model\Website */
+        /** @var \Magento\Store\Model\Website $website */
         foreach ($this->_storeManager->getWebsites() as $website) {
             $this->_websiteIdToCode[$website->getId()] = $website->getCode();
         }
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 328a4a3b1a52f..600dca2728255 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -1069,7 +1069,7 @@ public function getOptionEntity()
     public function getMediaGalleryAttributeId()
     {
         if (!$this->_mediaGalleryAttributeId) {
-            /** @var $resource \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModel */
+            /** @var \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModel $resource */
             $resource = $this->_resourceFactory->create();
             $this->_mediaGalleryAttributeId = $resource->getAttribute(self::MEDIA_GALLERY_ATTRIBUTE_CODE)->getId();
         }
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php
index aba9bc5801d8e..146399638ba20 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php
@@ -78,7 +78,7 @@ protected function initCategories()
                 ->addAttributeToSelect('url_key')
                 ->addAttributeToSelect('url_path');
             $collection->setStoreId(\Magento\Store\Model\Store::DEFAULT_STORE_ID);
-            /* @var $collection \Magento\Catalog\Model\ResourceModel\Category\Collection */
+            /** @var \Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
             foreach ($collection as $category) {
                 $structure = explode(self::DELIMITER_CATEGORY, $category->getPath());
                 $pathSize = count($structure);
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
index aebd029471a9e..be9482648b45f 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
@@ -542,7 +542,7 @@ protected function _initStores(array $data)
         if (isset($data['stores'])) {
             $this->_storeCodeToId = $data['stores'];
         } else {
-            /** @var $store Store */
+            /** @var Store $store */
             foreach ($this->_storeManager->getStores(true) as $store) {
                 $this->_storeCodeToId[$store->getCode()] = $store->getId();
             }
@@ -626,7 +626,7 @@ protected function _initOldCustomOptions()
                         ];
                     }
                 };
-                /** @var $collection \Magento\Catalog\Model\ResourceModel\Product\Option\Collection */
+                /** @var \Magento\Catalog\Model\ResourceModel\Product\Option\Collection $collection */
                 $this->_optionCollection->reset();
                 $this->_optionCollection->getSelect()->join(
                     ['option_title' => $optionTitleTable],
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
index 552bb12108b8a..b5dd19ab14c92 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
@@ -57,7 +57,7 @@ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeMan
      */
     protected function _initWebsites()
     {
-        /** @var $website \Magento\Store\Model\Website */
+        /** @var \Magento\Store\Model\Website $website */
         foreach ($this->storeManager->getWebsites() as $website) {
             $this->websiteCodeToId[$website->getCode()] = $website->getId();
             $this->websiteCodeToStoreIds[$website->getCode()] = array_flip($website->getStoreCodes());
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/TaxClassProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/TaxClassProcessor.php
index 75e5a9991ed84..6ea84dcadce0b 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/TaxClassProcessor.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/TaxClassProcessor.php
@@ -73,7 +73,7 @@ protected function initTaxClasses()
         if (empty($this->taxClasses)) {
             $collection = $this->collectionFactory->create();
             $collection->addFieldToFilter('class_type', ClassModel::TAX_CLASS_TYPE_PRODUCT);
-            /* @var $collection Collection */
+            /** @var Collection $collection */
             foreach ($collection as $taxClass) {
                 $this->taxClasses[mb_strtolower($taxClass->getClassName())] = $taxClass->getId();
             }
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/LayoutUpdate.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/LayoutUpdate.php
index 5abbda2e48a0a..1bcde3aa1e70f 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/LayoutUpdate.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/LayoutUpdate.php
@@ -22,7 +22,7 @@ class LayoutUpdate extends AbstractImportValidator
      * @var ValidatorFactory
      */
     private $layoutValidatorFactory;
-    
+
     /**
      * @var ValidationStateInterface
      */
@@ -65,7 +65,7 @@ public function isValid($value): bool
      */
     private function validateXml(string $xml): bool
     {
-        /** @var $layoutXmlValidator \Magento\Framework\View\Model\Layout\Update\Validator */
+        /** @var \Magento\Framework\View\Model\Layout\Update\Validator $layoutXmlValidator */
         $layoutXmlValidator = $this->layoutValidatorFactory->create(
             [
                 'validationState' => $this->validationState,
diff --git a/app/code/Magento/CatalogImportExport/Model/StockItemImporter.php b/app/code/Magento/CatalogImportExport/Model/StockItemImporter.php
index 57a7d0b8731cb..805633b79345c 100644
--- a/app/code/Magento/CatalogImportExport/Model/StockItemImporter.php
+++ b/app/code/Magento/CatalogImportExport/Model/StockItemImporter.php
@@ -45,7 +45,7 @@ public function __construct(
      */
     public function import(array $stockData)
     {
-        /** @var $stockItemResource Item */
+        /** @var Item $stockItemResource */
         $stockItemResource = $this->stockResourceItemFactory->create();
         $entityTable = $stockItemResource->getMainTable();
         try {
diff --git a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
index 18970d3bb49a1..5afa27bd044dd 100644
--- a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
+++ b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
@@ -107,7 +107,7 @@ private function addErrorInfoToQuote($result, $quoteItem)
      */
     public function validate(Observer $observer)
     {
-        /* @var $quoteItem Item */
+        /** @var Item $quoteItem */
         $quoteItem = $observer->getEvent()->getItem();
         if (!$quoteItem ||
             !$quoteItem->getProductId() ||
diff --git a/app/code/Magento/CatalogInventory/Model/StockIndex.php b/app/code/Magento/CatalogInventory/Model/StockIndex.php
index 7772f566451e3..41c3fb73177cd 100644
--- a/app/code/Magento/CatalogInventory/Model/StockIndex.php
+++ b/app/code/Magento/CatalogInventory/Model/StockIndex.php
@@ -159,7 +159,7 @@ protected function processChildren(
         $websitesWithStores = $this->getWebsitesWithDefaultStores($websiteId);
 
         foreach (array_keys($websitesWithStores) as $websiteId) {
-            /* @var $website Website */
+            /** @var Website $website */
             $statuses[$websiteId] = $status;
         }
 
diff --git a/app/code/Magento/CatalogRule/Model/Rule.php b/app/code/Magento/CatalogRule/Model/Rule.php
index 94c7e1a6734b3..8b8724ac4905e 100644
--- a/app/code/Magento/CatalogRule/Model/Rule.php
+++ b/app/code/Magento/CatalogRule/Model/Rule.php
@@ -350,7 +350,7 @@ public function getMatchingProductIds()
             $this->setCollectedAttributes([]);
 
             if ($this->getWebsiteIds()) {
-                /** @var $productCollection \Magento\Catalog\Model\ResourceModel\Product\Collection */
+                /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection */
                 $productCollection = $this->_productCollectionFactory->create();
                 $productCollection->setStoreId($this->_storeManager->getDefaultStoreView()->getId());
                 $productCollection->addWebsiteFilter($this->getWebsiteIds());
diff --git a/app/code/Magento/CatalogRule/Observer/PrepareCatalogProductCollectionPricesObserver.php b/app/code/Magento/CatalogRule/Observer/PrepareCatalogProductCollectionPricesObserver.php
index 423b37926b6aa..a632e434a6955 100644
--- a/app/code/Magento/CatalogRule/Observer/PrepareCatalogProductCollectionPricesObserver.php
+++ b/app/code/Magento/CatalogRule/Observer/PrepareCatalogProductCollectionPricesObserver.php
@@ -109,7 +109,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         }
 
         $productIds = [];
-        /* @var $product Product */
+        /** @var Product $product */
         foreach ($collection as $product) {
             $key = implode('|', [$date->format('Y-m-d H:i:s'), $websiteId, $groupId, $product->getId()]);
             if (!$this->rulePricesStorage->hasRulePrice($key)) {
diff --git a/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Attribute.php b/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Attribute.php
index 885f8cce4ac2f..799282d52255e 100644
--- a/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Attribute.php
+++ b/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Attribute.php
@@ -87,12 +87,12 @@ public function afterDelete(
      */
     protected function checkCatalogRulesAvailability($attributeCode)
     {
-        /* @var $collection RuleCollectionFactory */
+        /** @var RuleCollectionFactory $collection */
         $collection = $this->ruleCollectionFactory->create()->addAttributeInConditionFilter($attributeCode);
 
         $disabledRulesCount = 0;
         foreach ($collection as $rule) {
-            /* @var $rule Rule */
+            /** @var Rule $rule */
             $rule->setIsActive(0);
             /* @var $rule->getConditions() Combine */
             $this->removeAttributeFromConditions($rule->getConditions(), $attributeCode);
diff --git a/app/code/Magento/CatalogSearch/Block/Advanced/Result.php b/app/code/Magento/CatalogSearch/Block/Advanced/Result.php
index 6032a64984f9a..a7ccc2caf579c 100644
--- a/app/code/Magento/CatalogSearch/Block/Advanced/Result.php
+++ b/app/code/Magento/CatalogSearch/Block/Advanced/Result.php
@@ -105,7 +105,7 @@ private function getPageTitle()
      */
     public function setListOrders()
     {
-        /* @var $category \Magento\Catalog\Model\Category */
+        /** @var \Magento\Catalog\Model\Category $category */
         $category = $this->_catalogLayer->getCurrentCategory();
 
         $availableOrders = $category->getAvailableSortByOptions();
diff --git a/app/code/Magento/CatalogSearch/Block/Result.php b/app/code/Magento/CatalogSearch/Block/Result.php
index d3c72e8bae311..19f86ab6c86ef 100644
--- a/app/code/Magento/CatalogSearch/Block/Result.php
+++ b/app/code/Magento/CatalogSearch/Block/Result.php
@@ -133,7 +133,7 @@ public function getListBlock()
     public function setListOrders()
     {
         $category = $this->catalogLayer->getCurrentCategory();
-        /* @var $category \Magento\Catalog\Model\Category */
+        /** @var \Magento\Catalog\Model\Category $category */
         $availableOrders = $category->getAvailableSortByOptions();
         unset($availableOrders['position']);
         $availableOrders['relevance'] = __('Relevance');
diff --git a/app/code/Magento/CatalogSearch/Controller/Result/Index.php b/app/code/Magento/CatalogSearch/Controller/Result/Index.php
index 61d55d10dd45b..68993c7c66065 100644
--- a/app/code/Magento/CatalogSearch/Controller/Result/Index.php
+++ b/app/code/Magento/CatalogSearch/Controller/Result/Index.php
@@ -80,7 +80,7 @@ public function execute()
     {
         $this->layerResolver->create(Resolver::CATALOG_LAYER_SEARCH);
 
-        /* @var $query \Magento\Search\Model\Query */
+        /** @var \Magento\Search\Model\Query $query */
         $query = $this->_queryFactory->get();
 
         $storeId = $this->_storeManager->getStore()->getId();
diff --git a/app/code/Magento/CatalogSearch/Controller/SearchTermsLog/Save.php b/app/code/Magento/CatalogSearch/Controller/SearchTermsLog/Save.php
index 9afc791289c87..5f83696f303f6 100644
--- a/app/code/Magento/CatalogSearch/Controller/SearchTermsLog/Save.php
+++ b/app/code/Magento/CatalogSearch/Controller/SearchTermsLog/Save.php
@@ -67,7 +67,7 @@ public function __construct(
      */
     public function execute()
     {
-        /* @var $query \Magento\Search\Model\Query */
+        /** @var \Magento\Search\Model\Query $query */
         $query = $this->queryFactory->get();
 
         $query->setStoreId($this->storeManager->getStore()->getId());
diff --git a/app/code/Magento/CatalogSearch/Model/Advanced.php b/app/code/Magento/CatalogSearch/Model/Advanced.php
index 9d123b0713643..e2727694f9fa5 100644
--- a/app/code/Magento/CatalogSearch/Model/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/Advanced.php
@@ -175,7 +175,7 @@ public function addFilters($values)
         $allConditions = [];
 
         foreach ($attributes as $attribute) {
-            /* @var $attribute Attribute */
+            /** @var Attribute $attribute */
             if (!isset($values[$attribute->getAttributeCode()])) {
                 continue;
             }
@@ -367,7 +367,7 @@ protected function getPreparedSearchCriteria($attribute, $value)
                     $to = '';
 
                     if (isset($value['currency'])) {
-                        /** @var $currencyModel Currency */
+                        /** @var Currency $currencyModel */
                         $currencyModel = $this->_currencyFactory->create()->load($value['currency']);
                         $from = $currencyModel->format($value['from'], [], false);
                         $to = $currencyModel->format($value['to'], [], false);
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineProvider.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineProvider.php
index 9c789d61e0263..b843b69dedbd2 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineProvider.php
@@ -88,7 +88,7 @@ public function get()
                 );
             }
 
-            /** @var $engine EngineInterface */
+            /** @var EngineInterface $engine */
             if ($engine && !$engine->isAvailable()) {
                 throw new \LogicException(
                     'Engine is not available: ' . $currentEngine
diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
index 0066a6746ff28..53cf911547956 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
@@ -80,7 +80,7 @@ private function generateRequest($attributeType, $container, $useFulltext)
     {
         $request = [];
         foreach ($this->getSearchableAttributes() as $attribute) {
-            /** @var $attribute Attribute */
+            /** @var Attribute $attribute */
             if ($attribute->getData($attributeType)) {
                 if (!in_array($attribute->getAttributeCode(), ['price', 'category_ids'], true)) {
                     $queryName = $attribute->getAttributeCode() . '_query';
@@ -142,7 +142,7 @@ private function generateAdvancedSearchRequest()
     {
         $request = [];
         foreach ($this->getSearchableAttributes() as $attribute) {
-            /** @var $attribute Attribute */
+            /** @var Attribute $attribute */
             if (!$attribute->getIsVisibleInAdvancedSearch()) {
                 continue;
             }
diff --git a/app/code/Magento/CatalogSearch/Ui/DataProvider/Product/AddFulltextFilterToCollection.php b/app/code/Magento/CatalogSearch/Ui/DataProvider/Product/AddFulltextFilterToCollection.php
index 8345d878f7985..b095b5832b7a9 100644
--- a/app/code/Magento/CatalogSearch/Ui/DataProvider/Product/AddFulltextFilterToCollection.php
+++ b/app/code/Magento/CatalogSearch/Ui/DataProvider/Product/AddFulltextFilterToCollection.php
@@ -36,7 +36,7 @@ public function __construct(SearchCollection $searchCollection)
      */
     public function addFilter(Collection $collection, $field, $condition = null)
     {
-        /** @var $collection \Magento\Catalog\Model\ResourceModel\Product\Collection */
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
         if (isset($condition['fulltext']) && (string)$condition['fulltext'] !== '') {
             $this->searchCollection->addBackendSearchFilter($condition['fulltext']);
             $productIds = $this->searchCollection->load()->getAllIds();
diff --git a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
index 6dc6d498c8220..bde79e2d814b1 100644
--- a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
+++ b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
@@ -286,7 +286,7 @@ public function getProductPriceHtml(
     protected function getDetailsRendererList()
     {
         if (empty($this->rendererListBlock)) {
-            /** @var $layout LayoutInterface */
+            /** @var LayoutInterface $layout */
             $layout = $this->layoutFactory->create(['cacheable' => false]);
             $layout->getUpdate()->addHandle('catalog_widget_product_list')->load();
             $layout->generateXml();
diff --git a/app/code/Magento/Checkout/Block/Cart.php b/app/code/Magento/Checkout/Block/Cart.php
index 66760e401a44f..f2873e3ee7b3f 100644
--- a/app/code/Magento/Checkout/Block/Cart.php
+++ b/app/code/Magento/Checkout/Block/Cart.php
@@ -78,7 +78,7 @@ protected function _construct()
     public function prepareItemUrls()
     {
         $products = [];
-        /* @var $item \Magento\Quote\Model\Quote\Item */
+        /** @var \Magento\Quote\Model\Quote\Item $item */
         foreach ($this->getItems() as $item) {
             $product = $item->getProduct();
             $option = $item->getOptionByCode('product_type');
diff --git a/app/code/Magento/Checkout/Block/Cart/Crosssell.php b/app/code/Magento/Checkout/Block/Cart/Crosssell.php
index da7f4442c31ea..5e5b405a832c5 100644
--- a/app/code/Magento/Checkout/Block/Cart/Crosssell.php
+++ b/app/code/Magento/Checkout/Block/Cart/Crosssell.php
@@ -245,7 +245,7 @@ protected function _getCollection()
      */
     private function getProductLinkField(): string
     {
-        /* @var $collection Collection */
+        /** @var Collection $collection */
         $collection = $this->productCollectionFactory->create();
         return $collection->getProductEntityMetadata()->getLinkField();
     }
@@ -277,7 +277,7 @@ private function getCartRelatedProductLinkIds(): array
         $linkIds = [];
         if (!empty($productIds)) {
             $linkField = $this->getProductLinkField();
-            /* @var $collection Collection */
+            /** @var Collection $collection */
             $collection = $this->productCollectionFactory->create();
             $collection->addIdFilter($productIds);
             foreach ($collection as $product) {
@@ -317,7 +317,7 @@ private function getCartProducts(): array
         if ($this->cartProducts === null) {
             $this->cartProducts = [];
             foreach ($this->getQuote()->getAllItems() as $quoteItem) {
-                /* @var $quoteItem \Magento\Quote\Model\Quote\Item */
+                /** @var \Magento\Quote\Model\Quote\Item $quoteItem */
                 $product = $quoteItem->getProduct();
                 if ($product) {
                     $this->cartProducts[$product->getEntityId()] = $product;
diff --git a/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php b/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
index 6619c4f23a2af..b27407fd071a7 100644
--- a/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
+++ b/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
@@ -275,7 +275,7 @@ public function getProductName()
      */
     public function getProductOptions()
     {
-        /* @var $helper \Magento\Catalog\Helper\Product\Configuration */
+        /** @var \Magento\Catalog\Helper\Product\Configuration $helper */
         $helper = $this->_productConfig;
         return $helper->getCustomOptions($this->getItem());
     }
@@ -333,12 +333,12 @@ public function getMessages()
             }
         }
 
-        /* @var $collection \Magento\Framework\Message\Collection */
+        /** @var \Magento\Framework\Message\Collection $collection */
         $collection = $this->messageManager->getMessages(true, 'quote_item' . $quoteItem->getId());
         if ($collection) {
             $additionalMessages = $collection->getItems();
             foreach ($additionalMessages as $message) {
-                /* @var $message \Magento\Framework\Message\MessageInterface */
+                /** @var \Magento\Framework\Message\MessageInterface $message */
                 $messages[] = [
                     'text' => $this->messageInterpretationStrategy->interpret($message),
                     'type' => $message->getType()
@@ -372,7 +372,7 @@ public function getMessages()
      */
     public function getFormatedOptionValue($optionValue)
     {
-        /* @var $helper \Magento\Catalog\Helper\Product\Configuration */
+        /** @var \Magento\Catalog\Helper\Product\Configuration $helper */
         $helper = $this->_productConfig;
         $params = [
             'max_length' => 55,
diff --git a/app/code/Magento/Checkout/Controller/Cart.php b/app/code/Magento/Checkout/Controller/Cart.php
index 762f8880c951e..d7fa19bb93597 100644
--- a/app/code/Magento/Checkout/Controller/Cart.php
+++ b/app/code/Magento/Checkout/Controller/Cart.php
@@ -109,7 +109,7 @@ protected function _isInternalUrl($url)
         /**
          * Url must start from base secure or base unsecure url
          */
-        /** @var $store Store */
+        /** @var Store $store */
         $store = $this->_storeManager->getStore();
         $unsecure = strpos($url, (string) $store->getBaseUrl()) === 0;
         $secure = strpos($url, (string) $store->getBaseUrl(UrlInterface::URL_TYPE_LINK, true)) === 0;
diff --git a/app/code/Magento/Checkout/Controller/Cart/Addgroup.php b/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
index d7f282b60858a..b02ab4f175bbe 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
@@ -59,7 +59,7 @@ public function execute()
                 ->getCollection()
                 ->addIdFilter($orderItemIds)
                 ->load();
-            /* @var $itemsCollection \Magento\Sales\Model\ResourceModel\Order\Item\Collection */
+            /** @var \Magento\Sales\Model\ResourceModel\Order\Item\Collection $itemsCollection */
             foreach ($itemsCollection as $item) {
                 try {
                     $this->addOrderItem($item);
diff --git a/app/code/Magento/Checkout/CustomerData/Cart.php b/app/code/Magento/Checkout/CustomerData/Cart.php
index aba14af7a94e6..51327b80a6e54 100644
--- a/app/code/Magento/Checkout/CustomerData/Cart.php
+++ b/app/code/Magento/Checkout/CustomerData/Cart.php
@@ -154,7 +154,7 @@ protected function getRecentItems()
         }
 
         foreach (array_reverse($this->getAllQuoteItems()) as $item) {
-            /* @var $item \Magento\Quote\Model\Quote\Item */
+            /** @var \Magento\Quote\Model\Quote\Item $item */
             if (!$item->getProduct()->isVisibleInSiteVisibility()) {
                 $product =  $item->getOptionByCode('product_type') !== null
                     ? $item->getOptionByCode('product_type')->getProduct()
diff --git a/app/code/Magento/Checkout/Model/Cart.php b/app/code/Magento/Checkout/Model/Cart.php
index 6c220ff214f9e..2f80dd5d15128 100644
--- a/app/code/Magento/Checkout/Model/Cart.php
+++ b/app/code/Magento/Checkout/Model/Cart.php
@@ -266,7 +266,7 @@ protected function reinitializeState()
      */
     public function addOrderItem($orderItem, $qtyFlag = null)
     {
-        /* @var $orderItem \Magento\Sales\Model\Order\Item */
+        /** @var \Magento\Sales\Model\Order\Item $orderItem */
         if ($orderItem->getParentItem() === null) {
             $storeId = $this->_storeManager->getStore()->getId();
             try {
diff --git a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
index 8c605dfd4123f..5f3143309982a 100644
--- a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
+++ b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
@@ -419,7 +419,7 @@ private function getQuoteData()
             $quoteData['is_virtual'] = $quote->getIsVirtual();
 
             if (!$quote->getCustomer()->getId()) {
-                /** @var $quoteIdMask \Magento\Quote\Model\QuoteIdMask */
+                /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
                 $quoteIdMask = $this->quoteIdMaskFactory->create();
                 $quoteData['entity_id'] = $quoteIdMask->load(
                     $this->checkoutSession->getQuote()->getId(),
@@ -465,7 +465,7 @@ protected function getFormattedOptionValue($item)
         $optionsData = [];
         $options = $this->configurationPool->getByProductType($item->getProductType())->getOptions($item);
         foreach ($options as $index => $optionValue) {
-            /* @var $helper \Magento\Catalog\Helper\Product\Configuration */
+            /** @var \Magento\Catalog\Helper\Product\Configuration $helper */
             $helper = $this->configurationPool->getByProductType('default');
             $params = [
                 'max_length' => 55,
diff --git a/app/code/Magento/Checkout/Model/GuestShippingInformationManagement.php b/app/code/Magento/Checkout/Model/GuestShippingInformationManagement.php
index 8836858ab3d4a..1b8d21c51b8c3 100644
--- a/app/code/Magento/Checkout/Model/GuestShippingInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/GuestShippingInformationManagement.php
@@ -37,7 +37,7 @@ public function saveAddressInformation(
         $cartId,
         \Magento\Checkout\Api\Data\ShippingInformationInterface $addressInformation
     ) {
-        /** @var $quoteIdMask \Magento\Quote\Model\QuoteIdMask */
+        /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->shippingInformationManagement->saveAddressInformation(
             (int) $quoteIdMask->getQuoteId(),
diff --git a/app/code/Magento/Checkout/Model/GuestTotalsInformationManagement.php b/app/code/Magento/Checkout/Model/GuestTotalsInformationManagement.php
index 2992930fc3c92..9f6f19e6dcb29 100644
--- a/app/code/Magento/Checkout/Model/GuestTotalsInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/GuestTotalsInformationManagement.php
@@ -37,7 +37,7 @@ public function calculate(
         $cartId,
         \Magento\Checkout\Api\Data\TotalsInformationInterface $addressInformation
     ) {
-        /** @var $quoteIdMask \Magento\Quote\Model\QuoteIdMask */
+        /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->totalsInformationManagement->calculate(
             $quoteIdMask->getQuoteId(),
diff --git a/app/code/Magento/Checkout/Model/Session.php b/app/code/Magento/Checkout/Model/Session.php
index ff0a7d9dfd11d..0c1dc39931b61 100644
--- a/app/code/Magento/Checkout/Model/Session.php
+++ b/app/code/Magento/Checkout/Model/Session.php
@@ -322,7 +322,7 @@ public function getQuote()
 
         if (!$this->isQuoteMasked() && !$this->_customerSession->isLoggedIn() && $this->getQuoteId()) {
             $quoteId = $this->getQuoteId();
-            /** @var $quoteIdMask \Magento\Quote\Model\QuoteIdMask */
+            /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
             $quoteIdMask = $this->quoteIdMaskFactory->create()->load($quoteId, 'quote_id');
             if ($quoteIdMask->getMaskedId() === null) {
                 $quoteIdMask->setQuoteId($quoteId)->save();
diff --git a/app/code/Magento/Checkout/Plugin/Api/VerifyIsGuestCheckoutEnabledBeforeAssignBillingAddress.php b/app/code/Magento/Checkout/Plugin/Api/VerifyIsGuestCheckoutEnabledBeforeAssignBillingAddress.php
index e85d8bc0edac3..0bc00d30b396e 100644
--- a/app/code/Magento/Checkout/Plugin/Api/VerifyIsGuestCheckoutEnabledBeforeAssignBillingAddress.php
+++ b/app/code/Magento/Checkout/Plugin/Api/VerifyIsGuestCheckoutEnabledBeforeAssignBillingAddress.php
@@ -63,7 +63,7 @@ public function beforeAssign(
         AddressInterface $address,
         $useForShipping = false
     ): void {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         $quote = $this->cartRepository->get($quoteIdMask->getQuoteId());
         if (!$this->checkoutHelper->isAllowedGuestCheckout($quote)) {
diff --git a/app/code/Magento/Checkout/Plugin/Api/VerifyIsGuestCheckoutEnabledBeforePlaceOrder.php b/app/code/Magento/Checkout/Plugin/Api/VerifyIsGuestCheckoutEnabledBeforePlaceOrder.php
index ade63e33b332c..7869f27299301 100644
--- a/app/code/Magento/Checkout/Plugin/Api/VerifyIsGuestCheckoutEnabledBeforePlaceOrder.php
+++ b/app/code/Magento/Checkout/Plugin/Api/VerifyIsGuestCheckoutEnabledBeforePlaceOrder.php
@@ -61,7 +61,7 @@ public function beforePlaceOrder(
         $cartId,
         ?PaymentInterface $paymentMethod = null
     ): void {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         $quote = $this->cartRepository->get($quoteIdMask->getQuoteId());
         if (!$this->checkoutHelper->isAllowedGuestCheckout($quote)) {
diff --git a/app/code/Magento/Checkout/Plugin/Api/VerifyIsGuestCheckoutEnabledBeforeSavePaymentInformation.php b/app/code/Magento/Checkout/Plugin/Api/VerifyIsGuestCheckoutEnabledBeforeSavePaymentInformation.php
index 6731572055b06..1336df7d4a503 100644
--- a/app/code/Magento/Checkout/Plugin/Api/VerifyIsGuestCheckoutEnabledBeforeSavePaymentInformation.php
+++ b/app/code/Magento/Checkout/Plugin/Api/VerifyIsGuestCheckoutEnabledBeforeSavePaymentInformation.php
@@ -66,7 +66,7 @@ public function beforeSavePaymentInformation(
         PaymentInterface $paymentMethod,
         ?AddressInterface $billingAddress = null
     ): void {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         $quote = $this->cartRepository->get($quoteIdMask->getQuoteId());
         if (!$this->checkoutHelper->isAllowedGuestCheckout($quote)) {
diff --git a/app/code/Magento/Checkout/Plugin/Api/VerifyIsGuestCheckoutEnabledBeforeSaveShippingInformation.php b/app/code/Magento/Checkout/Plugin/Api/VerifyIsGuestCheckoutEnabledBeforeSaveShippingInformation.php
index a321d554fbdc1..26cdee34bfd20 100644
--- a/app/code/Magento/Checkout/Plugin/Api/VerifyIsGuestCheckoutEnabledBeforeSaveShippingInformation.php
+++ b/app/code/Magento/Checkout/Plugin/Api/VerifyIsGuestCheckoutEnabledBeforeSaveShippingInformation.php
@@ -61,7 +61,7 @@ public function beforeSaveAddressInformation(
         $cartId,
         ShippingInformationInterface $addressInformation
     ): void {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         $quote = $this->cartRepository->get($quoteIdMask->getQuoteId());
         if (!$this->checkoutHelper->isAllowedGuestCheckout($quote)) {
diff --git a/app/code/Magento/Checkout/Plugin/Api/VerifyIsGuestCheckoutEnabledBeforeSetPaymentMethod.php b/app/code/Magento/Checkout/Plugin/Api/VerifyIsGuestCheckoutEnabledBeforeSetPaymentMethod.php
index 8108cb1910d6a..0645c0106c716 100644
--- a/app/code/Magento/Checkout/Plugin/Api/VerifyIsGuestCheckoutEnabledBeforeSetPaymentMethod.php
+++ b/app/code/Magento/Checkout/Plugin/Api/VerifyIsGuestCheckoutEnabledBeforeSetPaymentMethod.php
@@ -61,7 +61,7 @@ public function beforeSet(
         $cartId,
         PaymentInterface $method
     ): void {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         $quote = $this->cartRepository->get($quoteIdMask->getQuoteId());
         if (!$this->checkoutHelper->isAllowedGuestCheckout($quote)) {
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/CartTest.php b/app/code/Magento/Checkout/Test/Unit/Block/CartTest.php
index 2da9133e9b085..23a90513e98f7 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/CartTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/CartTest.php
@@ -50,7 +50,7 @@ protected function setUp(): void
         $this->context->expects($this->once())->method('getEscaper')->willReturn($this->escaper);
         $this->context->expects($this->once())->method('getLayout')->willReturn($this->layoutMock);
 
-        /** @var $cartBlock Cart */
+        /** @var Cart $cartBlock */
         $this->cartBlock = $objectManager->getObject(
             Cart::class,
             [
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/SessionTest.php b/app/code/Magento/Checkout/Test/Unit/Model/SessionTest.php
index d339d1dd75927..d6694f0df6a8e 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/SessionTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/SessionTest.php
@@ -390,7 +390,7 @@ public function testClearStorage(): void
      */
     public function testResetCheckout(): void
     {
-        /** @var $session \Magento\Checkout\Model\Session */
+        /** @var \Magento\Checkout\Model\Session $session */
         $session = $this->helper->getObject(
             Session::class,
             ['storage' => new Storage()]
@@ -410,7 +410,7 @@ public function testGetStepData(): void
                 'key' => 'value'
             ]
         ];
-        /** @var $session \Magento\Checkout\Model\Session */
+        /** @var \Magento\Checkout\Model\Session $session */
         $session = $this->helper->getObject(
             Session::class,
             ['storage' => new Storage()]
@@ -495,7 +495,7 @@ public function testSetStepData(): void
                 'key' => 'value',
             ],
         ];
-        /** @var $session \Magento\Checkout\Model\Session */
+        /** @var \Magento\Checkout\Model\Session $session */
         $session = $this->helper->getObject(
             Session::class,
             ['storage' => new Storage()]
diff --git a/app/code/Magento/Checkout/view/frontend/templates/button.phtml b/app/code/Magento/Checkout/view/frontend/templates/button.phtml
index 34c08952fe434..f12525d0e7a28 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/button.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/button.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 ?>
-<?php /** @var $block \Magento\Checkout\Block\Onepage\Success */ ?>
+<?php /** @var \Magento\Checkout\Block\Onepage\Success $block */ ?>
 
 <?php if ($block->getCanViewOrder() && $block->getCanPrintOrder()) :?>
     <a href="<?= $block->escapeUrl($block->getPrintUrl()) ?>"
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
index 5116042604bf3..509173125c937 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
@@ -6,7 +6,7 @@
 
 // phpcs:disable Magento2.Templates.ThisInTemplate
 
-/**  @var $block \Magento\Checkout\Block\Cart\Grid */
+/** @var \Magento\Checkout\Block\Cart\Grid $block */
 ?>
 <?php $mergedCells = ($this->helper(Magento\Tax\Helper\Data::class)->displayCartBothPrices() ? 2 : 1); ?>
 <?= $block->getChildHtml('form_before') ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
index 23408e18f3a02..d8b0efaf001ab 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Catalog\Block\Product\View */
+/** @var \Magento\Catalog\Block\Product\View $block */
 ?>
 <?php $_product = $block->getProduct(); ?>
 <?php $buttonTitle = __('Update Cart'); ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
index 5686a3ef17c23..5f95dee68d978 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
@@ -7,7 +7,7 @@
 // phpcs:disable Magento2.Templates.ThisInTemplate
 // phpcs:disable Generic.Files.LineLength
 
-/** @var $block \Magento\Checkout\Block\Cart\Item\Renderer */
+/** @var \Magento\Checkout\Block\Cart\Item\Renderer $block */
 
 $_item = $block->getItem();
 $product = $_item->getProduct();
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/price/sidebar.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/price/sidebar.phtml
index b673d6b60d7d7..49aa914ce2570 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/price/sidebar.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/price/sidebar.phtml
@@ -6,7 +6,7 @@
 
 // phpcs:disable Magento2.Templates.ThisInTemplate
 
-/** @var $block \Magento\Checkout\Block\Item\Price\Renderer */
+/** @var \Magento\Checkout\Block\Item\Price\Renderer $block */
 ?>
 <?php $_item = $block->getItem() ?>
 <div class="price-container">
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml
index a920b6281cfd0..3d879f86ce152 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Checkout\Block\Cart\Item\Renderer\Actions\Edit */
+/** @var \Magento\Checkout\Block\Cart\Item\Renderer\Actions\Edit $block */
 ?>
 <?php if ($block->isProductVisibleInSiteVisibility()) :?>
     <a class="action action-edit"
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/remove.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/remove.phtml
index 30f70c1e5776e..22282e5a5796c 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/remove.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/remove.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Checkout\Block\Cart\Item\Renderer\Actions\Remove */
+/** @var \Magento\Checkout\Block\Cart\Item\Renderer\Actions\Remove $block */
 ?>
 <a href="#"
    title="<?= $block->escapeHtml(__('Remove item')) ?>"
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml
index acd75ae22ab70..8fddeef389cd5 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml
@@ -6,7 +6,7 @@
 
 ?>
 <?php
-/** @var $block \Magento\Checkout\Block\Cart */
+/** @var \Magento\Checkout\Block\Cart $block */
 ?>
 <?php if (!$block->hasError()) :?>
     <?php $methods = $block->getMethods('methods') ?: $block->getMethods('top_methods') ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
index a7817190bd17f..02f677ed5425c 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Checkout\Block\Cart\Sidebar */
+/** @var \Magento\Checkout\Block\Cart\Sidebar $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/noItems.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/noItems.phtml
index ceeeef8e0ab10..d8179713ab312 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/noItems.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/noItems.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/**  @var $block \Magento\Checkout\Block\Cart */
+/** @var \Magento\Checkout\Block\Cart $block */
 ?>
 <div class="cart-empty">
     <?= $block->getChildHtml('checkout_cart_empty_widget') ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
index cadecf64c2d84..a2d9eb56121cd 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
@@ -5,7 +5,7 @@
  */
 
 ?>
-<?php /** @var $block \Magento\Checkout\Block\Cart\Shipping */ ?>
+<?php /** @var \Magento\Checkout\Block\Cart\Shipping $block */ ?>
 <?php /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */ ?>
 <div id="block-shipping"
      class="block shipping"
diff --git a/app/code/Magento/Checkout/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Checkout/view/frontend/templates/item/price/row.phtml
index d60bc652ee986..75bf5964301e4 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/item/price/row.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/item/price/row.phtml
@@ -6,7 +6,7 @@
 
 // phpcs:disable Magento2.Templates.ThisInTemplate
 
-/** @var $block \Magento\Checkout\Block\Item\Price\Renderer */
+/** @var \Magento\Checkout\Block\Item\Price\Renderer $block */
 
 $_item = $block->getItem();
 ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Checkout/view/frontend/templates/item/price/unit.phtml
index a6ddc4e441635..f29d6ac92f6ea 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/item/price/unit.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/item/price/unit.phtml
@@ -6,7 +6,7 @@
 
 // phpcs:disable Magento2.Templates.ThisInTemplate
 
-/** @var $block \Magento\Checkout\Block\Item\Price\Renderer */
+/** @var \Magento\Checkout\Block\Item\Price\Renderer $block */
 
 $_item = $block->getItem();
 ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
index f12d25b8d7f55..9cdf814dc8774 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Checkout\Block\Onepage */
+/** @var \Magento\Checkout\Block\Onepage $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/failure.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/failure.phtml
index c9741e83f24de..9aa876d1b58b5 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/failure.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/failure.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Checkout\Block\Onepage\Failure */
+/** @var \Magento\Checkout\Block\Onepage\Failure $block */
 ?>
 <?php if ($block->getRealOrderId()) :?>
     <p><?= $block->escapeHtml(__('Order #') . $block->getRealOrderId()) ?></p>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml
index ebdef44c8cee2..2e2de704f60d3 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml
@@ -6,7 +6,7 @@
 
 // phpcs:disable Magento2.Templates.ThisInTemplate
 
-/** @var $block Magento\Checkout\Block\Cart\Item\Renderer */
+/** @var Magento\Checkout\Block\Cart\Item\Renderer $block */
 
 $_item = $block->getItem();
 $taxDataHelper = $this->helper(Magento\Tax\Helper\Data::class);
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_excl_tax.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_excl_tax.phtml
index 89a705054df55..5ae604aaf7290 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_excl_tax.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_excl_tax.phtml
@@ -6,7 +6,7 @@
 
 // phpcs:disable Magento2.Templates.ThisInTemplate
 
-/** @var $block \Magento\Checkout\Block\Item\Price\Renderer */
+/** @var \Magento\Checkout\Block\Item\Price\Renderer $block */
 
 $_item = $block->getItem();
 ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_incl_tax.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_incl_tax.phtml
index aa43388d49746..328f6bbf84353 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_incl_tax.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_incl_tax.phtml
@@ -6,7 +6,7 @@
 
 // phpcs:disable Magento2.Templates.ThisInTemplate
 
-/** @var $block \Magento\Checkout\Block\Item\Price\Renderer */
+/** @var \Magento\Checkout\Block\Item\Price\Renderer $block */
 
 $_item = $block->getItem();
 ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_excl_tax.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_excl_tax.phtml
index 6a729817e90b2..66b6f2791170e 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_excl_tax.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_excl_tax.phtml
@@ -6,7 +6,7 @@
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 
-/** @var $block \Magento\Checkout\Block\Item\Price\Renderer */
+/** @var \Magento\Checkout\Block\Item\Price\Renderer $block */
 
 $_item = $block->getItem();
 ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_incl_tax.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_incl_tax.phtml
index fecba3a2c3f7e..e74c3179b6015 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_incl_tax.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_incl_tax.phtml
@@ -6,7 +6,7 @@
 
 // phpcs:disable Magento2.Templates.ThisInTemplate
 
-/** @var $block \Magento\Checkout\Block\Item\Price\Renderer */
+/** @var \Magento\Checkout\Block\Item\Price\Renderer $block */
 
 $_item = $block->getItem();
 ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/registration.phtml b/app/code/Magento/Checkout/view/frontend/templates/registration.phtml
index aba9ca585b947..d0562e92bfa0c 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/registration.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/registration.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Checkout\Block\Registration */
+/** @var \Magento\Checkout\Block\Registration $block */
 ?>
 <div id="registration" data-bind="scope:'registration'">
     <br />
diff --git a/app/code/Magento/Checkout/view/frontend/templates/shipping/price.phtml b/app/code/Magento/Checkout/view/frontend/templates/shipping/price.phtml
index 5297e5a99f615..6d34f3ea4c065 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/shipping/price.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/shipping/price.phtml
@@ -5,7 +5,7 @@
  */
 
 ?>
-<?php /** @var $block \Magento\Checkout\Block\Shipping\Price */ ?>
+<?php /** @var \Magento\Checkout\Block\Shipping\Price $block */ ?>
 
 <?php $shippingPrice = $block->getShippingPrice(); ?>
 <?= $block->escapeHtml($shippingPrice) ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/success.phtml b/app/code/Magento/Checkout/view/frontend/templates/success.phtml
index f01d178659d66..339f67060e2e0 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/success.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/success.phtml
@@ -5,7 +5,7 @@
  */
 
 ?>
-<?php /** @var $block \Magento\Checkout\Block\Onepage\Success */ ?>
+<?php /** @var \Magento\Checkout\Block\Onepage\Success $block */ ?>
 <div class="checkout-success">
     <?php if ($block->getOrderId()) :?>
         <?php if ($block->getCanViewOrder()) :?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
index 103c2bb8429b9..197e42628ac03 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Checkout\Block\Total\DefaultTotal */
+/** @var \Magento\Checkout\Block\Total\DefaultTotal $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
diff --git a/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsList.php b/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsList.php
index 87808a1f59417..2d0707815e0ff 100644
--- a/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsList.php
+++ b/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsList.php
@@ -48,7 +48,7 @@ public function __construct(
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria) : array
     {
-        /** @var $collection \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Collection */
+        /** @var \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Collection $collection */
         $collection = $this->collectionFactory->create();
         $this->collectionProcessor->process($searchCriteria, $collection);
         $this->extensionAttributesJoinProcessor->process($collection);
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php
index 7c1de240ee272..169c8b7516b5c 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php
@@ -66,7 +66,7 @@ protected function _construct()
     protected function _prepareCollection()
     {
         $collection = $this->_collectionFactory->create();
-        /* @var $collection \Magento\Cms\Model\ResourceModel\Page\Collection */
+        /** @var \Magento\Cms\Model\ResourceModel\Page\Collection $collection */
         $collection->setFirstStoreFlag(true);
         $this->setCollection($collection);
 
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php
index 9aff235ac4b90..a3e4092dc6a19 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php
@@ -139,7 +139,7 @@ function (grid, event) {
     protected function _prepareCollection()
     {
         $collection = $this->_collectionFactory->create();
-        /* @var $collection \Magento\Cms\Model\ResourceModel\Page\CollectionFactory */
+        /** @var \Magento\Cms\Model\ResourceModel\Page\CollectionFactory $collection */
         $collection->setFirstStoreFlag(true);
         $this->setCollection($collection);
 
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
index 05b0b374b05bb..d0e6a5486cae5 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
@@ -95,7 +95,7 @@ public function filter($data)
     public function validate($data)
     {
         if (!empty($data['layout_update_xml']) || !empty($data['custom_layout_update_xml'])) {
-            /** @var $layoutXmlValidator \Magento\Framework\View\Model\Layout\Update\Validator */
+            /** @var \Magento\Framework\View\Model\Layout\Update\Validator $layoutXmlValidator */
             $layoutXmlValidator = $this->validatorFactory->create(
                 [
                     'validationState' => $this->validationState,
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
index dd51c82c1e263..cbb863c45dbfb 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
@@ -71,7 +71,7 @@ public function execute()
         try {
             $files = $this->getRequest()->getParam('files');
 
-            /** @var $helper \Magento\Cms\Helper\Wysiwyg\Images */
+            /** @var \Magento\Cms\Helper\Wysiwyg\Images $helper */
             $helper = $this->_objectManager->get(\Magento\Cms\Helper\Wysiwyg\Images::class);
             $path = $this->getStorage()->getSession()->getCurrentPath();
             if (!$this->directoryResolver->validatePath($path, DirectoryList::MEDIA)) {
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml
index 46a4116cb79df..c85fc899b12f3 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
- /** @var $block \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content */
+ /** @var \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content $block */
 ?>
 
 <div class="media-gallery-modal" data-mage-init='{"mediabrowser": <?= $block->escapeHtml($block->getFilebrowserSetupObject()) ?>}'>
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
index 7137dac5769f0..0fd0a2d1ef5a9 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Files */
+/** @var \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Files $block */
 
 $_width  = $block->getImagesWidth();
 
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
index c428ef1a81887..a04b170d88336 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
@@ -5,7 +5,7 @@
  */
 
 // phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
-/** @var $block \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Uploader */
+/** @var \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Uploader $block */
 /** @var \Magento\Framework\Escaper $escaper */
 
 $blockHtmlId = $block->getHtmlId();
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
index a533b4434e2d0..61196cbb52de8 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\Backend\Block\Template */
+/** @var \Magento\Backend\Block\Template $block */
 /** @var \Magento\Framework\Escaper $escaper */
 ?>
 <script type="text/x-magento-init">
diff --git a/app/code/Magento/Cms/view/frontend/templates/widget/static_block/default.phtml b/app/code/Magento/Cms/view/frontend/templates/widget/static_block/default.phtml
index a40c594c02c59..6a2839fe84074 100644
--- a/app/code/Magento/Cms/view/frontend/templates/widget/static_block/default.phtml
+++ b/app/code/Magento/Cms/view/frontend/templates/widget/static_block/default.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/* @var $block \Magento\Cms\Block\Widget\Block */
+/** @var \Magento\Cms\Block\Widget\Block $block */
 
 ?>
 <div class="widget block block-static-block">
diff --git a/app/code/Magento/CmsUrlRewrite/Observer/ProcessUrlRewriteSavingObserver.php b/app/code/Magento/CmsUrlRewrite/Observer/ProcessUrlRewriteSavingObserver.php
index 8e9cec4fbabb4..9857f7bd0a6f7 100644
--- a/app/code/Magento/CmsUrlRewrite/Observer/ProcessUrlRewriteSavingObserver.php
+++ b/app/code/Magento/CmsUrlRewrite/Observer/ProcessUrlRewriteSavingObserver.php
@@ -41,7 +41,7 @@ public function __construct(CmsPageUrlRewriteGenerator $cmsPageUrlRewriteGenerat
      */
     public function execute(EventObserver $observer)
     {
-        /** @var $cmsPage \Magento\Cms\Model\Page */
+        /** @var \Magento\Cms\Model\Page $cmsPage */
         $cmsPage = $observer->getEvent()->getObject();
 
         if ($cmsPage->dataHasChangedFor('identifier')
diff --git a/app/code/Magento/CmsUrlRewrite/Plugin/Cms/Model/ResourceModel/Page.php b/app/code/Magento/CmsUrlRewrite/Plugin/Cms/Model/ResourceModel/Page.php
index ee7179242e947..a9eab61825b76 100644
--- a/app/code/Magento/CmsUrlRewrite/Plugin/Cms/Model/ResourceModel/Page.php
+++ b/app/code/Magento/CmsUrlRewrite/Plugin/Cms/Model/ResourceModel/Page.php
@@ -54,7 +54,7 @@ public function beforeSave(
         \Magento\Cms\Model\ResourceModel\Page $subject,
         \Magento\Framework\Model\AbstractModel $object
     ) {
-        /** @var $object \Magento\Cms\Model\Page */
+        /** @var \Magento\Cms\Model\Page $object */
         $urlKey = $object->getData('identifier');
         if ($urlKey === '' || $urlKey === null) {
             $object->setData('identifier', $this->cmsPageUrlPathGenerator->generateUrlKey($object));
diff --git a/app/code/Magento/CompareListGraphQl/Model/Service/RemoveFromCompareList.php b/app/code/Magento/CompareListGraphQl/Model/Service/RemoveFromCompareList.php
index dda400559a412..90b78fa04d84d 100644
--- a/app/code/Magento/CompareListGraphQl/Model/Service/RemoveFromCompareList.php
+++ b/app/code/Magento/CompareListGraphQl/Model/Service/RemoveFromCompareList.php
@@ -47,7 +47,7 @@ public function __construct(
     public function execute(int $listId, array $products)
     {
         foreach ($products as $productId) {
-            /* @var $item Item */
+            /** @var Item $item */
             $item = $this->compareItemFactory->create();
             $item->setListId($listId);
             $this->compareItemResource->loadByProduct($item, $productId);
diff --git a/app/code/Magento/Config/Block/System/Config/Dwstree.php b/app/code/Magento/Config/Block/System/Config/Dwstree.php
index cc78cea2633f9..ce3675aa26ef2 100644
--- a/app/code/Magento/Config/Block/System/Config/Dwstree.php
+++ b/app/code/Magento/Config/Block/System/Config/Dwstree.php
@@ -40,7 +40,7 @@ public function initTabs()
             ]
         );
 
-        /** @var $website \Magento\Store\Model\Website */
+        /** @var \Magento\Store\Model\Website $website */
         foreach ($this->_storeManager->getWebsites(true) as $website) {
             $wCode = $website->getCode();
             $wName = $website->getName();
@@ -53,7 +53,7 @@ public function initTabs()
                     $this->_addBreadcrumb($wName);
                 }
             }
-            /** @var $store \Magento\Store\Model\Store */
+            /** @var \Magento\Store\Model\Store $store */
             foreach ($website->getStores() as $store) {
                 $sCode = $store->getCode();
                 $sName = $store->getName();
diff --git a/app/code/Magento/Config/Block/System/Config/Edit.php b/app/code/Magento/Config/Block/System/Config/Edit.php
index 6c1fc83ddeb79..cb1610c25eac5 100644
--- a/app/code/Magento/Config/Block/System/Config/Edit.php
+++ b/app/code/Magento/Config/Block/System/Config/Edit.php
@@ -73,7 +73,7 @@ public function __construct(
      */
     protected function _prepareLayout()
     {
-        /** @var $section \Magento\Config\Model\Config\Structure\Element\Section */
+        /** @var \Magento\Config\Model\Config\Structure\Element\Section $section */
         $section = $this->_configStructure->getElement($this->getRequest()->getParam('section'));
         $this->_formBlockName = $section->getFrontendModel();
         if (empty($this->_formBlockName)) {
diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php
index e1749a363b528..e85e60b07a247 100644
--- a/app/code/Magento/Config/Block/System/Config/Form.php
+++ b/app/code/Magento/Config/Block/System/Config/Form.php
@@ -195,7 +195,7 @@ public function initForm()
 
         /** @var \Magento\Framework\Data\Form $form */
         $form = $this->_formFactory->create();
-        /** @var $section \Magento\Config\Model\Config\Structure\Element\Section */
+        /** @var \Magento\Config\Model\Config\Structure\Element\Section $section */
         $section = $this->_configStructure->getElement($this->getSectionCode());
         if ($section && $section->isVisible($this->getWebsiteCode(), $this->getStoreCode())) {
             foreach ($section->getChildren() as $group) {
@@ -296,7 +296,7 @@ public function initFields(
         // Extends for config data
         $extraConfigGroups = [];
 
-        /** @var $element \Magento\Config\Model\Config\Structure\Element\Field */
+        /** @var \Magento\Config\Model\Config\Structure\Element\Field $element */
         foreach ($group->getChildren() as $element) {
             if ($element instanceof \Magento\Config\Model\Config\Structure\Element\Group) {
                 $this->_initGroup($element, $section, $fieldset);
@@ -476,7 +476,7 @@ private function getStringScopeCode()
     protected function _populateDependenciesBlock(array $dependencies, $elementId, $elementName)
     {
         foreach ($dependencies as $dependentField) {
-            /** @var $dependentField \Magento\Config\Model\Config\Structure\Element\Dependency\Field */
+            /** @var \Magento\Config\Model\Config\Structure\Element\Dependency\Field $dependentField */
             $fieldNameFrom = $this->_generateElementName($dependentField->getId(), null, '_');
             $this->_getDependence()->addFieldMap(
                 $elementId,
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/Image.php b/app/code/Magento/Config/Block/System/Config/Form/Field/Image.php
index e1d4a713b8b10..d6bb3801ae5a0 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Field/Image.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Field/Image.php
@@ -25,7 +25,7 @@ protected function _getUrl()
     {
         $url = parent::_getUrl();
         $config = $this->getFieldConfig();
-        /* @var $config array */
+        /** @var array $config */
         if (isset($config['base_url'])) {
             $element = $config['base_url'];
             $urlType = empty($element['type']) ? 'link' : (string)$element['type'];
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/Regexceptions.php b/app/code/Magento/Config/Block/System/Config/Form/Field/Regexceptions.php
index 9b8940567daab..e4716b9b3540c 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Field/Regexceptions.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Field/Regexceptions.php
@@ -61,7 +61,7 @@ protected function _construct()
     public function renderCellTemplate($columnName)
     {
         if ($columnName == 'value' && isset($this->_columns[$columnName])) {
-            /** @var $label \Magento\Framework\View\Design\Theme\Label */
+            /** @var \Magento\Framework\View\Design\Theme\Label $label */
             $label = $this->_labelFactory->create();
             $options = $label->getLabelsCollection(__('-- No Theme --'));
             $element = $this->_elementFactory->create('select');
diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php
index 12c6ecbab9fd9..f096b685962b6 100644
--- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php
+++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php
@@ -44,7 +44,7 @@ public function execute()
         $website = $this->getRequest()->getParam('website');
         $store = $this->getRequest()->getParam('store');
 
-        /** @var $section \Magento\Config\Model\Config\Structure\Element\Section */
+        /** @var \Magento\Config\Model\Config\Structure\Element\Section $section */
         $section = $this->_configStructure->getElement($current);
         if ($current && !$section->isVisible($website, $store)) {
             /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
diff --git a/app/code/Magento/Config/Model/Config/Backend/Currency/Cron.php b/app/code/Magento/Config/Model/Config/Backend/Currency/Cron.php
index 284a4e87e19da..e9fadc8f4995f 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Currency/Cron.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Currency/Cron.php
@@ -89,7 +89,7 @@ public function afterSave()
         $cronExprString = join(' ', $cronExprArray);
 
         try {
-            /** @var $configValue \Magento\Framework\App\Config\ValueInterface */
+            /** @var \Magento\Framework\App\Config\ValueInterface $configValue */
             $configValue = $this->_configValueFactory->create();
             $configValue->load(self::CRON_STRING_PATH, 'path');
             $configValue->setValue($cronExprString)->setPath(self::CRON_STRING_PATH)->save();
diff --git a/app/code/Magento/Config/Model/Config/Backend/Locale.php b/app/code/Magento/Config/Model/Config/Backend/Locale.php
index 460a1e6c38250..d63d5066e8223 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Locale.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Locale.php
@@ -80,7 +80,7 @@ public function __construct(
      */
     public function afterSave()
     {
-        /** @var $collection \Magento\Config\Model\ResourceModel\Config\Data\Collection */
+        /** @var \Magento\Config\Model\ResourceModel\Config\Data\Collection $collection */
         $collection = $this->_configsFactory->create();
         $collection->addPathFilter('currency/options');
 
@@ -106,14 +106,14 @@ public function afterSave()
                             break;
 
                         case \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE:
-                            /** @var $website \Magento\Store\Model\Website */
+                            /** @var \Magento\Store\Model\Website $website */
                             $website = $this->_websiteFactory->create();
                             $websiteName = $website->load($data->getScopeId())->getName();
                             $scopeName = __('website(%1) scope', $websiteName);
                             break;
 
                         case \Magento\Store\Model\ScopeInterface::SCOPE_STORE:
-                            /** @var $store \Magento\Store\Model\Store */
+                            /** @var \Magento\Store\Model\Store $store */
                             $store = $this->_storeFactory->create();
                             $storeName = $store->load($data->getScopeId())->getName();
                             $scopeName = __('store(%1) scope', $storeName);
diff --git a/app/code/Magento/Config/Model/Config/Backend/Log/Cron.php b/app/code/Magento/Config/Model/Config/Backend/Log/Cron.php
index cd0af22c3eda3..aa7222b4ab04e 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Log/Cron.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Log/Cron.php
@@ -87,12 +87,12 @@ public function afterSave()
         }
 
         try {
-            /** @var $configValue \Magento\Framework\App\Config\ValueInterface */
+            /** @var \Magento\Framework\App\Config\ValueInterface $configValue */
             $configValue = $this->_configValueFactory->create();
             $configValue->load(self::CRON_STRING_PATH, 'path');
             $configValue->setValue($cronExprString)->setPath(self::CRON_STRING_PATH)->save();
 
-            /** @var $configValue \Magento\Framework\App\Config\ValueInterface */
+            /** @var \Magento\Framework\App\Config\ValueInterface $configValue */
             $configValue = $this->_configValueFactory->create();
             $configValue->load(self::CRON_MODEL_PATH, 'path');
             $configValue->setValue($this->_runModelPath)->setPath(self::CRON_MODEL_PATH)->save();
diff --git a/app/code/Magento/Config/Model/Config/Source/Email/Identity.php b/app/code/Magento/Config/Model/Config/Source/Email/Identity.php
index 8cc7af6f619ac..23b179b8649b8 100644
--- a/app/code/Magento/Config/Model/Config/Source/Email/Identity.php
+++ b/app/code/Magento/Config/Model/Config/Source/Email/Identity.php
@@ -42,10 +42,10 @@ public function toOptionArray()
     {
         if ($this->_options === null) {
             $this->_options = [];
-            /** @var $section \Magento\Config\Model\Config\Structure\Element\Section */
+            /** @var \Magento\Config\Model\Config\Structure\Element\Section $section */
             $section = $this->_configStructure->getElement('trans_email');
 
-            /** @var $group \Magento\Config\Model\Config\Structure\Element\Group */
+            /** @var \Magento\Config\Model\Config\Structure\Element\Group $group */
             foreach ($section->getChildren() as $group) {
                 $this->_options[] = [
                     'value' => preg_replace('#^ident_(.*)$#', '$1', $group->getId()),
diff --git a/app/code/Magento/Config/Model/Config/Source/Email/Template.php b/app/code/Magento/Config/Model/Config/Source/Email/Template.php
index 182faa53e5288..f6a1a4b9d890c 100644
--- a/app/code/Magento/Config/Model/Config/Source/Email/Template.php
+++ b/app/code/Magento/Config/Model/Config/Source/Email/Template.php
@@ -53,7 +53,7 @@ public function __construct(
      */
     public function toOptionArray()
     {
-        /** @var $collection \Magento\Email\Model\ResourceModel\Template\Collection */
+        /** @var \Magento\Email\Model\ResourceModel\Template\Collection $collection */
         if (!($collection = $this->_coreRegistry->registry('config_system_email_template'))) {
             $collection = $this->_templatesFactory->create();
             $collection->load();
diff --git a/app/code/Magento/Config/Model/Config/Source/Store.php b/app/code/Magento/Config/Model/Config/Source/Store.php
index 7ba46677a08c7..f04a9f301ac5d 100644
--- a/app/code/Magento/Config/Model/Config/Source/Store.php
+++ b/app/code/Magento/Config/Model/Config/Source/Store.php
@@ -35,7 +35,7 @@ public function __construct(\Magento\Store\Model\ResourceModel\Store\CollectionF
     public function toOptionArray()
     {
         if (!$this->_options) {
-            /** @var $stores \Magento\Store\Model\ResourceModel\Store\Collection */
+            /** @var \Magento\Store\Model\ResourceModel\Store\Collection $stores */
             $stores = $this->_storesFactory->create();
             $this->_options = $stores->load()->toOptionArray();
         }
diff --git a/app/code/Magento/Config/Model/Config/Structure.php b/app/code/Magento/Config/Model/Config/Structure.php
index 6344714ad678f..00ed4d29961aa 100644
--- a/app/code/Magento/Config/Model/Config/Structure.php
+++ b/app/code/Magento/Config/Model/Config/Structure.php
@@ -210,7 +210,7 @@ public function getFirstSection()
     {
         $tabs = $this->getTabs();
         $tabs->rewind();
-        /** @var $tab \Magento\Config\Model\Config\Structure\Element\Tab */
+        /** @var \Magento\Config\Model\Config\Structure\Element\Tab $tab */
         $tab = $tabs->current();
         $tab->getChildren()->rewind();
         if (!$tab->getChildren()->current()->isVisible()) {
diff --git a/app/code/Magento/Config/Model/Config/Structure/Converter.php b/app/code/Magento/Config/Model/Config/Structure/Converter.php
index 38ddd69a444fd..b05ec70cd347c 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Converter.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Converter.php
@@ -63,7 +63,7 @@ public function convert($source)
         $result = $this->_convertDOMDocument($source);
 
         foreach ($this->_mapperList as $type) {
-            /** @var $mapper MapperInterface */
+            /** @var MapperInterface $mapper */
             $mapper = $this->_mapperFactory->create($type);
             $result = $mapper->map($result);
         }
@@ -111,7 +111,7 @@ protected function _convertDOMDocument(\DOMNode $root)
                     break;
 
                 default:
-                    /** @var $child \DOMElement */
+                    /** @var \DOMElement $child */
                     if ($childName == 'attribute') {
                         $childName = $child->getAttribute('type');
                     }
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml
index 19f7a73739400..2d4a6c76ba7e7 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/* @var $block \Magento\Backend\Block\Template */
+/** @var \Magento\Backend\Block\Template $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div class="field field-store-switcher">
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/tabs.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/tabs.phtml
index 73641206a0256..361b48bbe0c5f 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/tabs.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/tabs.phtml
@@ -4,13 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Config\Block\System\Config\Tabs */
+/** @var \Magento\Config\Block\System\Config\Tabs $block */
 ?>
 
 <?php if ($block->getTabs()) : ?>
     <div id="<?= $block->escapeHtmlAttr($block->getId()) ?>" class="config-nav">
         <?php
-        /** @var $_tab \Magento\Config\Model\Config\Structure\Element\Tab */
+        /** @var \Magento\Config\Model\Config\Structure\Element\Tab $_tab */
         foreach ($block->getTabs() as $_tab) :
             $activeCollapsible = false;
             foreach ($_tab->getChildren() as $_section) {
@@ -35,7 +35,7 @@
                 <ul class="admin__page-nav-items items" data-role="content">
                     <?php $_iterator = 1; ?>
                     <?php
-                    /** @var $_section \Magento\Config\Model\Config\Structure\Element\Section */
+                    /** @var \Magento\Config\Model\Config\Structure\Element\Section $_section */
                     foreach ($_tab->getChildren() as $_section) : ?>
                         <li class="admin__page-nav-item item
                             <?= $block->escapeHtml($_section->getClass()) ?>
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/Edit/Tab/Variations/Main.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/Edit/Tab/Variations/Main.php
index 2ad6d55d21755..70f9d15fd97c9 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/Edit/Tab/Variations/Main.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/Edit/Tab/Variations/Main.php
@@ -24,9 +24,9 @@ class Main extends \Magento\Eav\Block\Adminhtml\Attribute\Edit\Main\AbstractMain
     protected function _prepareForm()
     {
         parent::_prepareForm();
-        /* @var $form \Magento\Framework\Data\Form */
+        /** @var \Magento\Framework\Data\Form $form */
         $form = $this->getForm();
-        /* @var $fieldset \Magento\Framework\Data\Form\Element\Fieldset */
+        /** @var \Magento\Framework\Data\Form\Element\Fieldset $fieldset */
         $fieldset = $form->getElement('base_fieldset');
         $fieldsToRemove = ['attribute_code', 'is_unique', 'frontend_class'];
 
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php
index 92c40f71f2db9..8bc4e5ce685a5 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php
@@ -71,10 +71,10 @@ public function __construct(
     protected function _getGroupAttributes()
     {
         $attributes = [];
-        /** @var $product \Magento\Catalog\Model\Product */
+        /** @var \Magento\Catalog\Model\Product $product */
         $product = $this->_coreRegistry->registry('product');
         foreach ($product->getAttributes($this->getRequest()->getParam('group')) as $attribute) {
-            /** @var $attribute \Magento\Eav\Model\Entity\Attribute */
+            /** @var \Magento\Eav\Model\Entity\Attribute $attribute */
             if ($attribute->getId() == $this->getRequest()->getParam('attribute')) {
                 $attributes[] = $attribute;
             }
@@ -101,7 +101,7 @@ public function getAttributesBlockJson()
     {
         $result = [];
         if ($this->getRequest()->getParam('product_tab') == 'variations') {
-            /** @var $attribute \Magento\Eav\Model\Entity\Attribute */
+            /** @var \Magento\Eav\Model\Entity\Attribute $attribute */
             $attribute = $this->_attributeFactory->create()->load($this->getRequest()->getParam('attribute'));
             $result = [
                 'tab' => $this->getRequest()->getParam('product_tab'),
@@ -115,7 +115,7 @@ public function getAttributesBlockJson()
         }
         $newAttributeSetId = $this->getRequest()->getParam('new_attribute_set_id');
         if ($newAttributeSetId) {
-            /** @var $attributeSet \Magento\Eav\Model\Entity\Attribute\Set */
+            /** @var \Magento\Eav\Model\Entity\Attribute\Set $attributeSet */
             $attributeSet = $this->_setFactory->create()->load($newAttributeSetId);
             $result['set'] = ['id' => $attributeSet->getId(), 'label' => $attributeSet->getAttributeSetName()];
         }
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php
index 8de98b53b97a3..3318f8cb068f6 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php
@@ -235,7 +235,7 @@ protected function getAssociatedProducts()
         foreach ($this->_getAssociatedProducts() as $product) {
             $keys = [];
             foreach ($this->getUsedAttributes() as $attribute) {
-                /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+                /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
                 $keys[] = $product->getData($attribute->getAttributeCode());
             }
             $productByUsedAttributes[implode('-', $keys)] = $product;
@@ -252,7 +252,7 @@ private function getVariantAttributeComposition(): array
     {
         $variants = [];
         foreach ($this->_getAssociatedProducts() as $product) {
-            /* @var $attribute AbstractAttribute */
+            /** @var AbstractAttribute $attribute */
             foreach ($this->getUsedAttributes() as $attribute) {
                 $variants[$product->getId()][$attribute->getAttributeCode()] =
                     [
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/Bulk.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/Bulk.php
index ba58d3af0a59b..4292fc81cf443 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/Bulk.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/Bulk.php
@@ -89,7 +89,7 @@ public function getImageTypes()
     {
         $imageTypes = [];
         foreach ($this->catalogProductMediaConfig->getMediaAttributeCodes() as $attributeCode) {
-            /* @var $attribute Attribute */
+            /** @var Attribute $attribute */
             $imageTypes[$attributeCode] = [
                 'code' => $attributeCode,
                 'value' => '',
diff --git a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
index 78bd6ce510c06..b8a389528424e 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
@@ -180,7 +180,7 @@ public function getAllowProducts()
         if (!$this->hasAllowProducts()) {
             $products = [];
             $allProducts = $this->getProduct()->getTypeInstance()->getUsedProducts($this->getProduct(), null);
-            /** @var $product \Magento\Catalog\Model\Product */
+            /** @var \Magento\Catalog\Model\Product $product */
             foreach ($allProducts as $product) {
                 if ((int) $product->getStatus() === Status::STATUS_ENABLED) {
                     $products[] = $product;
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Builder/Plugin.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Builder/Plugin.php
index f96f73eb3c328..c76fea415d5fe 100644
--- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Builder/Plugin.php
+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Builder/Plugin.php
@@ -78,7 +78,7 @@ public function afterBuild(CatalogProductBuilder $subject, Product $product, Req
 
             $data = [];
             foreach ($configProduct->getTypeInstance()->getSetAttributes($configProduct) as $attribute) {
-                /* @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+                /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
                 if (!$attribute->getIsUnique() &&
                     $attribute->getFrontend()->getInputType() != 'gallery' &&
                     $attribute->getAttributeCode() != 'required_options' &&
diff --git a/app/code/Magento/ConfigurableProduct/Helper/Data.php b/app/code/Magento/ConfigurableProduct/Helper/Data.php
index 7790c82c49b35..d6173dd7ad53e 100644
--- a/app/code/Magento/ConfigurableProduct/Helper/Data.php
+++ b/app/code/Magento/ConfigurableProduct/Helper/Data.php
@@ -64,7 +64,7 @@ public function getGalleryImages(ProductInterface $product)
     {
         $images = $product->getMediaGalleryImages();
         if ($images instanceof \Magento\Framework\Data\Collection) {
-            /** @var $image Image */
+            /** @var Image $image */
             foreach ($images as $image) {
                 $smallImageUrl = $this->imageUrlBuilder
                     ->getUrl($image->getFile(), 'product_page_image_small');
diff --git a/app/code/Magento/ConfigurableProduct/Model/ConfigurableAttributeHandler.php b/app/code/Magento/ConfigurableProduct/Model/ConfigurableAttributeHandler.php
index f9f00289de6a6..7eaf1eacd7b27 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ConfigurableAttributeHandler.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ConfigurableAttributeHandler.php
@@ -30,7 +30,7 @@ public function __construct(
      */
     public function getApplicableAttributes()
     {
-        /** @var $collection \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection */
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection $collection */
         $collection = $this->collectionFactory->create();
         return $collection->addFieldToFilter(
             'frontend_input',
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index 375bb0cdeb490..7837fed14b916 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -513,7 +513,7 @@ public function getConfigurableAttributesAsArray($product)
                 $storeId = $product->getStoreId();
             }
             $eavAttribute->setStoreId($storeId);
-            /* @var $attribute \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute */
+            /** @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute $attribute */
             $res[$eavAttribute->getId()] = [
                 'id' => $attribute->getId(),
                 'label' => $attribute->getLabel(),
@@ -691,7 +691,7 @@ private function saveConfigurableOptions(ProductInterface $product)
         $metadata = $this->getMetadataPool()->getMetadata(ProductInterface::class);
 
         foreach ($data as $attributeData) {
-            /** @var $configurableAttribute \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute */
+            /** @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute $configurableAttribute */
             $configurableAttribute = $this->configurableAttributeFactory->create();
             if (!$product->getIsDuplicate()) {
                 if (!empty($attributeData['id'])) {
@@ -717,7 +717,7 @@ private function saveConfigurableOptions(ProductInterface $product)
                 ->setProductId($product->getData($metadata->getLinkField()))
                 ->save();
         }
-        /** @var $configurableAttributesCollection \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection */
+        /** @var \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection $configurableAttributesCollection */
         $configurableAttributesCollection = $this->_attributeCollectionFactory->create();
         $configurableAttributesCollection->setProductFilter($product);
         $configurableAttributesCollection->addFieldToFilter(
@@ -919,7 +919,7 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
                 $subProduct = true;
                 if ($this->_isStrictProcessMode($processMode)) {
                     foreach ($this->getConfigurableAttributes($product) as $attributeItem) {
-                        /* @var $attributeItem \Magento\Framework\DataObject */
+                        /** @var \Magento\Framework\DataObject $attributeItem */
                         $attrId = $attributeItem->getData('attribute_id');
                         if (!isset($attributes[$attrId]) || empty($attributes[$attrId])) {
                             $subProduct = null;
@@ -1054,7 +1054,7 @@ public function isVirtual($product)
     {
         if ($productOption = $product->getCustomOption('simple_product')) {
             if ($optionProduct = $productOption->getProduct()) {
-                /* @var $optionProduct \Magento\Catalog\Model\Product */
+                /** @var \Magento\Catalog\Model\Product $optionProduct */
                 return $optionProduct->isVirtual();
             }
         }
@@ -1195,7 +1195,7 @@ public function getConfigurableOptions($product)
     public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $product)
     {
         $this->typeConfigurableFactory->create()->saveProducts($product, []);
-        /** @var $configurableAttribute \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute */
+        /** @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute $configurableAttribute */
         $configurableAttribute = $this->configurableAttributeFactory->create();
         $configurableAttribute->deleteByProduct($product);
     }
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php b/app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php
index 96d245358ded9..b9273a4af8969 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php
@@ -141,14 +141,14 @@ public function prepareAttributeSet(\Magento\Catalog\Model\Product $product)
     {
         $attributes = $this->configurableProduct->getUsedProductAttributes($product);
         $attributeSetId = $product->getNewVariationsAttributeSetId();
-        /** @var $attributeSet \Magento\Eav\Model\Entity\Attribute\Set */
+        /** @var \Magento\Eav\Model\Entity\Attribute\Set $attributeSet */
         $attributeSet = $this->attributeSetFactory->create()->load($attributeSetId);
         $attributeSet->addSetInfo(
             $this->entityFactory->create()->setType(\Magento\Catalog\Model\Product::ENTITY)->getTypeId(),
             $attributes
         );
         foreach ($attributes as $attribute) {
-            /* @var $attribute \Magento\Catalog\Model\Entity\Attribute */
+            /** @var \Magento\Catalog\Model\Entity\Attribute $attribute */
             if (!$attribute->isInSet($attributeSetId)) {
                 $attribute->setAttributeSetId(
                     $attributeSetId
diff --git a/app/code/Magento/ConfigurableProduct/Model/SuggestedAttributeList.php b/app/code/Magento/ConfigurableProduct/Model/SuggestedAttributeList.php
index d13ba61ef1418..e20e7860f85ee 100644
--- a/app/code/Magento/ConfigurableProduct/Model/SuggestedAttributeList.php
+++ b/app/code/Magento/ConfigurableProduct/Model/SuggestedAttributeList.php
@@ -42,14 +42,14 @@ public function __construct(
     public function getSuggestedAttributes($labelPart)
     {
         $escapedLabelPart = $this->_resourceHelper->addLikeEscape($labelPart, ['position' => 'any']);
-        /** @var $collection \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection */
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection $collection */
         $collection = $this->configurableAttributeHandler->getApplicableAttributes()->addFieldToFilter(
             'frontend_label',
             ['like' => $escapedLabelPart]
         );
         $result = [];
         foreach ($collection->getItems() as $id => $attribute) {
-            /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+            /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
             if ($this->configurableAttributeHandler->isAttributeApplicable($attribute)) {
                 $result[$id] = [
                     'id' => $attribute->getId(),
diff --git a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProducts.php b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProducts.php
index 7d5b8183e81f1..642c59d03308f 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProducts.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProducts.php
@@ -335,7 +335,7 @@ protected function getAssociatedProducts()
         foreach ($this->_getAssociatedProducts() as $product) {
             $keys = [];
             foreach ($this->getUsedAttributes() as $attribute) {
-                /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+                /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
                 $keys[] = $product->getData($attribute->getAttributeCode());
             }
             $productByUsedAttributes[implode('-', $keys)] = $product;
@@ -509,7 +509,7 @@ private function getVariantAttributeComposition(): array
     {
         $variants = [];
         foreach ($this->_getAssociatedProducts() as $product) {
-            /* @var $attribute AbstractAttribute */
+            /** @var AbstractAttribute $attribute */
             foreach ($this->getUsedAttributes() as $attribute) {
                 $variants[$product->getId()][$attribute->getAttributeCode()] =
                     [
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/new/created.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/new/created.phtml
index 4ad7a6419ca63..3fb28a6c7ab58 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/new/created.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/new/created.phtml
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-/** @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Attribute\NewAttribute\Product\Created */
+/** @var \Magento\ConfigurableProduct\Block\Adminhtml\Product\Attribute\NewAttribute\Product\Created $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php $attributes = /* @noEscape */ $block->getAttributesBlockJson();
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
index a46d50176369a..9094eb57aa2f5 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Composite\Fieldset\Configurable */
+/** @var \Magento\ConfigurableProduct\Block\Adminhtml\Product\Composite\Fieldset\Configurable $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php $_product = $block->getProduct(); ?>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
index e94d94e0ded55..f8007ea9f7d86 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\AttributeValues */
+/** @var \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\AttributeValues $block */
 $isAllowedToManageAttributes = $block->getPermissions()->isAllowedToManageAttributes();
 $attributesUrl = $block->getUrl('catalog/product_attribute/getAttributes');
 $optionsUrl = $block->getUrl('catalog/product_attribute/createOptions');
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml
index 986457b94e3d9..df9e4f48d46aa 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml
@@ -5,9 +5,9 @@
  */
 
 // phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
-/* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\Bulk */
+/** @var \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\Bulk $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
-/** @var $viewModel uploadResizeConfigValue */
+/** @var uploadResizeConfigValue $viewModel */
 /** @var \Magento\Framework\Escaper $escaper */
 
 use Magento\ConfigurableProduct\ViewModel\uploadResizeConfigValue;
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/select_attributes.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/select_attributes.phtml
index 92fae99f6ec24..d93606a8f6503 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/select_attributes.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/select_attributes.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\SelectAttributes */
+/** @var \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\SelectAttributes $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div class="select-attributes-block <?= /* @noEscape */ $block->getData('config/dataScope') ?>"
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/summary.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/summary.phtml
index 439fd0c934403..2df806a5d100c 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/summary.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/summary.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\Summary */
+/** @var \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\Summary $block */
 
 ?>
 <div data-bind="scope: '<?= /* @noEscape */  $block->getComponentName() ?>'">
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
index 240c5e65c79c3..0c9fb6f069166 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config */
+/** @var \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config $block */
 ?>
 <div class="entry-edit form-inline" id="<?= $block->escapeHtmlAttr($block->getId()) ?>" data-panel="product-variations">
     <div data-bind="scope: 'variation-steps-wizard'" class="product-create-configuration">
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
index dcff7a579a0a4..0bbd2d4e2f79d 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
@@ -5,7 +5,7 @@
  */
 
 // phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
-/** @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config\Matrix */
+/** @var \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config\Matrix $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard-ajax.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard-ajax.phtml
index 55694a6d4909a..c45f870f6ca76 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard-ajax.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard-ajax.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config\Matrix */
+/** @var \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config\Matrix $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 
 $productMatrix = $block->getProductMatrix();
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml
index f3c6511772550..f6289a14a6a18 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config\Matrix */
+/** @var \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config\Matrix $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 /** @var \Magento\Framework\Escaper $escaper */
 ?>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/form.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/form.phtml
index 6b30b3eba33b4..2004c5b8fa465 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/form.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/form.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/* @var $block \Magento\Framework\View\Element\Template */
+/** @var \Magento\Framework\View\Element\Template $block */
 ?>
 <div data-role="affected-attribute-set-selector" class="no-display affected-attribute-set">
     <?= $block->getChildHtml('affected-attribute-set-form') ?>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml
index d5c946621e90d..bc8deb8727cd0 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/* @var $block \Magento\ConfigurableProduct\Block\Product\Configurable\AttributeSelector */
+/** @var \Magento\ConfigurableProduct\Block\Product\Configurable\AttributeSelector $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml
index 59bfabe736c02..622143d396714 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\ConfigurableProduct\Block\Product\Configurable\AttributeSelector */
+/** @var \Magento\ConfigurableProduct\Block\Product\Configurable\AttributeSelector $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
diff --git a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml
index 880a11fa9b305..4b513764c4659 100644
--- a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $escaper \Magento\Framework\Escaper */
+/** @var \Magento\Framework\Escaper $escaper */
 /** @var \Magento\ConfigurableProduct\Pricing\Render\FinalPriceBox $block */
 /** @var \Magento\Framework\Pricing\Price\PriceInterface $priceModel */
 $priceModel = $block->getPriceType('regular_price');
diff --git a/app/code/Magento/Contact/view/frontend/templates/form.phtml b/app/code/Magento/Contact/view/frontend/templates/form.phtml
index 1552897cb0850..d9757c01ce427 100644
--- a/app/code/Magento/Contact/view/frontend/templates/form.phtml
+++ b/app/code/Magento/Contact/view/frontend/templates/form.phtml
@@ -14,7 +14,7 @@ if (!$block->getButtonLockManager()) {
         $objectManager->get(\Magento\Framework\View\Element\ButtonLockManager::class)
     );
 }
-/** @var $escaper \Magento\Framework\Escaper */
+/** @var \Magento\Framework\Escaper $escaper */
 /** @var \Magento\Contact\ViewModel\UserDataProvider $viewModel */
 
 $viewModel = $block->getViewModel();
diff --git a/app/code/Magento/Cron/Model/Config/Converter/Xml.php b/app/code/Magento/Cron/Model/Config/Converter/Xml.php
index 810788cfb7570..65280e08c6c25 100644
--- a/app/code/Magento/Cron/Model/Config/Converter/Xml.php
+++ b/app/code/Magento/Cron/Model/Config/Converter/Xml.php
@@ -27,7 +27,7 @@ public function convert($source)
 
         $groups = $source->getElementsByTagName('group');
         foreach ($groups as $group) {
-            /** @var $group \DOMElement */
+            /** @var \DOMElement $group */
             if (!$group->hasAttribute('id')) {
                 throw new \InvalidArgumentException('Attribute "id" does not exist');
             }
diff --git a/app/code/Magento/Cron/Model/Groups/Config/Converter/Xml.php b/app/code/Magento/Cron/Model/Groups/Config/Converter/Xml.php
index 208bb4176c99c..7648da983f424 100644
--- a/app/code/Magento/Cron/Model/Groups/Config/Converter/Xml.php
+++ b/app/code/Magento/Cron/Model/Groups/Config/Converter/Xml.php
@@ -27,7 +27,7 @@ public function convert($source)
 
         $groups = $source->getElementsByTagName('group');
         foreach ($groups as $group) {
-            /** @var $group \DOMElement */
+            /** @var \DOMElement $group */
             if (!$group->hasAttribute('id')) {
                 throw new \InvalidArgumentException('Attribute "id" does not exist');
             }
@@ -35,7 +35,7 @@ public function convert($source)
                 if (!$child instanceof \DOMElement) {
                     continue;
                 }
-                /** @var $group \DOMElement */
+                /** @var \DOMElement $group */
                 $output[$group->getAttribute('id')][$child->nodeName]['value'] = $child->nodeValue;
                 if ($child->hasAttribute('tooltip')) {
                     $output[$group->getAttribute('id')][$child->nodeName]['tooltip'] = $child->getAttribute('tooltip');
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php b/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php
index ad72d9e88a187..0ce0227387886 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php
@@ -61,7 +61,7 @@ public function __construct(
     public function getValidateButton()
     {
         if ($this->_validateButton === null) {
-            /** @var $form \Magento\Framework\Data\Form */
+            /** @var \Magento\Framework\Data\Form $form */
             $form = $this->_element->getForm();
 
             $vatElementId = $this->_element->getHtmlId();
diff --git a/app/code/Magento/Customer/Console/Command/UpgradeHashAlgorithmCommand.php b/app/code/Magento/Customer/Console/Command/UpgradeHashAlgorithmCommand.php
index 260efefe48ddb..1d4b4b8c55396 100644
--- a/app/code/Magento/Customer/Console/Command/UpgradeHashAlgorithmCommand.php
+++ b/app/code/Magento/Customer/Console/Command/UpgradeHashAlgorithmCommand.php
@@ -63,7 +63,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->collection = $this->customerCollectionFactory->create();
         $this->collection->addAttributeToSelect('*');
         $customerCollection = $this->collection->getItems();
-        /** @var $customer Customer */
+        /** @var Customer $customer */
         foreach ($customerCollection as $customer) {
             $customer->load($customer->getId());
             if (!$this->encryptor->validateHashVersion($customer->getPasswordHash())) {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php
index 0acc349d65b7b..37cdaf15b3166 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php
@@ -176,7 +176,7 @@ protected function _validateCustomer($response)
             }
             $errors = $this->customerAccountManagement->validate($customer)->getMessages();
         } catch (\Magento\Framework\Validator\Exception $exception) {
-            /* @var $error Error */
+            /** @var Error $error */
             foreach ($exception->getMessages(\Magento\Framework\Message\MessageInterface::TYPE_ERROR) as $error) {
                 $errors[] = $error->getText();
             }
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist.php b/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist.php
index 2e38ba8de25f6..90f64cb561a4f 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist.php
@@ -46,7 +46,7 @@ protected function _initData()
             throw new CoreException(__('Please define Wish List item ID.'));
         }
 
-        /* @var $wishlistItem \Magento\Wishlist\Model\Item */
+        /** @var \Magento\Wishlist\Model\Item $wishlistItem */
         $wishlistItem = $this->_objectManager->create(
             \Magento\Wishlist\Model\Item::class
         )->loadWithOptions($wishlistItemId);
diff --git a/app/code/Magento/Customer/Helper/Address.php b/app/code/Magento/Customer/Helper/Address.php
index 88f3024c2dc7b..38278959d6f3d 100644
--- a/app/code/Magento/Customer/Helper/Address.php
+++ b/app/code/Magento/Customer/Helper/Address.php
@@ -280,7 +280,7 @@ public function getAttributeValidationClass($attributeCode)
         $class = '';
 
         try {
-            /** @var $attribute AttributeMetadataInterface */
+            /** @var AttributeMetadataInterface $attribute */
             $attribute = isset($this->_attributes[$attributeCode])
                 ? $this->_attributes[$attributeCode]
                 : $this->_addressMetadataService->getAttributeMetadata($attributeCode);
diff --git a/app/code/Magento/Customer/Model/Metadata/CustomerMetadata.php b/app/code/Magento/Customer/Model/Metadata/CustomerMetadata.php
index 38f3fbcbdbded..5e2b740b2a4fc 100644
--- a/app/code/Magento/Customer/Model/Metadata/CustomerMetadata.php
+++ b/app/code/Magento/Customer/Model/Metadata/CustomerMetadata.php
@@ -66,7 +66,7 @@ public function getAttributes($formCode)
             $formCode
         );
         foreach ($attributesFormCollection as $attribute) {
-            /** @var $attribute \Magento\Customer\Model\Attribute */
+            /** @var \Magento\Customer\Model\Attribute $attribute */
             $attributes[$attribute->getAttributeCode()] = $this->attributeMetadataConverter
                 ->createMetadataAttribute($attribute);
         }
diff --git a/app/code/Magento/Customer/Model/Plugin/CustomerRepository/TransactionWrapper.php b/app/code/Magento/Customer/Model/Plugin/CustomerRepository/TransactionWrapper.php
index 45041b10c9c7b..7ba494db637bb 100644
--- a/app/code/Magento/Customer/Model/Plugin/CustomerRepository/TransactionWrapper.php
+++ b/app/code/Magento/Customer/Model/Plugin/CustomerRepository/TransactionWrapper.php
@@ -40,7 +40,7 @@ public function aroundSave(
     ) {
         $this->resourceModel->beginTransaction();
         try {
-            /** @var $result \Magento\Customer\Api\Data\CustomerInterface */
+            /** @var \Magento\Customer\Api\Data\CustomerInterface $result */
             $result = $proceed($customer, $passwordHash);
             $this->resourceModel->commit();
             return $result;
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php
index dd502abcafca9..10d36bba245ed 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php
@@ -50,7 +50,7 @@ public function __construct(
      */
     public function processRelation(AbstractModel $object): void
     {
-        /** @var $object Address */
+        /** @var Address $object */
         if (!$object->getIsCustomerSaveTransaction() && $object->getId()) {
             $customer = $this->customerFactory->create()->load($object->getCustomerId());
 
diff --git a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
index e365c1c27c76b..c2ed1a22d2354 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
@@ -217,7 +217,7 @@ public function save(CustomerInterface $customer, $passwordHash = null)
         if ($customer->getDefaultShipping()) {
             $this->validateDefaultAddress($customer, $prevCustomerData, CustomerInterface::DEFAULT_SHIPPING);
         }
-        /** @var $customer \Magento\Customer\Model\Data\Customer */
+        /** @var \Magento\Customer\Model\Data\Customer $customer */
         $customerArr = $customer->__toArray();
         $customer = $this->imageProcessor->save(
             $customer,
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Group.php b/app/code/Magento/Customer/Model/ResourceModel/Group.php
index 6b56298500c57..6f0fa1b1b9d27 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Group.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Group.php
@@ -96,7 +96,7 @@ protected function _afterDelete(\Magento\Framework\Model\AbstractModel $group)
             $group->getId()
         )->load();
         foreach ($customerCollection as $customer) {
-            /** @var $customer \Magento\Customer\Model\Customer */
+            /** @var \Magento\Customer\Model\Customer $customer */
             $customer->load($customer->getId());
             $defaultGroupId = $this->_groupManagement->getDefaultGroup($customer->getStoreId())->getId();
             $customer->setGroupId($defaultGroupId);
diff --git a/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php b/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
index 0a98f6521def1..274d697b6e9cc 100644
--- a/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
+++ b/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
@@ -123,7 +123,7 @@ public function __construct(
      */
     public function execute(Observer $observer)
     {
-        /** @var $customerAddress Address */
+        /** @var Address $customerAddress */
         $customerAddress = $observer->getCustomerAddress();
         $customer = $customerAddress->getCustomer();
 
diff --git a/app/code/Magento/Customer/Observer/BeforeAddressSaveObserver.php b/app/code/Magento/Customer/Observer/BeforeAddressSaveObserver.php
index a24b27543a5cc..9bef2b3590d10 100644
--- a/app/code/Magento/Customer/Observer/BeforeAddressSaveObserver.php
+++ b/app/code/Magento/Customer/Observer/BeforeAddressSaveObserver.php
@@ -56,7 +56,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             $this->_coreRegistry->unregister(self::VIV_CURRENTLY_SAVED_ADDRESS);
         }
 
-        /** @var $customerAddress Address */
+        /** @var Address $customerAddress */
         $customerAddress = $observer->getCustomerAddress();
         if ($customerAddress->getId()) {
             $this->_coreRegistry->register(self::VIV_CURRENTLY_SAVED_ADDRESS, $customerAddress->getId());
diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/AddressTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/AddressTest.php
index 745ede53611f6..afa471a7baae1 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/AddressTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/AddressTest.php
@@ -78,7 +78,7 @@ protected function setUp(): void
      */
     public function testSave($addressId, $isDefaultBilling, $isDefaultShipping)
     {
-        /** @var $address \Magento\Customer\Model\Address|\PHPUnit\Framework\MockObject\MockObject */
+        /** @var \Magento\Customer\Model\Address|\PHPUnit\Framework\MockObject\MockObject $address */
         $address = $this->getMockBuilder(Address::class)
             ->addMethods(['getIsDefaultBilling', 'getIsDefaultShipping'])
             ->onlyMethods(
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/cart_website_filter_form.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/cart_website_filter_form.phtml
index ec903fa978fce..d4f7adc0619f3 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/tab/cart_website_filter_form.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/cart_website_filter_form.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Backend\Block\Widget\Form */
+/** @var \Magento\Backend\Block\Widget\Form $block */
 ?>
 <?= $block->getFormHtml() ?>
 <?= $block->getChildHtml('form_after') ?>
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/view.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/view.phtml
index c385a3ede3906..359be7524fad7 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/tab/view.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/view.phtml
@@ -8,6 +8,6 @@
  * Template for block \Magento\Customer\Block\Adminhtml\Edit\Tab\View
  */
 
-/** @var $block \Magento\Customer\Block\Adminhtml\Edit\Tab\View */
+/** @var \Magento\Customer\Block\Adminhtml\Edit\Tab\View $block */
 ?>
 <?= $block->getChildHtml();
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/navigation.phtml b/app/code/Magento/Customer/view/frontend/templates/account/navigation.phtml
index b766093d21b3e..df78edfb5b68c 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/navigation.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/navigation.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Framework\View\Element\Html\Links */
+/** @var \Magento\Framework\View\Element\Html\Links $block */
 ?>
 <div class="block account-nav">
     <div class="title">
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
index 0d99344589b90..f3fc27a1e499c 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
@@ -13,7 +13,7 @@ if (!$block->getButtonLockManager()) {
         $objectManager->get(\Magento\Framework\View\Element\ButtonLockManager::class)
     );
 }
-/** @var $escaper \Magento\Framework\Escaper */
+/** @var \Magento\Framework\Escaper $escaper */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <form class="form form-edit-account"
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml b/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml
index 3fb8c5c41b7d1..9453d44ce2ad9 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml
@@ -15,7 +15,7 @@ if (!$block->getButtonLockManager()) {
         $objectManager->get(\Magento\Framework\View\Element\ButtonLockManager::class)
     );
 }
-/** @var $escaper \Magento\Framework\Escaper */
+/** @var \Magento\Framework\Escaper $escaper */
 ?>
 <form class="form password forget"
       action="<?= $escaper->escapeUrl($block->getUrl('*/*/forgotpasswordpost')) ?>"
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/login.phtml b/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
index e74c63470a990..ca9f44f51c810 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
@@ -13,7 +13,7 @@ if (!$block->getButtonLockManager()) {
         $objectManager->get(\Magento\Framework\View\Element\ButtonLockManager::class)
     );
 }
-/** @var $escaper \Magento\Framework\Escaper */
+/** @var \Magento\Framework\Escaper $escaper */
 ?>
 <div class="block block-customer-login">
     <div class="block-title">
diff --git a/app/code/Magento/Customer/view/frontend/templates/js/customer-data/invalidation-rules.phtml b/app/code/Magento/Customer/view/frontend/templates/js/customer-data/invalidation-rules.phtml
index 4f8a917d1ed62..c89da18587a54 100644
--- a/app/code/Magento/Customer/view/frontend/templates/js/customer-data/invalidation-rules.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/js/customer-data/invalidation-rules.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/* @var $block \Magento\Customer\Block\CustomerScopeData */
+/** @var \Magento\Customer\Block\CustomerScopeData $block */
 ?>
 <script type="text/x-magento-init">
     {
diff --git a/app/code/Magento/CustomerImportExport/Model/Export/Address.php b/app/code/Magento/CustomerImportExport/Model/Export/Address.php
index a2d38767432d9..9ac7f24134339 100644
--- a/app/code/Magento/CustomerImportExport/Model/Export/Address.php
+++ b/app/code/Magento/CustomerImportExport/Model/Export/Address.php
@@ -259,7 +259,7 @@ public function exportItem($item)
     {
         $row = $this->_addAttributeValuesToRow($item);
 
-        /** @var $customer \Magento\Customer\Model\Customer */
+        /** @var \Magento\Customer\Model\Customer $customer */
         $customer = $this->getCustomers()[$item->getParentId()];
 
         // Fill row with default address attributes values
diff --git a/app/code/Magento/CustomerImportExport/Model/Export/Customer.php b/app/code/Magento/CustomerImportExport/Model/Export/Customer.php
index 90fcc0beeb049..65ef7a99db67d 100644
--- a/app/code/Magento/CustomerImportExport/Model/Export/Customer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Export/Customer.php
@@ -186,7 +186,7 @@ public function exportItem($item)
      */
     public function filterAttributeCollection(\Magento\Framework\Data\Collection $collection)
     {
-        /** @var $attribute \Magento\Customer\Model\Attribute */
+        /** @var \Magento\Customer\Model\Attribute $attribute */
         foreach (parent::filterAttributeCollection($collection) as $attribute) {
             if (!empty($this->_attributeOverrides[$attribute->getAttributeCode()])) {
                 $data = $this->_attributeOverrides[$attribute->getAttributeCode()];
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Address.php b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
index 725987deccae5..da082a17bc7fc 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Address.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
@@ -309,7 +309,7 @@ public function __construct(
             ObjectManager::getInstance()->get(CountryWithWebsitesSource::class);
 
         if (!isset($data['attribute_collection'])) {
-            /** @var $attributeCollection \Magento\Customer\Model\ResourceModel\Address\Attribute\Collection */
+            /** @var \Magento\Customer\Model\ResourceModel\Address\Attribute\Collection $attributeCollection */
             $attributeCollection = $attributesFactory->create();
             $attributeCollection->addSystemHiddenFilter()->addExcludeHiddenFrontendFilter();
             $data['attribute_collection'] = $attributeCollection;
@@ -443,7 +443,7 @@ protected function _getNextEntityId()
      */
     protected function _initCountryRegions()
     {
-        /** @var $region \Magento\Directory\Model\Region */
+        /** @var \Magento\Directory\Model\Region $region */
         foreach ($this->_regionCollection as $region) {
             $countryNormalized = strtolower($region->getCountryId());
             $regionCode = $region->getCode() !== null ? strtolower($region->getCode()) : '';
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
index 2a7eb9b4319a8..08109ed1d648c 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
@@ -257,7 +257,7 @@ public function __construct(
         $this->_initStores(true)->_initAttributes();
 
         $this->_customerModel = $customerFactory->create();
-        /** @var $customerResource \Magento\Customer\Model\ResourceModel\Customer */
+        /** @var \Magento\Customer\Model\ResourceModel\Customer $customerResource */
         $customerResource = $this->_customerModel->getResource();
         $this->_entityTable = $customerResource->getEntityTable();
         $this->indexerProcessor = $indexerProcessor ?: ObjectManager::getInstance()->get(Processor::class);
@@ -451,7 +451,7 @@ protected function _prepareDataForUpdate(array $rowData)
                 $value = $value->format(DateTime::DATETIME_PHP_FORMAT);
             }
             if (!$this->_attributes[$attributeCode]['is_static']) {
-                /** @var $attribute \Magento\Customer\Model\Attribute */
+                /** @var \Magento\Customer\Model\Attribute $attribute */
                 $attribute = $this->_customerModel->getAttribute($attributeCode);
                 $backendModel = $attribute->getBackendModel();
                 if ($backendModel
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php b/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php
index 84cd7314c9975..78d6b81316e14 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php
@@ -248,7 +248,7 @@ public function __construct(
      */
     protected function _initCustomerAttributes()
     {
-        /** @var $attribute \Magento\Eav\Model\Entity\Attribute */
+        /** @var \Magento\Eav\Model\Entity\Attribute $attribute */
         foreach ($this->_customerEntity->getAttributeCollection() as $attribute) {
             $this->_customerAttributes[] = $attribute->getAttributeCode();
         }
@@ -263,7 +263,7 @@ protected function _initCustomerAttributes()
      */
     protected function _initAddressAttributes()
     {
-        /** @var $attribute \Magento\Eav\Model\Entity\Attribute */
+        /** @var \Magento\Eav\Model\Entity\Attribute $attribute */
         foreach ($this->_addressEntity->getAttributeCollection() as $attribute) {
             $this->_addressAttributes[] = $attribute->getAttributeCode();
         }
diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php
index 116c418c56ab4..7b6035b06efe0 100644
--- a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php
+++ b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php
@@ -280,7 +280,7 @@ protected function _createAttrCollectionMock()
      */
     protected function _createCustomerStorageMock()
     {
-        /** @var $customerStorage Storage|MockObject */
+        /** @var Storage|MockObject $customerStorage */
         $customerStorage = $this->createMock(Storage::class);
         $customerStorage
             ->method('getCustomerId')
diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/ResourceModel/Import/CustomerComposite/DataTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/ResourceModel/Import/CustomerComposite/DataTest.php
index 5e4d9f639ea8c..a9e20b786f8ad 100644
--- a/app/code/Magento/CustomerImportExport/Test/Unit/Model/ResourceModel/Import/CustomerComposite/DataTest.php
+++ b/app/code/Magento/CustomerImportExport/Test/Unit/Model/ResourceModel/Import/CustomerComposite/DataTest.php
@@ -43,7 +43,7 @@ class DataTest extends TestCase
      */
     protected function _getDependencies($entityType, $bunchData)
     {
-        /** @var $statementMock \Magento\Framework\DB\Statement\Pdo\Mysql */
+        /** @var \Magento\Framework\DB\Statement\Pdo\Mysql $statementMock */
         $statementMock = $this->createPartialMock(
             Mysql::class,
             ['setFetchMode', 'getIterator']
@@ -56,7 +56,7 @@ protected function _getDependencies($entityType, $bunchData)
             new \ArrayIterator($bunchData)
         );
 
-        /** @var $selectMock \Magento\Framework\DB\Select */
+        /** @var \Magento\Framework\DB\Select $selectMock */
         $selectMock = $this->createPartialMock(Select::class, ['from', 'order']);
         $selectMock->expects($this->any())->method('from')->willReturnSelf();
         $selectMock->expects($this->any())->method('order')->willReturnSelf();
@@ -70,7 +70,7 @@ protected function _getDependencies($entityType, $bunchData)
         $connectionMock->expects($this->any())->method('select')->willReturn($selectMock);
         $connectionMock->expects($this->any())->method('query')->willReturn($statementMock);
 
-        /** @var $resourceModelMock \Magento\Framework\App\ResourceConnection */
+        /** @var \Magento\Framework\App\ResourceConnection $resourceModelMock */
         $resourceModelMock = $this->createMock(ResourceConnection::class);
         $resourceModelMock->expects($this->any())->method('getConnection')->willReturn($connectionMock);
 
diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index d89ca4685960b..4481c40f660bb 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -1270,13 +1270,13 @@ protected function _parseResponse($response)
                 $this->_errors[] = $e->getMessage();
             }
         }
-        /* @var $result Result */
+        /** @var Result $result */
         $result = $this->_rateFactory->create();
         if ($this->_rates) {
             foreach ($this->_rates as $rate) {
                 $method = $rate['service'];
                 $data = $rate['data'];
-                /* @var $rate Method */
+                /** @var Method $rate */
                 $rate = $this->_rateMethodFactory->create();
                 $rate->setCarrier(self::CODE);
                 $rate->setCarrierTitle($this->getConfigData('title'));
@@ -1323,7 +1323,7 @@ protected function _addRate(SimpleXMLElement $shipmentDetails)
             $dhlProductDescription = $this->getDhlProductTitle($dhlProduct);
 
             if ($currencyCode != $baseCurrencyCode) {
-                /* @var $currency Currency */
+                /** @var Currency $currency */
                 $currency = $this->_currencyFactory->create();
                 $rates = $currency->getCurrencyRates($currencyCode, [$baseCurrencyCode]);
                 if (!empty($rates) && isset($rates[$baseCurrencyCode])) {
@@ -1527,13 +1527,13 @@ protected function _parseRestResponse($rateResponse): Result
             }
         }
 
-        /* @var $result Result */
+        /** @var Result $result */
         $result = $this->_rateFactory->create();
         if ($this->_rates) {
             foreach ($this->_rates as $rate) {
                 $method = $rate['service'];
                 $data = $rate['data'];
-                /* @var $rate Method */
+                /** @var Method $rate */
                 $rate = $this->_rateMethodFactory->create();
                 $rate->setCarrier(self::CODE);
                 $rate->setCarrierTitle($this->getConfigData('title'));
@@ -1587,7 +1587,7 @@ protected function _addRestRate(array $product, array $exchangeRates): self
             $dhlProductDescription = $this->getDhlProductTitle($dhlProduct);
 
             if ($currencyCode != $baseCurrencyCode) {
-                /* @var $currency Currency */
+                /** @var Currency $currency */
                 $currency = $this->_currencyFactory->create();
                 $rates = $currency->getCurrencyRates($currencyCode, [$baseCurrencyCode]);
                 if (!empty($rates) && isset($rates[$baseCurrencyCode])) {
diff --git a/app/code/Magento/Dhl/Model/Source/Method/AbstractMethod.php b/app/code/Magento/Dhl/Model/Source/Method/AbstractMethod.php
index 3ff4b33692574..69d7667407ec0 100644
--- a/app/code/Magento/Dhl/Model/Source/Method/AbstractMethod.php
+++ b/app/code/Magento/Dhl/Model/Source/Method/AbstractMethod.php
@@ -29,7 +29,7 @@ abstract class AbstractMethod extends \Magento\Dhl\Model\Source\Method\Generic
      */
     public function toOptionArray()
     {
-        /* @var $carrierModel \Magento\Dhl\Model\Carrier */
+        /** @var \Magento\Dhl\Model\Carrier $carrierModel */
         $carrierModel = $this->_shippingDhl;
         $dhlProducts = $carrierModel->getDhlProducts($this->_contentType);
 
diff --git a/app/code/Magento/Directory/Helper/Data.php b/app/code/Magento/Directory/Helper/Data.php
index d0ad6f15705da..4e9460ba2c82f 100644
--- a/app/code/Magento/Directory/Helper/Data.php
+++ b/app/code/Magento/Directory/Helper/Data.php
@@ -360,7 +360,7 @@ public function getRegionData()
             ],
         ];
         foreach ($collection as $region) {
-            /** @var $region \Magento\Directory\Model\Region */
+            /** @var \Magento\Directory\Model\Region $region */
             if (!$region->getRegionId()) {
                 continue;
             }
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php
index 1b53afc520731..dfeb2d3183212 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php
@@ -45,7 +45,7 @@ protected function _getLink()
      */
     protected function _processDownload(string $resource, string $resourceType)
     {
-        /* @var $helper DownloadHelper */
+        /** @var DownloadHelper $helper */
         $helper = $this->_objectManager->get(DownloadHelper::class);
         $helper->setResource($resource, $resourceType);
 
diff --git a/app/code/Magento/Downloadable/Controller/Download.php b/app/code/Magento/Downloadable/Controller/Download.php
index 87d0216f29059..5838f9fee1381 100644
--- a/app/code/Magento/Downloadable/Controller/Download.php
+++ b/app/code/Magento/Downloadable/Controller/Download.php
@@ -29,7 +29,7 @@ abstract class Download extends \Magento\Framework\App\Action\Action
      */
     protected function _processDownload($path, $resourceType)
     {
-        /* @var $helper DownloadHelper */
+        /** @var DownloadHelper $helper */
         $helper = $this->_objectManager->get(\Magento\Downloadable\Helper\Download::class);
 
         $helper->setResource($path, $resourceType);
diff --git a/app/code/Magento/Downloadable/Model/Link/CreateHandler.php b/app/code/Magento/Downloadable/Model/Link/CreateHandler.php
index 025f2450af0fb..c978ef814419c 100644
--- a/app/code/Magento/Downloadable/Model/Link/CreateHandler.php
+++ b/app/code/Magento/Downloadable/Model/Link/CreateHandler.php
@@ -35,7 +35,7 @@ public function __construct(LinkRepository $linkRepository)
      */
     public function execute($entity, $arguments = [])
     {
-        /** @var $entity \Magento\Catalog\Api\Data\ProductInterface */
+        /** @var \Magento\Catalog\Api\Data\ProductInterface $entity */
         if ($entity->getTypeId() != Type::TYPE_DOWNLOADABLE) {
             return $entity;
         }
@@ -46,7 +46,7 @@ public function execute($entity, $arguments = [])
             $link->setId(null);
             $this->linkRepository->save($entity->getSku(), $link, !(bool)$entity->getStoreId());
         }
-        
+
         return $entity;
     }
 }
diff --git a/app/code/Magento/Downloadable/Model/Link/ReadHandler.php b/app/code/Magento/Downloadable/Model/Link/ReadHandler.php
index d3a2349739c26..87acc69ca71ca 100644
--- a/app/code/Magento/Downloadable/Model/Link/ReadHandler.php
+++ b/app/code/Magento/Downloadable/Model/Link/ReadHandler.php
@@ -36,7 +36,7 @@ public function __construct(LinkRepository $linkRepository)
      */
     public function execute($entity, $arguments = [])
     {
-        /** @var $entity \Magento\Catalog\Api\Data\ProductInterface */
+        /** @var \Magento\Catalog\Api\Data\ProductInterface $entity */
         if ($entity->getTypeId() != \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE) {
             return $entity;
         }
diff --git a/app/code/Magento/Downloadable/Model/LinkRepository.php b/app/code/Magento/Downloadable/Model/LinkRepository.php
index 68fbba2a7d385..8908a096eee54 100644
--- a/app/code/Magento/Downloadable/Model/LinkRepository.php
+++ b/app/code/Magento/Downloadable/Model/LinkRepository.php
@@ -288,7 +288,7 @@ protected function updateLink(
         LinkInterface $link,
         $isGlobalScopeContent
     ) {
-        /** @var $existingLink \Magento\Downloadable\Model\Link */
+        /** @var \Magento\Downloadable\Model\Link $existingLink */
         $existingLink = $this->linkFactory->create()->load($link->getId());
         if (!$existingLink->getId()) {
             throw new NoSuchEntityException(
@@ -331,7 +331,7 @@ protected function updateLink(
      */
     public function delete($id)
     {
-        /** @var $link \Magento\Downloadable\Model\Link */
+        /** @var \Magento\Downloadable\Model\Link $link */
         $link = $this->linkFactory->create()->load($id);
         if (!$link->getId()) {
             throw new NoSuchEntityException(
diff --git a/app/code/Magento/Downloadable/Model/Sample/CreateHandler.php b/app/code/Magento/Downloadable/Model/Sample/CreateHandler.php
index 49df2b92bad09..7846de550bebc 100644
--- a/app/code/Magento/Downloadable/Model/Sample/CreateHandler.php
+++ b/app/code/Magento/Downloadable/Model/Sample/CreateHandler.php
@@ -35,7 +35,7 @@ public function __construct(SampleRepository $sampleRepository)
      */
     public function execute($entity, $arguments = [])
     {
-        /** @var $entity \Magento\Catalog\Api\Data\ProductInterface */
+        /** @var \Magento\Catalog\Api\Data\ProductInterface $entity */
         if ($entity->getTypeId() != Type::TYPE_DOWNLOADABLE) {
             return $entity;
         }
diff --git a/app/code/Magento/Downloadable/Model/Sample/DeleteHandler.php b/app/code/Magento/Downloadable/Model/Sample/DeleteHandler.php
index d7361b602673e..43343f1941dc3 100644
--- a/app/code/Magento/Downloadable/Model/Sample/DeleteHandler.php
+++ b/app/code/Magento/Downloadable/Model/Sample/DeleteHandler.php
@@ -36,7 +36,7 @@ public function __construct(SampleRepository $sampleRepository)
      */
     public function execute($entity, $arguments = [])
     {
-        /** @var $entity \Magento\Catalog\Api\Data\ProductInterface */
+        /** @var \Magento\Catalog\Api\Data\ProductInterface $entity */
         if ($entity->getTypeId() != \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE) {
             return $entity;
         }
diff --git a/app/code/Magento/Downloadable/Model/Sample/ReadHandler.php b/app/code/Magento/Downloadable/Model/Sample/ReadHandler.php
index 4704de24e2094..0938cabedc35c 100644
--- a/app/code/Magento/Downloadable/Model/Sample/ReadHandler.php
+++ b/app/code/Magento/Downloadable/Model/Sample/ReadHandler.php
@@ -36,7 +36,7 @@ public function __construct(SampleRepository $sampleRepository)
      */
     public function execute($entity, $arguments = [])
     {
-        /** @var $entity \Magento\Catalog\Api\Data\ProductInterface */
+        /** @var \Magento\Catalog\Api\Data\ProductInterface $entity */
         if ($entity->getTypeId() != \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE) {
             return $entity;
         }
diff --git a/app/code/Magento/Downloadable/Model/SampleRepository.php b/app/code/Magento/Downloadable/Model/SampleRepository.php
index 37f376e666243..092c7e3322146 100644
--- a/app/code/Magento/Downloadable/Model/SampleRepository.php
+++ b/app/code/Magento/Downloadable/Model/SampleRepository.php
@@ -272,7 +272,7 @@ protected function updateSample(
         $isGlobalScopeContent
     ) {
         $sampleId = $sample->getId();
-        /** @var $existingSample \Magento\Downloadable\Model\Sample */
+        /** @var \Magento\Downloadable\Model\Sample $existingSample */
         $existingSample = $this->sampleFactory->create()->load($sampleId);
 
         if (!$existingSample->getId()) {
@@ -316,7 +316,7 @@ protected function updateSample(
      */
     public function delete($id)
     {
-        /** @var $sample \Magento\Downloadable\Model\Sample */
+        /** @var \Magento\Downloadable\Model\Sample $sample */
         $sample = $this->sampleFactory->create()->load($id);
         if (!$sample->getId()) {
             throw new NoSuchEntityException(
diff --git a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
index 95f3284f32df3..70a213250c78b 100644
--- a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
+++ b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
@@ -69,7 +69,7 @@ public function execute(Observer $observer)
         $storeId = (int)$this->storeManager->getStore($observer->getEvent()->getStore())->getId();
         $result = $observer->getEvent()->getResult();
 
-        /* @var $quote Quote */
+        /** @var Quote $quote */
         $quote = $observer->getEvent()->getQuote();
         $isGuestCheckoutDisabled = $this->scopeConfig->isSetFlag(
             self::XML_PATH_DISABLE_GUEST_CHECKOUT,
diff --git a/app/code/Magento/Downloadable/Observer/SetHasDownloadableProductsObserver.php b/app/code/Magento/Downloadable/Observer/SetHasDownloadableProductsObserver.php
index f9bc2e15035c2..15d91ff93f2e5 100644
--- a/app/code/Magento/Downloadable/Observer/SetHasDownloadableProductsObserver.php
+++ b/app/code/Magento/Downloadable/Observer/SetHasDownloadableProductsObserver.php
@@ -34,7 +34,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         if (!$this->_checkoutSession->getHasDownloadableProducts()) {
             $order = $observer->getEvent()->getOrder();
             foreach ($order->getAllItems() as $item) {
-                /* @var $item \Magento\Sales\Model\Order\Item */
+                /** @var \Magento\Sales\Model\Order\Item $item */
                 if ($item->getProductType() == \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE
                     || $item->getRealProductType() == \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE
                     || $item->getProductOptionByCode(
diff --git a/app/code/Magento/Downloadable/Observer/SetLinkStatusObserver.php b/app/code/Magento/Downloadable/Observer/SetLinkStatusObserver.php
index 2a07a3a49639f..ab3992ac90c21 100644
--- a/app/code/Magento/Downloadable/Observer/SetLinkStatusObserver.php
+++ b/app/code/Magento/Downloadable/Observer/SetLinkStatusObserver.php
@@ -52,7 +52,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             return $this;
         }
 
-        /* @var $order \Magento\Sales\Model\Order */
+        /** @var \Magento\Sales\Model\Order $order */
         $status = '';
         $linkStatuses = [
             'pending' => \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_PENDING,
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
index 17d5b73f49506..a7c5bc837f3ba 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
@@ -6,7 +6,7 @@
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 // @deprecated
 ?>
-<?php /* @var $block \Magento\Downloadable\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Downloadable */ ?>
+<?php /** @var \Magento\Downloadable\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Downloadable $block */ ?>
 <?php $_linksPurchasedSeparately = $block->getLinksPurchasedSeparately(); ?>
 <?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
 <?php if (($block->getProduct()->isSaleable() || $_skipSaleableCheck) && $block->hasLinks()) :?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
index cb924e6b9ac96..8554272716d2e 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php /* @var $block \Magento\Downloadable\Block\Catalog\Product\Links */ ?>
+<?php /** @var \Magento\Downloadable\Block\Catalog\Product\Links $block */ ?>
 <?php $_linksPurchasedSeparately = $block->getLinksPurchasedSeparately(); ?>
 <?php if ($block->getProduct()->isSaleable() && $block->hasLinks()) :?>
     <?php $_links = $block->getLinks(); ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/creditmemo/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/creditmemo/downloadable.phtml
index 25d2302e94b1c..93d7811f7c9de 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/creditmemo/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/creditmemo/downloadable.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php /** @var $block \Magento\Downloadable\Block\Sales\Order\Email\Items\Downloadable */ ?>
+<?php /** @var \Magento\Downloadable\Block\Sales\Order\Email\Items\Downloadable $block */ ?>
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrder(); ?>
 <tr>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/invoice/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/invoice/downloadable.phtml
index 88f3b2cc6f9c7..daadbd03bd0f5 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/invoice/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/invoice/downloadable.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php /** @var $block \Magento\Downloadable\Block\Sales\Order\Email\Items\Downloadable */ ?>
+<?php /** @var \Magento\Downloadable\Block\Sales\Order\Email\Items\Downloadable $block */ ?>
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrder() ?>
 <tr>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/order/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/order/downloadable.phtml
index 8dc552933fd3f..6606a4b52f99e 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/order/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/order/downloadable.phtml
@@ -5,7 +5,7 @@
  */
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
-<?php /** @var $block \Magento\Downloadable\Block\Sales\Order\Email\Items\Order\Downloadable */ ?>
+<?php /** @var \Magento\Downloadable\Block\Sales\Order\Email\Items\Order\Downloadable $block */ ?>
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrder() ?>
 <tr>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml
index 491d83ac0d5f9..308afe8ad98ce 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable */
+/** @var \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable $block */
 ?>
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml
index 7ea2de6e46ba1..7a7cd0f432a1f 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable */
+/** @var \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable $block */
 ?>
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml
index 02f6ac29f968a..b4540ce24f1ea 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml
@@ -5,7 +5,7 @@
  */
 // phpcs:disable Generic.Files.LineLength
 
-/** @var $block \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable */
+/** @var \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable $block */
 /** @var \Magento\Framework\Locale\LocaleFormatter $localeFormatter */
 ?>
 <?php $_item = $block->getItem() ?>
diff --git a/app/code/Magento/DownloadableImportExport/Model/Export/RowCustomizer.php b/app/code/Magento/DownloadableImportExport/Model/Export/RowCustomizer.php
index 5dc98f2d150f4..a20436be7e893 100644
--- a/app/code/Magento/DownloadableImportExport/Model/Export/RowCustomizer.php
+++ b/app/code/Magento/DownloadableImportExport/Model/Export/RowCustomizer.php
@@ -84,7 +84,7 @@ public function prepareData($collection, $productIds): void
         $this->storeManager->setCurrentStore(Store::DEFAULT_STORE_ID);
 
         while ($product = $productCollection->fetchItem()) {
-            /** @var $product \Magento\Catalog\Api\Data\ProductInterface */
+            /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
             $productLinks = $this->linkRepository->getLinksByProduct($product);
             $productSamples = $this->sampleRepository->getSamplesByProduct($product);
             $this->downloadableData[$product->getId()] = [];
diff --git a/app/code/Magento/Eav/Model/AttributeDataFactory.php b/app/code/Magento/Eav/Model/AttributeDataFactory.php
index ec2d02c65284a..7b415c558459c 100644
--- a/app/code/Magento/Eav/Model/AttributeDataFactory.php
+++ b/app/code/Magento/Eav/Model/AttributeDataFactory.php
@@ -62,7 +62,7 @@ public function __construct(
      */
     public function create(\Magento\Eav\Model\Attribute $attribute, \Magento\Framework\Model\AbstractModel $entity)
     {
-        /* @var $dataModel \Magento\Eav\Model\Attribute\Data\AbstractData */
+        /** @var \Magento\Eav\Model\Attribute\Data\AbstractData $dataModel */
         $dataModelClass = $attribute->getDataModel();
         if (!empty($dataModelClass)) {
             if (empty($this->_dataModels[$dataModelClass])) {
diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
index 5b53321b6203d..02664239c1d49 100644
--- a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
+++ b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
@@ -426,7 +426,7 @@ protected function _getConfig()
      */
     public function getAttribute($attribute)
     {
-        /** @var $config \Magento\Eav\Model\Config */
+        /** @var \Magento\Eav\Model\Config $config */
         $config = $this->_getConfig();
 
         $attributeInstance = $config->getAttribute($this->getEntityType(), $attribute);
@@ -582,7 +582,7 @@ public function getSortedAttributes($setId = null)
         $this->_attrSetEntity->addSetInfo($this->getEntityType(), $attributes, $setId);
 
         foreach ($attributes as $code => $attribute) {
-            /* @var $attribute AbstractAttribute */
+            /** @var AbstractAttribute $attribute */
             if (!$attribute->isInSet($setId)) {
                 unset($attributes[$code]);
             }
diff --git a/app/code/Magento/Eav/Model/Form.php b/app/code/Magento/Eav/Model/Form.php
index b06c084cf6675..4012dd8b0be86 100644
--- a/app/code/Magento/Eav/Model/Form.php
+++ b/app/code/Magento/Eav/Model/Form.php
@@ -328,7 +328,7 @@ public function getAttributes()
             $this->_userAttributes = [];
             $this->_systemAttributes = [];
             $this->_allowedAttributes = [];
-            /** @var $attribute \Magento\Eav\Model\Attribute */
+            /** @var \Magento\Eav\Model\Attribute $attribute */
             foreach ($this->_getFilteredFormAttributeCollection() as $attribute) {
                 $this->_attributes[$attribute->getAttributeCode()] = $attribute;
                 if ($attribute->getIsUserDefined()) {
@@ -440,7 +440,7 @@ public function prepareRequest(array $data)
     public function extractData(RequestInterface $request, $scope = null, $scopeOnly = true)
     {
         $data = [];
-        /** @var $attribute \Magento\Eav\Model\Attribute */
+        /** @var \Magento\Eav\Model\Attribute $attribute */
         foreach ($this->getAllowedAttributes() as $attribute) {
             $dataModel = $this->_getAttributeDataModel($attribute);
             $dataModel->setRequestScope($scope);
@@ -460,7 +460,7 @@ protected function _getValidator(array $data)
     {
         if ($this->_validator === null) {
             $configFiles = $this->_modulesReader->getConfigurationFiles('validation.xml');
-            /** @var $validatorFactory \Magento\Framework\Validator\Config */
+            /** @var \Magento\Framework\Validator\Config $validatorFactory */
             $validatorFactory = $this->_validatorConfigFactory->create(['configFiles' => $configFiles]);
             $builder = $validatorFactory->createValidatorBuilder('eav_entity', 'form');
 
@@ -504,7 +504,7 @@ public function validateData(array $data)
      */
     public function compactData(array $data)
     {
-        /** @var $attribute \Magento\Eav\Model\Attribute */
+        /** @var \Magento\Eav\Model\Attribute $attribute */
         foreach ($this->getAllowedAttributes() as $attribute) {
             $dataModel = $this->_getAttributeDataModel($attribute);
             $dataModel->setExtractedData($data);
@@ -525,7 +525,7 @@ public function compactData(array $data)
      */
     public function restoreData(array $data)
     {
-        /** @var $attribute \Magento\Eav\Model\Attribute */
+        /** @var \Magento\Eav\Model\Attribute $attribute */
         foreach ($this->getAllowedAttributes() as $attribute) {
             $dataModel = $this->_getAttributeDataModel($attribute);
             $dataModel->setExtractedData($data);
@@ -546,7 +546,7 @@ public function restoreData(array $data)
     public function outputData($format = \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_TEXT)
     {
         $data = [];
-        /** @var $attribute \Magento\Eav\Model\Attribute */
+        /** @var \Magento\Eav\Model\Attribute $attribute */
         foreach ($this->getAllowedAttributes() as $attribute) {
             $dataModel = $this->_getAttributeDataModel($attribute);
             $dataModel->setExtractedData($data);
@@ -562,7 +562,7 @@ public function outputData($format = \Magento\Eav\Model\AttributeDataFactory::OU
      */
     public function resetEntityData()
     {
-        /** @var $attribute \Magento\Eav\Model\Attribute */
+        /** @var \Magento\Eav\Model\Attribute $attribute */
         foreach ($this->getAllowedAttributes() as $attribute) {
             $value = $this->getEntity()->getOrigData($attribute->getAttributeCode());
             $this->getEntity()->setData($attribute->getAttributeCode(), $value);
@@ -601,7 +601,7 @@ public function getIsAjaxRequest()
     public function initDefaultValues()
     {
         if (!$this->getEntity()->getId()) {
-            /** @var $attribute \Magento\Eav\Model\Attribute */
+            /** @var \Magento\Eav\Model\Attribute $attribute */
             foreach ($this->getAttributes() as $attribute) {
                 $default = $attribute->getDefaultValue();
                 if ($default != '') {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
index 6f928e601dde3..94f0605d09a06 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
@@ -219,7 +219,7 @@ protected function _beforeSave(AbstractModel $object)
      */
     protected function _beforeDelete(AbstractModel $attribute)
     {
-        /** @var $attribute AttributeInterface */
+        /** @var AttributeInterface $attribute */
         if ($attribute->getId() && !$attribute->getIsUserDefined()) {
             throw new CouldNotDeleteException(__("The system attribute can't be deleted."));
         }
@@ -678,7 +678,7 @@ public function getFlatUpdateSelect(AbstractAttribute $attribute, $storeId)
 
         $valueExpr = $connection->getCheckSql('t2.value_id > 0', 't2.value', 't1.value');
 
-        /** @var $select Select */
+        /** @var Select $select */
         $select = $connection->select()->joinLeft(
             ['t1' => $attribute->getBackend()->getTable()],
             $joinCondition,
@@ -729,7 +729,7 @@ public function getAdditionalAttributeTable($entityTypeId)
      */
     protected function _afterLoad(AbstractModel $object)
     {
-        /** @var $entityType \Magento\Eav\Model\Entity\Type */
+        /** @var \Magento\Eav\Model\Entity\Type $entityType */
         $entityType = $object->getData('entity_type');
         if ($entityType) {
             $additionalTable = $entityType->getAdditionalAttributeTable();
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Group.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Group.php
index 1ac6881d223a2..a1b3b497518e9 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Group.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Group.php
@@ -92,7 +92,7 @@ protected function _afterSave(AbstractModel $object)
     {
         if ($object->getAttributes()) {
             foreach ($object->getAttributes() as $attribute) {
-                /** @var $attribute \Magento\Eav\Api\Data\AttributeInterface */
+                /** @var \Magento\Eav\Api\Data\AttributeInterface $attribute */
                 $attribute->setAttributeGroupId($object->getId());
                 $this->attributeResource->saveInSetIncluding(
                     $attribute
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option.php
index a7be59e2c05d5..3d51a5616b682 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option.php
@@ -131,7 +131,7 @@ public function getFlatUpdateSelect(
         }
 
         $valueExpr = $connection->getCheckSql('t2.value_id > 0', 't2.value', 't1.value');
-        /** @var $select \Magento\Framework\DB\Select */
+        /** @var \Magento\Framework\DB\Select $select */
         $select = $connection->select()->joinLeft(
             ['t1' => $attributeTable],
             $joinCondition,
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Set.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Set.php
index f49a82ff8941b..6d167ecdc1ff3 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Set.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Set.php
@@ -63,7 +63,7 @@ protected function _construct()
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
         if ($object->getGroups()) {
-            /* @var $group \Magento\Eav\Model\Entity\Attribute\Group */
+            /** @var \Magento\Eav\Model\Entity\Attribute\Group $group */
             foreach ($object->getGroups() as $group) {
                 $group->setAttributeSetId($object->getId());
                 if ($group->itemExists() && !$group->getId()) {
@@ -74,14 +74,14 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
         }
         if ($object->getRemoveGroups()) {
             foreach ($object->getRemoveGroups() as $group) {
-                /* @var $group \Magento\Eav\Model\Entity\Attribute\Group */
+                /** @var \Magento\Eav\Model\Entity\Attribute\Group $group */
                 $group->delete();
             }
             $this->_attrGroupFactory->create()->updateDefaultGroup($object->getId());
         }
         if ($object->getRemoveAttributes()) {
             foreach ($object->getRemoveAttributes() as $attribute) {
-                /* @var $attribute \Magento\Eav\Model\Entity\Attribute */
+                /** @var \Magento\Eav\Model\Entity\Attribute $attribute */
                 $attribute->deleteEntity();
             }
         }
diff --git a/app/code/Magento/Eav/Model/Validator/Attribute/Data.php b/app/code/Magento/Eav/Model/Validator/Attribute/Data.php
index 9be2c18dd9cdb..476e48cc2e9b8 100644
--- a/app/code/Magento/Eav/Model/Validator/Attribute/Data.php
+++ b/app/code/Magento/Eav/Model/Validator/Attribute/Data.php
@@ -141,7 +141,7 @@ public function setData(array $data)
      */
     public function isValid($entity)
     {
-        /** @var $attributes Attribute[] */
+        /** @var Attribute[] $attributes */
         $attributes = $this->_getAttributes($entity);
 
         $data = $this->retrieveData($entity);
diff --git a/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/AttributeTest.php b/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/AttributeTest.php
index 790e0d69a8f83..04eca0c219192 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/AttributeTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/AttributeTest.php
@@ -55,7 +55,7 @@ protected function setUp(): void
     public function testSaveOptionSystemAttribute()
     {
         /** @var MockObject $connectionMock */
-        /** @var $resourceModel \Magento\Eav\Model\ResourceModel\Entity\Attribute */
+        /** @var \Magento\Eav\Model\ResourceModel\Entity\Attribute $resourceModel */
         list($connectionMock, $resourceModel) = $this->_prepareResourceModel();
 
         $attributeData = [
@@ -198,7 +198,7 @@ public function testSaveSelectDefaultOptionAttribute()
     public function testSaveOptionNewUserDefinedAttribute()
     {
         /** @var MockObject $connectionMock */
-        /** @var $resourceModel \Magento\Eav\Model\ResourceModel\Entity\Attribute */
+        /** @var \Magento\Eav\Model\ResourceModel\Entity\Attribute $resourceModel */
         list($connectionMock, $resourceModel) = $this->_prepareResourceModel();
 
         $attributeData = [
@@ -295,7 +295,7 @@ public function testSaveOptionNewUserDefinedAttribute()
     public function testSaveOptionNoValue()
     {
         /** @var MockObject $connectionMock */
-        /** @var $resourceModel \Magento\Eav\Model\ResourceModel\Entity\Attribute */
+        /** @var \Magento\Eav\Model\ResourceModel\Entity\Attribute $resourceModel */
         list($connectionMock, $resourceModel) = $this->_prepareResourceModel();
 
         $objectManagerHelper = new ObjectManager($this);
@@ -389,7 +389,7 @@ protected function _prepareResourceModel()
             ]
         );
 
-        /** @var $resource \Magento\Framework\App\ResourceConnection */
+        /** @var \Magento\Framework\App\ResourceConnection $resource */
         $resource = $this->createMock(ResourceConnection::class);
         $resource->expects($this->any())->method('getTableName')->willReturnArgument(0);
         $resource->expects($this->any())->method('getConnection')->with()->willReturn($connectionMock);
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
index 0da42ec4dfc5e..d00eed8c9a5ff 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
@@ -396,7 +396,7 @@ public function getLoadUrl()
      */
     public function getCurrentlyUsedForPaths($asJSON = true)
     {
-        /** @var $template BackendTemplate */
+        /** @var BackendTemplate $template */
         $template = $this->getEmailTemplate();
         $paths = $template->getSystemConfigPathsWhereCurrentlyUsed();
         $pathsParts = $this->_getSystemConfigPathsParts($paths);
@@ -418,7 +418,7 @@ protected function _getSystemConfigPathsParts($paths) // phpcs:ignore Generic.Me
         $result = $urlParams = $prefixParts = [];
         $scopeLabel = __('Default Config');
         if ($paths) {
-            /** @var $menu \Magento\Backend\Model\Menu */
+            /** @var \Magento\Backend\Model\Menu $menu */
             $menu = $this->_menuConfig->getMenu();
             $item = $menu->get('Magento_Backend::stores');
             // create prefix path parts
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php b/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php
index 968f58761617e..afe5f12652908 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php
@@ -58,7 +58,7 @@ protected function _toHtml()
         $request = $this->getRequest();
 
         $storeId = $this->getAnyStoreView()->getId();
-        /** @var $template \Magento\Email\Model\Template */
+        /** @var \Magento\Email\Model\Template $template */
         $template = $this->_emailFactory->create();
 
         if ($id = (int)$request->getParam('id')) {
diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index f86deacad3b4e..75f26a91e0e19 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -480,7 +480,7 @@ public function emulateAreaCallback()
     {
         $skipParams = ['handle', 'area'];
 
-        /** @var $layout LayoutInterface */
+        /** @var LayoutInterface $layout */
         $layout = $this->_layoutFactory->create(['cacheable' => false]);
         $layout->getUpdate()->addHandle($this->_directiveParams['handle'])->load();
 
@@ -489,7 +489,7 @@ public function emulateAreaCallback()
 
         $rootBlock = false;
         foreach ($layout->getAllBlocks() as $block) {
-            /* @var $block AbstractBlock */
+            /** @var AbstractBlock $block */
             if (!$block->getParentBlock() && !$rootBlock) {
                 $rootBlock = $block;
             }
diff --git a/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml b/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
index a377cd8ae6722..8f94245571261 100644
--- a/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
+++ b/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
@@ -8,7 +8,7 @@ use Magento\Framework\App\TemplateTypesInterface;
 
 // phpcs:disable Generic.Files.LineLength.TooLong
 
-/** @var $block \Magento\Email\Block\Adminhtml\Template\Edit */
+/** @var \Magento\Email\Block\Adminhtml\Template\Edit $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php if (!$block->getEditMode()): ?>
diff --git a/app/code/Magento/Email/view/adminhtml/templates/template/preview.phtml b/app/code/Magento/Email/view/adminhtml/templates/template/preview.phtml
index 80d2ab0692675..1377abe3f3ba7 100644
--- a/app/code/Magento/Email/view/adminhtml/templates/template/preview.phtml
+++ b/app/code/Magento/Email/view/adminhtml/templates/template/preview.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/* @var $block \Magento\Email\Block\Adminhtml\Template\Preview */
+/** @var \Magento\Email\Block\Adminhtml\Template\Preview $block */
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html lang="en">
diff --git a/app/code/Magento/GiftMessage/Model/GuestCartRepository.php b/app/code/Magento/GiftMessage/Model/GuestCartRepository.php
index 96cd8e0f6c32c..bd91cbe765d4a 100644
--- a/app/code/Magento/GiftMessage/Model/GuestCartRepository.php
+++ b/app/code/Magento/GiftMessage/Model/GuestCartRepository.php
@@ -44,7 +44,7 @@ public function __construct(
      */
     public function get($cartId)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->repository->get($quoteIdMask->getQuoteId());
     }
@@ -54,7 +54,7 @@ public function get($cartId)
      */
     public function save($cartId, MessageInterface $giftMessage)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->repository->save($quoteIdMask->getQuoteId(), $giftMessage);
     }
diff --git a/app/code/Magento/GiftMessage/Model/GuestItemRepository.php b/app/code/Magento/GiftMessage/Model/GuestItemRepository.php
index 79545b6d6f9c9..d92c0375cf52c 100644
--- a/app/code/Magento/GiftMessage/Model/GuestItemRepository.php
+++ b/app/code/Magento/GiftMessage/Model/GuestItemRepository.php
@@ -44,7 +44,7 @@ public function __construct(
      */
     public function get($cartId, $itemId)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->repository->get($quoteIdMask->getQuoteId(), $itemId);
     }
@@ -54,7 +54,7 @@ public function get($cartId, $itemId)
      */
     public function save($cartId, MessageInterface $giftMessage, $itemId)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->repository->save($quoteIdMask->getQuoteId(), $giftMessage, $itemId);
     }
diff --git a/app/code/Magento/GiftMessage/Model/Save.php b/app/code/Magento/GiftMessage/Model/Save.php
index 12ce42375f9b6..a55efd9b18e85 100644
--- a/app/code/Magento/GiftMessage/Model/Save.php
+++ b/app/code/Magento/GiftMessage/Model/Save.php
@@ -118,7 +118,7 @@ public function saveAllInOrder()
      */
     protected function _saveOne($entityId, $giftmessage, $entityType)
     {
-        /* @var $giftmessageModel \Magento\GiftMessage\Model\Message */
+        /** @var \Magento\GiftMessage\Model\Message $giftmessageModel */
         $giftmessageModel = $this->_messageFactory->create();
 
         switch ($entityType) {
diff --git a/app/code/Magento/GiftMessage/Observer/SalesEventOrderItemToQuoteItemObserver.php b/app/code/Magento/GiftMessage/Observer/SalesEventOrderItemToQuoteItemObserver.php
index 2e156ccf5f5f7..0201e19a29736 100644
--- a/app/code/Magento/GiftMessage/Observer/SalesEventOrderItemToQuoteItemObserver.php
+++ b/app/code/Magento/GiftMessage/Observer/SalesEventOrderItemToQuoteItemObserver.php
@@ -42,7 +42,7 @@ public function __construct(
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
-        /** @var $orderItem \Magento\Sales\Model\Order\Item */
+        /** @var \Magento\Sales\Model\Order\Item $orderItem */
         $orderItem = $observer->getEvent()->getOrderItem();
         // Do not import giftmessage data if order is reordered
         $order = $orderItem->getOrder();
@@ -59,7 +59,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             return $this;
         }
 
-        /** @var $quoteItem \Magento\Quote\Model\Quote\Item */
+        /** @var \Magento\Quote\Model\Quote\Item $quoteItem */
         $quoteItem = $observer->getEvent()->getQuoteItem();
         if ($giftMessageId = $orderItem->getGiftMessageId()) {
             $giftMessage = $this->_messageFactory->create()->load($giftMessageId)->setId(null)->save();
diff --git a/app/code/Magento/GiftMessage/view/frontend/templates/cart/item/renderer/actions/gift_options.phtml b/app/code/Magento/GiftMessage/view/frontend/templates/cart/item/renderer/actions/gift_options.phtml
index 6fcad0faaa694..0b6335bd25461 100644
--- a/app/code/Magento/GiftMessage/view/frontend/templates/cart/item/renderer/actions/gift_options.phtml
+++ b/app/code/Magento/GiftMessage/view/frontend/templates/cart/item/renderer/actions/gift_options.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\GiftMessage\Block\Cart\Item\Renderer\Actions\GiftOptions */
+/** @var \Magento\GiftMessage\Block\Cart\Item\Renderer\Actions\GiftOptions $block */
 ?>
 <?php if (!$block->isVirtual()) : ?>
     <div id="gift-options-cart-item-<?= (int) $block->getItem()->getId() ?>"
diff --git a/app/code/Magento/GoogleAdwords/Observer/SetConversionValueObserver.php b/app/code/Magento/GoogleAdwords/Observer/SetConversionValueObserver.php
index b97975182a631..450bd8e4bebd3 100644
--- a/app/code/Magento/GoogleAdwords/Observer/SetConversionValueObserver.php
+++ b/app/code/Magento/GoogleAdwords/Observer/SetConversionValueObserver.php
@@ -64,7 +64,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         $conversionCurrency = false;
         $sendOrderCurrency = $this->_helper->hasSendConversionValueCurrency();
         foreach ($this->_collection as $order) {
-            /** @var $order \Magento\Sales\Api\Data\OrderInterface */
+            /** @var \Magento\Sales\Api\Data\OrderInterface $order */
             $conversionValue += $sendOrderCurrency ? $order->getGrandTotal() : $order->getBaseGrandTotal();
             $conversionCurrency = $sendOrderCurrency ? $order->getOrderCurrencyCode() : false;
         }
diff --git a/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml b/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml
index f1c850087b347..1be63b96ae747 100644
--- a/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml
+++ b/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php /** @var $block \Magento\GoogleAnalytics\Block\Ga */ ?>
+<?php /** @var \Magento\GoogleAnalytics\Block\Ga $block */ ?>
 <?php $accountId = $block->getConfig(\Magento\GoogleAnalytics\Helper\Data::XML_PATH_ACCOUNT) ?>
 <!-- BEGIN GOOGLE ANALYTICS CODE -->
 <script type="text/x-magento-init">
diff --git a/app/code/Magento/GoogleGtag/view/frontend/templates/ga.phtml b/app/code/Magento/GoogleGtag/view/frontend/templates/ga.phtml
index e6e0fc82dd852..b4ce6ebef0c0f 100644
--- a/app/code/Magento/GoogleGtag/view/frontend/templates/ga.phtml
+++ b/app/code/Magento/GoogleGtag/view/frontend/templates/ga.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\GoogleGtag\Block\Ga */
+/** @var \Magento\GoogleGtag\Block\Ga $block */
 /** @var \Magento\Framework\Escaper $escaper */
 
 $analyticsData = $block->getAnalyticsData();
diff --git a/app/code/Magento/GoogleOptimizer/Observer/Category/DeleteCategoryGoogleExperimentScriptObserver.php b/app/code/Magento/GoogleOptimizer/Observer/Category/DeleteCategoryGoogleExperimentScriptObserver.php
index e7b5cb7002429..971fcc84095ba 100644
--- a/app/code/Magento/GoogleOptimizer/Observer/Category/DeleteCategoryGoogleExperimentScriptObserver.php
+++ b/app/code/Magento/GoogleOptimizer/Observer/Category/DeleteCategoryGoogleExperimentScriptObserver.php
@@ -32,7 +32,7 @@ public function __construct(\Magento\GoogleOptimizer\Model\Code $modelCode)
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
-        /** @var $category \Magento\Catalog\Model\Category */
+        /** @var \Magento\Catalog\Model\Category $category */
         $category = $observer->getEvent()->getCategory();
         $this->_modelCode->loadByEntityIdAndType(
             $category->getId(),
diff --git a/app/code/Magento/GoogleOptimizer/Observer/CmsPage/DeleteCmsGoogleExperimentScriptObserver.php b/app/code/Magento/GoogleOptimizer/Observer/CmsPage/DeleteCmsGoogleExperimentScriptObserver.php
index 6d2ffff69f950..06ea269dea139 100644
--- a/app/code/Magento/GoogleOptimizer/Observer/CmsPage/DeleteCmsGoogleExperimentScriptObserver.php
+++ b/app/code/Magento/GoogleOptimizer/Observer/CmsPage/DeleteCmsGoogleExperimentScriptObserver.php
@@ -32,7 +32,7 @@ public function __construct(\Magento\GoogleOptimizer\Model\Code $modelCode)
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
-        /** @var $cmsPage \Magento\Cms\Model\Page */
+        /** @var \Magento\Cms\Model\Page $cmsPage */
         $cmsPage = $observer->getEvent()->getObject();
         $this->_modelCode->loadByEntityIdAndType(
             $cmsPage->getId(),
diff --git a/app/code/Magento/GoogleOptimizer/Observer/Product/DeleteProductGoogleExperimentScriptObserver.php b/app/code/Magento/GoogleOptimizer/Observer/Product/DeleteProductGoogleExperimentScriptObserver.php
index eaed30784403e..9a77eeaceb7e3 100644
--- a/app/code/Magento/GoogleOptimizer/Observer/Product/DeleteProductGoogleExperimentScriptObserver.php
+++ b/app/code/Magento/GoogleOptimizer/Observer/Product/DeleteProductGoogleExperimentScriptObserver.php
@@ -32,7 +32,7 @@ public function __construct(\Magento\GoogleOptimizer\Model\Code $modelCode)
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
-        /** @var $product \Magento\Catalog\Model\Product */
+        /** @var \Magento\Catalog\Model\Product $product */
         $product = $observer->getEvent()->getProduct();
         $this->_modelCode->loadByEntityIdAndType(
             $product->getId(),
diff --git a/app/code/Magento/GroupedProduct/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php b/app/code/Magento/GroupedProduct/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
index 83ebe8e9de5f8..25a2ff157e927 100644
--- a/app/code/Magento/GroupedProduct/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
+++ b/app/code/Magento/GroupedProduct/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
@@ -51,7 +51,7 @@ public function __construct(
      */
     public function getAssociatedProducts()
     {
-        /** @var $product \Magento\Catalog\Model\Product */
+        /** @var \Magento\Catalog\Model\Product $product */
         $product = $this->_registry->registry('current_product');
         $associatedProducts = $product->getTypeInstance()->getAssociatedProducts($product);
         $products = [];
diff --git a/app/code/Magento/GroupedProduct/Controller/Adminhtml/Edit/Popup.php b/app/code/Magento/GroupedProduct/Controller/Adminhtml/Edit/Popup.php
index ad63b335cb189..f3704e25b08c3 100644
--- a/app/code/Magento/GroupedProduct/Controller/Adminhtml/Edit/Popup.php
+++ b/app/code/Magento/GroupedProduct/Controller/Adminhtml/Edit/Popup.php
@@ -63,7 +63,7 @@ public function execute()
     {
         $productId = (int)$this->getRequest()->getParam('id');
 
-        /** @var $product \Magento\Catalog\Model\Product */
+        /** @var \Magento\Catalog\Model\Product $product */
         $product = $this->factory->create();
         $product->setStoreId($this->getRequest()->getParam('store', 0));
 
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
index 493e15b4d9785..c7885e63405bd 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
@@ -307,7 +307,7 @@ public function getAssociatedProductIds($product)
     {
         if (!$product->hasData($this->_keyAssociatedProductIds)) {
             $associatedProductIds = [];
-            /** @var $item \Magento\Catalog\Model\Product */
+            /** @var \Magento\Catalog\Model\Product $item */
             foreach ($this->getAssociatedProducts($product) as $item) {
                 $associatedProductIds[] = $item->getId();
             }
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped/Price.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped/Price.php
index 59d5fa1f1eb13..084a817d389f0 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped/Price.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped/Price.php
@@ -24,7 +24,7 @@ public function getFinalPrice($qty, $product)
 
         $finalPrice = parent::getFinalPrice($qty, $product);
         if ($product->hasCustomOptions()) {
-            /* @var $typeInstance \Magento\GroupedProduct\Model\Product\Type\Grouped */
+            /** @var \Magento\GroupedProduct\Model\Product\Type\Grouped $typeInstance */
             $typeInstance = $product->getTypeInstance();
             $associatedProducts = $typeInstance->setStoreFilter(
                 $product->getStore(),
@@ -33,7 +33,7 @@ public function getFinalPrice($qty, $product)
                 $product
             );
             foreach ($associatedProducts as $childProduct) {
-                /* @var $childProduct \Magento\Catalog\Model\Product */
+                /** @var \Magento\Catalog\Model\Product $childProduct */
                 $option = $product->getCustomOption('associated_product_' . $childProduct->getId());
                 if (!$option) {
                     continue;
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml b/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml
index 7c6fa50070315..ba63e91a8b126 100644
--- a/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml
@@ -6,7 +6,7 @@
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 
-<?php /* @var $block \Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped */ ?>
+<?php /** @var \Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped $block */ ?>
 <?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
 <div id="catalog_product_composite_configure_fields_grouped" class="<?= $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
     <h4><?= $block->escapeHtml(__('Associated Products')) ?></h4>
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/grouped.phtml b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/grouped.phtml
index ac6161d940a3a..769209d87f1a7 100644
--- a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/grouped.phtml
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/grouped.phtml
@@ -4,9 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Framework\View\Element\Template */
+/** @var \Magento\Framework\View\Element\Template $block */
 
-/** @var $block \Magento\Framework\View\Element\Template */
+/** @var \Magento\Framework\View\Element\Template $block */
 $_gridPopupBlock = $block->getChildBlock('catalog.product.group.grid.popup.container')->getChildBlock('grid');
 $_gridPopupBlock->setRowClickCallback('function(){}');
 ?>
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml
index 99b6e44feffee..05376b6102c2a 100644
--- a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml
@@ -5,7 +5,7 @@
  */
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 // phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
-/* @var $block \Magento\GroupedProduct\Block\Product\Grouped\AssociatedProducts\ListAssociatedProducts */
+/** @var \Magento\GroupedProduct\Block\Product\Grouped\AssociatedProducts\ListAssociatedProducts $block */
 ?>
 <script type="text/x-magento-template" id="group-product-template">
 <tr title="#" class="pointer" data-role="row">
diff --git a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml
index b1697bfb012b9..7598c2865bd7f 100644
--- a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml
+++ b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php /* @var $block \Magento\Catalog\Block\Product\View\AbstractView */?>
+<?php /** @var \Magento\Catalog\Block\Product\View\AbstractView $block */?>
 <?php $_product = $block->getProduct() ?>
 
 <?php $_associatedProducts = $block->getAssociatedProducts(); ?>
diff --git a/app/code/Magento/GroupedProductGraphQl/Plugin/Model/Resolver/ProductImagePlugin.php b/app/code/Magento/GroupedProductGraphQl/Plugin/Model/Resolver/ProductImagePlugin.php
index 18d5f33dc8835..00ab71b17ad1d 100644
--- a/app/code/Magento/GroupedProductGraphQl/Plugin/Model/Resolver/ProductImagePlugin.php
+++ b/app/code/Magento/GroupedProductGraphQl/Plugin/Model/Resolver/ProductImagePlugin.php
@@ -59,7 +59,7 @@ public function afterResolve(
         ?array $args = null
     ): array {
 
-        /* @var $cartItem Item */
+        /** @var Item $cartItem */
         $cartItem = $value['cart_item'] ?? [];
         if (!$cartItem instanceof Item ||
             !isset($cartItem['product_type']) ||
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
index c37e2a15eefd3..ec899e26dab75 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
@@ -103,7 +103,7 @@ protected function _getDateFromToHtmlWithValue(Attribute $attribute, $value)
                 \IntlDateFormatter::SHORT
             ),
         ];
-        /** @var $selectBlock \Magento\Framework\View\Element\Html\Date */
+        /** @var \Magento\Framework\View\Element\Html\Date $selectBlock */
         $dateBlock = $this->_layout->createBlock(
             \Magento\Framework\View\Element\Html\Date::class,
             '',
@@ -169,7 +169,7 @@ protected function _getMultiSelectHtmlWithValue(Attribute $attribute, $value)
                 'class' => 'admin__control-multiselect multiselect multiselect-export-filter',
                 'extra_params' => 'multiple="multiple" size="' . ($size > 5 ? 5 : ($size < 2 ? 2 : $size)) . '"',
             ];
-            /** @var $selectBlock \Magento\Framework\View\Element\Html\Select */
+            /** @var \Magento\Framework\View\Element\Html\Select $selectBlock */
             $selectBlock = $this->_layout->createBlock(
                 \Magento\Framework\View\Element\Html\Select::class,
                 '',
@@ -267,7 +267,7 @@ protected function _getSelectHtmlWithValue(Attribute $attribute, $value)
                 'id' => $this->getFilterElementId($attribute->getAttributeCode()),
                 'class' => 'admin__control-select select select-export-filter',
             ];
-            /** @var $selectBlock \Magento\Framework\View\Element\Html\Select */
+            /** @var \Magento\Framework\View\Element\Html\Select $selectBlock */
             $selectBlock = $this->_layout->createBlock(
                 \Magento\Framework\View\Element\Html\Select::class,
                 '',
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php
index 0b9857edc53eb..b3713f5703588 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php
@@ -191,7 +191,7 @@ public function getMessages()
      */
     public function getMessagesHtml()
     {
-        /** @var $messagesBlock \Magento\Framework\View\Element\Messages */
+        /** @var \Magento\Framework\View\Element\Messages $messagesBlock */
         $messagesBlock = $this->_layout->createBlock(\Magento\Framework\View\Element\Messages::class);
 
         foreach ($this->_messages as $priority => $messages) {
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php
index 6f3dd8d6d4a61..66a8074cc2462 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php
@@ -39,9 +39,9 @@ public function execute()
             try {
                 /** @var \Magento\Framework\View\Result\Layout $resultLayout */
                 $resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT);
-                /** @var $attrFilterBlock \Magento\ImportExport\Block\Adminhtml\Export\Filter */
+                /** @var \Magento\ImportExport\Block\Adminhtml\Export\Filter $attrFilterBlock */
                 $attrFilterBlock = $resultLayout->getLayout()->getBlock('export.filter');
-                /** @var $export \Magento\ImportExport\Model\Export */
+                /** @var \Magento\ImportExport\Model\Export $export */
                 $export = $this->_objectManager->create(\Magento\ImportExport\Model\Export::class);
                 $export->setData($data);
 
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php
index 5f036e51f66c4..da73001b9f311 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php
@@ -71,7 +71,7 @@ public function execute()
             /** @var \Magento\Framework\View\Result\Layout $resultLayout */
             $resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT);
 
-            /** @var $resultBlock \Magento\ImportExport\Block\Adminhtml\Import\Frame\Result */
+            /** @var \Magento\ImportExport\Block\Adminhtml\Import\Frame\Result $resultBlock */
             $resultBlock = $resultLayout->getLayout()->getBlock('import.frame.result');
             $resultBlock
                 ->addAction('show', 'import_validation_container')
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
index b974b483288d0..33d6a7b73713f 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
@@ -42,7 +42,7 @@ public function execute()
         $data = $this->getRequest()->getPostValue();
         /** @var Layout $resultLayout */
         $resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT);
-        /** @var $resultBlock Result */
+        /** @var Result $resultBlock */
         $resultBlock = $resultLayout->getLayout()->getBlock('import.frame.result');
         //phpcs:disable Magento2.Security.Superglobal
         if ($data) {
diff --git a/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
index 8baf9e8fe9cb9..a0e683227332d 100644
--- a/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
@@ -209,7 +209,7 @@ public function __construct(
      */
     protected function _initStores()
     {
-        /** @var $store \Magento\Store\Model\Store */
+        /** @var \Magento\Store\Model\Store $store */
         foreach ($this->_storeManager->getStores(true) as $store) {
             $this->_storeIdToCode[$store->getId()] = $store->getCode();
         }
@@ -227,7 +227,7 @@ protected function _initStores()
      */
     protected function _initWebsites($withDefault = false)
     {
-        /** @var $website \Magento\Store\Model\Website */
+        /** @var \Magento\Store\Model\Website $website */
         foreach ($this->_storeManager->getWebsites($withDefault) as $website) {
             $this->_websiteIdToCode[$website->getId()] = $website->getCode();
         }
@@ -325,7 +325,7 @@ protected function _getExportAttributeCodes()
             }
             $attributeCodes = [];
 
-            /** @var $attribute AbstractAttribute */
+            /** @var AbstractAttribute $attribute */
             foreach ($this->filterAttributeCollection($this->getAttributeCollection()) as $attribute) {
                 if (!isset($skippedAttributes[$attribute->getAttributeId()])
                     || in_array($attribute->getAttributeCode(), $this->_permanentAttributes)
@@ -378,7 +378,7 @@ public function getAttributeCollection()
      */
     public function filterAttributeCollection(\Magento\Framework\Data\Collection $collection)
     {
-        /** @var $attribute \Magento\Eav\Model\Entity\Attribute\AbstractAttribute */
+        /** @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute */
         foreach ($collection as $attribute) {
             if (in_array($attribute->getAttributeCode(), $this->_disabledAttributes)) {
                 $collection->removeItemByKey($attribute->getId());
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
index 3e0b403089ac2..e883f32f35311 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
@@ -89,7 +89,7 @@ public function __construct(
      */
     protected function _initAttributeValues()
     {
-        /** @var $attribute AbstractAttribute */
+        /** @var AbstractAttribute $attribute */
         foreach ($this->getAttributeCollection() as $attribute) {
             $this->_attributeValues[$attribute->getAttributeCode()] = $this->getAttributeOptions($attribute);
         }
@@ -104,7 +104,7 @@ protected function _initAttributeValues()
      */
     protected function _initAttributeTypes()
     {
-        /** @var $attribute AbstractAttribute */
+        /** @var AbstractAttribute $attribute */
         foreach ($this->getAttributeCollection() as $attribute) {
             $this->attributeTypes[$attribute->getAttributeCode()] = $attribute->getFrontendInput();
         }
@@ -144,7 +144,7 @@ public function filterEntityCollection(AbstractCollection $collection)
             $exportFilter = $this->_parameters[Export::FILTER_ELEMENT_GROUP];
         }
 
-        /** @var $attribute AbstractAttribute */
+        /** @var AbstractAttribute $attribute */
         foreach ($this->filterAttributeCollection($this->getAttributeCollection()) as $attribute) {
             $attributeCode = $attribute->getAttributeCode();
 
diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
index 896a0bc3237aa..327cd9878b0be 100644
--- a/app/code/Magento/ImportExport/Model/Import.php
+++ b/app/code/Magento/ImportExport/Model/Import.php
@@ -799,7 +799,7 @@ public function getEntityBehaviors()
         foreach ($entities as $entityCode => $entityData) {
             $behaviorClassName = isset($entityData['behaviorModel']) ? $entityData['behaviorModel'] : null;
             if ($behaviorClassName && class_exists($behaviorClassName)) {
-                /** @var $behavior AbstractBehavior */
+                /** @var AbstractBehavior $behavior */
                 $behavior = $this->_behaviorFactory->create($behaviorClassName);
                 $behaviourData[$entityCode] = [
                     'token' => $behaviorClassName,
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
index 365ba19052a14..e19f2eb61fcf8 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
@@ -135,7 +135,7 @@ public function getWebsiteId($websiteCode)
      */
     protected function _initWebsites($withDefault = false)
     {
-        /** @var $website \Magento\Store\Model\Website */
+        /** @var \Magento\Store\Model\Website $website */
         foreach ($this->_storeManager->getWebsites($withDefault) as $website) {
             $this->_websiteCodeToId[$website->getCode()] = $website->getId();
         }
@@ -150,7 +150,7 @@ protected function _initWebsites($withDefault = false)
      */
     protected function _initStores($withDefault = false)
     {
-        /** @var $store \Magento\Store\Model\Store */
+        /** @var \Magento\Store\Model\Store $store */
         foreach ($this->_storeManager->getStores($withDefault) as $store) {
             $this->_storeCodeToId[$store->getCode()] = $store->getId();
         }
@@ -164,7 +164,7 @@ protected function _initStores($withDefault = false)
      */
     protected function _initAttributes()
     {
-        /** @var $attribute \Magento\Eav\Model\Attribute */
+        /** @var \Magento\Eav\Model\Attribute $attribute */
         foreach ($this->_attributeCollection as $attribute) {
             $this->_attributes[$attribute->getAttributeCode()] = [
                 'id' => $attribute->getId(),
diff --git a/app/code/Magento/ImportExport/Model/ResourceModel/CollectionByPagesIterator.php b/app/code/Magento/ImportExport/Model/ResourceModel/CollectionByPagesIterator.php
index 37a69c7a08e0e..d41fce4451705 100644
--- a/app/code/Magento/ImportExport/Model/ResourceModel/CollectionByPagesIterator.php
+++ b/app/code/Magento/ImportExport/Model/ResourceModel/CollectionByPagesIterator.php
@@ -23,7 +23,7 @@ class CollectionByPagesIterator
      */
     public function iterate(\Magento\Framework\Data\Collection\AbstractDb $collection, $pageSize, array $callbacks)
     {
-        /** @var $paginatedCollection \Magento\Framework\Data\Collection\AbstractDb */
+        /** @var \Magento\Framework\Data\Collection\AbstractDb $paginatedCollection */
         $paginatedCollection = null;
         $pageNumber = 1;
         do {
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Export/Entity/AbstractEavTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Export/Entity/AbstractEavTest.php
index 4520450e6494f..2e63dcb1bb643 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Export/Entity/AbstractEavTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Export/Entity/AbstractEavTest.php
@@ -84,7 +84,7 @@ public function testAddAttributeValuesToRow()
         $testAttributeCode = 'lastname';
         $testAttributeValue = 'value';
         $testAttributeOptions = ['value' => 'option'];
-        /** @var $testAttribute \Magento\Eav\Model\Entity\Attribute */
+        /** @var \Magento\Eav\Model\Entity\Attribute $testAttribute */
         $testAttribute = $this->getMockForAbstractClass(
             AbstractAttribute::class,
             [],
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Entity/AbstractTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Entity/AbstractTest.php
index 9f6c3cbdd0fcc..037f24270fc9d 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Entity/AbstractTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Entity/AbstractTest.php
@@ -54,7 +54,7 @@ protected function tearDown(): void
      */
     protected function _createSourceAdapterMock(array $columns)
     {
-        /** @var $source \Magento\ImportExport\Model\Import\AbstractSource|MockObject */
+        /** @var \Magento\ImportExport\Model\Import\AbstractSource|MockObject $source */
         $source = $this->getMockForAbstractClass(
             AbstractSource::class,
             [],
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/EntityAbstractTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/EntityAbstractTest.php
index a485d8c8c3213..867e5bf435535 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/EntityAbstractTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/EntityAbstractTest.php
@@ -590,7 +590,7 @@ public function testValidateDataAttributeNames()
      */
     protected function _createSourceAdapterMock(array $columns)
     {
-        /** @var $source \Magento\ImportExport\Model\Import\AbstractSource|MockObject */
+        /** @var \Magento\ImportExport\Model\Import\AbstractSource|MockObject $source */
         $source = $this->getMockForAbstractClass(
             AbstractSource::class,
             [],
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
index d512ce8182ede..17284ec7a92f0 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
@@ -5,7 +5,7 @@
  */
 ?>
 <?php
-/** @var $block \Magento\ImportExport\Block\Adminhtml\Import\Edit\Before */
+/** @var \Magento\ImportExport\Block\Adminhtml\Import\Edit\Before $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 $fieldNameSourceFile = \Magento\ImportExport\Model\Import::FIELD_NAME_SOURCE_FILE;
 $uploaderErrorMessage = $block->escapeHtml(
diff --git a/app/code/Magento/Integration/Model/Oauth/Token.php b/app/code/Magento/Integration/Model/Oauth/Token.php
index eba0ed6eb81ef..cfacdfaf70b27 100644
--- a/app/code/Magento/Integration/Model/Oauth/Token.php
+++ b/app/code/Magento/Integration/Model/Oauth/Token.php
@@ -300,7 +300,7 @@ public function validate()
             throw new OauthException(__(array_shift($messages)));
         }
 
-        /** @var $validatorLength \Magento\Integration\Model\Oauth\Consumer\Validator\KeyLength */
+        /** @var \Magento\Integration\Model\Oauth\Consumer\Validator\KeyLength $validatorLength */
         $validatorLength = $this->_keyLengthFactory->create();
         $validatorLength->setLength(OauthHelper::LENGTH_TOKEN_SECRET);
         $validatorLength->setName('Token Secret Key');
diff --git a/app/code/Magento/Integration/Setup/Patch/Data/UpgradeConsumerSecret.php b/app/code/Magento/Integration/Setup/Patch/Data/UpgradeConsumerSecret.php
index 3b9b1792d1cf4..188b402e410b6 100644
--- a/app/code/Magento/Integration/Setup/Patch/Data/UpgradeConsumerSecret.php
+++ b/app/code/Magento/Integration/Setup/Patch/Data/UpgradeConsumerSecret.php
@@ -83,7 +83,7 @@ public function apply()
         for ($currentPage = 1; $currentPage <= $pages; $currentPage++) {
             $this->consumerCollection->setCurPage($currentPage);
 
-            /** @var $consumer Consumer */
+            /** @var Consumer $consumer */
             foreach ($this->consumerCollection as $consumer) {
                 $existingSecret = $consumer->getSecret();
                 $entityId = $consumer->getEntityId();
diff --git a/app/code/Magento/Integration/Setup/Patch/Data/UpgradeOauthToken.php b/app/code/Magento/Integration/Setup/Patch/Data/UpgradeOauthToken.php
index 158da64b0eaa1..e5bbbdaaa2a7f 100644
--- a/app/code/Magento/Integration/Setup/Patch/Data/UpgradeOauthToken.php
+++ b/app/code/Magento/Integration/Setup/Patch/Data/UpgradeOauthToken.php
@@ -85,7 +85,7 @@ public function apply()
         for ($currentPage = 1; $currentPage <= $pages; $currentPage++) {
             $this->tokenCollection->setCurPage($currentPage);
 
-            /** @var $token Token */
+            /** @var Token $token */
             foreach ($this->tokenCollection as $token) {
                 $existingSecret = $token->getSecret();
                 $entityId = $token->getEntityId();
diff --git a/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml b/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml
index 72f1fdc1e5dc9..79e79c0369190 100644
--- a/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml
+++ b/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Webapi */
+/** @var \Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Webapi $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
diff --git a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/templates/url_filter_applier.phtml b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/templates/url_filter_applier.phtml
index fa3abd419a691..fa6b6d722ee49 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/templates/url_filter_applier.phtml
+++ b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/templates/url_filter_applier.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Backend\Block\Template */
+/** @var \Magento\Backend\Block\Template $block */
 /** @var \Magento\Framework\Escaper $escaper */
 ?>
 <script type="text/x-magento-init">
diff --git a/app/code/Magento/MediaStorage/Helper/File/Storage/Database.php b/app/code/Magento/MediaStorage/Helper/File/Storage/Database.php
index 9ff6824555395..0a7e9a861b25f 100644
--- a/app/code/Magento/MediaStorage/Helper/File/Storage/Database.php
+++ b/app/code/Magento/MediaStorage/Helper/File/Storage/Database.php
@@ -228,7 +228,7 @@ public function getUniqueFilename($directory, $filename)
     public function saveFileToFilesystem($filename)
     {
         if ($this->checkDbUsage()) {
-            /** @var $file \Magento\MediaStorage\Model\File\Storage\Database */
+            /** @var \Magento\MediaStorage\Model\File\Storage\Database $file */
             $file = $this->_dbStorageFactory->create()->loadByFilename($this->_removeAbsPathFromFileName($filename));
             if (!$file->getId()) {
                 return false;
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage/Synchronization.php b/app/code/Magento/MediaStorage/Model/File/Storage/Synchronization.php
index 5341eb2e14d5a..dfd6ca6a9cf1d 100644
--- a/app/code/Magento/MediaStorage/Model/File/Storage/Synchronization.php
+++ b/app/code/Magento/MediaStorage/Model/File/Storage/Synchronization.php
@@ -51,7 +51,7 @@ public function __construct(
      */
     public function synchronize($relativeFileName)
     {
-        /** @var $storage Database */
+        /** @var Database $storage */
         $storage = $this->storageFactory->create();
         try {
             $storage->loadByFilename($relativeFileName);
diff --git a/app/code/Magento/Msrp/Model/Msrp.php b/app/code/Magento/Msrp/Model/Msrp.php
index 7983711534f61..f076cd5b05749 100644
--- a/app/code/Magento/Msrp/Model/Msrp.php
+++ b/app/code/Magento/Msrp/Model/Msrp.php
@@ -41,7 +41,7 @@ public function __construct(
     public function canApplyToProduct($product)
     {
         if ($this->mapApplyToProductType === null) {
-            /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+            /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
             $attribute = $this->eavAttributeFactory->create()->loadByCode(Product::ENTITY, 'msrp');
             $this->mapApplyToProductType = $attribute->getApplyTo();
         }
diff --git a/app/code/Magento/Msrp/Observer/Frontend/Quote/SetCanApplyMsrpObserver.php b/app/code/Magento/Msrp/Observer/Frontend/Quote/SetCanApplyMsrpObserver.php
index 6352dd9772354..e3320d183dd18 100644
--- a/app/code/Magento/Msrp/Observer/Frontend/Quote/SetCanApplyMsrpObserver.php
+++ b/app/code/Magento/Msrp/Observer/Frontend/Quote/SetCanApplyMsrpObserver.php
@@ -50,7 +50,7 @@ public function __construct(
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
-        /** @var $quote \Magento\Quote\Model\Quote */
+        /** @var \Magento\Quote\Model\Quote $quote */
         $quote = $observer->getEvent()->getQuote();
 
         $canApplyMsrp = false;
diff --git a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
index 95d2ced72912b..9646ffe66d1d5 100644
--- a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
+++ b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
@@ -16,7 +16,7 @@
 /** @var Magento\Msrp\Pricing\Price\MsrpPriceInterface $priceType */
 $priceType = $block->getPrice();
 
-/** @var $product \Magento\Catalog\Model\Product */
+/** @var \Magento\Catalog\Model\Product $product */
 $product = $block->getSaleableItem();
 $productId = $product->getId();
 
diff --git a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
index 04abde81a7fe0..cfe0b4a96d1f0 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
@@ -16,13 +16,13 @@
 
 <?php
     //phpcs:disable
-    /** @var $pricingHelper \Magento\Framework\Pricing\Helper\Data */
+    /** @var \Magento\Framework\Pricing\Helper\Data $pricingHelper */
     $pricingHelper = $this->helper(\Magento\Framework\Pricing\Helper\Data::class);
-    /** @var $_catalogHelper \Magento\Catalog\Helper\Data */
+    /** @var \Magento\Catalog\Helper\Data $_catalogHelper */
     $_catalogHelper = $this->helper(\Magento\Catalog\Helper\Data::class);
     //phpcs:enable
 
-    /** @var $_product \Magento\Catalog\Model\Product */
+    /** @var \Magento\Catalog\Model\Product $_product */
     $_product = $block->getProduct();
     $_id = $_product->getId();
     $_msrpPrice = '';
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
index 67ea989a2de16..275f63d9e263b 100644
--- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
@@ -417,7 +417,7 @@ public function getQuoteShippingAddressesItems()
     public function removeAddressItem($addressId, $itemId)
     {
         $address = $this->getQuote()->getAddressById($addressId);
-        /* @var $address \Magento\Quote\Model\Quote\Address */
+        /** @var \Magento\Quote\Model\Quote\Address $address */
         if ($address) {
             $item = $address->getValidItemById($itemId);
             if ($item) {
@@ -808,7 +808,7 @@ protected function _validate()
     {
         $quote = $this->getQuote();
 
-        /** @var $paymentMethod \Magento\Payment\Model\Method\AbstractMethod */
+        /** @var \Magento\Payment\Model\Method\AbstractMethod $paymentMethod */
         $paymentMethod = $quote->getPayment()->getMethodInstance();
         if (!$paymentMethod->isAvailable($quote)) {
             throw new \Magento\Framework\Exception\LocalizedException(
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml
index 3505cadc5ec71..f986055859dce 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml
@@ -14,7 +14,7 @@
  * @see \Magento\Checkout\Block\Cart\Item\Renderer
  */
 ?>
-<?php /** @var $block Magento\Checkout\Block\Cart\Item\Renderer */ ?>
+<?php /** @var Magento\Checkout\Block\Cart\Item\Renderer $block */ ?>
 <?php $_item = $block->getItem() ?>
 <tr>
     <td class="col item" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php
index 6827b84605b49..dc0f97d7ad547 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php
@@ -64,7 +64,7 @@ public function __construct(
      */
     protected function _prepareForm()
     {
-        /* @var $queue \Magento\Newsletter\Model\Queue */
+        /** @var \Magento\Newsletter\Model\Queue $queue */
         $queue = $this->getQueue();
 
         /** @var \Magento\Framework\Data\Form $form */
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
index 71eb85545721b..bf55cc90cb009 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
@@ -54,7 +54,7 @@ public function __construct(
      */
     protected function _toHtml()
     {
-        /* @var $template \Magento\Newsletter\Model\Template */
+        /** @var \Magento\Newsletter\Model\Template $template */
         $template = $this->_templateFactory->create();
 
         if ($id = (int)$this->getRequest()->getParam('id')) {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
index 4f93e3e4f73a3..1dd13859048ef 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
@@ -21,12 +21,12 @@ class Save extends \Magento\Newsletter\Controller\Adminhtml\Queue implements Htt
     public function execute()
     {
         try {
-            /* @var $queue \Magento\Newsletter\Model\Queue */
+            /** @var \Magento\Newsletter\Model\Queue $queue */
             $queue = $this->_objectManager->create(\Magento\Newsletter\Model\Queue::class);
 
             $templateId = $this->getRequest()->getParam('template_id');
             if ($templateId) {
-                /* @var $template \Magento\Newsletter\Model\Template */
+                /** @var \Magento\Newsletter\Model\Template $template */
                 $template = $this->_objectManager->create(\Magento\Newsletter\Model\Template::class)->load($templateId);
 
                 if (!$template->getId() || $template->getIsSystem()) {
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php b/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php
index 1acd8008e73a8..c62538de49905 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php
@@ -88,7 +88,7 @@ public function addTemplateInfo()
      */
     protected function _addSubscriberInfoToSelect()
     {
-        /** @var $select \Magento\Framework\DB\Select */
+        /** @var \Magento\Framework\DB\Select $select */
         $select = $this->getConnection()->select()->from(
             ['qlt' => $this->getTable('newsletter_queue_link')],
             'COUNT(qlt.queue_link_id)'
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/queue/edit.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/queue/edit.phtml
index eb2e3f2b399f2..abd63ab18899e 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/queue/edit.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/queue/edit.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/* @var $block \Magento\Newsletter\Block\Adminhtml\Queue\Edit */
+/** @var \Magento\Newsletter\Block\Adminhtml\Queue\Edit $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
index 29555130de1ae..5ae5f32c2569f 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
@@ -6,7 +6,7 @@
 
 use Magento\Framework\App\TemplateTypesInterface;
 
-/* @var $block \Magento\Newsletter\Block\Adminhtml\Template\Edit */
+/** @var \Magento\Newsletter\Block\Adminhtml\Template\Edit $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 
 ?>
diff --git a/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml b/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml
index e7d3059025272..e612aa7a289f3 100644
--- a/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml
+++ b/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml
@@ -11,7 +11,7 @@ if (!$block->getButtonLockManager()) {
         $objectManager->get(\Magento\Framework\View\Element\ButtonLockManager::class)
     );
 }
-/** @var $escaper \Magento\Framework\Escaper */
+/** @var \Magento\Framework\Escaper $escaper */
 ?>
 <div class="block newsletter">
     <div class="title"><strong><?= $escaper->escapeHtml(__('Newsletter')) ?></strong></div>
diff --git a/app/code/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/Grid.php b/app/code/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/Grid.php
index e7b105d6e2c3a..024dabc6f2a93 100644
--- a/app/code/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/Grid.php
+++ b/app/code/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/Grid.php
@@ -120,7 +120,7 @@ public function getConditionName()
      */
     protected function _prepareCollection()
     {
-        /** @var $collection \Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\Collection */
+        /** @var \Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\Collection $collection */
         $collection = $this->_collectionFactory->create();
         $collection->setConditionFilter($this->getConditionName())->setWebsiteFilter($this->getWebsiteId());
 
diff --git a/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php b/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php
index 6814e9a09843e..808b858ae0e20 100644
--- a/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php
+++ b/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php
@@ -49,7 +49,7 @@ public function __construct(
     public function execute()
     {
         $fileName = 'tablerates.csv';
-        /** @var $gridBlock \Magento\OfflineShipping\Block\Adminhtml\Carrier\Tablerate\Grid */
+        /** @var \Magento\OfflineShipping\Block\Adminhtml\Carrier\Tablerate\Grid $gridBlock */
         $gridBlock = $this->_view->getLayout()->createBlock(
             \Magento\OfflineShipping\Block\Adminhtml\Carrier\Tablerate\Grid::class
         );
diff --git a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/LocationDirectory.php b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/LocationDirectory.php
index bd75a1ffe698c..eb55499d66aab 100644
--- a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/LocationDirectory.php
+++ b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/LocationDirectory.php
@@ -87,7 +87,7 @@ protected function loadCountries()
         $this->iso2Countries = [];
         $this->iso3Countries = [];
 
-        /** @var $collection \Magento\Directory\Model\ResourceModel\Country\Collection */
+        /** @var \Magento\Directory\Model\ResourceModel\Country\Collection $collection */
         $collection = $this->_countryCollectionFactory->create();
         foreach ($collection->getData() as $row) {
             $this->iso2Countries[$row['iso2_code']] = $row['country_id'];
@@ -136,7 +136,7 @@ protected function loadRegions()
         $this->regions = [];
         $this->regionsByCode = [];
 
-        /** @var $collection \Magento\Directory\Model\ResourceModel\Region\Collection */
+        /** @var \Magento\Directory\Model\ResourceModel\Region\Collection $collection */
         $collection = $this->_regionCollectionFactory->create();
         foreach ($collection->getData() as $row) {
             $this->regions[$row['country_id']][$row['code']] = (int)$row['region_id'];
diff --git a/app/code/Magento/OfflineShipping/Model/SalesRule/Calculator.php b/app/code/Magento/OfflineShipping/Model/SalesRule/Calculator.php
index 1f161c74c8335..c383b568c7a8f 100644
--- a/app/code/Magento/OfflineShipping/Model/SalesRule/Calculator.php
+++ b/app/code/Magento/OfflineShipping/Model/SalesRule/Calculator.php
@@ -31,7 +31,7 @@ public function processFreeShipping(\Magento\Quote\Model\Quote\Item\AbstractItem
         $item->setFreeShipping(false);
 
         foreach ($this->getRules($address) as $rule) {
-            /* @var $rule \Magento\SalesRule\Model\Rule */
+            /** @var \Magento\SalesRule\Model\Rule $rule */
             if (!$this->validatorUtility->canProcessRule($rule, $address)) {
                 continue;
             }
diff --git a/app/code/Magento/OrderCancellationUi/view/frontend/templates/cancel-order-modal.phtml b/app/code/Magento/OrderCancellationUi/view/frontend/templates/cancel-order-modal.phtml
index 8d79c6041d755..b47cfdea71f4e 100644
--- a/app/code/Magento/OrderCancellationUi/view/frontend/templates/cancel-order-modal.phtml
+++ b/app/code/Magento/OrderCancellationUi/view/frontend/templates/cancel-order-modal.phtml
@@ -5,7 +5,7 @@
  */
 ?>
 <?php
-/** @var $escaper Magento\Framework\Escaper */
+/** @var Magento\Framework\Escaper $escaper */
 ?>
 <div id="cancel-order-modal-<?=/* @noEscape */ $block->getOrder()->getId() ?>">
     <div class="modal-body-content">
diff --git a/app/code/Magento/OrderCancellationUi/view/frontend/templates/order/history.phtml b/app/code/Magento/OrderCancellationUi/view/frontend/templates/order/history.phtml
index b9134dd1e53e6..2bee73d3053b9 100644
--- a/app/code/Magento/OrderCancellationUi/view/frontend/templates/order/history.phtml
+++ b/app/code/Magento/OrderCancellationUi/view/frontend/templates/order/history.phtml
@@ -7,7 +7,7 @@
 // @codingStandardsIgnoreFile
 
 /** @var \Magento\Sales\Block\Order\History $block */
-/** @var $viewModel \Magento\OrderCancellationUi\ViewModel\Config */
+/** @var \Magento\OrderCancellationUi\ViewModel\Config $viewModel */
 $viewModel = $block->getViewModel();
 ?>
 <?php $_orders = $block->getOrders(); ?>
diff --git a/app/code/Magento/OrderCancellationUi/view/frontend/templates/order/info/buttons.phtml b/app/code/Magento/OrderCancellationUi/view/frontend/templates/order/info/buttons.phtml
index 1c524e3b57320..13debfd8ef2d7 100644
--- a/app/code/Magento/OrderCancellationUi/view/frontend/templates/order/info/buttons.phtml
+++ b/app/code/Magento/OrderCancellationUi/view/frontend/templates/order/info/buttons.phtml
@@ -7,7 +7,7 @@
 // @codingStandardsIgnoreFile
 
 /** @var \Magento\Sales\Block\Order\Info\Buttons $block */
-/** @var $viewModel \Magento\OrderCancellationUi\ViewModel\Config */
+/** @var \Magento\OrderCancellationUi\ViewModel\Config $viewModel */
 $viewModel = $block->getViewModel();
 ?>
 <div class="actions">
diff --git a/app/code/Magento/OrderCancellationUi/view/frontend/templates/order/recent.phtml b/app/code/Magento/OrderCancellationUi/view/frontend/templates/order/recent.phtml
index e73a5b3ea1430..c28a7fac518a5 100644
--- a/app/code/Magento/OrderCancellationUi/view/frontend/templates/order/recent.phtml
+++ b/app/code/Magento/OrderCancellationUi/view/frontend/templates/order/recent.phtml
@@ -6,8 +6,8 @@
 // phpcs:disable Magento2.Templates.ThisInTemplate
 // @codingStandardsIgnoreFile
 
-/** @var $block \Magento\Sales\Block\Order\Recent */
-/** @var $viewModel \Magento\OrderCancellationUi\ViewModel\Config */
+/** @var \Magento\Sales\Block\Order\Recent $block */
+/** @var \Magento\OrderCancellationUi\ViewModel\Config $viewModel */
 $viewModel = $block->getViewModel();
 ?>
 <div class="block block-dashboard-orders">
diff --git a/app/code/Magento/Payment/Model/Config/Converter.php b/app/code/Magento/Payment/Model/Config/Converter.php
index 478fbd9b2a366..69ff71b8a01d3 100644
--- a/app/code/Magento/Payment/Model/Config/Converter.php
+++ b/app/code/Magento/Payment/Model/Config/Converter.php
@@ -35,7 +35,7 @@ protected function convertCreditCards(\DOMXPath $xpath)
         foreach ($xpath->query('/payment/credit_cards/type') as $type) {
             $typeArray = [];
 
-            /** @var $typeSubNode \DOMNode */
+            /** @var \DOMNode $typeSubNode */
             foreach ($type->childNodes as $typeSubNode) {
                 switch ($typeSubNode->nodeName) {
                     case 'label':
@@ -87,7 +87,7 @@ protected function convertGroups(\DOMXPath $xpath)
             $groupAttributes = $group->attributes;
             $id = $groupAttributes->getNamedItem('id')->nodeValue;
 
-            /** @var $groupSubNode \DOMNode */
+            /** @var \DOMNode $groupSubNode */
             foreach ($group->childNodes as $groupSubNode) {
                 switch ($groupSubNode->nodeName) {
                     case 'label':
@@ -113,7 +113,7 @@ protected function convertMethods(\DOMXPath $xpath)
         /** @var \DOMNode $method */
         foreach ($xpath->query('/payment/methods/method') as $method) {
             $name = $method->attributes->getNamedItem('name')->nodeValue;
-            /** @var $methodSubNode \DOMNode */
+            /** @var \DOMNode $methodSubNode */
             foreach ($method->childNodes as $methodSubNode) {
                 if ($methodSubNode->nodeType != XML_ELEMENT_NODE) {
                     continue;
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Details/Form.php b/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Details/Form.php
index 226276a174b37..96e575c6c3972 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Details/Form.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Details/Form.php
@@ -49,7 +49,7 @@ public function __construct(
      */
     protected function _prepareForm()
     {
-        /* @var $model \Magento\Paypal\Model\Report\Settlement\Row */
+        /** @var \Magento\Paypal\Model\Report\Settlement\Row $model */
         $model = $this->_coreRegistry->registry('current_transaction');
         $fieldsets = [
             'reference_fieldset' => [
diff --git a/app/code/Magento/Paypal/Block/Bml/Form.php b/app/code/Magento/Paypal/Block/Bml/Form.php
index 3bb96c1dabe34..d5aab018d3977 100644
--- a/app/code/Magento/Paypal/Block/Bml/Form.php
+++ b/app/code/Magento/Paypal/Block/Bml/Form.php
@@ -25,7 +25,7 @@ class Form extends Express\Form
     protected function _construct()
     {
         $this->_config = $this->_paypalConfigFactory->create()->setMethod($this->getMethodCode());
-        /** @var $mark \Magento\Framework\View\Element\Template */
+        /** @var \Magento\Framework\View\Element\Template $mark */
         $mark = $this->_getMarkTemplate();
         $mark->setPaymentAcceptanceMarkHref(
             'https://www.securecheckout.billmelater.com/paycapture-content/'
diff --git a/app/code/Magento/Paypal/Block/Express/Form.php b/app/code/Magento/Paypal/Block/Express/Form.php
index 42b06f961d225..df1c489a2f563 100644
--- a/app/code/Magento/Paypal/Block/Express/Form.php
+++ b/app/code/Magento/Paypal/Block/Express/Form.php
@@ -120,7 +120,7 @@ public function getMethodCode()
      */
     protected function _getMarkTemplate()
     {
-        /** @var $mark Template */
+        /** @var Template $mark */
         $mark = $this->_layout->createBlock(\Magento\Framework\View\Element\Template::class);
         $mark->setTemplate('Magento_Paypal::payment/mark.phtml');
         return $mark;
diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Fetch.php b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Fetch.php
index 76b434a6cff09..d5e185bda8cd1 100644
--- a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Fetch.php
+++ b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Fetch.php
@@ -27,7 +27,7 @@ public function execute()
     {
         try {
             $reports = $this->_settlementFactory->create();
-            /* @var $reports \Magento\Paypal\Model\Report\Settlement */
+            /** @var \Magento\Paypal\Model\Report\Settlement $reports */
             $credentials = $reports->getSftpCredentials();
             if (empty($credentials)) {
                 throw new \Magento\Framework\Exception\LocalizedException(
diff --git a/app/code/Magento/Paypal/Controller/Payflow/SilentPost.php b/app/code/Magento/Paypal/Controller/Payflow/SilentPost.php
index 2d6a8f80bafd8..1ce9b3d814af1 100644
--- a/app/code/Magento/Paypal/Controller/Payflow/SilentPost.php
+++ b/app/code/Magento/Paypal/Controller/Payflow/SilentPost.php
@@ -38,7 +38,7 @@ public function execute()
     {
         $data = $this->getRequest()->getPostValue();
         if (isset($data['INVNUM'])) {
-            /** @var $paymentModel \Magento\Paypal\Model\Payflowlink */
+            /** @var \Magento\Paypal\Model\Payflowlink $paymentModel */
             $paymentModel = $this->_payflowModelFactory->create();
             try {
                 $paymentModel->process($data);
diff --git a/app/code/Magento/Paypal/Cron/FetchReports.php b/app/code/Magento/Paypal/Cron/FetchReports.php
index 0e335721b4753..3d461ec3b580b 100644
--- a/app/code/Magento/Paypal/Cron/FetchReports.php
+++ b/app/code/Magento/Paypal/Cron/FetchReports.php
@@ -33,7 +33,7 @@ public function execute()
     {
         /** @var \Magento\Paypal\Model\Report\Settlement $reports */
         $reports = $this->_settlementFactory->create();
-        /* @var $reports \Magento\Paypal\Model\Report\Settlement */
+        /** @var \Magento\Paypal\Model\Report\Settlement $reports */
         $credentials = $reports->getSftpCredentials(true);
         foreach ($credentials as $config) {
             $reports->fetchAndSave(\Magento\Paypal\Model\Report\Settlement::createConnection($config));
diff --git a/app/code/Magento/Paypal/Helper/Shortcut/Validator.php b/app/code/Magento/Paypal/Helper/Shortcut/Validator.php
index 70fb497984296..7847c2fb3aa69 100644
--- a/app/code/Magento/Paypal/Helper/Shortcut/Validator.php
+++ b/app/code/Magento/Paypal/Helper/Shortcut/Validator.php
@@ -94,7 +94,7 @@ public function isPriceOrSetAvailable($isInCatalog)
     {
         if ($isInCatalog) {
             // Show PayPal shortcut on a product view page only if product has nonzero price
-            /** @var $currentProduct \Magento\Catalog\Model\Product */
+            /** @var \Magento\Catalog\Model\Product $currentProduct */
             $currentProduct = $this->_registry->registry('current_product');
             if ($currentProduct !== null) {
                 $productPrice = (double)$currentProduct->getFinalPrice();
diff --git a/app/code/Magento/Paypal/Model/Adminhtml/Express.php b/app/code/Magento/Paypal/Model/Adminhtml/Express.php
index 9642fc5231768..bd9c742da63db 100644
--- a/app/code/Magento/Paypal/Model/Adminhtml/Express.php
+++ b/app/code/Magento/Paypal/Model/Adminhtml/Express.php
@@ -123,7 +123,7 @@ public function authorizeOrder(OrderInterface $order)
     {
         $baseTotalDue = $order->getBaseTotalDue();
 
-        /** @var $payment Payment */
+        /** @var Payment $payment */
         $payment = $order->getPayment();
         if (!$payment || !$this->isOrderAuthorizationAllowed($payment)) {
             throw new LocalizedException(__('Authorization is not allowed.'));
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
index 86e763019f3c4..04bb9fabf1ae3 100644
--- a/app/code/Magento/Paypal/Model/Express/Checkout.php
+++ b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -553,7 +553,7 @@ public function start($returnUrl, $cancelUrl, $button = null)
             $this->_quote->getPayment()->save();
         }
 
-        /** @var $cart \Magento\Payment\Model\Cart */
+        /** @var \Magento\Payment\Model\Cart $cart */
         $cart = $this->_cartFactory->create(['salesModel' => $this->_quote]);
 
         $this->_getApi()->setPaypalCart($cart);
diff --git a/app/code/Magento/Paypal/Model/Ipn.php b/app/code/Magento/Paypal/Model/Ipn.php
index fd6a78e65854b..c11bdbf4c66fd 100644
--- a/app/code/Magento/Paypal/Model/Ipn.php
+++ b/app/code/Magento/Paypal/Model/Ipn.php
@@ -416,7 +416,7 @@ public function _registerPaymentPending()
      */
     protected function _registerPaymentAuthorization()
     {
-        /** @var $payment \Magento\Sales\Model\Order\Payment */
+        /** @var \Magento\Sales\Model\Order\Payment $payment */
         $payment = $this->_order->getPayment();
         if ($this->_order->canFetchPaymentReviewUpdate()) {
             $payment->update(true);
diff --git a/app/code/Magento/Paypal/Model/Payflowlink.php b/app/code/Magento/Paypal/Model/Payflowlink.php
index 536935b24f973..8dbfd1b1000cd 100644
--- a/app/code/Magento/Paypal/Model/Payflowlink.php
+++ b/app/code/Magento/Paypal/Model/Payflowlink.php
@@ -576,7 +576,7 @@ protected function _generateSecureSilentPostHash($payment)
     protected function _getCallbackUrl($actionName)
     {
         if ($this->_requestHttp->getParam('website')) {
-            /** @var $website \Magento\Store\Model\Website */
+            /** @var \Magento\Store\Model\Website $website */
             $website = $this->_websiteFactory->create()->load($this->_requestHttp->getParam('website'));
             $secure = $this->_scopeConfig->isSetFlag(
                 \Magento\Store\Model\Store::XML_PATH_SECURE_IN_FRONTEND,
diff --git a/app/code/Magento/Paypal/Observer/SaveOrderAfterSubmitObserver.php b/app/code/Magento/Paypal/Observer/SaveOrderAfterSubmitObserver.php
index 6900176702700..9a2e091c05b05 100644
--- a/app/code/Magento/Paypal/Observer/SaveOrderAfterSubmitObserver.php
+++ b/app/code/Magento/Paypal/Observer/SaveOrderAfterSubmitObserver.php
@@ -39,7 +39,7 @@ public function __construct(
      */
     public function execute(EventObserver $observer)
     {
-        /* @var $order \Magento\Sales\Model\Order */
+        /** @var \Magento\Sales\Model\Order $order */
         $order = $observer->getEvent()->getData('order');
         $this->_coreRegistry->register('hss_order', $order, true);
 
diff --git a/app/code/Magento/Paypal/Observer/SetResponseAfterSaveOrderObserver.php b/app/code/Magento/Paypal/Observer/SetResponseAfterSaveOrderObserver.php
index 0e05791dc875d..4f5b764b1a927 100644
--- a/app/code/Magento/Paypal/Observer/SetResponseAfterSaveOrderObserver.php
+++ b/app/code/Magento/Paypal/Observer/SetResponseAfterSaveOrderObserver.php
@@ -62,7 +62,7 @@ public function __construct(
      */
     public function execute(EventObserver $observer)
     {
-        /* @var $order \Magento\Sales\Model\Order */
+        /** @var \Magento\Sales\Model\Order $order */
         $order = $this->_coreRegistry->registry('hss_order');
 
         if ($order && $order->getId()) {
diff --git a/app/code/Magento/Paypal/view/frontend/templates/paylater/banner.phtml b/app/code/Magento/Paypal/view/frontend/templates/paylater/banner.phtml
index a0666b5467524..215cfa4491ebf 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/paylater/banner.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/paylater/banner.phtml
@@ -3,8 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-/** @var $block \Magento\Paypal\Block\PayLater\Banner */
-/** @var $cartBlock Magento\Checkout\Block\Cart */
+/** @var \Magento\Paypal\Block\PayLater\Banner $block */
+/** @var Magento\Checkout\Block\Cart $cartBlock */
 ?>
 <?php $cartBlock = $block->getLayout()->getBlock('checkout.cart'); ?>
 <?php if ($block->getData('placement') !== 'cart' || is_object($cartBlock) && $cartBlock->getItemsCount()): ?>
diff --git a/app/code/Magento/Persistent/Model/Checkout/ConfigProviderPlugin.php b/app/code/Magento/Persistent/Model/Checkout/ConfigProviderPlugin.php
index c7c64a32f030b..a5385740ee141 100644
--- a/app/code/Magento/Persistent/Model/Checkout/ConfigProviderPlugin.php
+++ b/app/code/Magento/Persistent/Model/Checkout/ConfigProviderPlugin.php
@@ -71,7 +71,7 @@ public function afterGetConfig(\Magento\Checkout\Model\DefaultConfigProvider $su
                 && $this->persistentSession->isPersistent()
                 && !$this->customerSession->isLoggedIn()
         ) {
-            /** @var $quoteIdMask \Magento\Quote\Model\QuoteIdMask */
+            /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
             $quoteIdMask = $this->quoteIdMaskFactory->create();
             $result['quoteData']['entity_id'] = $quoteIdMask->load(
                 $this->checkoutSession->getQuote()->getId(),
diff --git a/app/code/Magento/Persistent/Model/Persistent/Config.php b/app/code/Magento/Persistent/Model/Persistent/Config.php
index 3fd3690abc93b..379d05ef2756b 100644
--- a/app/code/Magento/Persistent/Model/Persistent/Config.php
+++ b/app/code/Magento/Persistent/Model/Persistent/Config.php
@@ -174,7 +174,7 @@ protected function _convertBlocksToArray($blocks)
             $referenceAttributes = $reference->attributes;
             $id = $referenceAttributes->getNamedItem('id')->nodeValue;
             $blocksArray[$id] = [];
-            /** @var $referenceSubNode /DOMNode */
+            /** @var /DOMNode $referenceSubNode */
             foreach ($reference->childNodes as $referenceSubNode) {
                 switch ($referenceSubNode->nodeName) {
                     case 'name_in_layout':
diff --git a/app/code/Magento/Persistent/Model/QuoteManager.php b/app/code/Magento/Persistent/Model/QuoteManager.php
index 4485240650cd7..f969842519763 100644
--- a/app/code/Magento/Persistent/Model/QuoteManager.php
+++ b/app/code/Magento/Persistent/Model/QuoteManager.php
@@ -102,7 +102,7 @@ public function __construct(
      */
     public function setGuest($checkQuote = false)
     {
-        /** @var $quote Quote */
+        /** @var Quote $quote */
         $quote = $this->checkoutSession->getQuote();
         if ($quote && $quote->getId()) {
             if ($checkQuote && !$this->persistentData->isShoppingCartPersist() && !$quote->getIsPersistent()) {
diff --git a/app/code/Magento/Persistent/Model/ResourceModel/ExpiredPersistentQuotesCollection.php b/app/code/Magento/Persistent/Model/ResourceModel/ExpiredPersistentQuotesCollection.php
index 291bf855af937..463d1879de584 100644
--- a/app/code/Magento/Persistent/Model/ResourceModel/ExpiredPersistentQuotesCollection.php
+++ b/app/code/Magento/Persistent/Model/ResourceModel/ExpiredPersistentQuotesCollection.php
@@ -51,7 +51,7 @@ public function getExpiredPersistentQuotes(StoreInterface $store, int $lastId, i
 
         $lastLoginCondition = gmdate("Y-m-d H:i:s", time() - $lifetime);
 
-        /** @var $quotes Collection */
+        /** @var Collection $quotes */
         $quotes = $this->quoteCollectionFactory->create();
 
         $additionalQuotes = clone $quotes;
diff --git a/app/code/Magento/Persistent/Observer/ApplyBlockPersistentDataObserver.php b/app/code/Magento/Persistent/Observer/ApplyBlockPersistentDataObserver.php
index fb21c3e680342..487403ff713a6 100644
--- a/app/code/Magento/Persistent/Observer/ApplyBlockPersistentDataObserver.php
+++ b/app/code/Magento/Persistent/Observer/ApplyBlockPersistentDataObserver.php
@@ -68,7 +68,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             return $this;
         }
 
-        /** @var $block \Magento\Framework\View\Element\AbstractBlock */
+        /** @var \Magento\Framework\View\Element\AbstractBlock $block */
         $block = $observer->getEvent()->getBlock();
 
         if (!$block) {
@@ -80,7 +80,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             $configFilePath = $this->_persistentData->getPersistentConfigFilePath();
         }
 
-        /** @var $persistentConfig \Magento\Persistent\Model\Persistent\Config */
+        /** @var \Magento\Persistent\Model\Persistent\Config $persistentConfig */
         $persistentConfig = $this->_persistentConfigFactory->create();
         $persistentConfig->setConfigFilePath($configFilePath);
 
diff --git a/app/code/Magento/Persistent/Observer/MakePersistentQuoteGuestObserver.php b/app/code/Magento/Persistent/Observer/MakePersistentQuoteGuestObserver.php
index 98c9c3df27852..2e0f21fa46e68 100644
--- a/app/code/Magento/Persistent/Observer/MakePersistentQuoteGuestObserver.php
+++ b/app/code/Magento/Persistent/Observer/MakePersistentQuoteGuestObserver.php
@@ -66,7 +66,7 @@ public function __construct(
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
-        /** @var $action \Magento\Persistent\Controller\Index */
+        /** @var \Magento\Persistent\Controller\Index $action */
         $action = $observer->getEvent()->getControllerAction();
         if ($action instanceof \Magento\Persistent\Controller\Index) {
             if (($this->_persistentSession->isPersistent() && !$this->_customerSession->isLoggedIn())
diff --git a/app/code/Magento/Persistent/Observer/PreventClearCheckoutSessionObserver.php b/app/code/Magento/Persistent/Observer/PreventClearCheckoutSessionObserver.php
index 595d0c0f7fd38..0eac1f79dcd7f 100644
--- a/app/code/Magento/Persistent/Observer/PreventClearCheckoutSessionObserver.php
+++ b/app/code/Magento/Persistent/Observer/PreventClearCheckoutSessionObserver.php
@@ -54,7 +54,7 @@ public function __construct(
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
-        /** @var $action \Magento\Persistent\Controller\Index */
+        /** @var \Magento\Persistent\Controller\Index $action */
         $action = $observer->getEvent()->getControllerAction();
         if ($action instanceof \Magento\Persistent\Controller\Index) {
             if (($this->_persistentSession->isPersistent() && !$this->_customerSession->isLoggedIn())
diff --git a/app/code/Magento/Persistent/Observer/RenewCookieObserver.php b/app/code/Magento/Persistent/Observer/RenewCookieObserver.php
index c814abe415b2b..67918b2219700 100644
--- a/app/code/Magento/Persistent/Observer/RenewCookieObserver.php
+++ b/app/code/Magento/Persistent/Observer/RenewCookieObserver.php
@@ -76,7 +76,7 @@ public function execute(Observer $observer)
             return;
         }
 
-        /** @var $request \Magento\Framework\App\RequestInterface */
+        /** @var \Magento\Framework\App\RequestInterface $request */
         $request = $observer->getEvent()->getRequest();
 
         if ($this->_customerSession->isLoggedIn() || $request->getFullActionName() == 'customer_account_logout') {
diff --git a/app/code/Magento/Persistent/Observer/SetCheckoutSessionPersistentDataObserver.php b/app/code/Magento/Persistent/Observer/SetCheckoutSessionPersistentDataObserver.php
index 8b14792a0e389..c63cad7634878 100644
--- a/app/code/Magento/Persistent/Observer/SetCheckoutSessionPersistentDataObserver.php
+++ b/app/code/Magento/Persistent/Observer/SetCheckoutSessionPersistentDataObserver.php
@@ -87,7 +87,7 @@ public function __construct(
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
-        /** @var $checkoutSession \Magento\Checkout\Model\Session */
+        /** @var \Magento\Checkout\Model\Session $checkoutSession */
         $checkoutSession = $observer->getEvent()->getData('checkout_session');
         if ($this->persistentData->isShoppingCartPersist() && $this->persistentSession->isPersistent()) {
             if (!$this->customerSession->isLoggedIn() && $this->persistentData->getClearOnLogout()) {
diff --git a/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php b/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php
index 2803bc998dcbe..d4105ddeaf97d 100644
--- a/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php
+++ b/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php
@@ -70,7 +70,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             return;
         }
 
-        /** @var $quote \Magento\Quote\Model\Quote */
+        /** @var \Magento\Quote\Model\Quote $quote */
         $quote = $observer->getEvent()->getQuote();
         if (!$quote) {
             return;
diff --git a/app/code/Magento/Persistent/Observer/SetRememberMeCheckedStatusObserver.php b/app/code/Magento/Persistent/Observer/SetRememberMeCheckedStatusObserver.php
index 83f2e55d8def0..15928c8a0a6ed 100644
--- a/app/code/Magento/Persistent/Observer/SetRememberMeCheckedStatusObserver.php
+++ b/app/code/Magento/Persistent/Observer/SetRememberMeCheckedStatusObserver.php
@@ -67,7 +67,7 @@ public function execute(Observer $observer)
             return;
         }
 
-        /** @var $controllerAction \Magento\Framework\App\RequestInterface */
+        /** @var \Magento\Framework\App\RequestInterface $controllerAction */
         $request = $observer->getEvent()->getRequest();
         if ($request) {
             $rememberMeCheckbox = $request->getPost('persistent_remember_me');
diff --git a/app/code/Magento/Persistent/Observer/SetRememberMeStatusForAjaxLoginObserver.php b/app/code/Magento/Persistent/Observer/SetRememberMeStatusForAjaxLoginObserver.php
index 05b05fc40cc33..48154a0cb2c3a 100644
--- a/app/code/Magento/Persistent/Observer/SetRememberMeStatusForAjaxLoginObserver.php
+++ b/app/code/Magento/Persistent/Observer/SetRememberMeStatusForAjaxLoginObserver.php
@@ -67,7 +67,7 @@ public function execute(Observer $observer)
             return;
         }
 
-        /** @var $request \Magento\Framework\App\RequestInterface */
+        /** @var \Magento\Framework\App\RequestInterface $request */
         $request = $observer->getEvent()->getRequest();
         if ($request && $request->isXmlHttpRequest()) {
             $requestData = [];
diff --git a/app/code/Magento/Persistent/Observer/SynchronizePersistentInfoObserver.php b/app/code/Magento/Persistent/Observer/SynchronizePersistentInfoObserver.php
index bbb81f76d9775..a870b0949af1f 100644
--- a/app/code/Magento/Persistent/Observer/SynchronizePersistentInfoObserver.php
+++ b/app/code/Magento/Persistent/Observer/SynchronizePersistentInfoObserver.php
@@ -62,10 +62,10 @@ public function execute(Observer $observer)
             return;
         }
 
-        /** @var $sessionModel \Magento\Persistent\Model\Session */
+        /** @var \Magento\Persistent\Model\Session $sessionModel */
         $sessionModel = $this->_persistentSession->getSession();
 
-        /** @var $request \Magento\Framework\App\RequestInterface */
+        /** @var \Magento\Framework\App\RequestInterface $request */
         $request = $observer->getEvent()->getRequest();
 
         // Quote Id could be changed only by logged in customer
diff --git a/app/code/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserver.php b/app/code/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserver.php
index f0b05cb7850cc..b339fc348a56a 100644
--- a/app/code/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserver.php
+++ b/app/code/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserver.php
@@ -74,7 +74,7 @@ public function __construct(
      */
     public function execute(Observer $observer)
     {
-        /** @var $customer \Magento\Customer\Api\Data\CustomerInterface */
+        /** @var \Magento\Customer\Api\Data\CustomerInterface $customer */
         $customer = $observer->getEvent()->getCustomer();
         // Check if customer is valid (remove persistent cookie for invalid customer)
         if (!$customer || !$customer->getId() || !$this->_persistentSession->isRememberMeChecked()) {
@@ -90,7 +90,7 @@ public function execute(Observer $observer)
             return;
         }
 
-        /** @var $sessionModel \Magento\Persistent\Model\Session */
+        /** @var \Magento\Persistent\Model\Session $sessionModel */
         $sessionModel = $this->_persistentSession->getSession();
 
         // Check if session is wrong or not exists, so create new session
diff --git a/app/code/Magento/ProductAlert/Controller/Add/Price.php b/app/code/Magento/ProductAlert/Controller/Add/Price.php
index 19eefe751db35..ce0dc6ddfd1e8 100644
--- a/app/code/Magento/ProductAlert/Controller/Add/Price.php
+++ b/app/code/Magento/ProductAlert/Controller/Add/Price.php
@@ -88,7 +88,7 @@ public function execute()
 
         $store = $this->storeManager->getStore();
         try {
-            /* @var $product \Magento\Catalog\Model\Product */
+            /** @var \Magento\Catalog\Model\Product $product */
             $product = $this->productRepository->getById($productId);
             /** @var \Magento\ProductAlert\Model\Price $model */
             $model = $this->_objectManager->create(\Magento\ProductAlert\Model\Price::class)
diff --git a/app/code/Magento/ProductAlert/Controller/Add/Stock.php b/app/code/Magento/ProductAlert/Controller/Add/Stock.php
index 1718c2d25112e..4a0bc81743dd5 100644
--- a/app/code/Magento/ProductAlert/Controller/Add/Stock.php
+++ b/app/code/Magento/ProductAlert/Controller/Add/Stock.php
@@ -66,7 +66,7 @@ public function execute()
         }
 
         try {
-            /* @var $product \Magento\Catalog\Model\Product */
+            /** @var \Magento\Catalog\Model\Product $product */
             $product = $this->productRepository->getById($productId);
             $store = $this->storeManager->getStore();
             /** @var \Magento\ProductAlert\Model\Stock $model */
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php
index 0aabf5d96e1e7..292cc3d55a276 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php
@@ -54,7 +54,7 @@ public function execute()
         }
 
         try {
-            /* @var $product \Magento\Catalog\Model\Product */
+            /** @var \Magento\Catalog\Model\Product $product */
             $product = $this->productRepository->getById($productId);
             if (!$product->isVisibleInCatalog()) {
                 $this->messageManager->addErrorMessage(
diff --git a/app/code/Magento/ProductAlert/view/frontend/templates/email/email.phtml b/app/code/Magento/ProductAlert/view/frontend/templates/email/email.phtml
index a99fe71d06dfd..5cb2dbd6510cd 100644
--- a/app/code/Magento/ProductAlert/view/frontend/templates/email/email.phtml
+++ b/app/code/Magento/ProductAlert/view/frontend/templates/email/email.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block Magento\Framework\View\Element\Template */
+/** @var Magento\Framework\View\Element\Template $block */
 ?>
 
 <form action="<?= $block->escapeUrl($block->getUrl('productalert/unsubscribe/stock')) ?>"
diff --git a/app/code/Magento/ProductAlert/view/frontend/templates/email/price.phtml b/app/code/Magento/ProductAlert/view/frontend/templates/email/price.phtml
index 054871be52613..ed59a82f6192f 100644
--- a/app/code/Magento/ProductAlert/view/frontend/templates/email/price.phtml
+++ b/app/code/Magento/ProductAlert/view/frontend/templates/email/price.phtml
@@ -4,12 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\ProductAlert\Block\Email\Price */
+/** @var \Magento\ProductAlert\Block\Email\Price $block */
 ?>
 <?php if ($_products = $block->getProducts()) : ?>
     <p><?= $block->escapeHtml(__('Price change alert! We wanted you to know that prices have changed for these products:')) ?></p>
     <table>
-    <?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
+    <?php /** @var \Magento\Catalog\Model\Product $_product */ ?>
     <?php foreach ($_products as $_product) : ?>
         <tr>
             <td class="col photo">
diff --git a/app/code/Magento/ProductAlert/view/frontend/templates/email/stock.phtml b/app/code/Magento/ProductAlert/view/frontend/templates/email/stock.phtml
index d90a458b4422a..3fb8d20fd6a38 100644
--- a/app/code/Magento/ProductAlert/view/frontend/templates/email/stock.phtml
+++ b/app/code/Magento/ProductAlert/view/frontend/templates/email/stock.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\ProductAlert\Block\Email\Stock */
+/** @var \Magento\ProductAlert\Block\Email\Stock $block */
 ?>
 <?php if ($_products = $block->getProducts()) : ?>
     <p><?= $block->escapeHtml(__('In stock alert! We wanted you to know that these products are now available:')) ?></p>
diff --git a/app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml b/app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml
index 462196d773aab..38aa39079c5d1 100644
--- a/app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml
+++ b/app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php /* @var $block \Magento\ProductAlert\Block\Product\View */?>
+<?php /** @var \Magento\ProductAlert\Block\Product\View $block */?>
 <div class="product alert <?= $block->getHtmlClass() ?>">
     <a href="<?= $block->escapeUrl($block->getSignupUrl()) ?>"
        title="<?= $block->escapeHtml(__($block->getSignupLabel())) ?>" class="action alert">
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml b/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml
index 9facf079ff4d4..8e6664b99f5f0 100644
--- a/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml
+++ b/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml
@@ -39,7 +39,7 @@ $message = 'Restricted admin is allowed to perform actions with images or videos
 </div>
 
 <?php
-/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content */
+/** @var \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content $block */
 $element = $block->getElement();
 $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode():
     'toggleValueElements(this, this.parentNode.parentNode.parentNode)';
diff --git a/app/code/Magento/Quote/Model/Cart/Totals/ItemConverter.php b/app/code/Magento/Quote/Model/Cart/Totals/ItemConverter.php
index f8a39fde60dca..e23a749dd8726 100644
--- a/app/code/Magento/Quote/Model/Cart/Totals/ItemConverter.php
+++ b/app/code/Magento/Quote/Model/Cart/Totals/ItemConverter.php
@@ -100,7 +100,7 @@ private function getFormattedOptionValue($item)
     {
         $optionsData = [];
 
-        /* @var $helper \Magento\Catalog\Helper\Product\Configuration */
+        /** @var \Magento\Catalog\Helper\Product\Configuration $helper */
         $helper = $this->configurationPool->getByProductType('default');
 
         $options = $this->configurationPool->getByProductType($item->getProductType())->getOptions($item);
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestBillingAddressManagement.php b/app/code/Magento/Quote/Model/GuestCart/GuestBillingAddressManagement.php
index 3e491e0b1a24d..c45fb01e16226 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestBillingAddressManagement.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestBillingAddressManagement.php
@@ -44,7 +44,7 @@ public function __construct(
      */
     public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $address, $useForShipping = false)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return (int)$this->billingAddressManagement->assign($quoteIdMask->getQuoteId(), $address, $useForShipping);
     }
@@ -54,7 +54,7 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
      */
     public function get($cartId)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->billingAddressManagement->get($quoteIdMask->getQuoteId());
     }
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestCartItemRepository.php b/app/code/Magento/Quote/Model/GuestCart/GuestCartItemRepository.php
index 46c3b9b7a8fdf..4b140b5376234 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestCartItemRepository.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestCartItemRepository.php
@@ -45,10 +45,10 @@ public function __construct(
      */
     public function getList($cartId)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         $cartItemList = $this->repository->getList($quoteIdMask->getQuoteId());
-        /** @var $item CartItemInterface */
+        /** @var CartItemInterface $item */
         foreach ($cartItemList as $item) {
             $item->setQuoteId($quoteIdMask->getMaskedId());
         }
@@ -60,7 +60,7 @@ public function getList($cartId)
      */
     public function save(\Magento\Quote\Api\Data\CartItemInterface $cartItem)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartItem->getQuoteId(), 'masked_id');
         $cartItem->setQuoteId($quoteIdMask->getQuoteId());
         return $this->repository->save($cartItem);
@@ -71,7 +71,7 @@ public function save(\Magento\Quote\Api\Data\CartItemInterface $cartItem)
      */
     public function deleteById($cartId, $itemId)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->repository->deleteById($quoteIdMask->getQuoteId(), $itemId);
     }
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestCartManagement.php b/app/code/Magento/Quote/Model/GuestCart/GuestCartManagement.php
index 51083e6a753c9..28c5066eadb45 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestCartManagement.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestCartManagement.php
@@ -58,7 +58,7 @@ public function __construct(
      */
     public function createEmptyCart()
     {
-        /** @var $quoteIdMask \Magento\Quote\Model\QuoteIdMask */
+        /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create();
         $cartId = $this->quoteManagement->createEmptyCart();
         $quoteIdMask->setQuoteId($cartId)->save();
@@ -70,7 +70,7 @@ public function createEmptyCart()
      */
     public function assignCustomer($cartId, $customerId, $storeId)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->quoteManagement->assignCustomer($quoteIdMask->getQuoteId(), $customerId, $storeId);
     }
@@ -80,7 +80,7 @@ public function assignCustomer($cartId, $customerId, $storeId)
      */
     public function placeOrder($cartId, ?PaymentInterface $paymentMethod = null)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         $this->cartRepository->get($quoteIdMask->getQuoteId())
             ->setCheckoutMethod(CartManagementInterface::METHOD_GUEST);
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestCartRepository.php b/app/code/Magento/Quote/Model/GuestCart/GuestCartRepository.php
index 665dc0a87c97b..f2b0732b61db6 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestCartRepository.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestCartRepository.php
@@ -44,7 +44,7 @@ public function __construct(
      */
     public function get($cartId)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->quoteRepository->get($quoteIdMask->getQuoteId());
     }
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestCartTotalRepository.php b/app/code/Magento/Quote/Model/GuestCart/GuestCartTotalRepository.php
index 9e384671cf6bd..77993c8ccde90 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestCartTotalRepository.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestCartTotalRepository.php
@@ -45,7 +45,7 @@ public function __construct(
      */
     public function get($cartId)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->cartTotalRepository->get($quoteIdMask->getQuoteId());
     }
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestCouponManagement.php b/app/code/Magento/Quote/Model/GuestCart/GuestCouponManagement.php
index a000d44be9eba..f94594b376309 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestCouponManagement.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestCouponManagement.php
@@ -45,7 +45,7 @@ public function __construct(
      */
     public function get($cartId)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->couponManagement->get($quoteIdMask->getQuoteId());
     }
@@ -55,7 +55,7 @@ public function get($cartId)
      */
     public function set($cartId, $couponCode)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->couponManagement->set($quoteIdMask->getQuoteId(), trim($couponCode));
     }
@@ -65,7 +65,7 @@ public function set($cartId, $couponCode)
      */
     public function remove($cartId)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->couponManagement->remove($quoteIdMask->getQuoteId());
     }
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestPaymentMethodManagement.php b/app/code/Magento/Quote/Model/GuestCart/GuestPaymentMethodManagement.php
index f57a7d2e0ba6e..34d3997137cdf 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestPaymentMethodManagement.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestPaymentMethodManagement.php
@@ -44,7 +44,7 @@ public function __construct(
      */
     public function set($cartId, \Magento\Quote\Api\Data\PaymentInterface $method)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->paymentMethodManagement->set($quoteIdMask->getQuoteId(), $method);
     }
@@ -54,7 +54,7 @@ public function set($cartId, \Magento\Quote\Api\Data\PaymentInterface $method)
      */
     public function get($cartId)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->paymentMethodManagement->get($quoteIdMask->getQuoteId());
     }
@@ -64,7 +64,7 @@ public function get($cartId)
      */
     public function getList($cartId)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->paymentMethodManagement->getList($quoteIdMask->getQuoteId());
     }
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestShippingAddressManagement.php b/app/code/Magento/Quote/Model/GuestCart/GuestShippingAddressManagement.php
index e2f31406cfe7e..ac9424798eb12 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestShippingAddressManagement.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestShippingAddressManagement.php
@@ -44,7 +44,7 @@ public function __construct(
      */
     public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $address)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->shippingAddressManagement->assign($quoteIdMask->getQuoteId(), $address);
     }
@@ -54,7 +54,7 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
      */
     public function get($cartId)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->shippingAddressManagement->get($quoteIdMask->getQuoteId());
     }
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestShippingMethodManagement.php b/app/code/Magento/Quote/Model/GuestCart/GuestShippingMethodManagement.php
index 88c4e10d17053..5c696d311dc61 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestShippingMethodManagement.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestShippingMethodManagement.php
@@ -56,7 +56,7 @@ public function __construct(
      */
     public function get($cartId)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->shippingMethodManagement->get($quoteIdMask->getQuoteId());
     }
@@ -66,7 +66,7 @@ public function get($cartId)
      */
     public function getList($cartId)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->shippingMethodManagement->getList($quoteIdMask->getQuoteId());
     }
@@ -76,7 +76,7 @@ public function getList($cartId)
      */
     public function set($cartId, $carrierCode, $methodCode)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->shippingMethodManagement->set($quoteIdMask->getQuoteId(), $carrierCode, $methodCode);
     }
@@ -86,7 +86,7 @@ public function set($cartId, $carrierCode, $methodCode)
      */
     public function estimateByAddress($cartId, \Magento\Quote\Api\Data\EstimateAddressInterface $address)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         return $this->shippingMethodManagement->estimateByAddress($quoteIdMask->getQuoteId(), $address);
     }
@@ -96,7 +96,7 @@ public function estimateByAddress($cartId, \Magento\Quote\Api\Data\EstimateAddre
      */
     public function estimateByExtendedAddress($cartId, AddressInterface $address)
     {
-        /** @var $quoteIdMask QuoteIdMask */
+        /** @var QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
 
         return $this->getShipmentEstimationManagement()
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
index a6e856875a4af..cd7b3e1149db1 100644
--- a/app/code/Magento/Quote/Model/Quote.php
+++ b/app/code/Magento/Quote/Model/Quote.php
@@ -2114,7 +2114,7 @@ public function getErrors()
     {
         $errors = [];
         foreach ($this->getMessages() as $message) {
-            /* @var $error \Magento\Framework\Message\AbstractMessage */
+            /** @var \Magento\Framework\Message\AbstractMessage $error */
             if ($message->getType() == \Magento\Framework\Message\MessageInterface::TYPE_ERROR) {
                 $errors[] = $message;
             }
@@ -2338,7 +2338,7 @@ public function validateMinimumAmount($multishipping = false)
 
         if (!$multishipping) {
             foreach ($addresses as $address) {
-                /* @var $address Address */
+                /** @var Address $address */
                 if (!$address->validateMinimumAmount()) {
                     return false;
                 }
@@ -2389,7 +2389,7 @@ public function isVirtual()
         $isVirtual = true;
         $countItems = 0;
         foreach ($this->getItemsCollection() as $_item) {
-            /* @var $_item \Magento\Quote\Model\Quote\Item */
+            /** @var \Magento\Quote\Model\Quote\Item $_item */
             if ($_item->isDeleted() || $_item->getParentItemId()) {
                 continue;
             }
diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
index 082404de26164..f5cc97c2ce4d8 100644
--- a/app/code/Magento/Quote/Model/Quote/Address.php
+++ b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -1041,7 +1041,7 @@ public function requestShippingRates(?AbstractItem $item = null)
             $storeId
         );
 
-        /** @var $request RateRequest */
+        /** @var RateRequest $request */
         $request = $this->_rateRequestFactory->create();
         $request->setAllItems($item ? [$item] : $this->getAllItems());
         $request->setDestCountryId($this->getCountryId());
diff --git a/app/code/Magento/Quote/Model/Quote/Item.php b/app/code/Magento/Quote/Model/Quote/Item.php
index 999215100f051..793b283ef11e7 100644
--- a/app/code/Magento/Quote/Model/Quote/Item.php
+++ b/app/code/Magento/Quote/Model/Quote/Item.php
@@ -397,7 +397,7 @@ public function getQtyOptions()
             $productIds = [];
             $qtyOptions = [];
             foreach ($this->getOptions() as $option) {
-                /** @var $option \Magento\Quote\Model\Quote\Item\Option */
+                /** @var \Magento\Quote\Model\Quote\Item\Option $option */
                 if (is_object($option->getProduct())
                     && $option->getProduct()->getId() != $this->getProduct()->getId()
                 ) {
diff --git a/app/code/Magento/Quote/Model/Quote/Item/RelatedProducts.php b/app/code/Magento/Quote/Model/Quote/Item/RelatedProducts.php
index 985ec81d60396..1fd442c96acf9 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/RelatedProducts.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/RelatedProducts.php
@@ -32,7 +32,7 @@ public function __construct($relatedProductTypes = [])
     public function getRelatedProductIds(array $quoteItems)
     {
         $productIds = [];
-        /** @var $quoteItems \Magento\Quote\Model\Quote\Item[] */
+        /** @var \Magento\Quote\Model\Quote\Item[] $quoteItems */
         foreach ($quoteItems as $quoteItem) {
             $productTypeOpt = $quoteItem->getOptionByCode('product_type');
             if ($productTypeOpt instanceof \Magento\Quote\Model\Quote\Item\Option) {
diff --git a/app/code/Magento/Quote/Observer/Backend/CustomerQuoteObserver.php b/app/code/Magento/Quote/Observer/Backend/CustomerQuoteObserver.php
index 3c03c4db2e59e..2ba346429d53a 100644
--- a/app/code/Magento/Quote/Observer/Backend/CustomerQuoteObserver.php
+++ b/app/code/Magento/Quote/Observer/Backend/CustomerQuoteObserver.php
@@ -63,7 +63,7 @@ public function execute(Observer $observer)
                  * It is needed to process customer's quotes for all websites
                  * if customer accounts are shared between all of them
                  */
-                /** @var $websites \Magento\Store\Model\Website[] */
+                /** @var \Magento\Store\Model\Website[] $websites */
                 $websites = $this->config->isWebsiteScope()
                     ? [$this->storeManager->getWebsite($customer->getWebsiteId())]
                     : $this->storeManager->getWebsites();
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/EstimateShippingMethods.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/EstimateShippingMethods.php
index 10f9c879264dc..0847297b31b5d 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/EstimateShippingMethods.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/EstimateShippingMethods.php
@@ -113,7 +113,7 @@ private function getAvailableShippingMethodsForAddress(array $args, CartInterfac
             AddressInterface::KEY_POSTCODE => $args[AddressInterface::KEY_POSTCODE] ?? null,
         ];
 
-        /** @var $address AddressInterface */
+        /** @var AddressInterface $address */
         $address = $this->addressFactory->create(['data' => array_filter($data)]);
         $shippingMethods = [];
 
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Grid.php
index f48ff9eec5988..10db1cf71669a 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid.php
@@ -159,7 +159,7 @@ protected function _prepareCollection()
             $this->_setFilterValues($this->_defaultFilter);
         }
 
-        /** @var $collection \Magento\Reports\Model\ResourceModel\Report\Collection */
+        /** @var \Magento\Reports\Model\ResourceModel\Report\Collection $collection */
         $collection = $this->getCollection();
         if ($collection) {
             $collection->setPeriod($this->getFilter('report_period'));
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock/Grid.php
index 777d1cfca962b..350055371674d 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock/Grid.php
@@ -66,7 +66,7 @@ protected function _prepareCollection()
             $storeId = null;
         }
 
-        /** @var $collection Collection  */
+        /** @var Collection $collection */
         $collection = $this->_lowstocksFactory->create()->addAttributeToSelect(
             '*'
         )->filterByIsQtyProductTypes()->joinInventoryItem(
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
index 935557ad0037b..536540cf43f3c 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
@@ -74,7 +74,7 @@ protected function _construct()
      */
     protected function _prepareCollection()
     {
-        /** @var $collection \Magento\Reports\Model\ResourceModel\Quote\Collection */
+        /** @var \Magento\Reports\Model\ResourceModel\Quote\Collection $collection */
         $collection = $this->_quotesFactory->create();
 
         $filter = $this->getParam($this->getVarNameFilter(), []);
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Review/Customer/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Review/Customer/Collection.php
index 7ce17fc98264c..3f1a69c259b15 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Review/Customer/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Review/Customer/Collection.php
@@ -83,7 +83,7 @@ protected function _initSelect()
      */
     protected function _joinCustomers()
     {
-        /** @var $connection \Magento\Framework\DB\Adapter\AdapterInterface */
+        /** @var \Magento\Framework\DB\Adapter\AdapterInterface $connection */
         $connection = $this->getConnection();
         //Prepare fullname field result
         $customerFullname = $connection->getConcatSql(['customer.firstname', 'customer.lastname'], ' ');
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Wishlist/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Wishlist/Collection.php
index a0c9b3921c398..d86cf35b08460 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Wishlist/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Wishlist/Collection.php
@@ -91,7 +91,7 @@ public function getWishlistTable()
      */
     public function getWishlistCustomerCount()
     {
-        /** @var $collection \Magento\Customer\Model\ResourceModel\Customer\Collection */
+        /** @var \Magento\Customer\Model\ResourceModel\Customer\Collection $collection */
         $collection = $this->_customerResFactory->create();
 
         $customersSelect = $collection->getSelectCountSql();
@@ -121,7 +121,7 @@ public function getWishlistCustomerCount()
      */
     public function getSharedCount()
     {
-        /** @var $collection \Magento\Customer\Model\ResourceModel\Customer\Collection */
+        /** @var \Magento\Customer\Model\ResourceModel\Customer\Collection $collection */
         $collection = $this->_customerResFactory->create();
         $countSelect = $collection->getSelectCountSql();
         $countSelect->joinLeft(
diff --git a/app/code/Magento/Reports/Setup/Patch/Data/InitializeReportEntityTypesAndPages.php b/app/code/Magento/Reports/Setup/Patch/Data/InitializeReportEntityTypesAndPages.php
index 77824689b8557..6eaf35d55b8f8 100644
--- a/app/code/Magento/Reports/Setup/Patch/Data/InitializeReportEntityTypesAndPages.php
+++ b/app/code/Magento/Reports/Setup/Patch/Data/InitializeReportEntityTypesAndPages.php
@@ -81,7 +81,7 @@ public function apply()
         /**
          * Cms Page  with 'home' identifier page modification for report pages
          */
-        /** @var $cms \Magento\Cms\Model\Page */
+        /** @var \Magento\Cms\Model\Page $cms */
         $cms = $this->pageFactory->create();
         $cms->load('home', 'identifier');
         // @codingStandardsIgnoreStart
diff --git a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed.phtml b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed.phtml
index 055a26b3dc308..2b20db5406ace 100644
--- a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed.phtml
@@ -8,7 +8,7 @@
  * @deprecated
  */
 
-/* @var $block \Magento\Reports\Block\Product\Widget\Viewed */
+/** @var \Magento\Reports\Block\Product\Widget\Viewed $block */
 ?>
 
 <?php
diff --git a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml
index da11582a16133..74163985ce1f6 100644
--- a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml
@@ -8,7 +8,7 @@
  * @deprecated
  */
 
-/* @var $block \Magento\Reports\Block\Product\Widget\Viewed\Item */
+/** @var \Magento\Reports\Block\Product\Widget\Viewed\Item $block */
 
 $type = $block->getType() . '-' . $block->getViewMode();
 
diff --git a/app/code/Magento/RequireJs/Model/FileManager.php b/app/code/Magento/RequireJs/Model/FileManager.php
index ec41c4238967f..0ce4de3120c87 100644
--- a/app/code/Magento/RequireJs/Model/FileManager.php
+++ b/app/code/Magento/RequireJs/Model/FileManager.php
@@ -173,7 +173,7 @@ public function createBundleJsPool()
         $bundles = [];
         if ($this->appState->getMode() == AppState::MODE_PRODUCTION) {
             $libDir = $this->filesystem->getDirectoryRead(DirectoryList::STATIC_VIEW);
-            /** @var $context \Magento\Framework\View\Asset\File\FallbackContext */
+            /** @var \Magento\Framework\View\Asset\File\FallbackContext $context */
             $context = $this->assetRepo->getStaticViewFileContext();
 
             $bundleDir = $context->getPath() . '/' . Config::BUNDLE_JS_DIR;
@@ -203,7 +203,7 @@ public function createBundleJsPool()
     public function clearBundleJsPool()
     {
         $dirWrite = $this->filesystem->getDirectoryWrite(DirectoryList::STATIC_VIEW);
-        /** @var $context \Magento\Framework\View\Asset\File\FallbackContext */
+        /** @var \Magento\Framework\View\Asset\File\FallbackContext $context */
         $context = $this->assetRepo->getStaticViewFileContext();
         $bundleDir = $context->getPath() . '/' . Config::BUNDLE_JS_DIR;
         return $dirWrite->delete($bundleDir);
diff --git a/app/code/Magento/Review/Block/Adminhtml/Edit.php b/app/code/Magento/Review/Block/Adminhtml/Edit.php
index 9162d293f9332..0d82a1f96aa0c 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Edit.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Edit.php
@@ -65,7 +65,7 @@ protected function _construct()
         $this->_blockGroup = 'Magento_Review';
         $this->_controller = 'adminhtml';
 
-        /** @var $actionPager \Magento\Review\Helper\Action\Pager */
+        /** @var \Magento\Review\Helper\Action\Pager $actionPager */
         $actionPager = $this->_reviewActionPager;
         $actionPager->setStorageId('reviews');
 
diff --git a/app/code/Magento/Review/Block/Adminhtml/Grid.php b/app/code/Magento/Review/Block/Adminhtml/Grid.php
index 798d6ae7148af..afa84ca8560bc 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Grid.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Grid.php
@@ -100,7 +100,7 @@ protected function _construct()
      */
     protected function _afterLoadCollection()
     {
-        /** @var $actionPager \Magento\Review\Helper\Action\Pager */
+        /** @var \Magento\Review\Helper\Action\Pager $actionPager */
         $actionPager = $this->_reviewActionPager;
         $actionPager->setStorageId('reviews');
         $actionPager->setItems($this->getCollection()->getResultingIds());
@@ -113,9 +113,9 @@ protected function _afterLoadCollection()
      */
     protected function _prepareCollection()
     {
-        /** @var $model \Magento\Review\Model\Review */
+        /** @var \Magento\Review\Model\Review $model */
         $model = $this->_reviewFactory->create();
-        /** @var $collection \Magento\Review\Model\ResourceModel\Review\Product\Collection */
+        /** @var \Magento\Review\Model\ResourceModel\Review\Product\Collection $collection */
         $collection = $this->_productsFactory->create();
 
         if ($this->getProductId() || $this->getRequest()->getParam('productId', false)) {
diff --git a/app/code/Magento/Review/Model/Rss.php b/app/code/Magento/Review/Model/Rss.php
index d0531eeec4bca..ffb75aa958603 100644
--- a/app/code/Magento/Review/Model/Rss.php
+++ b/app/code/Magento/Review/Model/Rss.php
@@ -63,7 +63,7 @@ public function __construct(
      */
     public function getProductCollection()
     {
-        /** @var $reviewModel \Magento\Review\Model\Review */
+        /** @var \Magento\Review\Model\Review $reviewModel */
         $reviewModel = $this->reviewFactory->create();
         $collection = $reviewModel->getProductCollection()
             ->addStatusFilter($reviewModel->getPendingStatus())
diff --git a/app/code/Magento/Review/view/adminhtml/templates/rss/grid/link.phtml b/app/code/Magento/Review/view/adminhtml/templates/rss/grid/link.phtml
index b50d618601fc3..9fa1f05785df9 100644
--- a/app/code/Magento/Review/view/adminhtml/templates/rss/grid/link.phtml
+++ b/app/code/Magento/Review/view/adminhtml/templates/rss/grid/link.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Review\Block\Adminhtml\Grid\Rss\Link */
+/** @var \Magento\Review\Block\Adminhtml\Grid\Rss\Link $block */
 ?>
 <?php if ($block->isRssAllowed() && $block->getLink()) : ?>
 <a href="<?= $block->escapeUrl($block->getLink()) ?>" class="link-feed"><?= $block->escapeHtml($block->getLabel()) ?></a>
diff --git a/app/code/Magento/Review/view/frontend/templates/form.phtml b/app/code/Magento/Review/view/frontend/templates/form.phtml
index 265c013c84014..6d1226d173427 100644
--- a/app/code/Magento/Review/view/frontend/templates/form.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/form.phtml
@@ -11,7 +11,7 @@ if (!$block->getButtonLockManager()) {
         $objectManager->get(\Magento\Framework\View\Element\ButtonLockManager::class)
     );
 }
-/** @var $escaper \Magento\Framework\Escaper */
+/** @var \Magento\Framework\Escaper $escaper */
 //phpcs:disable Generic.Files.LineLength
 ?>
 <div class="block review-add">
diff --git a/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php b/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php
index adcbee068ae1e..7a2251443f693 100644
--- a/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php
+++ b/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php
@@ -37,7 +37,7 @@ public function execute()
             throw new NotFoundException(__('Page not found.'));
         }
 
-        /** @var $rss \Magento\Rss\Model\Rss */
+        /** @var \Magento\Rss\Model\Rss $rss */
         $rss = $this->rssFactory->create();
         $rss->setDataProvider($provider);
 
diff --git a/app/code/Magento/Rss/Controller/Feed/Index.php b/app/code/Magento/Rss/Controller/Feed/Index.php
index ed87b318d55bb..bd3ae085cb73e 100644
--- a/app/code/Magento/Rss/Controller/Feed/Index.php
+++ b/app/code/Magento/Rss/Controller/Feed/Index.php
@@ -38,7 +38,7 @@ public function execute()
             throw new NotFoundException(__('Page not found.'));
         }
 
-        /** @var $rss \Magento\Rss\Model\Rss */
+        /** @var \Magento\Rss\Model\Rss $rss */
         $rss = $this->rssFactory->create();
         $rss->setDataProvider($provider);
 
diff --git a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
index e985972e79f06..db32887881f6d 100644
--- a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
+++ b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
@@ -182,7 +182,7 @@ public function loadAttributeOptions()
 
         $attributes = [];
         foreach ($productAttributes as $attribute) {
-            /* @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+            /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
             if (!$attribute->isAllowedForRuleCondition() || !$attribute->getDataUsingMethod(
                 $this->_isUsedForRuleProperty
             )
diff --git a/app/code/Magento/Rule/Model/Condition/Sql/Builder.php b/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
index a45d955dae98e..9ab0f17219cc5 100644
--- a/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
+++ b/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
@@ -101,7 +101,7 @@ protected function _getChildCombineTablesToJoin(Combine $combine, $tables = [])
             if ($condition->getConditions()) {
                 $tables = $this->_getChildCombineTablesToJoin($condition);
             } else {
-                /** @var $condition AbstractCondition */
+                /** @var AbstractCondition $condition */
                 foreach ($condition->getTablesToJoin() as $alias => $table) {
                     if (!isset($tables[$alias])) {
                         $tables[$alias] = $table;
@@ -124,7 +124,7 @@ protected function _joinTablesToCollection(
         Combine $combine
     ): Builder {
         foreach ($this->_getCombineTablesToJoin($combine) as $alias => $joinTable) {
-            /** @var $condition AbstractCondition */
+            /** @var AbstractCondition $condition */
             $collection->getSelect()->joinLeft(
                 [$alias => $collection->getResource()->getTable($joinTable['name'])],
                 $joinTable['condition'],
@@ -225,7 +225,7 @@ protected function _getMappedSqlCombination(
         $getAggregator = $combine->getAggregator();
         $conditions = $combine->getConditions();
         foreach ($conditions as $key => $condition) {
-            /** @var $condition AbstractCondition|Combine */
+            /** @var AbstractCondition|Combine $condition */
             $con = ($getAggregator == 'any' ? Select::SQL_OR : Select::SQL_AND);
             $con = (isset($conditions[$key+1]) ? $con : '');
             if ($condition instanceof Combine) {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Items/AbstractItems.php b/app/code/Magento/Sales/Block/Adminhtml/Items/AbstractItems.php
index 7020835164c2a..372881e0383e6 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Items/AbstractItems.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Items/AbstractItems.php
@@ -102,7 +102,7 @@ public function setColumnRenders(array $blocks)
      */
     public function getItemRenderer($type)
     {
-        /** @var $renderer \Magento\Sales\Block\Adminhtml\Items\AbstractItems */
+        /** @var \Magento\Sales\Block\Adminhtml\Items\AbstractItems $renderer */
         $renderer = $this->getChildBlock($type) ?: $this->getChildBlock(self::DEFAULT_TYPE);
         if (!$renderer instanceof \Magento\Framework\View\Element\BlockInterface) {
             throw new \RuntimeException('Renderer for type "' . $type . '" does not exist.');
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
index 46c51d08752c8..9806bfebc1fba 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
@@ -149,7 +149,7 @@ protected function _prepareCollection()
         $attributes = $this->_catalogConfig->getProductAttributes();
         $store = $this->getStore();
 
-        /* @var $collection \Magento\Catalog\Model\ResourceModel\Product\Collection */
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
         $collection = $this->productCollectionProvider->getCollectionForStore($store);
         $collection->addAttributeToSelect(
             $attributes
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php
index 1e92ebada0d8c..79b4a3e2876a7 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php
@@ -115,7 +115,7 @@ protected function _afterToHtml($html)
              * form creates appropriate child block and uses this alias. In this case we can't use the same alias
              * without core logic changes, that's why the code below was moved inside method '_afterToHtml'.
              */
-            /** @var $formAfterBlock \Magento\Backend\Block\Widget\Form\Element\Dependence */
+            /** @var \Magento\Backend\Block\Widget\Form\Element\Dependence $formAfterBlock */
             $formAfterBlock = $this->getLayout()->createBlock(
                 \Magento\Backend\Block\Widget\Form\Element\Dependence::class,
                 'adminhtml.block.widget.form.element.dependence'
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php
index 6905f70ef3585..28343184dd4c4 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php
@@ -119,7 +119,7 @@ public function __construct(
     public function execute()
     {
         $addressId = $this->getRequest()->getParam('address_id');
-        /** @var $address OrderAddressInterface|AddressModel */
+        /** @var OrderAddressInterface|AddressModel $address */
         $address = $this->_objectManager->create(
             OrderAddressInterface::class
         )->load($addressId);
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
index 8abaefd869473..e26ec3b5812e1 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
@@ -340,7 +340,7 @@ protected function _processActionData($action = null)
      */
     protected function _processFiles($items)
     {
-        /* @var $productHelper \Magento\Catalog\Helper\Product */
+        /** @var \Magento\Catalog\Helper\Product $productHelper */
         $productHelper = $this->_objectManager->get(\Magento\Catalog\Helper\Product::class);
         foreach ($items as $id => $item) {
             $buyRequest = new \Magento\Framework\DataObject($item);
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php
index 4645588a7522c..e81411320092e 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php
@@ -30,7 +30,7 @@ public function execute()
             $statusCode = $this->getRequest()->getParam('status');
 
             //filter tags in labels/status
-            /** @var $filterManager FilterManager */
+            /** @var FilterManager $filterManager */
             $filterManager = $this->_objectManager->get(FilterManager::class);
             if ($isNew) {
                 $statusCode = $data['status'] = $filterManager->stripTags($data['status']);
diff --git a/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php b/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
index 14551758140b6..6328e7d4dd3fe 100644
--- a/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
+++ b/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
@@ -72,7 +72,7 @@ public function __construct(
     public function execute()
     {
         $quoteItemOptionId = $this->getRequest()->getParam('id');
-        /** @var $option \Magento\Quote\Model\Quote\Item\Option */
+        /** @var \Magento\Quote\Model\Quote\Item\Option $option */
         $option = $this->_objectManager->create(
             \Magento\Quote\Model\Quote\Item\Option::class
         )->load($quoteItemOptionId);
@@ -92,7 +92,7 @@ public function execute()
         }
         $productOption = null;
         if ($optionId) {
-            /** @var $productOption \Magento\Catalog\Model\Product\Option */
+            /** @var \Magento\Catalog\Model\Product\Option $productOption */
             $productOption = $this->_objectManager->create(
                 \Magento\Catalog\Model\Product\Option::class
             );
diff --git a/app/code/Magento/Sales/Cron/CleanExpiredQuotes.php b/app/code/Magento/Sales/Cron/CleanExpiredQuotes.php
index 978aec1b79ec4..85ee5e7ffb6d3 100644
--- a/app/code/Magento/Sales/Cron/CleanExpiredQuotes.php
+++ b/app/code/Magento/Sales/Cron/CleanExpiredQuotes.php
@@ -64,7 +64,7 @@ public function execute()
     {
         $stores = $this->storeManager->getStores(true);
         foreach ($stores as $store) {
-            /** @var $quoteCollection QuoteCollection */
+            /** @var QuoteCollection $quoteCollection */
             $quoteCollection = $this->expiredQuotesCollection->getExpiredQuotes($store);
             $quoteCollection->setPageSize(50);
 
diff --git a/app/code/Magento/Sales/Helper/Guest.php b/app/code/Magento/Sales/Helper/Guest.php
index 47a280609c8bd..28a4a59da74da 100644
--- a/app/code/Magento/Sales/Helper/Guest.php
+++ b/app/code/Magento/Sales/Helper/Guest.php
@@ -253,7 +253,7 @@ private function loadFromCookie($fromCookie)
      */
     private function loadFromPost(array $postData)
     {
-        /** @var $order \Magento\Sales\Model\Order */
+        /** @var \Magento\Sales\Model\Order $order */
         $order = $this->getOrderRecord($postData['oar_order_id']);
         if (!$this->compareStoredBillingDataWithInput($order, $postData)) {
             throw new InputException(__('You entered incorrect data. Please try again.'));
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index 61e26853ebe06..a6dbba1fc2bf3 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -586,7 +586,7 @@ public function initFromOrder(\Magento\Sales\Model\Order $order)
         /* Initialize catalog rule data with new session values */
         $this->initRuleData();
         foreach ($order->getItemsCollection($this->_salesConfig->getAvailableProductTypes(), true) as $orderItem) {
-            /* @var $orderItem \Magento\Sales\Model\Order\Item */
+            /** @var \Magento\Sales\Model\Order\Item $orderItem */
             if (!$orderItem->getParentItem()) {
                 $qty = $orderItem->getQtyOrdered();
                 if (!$order->getReordered()) {
@@ -1028,7 +1028,7 @@ public function applySidebarData($data)
     {
         if (isset($data['add_order_item'])) {
             foreach ($data['add_order_item'] as $orderItemId => $value) {
-                /* @var $orderItem \Magento\Sales\Model\Order\Item */
+                /** @var \Magento\Sales\Model\Order\Item $orderItem */
                 $orderItem = $this->_objectManager->create(\Magento\Sales\Model\Order\Item::class)->load($orderItemId);
                 $item = $this->initFromOrderItem($orderItem);
                 if (is_string($item)) {
@@ -1916,7 +1916,7 @@ protected function _validateCustomerData(\Magento\Customer\Api\Data\CustomerInte
      */
     public function _prepareCustomer()
     {
-        /** @var $store \Magento\Store\Model\Store */
+        /** @var \Magento\Store\Model\Store $store */
         $store = $this->getSession()->getStore();
         $customer = $this->getQuote()->getCustomer();
 
diff --git a/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php b/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php
index a818f2c81530c..dd71068b74d2b 100644
--- a/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php
+++ b/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php
@@ -57,7 +57,7 @@ public function execute()
     {
         $lifetimes = $this->storesConfig->getStoresConfigByPath('sales/orders/delete_pending_after');
         foreach ($lifetimes as $storeId => $lifetime) {
-            /** @var $orders \Magento\Sales\Model\ResourceModel\Order\Collection */
+            /** @var \Magento\Sales\Model\ResourceModel\Order\Collection $orders */
             $orders = $this->orderCollectionFactory->create();
             $orders->addFieldToFilter('store_id', $storeId);
             $orders->addFieldToFilter('status', Order::STATE_PENDING_PAYMENT);
diff --git a/app/code/Magento/Sales/Model/EmailSenderHandler.php b/app/code/Magento/Sales/Model/EmailSenderHandler.php
index 59c39a0936a32..a491b5b9dedfa 100644
--- a/app/code/Magento/Sales/Model/EmailSenderHandler.php
+++ b/app/code/Magento/Sales/Model/EmailSenderHandler.php
@@ -198,7 +198,7 @@ private function getStores(
      */
     private function filterCollectionByStartFromDate(AbstractCollection $collection): void
     {
-        /** @var $configValue ValueInterface */
+        /** @var ValueInterface $configValue */
         $configValue = $this->configValueFactory->create();
         $configValue->load('sales_email/general/async_sending', 'path');
 
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Discount.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Discount.php
index 43a66382aa1c2..26fd135612658 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Discount.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Discount.php
@@ -76,7 +76,7 @@ public function collect(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
             $baseTotalDiscountAmount = $baseTotalDiscountAmount + $baseShippingDiscount;
         }
 
-        /** @var $item \Magento\Sales\Model\Order\Invoice\Item */
+        /** @var \Magento\Sales\Model\Order\Invoice\Item $item */
         foreach ($creditmemo->getAllItems() as $item) {
             $orderItem = $item->getOrderItem();
 
diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoDocumentFactory.php b/app/code/Magento/Sales/Model/Order/CreditmemoDocumentFactory.php
index 98a60e08c3c16..62cd6b0638f07 100644
--- a/app/code/Magento/Sales/Model/Order/CreditmemoDocumentFactory.php
+++ b/app/code/Magento/Sales/Model/Order/CreditmemoDocumentFactory.php
@@ -149,7 +149,7 @@ public function createFromInvoice(
         ?\Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface $arguments = null
     ) {
         $data = $this->getCreditmemoCreationData($items, $arguments);
-        /** @var $invoice \Magento\Sales\Model\Order\Invoice */
+        /** @var \Magento\Sales\Model\Order\Invoice $invoice */
         $invoice->setOrder($this->orderRepository->get($invoice->getOrderId()));
         $creditmemo = $this->creditmemoFactory->createByInvoice($invoice, $data);
         if ($comment) {
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php b/app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php
index f2a99a4765909..be817da6d9450 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php
@@ -37,7 +37,7 @@ public function collect(Invoice $invoice)
                 $invoice->getOrder()->getBaseShippingDiscountAmount();
         }
 
-        /** @var $item \Magento\Sales\Model\Order\Invoice\Item */
+        /** @var \Magento\Sales\Model\Order\Invoice\Item $item */
         foreach ($invoice->getAllItems() as $item) {
             $orderItem = $item->getOrderItem();
             if ($orderItem->isDummy()) {
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php b/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
index 6e12f10f0c679..117cf525818bf 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
@@ -27,7 +27,7 @@ public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
 
         $order = $invoice->getOrder();
 
-        /** @var $item \Magento\Sales\Model\Order\Invoice\Item */
+        /** @var \Magento\Sales\Model\Order\Invoice\Item $item */
         foreach ($invoice->getAllItems() as $item) {
             $orderItem = $item->getOrderItem();
             $orderItemQty = $orderItem->getQtyOrdered();
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Operations/SaleOperation.php b/app/code/Magento/Sales/Model/Order/Payment/Operations/SaleOperation.php
index 7ff271078eda6..802ac9c24e9fc 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Operations/SaleOperation.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Operations/SaleOperation.php
@@ -40,7 +40,7 @@ public function __construct(
      */
     public function execute(OrderPaymentInterface $payment): OrderPaymentInterface
     {
-        /** @var $payment Payment */
+        /** @var Payment $payment */
         $invoice = $payment->getOrder()->prepareInvoice();
         $invoice->register();
         $this->processInvoiceOperation->execute($payment, $invoice, 'sale');
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Total/DefaultTotal.php b/app/code/Magento/Sales/Model/Order/Pdf/Total/DefaultTotal.php
index 23ae36ea4f3e3..d49bfb060acd9 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Total/DefaultTotal.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Total/DefaultTotal.php
@@ -113,7 +113,7 @@ public function getFullTaxInfo()
                 $tax['font_size'] = $fontSize;
             }
         } else {
-            /** @var $orders Collection */
+            /** @var Collection $orders */
             $orders = $this->_taxOrdersFactory->create();
             $rates = $orders->loadByOrder($this->getOrder())->toArray();
             $fullInfo = $this->_taxCalculation->reproduceProcess($rates['items']);
diff --git a/app/code/Magento/Sales/Model/Order/StateResolver.php b/app/code/Magento/Sales/Model/Order/StateResolver.php
index f5575e0388af3..ec592a06a4970 100644
--- a/app/code/Magento/Sales/Model/Order/StateResolver.php
+++ b/app/code/Magento/Sales/Model/Order/StateResolver.php
@@ -21,7 +21,7 @@ class StateResolver implements OrderStateResolverInterface
      */
     private function isOrderComplete(OrderInterface $order)
     {
-        /** @var $order Order|OrderInterface */
+        /** @var Order|OrderInterface $order */
         if (0 == $order->getBaseGrandTotal() || $order->canCreditmemo()) {
             return true;
         }
@@ -37,7 +37,7 @@ private function isOrderComplete(OrderInterface $order)
      */
     private function isOrderClosed(OrderInterface $order, $arguments)
     {
-        /** @var $order Order|OrderInterface */
+        /** @var Order|OrderInterface $order */
         $forceCreditmemo = in_array(self::FORCED_CREDITMEMO, $arguments);
         if ((float)$order->getTotalRefunded() || !$order->getTotalRefunded() && $forceCreditmemo) {
             return true;
@@ -54,7 +54,7 @@ private function isOrderClosed(OrderInterface $order, $arguments)
      */
     private function isOrderProcessing(OrderInterface $order, $arguments)
     {
-        /** @var $order Order|OrderInterface */
+        /** @var Order|OrderInterface $order */
         if ($order->getState() == Order::STATE_NEW && in_array(self::IN_PROGRESS, $arguments)) {
             return true;
         }
@@ -79,7 +79,7 @@ private function getInitialOrderState(OrderInterface $order)
      */
     public function getStateForOrder(OrderInterface $order, array $arguments = [])
     {
-        /** @var $order Order|OrderInterface */
+        /** @var Order|OrderInterface $order */
         $orderState = $this->getInitialOrderState($order);
         if (!$order->isCanceled() && !$order->canUnhold() && !$order->canInvoice() && !$order->canShip()) {
             if ($this->isOrderComplete($order)) {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Collection/ExpiredQuotesCollection.php b/app/code/Magento/Sales/Model/ResourceModel/Collection/ExpiredQuotesCollection.php
index 05d7005f48d31..67fb5cf685269 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Collection/ExpiredQuotesCollection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Collection/ExpiredQuotesCollection.php
@@ -66,7 +66,7 @@ public function getExpiredQuotes(StoreInterface $store): AbstractCollection
         );
         $lifetime *= $this->secondsInDay;
 
-        /** @var $quotes Collection */
+        /** @var Collection $quotes */
         $quotes = $this->quoteCollectionFactory->create();
         $quotes->addFieldToFilter('main_table.store_id', $store->getId());
         $quotes->addFieldToFilter('main_table.updated_at', ['to' => date("Y-m-d", time() - $lifetime)]);
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Collection.php
index ea35dba80f033..c2f0a8bacc338 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Collection.php
@@ -111,7 +111,7 @@ public function addItemCountExpr()
      */
     public function getSelectCountSql()
     {
-        /* @var $countSelect \Magento\Framework\DB\Select */
+        /** @var \Magento\Framework\DB\Select $countSelect */
         $countSelect = parent::getSelectCountSql();
         $countSelect->resetJoinLeft();
         return $countSelect;
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Relation.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Relation.php
index fb689401890c8..7e73608206205 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Relation.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Relation.php
@@ -46,7 +46,7 @@ public function __construct(
      */
     public function processRelation(\Magento\Framework\Model\AbstractModel $object)
     {
-        /** @var $object \Magento\Sales\Model\Order\Invoice */
+        /** @var \Magento\Sales\Model\Order\Invoice $object */
         if (null !== $object->getItems()) {
             foreach ($object->getItems() as $item) {
                 /** @var \Magento\Sales\Model\Order\Invoice\Item */
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Rss/OrderStatus.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Rss/OrderStatus.php
index 5a3751a1e0f5b..bf9a94f86cc29 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Rss/OrderStatus.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Rss/OrderStatus.php
@@ -33,7 +33,7 @@ public function __construct(ResourceConnection $resource)
      */
     public function getAllCommentCollection($orderId)
     {
-        /** @var $resource \Magento\Framework\App\ResourceConnection */
+        /** @var \Magento\Framework\App\ResourceConnection $resource */
         $resource = $this->_resource;
         $read = $resource->getConnection();
 
diff --git a/app/code/Magento/Sales/Model/Rss/NewOrder.php b/app/code/Magento/Sales/Model/Rss/NewOrder.php
index 64e255057cbd4..5715b0d181b20 100644
--- a/app/code/Magento/Sales/Model/Rss/NewOrder.php
+++ b/app/code/Magento/Sales/Model/Rss/NewOrder.php
@@ -105,9 +105,9 @@ public function getRssData()
         $title = __('New Orders');
         $data = ['title' => $title, 'description' => $title, 'link' => $newUrl, 'charset' => 'UTF-8'];
 
-        /** @var $order \Magento\Sales\Model\Order */
+        /** @var \Magento\Sales\Model\Order $order */
         $order = $this->orderFactory->create();
-        /** @var $collection \Magento\Sales\Model\ResourceModel\Order\Collection */
+        /** @var \Magento\Sales\Model\ResourceModel\Order\Collection $collection */
         $collection = $order->getResourceCollection();
         $collection->addAttributeToFilter('created_at', ['date' => true, 'from' => $fromDate])
             ->addAttributeToSort('created_at', 'desc');
diff --git a/app/code/Magento/Sales/Model/Rss/OrderStatus.php b/app/code/Magento/Sales/Model/Rss/OrderStatus.php
index 1f475c6c23352..825d444e98050 100644
--- a/app/code/Magento/Sales/Model/Rss/OrderStatus.php
+++ b/app/code/Magento/Sales/Model/Rss/OrderStatus.php
@@ -175,7 +175,7 @@ protected function getOrder()
             return null;
         }
 
-        /** @var $order \Magento\Sales\Model\Order */
+        /** @var \Magento\Sales\Model\Order $order */
         $order = $this->orderFactory->create();
         $order->load($data['order_id']);
 
@@ -206,7 +206,7 @@ private function isOrderSuitable(\Magento\Sales\Model\Order $order, array $data)
      */
     protected function getEntries()
     {
-        /** @var $resourceModel \Magento\Sales\Model\ResourceModel\Order\Rss\OrderStatus */
+        /** @var \Magento\Sales\Model\ResourceModel\Order\Rss\OrderStatus $resourceModel */
         $resourceModel = $this->orderResourceFactory->create();
         $results = $resourceModel->getAllCommentCollection($this->order->getId());
         $entries = [];
diff --git a/app/code/Magento/Sales/Observer/Frontend/AddVatRequestParamsOrderComment.php b/app/code/Magento/Sales/Observer/Frontend/AddVatRequestParamsOrderComment.php
index 8195eba96d750..3802a1bcb7800 100644
--- a/app/code/Magento/Sales/Observer/Frontend/AddVatRequestParamsOrderComment.php
+++ b/app/code/Magento/Sales/Observer/Frontend/AddVatRequestParamsOrderComment.php
@@ -40,9 +40,9 @@ public function __construct(CustomerAddress $customerAddressHelper)
      */
     public function execute(Observer $observer)
     {
-        /** @var $orderInstance Order */
+        /** @var Order $orderInstance */
         $orderInstance = $observer->getOrder();
-        /** @var $orderAddress Address */
+        /** @var Address $orderAddress */
         $orderAddress = $this->_getVatRequiredSalesAddress($orderInstance);
         if (!$orderAddress instanceof Address) {
             return;
diff --git a/app/code/Magento/Sales/Observer/StoreStatusChangeObserver.php b/app/code/Magento/Sales/Observer/StoreStatusChangeObserver.php
index 984f4b7523cdf..d88885033e906 100644
--- a/app/code/Magento/Sales/Observer/StoreStatusChangeObserver.php
+++ b/app/code/Magento/Sales/Observer/StoreStatusChangeObserver.php
@@ -30,7 +30,7 @@ public function __construct(
      */
     public function execute(Observer $observer)
     {
-        /* @var $order Order */
+        /** @var Order $order */
         $order = $observer->getEvent()->getOrder();
 
         if (!$order->getId()) {
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
index 6e4c437256031..08ecbbff1f76b 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-/** @var $escaper \Magento\Framework\Escaper */
+/** @var \Magento\Framework\Escaper $escaper */
 ?>
 <?php if ($item = $block->getItem()): ?>
     <table class="qty-table">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
index b0db93b0335a1..4997996ff382b 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
@@ -7,7 +7,7 @@
 use Magento\Framework\Escaper;
 use Magento\Sales\ViewModel\Order\Create\SidebarPermissionCheck;
 
-/* @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar */
+/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 /** @var Escaper $escaper */
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
index 1c21d51a2df32..bd3e8113c3638 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/* @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Store\Select */
+/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Store\Select $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div class="store-scope form-inline">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml
index dca8403987c47..83ae3f7bd711e 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php /** @var $block \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer */ ?>
+<?php /** @var \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer $block */ ?>
 <?php $_item = $block->getItem() ?>
 <?php $block->setPriceDataObject($_item); ?>
 <tr>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml
index 48ea5e7dd3eb9..7ffa947c718d0 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php /** @var $block \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer */ ?>
+<?php /** @var \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer $block */ ?>
 <?php $_item = $block->getItem() ?>
 <?php $_item->setStoreId($_item->getCreditMemo()->getStoreId()) ?>
 <?php $block->setPriceDataObject($_item) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml
index f9de91d35c726..3b69af9fbe5f8 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php /** @var $block \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer */ ?>
+<?php /** @var \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer $block */ ?>
 <?php $_item = $block->getItem() ?>
 <?php $block->setPriceDataObject($_item)?>
     <td class="col-product"><?= $block->getColumnHtml($_item, 'name') ?></td>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml
index 8a98748f6afac..18f280cff8270 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php /** @var $block \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer */ ?>
+<?php /** @var \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer $block */ ?>
 <?php $_item = $block->getItem() ?>
 <?php $_item->setStoreId($_item->getInvoice()->getStoreId()) ?>
 <?php $block->setPriceDataObject($_item) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
index c7bf1104b6ee7..8a3d454c29e0d 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
@@ -9,7 +9,7 @@
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 
-/** @var $_source \Magento\Sales\Model\Order\Invoice */
+/** @var \Magento\Sales\Model\Order\Invoice $_source */
 $_source    = $block->getSource();
 $_order     = $block->getOrder();
 $_fullInfo  = $block->getFullTaxInfo();
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml
index bf80f5df00b5e..5ab97e5a92180 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Sales\Block\Adminhtml\Order\View\Giftmessage */
+/** @var \Magento\Sales\Block\Adminhtml\Order\View\Giftmessage $block */
 ?>
 <?php if ($block->canDisplayGiftmessage()) : ?>
     <?php $_required = $block->getMessage()->getMessage() != '' ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
index 06f0603a21215..98f06997975da 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Sales\Block\Adminhtml\Order\View\Tab\Info */
+/** @var \Magento\Sales\Block\Adminhtml\Order\View\Tab\Info $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php $_order = $block->getOrder() ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/rss/order/grid/link.phtml b/app/code/Magento/Sales/view/adminhtml/templates/rss/order/grid/link.phtml
index 231eb274290cf..7dab592bc93ed 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/rss/order/grid/link.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/rss/order/grid/link.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Sales\Block\Adminhtml\Rss\Order\Grid\Link */
+/** @var \Magento\Sales\Block\Adminhtml\Rss\Order\Grid\Link $block */
 ?>
 <?php if ($block->isRssAllowed() && $block->getLink()) : ?>
 <a href="<?= $block->escapeUrl($block->getLink()) ?>" class="link-feed"><?= $block->escapeHtml($block->getLabel()) ?></a>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
index 1bba8166762c7..e086a0008d1a7 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
@@ -6,7 +6,7 @@
 
 // phpcs:disable Magento2.Templates.ThisInTemplate
 
-/** @var $block \Magento\Sales\Block\Order\Email\Items */
+/** @var \Magento\Sales\Block\Order\Email\Items $block */
 ?>
 <?php $_order = $block->getOrder() ?>
 <?php if ($_order) : ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/order/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/order/default.phtml
index 0d74980887ed6..d532a360ae2e8 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items/order/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/order/default.phtml
@@ -7,9 +7,9 @@
 // phpcs:disable Magento2.Templates.ThisInTemplate
 // phpcs:disable Magento2.Files.LineLength, Generic.Files.LineLength
 
-/** @var $block \Magento\Sales\Block\Order\Email\Items\DefaultItems */
+/** @var \Magento\Sales\Block\Order\Email\Items\DefaultItems $block */
 
-/** @var $_item \Magento\Sales\Model\Order\Item */
+/** @var \Magento\Sales\Model\Order\Item $_item */
 /** @var \Magento\Framework\Escaper $escaper */
 $_item = $block->getItem();
 $_order = $_item->getOrder();
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml
index 3d8853bbe0366..a59ac4965d281 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/* @var $block \Magento\Sales\Block\Order\Creditmemo */
+/** @var \Magento\Sales\Block\Order\Creditmemo $block */
 ?>
 <div class="order-details-items creditmemo">
     <?= $block->getChildHtml('creditmemo_items') ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/info.phtml b/app/code/Magento/Sales/view/frontend/templates/order/info.phtml
index 1bf05f4fed7f7..f9eab02a55ce6 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/info.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/info.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php /** @var $block \Magento\Sales\Block\Order\Info */ ?>
+<?php /** @var \Magento\Sales\Block\Order\Info $block */ ?>
 <?php $_order = $block->getOrder() ?>
 <div class="block block-order-details-view">
     <div class="block-title">
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/info/buttons/rss.phtml b/app/code/Magento/Sales/view/frontend/templates/order/info/buttons/rss.phtml
index e29d1aa1f849f..e8324b448e483 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/info/buttons/rss.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/info/buttons/rss.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Sales\Block\Order\Info\Buttons\Rss */
+/** @var \Magento\Sales\Block\Order\Info\Buttons\Rss $block */
 ?>
 <?php if ($block->isRssAllowed() && $block->getLink()) : ?>
     <a href="<?= $block->escapeHtmlAttr($block->getLink()) ?>" class="action rss">
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/invoice.phtml b/app/code/Magento/Sales/view/frontend/templates/order/invoice.phtml
index 017331ad72b76..2c4f5dc9a466f 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/invoice.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/invoice.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/* @var $block \Magento\Sales\Block\Order\Invoice */
+/** @var \Magento\Sales\Block\Order\Invoice $block */
 ?>
 <div class="order-details-items invoice">
     <?= $block->getChildHtml('invoice_items') ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml
index 35000b19aa5c9..3200ddcf2056c 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml
@@ -5,7 +5,7 @@
  */
 /** @var \Magento\Framework\Locale\LocaleFormatter $localeFormatter */
 ?>
-<?php /** @var  $block \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer */ ?>
+<?php /** @var \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer $block */ ?>
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
 <tr id="order-item-row-<?= (int) $_item->getId() ?>">
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/order_status.phtml b/app/code/Magento/Sales/view/frontend/templates/order/order_status.phtml
index 7a3ff4398d983..a5fdcb0fca218 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/order_status.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/order_status.phtml
@@ -4,6 +4,6 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php /** @var $block \Magento\Sales\Block\Order\Info */ ?>
+<?php /** @var \Magento\Sales\Block\Order\Info $block */ ?>
 
 <span class="order-status"><?= $block->escapeHtml($block->getOrder()->getStatusLabel()) ?></span>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml b/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
index 0702724e79e38..c795642587ad3 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
@@ -6,7 +6,7 @@
 
 // phpcs:disable Magento2.Templates.ThisInTemplate
 
-/** @var $block \Magento\Sales\Block\Order\Recent */
+/** @var \Magento\Sales\Block\Order\Recent $block */
 ?>
 <div class="block block-dashboard-orders">
 <?php
diff --git a/app/code/Magento/SalesInventory/Observer/RefundOrderInventoryObserver.php b/app/code/Magento/SalesInventory/Observer/RefundOrderInventoryObserver.php
index 27bb2c70bb2c8..d59ab87efe3a5 100644
--- a/app/code/Magento/SalesInventory/Observer/RefundOrderInventoryObserver.php
+++ b/app/code/Magento/SalesInventory/Observer/RefundOrderInventoryObserver.php
@@ -81,7 +81,7 @@ public function __construct(
      */
     public function execute(EventObserver $observer)
     {
-        /* @var $creditmemo \Magento\Sales\Model\Order\Creditmemo */
+        /** @var \Magento\Sales\Model\Order\Creditmemo $creditmemo */
         $creditmemo = $observer->getEvent()->getCreditmemo();
         $order = $this->orderRepository->get($creditmemo->getOrderId());
         $returnToStockItems = [];
diff --git a/app/code/Magento/SalesRule/Block/Rss/Discounts.php b/app/code/Magento/SalesRule/Block/Rss/Discounts.php
index efc52f87fa182..037db63eddbff 100644
--- a/app/code/Magento/SalesRule/Block/Rss/Discounts.php
+++ b/app/code/Magento/SalesRule/Block/Rss/Discounts.php
@@ -93,7 +93,7 @@ public function getRssData()
             'language' => $lang,
         ];
 
-        /** @var $rule \Magento\SalesRule\Model\Rule */
+        /** @var \Magento\SalesRule\Model\Rule $rule */
         foreach ($this->rssModel->getDiscountCollection($websiteId, $customerGroupId) as $rule) {
             $toDate = $rule->getToDate()
                 ? '<br/>Discount End Date: ' . $this->formatDate($rule->getToDate(), \IntlDateFormatter::MEDIUM)
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php
index 184462755a521..00e33546e15fb 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php
@@ -68,7 +68,7 @@ public function execute()
                     ? null : $data['simple_free_shipping'];
 
             try {
-                /** @var $model \Magento\SalesRule\Model\Rule */
+                /** @var \Magento\SalesRule\Model\Rule $model */
                 $model = $this->_objectManager->create(\Magento\SalesRule\Model\Rule::class);
                 $this->_eventManager->dispatch(
                     'adminhtml_controller_salesrule_prepare_save',
diff --git a/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php b/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php
index 2bc49760c573f..d04dbd6dd2b87 100644
--- a/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php
+++ b/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php
@@ -152,7 +152,7 @@ public function generatePool()
         $size = $this->getQty();
         $maxAttempts = $this->getMaxAttempts() ? $this->getMaxAttempts() : self::MAX_GENERATE_ATTEMPTS;
         $this->increaseLength();
-        /** @var $coupon \Magento\SalesRule\Model\Coupon */
+        /** @var \Magento\SalesRule\Model\Coupon $coupon */
         $coupon = $this->couponFactory->create();
         $nowTimestamp = $this->dateTime->formatDate($this->date->gmtTimestamp());
 
diff --git a/app/code/Magento/SalesRule/Model/Rss/Discounts.php b/app/code/Magento/SalesRule/Model/Rss/Discounts.php
index aa478a2635ed9..1cd35cc86da76 100644
--- a/app/code/Magento/SalesRule/Model/Rss/Discounts.php
+++ b/app/code/Magento/SalesRule/Model/Rss/Discounts.php
@@ -40,7 +40,7 @@ public function __construct(
      */
     public function getDiscountCollection($websiteId, $customerGroupId)
     {
-        /** @var $collection \Magento\SalesRule\Model\ResourceModel\Rule\Collection */
+        /** @var \Magento\SalesRule\Model\ResourceModel\Rule\Collection $collection */
         $collection = $this->collectionFactory->create();
         $collection->addWebsiteGroupDateFilter(
             $websiteId,
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php
index bd18c665d98e4..e5c69c8b329d2 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php
@@ -64,7 +64,7 @@ public function loadAttributeOptions()
 
         $attributes = [];
         foreach ($productAttributes as $attribute) {
-            /* @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+            /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
             if (!$attribute->isAllowedForRuleCondition()
                 || !$attribute->getDataUsingMethod($this->_isUsedForRuleProperty)
             ) {
diff --git a/app/code/Magento/SalesRule/Model/RulesApplier.php b/app/code/Magento/SalesRule/Model/RulesApplier.php
index 9e1c0af24fac4..70fa320a02399 100644
--- a/app/code/Magento/SalesRule/Model/RulesApplier.php
+++ b/app/code/Magento/SalesRule/Model/RulesApplier.php
@@ -130,7 +130,7 @@ public function applyRules($item, $rules, $skipValidation, array $couponCodes =
     {
         $address = $item->getAddress();
         $appliedRuleIds = [];
-        /* @var $rule Rule */
+        /** @var Rule $rule */
         foreach ($rules as $rule) {
             if (!$this->validatorUtility->canProcessRule($rule, $address)) {
                 continue;
diff --git a/app/code/Magento/SalesRule/Model/Validator.php b/app/code/Magento/SalesRule/Model/Validator.php
index fddd6d615e26d..75750fd742114 100644
--- a/app/code/Magento/SalesRule/Model/Validator.php
+++ b/app/code/Magento/SalesRule/Model/Validator.php
@@ -746,7 +746,7 @@ public function prepareDescription($address, $separator = ', ')
     public function sortItemsByPriority($items, ?Address $address = null)
     {
         $itemsSorted = [];
-        /** @var $rule Rule */
+        /** @var Rule $rule */
         foreach ($this->getRules($address) as $rule) {
             $actions = $rule->getActions();
             foreach ($items as $itemKey => $itemValue) {
diff --git a/app/code/Magento/SalesRule/Observer/CheckSalesRulesAvailability.php b/app/code/Magento/SalesRule/Observer/CheckSalesRulesAvailability.php
index f2819a06fe1bf..0902bc5b0d94a 100644
--- a/app/code/Magento/SalesRule/Observer/CheckSalesRulesAvailability.php
+++ b/app/code/Magento/SalesRule/Observer/CheckSalesRulesAvailability.php
@@ -38,12 +38,12 @@ public function __construct(
      */
     public function checkSalesRulesAvailability($attributeCode)
     {
-        /* @var $collection \Magento\SalesRule\Model\ResourceModel\Rule\Collection */
+        /** @var \Magento\SalesRule\Model\ResourceModel\Rule\Collection $collection */
         $collection = $this->_collectionFactory->create()->addAttributeInConditionFilter($attributeCode);
 
         $disabledRulesCount = 0;
         foreach ($collection as $rule) {
-            /* @var $rule \Magento\SalesRule\Model\Rule */
+            /** @var \Magento\SalesRule\Model\Rule $rule */
             $rule->setIsActive(0);
             /* @var $rule->getConditions() \Magento\SalesRule\Model\Rule\Condition\Combine */
             $this->_removeAttributeFromConditions($rule->getConditions(), $attributeCode);
diff --git a/app/code/Magento/SalesRule/Plugin/CartTotalRepository.php b/app/code/Magento/SalesRule/Plugin/CartTotalRepository.php
index 9249676f07d06..b0df5d3022123 100644
--- a/app/code/Magento/SalesRule/Plugin/CartTotalRepository.php
+++ b/app/code/Magento/SalesRule/Plugin/CartTotalRepository.php
@@ -87,7 +87,7 @@ public function afterGet(
 
         $storeLabel = $storeLabelFallback = null;
 
-        /* @var $label \Magento\SalesRule\Model\Data\RuleLabel */
+        /** @var \Magento\SalesRule\Model\Data\RuleLabel $label */
         foreach ($rule->getStoreLabels() as $label) {
             if ($label->getStoreId() === 0) {
                 $storeLabelFallback = $label->getStoreLabel();
diff --git a/app/code/Magento/Search/Block/Adminhtml/Term/Edit/Form.php b/app/code/Magento/Search/Block/Adminhtml/Term/Edit/Form.php
index b607d426c57b3..671ba68371fdf 100644
--- a/app/code/Magento/Search/Block/Adminhtml/Term/Edit/Form.php
+++ b/app/code/Magento/Search/Block/Adminhtml/Term/Edit/Form.php
@@ -65,7 +65,7 @@ protected function _construct()
     protected function _prepareForm()
     {
         $model = $this->_coreRegistry->registry('current_catalog_search');
-        /* @var $model \Magento\Search\Model\Query */
+        /** @var \Magento\Search\Model\Query $model */
 
         /** @var \Magento\Framework\Data\Form $form */
         $form = $this->_formFactory->create(
diff --git a/app/code/Magento/Search/Block/Term.php b/app/code/Magento/Search/Block/Term.php
index ed6a2c5215b54..2789d076175bf 100644
--- a/app/code/Magento/Search/Block/Term.php
+++ b/app/code/Magento/Search/Block/Term.php
@@ -130,7 +130,7 @@ public function getTerms()
      */
     public function getSearchUrl($obj)
     {
-        /** @var $url UrlInterface */
+        /** @var UrlInterface $url */
         $url = $this->_urlFactory->create();
         /*
          * url encoding will be done in Url.php http_build_query
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php
index 39ae07f0d3531..2bbae28330747 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php
@@ -76,7 +76,7 @@ private function loadQuery()
         $queryText = $this->getRequest()->getPost('query_text', false);
         $queryId = $this->getRequest()->getPost('query_id', null);
 
-        /* @var $model \Magento\Search\Model\Query */
+        /** @var \Magento\Search\Model\Query $model */
         $model = $this->queryFactory->create();
         if ($queryText) {
             $storeId = $this->getRequest()->getPost('store_id', false);
diff --git a/app/code/Magento/Search/view/frontend/templates/form.mini.phtml b/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
index d64628151cf6a..86e691959bc37 100644
--- a/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
+++ b/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
@@ -6,13 +6,13 @@
 
 ?>
 <?php
-/** @var $block \Magento\Framework\View\Element\Template */
-/** @var $escaper \Magento\Framework\Escaper */
-/** @var $configProvider \Magento\Search\ViewModel\ConfigProvider */
+/** @var \Magento\Framework\View\Element\Template $block */
+/** @var \Magento\Framework\Escaper $escaper */
+/** @var \Magento\Search\ViewModel\ConfigProvider $configProvider */
 $configProvider = $block->getData('configProvider');
-/** @var $versionManager \Magento\Search\ViewModel\AdditionalSearchFormData */
+/** @var \Magento\Search\ViewModel\AdditionalSearchFormData $versionManager */
 $additionalSearchFormData = $block->getData('additionalSearchFormData');
-/** @var $helper \Magento\Search\Helper\Data */
+/** @var \Magento\Search\Helper\Data $helper */
 $helper = $configProvider->getSearchHelperData();
 $quickSearchUrl = $escaper->escapeUrl($helper->getSuggestUrl());
 ?>
diff --git a/app/code/Magento/Security/Model/ResourceModel/UserExpiration.php b/app/code/Magento/Security/Model/ResourceModel/UserExpiration.php
index 240dda2f0dfb9..5fb2a3989aa25 100644
--- a/app/code/Magento/Security/Model/ResourceModel/UserExpiration.php
+++ b/app/code/Magento/Security/Model/ResourceModel/UserExpiration.php
@@ -76,7 +76,7 @@ protected function _construct()
      */
     protected function _beforeSave(AbstractModel $userExpiration)
     {
-        /** @var $userExpiration UserExpirationModel */
+        /** @var UserExpirationModel $userExpiration */
         $expiresAt = $userExpiration->getExpiresAt();
         $utcValue = strtotime($expiresAt)
             ? $this->timezone->convertConfigTimeToUtc($expiresAt)
@@ -95,7 +95,7 @@ protected function _beforeSave(AbstractModel $userExpiration)
      */
     protected function _afterLoad(AbstractModel $userExpiration)
     {
-        /** @var $userExpiration UserExpirationModel */
+        /** @var UserExpirationModel $userExpiration */
         if ($userExpiration->getExpiresAt()) {
             $date = new \DateTime($userExpiration->getExpiresAt());
             $storeValue = $this->timezone->date($date);
diff --git a/app/code/Magento/Security/Observer/AfterAdminUserSave.php b/app/code/Magento/Security/Observer/AfterAdminUserSave.php
index 096b0f85f5056..b46e75e1702bb 100644
--- a/app/code/Magento/Security/Observer/AfterAdminUserSave.php
+++ b/app/code/Magento/Security/Observer/AfterAdminUserSave.php
@@ -51,7 +51,7 @@ public function __construct(
      */
     public function execute(Observer $observer)
     {
-        /* @var $user \Magento\User\Model\User */
+        /** @var \Magento\User\Model\User $user */
         $user = $observer->getEvent()->getObject();
         if ($user->getId() && $user->hasData('expires_at')) {
             $expiresAt = $user->getExpiresAt();
diff --git a/app/code/Magento/SendFriend/Block/Send.php b/app/code/Magento/SendFriend/Block/Send.php
index 6f2154ba29f47..552f26c591de5 100644
--- a/app/code/Magento/SendFriend/Block/Send.php
+++ b/app/code/Magento/SendFriend/Block/Send.php
@@ -93,7 +93,7 @@ public function getUserName()
             return trim($name);
         }
 
-        /* @var $session \Magento\Customer\Model\Session */
+        /** @var \Magento\Customer\Model\Session $session */
         $session = $this->_customerSession;
 
         if ($this->httpContext->getValue(Context::CONTEXT_AUTH)) {
@@ -117,7 +117,7 @@ public function getEmail()
             return trim($email);
         }
 
-        /* @var $session \Magento\Customer\Model\Session */
+        /** @var \Magento\Customer\Model\Session $session */
         $session = $this->_customerSession;
 
         if ($this->httpContext->getValue(Context::CONTEXT_AUTH)) {
diff --git a/app/code/Magento/SendFriend/Controller/Product.php b/app/code/Magento/SendFriend/Controller/Product.php
index a184d7d8bff62..b73bb4a08f1b5 100644
--- a/app/code/Magento/SendFriend/Controller/Product.php
+++ b/app/code/Magento/SendFriend/Controller/Product.php
@@ -70,9 +70,9 @@ public function __construct(
      */
     public function dispatch(RequestInterface $request)
     {
-        /* @var $helper \Magento\SendFriend\Helper\Data */
+        /** @var \Magento\SendFriend\Helper\Data $helper */
         $helper = $this->_objectManager->get(\Magento\SendFriend\Helper\Data::class);
-        /* @var $session \Magento\Customer\Model\Session */
+        /** @var \Magento\Customer\Model\Session $session */
         $session = $this->_objectManager->get(\Magento\Customer\Model\Session::class);
 
         if (!$helper->isEnabled()) {
diff --git a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
index 414e8279708e9..c069874d93618 100644
--- a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
+++ b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
@@ -14,7 +14,7 @@ if (!$block->getButtonLockManager()) {
         $objectManager->get(\Magento\Framework\View\Element\ButtonLockManager::class)
     );
 }
-/** @var $escaper \Magento\Framework\Escaper */
+/** @var \Magento\Framework\Escaper $escaper */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 // phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
 
diff --git a/app/code/Magento/Shipping/Block/Tracking/Popup.php b/app/code/Magento/Shipping/Block/Tracking/Popup.php
index 1eb679bd8cc76..3228f0fed437a 100644
--- a/app/code/Magento/Shipping/Block/Tracking/Popup.php
+++ b/app/code/Magento/Shipping/Block/Tracking/Popup.php
@@ -52,7 +52,7 @@ public function __construct(
      */
     public function getTrackingInfo()
     {
-        /* @var $info \Magento\Shipping\Model\Info */
+        /** @var \Magento\Shipping\Model\Info $info */
         $info = $this->_registry->registry('current_shipping_info');
 
         return $info->getTrackingInfo();
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
index 5e13688466618..1b7b3bad86f62 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
@@ -266,7 +266,7 @@ public function getAllItems(RateRequest $request)
         $items = [];
         if ($request->getAllItems()) {
             foreach ($request->getAllItems() as $item) {
-                /* @var $item \Magento\Quote\Model\Quote\Item */
+                /** @var \Magento\Quote\Model\Quote\Item $item */
                 if ($item->getProduct()->isVirtual() || $item->getParentItem()) {
                     // Don't process children here - we will process (or already have processed) them below
                     continue;
@@ -324,7 +324,7 @@ public function processAdditionalValidation(\Magento\Framework\DataObject $reque
         $defaultErrorMsg = __('The shipping module is not available.');
         $showMethod = $this->getConfigData('showmethod');
 
-        /** @var $item \Magento\Quote\Model\Quote\Item */
+        /** @var \Magento\Quote\Model\Quote\Item $item */
         foreach ($this->getAllItems($request) as $item) {
             $product = $item->getProduct();
             if ($product && $product->getId()) {
@@ -685,7 +685,7 @@ public function canCollectRates()
     protected function debugErrors($errors)
     {
         if ($this->getConfigData('showmethod')) {
-            /* @var $error Error */
+            /** @var Error $error */
             $this->_debug($errors);
         }
     }
@@ -698,7 +698,7 @@ protected function debugErrors($errors)
     protected function getErrorMessage()
     {
         if ($this->getConfigData('showmethod')) {
-            /* @var $error Error */
+            /** @var Error $error */
             $error = $this->_rateErrorFactory->create();
             $error->setCarrier($this->getCarrierCode());
             $error->setCarrierTitle($this->getConfigData('title'));
diff --git a/app/code/Magento/Shipping/Model/Info.php b/app/code/Magento/Shipping/Model/Info.php
index ed4c1c3f6d127..53d3b89f8eb35 100644
--- a/app/code/Magento/Shipping/Model/Info.php
+++ b/app/code/Magento/Shipping/Model/Info.php
@@ -76,7 +76,7 @@ public function __construct(
      */
     public function loadByHash($hash)
     {
-        /* @var $helper \Magento\Shipping\Helper\Data */
+        /** @var \Magento\Shipping\Helper\Data $helper */
         $helper = $this->_shippingData;
         $data = $helper->decodeTrackingHash($hash);
         if (!empty($data)) {
@@ -128,7 +128,7 @@ protected function _initOrder()
      */
     protected function _initShipment()
     {
-        /* @var $model Shipment */
+        /** @var Shipment $model */
         $ship = $this->shipmentRepository->get($this->getShipId());
         if (!$ship->getEntityId() || $this->getProtectCode() !== $ship->getProtectCode()) {
             return false;
diff --git a/app/code/Magento/Shipping/Model/Rate/Result.php b/app/code/Magento/Shipping/Model/Rate/Result.php
index c4ba502b346e8..ebe88064adbf5 100644
--- a/app/code/Magento/Shipping/Model/Rate/Result.php
+++ b/app/code/Magento/Shipping/Model/Rate/Result.php
@@ -197,7 +197,7 @@ public function sortRatesByPrice()
         if (!is_array($this->_rates) || !count($this->_rates)) {
             return $this;
         }
-        /* @var $rate \Magento\Quote\Model\Quote\Address\RateResult\Method */
+        /** @var \Magento\Quote\Model\Quote\Address\RateResult\Method $rate */
         foreach ($this->_rates as $i => $rate) {
             $tmp[$i] = $rate->getPrice();
         }
diff --git a/app/code/Magento/Shipping/Model/Shipping.php b/app/code/Magento/Shipping/Model/Shipping.php
index c9ed6b47ef193..236e47ce468c1 100644
--- a/app/code/Magento/Shipping/Model/Shipping.php
+++ b/app/code/Magento/Shipping/Model/Shipping.php
@@ -365,7 +365,7 @@ public function composePackagesForCarrier($carrier, $request)
 
         $maxWeight = (double)$carrier->getConfigData('max_package_weight');
 
-        /** @var $item \Magento\Quote\Model\Quote\Item */
+        /** @var \Magento\Quote\Model\Quote\Item $item */
         foreach ($allItems as $item) {
             if ($item->getProductType() == \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE
                 && $item->getProduct()->getShipmentType()
@@ -500,7 +500,7 @@ protected function _makePieces(array $orderItems, float $maxPackageWeight): arra
      */
     public function collectRatesByAddress(\Magento\Framework\DataObject $address, $limitCarrier = null)
     {
-        /** @var $request \Magento\Quote\Model\Quote\Address\RateRequest */
+        /** @var \Magento\Quote\Model\Quote\Address\RateRequest $request */
         $request = $this->rateRequestFactory->create();
         $request->setAllItems($address->getAllItems());
         $request->setDestCountryId($address->getCountryId());
diff --git a/app/code/Magento/Shipping/Model/Shipping/Labels.php b/app/code/Magento/Shipping/Model/Shipping/Labels.php
index 08ce168567182..89683bdbf364b 100644
--- a/app/code/Magento/Shipping/Model/Shipping/Labels.php
+++ b/app/code/Magento/Shipping/Model/Shipping/Labels.php
@@ -146,7 +146,7 @@ public function requestToShipment(Shipment $orderShipment)
             );
         }
 
-        /** @var $request \Magento\Shipping\Model\Shipment\Request */
+        /** @var \Magento\Shipping\Model\Shipment\Request $request */
         $request = $this->_shipmentRequestFactory->create();
         $request->setOrderShipment($orderShipment);
         $address = $order->getShippingAddress();
diff --git a/app/code/Magento/Shipping/view/frontend/templates/items.phtml b/app/code/Magento/Shipping/view/frontend/templates/items.phtml
index 177628c6b2015..ccaab1485cc30 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/items.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/items.phtml
@@ -8,7 +8,7 @@
 //phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 //phpcs:disable Magento2.Files.LineLength.MaxExceeded
 ?>
-<?php /** @var  $block \Magento\Shipping\Block\Items */ ?>
+<?php /** @var \Magento\Shipping\Block\Items $block */ ?>
 <?php  $_order = $block->getOrder() ?>
 <div class="actions-toolbar">
     <?php if ($_order->getTracksCollection()->count()) : ?>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml
index 7dca84565e674..1a86fc14a68cc 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Framework\View\Element\Template */
+/** @var \Magento\Framework\View\Element\Template $block */
 //phpcs:disable Magento2.Files.LineLength.MaxExceeded
 
 $parentBlock = $block->getParentBlock();
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/link.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/link.phtml
index 24658649d0a0c..4643369add275 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/link.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/link.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php /** @var $block \Magento\Shipping\Block\Tracking\Link */ ?>
+<?php /** @var \Magento\Shipping\Block\Tracking\Link $block */ ?>
 <?php $order = $block->getOrder() ?>
 <a href="#" class="action track" title="<?= $block->escapeHtmlAttr($block->getLabel()) ?>"
    data-mage-init='{"popupWindow": {
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml
index e15c39367529f..66a73c24fb462 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Framework\View\Element\Template */
+/** @var \Magento\Framework\View\Element\Template $block */
 $parentBlock = $block->getParentBlock();
 $track = $block->getData('track');
 ?>
diff --git a/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php
index 5779caf529e33..3fc81afb74df1 100644
--- a/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php
@@ -65,7 +65,7 @@ public function __construct(
      */
     public function render(DataObject $row)
     {
-        /** @var $sitemap Sitemap */
+        /** @var Sitemap $sitemap */
         $sitemap = $this->sitemapFactory->create();
         $sitemap->setStoreId($row->getStoreId());
         $url = $this->_escaper->escapeHtml($sitemap->getSitemapUrl($row->getSitemapPath(), $row->getSitemapFilename()));
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
index 7d7ba87940fc7..34705204f57e5 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
@@ -45,7 +45,7 @@ public function execute()
         // init and load sitemap model
         $id = $this->getRequest()->getParam('sitemap_id');
         $sitemap = $this->_objectManager->create(\Magento\Sitemap\Model\Sitemap::class);
-        /* @var $sitemap \Magento\Sitemap\Model\Sitemap */
+        /** @var \Magento\Sitemap\Model\Sitemap $sitemap */
         $sitemap->load($id);
         // if sitemap record exists
         if ($sitemap->getId()) {
diff --git a/app/code/Magento/Sitemap/Model/Observer.php b/app/code/Magento/Sitemap/Model/Observer.php
index 4333c71c7497f..e51934d5d48b1 100644
--- a/app/code/Magento/Sitemap/Model/Observer.php
+++ b/app/code/Magento/Sitemap/Model/Observer.php
@@ -113,9 +113,9 @@ public function scheduledGenerateSitemaps()
         }
 
         $collection = $this->collectionFactory->create();
-        /* @var $collection \Magento\Sitemap\Model\ResourceModel\Sitemap\Collection */
+        /** @var \Magento\Sitemap\Model\ResourceModel\Sitemap\Collection $collection */
         foreach ($collection as $sitemap) {
-            /* @var $sitemap \Magento\Sitemap\Model\Sitemap */
+            /** @var \Magento\Sitemap\Model\Sitemap $sitemap */
             try {
                 $this->appEmulation->startEnvironmentEmulation(
                     $sitemap->getStoreId(),
diff --git a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Category.php b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Category.php
index 532522c8487df..a654acc3a2fae 100644
--- a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Category.php
+++ b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Category.php
@@ -95,7 +95,7 @@ public function getCollection($storeId)
     {
         $categories = [];
 
-        /* @var $store \Magento\Store\Model\Store */
+        /** @var \Magento\Store\Model\Store $store */
         $store = $this->_storeManager->getStore($storeId);
 
         if (!$store) {
diff --git a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
index 8a72d585321b9..be7ddc7d03059 100644
--- a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
+++ b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
@@ -288,7 +288,7 @@ public function getCollection($storeId)
     {
         $products = [];
 
-        /* @var $store Store */
+        /** @var Store $store */
         $store = $this->_storeManager->getStore($storeId);
         if (!$store) {
             return false;
@@ -359,7 +359,7 @@ protected function _prepareProduct(array $productRow, $storeId)
     protected function _loadProductImages($product, $storeId)
     {
         $this->_storeManager->setCurrentStore($storeId);
-        /** @var $helper \Magento\Sitemap\Helper\Data */
+        /** @var \Magento\Sitemap\Helper\Data $helper */
         $helper = $this->_sitemapData;
         $imageIncludePolicy = $helper->getProductImageIncludePolicy($storeId);
 
diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php
index 887dac2a598c0..e799ab9ce7c14 100644
--- a/app/code/Magento/Sitemap/Model/Sitemap.php
+++ b/app/code/Magento/Sitemap/Model/Sitemap.php
@@ -316,7 +316,7 @@ public function addSitemapItem(DataObject $sitemapItem)
      */
     public function collectSitemapItems()
     {
-        /** @var $helper \Magento\Sitemap\Helper\Data */
+        /** @var \Magento\Sitemap\Helper\Data $helper */
         $helper = $this->_sitemapData;
         $storeId = $this->getStoreId();
 
@@ -451,7 +451,7 @@ public function generateXml()
     {
         $this->_initSitemapItems();
 
-        /** @var $item SitemapItemInterface */
+        /** @var SitemapItemInterface $item */
         foreach ($this->_sitemapItems as $item) {
             $xml = $this->_getSitemapRow(
                 $item->getUrl(),
diff --git a/app/code/Magento/Store/Block/Switcher.php b/app/code/Magento/Store/Block/Switcher.php
index c91c1c56940e8..b8a828c59cdba 100644
--- a/app/code/Magento/Store/Block/Switcher.php
+++ b/app/code/Magento/Store/Block/Switcher.php
@@ -116,7 +116,7 @@ public function getRawStores()
             $websiteStores = $this->_storeManager->getWebsite()->getStores();
             $stores = [];
             foreach ($websiteStores as $store) {
-                /* @var $store \Magento\Store\Model\Store */
+                /** @var \Magento\Store\Model\Store $store */
                 if (!$store->isActive()) {
                     continue;
                 }
@@ -157,7 +157,7 @@ public function getGroups()
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
             foreach ($rawGroups as $group) {
-                /* @var $group Group */
+                /** @var Group $group */
                 if (!isset($rawStores[$group->getId()])) {
                     continue;
                 }
diff --git a/app/code/Magento/Store/Model/Group.php b/app/code/Magento/Store/Model/Group.php
index 55e34e7673b05..dbce743b96bc1 100644
--- a/app/code/Magento/Store/Model/Group.php
+++ b/app/code/Magento/Store/Model/Group.php
@@ -334,7 +334,7 @@ public function getStoresByLocale($locale)
     {
         $stores = [];
         foreach ($this->getStores() as $store) {
-            /* @var $store \Magento\Store\Model\Store */
+            /** @var \Magento\Store\Model\Store $store */
             if ($store->getLocaleCode() == $locale) {
                 $stores[] = $store;
             }
diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
index becdfa8e9e614..b3dd8725a95a8 100644
--- a/app/code/Magento/Store/Model/Store.php
+++ b/app/code/Magento/Store/Model/Store.php
@@ -588,7 +588,7 @@ public function getWebsite()
      */
     public function getUrl($route = '', $params = [])
     {
-        /** @var $url UrlInterface */
+        /** @var UrlInterface $url */
         $url = $this->_url->setScope($this);
         if ($this->_storeManager->getStore()->getId() != $this->getId()) {
             $params['_scope_to_url'] = true;
diff --git a/app/code/Magento/Store/Model/StoresConfig.php b/app/code/Magento/Store/Model/StoresConfig.php
index 8dd100709b6f3..41be312d5390f 100644
--- a/app/code/Magento/Store/Model/StoresConfig.php
+++ b/app/code/Magento/Store/Model/StoresConfig.php
@@ -44,7 +44,7 @@ public function getStoresConfigByPath($path)
     {
         $stores = $this->_storeManager->getStores(true);
         $storeValues = [];
-        /** @var $store \Magento\Store\Model\Store */
+        /** @var \Magento\Store\Model\Store $store */
         foreach ($stores as $store) {
             try {
                 $value = $this->_config->getValue($path, ScopeInterface::SCOPE_STORE, $store->getCode());
diff --git a/app/code/Magento/Swatches/Helper/Media.php b/app/code/Magento/Swatches/Helper/Media.php
index ddaf1718149bd..ce2a93c228e7c 100644
--- a/app/code/Magento/Swatches/Helper/Media.php
+++ b/app/code/Magento/Swatches/Helper/Media.php
@@ -170,7 +170,7 @@ public function moveImageFromTmp($file)
         }
         $destinationFile = $this->getUniqueFileName($file);
 
-        /** @var $storageHelper \Magento\MediaStorage\Helper\File\Storage\Database */
+        /** @var \Magento\MediaStorage\Helper\File\Storage\Database $storageHelper */
         $storageHelper = $this->fileStorageDb;
 
         if ($storageHelper->checkDbUsage()) {
diff --git a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml
index c004341cf9dcd..1eea6f7da2663 100644
--- a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml
+++ b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml
@@ -6,8 +6,8 @@
 
 // phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
 // phpcs:disable Generic.Files.LineLength.TooLong
-/** @var $block \Magento\Swatches\Block\Adminhtml\Attribute\Edit\Options\Visual */
-/** @var $escaper \Magento\Framework\Escaper */
+/** @var \Magento\Swatches\Block\Adminhtml\Attribute\Edit\Options\Visual $block */
+/** @var \Magento\Framework\Escaper $escaper */
 
 $stores = $block->getStoresSortedBySortOrder();
 ?>
diff --git a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
index adb13e7f24c34..c33c242a3a9b4 100644
--- a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
+++ b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\AttributeValues */
+/** @var \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\AttributeValues $block */
 ?>
 <div data-bind="scope: '<?= $block->escapeHtmlAttr($block->getComponentName()) ?>'">
     <h2 class="steps-wizard-title"><?= $block->escapeHtml(__('Step 2: Attribute Values')) ?></h2>
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
index 18cdbb0a6da63..8d8b07bfc8968 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
@@ -7,7 +7,7 @@
 // phpcs:disable PSR2.ControlStructures.SwitchDeclaration
 // phpcs:disable Generic.WhiteSpace.ScopeIndent
 
-/** @var $block \Magento\Swatches\Block\LayeredNavigation\RenderLayered */
+/** @var \Magento\Swatches\Block\LayeredNavigation\RenderLayered $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 /** @var \Magento\Framework\Escaper $escaper */
 ?>
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
index bfabd5f3ab38f..a53f78497bc33 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
@@ -5,7 +5,7 @@
  */
 ?>
 <?php
-/** @var $block \Magento\Swatches\Block\Product\Renderer\Configurable */
+/** @var \Magento\Swatches\Block\Product\Renderer\Configurable $block */
 /** @var \Magento\Swatches\ViewModel\Product\Renderer\Configurable $configurableViewModel */
 $configurableViewModel = $block->getConfigurableViewModel()
 ?>
diff --git a/app/code/Magento/Tax/Block/Sales/Order/Tax.php b/app/code/Magento/Tax/Block/Sales/Order/Tax.php
index a08a07260e8c9..879e68c8e5c64 100644
--- a/app/code/Magento/Tax/Block/Sales/Order/Tax.php
+++ b/app/code/Magento/Tax/Block/Sales/Order/Tax.php
@@ -77,7 +77,7 @@ public function getSource()
      */
     public function initTotals()
     {
-        /** @var $parent \Magento\Sales\Block\Adminhtml\Order\Invoice\Totals */
+        /** @var \Magento\Sales\Block\Adminhtml\Order\Invoice\Totals $parent */
         $parent = $this->getParentBlock();
         $this->_order = $parent->getOrder();
         $this->_source = $parent->getSource();
diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
index f71349796e9fa..cbb25a10d3dfe 100644
--- a/app/code/Magento/Tax/Helper/Data.php
+++ b/app/code/Magento/Tax/Helper/Data.php
@@ -727,7 +727,7 @@ protected function calculateTaxForItems(EntityInterface $order, EntityInterface
         $orderTaxDetails = $this->orderTaxManagement->getOrderTaxDetails($order->getId());
 
         // Apply any taxes for the items
-        /** @var $item \Magento\Sales\Model\Order\Invoice\Item|\Magento\Sales\Model\Order\Creditmemo\Item */
+        /** @var \Magento\Sales\Model\Order\Invoice\Item|\Magento\Sales\Model\Order\Creditmemo\Item $item */
         foreach ($salesItem->getItems() as $item) {
             $orderItem = $item->getOrderItem();
             $orderItemId = $orderItem->getId();
diff --git a/app/code/Magento/Tax/Model/AggregateSalesReportTaxData.php b/app/code/Magento/Tax/Model/AggregateSalesReportTaxData.php
index a56c0063b647a..5c9308fea60e3 100644
--- a/app/code/Magento/Tax/Model/AggregateSalesReportTaxData.php
+++ b/app/code/Magento/Tax/Model/AggregateSalesReportTaxData.php
@@ -48,7 +48,7 @@ public function invoke()
         $this->localeResolver->emulate(0);
         $currentDate = $this->localeDate->date();
         $date = $currentDate->modify('-25 hours');
-        /** @var $reportTax \Magento\Tax\Model\ResourceModel\Report\Tax */
+        /** @var \Magento\Tax\Model\ResourceModel\Report\Tax $reportTax */
         $reportTax = $this->reportTaxFactory->create();
         $reportTax->aggregate($date);
         $this->localeResolver->revert();
diff --git a/app/code/Magento/Tax/Model/Calculation/Rate.php b/app/code/Magento/Tax/Model/Calculation/Rate.php
index db65d2c2c9d10..ba25d36283b62 100644
--- a/app/code/Magento/Tax/Model/Calculation/Rate.php
+++ b/app/code/Magento/Tax/Model/Calculation/Rate.php
@@ -177,7 +177,7 @@ public function beforeSave()
         parent::beforeSave();
         $country = $this->getTaxCountryId();
         $region = $this->getTaxRegionId();
-        /** @var $regionModel \Magento\Directory\Model\Region */
+        /** @var \Magento\Directory\Model\Region $regionModel */
         $regionModel = $this->_regionFactory->create();
         $regionModel->load($region);
         if ($regionModel->getCountryId() != $country) {
diff --git a/app/code/Magento/Tax/Model/ResourceModel/Report/Tax.php b/app/code/Magento/Tax/Model/ResourceModel/Report/Tax.php
index 53f20a869c3fb..dddea9a31a51b 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/Report/Tax.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/Report/Tax.php
@@ -75,9 +75,9 @@ protected function _construct()
      */
     public function aggregate($from = null, $to = null)
     {
-        /** @var $createdAt \Magento\Tax\Model\ResourceModel\Report\Tax\Createdat */
+        /** @var \Magento\Tax\Model\ResourceModel\Report\Tax\Createdat $createdAt */
         $createdAt = $this->_createdAtFactory->create();
-        /** @var $updatedAt \Magento\Tax\Model\ResourceModel\Report\Tax\Updatedat */
+        /** @var \Magento\Tax\Model\ResourceModel\Report\Tax\Updatedat $updatedAt */
         $updatedAt = $this->_updatedAtFactory->create();
 
         $createdAt->aggregate($from, $to);
diff --git a/app/code/Magento/Tax/Model/ResourceModel/Sales/Order/ConvertQuoteTaxToOrderTax.php b/app/code/Magento/Tax/Model/ResourceModel/Sales/Order/ConvertQuoteTaxToOrderTax.php
index 36088587afe41..a40b039c48f10 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/Sales/Order/ConvertQuoteTaxToOrderTax.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/Sales/Order/ConvertQuoteTaxToOrderTax.php
@@ -132,7 +132,7 @@ public function execute(\Magento\Sales\Api\Data\OrderInterface $order): void
                             'base_real_amount' => $baseRealAmount,
                         ];
 
-                        /** @var $orderTax \Magento\Tax\Model\Sales\Order\Tax */
+                        /** @var \Magento\Tax\Model\Sales\Order\Tax $orderTax */
                         $orderTax = $this->orderTaxFactory->create();
                         $result = $orderTax->setData($data)->save();
 
@@ -166,7 +166,7 @@ public function execute(\Magento\Sales\Api\Data\OrderInterface $order): void
                                         'real_base_amount' => $quoteItemId['real_base_amount'],
                                         'taxable_item_type' => $quoteItemId['item_type'],
                                     ];
-                                    /** @var $taxItem \Magento\Sales\Model\Order\Tax\Item */
+                                    /** @var \Magento\Sales\Model\Order\Tax\Item $taxItem */
                                     $taxItem = $this->taxItemFactory->create();
                                     $taxItem->setData($data)->save();
                                 }
diff --git a/app/code/Magento/Tax/Model/System/Config/Source/Tax/Region.php b/app/code/Magento/Tax/Model/System/Config/Source/Tax/Region.php
index a3e105788cb31..0304e353df15e 100644
--- a/app/code/Magento/Tax/Model/System/Config/Source/Tax/Region.php
+++ b/app/code/Magento/Tax/Model/System/Config/Source/Tax/Region.php
@@ -29,7 +29,7 @@ public function __construct(\Magento\Directory\Model\ResourceModel\Region\Collec
      */
     public function toOptionArray($noEmpty = false, $country = null)
     {
-        /** @var $region \Magento\Directory\Model\ResourceModel\Region\Collection */
+        /** @var \Magento\Directory\Model\ResourceModel\Region\Collection $region */
         $regionCollection = $this->_regionsFactory->create();
         $options = $regionCollection->addCountryFilter($country)->toOptionArray();
 
diff --git a/app/code/Magento/Tax/Model/TaxClass/Source/Product.php b/app/code/Magento/Tax/Model/TaxClass/Source/Product.php
index 8dc6929a7b08e..c24c6f9102ed9 100644
--- a/app/code/Magento/Tax/Model/TaxClass/Source/Product.php
+++ b/app/code/Magento/Tax/Model/TaxClass/Source/Product.php
@@ -141,7 +141,7 @@ public function getFlatColumns()
      */
     public function getFlatUpdateSelect($store)
     {
-        /** @var $option \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option */
+        /** @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option $option */
         $option = $this->_optionFactory->create();
         return $option->getFlatUpdateSelect($this->getAttribute(), $store, false);
     }
diff --git a/app/code/Magento/Tax/Observer/AfterAddressSaveObserver.php b/app/code/Magento/Tax/Observer/AfterAddressSaveObserver.php
index cf5d939b35c01..03d552166ede6 100644
--- a/app/code/Magento/Tax/Observer/AfterAddressSaveObserver.php
+++ b/app/code/Magento/Tax/Observer/AfterAddressSaveObserver.php
@@ -75,7 +75,7 @@ public function execute(Observer $observer)
             && $this->cacheConfig->isEnabled()
             && $this->taxHelper->isCatalogPriceDisplayAffectedByTax()
         ) {
-            /** @var $customerAddress Address */
+            /** @var Address $customerAddress */
             $address = $observer->getCustomerAddress();
             $this->addressManager->setDefaultAddressAfterSave($address);
         }
diff --git a/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php b/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php
index 3952d1534f7dc..514159452fd1d 100644
--- a/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php
+++ b/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php
@@ -156,7 +156,7 @@ protected function findItemById($id, $itemsHaystack)
     {
         if (is_array($itemsHaystack)) {
             foreach ($itemsHaystack as $item) {
-                /** @var $item \Magento\Quote\Model\Quote\Item */
+                /** @var \Magento\Quote\Model\Quote\Item $item */
                 if ((int)$item->getItemId() == $id) {
                     return $item;
                 }
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/TaxTest.php b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/TaxTest.php
index 5ecc175c0248c..e050c74679f9e 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/TaxTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/TaxTest.php
@@ -730,7 +730,7 @@ public function testEmptyAddress()
         $quote = $this->createMock(Quote::class);
         $shippingMock = $this->getMockForAbstractClass(ShippingInterface::class);
         $shippingAssignmentMock->expects($this->any())->method('getShipping')->willReturn($shippingMock);
-        /** @var $address \Magento\Quote\Model\Quote\Address|MockObject */
+        /** @var \Magento\Quote\Model\Quote\Address|MockObject $address */
         $address = $this->getMockBuilder(Address::class)
             ->disableOriginalConstructor()
             ->onlyMethods(
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
index 26573e358ce82..d29c6fd4c4ebd 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Tax\Block\Adminhtml\Rule\Edit\Form */
+/** @var \Magento\Tax\Block\Adminhtml\Rule\Edit\Form $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php $formElementId = /* @noEscape */ \Magento\Tax\Block\Adminhtml\Rate\Form::FORM_ELEMENT_ID;
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
index e6b7282cf4d27..ac0530aa336b5 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-/* @var $block \Magento\Tax\Block\Adminhtml\Rate\Form */
+/** @var \Magento\Tax\Block\Adminhtml\Rate\Form $block */
 ?>
 
 <div data-role="spinner" class="grid-loading-mask">
diff --git a/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml b/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
index 685893151bc5a..1d5cc58cb9bf8 100644
--- a/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
+++ b/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
@@ -6,7 +6,7 @@
 ?>
 
 <?php /** @var \Magento\Tax\Pricing\Render\Adjustment $block */ ?>
-<?php /** @var $escaper \Magento\Framework\Escaper */ ?>
+<?php /** @var \Magento\Framework\Escaper $escaper */ ?>
 
 <?php if ($block->displayBothPrices()): ?>
     <span id="<?= $escaper->escapeHtmlAttr($block->buildIdWithPrefix('price-excluding-tax-')) ?>"
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
index 74db5c24aecd0..33920eb6d29a2 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
@@ -6,7 +6,7 @@
 
 // phpcs:disable Magento2.Templates.ThisInTemplate
 
-/** @var $block \Magento\Tax\Block\Item\Price\Renderer */
+/** @var \Magento\Tax\Block\Item\Price\Renderer $block */
 ?>
 <?php $_item = $block->getItem() ?>
     <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
index 6c91f8cec2dce..1eeec4b682abb 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php /** @var $block \Magento\Tax\Block\Checkout\Shipping\Price */ ?>
+<?php /** @var \Magento\Tax\Block\Checkout\Shipping\Price $block */ ?>
 
 <?php $_excl = $block->getShippingPriceExclTax(); ?>
 <?php $_incl = $block->getShippingPriceInclTax(); ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
index 12aa494f74e7a..068339f325d34 100644
--- a/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Tax\Block\Item\Price\Renderer */
+/** @var \Magento\Tax\Block\Item\Price\Renderer $block */
 
 $_item = $block->getItem();
 ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
index e5fd756e2f373..7d3395f4dfeb5 100644
--- a/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Tax\Block\Item\Price\Renderer */
+/** @var \Magento\Tax\Block\Item\Price\Renderer $block */
 
 $_item = $block->getItem();
 ?>
diff --git a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportPost.php b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportPost.php
index 4a43f1827eb3d..90c8b8677ea0f 100644
--- a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportPost.php
+++ b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportPost.php
@@ -24,7 +24,7 @@ public function execute()
         $importRatesFile = $this->getRequest()->getFiles('import_rates_file');
         if ($this->getRequest()->isPost() && isset($importRatesFile['tmp_name'])) {
             try {
-                /** @var $importHandler \Magento\TaxImportExport\Model\Rate\CsvImportHandler */
+                /** @var \Magento\TaxImportExport\Model\Rate\CsvImportHandler $importHandler */
                 $importHandler = $this->_objectManager->create(
                     \Magento\TaxImportExport\Model\Rate\CsvImportHandler::class
                 );
diff --git a/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php b/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php
index c8cba30c9cd25..88caa7085b3ab 100644
--- a/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php
+++ b/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php
@@ -259,7 +259,7 @@ protected function _importRate(array $rateData, array $regionsCache, array $stor
             ];
 
             // try to load existing rate
-            /** @var $rateModel \Magento\Tax\Model\Calculation\Rate */
+            /** @var \Magento\Tax\Model\Calculation\Rate $rateModel */
             $rateModel = $this->_taxRateFactory->create()->loadByCode($modelData['code']);
             $rateModel->addData($modelData);
 
diff --git a/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml b/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
index be81f68ecab77..7efad04b51c6b 100644
--- a/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
+++ b/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\TaxImportExport\Block\Adminhtml\Rate\ImportExport */
+/** @var \Magento\TaxImportExport\Block\Adminhtml\Rate\ImportExport $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div class="import-export-tax-rates">
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit.php
index 749a9f8dafac5..5319c40dba201 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit.php
@@ -51,7 +51,7 @@ protected function _prepareLayout()
             $this->getLayout()->getBlock('page.title')->setPageTitle($this->getHeaderText());
         }
 
-        /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
+        /** @var \Magento\Framework\View\Design\ThemeInterface $theme */
         $theme = $this->_getCurrentTheme();
         if ($theme) {
             if ($theme->isEditable()) {
@@ -98,7 +98,7 @@ protected function _prepareLayout()
      */
     public function getHeaderText()
     {
-        /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
+        /** @var \Magento\Framework\View\Design\ThemeInterface $theme */
         $theme = $this->_getCurrentTheme();
         if ($theme->getId()) {
             $header = __('Theme: %1', $theme->getThemeTitle());
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
index 62103f59bfa95..0b7173013d3fb 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
@@ -82,7 +82,7 @@ protected function _prepareForm()
 
         $formData['custom_css_content'] = $this->_customCssFile ? $this->_customCssFile->getContent() : null;
 
-        /** @var $session \Magento\Backend\Model\Session */
+        /** @var \Magento\Backend\Model\Session $session */
         $session = $this->_objectManager->get(\Magento\Backend\Model\Session::class);
         $cssFileContent = $session->getThemeCustomCssData();
         if ($cssFileContent) {
@@ -179,7 +179,7 @@ protected function _addCustomCssFieldset()
         }
         $themeFieldset->addField('css_download_button', 'button', $downloadButtonConfig);
 
-        /** @var $imageButton \Magento\Backend\Block\Widget\Button */
+        /** @var \Magento\Backend\Block\Widget\Button $imageButton */
         $imageButton = $this->getLayout()->createBlock(
             \Magento\Backend\Block\Widget\Button::class
         )->setData(
@@ -206,7 +206,7 @@ protected function _addCustomCssFieldset()
             ['label' => __("Images Assets"), 'text' => $imageButton->toHtml()]
         );
 
-        /** @var $fontButton \Magento\Backend\Block\Widget\Button */
+        /** @var \Magento\Backend\Block\Widget\Button $fontButton */
         $fontButton = $this->getLayout()->createBlock(
             \Magento\Backend\Block\Widget\Button::class
         )->setData(
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Js.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Js.php
index 9228d6176e58c..bf95d13d26083 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Js.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Js.php
@@ -43,7 +43,7 @@ protected function _addThemeJsFieldset()
             \Magento\Framework\View\Design\Theme\Customization\File\Js::TYPE
         );
 
-        /** @var $jsFieldsetRenderer \Magento\Backend\Block\Widget\Form\Renderer\Fieldset */
+        /** @var \Magento\Backend\Block\Widget\Form\Renderer\Fieldset $jsFieldsetRenderer */
         $jsFieldsetRenderer = $this->getChildBlock('theme_edit_tabs_tab_js_tab_content');
         $jsFieldsetRenderer->setJsFiles($customization->generateFileInfo($customJsFiles));
 
diff --git a/app/code/Magento/Theme/Block/Html/Topmenu.php b/app/code/Magento/Theme/Block/Html/Topmenu.php
index 6f3c7d4bdf5b9..6059c9d6f0af7 100644
--- a/app/code/Magento/Theme/Block/Html/Topmenu.php
+++ b/app/code/Magento/Theme/Block/Html/Topmenu.php
@@ -120,7 +120,7 @@ protected function _countItems($items)
     {
         $total = $items->count();
         foreach ($items as $item) {
-            /** @var $item Menu\Item */
+            /** @var Menu\Item $item */
             if ($item->hasChildren()) {
                 $total += $this->_countItems($item->getChildren());
             }
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Delete.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Delete.php
index 04e52a2e2a7eb..35b71c4e98052 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Delete.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Delete.php
@@ -27,7 +27,7 @@ public function execute()
         $themeId = $this->getRequest()->getParam('id');
         try {
             if ($themeId) {
-                /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
+                /** @var \Magento\Framework\View\Design\ThemeInterface $theme */
                 $theme = $this->_objectManager->create(
                     \Magento\Framework\View\Design\ThemeInterface::class
                 )->load($themeId);
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCss.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCss.php
index d5ef88e918f5c..d7105d5e50010 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCss.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCss.php
@@ -64,11 +64,11 @@ public function execute()
         $themeId = $this->getRequest()->getParam('theme_id');
         $file = $this->getRequest()->getParam('file');
 
-        /** @var $urlDecoder DecoderInterface */
+        /** @var DecoderInterface $urlDecoder */
         $urlDecoder = $this->_objectManager->get(DecoderInterface::class);
         $fileId = $urlDecoder->decode($file);
         try {
-            /** @var $theme ThemeInterface */
+            /** @var ThemeInterface $theme */
             $theme = $this->_objectManager->create(ThemeInterface::class)->load($themeId);
             if (!$theme->getId()) {
                 throw new \InvalidArgumentException(sprintf('Theme not found: "%d".', $themeId));
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCustomCss.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCustomCss.php
index 9bee1b78b636e..6e6e2dafb9e3c 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCustomCss.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCustomCss.php
@@ -28,7 +28,7 @@ public function execute()
     {
         $themeId = $this->getRequest()->getParam('theme_id');
         try {
-            /** @var $themeFactory \Magento\Framework\View\Design\Theme\FlyweightFactory */
+            /** @var \Magento\Framework\View\Design\Theme\FlyweightFactory $themeFactory */
             $themeFactory = $this->_objectManager->create(\Magento\Framework\View\Design\Theme\FlyweightFactory::class);
             $theme = $themeFactory->create($themeId);
             if ($theme === null || !$theme->getId()) {
@@ -41,7 +41,7 @@ public function execute()
             $customCssFiles = $theme->getCustomization()->getFilesByType(
                 \Magento\Theme\Model\Theme\Customization\File\CustomCss::TYPE
             );
-            /** @var $customCssFile \Magento\Framework\View\Design\Theme\FileInterface */
+            /** @var \Magento\Framework\View\Design\Theme\FileInterface $customCssFile */
             $customCssFile = reset($customCssFiles);
             if ($customCssFile && $customCssFile->getContent()) {
                 return $this->_fileFactory->create(
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Edit.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Edit.php
index 6f8381c2b5b15..32c5596d0c3c7 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Edit.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Edit.php
@@ -20,7 +20,7 @@ class Edit extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
     public function execute()
     {
         $themeId = (int)$this->getRequest()->getParam('id');
-        /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
+        /** @var \Magento\Framework\View\Design\ThemeInterface $theme */
         $theme = $this->_objectManager->create(\Magento\Framework\View\Design\ThemeInterface::class);
         try {
             $theme->setType(\Magento\Framework\View\Design\ThemeInterface::TYPE_VIRTUAL);
@@ -30,10 +30,10 @@ public function execute()
             $this->_coreRegistry->register('current_theme', $theme);
 
             $this->_view->loadLayout();
-            /** @var $tab \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Css */
+            /** @var \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Css $tab */
             $tab = $this->_view->getLayout()->getBlock('theme_edit_tabs_tab_css_tab');
             if ($tab && $tab->canShowTab()) {
-                /** @var $helper \Magento\Theme\Helper\Theme */
+                /** @var \Magento\Theme\Helper\Theme $helper */
                 $helper = $this->_objectManager->get(\Magento\Theme\Helper\Theme::class);
                 $files = $helper->getCssAssets($theme);
                 $tab->setFiles($files);
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Save.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Save.php
index 878768cadab88..4dd15c6b70171 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Save.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Save.php
@@ -27,18 +27,18 @@ public function execute()
         $removeJsFiles = (array)$this->getRequest()->getParam('js_removed_files');
         $reorderJsFiles = array_keys($this->getRequest()->getParam('js_order', []));
 
-        /** @var $themeFactory \Magento\Framework\View\Design\Theme\FlyweightFactory */
+        /** @var \Magento\Framework\View\Design\Theme\FlyweightFactory $themeFactory */
         $themeFactory = $this->_objectManager->get(\Magento\Framework\View\Design\Theme\FlyweightFactory::class);
-        /** @var $cssService \Magento\Theme\Model\Theme\Customization\File\CustomCss */
+        /** @var \Magento\Theme\Model\Theme\Customization\File\CustomCss $cssService */
         $cssService = $this->_objectManager->get(\Magento\Theme\Model\Theme\Customization\File\CustomCss::class);
-        /** @var $singleFile \Magento\Theme\Model\Theme\SingleFile */
+        /** @var \Magento\Theme\Model\Theme\SingleFile $singleFile */
         $singleFile = $this->_objectManager->create(
             \Magento\Theme\Model\Theme\SingleFile::class,
             ['fileService' => $cssService]
         );
         try {
             if ($this->getRequest()->getPostValue()) {
-                /** @var $theme \Magento\Theme\Model\Theme */
+                /** @var \Magento\Theme\Model\Theme $theme */
                 if (!empty($themeData['theme_id'])) {
                     $theme = $themeFactory->create($themeData['theme_id']);
                 } else {
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadCss.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadCss.php
index 3519ff955ed73..dfdcb4d456d64 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadCss.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadCss.php
@@ -19,7 +19,7 @@ class UploadCss extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
      */
     public function execute()
     {
-        /** @var $serviceModel \Magento\Theme\Model\Uploader\Service */
+        /** @var \Magento\Theme\Model\Uploader\Service $serviceModel */
         $serviceModel = $this->_objectManager->get(\Magento\Theme\Model\Uploader\Service::class);
         try {
             $cssFileContent = $serviceModel->uploadCssFile('css_file_uploader');
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php
index fb2ceb0a91fc9..c75c6590915f0 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php
@@ -23,11 +23,11 @@ class UploadJs extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme i
     public function execute()
     {
         $themeId = $this->getRequest()->getParam('id');
-        /** @var $serviceModel \Magento\Theme\Model\Uploader\Service */
+        /** @var \Magento\Theme\Model\Uploader\Service $serviceModel */
         $serviceModel = $this->_objectManager->get(\Magento\Theme\Model\Uploader\Service::class);
-        /** @var $themeFactory \Magento\Framework\View\Design\Theme\FlyweightFactory */
+        /** @var \Magento\Framework\View\Design\Theme\FlyweightFactory $themeFactory */
         $themeFactory = $this->_objectManager->get(\Magento\Framework\View\Design\Theme\FlyweightFactory::class);
-        /** @var $jsService \Magento\Framework\View\Design\Theme\Customization\File\Js */
+        /** @var \Magento\Framework\View\Design\Theme\Customization\File\Js $jsService */
         $jsService = $this->_objectManager->get(\Magento\Framework\View\Design\Theme\Customization\File\Js::class);
         try {
             $theme = $themeFactory->create($themeId);
@@ -43,7 +43,7 @@ public function execute()
             $jsFile->setData('content', $jsFileData['content']);
             $jsFile->save();
 
-            /** @var $customization \Magento\Framework\View\Design\Theme\Customization */
+            /** @var \Magento\Framework\View\Design\Theme\Customization $customization */
             $customization = $this->_objectManager->create(
                 \Magento\Framework\View\Design\Theme\CustomizationInterface::class,
                 ['theme' => $theme]
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/OnInsert.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/OnInsert.php
index f8787754b41ba..1853f5d6c1c0c 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/OnInsert.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/OnInsert.php
@@ -15,7 +15,7 @@ class OnInsert extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg
      */
     public function execute()
     {
-        /** @var $helperStorage \Magento\Theme\Helper\Storage */
+        /** @var \Magento\Theme\Helper\Storage $helperStorage */
         $helperStorage = $this->_objectManager->get(\Magento\Theme\Helper\Storage::class);
         $this->getResponse()->setBody($helperStorage->getRelativeUrl());
     }
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/PreviewImage.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/PreviewImage.php
index 0b7641cf9210c..13330728e1d85 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/PreviewImage.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/PreviewImage.php
@@ -19,7 +19,7 @@ class PreviewImage extends \Magento\Theme\Controller\Adminhtml\System\Design\Wys
     public function execute()
     {
         $file = $this->getRequest()->getParam('file');
-        /** @var $helper \Magento\Theme\Helper\Storage */
+        /** @var \Magento\Theme\Helper\Storage $helper */
         $helper = $this->_objectManager->get(\Magento\Theme\Helper\Storage::class);
         try {
             return $this->_fileFactory->create(
diff --git a/app/code/Magento/Theme/Helper/Theme.php b/app/code/Magento/Theme/Helper/Theme.php
index 786f029cb4764..f1da8ba4e1891 100644
--- a/app/code/Magento/Theme/Helper/Theme.php
+++ b/app/code/Magento/Theme/Helper/Theme.php
@@ -50,7 +50,7 @@ public function __construct(
      */
     public function getCssAssets($theme)
     {
-        /** @var $layoutProcessor \Magento\Framework\View\Layout\ProcessorInterface */
+        /** @var \Magento\Framework\View\Layout\ProcessorInterface $layoutProcessor */
         $layoutProcessor = $this->_layoutProcessorFactory->create(['theme' => $theme]);
         $layoutElement = $layoutProcessor->getFileLayoutUpdatesXml();
 
diff --git a/app/code/Magento/Theme/Model/Config/Customization.php b/app/code/Magento/Theme/Model/Config/Customization.php
index 7430730451110..607dd1cd23c17 100644
--- a/app/code/Magento/Theme/Model/Config/Customization.php
+++ b/app/code/Magento/Theme/Model/Config/Customization.php
@@ -112,7 +112,7 @@ public function getStoresByThemes()
     {
         $storesByThemes = [];
         $stores = $this->_storeManager->getStores();
-        /** @var $store Store */
+        /** @var Store $store */
         foreach ($stores as $store) {
             foreach ($this->storeThemesResolver->getThemes($store) as $themeId) {
                 if (!isset($storesByThemes[$themeId])) {
@@ -195,7 +195,7 @@ protected function _prepareThemeCustomizations()
         $this->_assignedTheme = [];
         $this->_unassignedTheme = [];
 
-        /** @var $theme ThemeInterface */
+        /** @var ThemeInterface $theme */
         foreach ($themeCollection as $theme) {
             if (isset($assignedThemes[$theme->getId()])) {
                 $theme->setAssignedStores($assignedThemes[$theme->getId()]);
diff --git a/app/code/Magento/Theme/Model/CopyService.php b/app/code/Magento/Theme/Model/CopyService.php
index a6ef782b9be6b..ace2717dd86d2 100644
--- a/app/code/Magento/Theme/Model/CopyService.php
+++ b/app/code/Magento/Theme/Model/CopyService.php
@@ -91,13 +91,13 @@ public function copy(ThemeInterface $source, ThemeInterface $target)
      */
     protected function _copyDatabaseCustomization(ThemeInterface $source, ThemeInterface $target)
     {
-        /** @var $themeFile \Magento\Theme\Model\Theme\File */
+        /** @var \Magento\Theme\Model\Theme\File $themeFile */
         foreach ($target->getCustomization()->getFiles() as $themeFile) {
             $themeFile->delete();
         }
-        /** @var $newFile \Magento\Theme\Model\Theme\File */
+        /** @var \Magento\Theme\Model\Theme\File $newFile */
         foreach ($source->getCustomization()->getFiles() as $themeFile) {
-            /** @var $newThemeFile \Magento\Theme\Model\Theme\File */
+            /** @var \Magento\Theme\Model\Theme\File $newThemeFile */
             $newThemeFile = $this->_fileFactory->create();
             $newThemeFile->setData(
                 [
@@ -122,17 +122,17 @@ protected function _copyDatabaseCustomization(ThemeInterface $source, ThemeInter
     protected function _copyLayoutCustomization(ThemeInterface $source, ThemeInterface $target)
     {
         $update = $this->_updateFactory->create();
-        /** @var $targetUpdates \Magento\Widget\Model\ResourceModel\Layout\Update\Collection */
+        /** @var \Magento\Widget\Model\ResourceModel\Layout\Update\Collection $targetUpdates */
         $targetUpdates = $update->getCollection();
         $targetUpdates->addThemeFilter($target->getId());
         $targetUpdates->delete();
 
-        /** @var $sourceCollection \Magento\Widget\Model\ResourceModel\Layout\Link\Collection */
+        /** @var \Magento\Widget\Model\ResourceModel\Layout\Link\Collection $sourceCollection */
         $sourceCollection = $this->_link->getCollection();
         $sourceCollection->addThemeFilter($source->getId());
-        /** @var $layoutLink \Magento\Widget\Model\Layout\Link */
+        /** @var \Magento\Widget\Model\Layout\Link $layoutLink */
         foreach ($sourceCollection as $layoutLink) {
-            /** @var $update \Magento\Widget\Model\Layout\Update */
+            /** @var \Magento\Widget\Model\Layout\Update $update */
             $update = $this->_updateFactory->create();
             $update->load($layoutLink->getLayoutUpdateId());
             if ($update->getId()) {
diff --git a/app/code/Magento/Theme/Model/Design/Config/Storage.php b/app/code/Magento/Theme/Model/Design/Config/Storage.php
index c97114f963a09..99cbd6996a7de 100644
--- a/app/code/Magento/Theme/Model/Design/Config/Storage.php
+++ b/app/code/Magento/Theme/Model/Design/Config/Storage.php
@@ -106,9 +106,9 @@ public function load($scope, $scopeId)
     public function save(DesignConfigInterface $designConfig)
     {
         $fieldsData = $designConfig->getExtensionAttributes()->getDesignConfigData();
-        /* @var $saveTransaction \Magento\Framework\DB\Transaction */
+        /** @var \Magento\Framework\DB\Transaction $saveTransaction */
         $saveTransaction = $this->transactionFactory->create();
-        /* @var $deleteTransaction \Magento\Framework\DB\Transaction */
+        /** @var \Magento\Framework\DB\Transaction $deleteTransaction */
         $deleteTransaction = $this->transactionFactory->create();
         foreach ($fieldsData as $fieldData) {
             /** @var ValueInterface|Value $backendModel */
@@ -145,7 +145,7 @@ public function save(DesignConfigInterface $designConfig)
     public function delete(DesignConfigInterface $designConfig)
     {
         $fieldsData = $designConfig->getExtensionAttributes()->getDesignConfigData();
-        /* @var $deleteTransaction \Magento\Framework\DB\Transaction */
+        /** @var \Magento\Framework\DB\Transaction $deleteTransaction */
         $deleteTransaction = $this->transactionFactory->create();
         foreach ($fieldsData as $fieldData) {
             /** @var ValueInterface|Value $backendModel */
diff --git a/app/code/Magento/Theme/Model/Layout/Config/Converter.php b/app/code/Magento/Theme/Model/Layout/Config/Converter.php
index 99b772d155827..1f0ad5ed2ab47 100644
--- a/app/code/Magento/Theme/Model/Layout/Config/Converter.php
+++ b/app/code/Magento/Theme/Model/Layout/Config/Converter.php
@@ -17,13 +17,13 @@ public function convert($source)
         $pageLayouts = [];
         $xpath = new \DOMXPath($source);
 
-        /** @var $layout DOMNode */
+        /** @var DOMNode $layout */
         foreach ($xpath->query('/page_layouts/layout') as $layout) {
             $layoutAttributes = $layout->attributes;
             $id = $layoutAttributes->getNamedItem('id')->nodeValue;
             $pageLayouts[$id]['code'] = $id;
 
-            /** @var $layoutSubNode DOMNode */
+            /** @var DOMNode $layoutSubNode */
             foreach ($layout->childNodes as $layoutSubNode) {
                 switch ($layoutSubNode->nodeName) {
                     case 'label':
diff --git a/app/code/Magento/Theme/Model/ResourceModel/Theme/Collection.php b/app/code/Magento/Theme/Model/ResourceModel/Theme/Collection.php
index f9dd501520109..3a90afae55de4 100644
--- a/app/code/Magento/Theme/Model/ResourceModel/Theme/Collection.php
+++ b/app/code/Magento/Theme/Model/ResourceModel/Theme/Collection.php
@@ -168,7 +168,7 @@ public function updateChildRelations(\Magento\Framework\View\Design\ThemeInterfa
         $parentThemeId = $themeModel->getParentId();
         $this->addFieldToFilter('parent_id', ['eq' => $themeModel->getId()])->load();
 
-        /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
+        /** @var \Magento\Framework\View\Design\ThemeInterface $theme */
         foreach ($this->getItems() as $theme) {
             $theme->setParentId($parentThemeId)->save();
         }
diff --git a/app/code/Magento/Theme/Model/Theme/Domain/Physical.php b/app/code/Magento/Theme/Model/Theme/Domain/Physical.php
index 59ffd2f436398..1d76c3971ae1f 100644
--- a/app/code/Magento/Theme/Model/Theme/Domain/Physical.php
+++ b/app/code/Magento/Theme/Model/Theme/Domain/Physical.php
@@ -66,7 +66,7 @@ public function createVirtualTheme($theme)
         $themeData['theme_title'] = $this->_getVirtualThemeTitle($theme);
         $themeData['type'] = \Magento\Framework\View\Design\ThemeInterface::TYPE_VIRTUAL;
 
-        /** @var $themeCustomization \Magento\Framework\View\Design\ThemeInterface */
+        /** @var \Magento\Framework\View\Design\ThemeInterface $themeCustomization */
         $themeCustomization = $this->_themeFactory->create()->setData($themeData);
         $themeCustomization->getThemeImage()->createPreviewImageCopy($theme);
         $themeCustomization->save();
diff --git a/app/code/Magento/Theme/Model/Theme/Domain/Virtual.php b/app/code/Magento/Theme/Model/Theme/Domain/Virtual.php
index 5c58e73437c74..8bb5e39947b13 100644
--- a/app/code/Magento/Theme/Model/Theme/Domain/Virtual.php
+++ b/app/code/Magento/Theme/Model/Theme/Domain/Virtual.php
@@ -84,7 +84,7 @@ public function getStagingTheme()
      */
     public function getPhysicalTheme()
     {
-        /** @var $parentTheme \Magento\Framework\View\Design\ThemeInterface */
+        /** @var \Magento\Framework\View\Design\ThemeInterface $parentTheme */
         $parentTheme = $this->_theme->getParentTheme();
         while ($parentTheme && !$parentTheme->isPhysical()) {
             $parentTheme = $parentTheme->getParentTheme();
diff --git a/app/code/Magento/Theme/Model/Theme/Registration.php b/app/code/Magento/Theme/Model/Theme/Registration.php
index e42d8dad77bf2..39726e41a182e 100644
--- a/app/code/Magento/Theme/Model/Theme/Registration.php
+++ b/app/code/Magento/Theme/Model/Theme/Registration.php
@@ -156,7 +156,7 @@ public function getThemeFromDb($fullPath)
     public function checkPhysicalThemes()
     {
         $themes = $this->_collectionFactory->create()->addTypeFilter(ThemeInterface::TYPE_PHYSICAL);
-        /** @var $theme ThemeInterface */
+        /** @var ThemeInterface $theme */
         foreach ($themes as $theme) {
             if (!$this->_themeCollection->hasTheme($theme)) {
                 $theme->setType(ThemeInterface::TYPE_VIRTUAL)->save();
@@ -176,7 +176,7 @@ public function checkAllowedThemeRelations()
             list($parentType, $childType) = $typesSequence;
             $collection = $this->_collectionFactory->create();
             $collection->addTypeRelationFilter($parentType, $childType);
-            /** @var $theme ThemeInterface */
+            /** @var ThemeInterface $theme */
             foreach ($collection as $theme) {
                 $parentId = $this->_getResetParentId($theme);
                 if ($theme->getParentId() != $parentId) {
diff --git a/app/code/Magento/Theme/Model/Theme/ThemeProvider.php b/app/code/Magento/Theme/Model/Theme/ThemeProvider.php
index 3da7814560fb1..1c53d6cd20207 100644
--- a/app/code/Magento/Theme/Model/Theme/ThemeProvider.php
+++ b/app/code/Magento/Theme/Model/Theme/ThemeProvider.php
@@ -115,7 +115,7 @@ public function getThemeCustomizations(
         $area = \Magento\Framework\App\Area::AREA_FRONTEND,
         $type = \Magento\Framework\View\Design\ThemeInterface::TYPE_VIRTUAL
     ) {
-        /** @var $themeCollection \Magento\Theme\Model\ResourceModel\Theme\Collection */
+        /** @var \Magento\Theme\Model\ResourceModel\Theme\Collection $themeCollection */
         $themeCollection = $this->collectionFactory->create();
         $themeCollection->addAreaFilter($area)->addTypeFilter($type);
         return $themeCollection;
diff --git a/app/code/Magento/Theme/Model/Uploader/Service.php b/app/code/Magento/Theme/Model/Uploader/Service.php
index 4fc14522da169..4e299021fbcee 100644
--- a/app/code/Magento/Theme/Model/Uploader/Service.php
+++ b/app/code/Magento/Theme/Model/Uploader/Service.php
@@ -98,7 +98,7 @@ public function __construct(
      */
     public function uploadCssFile($file)
     {
-        /** @var $fileUploader \Magento\MediaStorage\Model\File\Uploader */
+        /** @var \Magento\MediaStorage\Model\File\Uploader $fileUploader */
         $fileUploader = $this->_uploaderFactory->create(['fileId' => $file]);
         $fileUploader->setAllowedExtensions(['css']);
         $fileUploader->setAllowRenameFiles(true);
@@ -124,7 +124,7 @@ public function uploadCssFile($file)
      */
     public function uploadJsFile($file)
     {
-        /** @var $fileUploader \Magento\MediaStorage\Model\File\Uploader */
+        /** @var \Magento\MediaStorage\Model\File\Uploader $fileUploader */
         $fileUploader = $this->_uploaderFactory->create(['fileId' => $file]);
         $fileUploader->setAllowedExtensions(['js']);
         $fileUploader->setAllowRenameFiles(true);
diff --git a/app/code/Magento/Theme/Model/Wysiwyg/Storage.php b/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
index d63d87d1d324c..5080e26c9bb75 100644
--- a/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
+++ b/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
@@ -140,7 +140,7 @@ public function __construct(
      */
     public function uploadFile($targetPath)
     {
-        /** @var $uploader Uploader */
+        /** @var Uploader $uploader */
         $uploader = $this->_objectManager->create(
             Uploader::class,
             ['fileId' => 'file']
diff --git a/app/code/Magento/Theme/Observer/ApplyThemeCustomizationObserver.php b/app/code/Magento/Theme/Observer/ApplyThemeCustomizationObserver.php
index e2566adff1b78..09ddb00906758 100644
--- a/app/code/Magento/Theme/Observer/ApplyThemeCustomizationObserver.php
+++ b/app/code/Magento/Theme/Observer/ApplyThemeCustomizationObserver.php
@@ -64,7 +64,7 @@ public function __construct(
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
-        /** @var $themeFile \Magento\Theme\Model\Theme\File */
+        /** @var \Magento\Theme\Model\Theme\File $themeFile */
         foreach ($this->currentTheme->getCustomization()->getFiles() as $themeFile) {
             try {
                 $service = $themeFile->getCustomizationService();
diff --git a/app/code/Magento/Theme/Observer/CheckThemeIsAssignedObserver.php b/app/code/Magento/Theme/Observer/CheckThemeIsAssignedObserver.php
index ca7dad1f3362a..2e71a391c61a4 100644
--- a/app/code/Magento/Theme/Observer/CheckThemeIsAssignedObserver.php
+++ b/app/code/Magento/Theme/Observer/CheckThemeIsAssignedObserver.php
@@ -44,7 +44,7 @@ public function execute(EventObserver $observer)
     {
         $theme = $observer->getEvent()->getData('theme');
         if ($theme instanceof \Magento\Framework\View\Design\ThemeInterface) {
-            /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
+            /** @var \Magento\Framework\View\Design\ThemeInterface $theme */
             if ($this->themeConfig->isThemeAssignedToStore($theme)) {
                 $this->eventDispatcher->dispatch('assigned_theme_changed', ['theme' => $theme]);
             }
diff --git a/app/code/Magento/Theme/Observer/CleanThemeRelatedContentObserver.php b/app/code/Magento/Theme/Observer/CleanThemeRelatedContentObserver.php
index 006672f0890ad..1316cf3772f36 100644
--- a/app/code/Magento/Theme/Observer/CleanThemeRelatedContentObserver.php
+++ b/app/code/Magento/Theme/Observer/CleanThemeRelatedContentObserver.php
@@ -55,7 +55,7 @@ public function execute(EventObserver $observer)
         if (!($theme instanceof \Magento\Framework\View\Design\ThemeInterface)) {
             return;
         }
-        /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
+        /** @var \Magento\Framework\View\Design\ThemeInterface $theme */
         if ($this->themeConfig->isThemeAssignedToStore($theme)) {
             throw new \Magento\Framework\Exception\LocalizedException(__('Theme isn\'t deletable.'));
         }
diff --git a/app/code/Magento/Theme/Test/Unit/Block/Adminhtml/System/Design/Theme/Tab/CssTest.php b/app/code/Magento/Theme/Test/Unit/Block/Adminhtml/System/Design/Theme/Tab/CssTest.php
index 9f7dd481b59c7..baa0d7c334b1b 100644
--- a/app/code/Magento/Theme/Test/Unit/Block/Adminhtml/System/Design/Theme/Tab/CssTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Block/Adminhtml/System/Design/Theme/Tab/CssTest.php
@@ -73,7 +73,7 @@ protected function setUp(): void
     public function testGetUploadCssFileNote()
     {
         $method = self::getMethod('_getUploadCssFileNote');
-        /** @var $sizeModel \PHPUnit\Framework\MockObject\MockObject|\Magento\Framework\File\Size  */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\Magento\Framework\File\Size $sizeModel */
         $sizeModel = $this->createMock(Size::class);
         $sizeModel->expects($this->any())->method('getMaxFileSizeInMb')->willReturn('2M');
 
diff --git a/app/code/Magento/Theme/Test/Unit/Helper/ThemeTest.php b/app/code/Magento/Theme/Test/Unit/Helper/ThemeTest.php
index c5431d35323c5..22b969dfcb0b5 100644
--- a/app/code/Magento/Theme/Test/Unit/Helper/ThemeTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Helper/ThemeTest.php
@@ -123,7 +123,7 @@ public static function getCssAssetsDataProvider()
      */
     protected function _getLayoutMergeFactory($theme, $layoutStr)
     {
-        /** @var $layoutProcessor \Magento\Framework\View\Layout\ProcessorInterface */
+        /** @var \Magento\Framework\View\Layout\ProcessorInterface $layoutProcessor */
         $layoutProcessor = $this->getMockBuilder(ProcessorInterface::class)
             ->getMockForAbstractClass();
         $xml = '<layouts xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">' . $layoutStr . '</layouts>';
@@ -136,7 +136,7 @@ protected function _getLayoutMergeFactory($theme, $layoutStr)
             $layoutElement
         );
 
-        /** @var $processorFactory \Magento\Framework\View\Layout\ProcessorFactory */
+        /** @var \Magento\Framework\View\Layout\ProcessorFactory $processorFactory */
         $processorFactory = $this->createPartialMock(
             ProcessorFactory::class,
             ['create']
diff --git a/app/code/Magento/Theme/Test/Unit/Model/DesignTest.php b/app/code/Magento/Theme/Test/Unit/Model/DesignTest.php
index 3163f673be5b7..6cbc9cc5830d8 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/DesignTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/DesignTest.php
@@ -196,7 +196,7 @@ public function testChangeDesign()
             ->getMock();
 
         $this->model->setDesign('test');
-        /** @var $design \Magento\Framework\View\DesignInterface */
+        /** @var \Magento\Framework\View\DesignInterface $design */
         $this->assertInstanceOf(get_class($this->model), $this->model->changeDesign($design));
     }
 }
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Theme/FileTest.php b/app/code/Magento/Theme/Test/Unit/Model/Theme/FileTest.php
index 8e0cb4f1209e5..b0eff49a1251a 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Theme/FileTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Theme/FileTest.php
@@ -114,7 +114,7 @@ public function testSetCustomizationService()
         $customization = $this->getMockBuilder(FileInterface::class)
             ->getMock();
 
-        /** @var $customization \Magento\Framework\View\Design\Theme\Customization\FileInterface */
+        /** @var \Magento\Framework\View\Design\Theme\Customization\FileInterface $customization */
         $this->assertInstanceOf(get_class($this->model), $this->model->setCustomizationService($customization));
     }
 
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Uploader/ServiceTest.php b/app/code/Magento/Theme/Test/Unit/Model/Uploader/ServiceTest.php
index 9252b28406795..d13f664d4eafb 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Uploader/ServiceTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Uploader/ServiceTest.php
@@ -79,7 +79,7 @@ protected function setUp(): void
         )->willReturn(
             $this->_directoryMock
         );
-        /** @var $service \Magento\Theme\Model\Uploader\Service */
+        /** @var \Magento\Theme\Model\Uploader\Service $service */
 
         $this->_fileSizeMock = $this->getMockBuilder(
             Size::class
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml
index 6b350cd625445..1859c0443fd9f 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content\Files */
+/** @var \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content\Files $block */
 ?>
 
 <?php if ($block->getFilesCount() > 0) : ?>
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml
index 866be28bf1521..4050fe1cc17a6 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml
@@ -5,7 +5,7 @@
  */
 
 // phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
-/** @var $block \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content\Uploader */
+/** @var \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content\Uploader $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 /** @var \Magento\Framework\Escaper $escaper */
 ?>
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/design/config/edit/scope.phtml b/app/code/Magento/Theme/view/adminhtml/templates/design/config/edit/scope.phtml
index 639eb749d3e71..7a960ea1e7860 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/design/config/edit/scope.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/design/config/edit/scope.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/* @var $block \Magento\Theme\Block\Adminhtml\Design\Config\Edit\Scope */
+/** @var \Magento\Theme\Block\Adminhtml\Design\Config\Edit\Scope $block */
 ?>
 
 <div class="store-view">
diff --git a/app/code/Magento/Theme/view/frontend/templates/template.phtml b/app/code/Magento/Theme/view/frontend/templates/template.phtml
index 7884c3e08f5d2..d4f1cfc3cafe3 100644
--- a/app/code/Magento/Theme/view/frontend/templates/template.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/template.phtml
@@ -4,6 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Framework\View\Element\Template */
+/** @var \Magento\Framework\View\Element\Template $block */
 ?>
 <?= $block->getChildHtml('', false);
diff --git a/app/code/Magento/Translation/Model/Inline/Parser.php b/app/code/Magento/Translation/Model/Inline/Parser.php
index 626b14a1eecfc..49aa89c90f477 100644
--- a/app/code/Magento/Translation/Model/Inline/Parser.php
+++ b/app/code/Magento/Translation/Model/Inline/Parser.php
@@ -203,10 +203,10 @@ public function processAjaxPost(array $translateParams)
         $this->_validateTranslationParams($translateParams);
         $this->_filterTranslationParams($translateParams, ['custom']);
 
-        /** @var $validStoreId int */
+        /** @var int $validStoreId */
         $validStoreId = $this->_storeManager->getStore()->getId();
 
-        /** @var $resource StringUtils */
+        /** @var StringUtils $resource */
         $resource = $this->_resourceFactory->create();
         foreach ($translateParams as $param) {
             if ($this->_appState->getAreaCode() == FrontNameResolver::AREA_CODE) {
diff --git a/app/code/Magento/Ui/Component/MassAction/Filter.php b/app/code/Magento/Ui/Component/MassAction/Filter.php
index a06592bbd6758..7a1e063174890 100644
--- a/app/code/Magento/Ui/Component/MassAction/Filter.php
+++ b/app/code/Magento/Ui/Component/MassAction/Filter.php
@@ -234,7 +234,7 @@ private function getFilterIds()
             $searchResult = $dataProvider->getSearchResult();
             // Use compatible search api getItems when searchResult is not a collection.
             foreach ($searchResult->getItems() as $item) {
-                /** @var $item \Magento\Framework\Api\Search\DocumentInterface */
+                /** @var \Magento\Framework\Api\Search\DocumentInterface $item */
                 $idsArray[] = $item->getId();
             }
         }
diff --git a/app/code/Magento/Ui/Test/Unit/Model/ResourceModel/BookmarkRepositoryTest.php b/app/code/Magento/Ui/Test/Unit/Model/ResourceModel/BookmarkRepositoryTest.php
index 03c380ba63617..9d75ca44b7a5b 100644
--- a/app/code/Magento/Ui/Test/Unit/Model/ResourceModel/BookmarkRepositoryTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Model/ResourceModel/BookmarkRepositoryTest.php
@@ -75,7 +75,7 @@ protected function setUp(): void
 
         $this->searchResultsMock = $this->getMockBuilder(BookmarkSearchResultsInterface::class)
             ->getMockForAbstractClass();
-        /** @var $searchResultsFactoryMock \Magento\Ui\Api\Data\BookmarkSearchResultsInterfaceFactory */
+        /** @var \Magento\Ui\Api\Data\BookmarkSearchResultsInterfaceFactory $searchResultsFactoryMock */
         $searchResultsFactoryMock = $this->getMockBuilder(
             BookmarkSearchResultsInterfaceFactory::class
         )->disableOriginalConstructor()
diff --git a/app/code/Magento/Ui/view/base/templates/control/button/split.phtml b/app/code/Magento/Ui/view/base/templates/control/button/split.phtml
index ce7112c400509..053eb52a6be0d 100644
--- a/app/code/Magento/Ui/view/base/templates/control/button/split.phtml
+++ b/app/code/Magento/Ui/view/base/templates/control/button/split.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Ui\Component\Control\SplitButton */
+/** @var \Magento\Ui\Component\Control\SplitButton $block */
 ?>
 
 <div <?= $block->getAttributesHtml() ?>>
diff --git a/app/code/Magento/Ui/view/base/templates/logger.phtml b/app/code/Magento/Ui/view/base/templates/logger.phtml
index b93ac7542464b..973ade92217c0 100644
--- a/app/code/Magento/Ui/view/base/templates/logger.phtml
+++ b/app/code/Magento/Ui/view/base/templates/logger.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Ui\Block\Logger */
+/** @var \Magento\Ui\Block\Logger $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php if ($block->isLoggingEnabled()): ?>
diff --git a/app/code/Magento/Ui/view/base/templates/stepswizard.phtml b/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
index 3513cf4c0edee..b49f100a10d1b 100644
--- a/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
+++ b/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
@@ -5,7 +5,7 @@
  */
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-/** @var $block \Magento\Ui\Block\Component\StepsWizard */
+/** @var \Magento\Ui\Block\Component\StepsWizard $block */
 ?>
 <div data-role="steps-wizard-main"
      class="steps-wizard <?= /* @noEscape */ $block->getData('config/dataScope') ?>"
diff --git a/app/code/Magento/UrlRewrite/Block/Catalog/Edit/Form.php b/app/code/Magento/UrlRewrite/Block/Catalog/Edit/Form.php
index ea5867ef666f4..0fcdcf4bdf77e 100644
--- a/app/code/Magento/UrlRewrite/Block/Catalog/Edit/Form.php
+++ b/app/code/Magento/UrlRewrite/Block/Catalog/Edit/Form.php
@@ -102,9 +102,9 @@ protected function _formPostInit($form)
             )
         );
 
-        /** @var $requestPath \Magento\Framework\Data\Form\Element\AbstractElement */
+        /** @var \Magento\Framework\Data\Form\Element\AbstractElement $requestPath */
         $requestPath = $this->getForm()->getElement('request_path');
-        /** @var $targetPath \Magento\Framework\Data\Form\Element\AbstractElement */
+        /** @var \Magento\Framework\Data\Form\Element\AbstractElement $targetPath */
         $targetPath = $this->getForm()->getElement('target_path');
 
         $model = $this->_getModel();
diff --git a/app/code/Magento/UrlRewrite/Block/Cms/Page/Edit/Form.php b/app/code/Magento/UrlRewrite/Block/Cms/Page/Edit/Form.php
index 39d55098e120e..1e87a4854a1c9 100644
--- a/app/code/Magento/UrlRewrite/Block/Cms/Page/Edit/Form.php
+++ b/app/code/Magento/UrlRewrite/Block/Cms/Page/Edit/Form.php
@@ -80,9 +80,9 @@ protected function _formPostInit($form)
         );
 
         // Fill request path and target path elements
-        /** @var $requestPath \Magento\Framework\Data\Form\Element\AbstractElement */
+        /** @var \Magento\Framework\Data\Form\Element\AbstractElement $requestPath */
         $requestPath = $this->getForm()->getElement('request_path');
-        /** @var $targetPath \Magento\Framework\Data\Form\Element\AbstractElement */
+        /** @var \Magento\Framework\Data\Form\Element\AbstractElement $targetPath */
         $targetPath = $this->getForm()->getElement('target_path');
 
         $model = $this->_getModel();
diff --git a/app/code/Magento/UrlRewrite/Block/Edit/Form.php b/app/code/Magento/UrlRewrite/Block/Edit/Form.php
index 2bc92ecf78ae1..0b4f2f4cf661d 100644
--- a/app/code/Magento/UrlRewrite/Block/Edit/Form.php
+++ b/app/code/Magento/UrlRewrite/Block/Edit/Form.php
@@ -258,7 +258,7 @@ protected function _prepareStoreElement($fieldset)
             if ($this->_getModel()->getIsAutogenerated()) {
                 $storeElement->setReadonly(true);
             }
-            /** @var $renderer \Magento\Backend\Block\Store\Switcher\Form\Renderer\Fieldset\Element */
+            /** @var \Magento\Backend\Block\Store\Switcher\Form\Renderer\Fieldset\Element $renderer */
             $renderer = $this->getLayout()->createBlock(
                 \Magento\Backend\Block\Store\Switcher\Form\Renderer\Fieldset\Element::class
             );
diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php
index 4ef7ea4b2062f..25ef30fdd87a9 100644
--- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php
+++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php
@@ -184,7 +184,7 @@ public function execute()
     {
         $data = $this->getRequest()->getPostValue();
         if ($data) {
-            /** @var $session \Magento\Backend\Model\Session */
+            /** @var \Magento\Backend\Model\Session $session */
             $session = $this->_objectManager->get(\Magento\Backend\Model\Session::class);
             try {
                 $model = $this->_getUrlRewrite();
diff --git a/app/code/Magento/UrlRewrite/Model/ResourceModel/UrlRewrite.php b/app/code/Magento/UrlRewrite/Model/ResourceModel/UrlRewrite.php
index 9005ed9ad535d..5071960ea9b9c 100644
--- a/app/code/Magento/UrlRewrite/Model/ResourceModel/UrlRewrite.php
+++ b/app/code/Magento/UrlRewrite/Model/ResourceModel/UrlRewrite.php
@@ -42,7 +42,7 @@ protected function _initUniqueFields()
      */
     protected function _getLoadSelect($field, $value, $object)
     {
-        /** @var $select \Magento\Framework\DB\Select */
+        /** @var \Magento\Framework\DB\Select $select */
         $select = parent::_getLoadSelect($field, $value, $object);
 
         if ($object->getStoreId() !== null) {
diff --git a/app/code/Magento/User/Block/User/Edit/Tab/Main.php b/app/code/Magento/User/Block/User/Edit/Tab/Main.php
index 6b5d45516b36d..8c09b295cdaab 100644
--- a/app/code/Magento/User/Block/User/Edit/Tab/Main.php
+++ b/app/code/Magento/User/Block/User/Edit/Tab/Main.php
@@ -68,7 +68,7 @@ public function __construct(
      */
     protected function _prepareForm()
     {
-        /** @var $model \Magento\User\Model\User */
+        /** @var \Magento\User\Model\User $model */
         $model = $this->_coreRegistry->registry('permissions_user');
 
         /** @var \Magento\Framework\Data\Form $form */
diff --git a/app/code/Magento/User/Block/User/Edit/Tab/Roles.php b/app/code/Magento/User/Block/User/Edit/Tab/Roles.php
index 96f45c53e96c1..d25f57204a723 100644
--- a/app/code/Magento/User/Block/User/Edit/Tab/Roles.php
+++ b/app/code/Magento/User/Block/User/Edit/Tab/Roles.php
@@ -160,7 +160,7 @@ public function getSelectedRoles($json = false)
             }
             return $this->escapeJs($this->escapeHtml($userRoles));
         }
-        /* @var $user \Magento\User\Model\User */
+        /** @var \Magento\User\Model\User $user */
         $user = $this->_coreRegistry->registry('permissions_user');
         //checking if we have this data and we
         //don't need load it through resource model
diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth.php b/app/code/Magento/User/Controller/Adminhtml/Auth.php
index ea539b64a5cc3..d0833eeb21ae9 100644
--- a/app/code/Magento/User/Controller/Adminhtml/Auth.php
+++ b/app/code/Magento/User/Controller/Adminhtml/Auth.php
@@ -57,7 +57,7 @@ protected function _validateResetPasswordLinkToken($userId, $resetPasswordToken)
             throw new LocalizedException(__('Please correct the password reset token.'));
         }
 
-        /** @var $user \Magento\User\Model\User */
+        /** @var \Magento\User\Model\User $user */
         $user = $this->_userFactory->create()->load($userId);
         if (!$user->getId()) {
             throw new LocalizedException(
diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php b/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php
index 59fe2f1ba749e..bf84e084df875 100644
--- a/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php
+++ b/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php
@@ -106,7 +106,7 @@ public function execute()
                     $this->messageManager->addErrorMessage($exception->getMessage());
                     return $resultRedirect->setPath('admin');
                 }
-                /** @var $collection \Magento\User\Model\ResourceModel\User\Collection */
+                /** @var \Magento\User\Model\ResourceModel\User\Collection $collection */
                 $collection = $this->userCollectionFactory->create();
                 $collection->addFieldToFilter('email', $email);
                 $collection->load(false);
diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php b/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php
index 711665e291f75..5caf98703d723 100644
--- a/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php
+++ b/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php
@@ -69,7 +69,7 @@ public function execute()
             return;
         }
 
-        /** @var $user \Magento\User\Model\User */
+        /** @var \Magento\User\Model\User $user */
         $user = $this->_userFactory->create()->load($userId);
         $user->setPassword($password);
         $user->setPasswordConfirmation($passwordConfirmation);
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Save.php b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
index 355887ae92835..b0872c0cf8203 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Save.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
@@ -57,7 +57,7 @@ public function execute()
             return;
         }
 
-        /** @var $model \Magento\User\Model\User */
+        /** @var \Magento\User\Model\User $model */
         $model = $this->_userFactory->create()->load($userId);
         if ($userId && $model->isObjectNew()) {
             $this->messageManager->addError(__('This user no longer exists.'));
@@ -78,7 +78,7 @@ public function execute()
             $model->setRoleId($userRoles[0]);
         }
 
-        /** @var $currentUser \Magento\User\Model\User */
+        /** @var \Magento\User\Model\User $currentUser */
         $currentUser = $this->_objectManager->get(\Magento\Backend\Model\Auth\Session::class)->getUser();
         if ($userId == $currentUser->getId()
             && $this->_objectManager->get(\Magento\Framework\Validator\Locale::class)
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Validate.php b/app/code/Magento/User/Controller/Adminhtml/User/Validate.php
index a703410abc8f0..21105427018d6 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Validate.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Validate.php
@@ -21,12 +21,12 @@ public function execute()
         $userId = (int)$this->getRequest()->getParam('user_id');
         $data = $this->getRequest()->getPostValue();
         try {
-            /** @var $model \Magento\User\Model\User */
+            /** @var \Magento\User\Model\User $model */
             $model = $this->_userFactory->create()->load($userId);
             $model->setData($this->_getAdminUserData($data));
             $errors = $model->validate();
         } catch (\Magento\Framework\Validator\Exception $exception) {
-            /* @var $error Error */
+            /** @var Error $error */
             foreach ($exception->getMessages(\Magento\Framework\Message\MessageInterface::TYPE_ERROR) as $error) {
                 $errors[] = $error->getText();
             }
diff --git a/app/code/Magento/User/Model/User.php b/app/code/Magento/User/Model/User.php
index 6cc8a97456e6f..3d80132f10b15 100644
--- a/app/code/Magento/User/Model/User.php
+++ b/app/code/Magento/User/Model/User.php
@@ -320,7 +320,7 @@ protected function _willSavePassword()
      */
     protected function _getValidationRulesBeforeSave()
     {
-        /** @var $validator DataObject */
+        /** @var DataObject $validator */
         $validator = $this->_validatorObject->create();
         $this->validationRules->addUserInfoRules($validator);
 
@@ -344,7 +344,7 @@ protected function _getValidationRulesBeforeSave()
      */
     public function validate()
     {
-        /** @var $validator DataObject */
+        /** @var DataObject $validator */
         $validator = $this->_validatorObject->create();
         $this->validationRules->addUserInfoRules($validator);
 
diff --git a/app/code/Magento/User/Model/UserValidationRules.php b/app/code/Magento/User/Model/UserValidationRules.php
index 2c39f66da990c..e8736bcc5980b 100644
--- a/app/code/Magento/User/Model/UserValidationRules.php
+++ b/app/code/Magento/User/Model/UserValidationRules.php
@@ -55,7 +55,7 @@ public function addUserInfoRules(DataObject $validator)
             EmailAddress::INVALID
         );
 
-        /** @var $validator DataObject */
+        /** @var DataObject $validator */
         $validator->addRule(
             $userNameNotEmpty,
             'username'
diff --git a/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php b/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php
index 9573aaa1547ab..ac7437a80d2e5 100644
--- a/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php
+++ b/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php
@@ -74,7 +74,7 @@ public function __construct(
      */
     public function execute(EventObserver $observer)
     {
-        /* @var $user User */
+        /** @var User $user */
         $user = $observer->getEvent()->getObject();
         if ($user->getId()) {
             $passwordHash = $user->getPassword();
diff --git a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable.php b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable.php
index 2b3a3107a15b9..27bef5c37a1cd 100644
--- a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable.php
+++ b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable.php
@@ -93,7 +93,7 @@ protected function _initVariable()
     {
         $variableId = $this->getRequest()->getParam('variable_id', null);
         $storeId = (int)$this->getRequest()->getParam('store', 0);
-        /* @var $variable \Magento\Variable\Model\Variable */
+        /** @var \Magento\Variable\Model\Variable $variable */
         $variable = $this->_objectManager->create(\Magento\Variable\Model\Variable::class);
         if ($variableId) {
             $variable->setStoreId($storeId)->load($variableId);
diff --git a/app/code/Magento/Variable/Model/Variable.php b/app/code/Magento/Variable/Model/Variable.php
index 1008b16fc7c36..764fa5d7b8110 100644
--- a/app/code/Magento/Variable/Model/Variable.php
+++ b/app/code/Magento/Variable/Model/Variable.php
@@ -179,7 +179,7 @@ public function validate()
      */
     public function getVariablesOptionArray($withGroup = false)
     {
-        /* @var $collection \Magento\Variable\Model\ResourceModel\Variable\Collection */
+        /** @var \Magento\Variable\Model\ResourceModel\Variable\Collection $collection */
         $collection = $this->getCollection();
         $variables = [];
         foreach ($collection->toOptionArray() as $variable) {
diff --git a/app/code/Magento/Vault/Model/Method/Vault.php b/app/code/Magento/Vault/Model/Method/Vault.php
index d70d59f66525c..6ad09c0a19148 100644
--- a/app/code/Magento/Vault/Model/Method/Vault.php
+++ b/app/code/Magento/Vault/Model/Method/Vault.php
@@ -436,7 +436,7 @@ public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount
         if (!$payment instanceof OrderPaymentInterface) {
             throw new \DomainException('Not implemented');
         }
-        /** @var $payment OrderPaymentInterface */
+        /** @var OrderPaymentInterface $payment */
 
         $this->attachTokenExtensionAttribute($payment);
         $this->attachCreditCardInfo($payment);
@@ -467,7 +467,7 @@ public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
         if (!$payment instanceof OrderPaymentInterface) {
             throw new \DomainException('Not implemented');
         }
-        /** @var $payment Payment */
+        /** @var Payment $payment */
 
         if ($payment->getAuthorizationTransaction()) {
             throw new \DomainException('Capture can not be performed through vault');
diff --git a/app/code/Magento/Vault/view/frontend/templates/token_list.phtml b/app/code/Magento/Vault/view/frontend/templates/token_list.phtml
index 65316f9db5830..bced3e3b3766b 100644
--- a/app/code/Magento/Vault/view/frontend/templates/token_list.phtml
+++ b/app/code/Magento/Vault/view/frontend/templates/token_list.phtml
@@ -5,7 +5,7 @@
  */
 
 /** @var \Magento\Vault\Block\Customer\AccountTokens $block */
-/** @var $escaper \Magento\Framework\Escaper */
+/** @var \Magento\Framework\Escaper $escaper */
 $tokens = $block->getPaymentTokens();
 ?>
 <?php if (count($tokens) !== 0): ?>
diff --git a/app/code/Magento/Webapi/Model/Rest/Config.php b/app/code/Magento/Webapi/Model/Rest/Config.php
index 59a7f45eb8abe..f96926d4d4538 100644
--- a/app/code/Magento/Webapi/Model/Rest/Config.php
+++ b/app/code/Magento/Webapi/Model/Rest/Config.php
@@ -75,7 +75,7 @@ public function __construct(
      */
     protected function _createRoute($routeData)
     {
-        /** @var $route \Magento\Webapi\Controller\Rest\Router\Route */
+        /** @var \Magento\Webapi\Controller\Rest\Router\Route $route */
         $route = $this->_routeFactory->createRoute(
             \Magento\Webapi\Controller\Rest\Router\Route::class,
             $routeData[self::KEY_ROUTE_PATH]
diff --git a/app/code/Magento/Weee/Block/Sales/Order/Totals.php b/app/code/Magento/Weee/Block/Sales/Order/Totals.php
index bc04b3a3985f3..5080434cf1b79 100644
--- a/app/code/Magento/Weee/Block/Sales/Order/Totals.php
+++ b/app/code/Magento/Weee/Block/Sales/Order/Totals.php
@@ -49,7 +49,7 @@ public function getSource()
      */
     public function initTotals()
     {
-        /** @var $items \Magento\Sales\Model\Order\Item[] */
+        /** @var \Magento\Sales\Model\Order\Item[] $items */
         $items = $this->getSource()->getAllItems();
         $store = $this->getSource()->getStore();
 
diff --git a/app/code/Magento/Weee/Model/Sales/Pdf/Weee.php b/app/code/Magento/Weee/Model/Sales/Pdf/Weee.php
index 2b8c74581d973..4d2e0d699f1e4 100644
--- a/app/code/Magento/Weee/Model/Sales/Pdf/Weee.php
+++ b/app/code/Magento/Weee/Model/Sales/Pdf/Weee.php
@@ -49,7 +49,7 @@ public function __construct(
      */
     public function getTotalsForDisplay()
     {
-        /** @var $items \Magento\Sales\Model\Order\Item[] */
+        /** @var \Magento\Sales\Model\Order\Item[] $items */
         $items = $this->getSource()->getAllItems();
         $store = $this->getSource()->getStore();
 
@@ -72,7 +72,7 @@ public function getTotalsForDisplay()
 
         return $totals;
     }
-    
+
     /**
      * Check if we can display Weee total information in PDF
      *
diff --git a/app/code/Magento/Weee/Observer/AfterAddressSave.php b/app/code/Magento/Weee/Observer/AfterAddressSave.php
index ba15854b2dff4..149fe70a20455 100644
--- a/app/code/Magento/Weee/Observer/AfterAddressSave.php
+++ b/app/code/Magento/Weee/Observer/AfterAddressSave.php
@@ -75,7 +75,7 @@ public function execute(Observer $observer)
             && $this->cacheConfig->isEnabled()
             && $this->weeeHelper->isEnabled()
         ) {
-            /** @var $customerAddress Address */
+            /** @var Address $customerAddress */
             $address = $observer->getCustomerAddress();
             $this->addressManager->setDefaultAddressAfterSave($address);
         }
diff --git a/app/code/Magento/Weee/Observer/AssignBackendModelToAttributeObserver.php b/app/code/Magento/Weee/Observer/AssignBackendModelToAttributeObserver.php
index 2096a5d544c7b..c8fb619775f39 100644
--- a/app/code/Magento/Weee/Observer/AssignBackendModelToAttributeObserver.php
+++ b/app/code/Magento/Weee/Observer/AssignBackendModelToAttributeObserver.php
@@ -40,7 +40,7 @@ public function __construct(
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
         $backendModel = \Magento\Weee\Model\Attribute\Backend\Weee\Tax::getBackendModelName();
-        /** @var $object \Magento\Eav\Model\Entity\Attribute\AbstractAttribute */
+        /** @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $object */
         $object = $observer->getEvent()->getAttribute();
         if ($object->getFrontendInput() == 'weee') {
             $object->setBackendModel($backendModel);
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml b/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml
index 0d8365ff4bd85..459e398b70e3c 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml
@@ -9,7 +9,7 @@
 <?php
 /** @var \Magento\Weee\Block\Adminhtml\Items\Price\Renderer $block */
 
-/** @var $_weeeHelper \Magento\Weee\Helper\Data */
+/** @var \Magento\Weee\Helper\Data $_weeeHelper */
 $_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
 
 $_item = $block->getItem();
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml b/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml
index 8dbaff2e2a6b1..ac221926402c4 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml
@@ -9,7 +9,7 @@
 <?php
 /** @var \Magento\Weee\Block\Adminhtml\Items\Price\Renderer $block */
 
-/** @var $_weeeHelper \Magento\Weee\Helper\Data */
+/** @var \Magento\Weee\Helper\Data $_weeeHelper */
 $_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
 
 $_item = $block->getItem();
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml
index 769e9e68e3a46..cc93c692b7687 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml
@@ -7,7 +7,7 @@
 // phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php
-/** @var $block \Magento\Weee\Block\Item\Price\Renderer */
+/** @var \Magento\Weee\Block\Item\Price\Renderer $block */
 
 $_item = $block->getItem();
 ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
index 0cd1ca8057984..655f18f3534dc 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
@@ -6,7 +6,7 @@
 
 // phpcs:disable Magento2.Templates.ThisInTemplate
 
-/** @var $block \Magento\Weee\Block\Item\Price\Renderer */
+/** @var \Magento\Weee\Block\Item\Price\Renderer $block */
 
 $item = $block->getItem();
 
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
index 38f2c528b15c9..0ba0446d2aabe 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
@@ -10,7 +10,7 @@
  */
 
 $_item = $block->getItem();
-/** @var $_weeeHelper \Magento\Weee\Helper\Data */
+/** @var \Magento\Weee\Helper\Data $_weeeHelper */
 $_weeeHelper = $block->getData('weeeHelper');
 ?>
 <?php $_incl = $_item->getRowTotalInclTax(); ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
index e667796825327..cc857f9b87e4d 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
@@ -10,7 +10,7 @@
  */
 
 $_item = $block->getItem();
-/** @var $_weeeHelper \Magento\Weee\Helper\Data */
+/** @var \Magento\Weee\Helper\Data $_weeeHelper */
 $_weeeHelper = $block->getData('weeeHelper');
 ?>
 <?php $_incl = $_item->getPriceInclTax(); ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml b/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml
index edcf73d2f9577..74b9fd33bd23f 100644
--- a/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml
@@ -9,7 +9,7 @@
 <?php
 /** @var \Magento\Weee\Block\Item\Price\Renderer $block */
 
-/** @var $_weeeHelper \Magento\Weee\Helper\Data */
+/** @var \Magento\Weee\Helper\Data $_weeeHelper */
 $_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
 
 $_item = $block->getItem();
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php
index 73b6f8d314556..8e9a2e3634ca8 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php
@@ -146,7 +146,7 @@ public function getHiddenEnabled()
     protected function _toHtml()
     {
         $element = $this->getElement();
-        /* @var $fieldset \Magento\Framework\Data\Form\Element\Fieldset */
+        /** @var \Magento\Framework\Data\Form\Element\Fieldset $fieldset */
         $fieldset = $element->getForm()->getElement($this->getFieldsetId());
         $chooserId = $this->getUniqId();
         $config = $this->getConfig();
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Container.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Container.php
index 9eee32cbc9a78..bec3d79ba3aa5 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Container.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Container.php
@@ -95,7 +95,7 @@ protected function _beforeToHtml()
     {
         if (!$this->getOptions()) {
             $layoutMergeParams = ['theme' => $this->_getThemeInstance($this->getTheme())];
-            /** @var $layoutProcessor \Magento\Framework\View\Layout\ProcessorInterface */
+            /** @var \Magento\Framework\View\Layout\ProcessorInterface $layoutProcessor */
             $layoutProcessor = $this->_layoutProcessorFactory->create($layoutMergeParams);
             $layoutProcessor->addPageHandles([$this->getLayoutHandle()]);
             $layoutProcessor->addPageHandles(['default']);
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/DesignAbstraction.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/DesignAbstraction.php
index 009f7b2e75dea..3b98166b6ce6e 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/DesignAbstraction.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/DesignAbstraction.php
@@ -109,7 +109,7 @@ protected function _addDesignAbstractionOptions(array $designAbstractions)
         // Group the layout options
         $customLayouts = [];
         $pageLayouts = [];
-        /** @var $layoutProcessor \Magento\Framework\View\Layout\ProcessorInterface */
+        /** @var \Magento\Framework\View\Layout\ProcessorInterface $layoutProcessor */
         $layoutProcessor = $this->_layoutProcessorFactory->create();
         foreach ($designAbstractions as $pageTypeName => $pageTypeInfo) {
             if ($layoutProcessor->isPageLayoutDesignAbstraction($pageTypeInfo)) {
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
index a8547648aeddb..0b3b48a652bd0 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
@@ -145,7 +145,7 @@ protected function _prepareForm()
             ]
         );
 
-        /** @var $label \Magento\Framework\View\Design\Theme\Label */
+        /** @var \Magento\Framework\View\Design\Theme\Label $label */
         $label = $this->_themeLabelFactory->create();
         $options = $label->getLabelsCollection(__('-- Please Select --'));
         $fieldset->addField(
@@ -204,7 +204,7 @@ protected function _prepareForm()
             ]
         );
 
-        /* @var $layoutBlock \Magento\Widget\Block\Adminhtml\Widget\Instance\Edit\Tab\Main\Layout */
+        /** @var \Magento\Widget\Block\Adminhtml\Widget\Instance\Edit\Tab\Main\Layout $layoutBlock */
         $layoutBlock = $this->getLayout()->createBlock(
             \Magento\Widget\Block\Adminhtml\Widget\Instance\Edit\Tab\Main\Layout::class
         )->setWidgetInstance(
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php
index cb275774764a5..03247e9982b33 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php
@@ -133,7 +133,7 @@ protected function _prepareForm()
             ]
         );
 
-        /** @var $label \Magento\Framework\View\Design\Theme\Label */
+        /** @var \Magento\Framework\View\Design\Theme\Label $label */
         $label = $this->_themeLabelFactory->create();
         $options = $label->getLabelsCollection(__('-- Please Select --'));
         $fieldset->addField(
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php
index b8f9f13081222..565dce3f814ab 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php
@@ -96,7 +96,7 @@ protected function _initAction()
      */
     protected function _initWidgetInstance()
     {
-        /** @var $widgetInstance \Magento\Widget\Model\Widget\Instance */
+        /** @var \Magento\Widget\Model\Widget\Instance $widgetInstance */
         $widgetInstance = $this->_widgetFactory->create();
 
         $code = $this->getRequest()->getParam('code', null);
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Blocks.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Blocks.php
index 108bd45a86e65..21ed2ac8a9f93 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Blocks.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Blocks.php
@@ -15,7 +15,7 @@ class Blocks extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
      */
     public function renderPageContainers()
     {
-        /* @var $widgetInstance \Magento\Widget\Model\Widget\Instance */
+        /** @var \Magento\Widget\Model\Widget\Instance $widgetInstance */
         $widgetInstance = $this->_initWidgetInstance();
         $layout = $this->getRequest()->getParam('layout');
         $selected = $this->getRequest()->getParam('selected', null);
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Products.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Products.php
index 73477ce4c2c18..745e130960682 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Products.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Products.php
@@ -28,7 +28,7 @@ public function execute()
         )->setSelectedProducts(
             explode(',', $selected)
         );
-        /* @var $serializer \Magento\Backend\Block\Widget\Grid\Serializer */
+        /** @var \Magento\Backend\Block\Widget\Grid\Serializer $serializer */
         $serializer = $this->_view->getLayout()->createBlock(
             \Magento\Backend\Block\Widget\Grid\Serializer::class,
             '',
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Template.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Template.php
index af7005d2cf72f..ec2c65b23ef4e 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Template.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Template.php
@@ -17,7 +17,7 @@ class Template extends \Magento\Widget\Controller\Adminhtml\Widget\Instance impl
      */
     public function execute()
     {
-        /* @var $widgetInstance \Magento\Widget\Model\Widget\Instance */
+        /** @var \Magento\Widget\Model\Widget\Instance $widgetInstance */
         $widgetInstance = $this->_initWidgetInstance();
         $block = $this->getRequest()->getParam('block', '');
         $selected = $this->getRequest()->getParam('selected', null);
diff --git a/app/code/Magento/Widget/Model/Config/Converter.php b/app/code/Magento/Widget/Model/Config/Converter.php
index 2a64a475700bd..1af7c61218fe2 100644
--- a/app/code/Magento/Widget/Model/Config/Converter.php
+++ b/app/code/Magento/Widget/Model/Config/Converter.php
@@ -18,7 +18,7 @@ public function convert($source)
     {
         $widgets = [];
         $xpath = new \DOMXPath($source);
-        /** @var $widget \DOMNode */
+        /** @var \DOMNode $widget */
         foreach ($xpath->query('/widgets/widget') as $widget) {
             $widgetAttributes = $widget->attributes;
             $widgetArray = ['@' => []];
@@ -34,7 +34,7 @@ public function convert($source)
             }
 
             $widgetId = $widgetAttributes->getNamedItem('id');
-            /** @var $widgetSubNode \DOMNode */
+            /** @var \DOMNode $widgetSubNode */
             foreach ($widget->childNodes as $widgetSubNode) {
                 switch ($widgetSubNode->nodeName) {
                     case 'label':
@@ -44,7 +44,7 @@ public function convert($source)
                         $widgetArray['description'] = $widgetSubNode->nodeValue;
                         break;
                     case 'parameters':
-                        /** @var $parameter \DOMNode */
+                        /** @var \DOMNode $parameter */
                         foreach ($widgetSubNode->childNodes as $parameter) {
                             if ($parameter->nodeName === '#text' || $parameter->nodeName === '#comment') {
                                 continue;
@@ -150,10 +150,10 @@ protected function _convertParameter($source)
             }
             $parameter['type'] = $xsiType;
 
-            /** @var $paramSubNode \DOMNode */
+            /** @var \DOMNode $paramSubNode */
             foreach ($source->childNodes as $paramSubNode) {
                 if ($paramSubNode->nodeName == 'options') {
-                    /** @var $option \DOMNode */
+                    /** @var \DOMNode $option */
                     foreach ($paramSubNode->childNodes as $option) {
                         if ($option->nodeName === '#text') {
                             continue;
diff --git a/app/code/Magento/Widget/Model/ResourceModel/Layout/Update/Collection.php b/app/code/Magento/Widget/Model/ResourceModel/Layout/Update/Collection.php
index 2be7ecc781ebb..dbfabb35f24df 100644
--- a/app/code/Magento/Widget/Model/ResourceModel/Layout/Update/Collection.php
+++ b/app/code/Magento/Widget/Model/ResourceModel/Layout/Update/Collection.php
@@ -179,7 +179,7 @@ public function addNoLinksFilter()
      */
     public function delete()
     {
-        /** @var $update \Magento\Widget\Model\Layout\Update */
+        /** @var \Magento\Widget\Model\Layout\Update $update */
         foreach ($this->getItems() as $update) {
             $update->delete();
         }
diff --git a/app/code/Magento/Widget/Test/Unit/Model/ResourceModel/Layout/Link/CollectionTest.php b/app/code/Magento/Widget/Test/Unit/Model/ResourceModel/Layout/Link/CollectionTest.php
index 1ff13377afd7b..2be9001048b5b 100644
--- a/app/code/Magento/Widget/Test/Unit/Model/ResourceModel/Layout/Link/CollectionTest.php
+++ b/app/code/Magento/Widget/Test/Unit/Model/ResourceModel/Layout/Link/CollectionTest.php
@@ -109,7 +109,7 @@ public function testJoinWithUpdate()
 
         $collection = $this->_getCollection($select);
 
-        /** @var $resource \PHPUnit\Framework\MockObject\MockObject */
+        /** @var \PHPUnit\Framework\MockObject\MockObject $resource */
         $resource = $collection->getResource();
         $resource->expects(
             $this->once()
diff --git a/app/code/Magento/Wishlist/Controller/Index/Cart.php b/app/code/Magento/Wishlist/Controller/Index/Cart.php
index 8bf42514997d4..9aac44381efab 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Cart.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Cart.php
@@ -165,7 +165,7 @@ public function execute()
         }
 
         $itemId = (int)$this->getRequest()->getParam('item');
-        /* @var $item \Magento\Wishlist\Model\Item */
+        /** @var \Magento\Wishlist\Model\Item $item */
         $item = $this->itemFactory->create()->load($itemId);
         if (!$item->getId()) {
             $resultRedirect->setPath('*/*');
diff --git a/app/code/Magento/Wishlist/Controller/Index/Configure.php b/app/code/Magento/Wishlist/Controller/Index/Configure.php
index a273a37deeff3..bce2df440f211 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Configure.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Configure.php
@@ -64,7 +64,7 @@ public function execute()
         /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         try {
-            /* @var $item \Magento\Wishlist\Model\Item */
+            /** @var \Magento\Wishlist\Model\Item $item */
             $item = $this->_objectManager->create(\Magento\Wishlist\Model\Item::class);
             $item->loadWithOptions($id);
             if (!$item->getId()) {
diff --git a/app/code/Magento/Wishlist/Controller/Shared/Cart.php b/app/code/Magento/Wishlist/Controller/Shared/Cart.php
index 939cbe3a2c46f..adda50877dc9d 100644
--- a/app/code/Magento/Wishlist/Controller/Shared/Cart.php
+++ b/app/code/Magento/Wishlist/Controller/Shared/Cart.php
@@ -90,7 +90,7 @@ public function execute()
     {
         $itemId = (int)$this->getRequest()->getParam('item');
 
-        /* @var $item Item */
+        /** @var Item $item */
         $item = $this->itemFactory->create()
             ->load($itemId);
 
diff --git a/app/code/Magento/Wishlist/Model/ItemCarrier.php b/app/code/Magento/Wishlist/Model/ItemCarrier.php
index 6198eb289a0f4..5c88109ab7413 100644
--- a/app/code/Magento/Wishlist/Model/ItemCarrier.php
+++ b/app/code/Magento/Wishlist/Model/ItemCarrier.php
@@ -126,7 +126,7 @@ public function moveAllToCart(Wishlist $wishlist, $qtys)
         $collection = $wishlist->getItemCollection()->setVisibilityFilter();
 
         foreach ($collection as $item) {
-            /** @var $item \Magento\Wishlist\Model\Item */
+            /** @var \Magento\Wishlist\Model\Item $item */
             try {
                 $disableAddToCart = $item->getProduct()->getDisableAddToCart();
                 $item->unsProduct();
@@ -202,7 +202,7 @@ public function moveAllToCart(Wishlist $wishlist, $qtys)
 
             $products = [];
             foreach ($addedProducts as $product) {
-                /** @var $product \Magento\Catalog\Model\Product */
+                /** @var \Magento\Catalog\Model\Product $product */
                 $products[] = '"' . $product->getName() . '"';
             }
 
diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
index a049bb12c97f6..6ef8fcadc8cd4 100644
--- a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
+++ b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
@@ -299,11 +299,11 @@ protected function _afterLoad()
     protected function _assignOptions()
     {
         $itemIds = array_keys($this->_items);
-        /* @var $optionCollection \Magento\Wishlist\Model\ResourceModel\Item\Option\Collection */
+        /** @var \Magento\Wishlist\Model\ResourceModel\Item\Option\Collection $optionCollection */
         $optionCollection = $this->_optionCollectionFactory->create();
         $optionCollection->addItemFilter($itemIds);
 
-        /* @var $item \Magento\Wishlist\Model\Item */
+        /** @var \Magento\Wishlist\Model\Item $item */
         foreach ($this as $item) {
             $item->setOptions($optionCollection->getOptionsByItem($item));
         }
diff --git a/app/code/Magento/Wishlist/Model/Rss/Wishlist.php b/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
index 9652b8ded2e1a..a6d910199eba7 100644
--- a/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
@@ -132,9 +132,9 @@ public function getRssData()
         if ($wishlist->getId()) {
             $data = $this->getHeader();
 
-            /** @var $wishlistItem \Magento\Wishlist\Model\Item */
+            /** @var \Magento\Wishlist\Model\Item $wishlistItem */
             foreach ($wishlist->getItemCollection() as $wishlistItem) {
-                /* @var $product \Magento\Catalog\Model\Product */
+                /** @var \Magento\Catalog\Model\Product $product */
                 $product = $wishlistItem->getProduct();
                 $productUrl = $this->wishlistBlock->getProductUrl($product, ['_rss' => true]);
                 $product->setAllowedInRss(true);
diff --git a/app/code/Magento/Wishlist/Model/Wishlist.php b/app/code/Magento/Wishlist/Model/Wishlist.php
index 2b3affbd3ed03..83c6eae01de0d 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist.php
@@ -493,7 +493,7 @@ public function addNewItem($product, $buyRequest = null, $forciblySetQty = false
             $_buyRequest->setData('action', 'add');
         }
 
-        /* @var $product Product */
+        /** @var Product $product */
         $cartCandidates = $product->getTypeInstance()->processConfiguration($_buyRequest, clone $product);
 
         /**
@@ -738,7 +738,7 @@ public function updateItem($itemId, $buyRequest, $params = null)
             $items = $this->getItemCollection();
             $isForceSetQuantity = true;
             foreach ($items as $wishlistItem) {
-                /* @var $wishlistItem Item */
+                /** @var Item $wishlistItem */
                 if ($wishlistItem->getProductId() == $product->getId()
                     && $wishlistItem->getId() != $item->getId()
                     && $wishlistItem->representProduct($product)
diff --git a/app/code/Magento/Wishlist/Pricing/ConfiguredPrice/ConfigurableProduct.php b/app/code/Magento/Wishlist/Pricing/ConfiguredPrice/ConfigurableProduct.php
index 37859ab1f4e75..ba499c0ad68ee 100644
--- a/app/code/Magento/Wishlist/Pricing/ConfiguredPrice/ConfigurableProduct.php
+++ b/app/code/Magento/Wishlist/Pricing/ConfiguredPrice/ConfigurableProduct.php
@@ -70,7 +70,7 @@ public function getValue()
                 $option = $configurableProduct->getOptionById($optionId);
                 if ($option) {
                     $itemOption = $item->getOptionByCode('option_' . $option->getId());
-                    /** @var $group \Magento\Catalog\Model\Product\Option\Type\DefaultType */
+                    /** @var \Magento\Catalog\Model\Product\Option\Type\DefaultType $group */
                     $group = $option->groupFactory($option->getType())
                         ->setOption($option);
                     $customPrice += $group->getOptionPrice($itemOption->getValue(), $price);
diff --git a/app/code/Magento/Wishlist/Pricing/Render/ConfiguredPriceBox.php b/app/code/Magento/Wishlist/Pricing/Render/ConfiguredPriceBox.php
index 12a18430634e5..3ca7553a786b1 100644
--- a/app/code/Magento/Wishlist/Pricing/Render/ConfiguredPriceBox.php
+++ b/app/code/Magento/Wishlist/Pricing/Render/ConfiguredPriceBox.php
@@ -22,10 +22,10 @@ protected function getCacheLifetime()
      */
     protected function _prepareLayout()
     {
-        /** @var $price \Magento\Catalog\Pricing\Price\ConfiguredPrice */
+        /** @var \Magento\Catalog\Pricing\Price\ConfiguredPrice $price */
         $price = $this->getPrice();
 
-        /** @var $renderBlock \Magento\Catalog\Pricing\Render */
+        /** @var \Magento\Catalog\Pricing\Render $renderBlock */
         $renderBlock = $this->getRenderBlock();
         if (!$renderBlock && $this->getItem() instanceof ItemInterface) {
             $price->setItem($this->getItem());
diff --git a/app/code/Magento/Wishlist/Test/Unit/Observer/AddToCartTest.php b/app/code/Magento/Wishlist/Test/Unit/Observer/AddToCartTest.php
index b275bbc01b76b..9a605376b88b0 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Observer/AddToCartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Observer/AddToCartTest.php
@@ -196,7 +196,7 @@ public function testExecute()
             ->method('setNoCartRedirect')
             ->with(true);
 
-        /** @var $eventObserver \Magento\Framework\Event\Observer */
+        /** @var \Magento\Framework\Event\Observer $eventObserver */
         $this->observer->execute($eventObserver);
     }
 }
diff --git a/app/code/Magento/Wishlist/Test/Unit/Observer/CartUpdateBeforeTest.php b/app/code/Magento/Wishlist/Test/Unit/Observer/CartUpdateBeforeTest.php
index d6e3273806e32..a597ace977c2e 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Observer/CartUpdateBeforeTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Observer/CartUpdateBeforeTest.php
@@ -189,7 +189,7 @@ public function testExecute()
         $this->helper->expects($this->once())
             ->method('calculate');
 
-        /** @var $eventObserver \Magento\Framework\Event\Observer */
+        /** @var \Magento\Framework\Event\Observer $eventObserver */
         $this->assertSame(
             $this->observer,
             $this->observer->execute($eventObserver)