From 44786a1f93c2bfda73e0d2397149010f6f097c7e Mon Sep 17 00:00:00 2001 From: Lukasz Bajsarowicz Date: Tue, 12 Aug 2025 14:26:43 +0200 Subject: [PATCH] Code Quality Fix: Invalid `@var` usage --- .../Model/System/Message/Baseurl.php | 4 ++-- .../Model/System/Message/Security.php | 2 +- .../PredispatchAdminActionControllerObserver.php | 2 +- .../view/adminhtml/templates/toolbar_entry.phtml | 2 +- .../Controller/Adminhtml/Export/GetFilter.php | 4 ++-- .../Authorization/Model/ResourceModel/Rules.php | 2 +- app/code/Magento/Backend/App/AbstractAction.php | 4 ++-- .../Block/Dashboard/Tab/Customers/Most.php | 2 +- .../Magento/Backend/Block/Dashboard/Totals.php | 2 +- app/code/Magento/Backend/Block/Menu.php | 6 +++--- .../Store/Switcher/Form/Renderer/Fieldset.php | 2 +- .../Switcher/Form/Renderer/Fieldset/Element.php | 2 +- .../Block/System/Design/Edit/Tab/General.php | 2 +- .../Block/System/Store/Edit/Form/Website.php | 2 +- app/code/Magento/Backend/Block/Widget/Form.php | 2 +- .../Block/Widget/Form/Element/Dependence.php | 4 ++-- .../Block/Widget/Grid/Column/Filter/Datetime.php | 2 +- .../Block/Widget/Grid/Column/Filter/Theme.php | 2 +- .../Backend/Block/Widget/Grid/ColumnSet.php | 2 +- .../Magento/Backend/Block/Widget/Grid/Export.php | 8 ++++---- .../Grid/Massaction/AbstractMassaction.php | 2 +- .../Controller/Adminhtml/Cache/FlushAll.php | 2 +- .../Controller/Adminhtml/Cache/FlushSystem.php | 2 +- .../Controller/Adminhtml/Dashboard/Tunnel.php | 2 +- .../Controller/Adminhtml/System/Account/Save.php | 2 +- app/code/Magento/Backend/Cron/CleanCache.php | 2 +- app/code/Magento/Backend/Model/Menu/Builder.php | 2 +- app/code/Magento/Backend/Model/Url.php | 2 +- .../Magento/Backend/Model/View/Result/Page.php | 4 ++-- .../view/adminhtml/templates/admin/page.phtml | 2 +- .../adminhtml/templates/media/uploader.phtml | 2 +- .../view/adminhtml/templates/page/header.phtml | 2 +- .../adminhtml/templates/page/js/components.phtml | 2 +- .../adminhtml/templates/store/switcher.phtml | 2 +- .../form/renderer/fieldset/element.phtml | 2 +- .../view/adminhtml/templates/system/search.phtml | 2 +- .../templates/widget/button/split.phtml | 2 +- .../view/adminhtml/templates/widget/form.phtml | 2 +- .../templates/widget/form/container.phtml | 2 +- .../widget/form/renderer/fieldset.phtml | 2 +- .../widget/form/renderer/fieldset/element.phtml | 2 +- .../view/adminhtml/templates/widget/grid.phtml | 2 +- .../templates/widget/grid/column_set.phtml | 2 +- .../view/adminhtml/templates/widget/tabs.phtml | 2 +- .../Controller/Adminhtml/Index/Download.php | 2 +- .../Controller/Adminhtml/Index/Rollback.php | 2 +- .../Block/Catalog/Product/View/Type/Bundle.php | 4 ++-- app/code/Magento/Bundle/Model/LinkManagement.php | 6 +++--- app/code/Magento/Bundle/Model/Product/Price.php | 8 ++++---- .../Magento/Bundle/Model/Product/ReadHandler.php | 2 +- app/code/Magento/Bundle/Model/Product/Type.php | 2 +- .../Observer/AppendUpsellProductsObserver.php | 8 ++++---- .../Bundle/Pricing/Adjustment/Calculator.php | 4 ++-- .../product/edit/tab/attributes/extend.phtml | 2 +- .../composite/fieldset/options/bundle.phtml | 2 +- .../fieldset/options/type/checkbox.phtml | 2 +- .../composite/fieldset/options/type/multi.phtml | 2 +- .../composite/fieldset/options/type/radio.phtml | 2 +- .../composite/fieldset/options/type/select.phtml | 2 +- .../templates/product/edit/bundle.phtml | 2 +- .../templates/product/edit/bundle/option.phtml | 6 +++--- .../product/edit/bundle/option/search.phtml | 2 +- .../product/edit/bundle/option/selection.phtml | 2 +- .../sales/creditmemo/create/items/renderer.phtml | 2 +- .../sales/creditmemo/view/items/renderer.phtml | 2 +- .../sales/invoice/create/items/renderer.phtml | 2 +- .../sales/invoice/view/items/renderer.phtml | 2 +- .../sales/order/view/items/renderer.phtml | 2 +- .../sales/shipment/create/items/renderer.phtml | 2 +- .../sales/shipment/view/items/renderer.phtml | 2 +- .../catalog/product/view/type/bundle.phtml | 2 +- .../product/view/type/bundle/option/multi.phtml | 4 ++-- .../product/view/type/bundle/option/radio.phtml | 2 +- .../product/view/type/bundle/option/select.phtml | 2 +- .../product/view/type/bundle/options.phtml | 2 +- .../email/order/items/creditmemo/default.phtml | 2 +- .../email/order/items/invoice/default.phtml | 2 +- .../email/order/items/order/default.phtml | 2 +- .../email/order/items/shipment/default.phtml | 2 +- .../sales/order/invoice/items/renderer.phtml | 2 +- .../Model/Import/Product/Type/Bundle.php | 2 +- .../Catalog/Block/Adminhtml/Category/Tree.php | 2 +- .../Product/Attribute/Edit/Tab/Main.php | 2 +- .../Adminhtml/Product/Attribute/Set/Main.php | 6 +++--- .../Adminhtml/Product/Composite/Fieldset.php | 2 +- .../Catalog/Block/Adminhtml/Product/Edit.php | 2 +- .../Block/Adminhtml/Product/Edit/Tab/Alerts.php | 2 +- .../Adminhtml/Product/Edit/Tab/Attributes.php | 2 +- .../Product/Edit/Tab/Attributes/Search.php | 4 ++-- .../Adminhtml/Product/Edit/Tab/Crosssell.php | 2 +- .../Product/Edit/Tab/Options/Option.php | 4 ++-- .../Edit/Tab/Price/Group/AbstractGroup.php | 4 ++-- .../Adminhtml/Product/Helper/Form/Gallery.php | 2 +- .../Product/Helper/Form/Gallery/Content.php | 4 ++-- .../Block/Adminhtml/Product/Options/Ajax.php | 2 +- .../Block/Adminhtml/Product/Widget/Chooser.php | 2 +- .../Catalog/Block/Adminhtml/Rss/NotifyStock.php | 2 +- .../Catalog/Block/Product/ListProduct.php | 2 +- .../Magento/Catalog/Block/Product/NewProduct.php | 2 +- .../Block/Product/ProductList/Crosssell.php | 2 +- .../Block/Product/ProductList/Related.php | 2 +- .../Block/Product/ProductList/Toolbar.php | 2 +- .../Catalog/Block/Product/ProductList/Upsell.php | 2 +- app/code/Magento/Catalog/Block/Product/View.php | 2 +- .../Catalog/Block/Product/View/Options.php | 2 +- .../Catalog/Block/Product/Widget/NewWidget.php | 2 +- app/code/Magento/Catalog/Block/Rss/Category.php | 6 +++--- .../Catalog/Block/Rss/Product/NewProducts.php | 2 +- .../Catalog/Block/Rss/Product/Special.php | 2 +- .../Controller/Adminhtml/Category/Move.php | 2 +- .../Controller/Adminhtml/Category/Save.php | 2 +- .../Adminhtml/Product/Attribute/Edit.php | 2 +- .../Adminhtml/Product/Attribute/Validate.php | 2 +- .../Controller/Adminhtml/Product/Builder.php | 2 +- .../Controller/Adminhtml/Product/Set/Save.php | 4 ++-- .../Controller/Adminhtml/Product/Validate.php | 2 +- .../Controller/Product/Compare/Remove.php | 4 ++-- app/code/Magento/Catalog/Helper/Data.php | 4 ++-- .../Magento/Catalog/Helper/Product/Compare.php | 2 +- .../Catalog/Helper/Product/Configuration.php | 2 +- .../Helper/Product/Edit/Action/Attribute.php | 2 +- .../Catalog/Helper/Product/Flat/Indexer.php | 6 +++--- app/code/Magento/Catalog/Model/Config.php | 2 +- .../Model/Config/CatalogClone/Media/Image.php | 2 +- .../Model/Indexer/Category/Flat/Action/Full.php | 6 +++--- .../AttributeSet/IndexableAttributeFilter.php | 4 ++-- .../Indexer/Product/Flat/AbstractAction.php | 8 ++++---- .../Model/Indexer/Product/Flat/Action/Eraser.php | 2 +- .../Indexer/Product/Flat/Action/Indexer.php | 2 +- .../Model/Indexer/Product/Flat/Action/Row.php | 2 +- .../Indexer/Product/Flat/FlatTableBuilder.php | 8 ++++---- .../Model/Indexer/Product/Flat/TableBuilder.php | 6 +++--- .../Indexer/Product/Price/AbstractAction.php | 4 ++-- .../Layer/Category/FilterableAttributeList.php | 2 +- .../Product/Attribute/AttributeSetFinder.php | 2 +- .../Backend/GroupPrice/AbstractGroupPrice.php | 2 +- .../Model/Product/Attribute/Backend/Price.php | 2 +- .../Catalog/Model/Product/Attribute/Group.php | 2 +- .../Model/Product/Compare/ListCompare.php | 4 ++-- .../Model/Product/Gallery/GalleryManagement.php | 2 +- .../Catalog/Model/Product/Gallery/Processor.php | 2 +- .../Catalog/Model/Product/Option/ReadHandler.php | 2 +- .../Catalog/Model/Product/Option/Repository.php | 2 +- .../Model/Product/Option/Type/DefaultType.php | 4 ++-- .../Catalog/Model/Product/Type/AbstractType.php | 4 ++-- .../Model/ProductOptions/Config/Converter.php | 4 ++-- .../Model/ProductTypes/Config/Converter.php | 8 ++++---- .../Model/ResourceModel/AbstractResource.php | 2 +- .../Catalog/Model/ResourceModel/Category.php | 4 ++-- .../Model/ResourceModel/Category/Tree.php | 2 +- .../Product/Attribute/Backend/Image.php | 2 +- .../Model/ResourceModel/Product/Collection.php | 14 +++++++------- .../Model/ResourceModel/Product/Option/Value.php | 2 +- .../Magento/Catalog/Model/ResourceModel/Url.php | 4 ++-- app/code/Magento/Catalog/Model/Rss/Category.php | 4 ++-- .../Catalog/Model/Rss/Product/NewProducts.php | 4 ++-- .../Catalog/Model/Rss/Product/NotifyStock.php | 6 +++--- .../Catalog/Model/Rss/Product/Special.php | 2 +- .../Observer/ImageResizeAfterProductSave.php | 2 +- .../Observer/SetSpecialPriceStartDate.php | 2 +- .../Catalog/Pricing/Price/ConfiguredOptions.php | 2 +- .../Catalog/Pricing/Price/ConfiguredPrice.php | 2 +- .../Catalog/Pricing/Price/CustomOptionPrice.php | 8 ++++---- .../Pricing/Render/ConfiguredPriceBox.php | 4 ++-- .../Product/Form/Categories/Options.php | 4 ++-- .../Product/Form/Modifier/Categories.php | 4 ++-- .../templates/catalog/category/tree.phtml | 2 +- .../catalog/form/renderer/fieldset/element.phtml | 4 ++-- .../templates/catalog/product/attribute/js.phtml | 2 +- .../catalog/product/attribute/labels.phtml | 2 +- .../catalog/product/attribute/set/main.phtml | 2 +- .../product/composite/fieldset/options.phtml | 2 +- .../composite/fieldset/options/type/date.phtml | 2 +- .../fieldset/options/type/default.phtml | 2 +- .../composite/fieldset/options/type/file.phtml | 2 +- .../composite/fieldset/options/type/select.phtml | 2 +- .../composite/fieldset/options/type/text.phtml | 2 +- .../catalog/product/composite/fieldset/qty.phtml | 2 +- .../catalog/product/edit/action/attribute.phtml | 2 +- .../catalog/product/edit/action/websites.phtml | 2 +- .../catalog/product/edit/attribute_set.phtml | 2 +- .../catalog/product/edit/category/new/form.phtml | 2 +- .../templates/catalog/product/edit/options.phtml | 2 +- .../catalog/product/edit/options/option.phtml | 4 ++-- .../catalog/product/edit/options/type/date.phtml | 2 +- .../catalog/product/edit/options/type/file.phtml | 2 +- .../product/edit/options/type/select.phtml | 2 +- .../catalog/product/edit/options/type/text.phtml | 2 +- .../catalog/product/edit/price/tier.phtml | 2 +- .../catalog/product/edit/serializer.phtml | 2 +- .../catalog/product/edit/websites.phtml | 2 +- .../catalog/product/helper/gallery.phtml | 2 +- .../catalog/product/tab/inventory.phtml | 2 +- .../product/edit/attribute/search.phtml | 2 +- .../adminhtml/templates/product/edit/tabs.phtml | 4 ++-- .../templates/product/edit/tabs/child_tab.phtml | 2 +- .../product/grid/massaction_extended.phtml | 2 +- .../product/grid/url_filter_applier.phtml | 2 +- .../view/adminhtml/templates/rss/grid/link.phtml | 2 +- .../templates/product/price/amount/default.phtml | 2 +- .../view/frontend/templates/category/rss.phtml | 2 +- .../templates/frontend_storage_manager.phtml | 2 +- .../templates/product/compare/link.phtml | 2 +- .../templates/product/compare/list.phtml | 4 ++-- .../templates/product/compare/sidebar.phtml | 2 +- .../view/frontend/templates/product/image.phtml | 4 ++-- .../templates/product/image_with_borders.phtml | 6 +++--- .../view/frontend/templates/product/list.phtml | 2 +- .../templates/product/list/addto/compare.phtml | 2 +- .../frontend/templates/product/list/items.phtml | 4 ++-- .../templates/product/view/additional.phtml | 2 +- .../templates/product/view/addto/compare.phtml | 2 +- .../templates/product/view/addtocart.phtml | 2 +- .../product/view/opengraph/currency.phtml | 2 +- .../product/view/opengraph/general.phtml | 4 ++-- .../templates/product/view/options.phtml | 2 +- .../product/view/options/type/date.phtml | 2 +- .../product/view/options/type/file.phtml | 2 +- .../product/view/options/type/select.phtml | 2 +- .../product/view/options/type/text.phtml | 2 +- .../templates/product/view/options/wrapper.phtml | 2 +- .../frontend/templates/product/view/review.phtml | 2 +- .../templates/product/view/type/default.phtml | 2 +- .../templates/product/widget/compared/grid.phtml | 2 +- .../templates/product/widget/compared/list.phtml | 2 +- .../product/widget/compared/sidebar.phtml | 2 +- .../templates/product/widget/viewed/grid.phtml | 2 +- .../templates/product/widget/viewed/list.phtml | 2 +- .../product/widget/viewed/sidebar.phtml | 2 +- .../Resolver/Category/CategoryHtmlAttribute.php | 2 +- .../Product/ProductComplexTextAttribute.php | 2 +- .../CatalogImportExport/Model/Export/Product.php | 4 ++-- .../CatalogImportExport/Model/Import/Product.php | 2 +- .../Model/Import/Product/CategoryProcessor.php | 2 +- .../Model/Import/Product/Option.php | 4 ++-- .../Model/Import/Product/StoreResolver.php | 2 +- .../Model/Import/Product/TaxClassProcessor.php | 2 +- .../Import/Product/Validator/LayoutUpdate.php | 4 ++-- .../Model/StockItemImporter.php | 2 +- .../Model/Quote/Item/QuantityValidator.php | 2 +- .../CatalogInventory/Model/StockIndex.php | 2 +- app/code/Magento/CatalogRule/Model/Rule.php | 2 +- ...areCatalogProductCollectionPricesObserver.php | 2 +- .../Plugin/Indexer/Product/Attribute.php | 4 ++-- .../CatalogSearch/Block/Advanced/Result.php | 2 +- app/code/Magento/CatalogSearch/Block/Result.php | 2 +- .../CatalogSearch/Controller/Result/Index.php | 2 +- .../Controller/SearchTermsLog/Save.php | 2 +- .../Magento/CatalogSearch/Model/Advanced.php | 4 ++-- .../Model/ResourceModel/EngineProvider.php | 2 +- .../Model/Search/RequestGenerator.php | 4 ++-- .../Product/AddFulltextFilterToCollection.php | 2 +- .../CatalogWidget/Block/Product/ProductsList.php | 2 +- app/code/Magento/Checkout/Block/Cart.php | 2 +- .../Magento/Checkout/Block/Cart/Crosssell.php | 6 +++--- .../Checkout/Block/Cart/Item/Renderer.php | 8 ++++---- app/code/Magento/Checkout/Controller/Cart.php | 2 +- .../Checkout/Controller/Cart/Addgroup.php | 2 +- app/code/Magento/Checkout/CustomerData/Cart.php | 2 +- app/code/Magento/Checkout/Model/Cart.php | 2 +- .../Checkout/Model/DefaultConfigProvider.php | 4 ++-- .../Model/GuestShippingInformationManagement.php | 2 +- .../Model/GuestTotalsInformationManagement.php | 2 +- app/code/Magento/Checkout/Model/Session.php | 2 +- ...CheckoutEnabledBeforeAssignBillingAddress.php | 2 +- ...ifyIsGuestCheckoutEnabledBeforePlaceOrder.php | 2 +- ...eckoutEnabledBeforeSavePaymentInformation.php | 2 +- ...ckoutEnabledBeforeSaveShippingInformation.php | 2 +- ...uestCheckoutEnabledBeforeSetPaymentMethod.php | 2 +- .../Checkout/Test/Unit/Block/CartTest.php | 2 +- .../Checkout/Test/Unit/Model/SessionTest.php | 6 +++--- .../view/frontend/templates/button.phtml | 2 +- .../view/frontend/templates/cart/form.phtml | 2 +- .../cart/item/configure/updatecart.phtml | 2 +- .../frontend/templates/cart/item/default.phtml | 2 +- .../templates/cart/item/price/sidebar.phtml | 2 +- .../cart/item/renderer/actions/edit.phtml | 2 +- .../cart/item/renderer/actions/remove.phtml | 2 +- .../view/frontend/templates/cart/methods.phtml | 2 +- .../view/frontend/templates/cart/minicart.phtml | 2 +- .../view/frontend/templates/cart/noItems.phtml | 2 +- .../view/frontend/templates/cart/shipping.phtml | 2 +- .../view/frontend/templates/item/price/row.phtml | 2 +- .../frontend/templates/item/price/unit.phtml | 2 +- .../view/frontend/templates/onepage.phtml | 2 +- .../frontend/templates/onepage/failure.phtml | 2 +- .../frontend/templates/onepage/review/item.phtml | 2 +- .../onepage/review/item/price/row_excl_tax.phtml | 2 +- .../onepage/review/item/price/row_incl_tax.phtml | 2 +- .../review/item/price/unit_excl_tax.phtml | 2 +- .../review/item/price/unit_incl_tax.phtml | 2 +- .../view/frontend/templates/registration.phtml | 2 +- .../view/frontend/templates/shipping/price.phtml | 2 +- .../view/frontend/templates/success.phtml | 2 +- .../view/frontend/templates/total/default.phtml | 2 +- .../Model/CheckoutAgreementsList.php | 2 +- .../Magento/Cms/Block/Adminhtml/Page/Grid.php | 2 +- .../Cms/Block/Adminhtml/Page/Widget/Chooser.php | 2 +- .../Adminhtml/Page/PostDataProcessor.php | 2 +- .../Adminhtml/Wysiwyg/Images/DeleteFiles.php | 2 +- .../adminhtml/templates/browser/content.phtml | 2 +- .../templates/browser/content/files.phtml | 2 +- .../templates/browser/content/uploader.phtml | 2 +- .../adminhtml/templates/url_filter_applier.phtml | 2 +- .../templates/widget/static_block/default.phtml | 2 +- .../Observer/ProcessUrlRewriteSavingObserver.php | 2 +- .../Plugin/Cms/Model/ResourceModel/Page.php | 2 +- .../Model/Service/RemoveFromCompareList.php | 2 +- .../Config/Block/System/Config/Dwstree.php | 4 ++-- .../Magento/Config/Block/System/Config/Edit.php | 2 +- .../Magento/Config/Block/System/Config/Form.php | 6 +++--- .../Block/System/Config/Form/Field/Image.php | 2 +- .../System/Config/Form/Field/Regexceptions.php | 2 +- .../Controller/Adminhtml/System/Config/Edit.php | 2 +- .../Model/Config/Backend/Currency/Cron.php | 2 +- .../Config/Model/Config/Backend/Locale.php | 6 +++--- .../Config/Model/Config/Backend/Log/Cron.php | 4 ++-- .../Model/Config/Source/Email/Identity.php | 4 ++-- .../Model/Config/Source/Email/Template.php | 2 +- .../Magento/Config/Model/Config/Source/Store.php | 2 +- .../Magento/Config/Model/Config/Structure.php | 2 +- .../Config/Model/Config/Structure/Converter.php | 4 ++-- .../templates/system/config/switcher.phtml | 2 +- .../adminhtml/templates/system/config/tabs.phtml | 6 +++--- .../Attribute/Edit/Tab/Variations/Main.php | 4 ++-- .../Attribute/NewAttribute/Product/Created.php | 8 ++++---- .../Edit/Tab/Variations/Config/Matrix.php | 4 ++-- .../Block/Adminhtml/Product/Steps/Bulk.php | 2 +- .../Block/Product/View/Type/Configurable.php | 2 +- .../Adminhtml/Product/Builder/Plugin.php | 2 +- .../Magento/ConfigurableProduct/Helper/Data.php | 2 +- .../Model/ConfigurableAttributeHandler.php | 2 +- .../Model/Product/Type/Configurable.php | 12 ++++++------ .../Model/Product/VariationHandler.php | 4 ++-- .../Model/SuggestedAttributeList.php | 4 ++-- .../Form/Modifier/Data/AssociatedProducts.php | 4 ++-- .../catalog/product/attribute/new/created.phtml | 2 +- .../composite/fieldset/configurable.phtml | 2 +- .../edit/attribute/steps/attributes_values.phtml | 2 +- .../product/edit/attribute/steps/bulk.phtml | 4 ++-- .../edit/attribute/steps/select_attributes.phtml | 2 +- .../product/edit/attribute/steps/summary.phtml | 2 +- .../catalog/product/edit/super/config.phtml | 2 +- .../catalog/product/edit/super/matrix.phtml | 2 +- .../catalog/product/edit/super/wizard-ajax.phtml | 2 +- .../catalog/product/edit/super/wizard.phtml | 2 +- .../affected-attribute-set-selector/form.phtml | 2 +- .../affected-attribute-set-selector/js.phtml | 2 +- .../configurable/attribute-selector/js.phtml | 2 +- .../templates/product/price/final_price.phtml | 2 +- .../Contact/view/frontend/templates/form.phtml | 2 +- .../Magento/Cron/Model/Config/Converter/Xml.php | 2 +- .../Cron/Model/Groups/Config/Converter/Xml.php | 4 ++-- .../Sales/Order/Address/Form/Renderer/Vat.php | 2 +- .../Command/UpgradeHashAlgorithmCommand.php | 2 +- .../Controller/Adminhtml/Index/Validate.php | 2 +- .../Wishlist/Product/Composite/Wishlist.php | 2 +- app/code/Magento/Customer/Helper/Address.php | 2 +- .../Customer/Model/Metadata/CustomerMetadata.php | 2 +- .../CustomerRepository/TransactionWrapper.php | 2 +- .../Model/ResourceModel/Address/Relation.php | 2 +- .../Model/ResourceModel/CustomerRepository.php | 2 +- .../Customer/Model/ResourceModel/Group.php | 2 +- .../Observer/AfterAddressSaveObserver.php | 2 +- .../Observer/BeforeAddressSaveObserver.php | 2 +- .../Unit/Model/ResourceModel/AddressTest.php | 2 +- .../templates/tab/cart_website_filter_form.phtml | 2 +- .../view/adminhtml/templates/tab/view.phtml | 2 +- .../frontend/templates/account/navigation.phtml | 2 +- .../view/frontend/templates/form/edit.phtml | 2 +- .../frontend/templates/form/forgotpassword.phtml | 2 +- .../view/frontend/templates/form/login.phtml | 2 +- .../js/customer-data/invalidation-rules.phtml | 2 +- .../Model/Export/Address.php | 2 +- .../Model/Export/Customer.php | 2 +- .../Model/Import/Address.php | 4 ++-- .../Model/Import/Customer.php | 4 ++-- .../Model/Import/CustomerComposite.php | 4 ++-- .../Test/Unit/Model/Import/AddressTest.php | 2 +- .../Import/CustomerComposite/DataTest.php | 6 +++--- app/code/Magento/Dhl/Model/Carrier.php | 12 ++++++------ .../Dhl/Model/Source/Method/AbstractMethod.php | 2 +- app/code/Magento/Directory/Helper/Data.php | 2 +- .../Adminhtml/Downloadable/Product/Edit/Link.php | 2 +- .../Magento/Downloadable/Controller/Download.php | 2 +- .../Downloadable/Model/Link/CreateHandler.php | 4 ++-- .../Downloadable/Model/Link/ReadHandler.php | 2 +- .../Downloadable/Model/LinkRepository.php | 4 ++-- .../Downloadable/Model/Sample/CreateHandler.php | 2 +- .../Downloadable/Model/Sample/DeleteHandler.php | 2 +- .../Downloadable/Model/Sample/ReadHandler.php | 2 +- .../Downloadable/Model/SampleRepository.php | 4 ++-- .../Observer/IsAllowedGuestCheckoutObserver.php | 2 +- .../SetHasDownloadableProductsObserver.php | 2 +- .../Observer/SetLinkStatusObserver.php | 2 +- .../composite/fieldset/downloadable.phtml | 2 +- .../templates/catalog/product/links.phtml | 2 +- .../order/items/creditmemo/downloadable.phtml | 2 +- .../email/order/items/invoice/downloadable.phtml | 2 +- .../email/order/items/order/downloadable.phtml | 2 +- .../creditmemo/items/renderer/downloadable.phtml | 2 +- .../invoice/items/renderer/downloadable.phtml | 2 +- .../order/items/renderer/downloadable.phtml | 2 +- .../Model/Export/RowCustomizer.php | 2 +- .../Magento/Eav/Model/AttributeDataFactory.php | 2 +- .../Magento/Eav/Model/Entity/AbstractEntity.php | 4 ++-- app/code/Magento/Eav/Model/Form.php | 16 ++++++++-------- .../Eav/Model/ResourceModel/Entity/Attribute.php | 6 +++--- .../ResourceModel/Entity/Attribute/Group.php | 2 +- .../ResourceModel/Entity/Attribute/Option.php | 2 +- .../Model/ResourceModel/Entity/Attribute/Set.php | 6 +++--- .../Eav/Model/Validator/Attribute/Data.php | 2 +- .../Model/ResourceModel/Entity/AttributeTest.php | 8 ++++---- .../Email/Block/Adminhtml/Template/Edit.php | 4 ++-- .../Email/Block/Adminhtml/Template/Preview.php | 2 +- app/code/Magento/Email/Model/Template/Filter.php | 4 ++-- .../view/adminhtml/templates/template/edit.phtml | 2 +- .../adminhtml/templates/template/preview.phtml | 2 +- .../GiftMessage/Model/GuestCartRepository.php | 4 ++-- .../GiftMessage/Model/GuestItemRepository.php | 4 ++-- app/code/Magento/GiftMessage/Model/Save.php | 2 +- .../SalesEventOrderItemToQuoteItemObserver.php | 4 ++-- .../item/renderer/actions/gift_options.phtml | 2 +- .../Observer/SetConversionValueObserver.php | 2 +- .../view/frontend/templates/ga.phtml | 2 +- .../GoogleGtag/view/frontend/templates/ga.phtml | 2 +- ...eteCategoryGoogleExperimentScriptObserver.php | 2 +- .../DeleteCmsGoogleExperimentScriptObserver.php | 2 +- ...leteProductGoogleExperimentScriptObserver.php | 2 +- .../ListAssociatedProducts.php | 2 +- .../Controller/Adminhtml/Edit/Popup.php | 2 +- .../Model/Product/Type/Grouped.php | 2 +- .../Model/Product/Type/Grouped/Price.php | 4 ++-- .../product/composite/fieldset/grouped.phtml | 2 +- .../templates/product/grouped/grouped.phtml | 4 ++-- .../templates/product/grouped/list.phtml | 2 +- .../templates/product/view/type/default.phtml | 2 +- .../Plugin/Model/Resolver/ProductImagePlugin.php | 2 +- .../Block/Adminhtml/Export/Filter.php | 6 +++--- .../Block/Adminhtml/Import/Frame/Result.php | 2 +- .../Controller/Adminhtml/Export/GetFilter.php | 4 ++-- .../Controller/Adminhtml/Import/Start.php | 2 +- .../Controller/Adminhtml/Import/Validate.php | 2 +- .../ImportExport/Model/Export/AbstractEntity.php | 8 ++++---- .../Model/Export/Entity/AbstractEav.php | 6 +++--- app/code/Magento/ImportExport/Model/Import.php | 2 +- .../Model/Import/Entity/AbstractEav.php | 6 +++--- .../ResourceModel/CollectionByPagesIterator.php | 2 +- .../Unit/Model/Export/Entity/AbstractEavTest.php | 2 +- .../Unit/Model/Import/Entity/AbstractTest.php | 2 +- .../Unit/Model/Import/EntityAbstractTest.php | 2 +- .../adminhtml/templates/import/form/before.phtml | 2 +- .../Magento/Integration/Model/Oauth/Token.php | 2 +- .../Setup/Patch/Data/UpgradeConsumerSecret.php | 2 +- .../Setup/Patch/Data/UpgradeOauthToken.php | 2 +- .../view/adminhtml/templates/resourcetree.phtml | 2 +- .../adminhtml/templates/url_filter_applier.phtml | 2 +- .../Helper/File/Storage/Database.php | 2 +- .../Model/File/Storage/Synchronization.php | 2 +- app/code/Magento/Msrp/Model/Msrp.php | 2 +- .../Frontend/Quote/SetCanApplyMsrpObserver.php | 2 +- .../view/base/templates/product/price/msrp.phtml | 2 +- .../templates/render/item/price_msrp_item.phtml | 6 +++--- .../Model/Checkout/Type/Multishipping.php | 4 ++-- .../templates/checkout/overview/item.phtml | 2 +- .../Block/Adminhtml/Queue/Edit/Form.php | 2 +- .../Block/Adminhtml/Template/Preview.php | 2 +- .../Controller/Adminhtml/Queue/Save.php | 4 ++-- .../Model/ResourceModel/Queue/Collection.php | 2 +- .../view/adminhtml/templates/queue/edit.phtml | 2 +- .../view/adminhtml/templates/template/edit.phtml | 2 +- .../view/frontend/templates/subscribe.phtml | 2 +- .../Block/Adminhtml/Carrier/Tablerate/Grid.php | 2 +- .../Adminhtml/System/Config/ExportTablerates.php | 2 +- .../Carrier/Tablerate/LocationDirectory.php | 4 ++-- .../Model/SalesRule/Calculator.php | 2 +- .../frontend/templates/cancel-order-modal.phtml | 2 +- .../view/frontend/templates/order/history.phtml | 2 +- .../frontend/templates/order/info/buttons.phtml | 2 +- .../view/frontend/templates/order/recent.phtml | 4 ++-- .../Magento/Payment/Model/Config/Converter.php | 6 +++--- .../Block/Adminhtml/Settlement/Details/Form.php | 2 +- app/code/Magento/Paypal/Block/Bml/Form.php | 2 +- app/code/Magento/Paypal/Block/Express/Form.php | 2 +- .../Adminhtml/Paypal/Reports/Fetch.php | 2 +- .../Paypal/Controller/Payflow/SilentPost.php | 2 +- app/code/Magento/Paypal/Cron/FetchReports.php | 2 +- .../Magento/Paypal/Helper/Shortcut/Validator.php | 2 +- .../Magento/Paypal/Model/Adminhtml/Express.php | 2 +- .../Magento/Paypal/Model/Express/Checkout.php | 2 +- app/code/Magento/Paypal/Model/Ipn.php | 2 +- app/code/Magento/Paypal/Model/Payflowlink.php | 2 +- .../Observer/SaveOrderAfterSubmitObserver.php | 2 +- .../SetResponseAfterSaveOrderObserver.php | 2 +- .../frontend/templates/paylater/banner.phtml | 4 ++-- .../Model/Checkout/ConfigProviderPlugin.php | 2 +- .../Persistent/Model/Persistent/Config.php | 2 +- .../Magento/Persistent/Model/QuoteManager.php | 2 +- .../ExpiredPersistentQuotesCollection.php | 2 +- .../ApplyBlockPersistentDataObserver.php | 4 ++-- .../MakePersistentQuoteGuestObserver.php | 2 +- .../PreventClearCheckoutSessionObserver.php | 2 +- .../Persistent/Observer/RenewCookieObserver.php | 2 +- .../SetCheckoutSessionPersistentDataObserver.php | 2 +- .../Observer/SetQuotePersistentDataObserver.php | 2 +- .../SetRememberMeCheckedStatusObserver.php | 2 +- .../SetRememberMeStatusForAjaxLoginObserver.php | 2 +- .../SynchronizePersistentInfoObserver.php | 4 ++-- .../SynchronizePersistentOnLoginObserver.php | 4 ++-- .../ProductAlert/Controller/Add/Price.php | 2 +- .../ProductAlert/Controller/Add/Stock.php | 2 +- .../Controller/Unsubscribe/Price.php | 2 +- .../view/frontend/templates/email/email.phtml | 2 +- .../view/frontend/templates/email/price.phtml | 4 ++-- .../view/frontend/templates/email/stock.phtml | 2 +- .../view/frontend/templates/product/view.phtml | 2 +- .../adminhtml/templates/helper/gallery.phtml | 2 +- .../Quote/Model/Cart/Totals/ItemConverter.php | 2 +- .../GuestCart/GuestBillingAddressManagement.php | 4 ++-- .../Model/GuestCart/GuestCartItemRepository.php | 8 ++++---- .../Model/GuestCart/GuestCartManagement.php | 6 +++--- .../Model/GuestCart/GuestCartRepository.php | 2 +- .../Model/GuestCart/GuestCartTotalRepository.php | 2 +- .../Model/GuestCart/GuestCouponManagement.php | 6 +++--- .../GuestCart/GuestPaymentMethodManagement.php | 6 +++--- .../GuestCart/GuestShippingAddressManagement.php | 4 ++-- .../GuestCart/GuestShippingMethodManagement.php | 10 +++++----- app/code/Magento/Quote/Model/Quote.php | 6 +++--- app/code/Magento/Quote/Model/Quote/Address.php | 2 +- app/code/Magento/Quote/Model/Quote/Item.php | 2 +- .../Quote/Model/Quote/Item/RelatedProducts.php | 2 +- .../Observer/Backend/CustomerQuoteObserver.php | 2 +- .../Model/Resolver/EstimateShippingMethods.php | 2 +- .../Magento/Reports/Block/Adminhtml/Grid.php | 2 +- .../Block/Adminhtml/Product/Lowstock/Grid.php | 2 +- .../Block/Adminhtml/Shopcart/Abandoned/Grid.php | 2 +- .../ResourceModel/Review/Customer/Collection.php | 2 +- .../Model/ResourceModel/Wishlist/Collection.php | 4 ++-- .../Data/InitializeReportEntityTypesAndPages.php | 2 +- .../templates/product/widget/viewed.phtml | 2 +- .../templates/product/widget/viewed/item.phtml | 2 +- app/code/Magento/RequireJs/Model/FileManager.php | 4 ++-- app/code/Magento/Review/Block/Adminhtml/Edit.php | 2 +- app/code/Magento/Review/Block/Adminhtml/Grid.php | 6 +++--- app/code/Magento/Review/Model/Rss.php | 2 +- .../view/adminhtml/templates/rss/grid/link.phtml | 2 +- .../Review/view/frontend/templates/form.phtml | 2 +- .../Rss/Controller/Adminhtml/Feed/Index.php | 2 +- app/code/Magento/Rss/Controller/Feed/Index.php | 2 +- .../Model/Condition/Product/AbstractProduct.php | 2 +- .../Magento/Rule/Model/Condition/Sql/Builder.php | 6 +++--- .../Block/Adminhtml/Items/AbstractItems.php | 2 +- .../Block/Adminhtml/Order/Create/Search/Grid.php | 2 +- .../Adminhtml/Report/Filter/Form/Coupon.php | 2 +- .../Controller/Adminhtml/Order/AddressSave.php | 2 +- .../Sales/Controller/Adminhtml/Order/Create.php | 2 +- .../Controller/Adminhtml/Order/Status/Save.php | 2 +- .../Controller/Download/DownloadCustomOption.php | 4 ++-- .../Magento/Sales/Cron/CleanExpiredQuotes.php | 2 +- app/code/Magento/Sales/Helper/Guest.php | 2 +- .../Magento/Sales/Model/AdminOrder/Create.php | 6 +++--- .../Sales/Model/CronJob/CleanExpiredOrders.php | 2 +- .../Magento/Sales/Model/EmailSenderHandler.php | 2 +- .../Model/Order/Creditmemo/Total/Discount.php | 2 +- .../Model/Order/CreditmemoDocumentFactory.php | 2 +- .../Sales/Model/Order/Invoice/Total/Discount.php | 2 +- .../Sales/Model/Order/Invoice/Total/Tax.php | 2 +- .../Order/Payment/Operations/SaleOperation.php | 2 +- .../Sales/Model/Order/Pdf/Total/DefaultTotal.php | 2 +- .../Magento/Sales/Model/Order/StateResolver.php | 8 ++++---- .../Collection/ExpiredQuotesCollection.php | 2 +- .../Model/ResourceModel/Order/Collection.php | 2 +- .../ResourceModel/Order/Invoice/Relation.php | 2 +- .../ResourceModel/Order/Rss/OrderStatus.php | 2 +- app/code/Magento/Sales/Model/Rss/NewOrder.php | 4 ++-- app/code/Magento/Sales/Model/Rss/OrderStatus.php | 4 ++-- .../Frontend/AddVatRequestParamsOrderComment.php | 4 ++-- .../Sales/Observer/StoreStatusChangeObserver.php | 2 +- .../adminhtml/templates/items/column/qty.phtml | 2 +- .../templates/order/create/sidebar/items.phtml | 2 +- .../templates/order/create/store/select.phtml | 2 +- .../create/items/renderer/default.phtml | 2 +- .../creditmemo/view/items/renderer/default.phtml | 2 +- .../invoice/create/items/renderer/default.phtml | 2 +- .../invoice/view/items/renderer/default.phtml | 2 +- .../adminhtml/templates/order/totals/tax.phtml | 2 +- .../templates/order/view/giftmessage.phtml | 2 +- .../templates/order/view/tab/info.phtml | 2 +- .../templates/rss/order/grid/link.phtml | 2 +- .../view/frontend/templates/email/items.phtml | 2 +- .../templates/email/items/order/default.phtml | 4 ++-- .../frontend/templates/order/creditmemo.phtml | 2 +- .../view/frontend/templates/order/info.phtml | 2 +- .../templates/order/info/buttons/rss.phtml | 2 +- .../view/frontend/templates/order/invoice.phtml | 2 +- .../order/invoice/items/renderer/default.phtml | 2 +- .../frontend/templates/order/order_status.phtml | 2 +- .../view/frontend/templates/order/recent.phtml | 2 +- .../Observer/RefundOrderInventoryObserver.php | 2 +- .../Magento/SalesRule/Block/Rss/Discounts.php | 2 +- .../Controller/Adminhtml/Promo/Quote/Save.php | 2 +- .../SalesRule/Model/Coupon/Massgenerator.php | 2 +- .../Magento/SalesRule/Model/Rss/Discounts.php | 2 +- .../SalesRule/Model/Rule/Condition/Product.php | 2 +- .../Magento/SalesRule/Model/RulesApplier.php | 2 +- app/code/Magento/SalesRule/Model/Validator.php | 2 +- .../Observer/CheckSalesRulesAvailability.php | 4 ++-- .../SalesRule/Plugin/CartTotalRepository.php | 2 +- .../Search/Block/Adminhtml/Term/Edit/Form.php | 2 +- app/code/Magento/Search/Block/Term.php | 2 +- .../Search/Controller/Adminhtml/Term/Save.php | 2 +- .../view/frontend/templates/form.mini.phtml | 10 +++++----- .../Model/ResourceModel/UserExpiration.php | 4 ++-- .../Security/Observer/AfterAdminUserSave.php | 2 +- app/code/Magento/SendFriend/Block/Send.php | 4 ++-- .../Magento/SendFriend/Controller/Product.php | 4 ++-- .../view/frontend/templates/send.phtml | 2 +- .../Magento/Shipping/Block/Tracking/Popup.php | 2 +- .../Model/Carrier/AbstractCarrierOnline.php | 8 ++++---- app/code/Magento/Shipping/Model/Info.php | 4 ++-- app/code/Magento/Shipping/Model/Rate/Result.php | 2 +- app/code/Magento/Shipping/Model/Shipping.php | 4 ++-- .../Magento/Shipping/Model/Shipping/Labels.php | 2 +- .../Shipping/view/frontend/templates/items.phtml | 2 +- .../frontend/templates/tracking/details.phtml | 2 +- .../view/frontend/templates/tracking/link.phtml | 2 +- .../frontend/templates/tracking/progress.phtml | 2 +- .../Block/Adminhtml/Grid/Renderer/Link.php | 2 +- .../Controller/Adminhtml/Sitemap/Generate.php | 2 +- app/code/Magento/Sitemap/Model/Observer.php | 4 ++-- .../Model/ResourceModel/Catalog/Category.php | 2 +- .../Model/ResourceModel/Catalog/Product.php | 4 ++-- app/code/Magento/Sitemap/Model/Sitemap.php | 4 ++-- app/code/Magento/Store/Block/Switcher.php | 4 ++-- app/code/Magento/Store/Model/Group.php | 2 +- app/code/Magento/Store/Model/Store.php | 2 +- app/code/Magento/Store/Model/StoresConfig.php | 2 +- app/code/Magento/Swatches/Helper/Media.php | 2 +- .../catalog/product/attribute/visual.phtml | 4 ++-- .../edit/attribute/steps/attributes_values.phtml | 2 +- .../templates/product/layered/renderer.phtml | 2 +- .../templates/product/view/renderer.phtml | 2 +- app/code/Magento/Tax/Block/Sales/Order/Tax.php | 2 +- app/code/Magento/Tax/Helper/Data.php | 2 +- .../Tax/Model/AggregateSalesReportTaxData.php | 2 +- app/code/Magento/Tax/Model/Calculation/Rate.php | 2 +- .../Tax/Model/ResourceModel/Report/Tax.php | 4 ++-- .../Sales/Order/ConvertQuoteTaxToOrderTax.php | 4 ++-- .../Model/System/Config/Source/Tax/Region.php | 2 +- .../Tax/Model/TaxClass/Source/Product.php | 2 +- .../Tax/Observer/AfterAddressSaveObserver.php | 2 +- .../Tax/Plugin/Checkout/CustomerData/Cart.php | 2 +- .../Unit/Model/Sales/Total/Quote/TaxTest.php | 2 +- .../Tax/view/adminhtml/templates/rule/edit.phtml | 2 +- .../adminhtml/templates/rule/rate/form.phtml | 2 +- .../view/base/templates/pricing/adjustment.phtml | 2 +- .../checkout/cart/item/price/sidebar.phtml | 2 +- .../templates/checkout/shipping/price.phtml | 2 +- .../view/frontend/templates/item/price/row.phtml | 2 +- .../frontend/templates/item/price/unit.phtml | 2 +- .../Controller/Adminhtml/Rate/ImportPost.php | 2 +- .../Model/Rate/CsvImportHandler.php | 2 +- .../view/adminhtml/templates/importExport.phtml | 2 +- .../Block/Adminhtml/System/Design/Theme/Edit.php | 4 ++-- .../System/Design/Theme/Edit/Tab/Css.php | 6 +++--- .../System/Design/Theme/Edit/Tab/Js.php | 2 +- app/code/Magento/Theme/Block/Html/Topmenu.php | 2 +- .../Adminhtml/System/Design/Theme/Delete.php | 2 +- .../System/Design/Theme/DownloadCss.php | 4 ++-- .../System/Design/Theme/DownloadCustomCss.php | 4 ++-- .../Adminhtml/System/Design/Theme/Edit.php | 6 +++--- .../Adminhtml/System/Design/Theme/Save.php | 8 ++++---- .../Adminhtml/System/Design/Theme/UploadCss.php | 2 +- .../Adminhtml/System/Design/Theme/UploadJs.php | 8 ++++---- .../System/Design/Wysiwyg/Files/OnInsert.php | 2 +- .../System/Design/Wysiwyg/Files/PreviewImage.php | 2 +- app/code/Magento/Theme/Helper/Theme.php | 2 +- .../Magento/Theme/Model/Config/Customization.php | 4 ++-- app/code/Magento/Theme/Model/CopyService.php | 14 +++++++------- .../Theme/Model/Design/Config/Storage.php | 6 +++--- .../Theme/Model/Layout/Config/Converter.php | 4 ++-- .../Model/ResourceModel/Theme/Collection.php | 2 +- .../Theme/Model/Theme/Domain/Physical.php | 2 +- .../Magento/Theme/Model/Theme/Domain/Virtual.php | 2 +- .../Magento/Theme/Model/Theme/Registration.php | 4 ++-- .../Magento/Theme/Model/Theme/ThemeProvider.php | 2 +- .../Magento/Theme/Model/Uploader/Service.php | 4 ++-- app/code/Magento/Theme/Model/Wysiwyg/Storage.php | 2 +- .../Observer/ApplyThemeCustomizationObserver.php | 2 +- .../Observer/CheckThemeIsAssignedObserver.php | 2 +- .../CleanThemeRelatedContentObserver.php | 2 +- .../System/Design/Theme/Tab/CssTest.php | 2 +- .../Magento/Theme/Test/Unit/Helper/ThemeTest.php | 4 ++-- .../Magento/Theme/Test/Unit/Model/DesignTest.php | 2 +- .../Theme/Test/Unit/Model/Theme/FileTest.php | 2 +- .../Test/Unit/Model/Uploader/ServiceTest.php | 2 +- .../templates/browser/content/files.phtml | 2 +- .../templates/browser/content/uploader.phtml | 2 +- .../templates/design/config/edit/scope.phtml | 2 +- .../Theme/view/frontend/templates/template.phtml | 2 +- .../Magento/Translation/Model/Inline/Parser.php | 4 ++-- .../Magento/Ui/Component/MassAction/Filter.php | 2 +- .../ResourceModel/BookmarkRepositoryTest.php | 2 +- .../base/templates/control/button/split.phtml | 2 +- .../Magento/Ui/view/base/templates/logger.phtml | 2 +- .../Ui/view/base/templates/stepswizard.phtml | 2 +- .../UrlRewrite/Block/Catalog/Edit/Form.php | 4 ++-- .../UrlRewrite/Block/Cms/Page/Edit/Form.php | 4 ++-- app/code/Magento/UrlRewrite/Block/Edit/Form.php | 2 +- .../Controller/Adminhtml/Url/Rewrite/Save.php | 2 +- .../Model/ResourceModel/UrlRewrite.php | 2 +- .../Magento/User/Block/User/Edit/Tab/Main.php | 2 +- .../Magento/User/Block/User/Edit/Tab/Roles.php | 2 +- .../Magento/User/Controller/Adminhtml/Auth.php | 2 +- .../Controller/Adminhtml/Auth/Forgotpassword.php | 2 +- .../Adminhtml/Auth/ResetPasswordPost.php | 2 +- .../User/Controller/Adminhtml/User/Save.php | 4 ++-- .../User/Controller/Adminhtml/User/Validate.php | 4 ++-- app/code/Magento/User/Model/User.php | 4 ++-- .../Magento/User/Model/UserValidationRules.php | 2 +- .../Backend/TrackAdminNewPasswordObserver.php | 2 +- .../Controller/Adminhtml/System/Variable.php | 2 +- app/code/Magento/Variable/Model/Variable.php | 2 +- app/code/Magento/Vault/Model/Method/Vault.php | 4 ++-- .../view/frontend/templates/token_list.phtml | 2 +- app/code/Magento/Webapi/Model/Rest/Config.php | 2 +- .../Magento/Weee/Block/Sales/Order/Totals.php | 2 +- app/code/Magento/Weee/Model/Sales/Pdf/Weee.php | 4 ++-- .../Magento/Weee/Observer/AfterAddressSave.php | 2 +- .../AssignBackendModelToAttributeObserver.php | 2 +- .../adminhtml/templates/items/price/row.phtml | 2 +- .../adminhtml/templates/items/price/unit.phtml | 2 +- .../templates/order/create/items/price/row.phtml | 2 +- .../checkout/cart/item/price/sidebar.phtml | 2 +- .../onepage/review/item/price/row_incl_tax.phtml | 2 +- .../review/item/price/unit_incl_tax.phtml | 2 +- .../templates/email/items/price/row.phtml | 2 +- .../Widget/Block/Adminhtml/Widget/Chooser.php | 2 +- .../Widget/Instance/Edit/Chooser/Container.php | 2 +- .../Instance/Edit/Chooser/DesignAbstraction.php | 2 +- .../Adminhtml/Widget/Instance/Edit/Tab/Main.php | 4 ++-- .../Widget/Instance/Edit/Tab/Settings.php | 2 +- .../Controller/Adminhtml/Widget/Instance.php | 2 +- .../Adminhtml/Widget/Instance/Blocks.php | 2 +- .../Adminhtml/Widget/Instance/Products.php | 2 +- .../Adminhtml/Widget/Instance/Template.php | 2 +- .../Magento/Widget/Model/Config/Converter.php | 10 +++++----- .../ResourceModel/Layout/Update/Collection.php | 2 +- .../ResourceModel/Layout/Link/CollectionTest.php | 2 +- .../Magento/Wishlist/Controller/Index/Cart.php | 2 +- .../Wishlist/Controller/Index/Configure.php | 2 +- .../Magento/Wishlist/Controller/Shared/Cart.php | 2 +- app/code/Magento/Wishlist/Model/ItemCarrier.php | 4 ++-- .../Model/ResourceModel/Item/Collection.php | 4 ++-- app/code/Magento/Wishlist/Model/Rss/Wishlist.php | 4 ++-- app/code/Magento/Wishlist/Model/Wishlist.php | 4 ++-- .../ConfiguredPrice/ConfigurableProduct.php | 2 +- .../Pricing/Render/ConfiguredPriceBox.php | 4 ++-- .../Test/Unit/Observer/AddToCartTest.php | 2 +- .../Test/Unit/Observer/CartUpdateBeforeTest.php | 2 +- 760 files changed, 1036 insertions(+), 1036 deletions(-) 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="escapeUrl($block->getUrl('adminhtml/notification/ajaxMarkAsRead')) ?>"> getLatestUnreadNotifications() as $notification): ?> - +
  • 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 = '