From bc0e0e67cb0db50f33c41452fbeea8491748979c Mon Sep 17 00:00:00 2001 From: Dariusz Ruminski Date: Sat, 11 Nov 2017 14:31:16 +0100 Subject: [PATCH] CS: reapply fixers --- .../Magento/AdminNotification/Model/Inbox.php | 1 - .../Controller/Adminhtml/Export/GetFilter.php | 4 +- .../Model/Export/AdvancedPricing.php | 10 +-- .../Model/Import/AdvancedPricing.php | 4 +- .../Import/AdvancedPricing/Validator.php | 2 +- .../AdvancedPricing/Validator/Website.php | 4 +- .../Validator/TierPriceTypeTest.php | 2 +- app/code/Magento/Analytics/Cron/SignUp.php | 2 +- app/code/Magento/Analytics/Cron/Update.php | 2 +- .../Model/Connector/Http/Client/Curl.php | 4 +- .../Connector/NotifyDataChangedCommand.php | 4 +- .../Connector/ResponseHandler/ReSignUp.php | 2 +- .../Model/Connector/SignUpCommand.php | 2 +- .../State/SubscriptionUpdateException.php | 1 - .../Analytics/Model/IntegrationManager.php | 4 +- .../Analytics/ReportXml/ConnectionFactory.php | 2 +- .../DB/Assembler/FilterAssembler.php | 2 +- .../ReportXml/DB/Assembler/FromAssembler.php | 5 +- .../ReportXml/DB/Assembler/JoinAssembler.php | 4 +- .../Analytics/ReportXml/ReportProvider.php | 2 - .../Controller/Adminhtml/Reports/ShowTest.php | 1 - .../Baseurl/SubscriptionUpdateHandlerTest.php | 2 +- .../NotifyDataChangedCommandTest.php | 4 +- .../Unit/Model/Connector/OTPRequestTest.php | 2 +- .../Model/Connector/SignUpCommandTest.php | 2 +- .../Model/Connector/UpdateCommandTest.php | 4 +- .../Test/Unit/Model/ConnectorTest.php | 2 +- .../Unit/Model/IntegrationManagerTest.php | 8 +-- .../Model/Plugin/BaseUrlConfigPluginTest.php | 1 - .../Unit/ReportXml/ConnectionFactoryTest.php | 2 +- .../Unit/ReportXml/DB/ColumnsResolverTest.php | 8 +-- .../Authorization/Setup/InstallData.php | 4 +- .../Unit/Model/CompositeUserContextTest.php | 2 +- .../Authorizenet/Directpost/Payment/Place.php | 8 +-- .../Directpost/Payment/Redirect.php | 1 - .../Authorizenet/Helper/Backend/Data.php | 4 +- app/code/Magento/Authorizenet/Helper/Data.php | 5 +- .../Authorizenet/Model/Authorizenet.php | 1 - .../Magento/Authorizenet/Model/Directpost.php | 1 + .../Authorizenet/Model/TransactionService.php | 2 - .../Unit/Model/Directpost/ResponseTest.php | 2 +- .../Test/Unit/Model/DirectpostTest.php | 8 +-- .../Unit/Model/TransactionServiceTest.php | 3 +- .../order/view/info/fraud_details.phtml | 12 ++-- .../App/Action/Plugin/MassactionKey.php | 2 +- .../Store/Switcher/Form/Renderer/Fieldset.php | 2 +- .../Backend/Block/Widget/Container.php | 2 - .../Backend/Block/Widget/Form/Container.php | 2 +- .../Widget/Form/Renderer/Fieldset/Element.php | 2 +- .../Grid/Column/Renderer/AbstractRenderer.php | 2 +- .../Grid/Column/Renderer/Massaction.php | 4 +- .../Grid/Massaction/AbstractMassaction.php | 4 +- .../Block/Widget/Grid/Massaction/Extended.php | 4 +- .../AbstractCacheTypeManageCommand.php | 2 +- .../Adminhtml/Cache/CleanImages.php | 2 +- .../Controller/Adminhtml/Cache/CleanMedia.php | 2 +- .../Adminhtml/Cache/MassDisable.php | 6 +- .../Controller/Adminhtml/Cache/MassEnable.php | 6 +- .../Adminhtml/Cache/MassRefresh.php | 2 +- .../Adminhtml/System/Account/Save.php | 5 +- app/code/Magento/Backend/Model/Auth.php | 2 +- .../Magento/Backend/Model/Session/Quote.php | 2 +- app/code/Magento/Backend/Model/Url.php | 2 +- .../Backend/Model/View/Layout/Builder.php | 4 -- .../Model/View/Layout/Reader/Block.php | 2 +- .../Model/View/Layout/StructureManager.php | 2 +- .../Backend/Model/View/Page/Builder.php | 3 - .../Backend/Model/View/Result/Page.php | 1 - .../Backend/Model/View/Result/Redirect.php | 1 - .../Backend/Setup/ConfigOptionsList.php | 4 +- .../App/Action/Plugin/MassactionKeyTest.php | 2 +- .../Test/Unit/Block/MenuItemCheckerTest.php | 4 +- .../Backend/Test/Unit/Block/MenuTest.php | 12 ++-- .../Widget/Grid/Massaction/ExtendedTest.php | 4 +- .../Unit/Block/Widget/Grid/MassactionTest.php | 2 +- .../Adminhtml/Cache/MassDisableTest.php | 16 ++--- .../Adminhtml/Cache/MassEnableTest.php | 16 ++--- .../Adminhtml/Dashboard/AbstractTestCase.php | 3 +- .../Adminhtml/System/Store/IndexTest.php | 4 +- .../Test/Unit/Model/AdminPathConfigTest.php | 1 - .../Test/Unit/Model/Locale/ManagerTest.php | 6 +- .../Test/Unit/Model/MenuBuilderTest.php | 2 +- .../Backend/Test/Unit/Model/MenuTest.php | 1 - .../View/Layout/StructureManagerTest.php | 4 +- .../adminhtml/templates/dashboard/graph.phtml | 4 +- .../adminhtml/templates/dashboard/grid.phtml | 2 +- .../adminhtml/templates/store/switcher.phtml | 72 +++++++++---------- .../widget/form/renderer/fieldset.phtml | 2 +- .../adminhtml/templates/widget/grid.phtml | 6 +- .../templates/widget/grid/column_set.phtml | 8 +-- .../templates/widget/grid/extended.phtml | 8 +-- .../Adminhtml/Index/DownloadTest.php | 2 +- .../Test/Unit/Cron/SystemBackupTest.php | 2 +- .../Backup/Test/Unit/Model/BackupTest.php | 2 +- .../Braintree/Block/Customer/CardRenderer.php | 1 - .../Controller/Paypal/AbstractAction.php | 4 +- .../Braintree/Controller/Paypal/Review.php | 4 +- .../Controller/Paypal/SaveShippingMethod.php | 6 +- .../Command/CaptureStrategyCommand.php | 2 +- .../Gateway/Http/TransferFactory.php | 1 - .../Gateway/Request/AddressDataBuilder.php | 2 +- .../Gateway/Request/CaptureDataBuilder.php | 2 +- .../Gateway/Request/CustomerDataBuilder.php | 2 +- .../Gateway/Request/DescriptorDataBuilder.php | 2 +- .../Gateway/Request/PaymentDataBuilder.php | 2 +- .../Gateway/Request/StoreConfigBuilder.php | 2 +- .../Request/ThreeDSecureDataBuilder.php | 2 +- .../Gateway/Response/PayPalDetailsHandler.php | 2 +- .../Response/PaymentDetailsHandler.php | 4 +- .../Gateway/Response/RiskDataHandler.php | 2 +- .../Response/ThreeDSecureDetailsHandler.php | 2 +- .../Validator/GeneralResponseValidator.php | 2 +- .../Gateway/Validator/ResponseValidator.php | 2 - app/code/Magento/Braintree/Helper/Country.php | 2 +- .../Model/Adapter/BraintreeSearchAdapter.php | 1 - .../Braintree/Model/LocaleResolver.php | 2 +- .../Model/Paypal/Helper/OrderPlace.php | 8 +-- .../Model/Paypal/Helper/QuoteUpdater.php | 11 ++- .../Model/Ui/PayPal/ConfigProvider.php | 3 +- .../Model/Ui/TokenUiComponentProvider.php | 4 +- .../Braintree/Observer/AddPaypalShortcuts.php | 2 +- .../Unit/Controller/Payment/GetNonceTest.php | 2 +- .../Unit/Controller/Paypal/ReviewTest.php | 18 ++--- .../Paypal/SaveShippingMethodTest.php | 18 ++--- .../Command/CaptureStrategyCommandTest.php | 1 - .../Http/Client/TransactionSaleTest.php | 2 +- .../Request/AddressDataBuilderTest.php | 2 +- .../Request/CaptureDataBuilderTest.php | 2 +- .../Request/CustomerDataBuilderTest.php | 2 +- .../Request/DescriptorDataBuilderTest.php | 2 +- .../Request/KountPaymentDataBuilderTest.php | 8 +-- .../Request/PayPal/DeviceDataBuilderTest.php | 4 +- .../Request/PayPal/VaultDataBuilderTest.php | 2 +- .../Request/PaymentDataBuilderTest.php | 2 +- .../Gateway/Request/RefundDataBuilderTest.php | 2 +- .../Request/ThreeDSecureDataBuilderTest.php | 2 +- .../Request/VaultCaptureDataBuilderTest.php | 2 +- .../Response/CardDetailsHandlerTest.php | 5 +- .../PayPal/VaultDetailsHandlerTest.php | 9 ++- .../Response/PayPalDetailsHandlerTest.php | 2 +- .../Response/PaymentDetailsHandlerTest.php | 2 +- .../Gateway/Response/RiskDataHandlerTest.php | 2 +- .../ThreeDSecureDetailsHandlerTest.php | 3 +- .../Response/TransactionIdHandlerTest.php | 2 +- .../Response/VaultDetailsHandlerTest.php | 3 +- .../Unit/Gateway/Response/VoidHandlerTest.php | 2 +- .../GeneralResponseValidatorTest.php | 5 +- .../PaymentNonceResponseValidatorTest.php | 3 +- .../Validator/ResponseValidatorTest.php | 8 +-- .../Test/Unit/Helper/CountryTest.php | 2 +- .../Model/Paypal/Helper/QuoteUpdaterTest.php | 10 +-- .../Helper/ShippingMethodUpdaterTest.php | 6 +- .../Unit/Model/Report/TransactionMapTest.php | 2 - .../Model/Ui/PayPal/ConfigProviderTest.php | 3 +- .../PayPal/TokenUiComponentProviderTest.php | 10 +-- .../Unit/Observer/AddPaypalShortcutsTest.php | 2 +- .../Unit/Observer/DataAssignObserverTest.php | 2 +- .../view/adminhtml/templates/form/cc.phtml | 6 +- .../templates/form/paypal/vault.phtml | 1 + .../view/adminhtml/templates/form/vault.phtml | 1 + .../Product/Edit/Tab/Attributes/Extend.php | 3 +- .../Initialization/Helper/Plugin/Bundle.php | 4 +- .../Magento/Bundle/Model/BundleOption.php | 2 +- .../Bundle/Model/CartItemProcessor.php | 4 +- .../Magento/Bundle/Model/LinkManagement.php | 2 +- .../Magento/Bundle/Model/Plugin/QuoteItem.php | 2 +- .../Magento/Bundle/Model/Product/Price.php | 4 +- .../Bundle/Model/Product/SaveHandler.php | 4 +- .../Magento/Bundle/Model/Product/Type.php | 6 +- .../Bundle/Model/ProductOptionProcessor.php | 1 - .../Indexer/StockStatusSelectBuilder.php | 4 +- .../Bundle/Model/ResourceModel/Option.php | 2 +- .../Model/ResourceModel/Option/Collection.php | 2 +- .../Bundle/Model/ResourceModel/Selection.php | 6 +- .../ResourceModel/Selection/Collection.php | 8 +-- .../Sales/Order/Pdf/Items/Creditmemo.php | 1 - .../Model/Sales/Order/Pdf/Items/Invoice.php | 1 - .../Model/Sales/Order/Pdf/Items/Shipment.php | 1 - .../Bundle/Pricing/Adjustment/Calculator.php | 2 +- .../DefaultSelectionPriceListProvider.php | 2 +- .../Pricing/Price/BundleRegularPrice.php | 4 +- .../Pricing/Price/BundleSelectionPrice.php | 2 +- .../Pricing/Price/DiscountCalculator.php | 2 +- .../Bundle/Pricing/Price/FinalPrice.php | 6 +- .../Bundle/Pricing/Price/TierPrice.php | 1 - app/code/Magento/Bundle/Setup/Recurring.php | 4 +- app/code/Magento/Bundle/Setup/UpgradeData.php | 4 +- .../Product/View/Type/Bundle/OptionTest.php | 6 +- .../Bundle/Test/Unit/Helper/DataTest.php | 2 - .../Test/Unit/Model/LinkManagementTest.php | 3 +- .../Test/Unit/Model/Option/ValidatorTest.php | 2 +- .../Test/Unit/Model/OptionManagementTest.php | 2 +- .../Test/Unit/Model/OptionRepositoryTest.php | 1 - .../Unit/Model/Plugin/PriceBackendTest.php | 2 +- .../Test/Unit/Model/Plugin/QuoteItemTest.php | 4 +- .../Test/Unit/Model/Product/LinksListTest.php | 2 +- .../Selection/CollectionTest.php | 10 +-- .../Pricing/Adjustment/CalculatorTest.php | 9 +-- .../Pricing/Price/BundleRegularPriceTest.php | 4 +- .../Price/BundleSelectionFactoryTest.php | 2 +- .../Pricing/Price/DiscountCalculatorTest.php | 6 +- .../Unit/Pricing/Price/FinalPriceTest.php | 4 +- .../Unit/Pricing/Price/SpecialPriceTest.php | 2 +- .../Test/Unit/Pricing/Price/TierPriceTest.php | 2 +- .../Product/BundleDataProviderTest.php | 6 +- .../Form/Modifier/AbstractModifierTest.php | 2 +- .../Product/Form/Modifier/CompositeTest.php | 2 +- .../Product/BundleDataProvider.php | 2 +- .../Product/Form/Modifier/BundlePanel.php | 6 +- .../Product/Form/Modifier/BundlePrice.php | 4 +- .../Product/Form/Modifier/BundleWeight.php | 4 +- .../Product/Form/Modifier/Composite.php | 6 +- .../Product/Form/Modifier/StockData.php | 2 +- .../Product/Listing/Collector/BundlePrice.php | 2 +- .../product/edit/tab/attributes/extend.phtml | 28 +++++--- .../fieldset/options/type/checkbox.phtml | 8 ++- .../fieldset/options/type/multi.phtml | 16 +++-- .../fieldset/options/type/radio.phtml | 20 ++++-- .../fieldset/options/type/select.phtml | 22 ++++-- .../sales/order/view/items/renderer.phtml | 12 ++-- .../view/type/bundle/option/checkbox.phtml | 15 ++-- .../view/type/bundle/option/multi.phtml | 16 +++-- .../view/type/bundle/option/radio.phtml | 24 +++++-- .../view/type/bundle/option/select.phtml | 22 ++++-- .../Model/Export/RowCustomizer.php | 5 +- .../Model/Import/Product/Type/Bundle.php | 6 +- .../InvalidateVarnishObserverTest.php | 2 - app/code/Magento/Captcha/Helper/Data.php | 1 - .../Model/Customer/Plugin/AjaxLogin.php | 2 +- .../Observer/CheckContactUsFormObserver.php | 4 +- .../Observer/CheckUserEditObserver.php | 2 +- .../Observer/CheckUserLoginObserver.php | 4 +- .../Adminhtml/Category/Edit/DeleteButton.php | 2 +- .../Adminhtml/Category/Edit/SaveButton.php | 2 +- .../Adminhtml/Category/Helper/Pricestep.php | 4 +- .../Catalog/Block/Adminhtml/Category/Tree.php | 6 +- .../Product/Attribute/Button/Generic.php | 1 - .../Product/Attribute/Edit/Tab/Front.php | 2 +- .../Adminhtml/Product/Edit/Tab/Alerts.php | 3 +- .../Product/Edit/Tab/Options/Option.php | 2 +- .../Block/Adminhtml/Product/Edit/Tabs.php | 1 - .../Adminhtml/Product/Helper/Form/Gallery.php | 4 +- .../Product/Helper/Form/Gallery/Content.php | 2 +- .../Adminhtml/Product/Helper/Form/Weight.php | 2 +- .../Block/Category/Plugin/PriceBoxTags.php | 3 +- .../Block/Product/ProductList/Related.php | 1 - .../Block/Product/ProductList/Upsell.php | 1 - .../Catalog/Block/Product/View/Gallery.php | 2 +- .../Block/Product/Widget/NewWidget.php | 2 +- .../Catalog/Block/Ui/ProductViewCounter.php | 6 +- .../Command/ProductAttributesCleanUp.php | 2 +- .../Adminhtml/Category/Validate.php | 2 +- .../Adminhtml/Product/AbstractProductGrid.php | 2 - .../Adminhtml/Product/Action/Attribute.php | 3 +- .../Product/Action/Attribute/Edit.php | 2 +- .../Product/AddAttributeToTemplate.php | 4 +- .../Adminhtml/Product/AlertsStockGrid.php | 1 - .../Adminhtml/Product/Attribute.php | 1 - .../Controller/Adminhtml/Product/Builder.php | 2 +- .../Product/Initialization/Helper.php | 2 +- .../Initialization/Helper/AttributeFilter.php | 2 +- .../Adminhtml/Product/MassDelete.php | 6 +- .../Adminhtml/Product/MassStatus.php | 2 +- .../Adminhtml/Product/NewAction.php | 1 - .../Controller/Adminhtml/Product/Save.php | 2 +- .../Adminhtml/Product/ShowUpdateResult.php | 3 +- .../Product/SuggestAttributeSets.php | 2 +- .../Cron/DeleteOutdatedPriceValues.php | 4 +- .../ProductsRenderInfoSection.php | 2 +- .../Catalog/Helper/Product/Composite.php | 7 +- .../Catalog/Helper/Product/Configuration.php | 4 +- .../Catalog/Helper/Product/Flat/Indexer.php | 2 - .../Attribute/Backend/Customlayoutupdate.php | 2 +- .../Model/Attribute/ScopeOverriddenValue.php | 8 +-- .../Catalog/Model/Attribute/Source/Scopes.php | 2 +- .../Model/Category/Link/SaveHandler.php | 2 +- .../Catalog/Model/CategoryLinkRepository.php | 2 +- .../Magento/Catalog/Model/CategoryList.php | 2 +- .../Catalog/Model/CategoryManagement.php | 4 +- .../Catalog/Model/CategoryRepository.php | 2 +- app/code/Magento/Catalog/Model/Config.php | 1 + .../Model/CustomOptions/CustomOption.php | 10 +-- .../CustomOptions/CustomOptionProcessor.php | 2 +- .../Indexer/Category/Flat/AbstractAction.php | 2 +- .../Flat/Plugin/IndexerConfigData.php | 4 +- .../Category/Flat/Plugin/StoreGroup.php | 6 +- .../Category/Product/AbstractAction.php | 2 +- .../Indexer/Category/Product/Action/Full.php | 2 +- .../Category/Product/Plugin/StoreGroup.php | 4 +- .../Product/Eav/Plugin/AttributeSet.php | 3 +- .../Indexer/Product/Flat/AbstractAction.php | 1 - .../Indexer/Product/Flat/Action/Eraser.php | 2 - .../Product/Flat/Action/Rows/TableData.php | 2 - .../Product/Flat/Plugin/IndexerConfigData.php | 2 +- .../Model/Indexer/Product/Flat/TableData.php | 2 - .../Indexer/Product/Price/AbstractAction.php | 2 +- .../Product/Price/Plugin/CustomerGroup.php | 4 +- app/code/Magento/Catalog/Model/Layer.php | 2 +- .../Magento/Catalog/Model/Layer/Category.php | 1 - .../Magento/Catalog/Model/Layer/Search.php | 2 - .../Model/Layer/Search/CollectionFilter.php | 1 - .../Magento/Catalog/Model/Layer/State.php | 2 +- .../Model/Plugin/QuoteItemProductOption.php | 4 +- .../Product/Attribute/AttributeSetFinder.php | 2 +- .../Model/Product/Attribute/Backend/Price.php | 2 +- .../Model/Product/Attribute/DataProvider.php | 8 +-- .../Product/Attribute/OptionManagement.php | 2 +- .../Model/Product/Attribute/SetRepository.php | 2 - .../Model/Product/AttributeSet/Build.php | 2 +- .../Catalog/Model/Product/Gallery/Entry.php | 4 +- .../Product/Gallery/GalleryManagement.php | 2 +- .../Model/Product/Gallery/Processor.php | 1 - .../Model/Product/Gallery/ReadHandler.php | 4 +- .../Model/Product/Gallery/UpdateHandler.php | 2 - .../Catalog/Model/Product/Image/Cache.php | 2 +- .../Product/Media/AttributeManagement.php | 2 +- .../Model/Product/Option/ReadHandler.php | 2 - .../Model/Product/Option/Repository.php | 6 +- .../Model/Product/Option/Type/DefaultType.php | 2 +- .../Model/Product/Option/Type/File.php | 6 +- .../Option/Type/File/ValidatorFile.php | 2 +- .../Price/Validation/TierPriceValidator.php | 3 +- .../Catalog/Model/Product/Type/Price.php | 4 +- .../Model/Product/TypeTransitionManager.php | 1 - .../Catalog/Model/ProductLink/Management.php | 2 +- .../Catalog/Model/ProductLink/Repository.php | 8 +-- .../Catalog/Model/ProductOptionProcessor.php | 1 - .../Catalog/Model/ProductRender/Button.php | 3 +- .../Model/ProductWebsiteLinkRepository.php | 4 +- .../Attribute/ConditionBuilder.php | 3 +- .../ResourceModel/AttributePersistor.php | 4 +- .../Category/Flat/Collection.php | 4 +- .../Model/ResourceModel/Category/Tree.php | 2 +- .../Model/ResourceModel/CategoryProduct.php | 1 - .../Model/ResourceModel/Product/Flat.php | 2 +- .../Product/Indexer/Eav/AbstractEav.php | 3 +- .../Product/Indexer/Eav/Decimal.php | 2 +- .../Indexer/Eav/DecimalRowSizeEstimator.php | 6 +- .../Product/Indexer/Eav/Source.php | 2 +- .../Indexer/Eav/SourceRowSizeEstimator.php | 6 +- ...LinkedProductSelectBuilderByIndexPrice.php | 2 +- .../CompositeProductRowSizeEstimator.php | 2 +- .../Model/ResourceModel/Product/Link.php | 2 +- .../Product/Link/DeleteHandler.php | 2 +- .../Product/Link/SaveHandler.php | 2 +- ...nkedProductSelectBuilderBySpecialPrice.php | 4 +- .../ResourceModel/Product/Website/Link.php | 1 - .../Product/Website/SelectProcessor.php | 4 +- .../Catalog/Model/ResourceModel/Url.php | 5 +- .../Product/Option/Type/File/Processor.php | 2 +- .../Compare/BindCustomerLoginObserver.php | 2 +- .../Compare/BindCustomerLogoutObserver.php | 2 +- ...witchPriceAttributeScopeOnConfigChange.php | 8 +-- .../Action/UpdateAttributesFlushCache.php | 2 +- .../Model/ResourceModel/Attribute/Save.php | 2 +- .../Pricing/Price/CustomOptionPrice.php | 4 +- .../Catalog/Pricing/Price/FinalPrice.php | 1 - .../Price/MinimalPriceCalculatorInterface.php | 2 +- .../Price/MinimalTierPriceCalculator.php | 2 +- .../Catalog/Pricing/Price/TierPrice.php | 2 +- app/code/Magento/Catalog/Pricing/Render.php | 2 +- .../Catalog/Pricing/Render/FinalPriceBox.php | 16 ++--- .../Magento/Catalog/Setup/CategorySetup.php | 11 ++- .../Magento/Catalog/Setup/InstallData.php | 2 +- .../Magento/Catalog/Setup/UpgradeSchema.php | 2 +- .../Catalog/Setup/UpgradeWidgetData.php | 6 +- .../Category/AbstractCategoryTest.php | 9 ++- .../Product/Edit/Button/AddAttributeTest.php | 3 +- .../Product/Edit/Button/GenericTest.php | 2 +- .../Block/Product/AbstractProductTest.php | 4 +- .../Block/Product/Compare/ListCompareTest.php | 2 +- .../Unit/Block/Product/ListProductTest.php | 1 - .../Test/Unit/Block/Product/ViewTest.php | 3 +- .../Unit/Block/Ui/ProductViewCounterTest.php | 12 ++-- .../Command/ImagesResizeCommandTest.php | 2 +- .../Adminhtml/Category/Image/UploadTest.php | 2 +- .../Category/Widget/CategoriesJsonTest.php | 8 ++- .../Adminhtml/Category/Widget/ChooserTest.php | 7 +- .../Product/AddAttributeToTemplateTest.php | 22 +++--- .../Adminhtml/Product/Attribute/SaveTest.php | 10 +-- .../Adminhtml/Product/AttributeTest.php | 2 +- .../Adminhtml/Product/BuilderTest.php | 10 +-- .../Helper/HandlerFactoryTest.php | 2 +- .../Product/Initialization/HelperTest.php | 14 ++-- .../Adminhtml/Product/MassStatusTest.php | 6 +- .../Adminhtml/Product/ReloadTest.php | 2 +- .../Frontend/Action/SynchronizeTest.php | 12 ++-- .../Unit/Cron/RefreshSpecialPricesTest.php | 1 - .../ProductFrontendActionSectionTest.php | 2 +- .../Category/Attribute/Backend/SortbyTest.php | 8 +-- .../Category/Attribute/Source/PageTest.php | 1 - .../Test/Unit/Model/Category/FileInfoTest.php | 2 +- .../Model/Category/Link/ReadHandlerTest.php | 2 +- .../Model/Category/Link/SaveHandlerTest.php | 3 +- .../Category/Product/PositionResolverTest.php | 4 +- .../Test/Unit/Model/CategoryListTest.php | 6 +- .../Catalog/Test/Unit/Model/CategoryTest.php | 2 +- .../Unit/Model/CollectionProviderTest.php | 2 +- .../Catalog/Test/Unit/Model/FactoryTest.php | 2 +- .../Test/Unit/Model/ImageExtractorTest.php | 2 +- .../Product/Eav/Plugin/AttributeSetTest.php | 4 +- .../Indexer/Product/Flat/Action/RowTest.php | 7 +- .../Flat/Action/Rows/TableDataTest.php | 2 - .../Indexer/Product/Flat/Action/RowsTest.php | 6 +- .../Flat/Plugin/IndexerConfigDataTest.php | 2 +- .../Indexer/Product/Flat/TableDataTest.php | 2 - .../Unit/Model/Indexer/Product/FullTest.php | 4 +- .../Layer/Category/AvailabilityFlagTest.php | 2 +- .../Layer/Category/CollectionFilterTest.php | 2 +- .../Category/FilterableAttributeListTest.php | 1 - .../Model/Layer/Category/StateKeyTest.php | 2 +- .../Layer/Filter/DataProvider/PriceTest.php | 2 +- .../Test/Unit/Model/Layer/FilterListTest.php | 2 +- .../Search/FilterableAttributeListTest.php | 1 - .../Model/Layout/DepersonalizePluginTest.php | 3 +- .../Plugin/QuoteItemProductOptionTest.php | 8 +-- .../Product/Attribute/Backend/PriceTest.php | 2 - .../Product/Attribute/ManagementTest.php | 3 +- .../Test/Unit/Model/Product/CopierTest.php | 5 +- .../Product/CopyConstructorFactoryTest.php | 2 +- .../Test/Unit/Model/Product/ImageTest.php | 4 +- .../Helper/ProductLinksTest.php | 1 - .../Unit/Model/Product/Link/ConverterTest.php | 2 +- .../Test/Unit/Model/Product/LinkTest.php | 2 +- .../Model/Product/Option/RepositoryTest.php | 4 +- .../Model/Product/Option/SaveHandlerTest.php | 4 +- .../Unit/Model/Product/Option/ValueTest.php | 4 +- .../Test/Unit/Model/Product/OptionTest.php | 1 - .../Product/Price/BasePriceStorageTest.php | 3 +- .../Model/Product/Price/CostStorageTest.php | 3 +- .../Model/Product/ProductList/ToolbarTest.php | 2 +- .../Unit/Model/Product/Type/PriceTest.php | 2 +- .../Test/Unit/Model/Product/UrlTest.php | 2 +- .../Model/Product/Website/SaveHandlerTest.php | 4 +- .../Unit/Model/ProductLink/ManagementTest.php | 5 +- .../FormattedPriceInfoBuilderTest.php | 4 +- .../Test/Unit/Model/ProductRepositoryTest.php | 8 ++- .../Catalog/Test/Unit/Model/ProductTest.php | 15 ++-- .../Attribute/ConditionBuilderTest.php | 8 +-- .../Model/ResourceModel/Category/FlatTest.php | 10 +-- .../Product/CategoryLinkTest.php | 2 +- .../Collection/ProductLimitationTest.php | 2 +- .../Indexer/Eav/BatchSizeCalculatorTest.php | 2 +- .../Eav/DecimalRowSizeEstimatorTest.php | 10 +-- ...ompositeProductRelationsCalculatorTest.php | 2 +- .../Product/Option/CollectionTest.php | 7 +- .../Catalog/Url/Rewrite/SuffixTest.php | 24 +++---- .../Unit/Model/View/Asset/PlaceholderTest.php | 2 +- .../Unit/Observer/MenuCategoryDataTest.php | 3 +- .../Indexer/Category/Product/ExecuteTest.php | 2 +- .../Action/UpdateAttributesFlushCacheTest.php | 2 - .../ResourceModel/Attribute/SaveTest.php | 4 +- .../Plugin/Model/ResourceModel/ConfigTest.php | 1 - .../Price/MinimalTierPriceCalculatorTest.php | 8 +-- .../Unit/Pricing/Price/RegularPriceTest.php | 2 +- .../Test/Unit/Pricing/Price/TierPriceTest.php | 13 ++-- .../Test/Unit/Ui/AllowedProductTypesTest.php | 4 +- .../Listing/Columns/AbstractColumnTest.php | 2 +- .../Listing/Columns/StatusTextTest.php | 4 +- .../Product/Form/Categories/OptionsTest.php | 6 +- .../CatalogEavValidationRulesTest.php | 2 +- .../Form/Modifier/AbstractModifierTest.php | 2 +- .../Form/Modifier/AdvancedPricingTest.php | 8 +-- .../Form/Modifier/AttributeSetTest.php | 4 +- .../Product/Form/Modifier/CategoriesTest.php | 6 +- .../Form/Modifier/CustomOptionsTest.php | 10 +-- .../Product/Form/Modifier/EavTest.php | 46 ++++++------ .../Product/Form/Modifier/FactoryTest.php | 2 +- .../Product/Form/Modifier/GeneralTest.php | 1 - .../Product/Form/Modifier/ImagesTest.php | 2 - .../Product/Form/Modifier/TierPriceTest.php | 2 +- .../Product/Form/Modifier/WebsitesTest.php | 8 +-- .../Form/NewCategoryDataProviderTest.php | 2 +- .../Product/Form/ProductDataProviderTest.php | 8 +-- .../Product/Listing/Collector/ImageTest.php | 8 +-- .../Product/Listing/Collector/PriceTest.php | 4 +- .../Product/Listing/Collector/UrlTest.php | 4 +- .../ProductCustomOptionsDataProviderTest.php | 6 +- .../Related/AbstractDataProviderTest.php | 4 +- .../Category/Form/Element/Wysiwyg.php | 3 +- .../Catalog/Ui/Component/ColumnFactory.php | 6 +- .../Listing/Columns/AttributeSetText.php | 4 +- .../Ui/Component/Listing/Columns/Price.php | 2 +- .../Listing/Columns/ProductActions.php | 2 +- .../Component/Listing/Columns/StatusText.php | 6 +- .../Component/Listing/Columns/Thumbnail.php | 2 +- .../Ui/Component/Listing/Columns/Websites.php | 4 +- .../Product/Form/Categories/Options.php | 4 +- .../Product/Attributes/Listing.php | 3 +- .../Product/Form/Modifier/AdvancedPricing.php | 19 +++-- .../Product/Form/Modifier/Alerts.php | 11 ++- .../Product/Form/Modifier/AttributeSet.php | 1 - .../Product/Form/Modifier/Attributes.php | 12 ++-- .../Product/Form/Modifier/Categories.php | 12 ++-- .../Product/Form/Modifier/CustomOptions.php | 22 +++--- .../Product/Form/Modifier/General.php | 2 +- .../Product/Form/Modifier/Related.php | 7 +- .../Product/Form/Modifier/Websites.php | 6 +- .../Product/Form/NewCategoryDataProvider.php | 2 +- .../ProductCustomOptionsDataProvider.php | 8 +-- .../Product/Related/AbstractDataProvider.php | 4 +- .../templates/catalog/category/tree.phtml | 4 +- .../catalog/product/attribute/options.phtml | 2 +- .../attribute/set/main/tree/attribute.phtml | 2 +- .../fieldset/options/type/date.phtml | 4 +- .../fieldset/options/type/file.phtml | 4 +- .../fieldset/options/type/select.phtml | 4 +- .../fieldset/options/type/text.phtml | 4 +- .../product/edit/options/type/file.phtml | 6 +- .../catalog/product/helper/gallery.phtml | 11 +-- .../frontend/templates/product/list.phtml | 2 +- .../templates/product/list/toolbar.phtml | 9 +-- .../product/list/toolbar/amount.phtml | 19 +++-- .../product/list/toolbar/limiter.phtml | 1 + .../product/list/toolbar/sorter.phtml | 1 + .../product/list/toolbar/viewmode.phtml | 1 + .../frontend/templates/product/listing.phtml | 4 +- .../product/view/options/type/text.phtml | 12 ++-- .../product/widget/compared/grid.phtml | 2 +- .../Model/Export/Product.php | 8 ++- .../Model/Import/Product.php | 6 +- .../Model/Import/Product/Option.php | 9 +-- .../Import/Product/Type/AbstractType.php | 4 +- .../Validator/AbstractImportValidator.php | 2 +- .../Import/Product/Validator/Website.php | 2 +- .../Import/Product/Validator/MediaTest.php | 2 +- .../Model/AddStockStatusToCollection.php | 2 +- .../Model/Adminhtml/Stock/Item.php | 2 +- .../CatalogInventory/Model/Configuration.php | 2 +- .../Model/Indexer/Stock/Action/Full.php | 18 ++--- .../Model/Indexer/Stock/CacheCleaner.php | 4 +- .../Model/ProductCollectionStockCondition.php | 2 - .../Initializer/StockItem.php | 3 +- .../Indexer/Stock/DefaultStock.php | 6 +- .../Model/ResourceModel/Stock/Item.php | 2 - .../Stock/Item/StockItemCriteriaMapper.php | 6 +- .../Model/ResourceModel/Stock/Status.php | 3 +- .../Model/Source/StockConfiguration.php | 2 +- .../Model/Stock/StockItemRepository.php | 2 +- .../CatalogInventory/Model/StockIndex.php | 3 +- .../Model/StockManagement.php | 6 +- .../CatalogInventory/Model/StockRegistry.php | 1 - .../Model/StockRegistryProvider.php | 9 ++- .../CatalogInventory/Model/StockState.php | 14 ++-- .../Model/StockStateProvider.php | 2 +- .../Observer/AddInventoryDataObserver.php | 2 +- .../Observer/CancelOrderItemObserver.php | 2 +- .../CheckoutAllSubmitAfterObserver.php | 2 +- .../Observer/ProcessInventoryDataObserver.php | 2 +- .../Observer/RevertQuoteInventoryObserver.php | 2 +- .../Observer/SaveInventoryDataObserver.php | 6 +- .../SubtractQuoteInventoryObserver.php | 2 +- .../CatalogInventory/Setup/Recurring.php | 4 +- .../CatalogInventory/Setup/UpgradeData.php | 2 +- .../CatalogInventory/Setup/UpgradeSchema.php | 4 +- .../Unit/Block/Plugin/ProductViewTest.php | 3 +- .../Test/Unit/Helper/StockTest.php | 2 +- .../Test/Unit/Model/ConfigurationTest.php | 2 +- .../Model/Indexer/Stock/CacheCleanerTest.php | 2 +- .../Model/Plugin/AfterProductLoadTest.php | 3 +- .../Initializer/QtyProcessorTest.php | 2 +- .../Model/Stock/StockStatusRepositoryTest.php | 2 +- .../Test/Unit/Model/StockTest.php | 16 ++--- .../Form/Element/UseConfigSettings.php | 4 +- .../Form/Modifier/AdvancedInventory.php | 4 +- .../Promo/Catalog/Edit/Tab/Conditions.php | 2 +- .../Adminhtml/Promo/Catalog/Save.php | 2 +- .../Model/Indexer/AbstractIndexer.php | 4 +- .../Model/Indexer/IndexBuilder.php | 2 +- .../Indexer/IndexBuilder/ProductLoader.php | 2 +- ...ProductSelectBuilderByCatalogRulePrice.php | 2 +- .../Model/ResourceModel/ReadHandler.php | 1 - .../Model/ResourceModel/Rule/Collection.php | 2 +- .../Model/ResourceModel/SaveHandler.php | 1 - ...CatalogProductCollectionPricesObserver.php | 8 +-- .../ProcessAdminFinalPriceObserver.php | 7 +- .../ProcessFrontFinalPriceObserver.php | 8 +-- .../Product/Save/ApplyRulesAfterReindex.php | 2 +- .../Magento/CatalogRule/Setup/UpgradeData.php | 4 +- .../CatalogRule/Setup/UpgradeSchema.php | 2 +- .../IndexBuilder/ProductLoaderTest.php | 6 +- .../Indexer/ReindexRuleProductPriceTest.php | 2 - .../Indexer/RuleProductsSelectBuilderTest.php | 4 +- .../Save/ApplyRulesAfterReindexTest.php | 4 +- .../Unit/Plugin/Model/Product/ActionTest.php | 2 +- .../Model/Indexer/ProductRuleReindex.php | 2 +- .../Model/Rule/ConfigurableProductHandler.php | 2 +- .../CatalogRule/Model/Rule/Validation.php | 4 +- .../Controller/Advanced/Result.php | 1 - .../CatalogSearch/Controller/Result/Index.php | 3 +- .../Aggregation/AggregationResolver.php | 2 +- .../Aggregation/Checker/Query/CatalogView.php | 8 +-- .../Aggregation/RequestCheckerComposite.php | 2 +- .../Mysql/Aggregation/DataProvider.php | 1 - .../BaseSelectAttributesSearchStrategy.php | 4 +- .../BaseSelectFullTextSearchStrategy.php | 2 +- .../Adapter/Mysql/Dynamic/DataProvider.php | 2 +- .../Adapter/Mysql/Filter/Preprocessor.php | 4 +- .../Magento/CatalogSearch/Model/Advanced.php | 2 +- .../Model/Autocomplete/DataProvider.php | 4 +- .../Model/Indexer/Fulltext/Action/Full.php | 2 +- .../Fulltext/Plugin/AbstractPlugin.php | 2 +- .../Fulltext/Plugin/Product/Action.php | 2 +- .../Indexer/Fulltext/Plugin/Store/Group.php | 4 +- .../Indexer/Fulltext/Plugin/Store/View.php | 4 +- .../Model/Indexer/Fulltext/Processor.php | 2 +- .../Model/Indexer/Fulltext/Store.php | 4 +- .../Model/Indexer/IndexStructure.php | 2 +- .../Model/Indexer/IndexerHandler.php | 4 +- .../Model/Indexer/Mview/Action.php | 2 +- .../Model/Indexer/ProductFieldset.php | 2 +- .../ResourceModel/Advanced/Collection.php | 2 +- .../Model/ResourceModel/Fulltext.php | 2 +- .../ResourceModel/Fulltext/Collection.php | 12 ++-- .../Model/ResourceModel/Search/Collection.php | 3 +- .../BaseSelectStrategy/StrategyMapper.php | 4 +- .../Search/CustomAttributeFilterCheck.php | 4 +- .../FilterMapper/CustomAttributeFilter.php | 8 +-- .../FilterMapper/DimensionsProcessor.php | 5 +- .../Search/FilterMapper/FilterMapper.php | 4 +- .../Search/FilterMapper/StockStatusFilter.php | 4 +- .../Search/FilterMapper/VisibilityFilter.php | 6 +- .../Model/Search/FiltersExtractor.php | 4 +- .../Model/Search/IndexBuilder.php | 18 ++--- .../QueryChecker/FullTextSearchCheck.php | 2 +- .../SelectContainerBuilder.php | 6 +- .../CatalogSearch/Setup/InstallData.php | 4 +- .../Unit/Block/Plugin/FrontTabPluginTest.php | 6 +- .../Test/Unit/Block/ResultTest.php | 2 +- .../Aggregation/AggregationResolverTest.php | 2 +- .../Checker/Query/CatalogViewTest.php | 10 +-- .../Mysql/Aggregation/DataProviderTest.php | 12 ++-- .../Mysql/Dynamic/DataProviderTest.php | 6 +- .../Test/Unit/Model/Adapter/OptionsTest.php | 2 +- .../Model/Autocomplete/DataProviderTest.php | 2 +- .../Fulltext/Plugin/Product/ActionTest.php | 8 +-- .../Indexer/Fulltext/Plugin/ProductTest.php | 2 +- .../Fulltext/Plugin/Store/ViewTest.php | 6 +- .../Model/Indexer/Scope/IndexSwitcherTest.php | 3 +- .../Search/Plugin/CollectionFilterTest.php | 6 +- .../Unit/Model/ResourceModel/AdvancedTest.php | 1 - .../ResourceModel/Fulltext/CollectionTest.php | 2 +- .../BaseSelectStrategy/StrategyMapperTest.php | 4 +- .../Search/CustomAttributeFilterCheckTest.php | 6 +- .../FilterMapper/ExclusionStrategyTest.php | 6 +- .../FilterMapper/TermDropdownStrategyTest.php | 12 ++-- .../Unit/Model/Search/IndexBuilderTest.php | 24 +++---- .../Search/Indexer/IndexStructureTest.php | 2 +- .../Model/Search/RequestGeneratorTest.php | 2 +- .../SelectContainerBuilderTest.php | 16 ++--- .../Unit/Model/Search/TableMapperTest.php | 8 +-- .../Category/ChildrenUrlRewriteGenerator.php | 4 +- .../Model/Category/Plugin/Category/Move.php | 2 +- .../Model/Category/Plugin/Storage.php | 2 +- .../Model/Category/Plugin/Store/Group.php | 8 +-- .../Model/Category/Plugin/Store/View.php | 1 - .../Model/CategoryUrlRewriteGenerator.php | 6 +- .../Model/Map/DataCategoryHashMap.php | 4 +- .../Map/DataCategoryUrlRewriteDatabaseMap.php | 1 - .../Map/DataProductUrlRewriteDatabaseMap.php | 1 - .../Model/Map/HashMapInterface.php | 2 - .../Product/AnchorUrlRewriteGenerator.php | 1 - .../Product/CurrentUrlRewritesRegenerator.php | 12 ++-- .../Model/ProductUrlRewriteGenerator.php | 2 +- ...ategoryProcessUrlRewriteMovingObserver.php | 8 +-- ...egorySaveRewritesHistorySetterObserver.php | 1 - .../CategoryUrlPathAutogeneratorObserver.php | 3 +- .../Observer/ClearProductUrlsObserver.php | 5 +- ...oductProcessUrlRewriteRemovingObserver.php | 2 +- ...ProductProcessUrlRewriteSavingObserver.php | 2 +- .../ProductUrlKeyAutogeneratorObserver.php | 1 - .../Observer/UrlRewriteHandler.php | 12 ++-- .../Service/V1/StoreViewService.php | 2 +- .../CurrentUrlRewritesRegeneratorTest.php | 4 +- .../Category/Plugin/Category/MoveTest.php | 8 +-- .../Category/Plugin/Category/RemoveTest.php | 6 +- .../Model/Category/Plugin/StorageTest.php | 8 +-- .../Model/Category/Plugin/Store/GroupTest.php | 14 ++-- .../Model/Category/Plugin/Store/ViewTest.php | 16 ++--- .../CategoryProductUrlPathGeneratorTest.php | 3 +- .../Model/CategoryUrlPathGeneratorTest.php | 4 +- .../Model/CategoryUrlRewriteGeneratorTest.php | 4 +- .../Model/Map/DataCategoryHashMapTest.php | 10 +-- .../DataCategoryUrlRewriteDatabaseMapTest.php | 12 ++-- .../DataCategoryUsedInProductsHashMapTest.php | 10 +-- .../DataProductUrlRewriteDatabaseMapTest.php | 8 +-- .../Unit/Model/Map/UrlRewriteFinderTest.php | 10 +-- .../Test/Unit/Model/ObjectRegistryTest.php | 1 - .../Model/ProductUrlRewriteGeneratorTest.php | 4 +- .../Unit/Observer/UrlRewriteHandlerTest.php | 11 ++- .../Form/Modifier/ProductUrlRewrite.php | 6 +- .../Block/Product/ProductsList.php | 2 +- .../Block/Cart/CartTotalsProcessor.php | 2 +- .../Magento/Checkout/Block/Cart/Totals.php | 2 +- .../Block/Checkout/DirectoryDataProcessor.php | 4 +- app/code/Magento/Checkout/Controller/Cart.php | 2 +- .../Checkout/Controller/Cart/EstimatePost.php | 2 +- .../Checkout/Controller/Noroute/Index.php | 2 +- .../Magento/Checkout/Controller/Onepage.php | 2 +- .../Controller/ShippingRates/Index.php | 2 - app/code/Magento/Checkout/Helper/Data.php | 2 +- .../Cart/CheckoutSummaryConfigProvider.php | 2 +- .../GuestPaymentInformationManagement.php | 2 +- .../Checkout/Model/ShippingInformation.php | 2 +- .../Model/ShippingInformationManagement.php | 8 +-- app/code/Magento/Checkout/Model/Sidebar.php | 1 - .../Checkout/Model/TotalsInformation.php | 2 +- .../Magento/Checkout/Setup/InstallData.php | 2 +- .../Test/Unit/Block/Cart/AbstractCartTest.php | 2 +- .../Unit/Block/Item/Price/RendererTest.php | 2 +- .../Test/Unit/Controller/OnepageTest.php | 4 +- .../Checkout/Test/Unit/Helper/CartTest.php | 3 +- .../Checkout/Test/Unit/Helper/DataTest.php | 9 ++- .../CheckoutSummaryConfigProviderTest.php | 2 +- .../Model/Config/Source/Cart/SummaryTest.php | 2 +- .../Checkout/Test/Unit/Model/SessionTest.php | 20 ++++-- .../Test/Unit/Model/Type/OnepageTest.php | 2 +- .../frontend/templates/cart/noItems.phtml | 6 +- .../Model/AgreementsProvider.php | 2 +- .../Model/CheckoutAgreementsRepository.php | 10 +-- .../view/frontend/templates/agreements.phtml | 4 +- .../templates/multishipping_agreements.phtml | 4 +- .../Cms/Api/BlockRepositoryInterface.php | 2 - .../Cms/Api/PageRepositoryInterface.php | 2 - .../Controller/Adminhtml/Block/InlineEdit.php | 2 +- .../Controller/Adminhtml/Block/MassDelete.php | 4 +- .../Cms/Controller/Adminhtml/Block/Save.php | 1 - .../Adminhtml/Block/Widget/Chooser.php | 2 +- .../Controller/Adminhtml/Page/InlineEdit.php | 2 +- .../Controller/Adminhtml/Page/MassDelete.php | 4 +- .../Controller/Adminhtml/Page/MassDisable.php | 4 +- .../Controller/Adminhtml/Page/MassEnable.php | 4 +- .../Cms/Controller/Adminhtml/Page/Save.php | 2 +- app/code/Magento/Cms/Model/Block.php | 1 - app/code/Magento/Cms/Model/Page.php | 3 +- app/code/Magento/Cms/Model/PageRepository.php | 4 +- .../Magento/Cms/Model/ResourceModel/Block.php | 4 +- .../Model/ResourceModel/Block/Collection.php | 2 +- .../ResourceModel/Block/Grid/Collection.php | 2 +- .../Block/Relation/Store/SaveHandler.php | 2 +- .../Magento/Cms/Model/ResourceModel/Page.php | 6 +- .../Model/ResourceModel/Page/Collection.php | 2 +- .../ResourceModel/Page/Grid/Collection.php | 4 +- .../Page/Relation/Store/SaveHandler.php | 2 +- app/code/Magento/Cms/Model/Wysiwyg/Config.php | 2 +- .../Magento/Cms/Setup/ContentConverter.php | 2 +- app/code/Magento/Cms/Setup/InstallSchema.php | 2 +- app/code/Magento/Cms/Setup/UpgradeSchema.php | 2 +- .../Controller/Adminhtml/Block/SaveTest.php | 6 +- .../Controller/Adminhtml/Page/SaveTest.php | 4 +- .../Controller/Page/PostDataProcessorTest.php | 2 +- .../Model/Page/Source/CustomLayoutTest.php | 2 - .../Magento/Cms/Test/Unit/Model/PageTest.php | 2 +- .../Block/Relation/Store/ReadHandlerTest.php | 1 - .../Block/Relation/Store/SaveHandlerTest.php | 2 +- .../Page/Grid/CollectionTest.php | 4 +- .../Page/Relation/Store/SaveHandlerTest.php | 2 +- .../Unit/Model/ResourceModel/PageTest.php | 11 ++- .../Component/Listing/Column/BlockActions.php | 4 +- .../ProcessUrlRewriteSavingObserver.php | 4 +- .../Plugin/Cms/Model/ResourceModel/Page.php | 4 +- .../ProcessUrlRewriteSavingObserverTest.php | 10 +-- .../Cms/Model/ResourceModel/PageTest.php | 2 +- .../Config/Source/EnvironmentConfigSource.php | 4 +- .../App/Config/Source/ModularConfigSource.php | 2 +- .../App/Config/Source/RuntimeConfigSource.php | 4 +- .../Magento/Config/App/Config/Type/System.php | 2 +- .../Command/ConfigSet/DefaultProcessor.php | 4 +- .../Command/ConfigSet/ProcessorFacade.php | 10 +-- .../Console/Command/ConfigSetCommand.php | 2 +- .../Config/Model/Config/Backend/Baseurl.php | 2 +- .../Model/Config/Compiler/IncludeElement.php | 4 +- .../Reader/Source/Deployed/DocumentRoot.php | 4 +- .../Reader/Source/Deployed/SettingChecker.php | 7 +- .../Config/Model/Config/SchemaLocator.php | 2 - .../Config/Structure/AbstractElement.php | 2 +- .../Model/Config/Structure/Mapper/Factory.php | 3 +- .../Config/Model/PreparedValueFactory.php | 4 +- .../App/Config/Type/System/ReaderTest.php | 6 +- .../Test/Unit/App/Config/Type/SystemTest.php | 2 +- .../Unit/Block/System/Config/DwstreeTest.php | 2 +- .../System/Config/Form/Field/ImageTest.php | 3 +- .../ConfigSet/DefaultProcessorTest.php | 6 +- .../Command/ConfigSet/ProcessorFacadeTest.php | 12 ++-- .../Console/Command/ConfigSetCommandTest.php | 2 +- .../Console/Command/ConfigShowCommandTest.php | 6 +- .../Unit/Model/Config/Export/CommentTest.php | 2 +- .../Unit/Model/Config/Export/TypePoolTest.php | 2 +- .../Processor/EnvironmentPlaceholderTest.php | 2 +- .../Source/Deployed/DocumentRootTest.php | 3 +- .../Source/Deployed/SettingCheckerTest.php | 5 +- .../Config/Structure/Element/SectionTest.php | 2 +- .../Config/Structure/Element/TabTest.php | 2 +- .../Model/Placeholder/EnvironmentTest.php | 3 +- .../Unit/Model/PreparedValueFactoryTest.php | 10 +-- .../Model/Export/RowCustomizer.php | 4 +- .../Import/Product/Type/Configurable.php | 3 +- .../Unit/Model/Export/RowCustomizerTest.php | 8 +-- .../Import/Product/Type/ConfigurableTest.php | 30 +++----- .../Adminhtml/Product/Edit/Button/Save.php | 4 +- .../Block/Plugin/Product/Media/Gallery.php | 2 +- .../Adminhtml/Product/Builder/Plugin.php | 4 +- .../Controller/Adminhtml/Product/Wizard.php | 4 +- .../Helper/Product/Options/Factory.php | 4 +- .../Helper/Product/Options/Loader.php | 2 +- .../Model/AttributeOptionProvider.php | 3 +- .../Model/ConfigurableProductManagement.php | 1 - .../Model/OptionRepository.php | 3 +- .../Model/Plugin/ProductRepositorySave.php | 8 +-- .../Model/Product/Type/Configurable.php | 8 +-- .../Model/Product/Validator/Plugin.php | 2 +- .../Model/Quote/Item/CartItemProcessor.php | 6 +- .../Attribute/OptionProvider.php | 2 +- .../Product/Indexer/Price/Configurable.php | 3 - .../StockStatusBaseSelectProcessor.php | 4 +- .../Product/Type/Configurable.php | 10 +-- .../Product/Type/Configurable/Attribute.php | 1 - .../Configurable/Attribute/Collection.php | 4 +- .../Attribute/InStockOptionSelectBuilder.php | 4 +- .../Price/ConfigurableOptionsProvider.php | 4 +- .../ConfigurableRegularPriceInterface.php | 1 - .../Price/LowestPriceOptionsProvider.php | 2 +- .../ConfigurableProduct/Setup/Recurring.php | 4 +- .../ConfigurableProduct/Setup/UpgradeData.php | 6 +- .../Product/Edit/Button/SaveTest.php | 4 +- .../Product/Steps/SelectAttributesTest.php | 8 +-- .../Plugin/Product/Media/GalleryTest.php | 3 +- .../Plugin/UpdateConfigurationsTest.php | 8 +-- .../Test/Unit/Helper/DataTest.php | 1 - .../Helper/Product/Options/LoaderTest.php | 2 +- .../Model/Attribute/LockValidatorTest.php | 3 +- .../Model/AttributeOptionProviderTest.php | 12 ++-- .../Product/ProductExtensionAttributes.php | 1 - .../ProductOptionExtensionAttributes.php | 1 - .../Unit/Model/Product/SaveHandlerTest.php | 1 - .../Type/Collection/SalableProcessorTest.php | 2 +- .../Model/Product/Type/ConfigurableTest.php | 30 ++++---- .../Product/Type/VariationMatrixTest.php | 6 +- .../Model/Product/VariationHandlerTest.php | 4 +- .../Attribute/OptionProviderTest.php | 4 +- .../Attribute/OptionSelectBuilderTest.php | 6 +- .../LinkedProductSelectBuilderTest.php | 4 +- .../StockStatusBaseSelectProcessorTest.php | 6 +- .../Product/Type/ConfigurableTest.php | 16 ++--- .../HideUnsupportedAttributeTypesTest.php | 3 - .../InStockOptionSelectBuilderTest.php | 4 +- .../Price/LowestPriceOptionsProviderTest.php | 2 +- .../Columns/AttributesTest.php | 12 ++-- .../AssociatedProduct/Columns/PriceTest.php | 8 +-- .../Product/Form/Modifier/CompositeTest.php | 12 ++-- .../Form/Modifier/ConfigurablePanelTest.php | 4 +- .../Form/Modifier/ConfigurablePriceTest.php | 6 +- .../Product/Form/Modifier/StockDataTest.php | 4 +- .../AssociatedProduct/Columns/Attributes.php | 4 +- .../AssociatedProduct/Columns/Name.php | 2 +- .../AssociatedProduct/Columns/Price.php | 2 +- .../Product/Form/Modifier/Composite.php | 8 +-- .../ConfigurableAttributeSetHandler.php | 12 ++-- .../Form/Modifier/ConfigurablePanel.php | 14 ++-- .../Form/Modifier/ConfigurablePrice.php | 2 +- .../Product/Form/Modifier/CustomOptions.php | 4 +- .../view/type/options/configurable.phtml | 6 +- .../OrderedProductAvailabilityChecker.php | 4 +- .../ConfigurableProductSales/registration.php | 2 +- .../Magento/Contact/Controller/Index/Post.php | 4 +- app/code/Magento/Contact/Model/Mail.php | 4 +- .../Contact/Test/Unit/Model/MailTest.php | 2 +- .../Unit/Model/Config/Backend/PathTest.php | 3 +- .../Cron/Console/Command/CronCommand.php | 14 ++-- .../Console/Command/CronInstallCommand.php | 4 +- .../Console/Command/CronRemoveCommand.php | 4 +- app/code/Magento/Cron/Model/Schedule.php | 2 +- .../Observer/ProcessCronQueueObserver.php | 2 +- .../Command/CronInstallCommandTest.php | 4 +- .../Console/Command/CronRemoveCommandTest.php | 4 +- .../Test/Unit/Model/Config/Reader/DbTest.php | 1 - .../Adminhtml/System/Currency/FetchRates.php | 2 +- .../Observer/CurrencyDisplayOptions.php | 2 +- .../CurrencySymbol/Setup/UpgradeData.php | 2 +- .../Block/Account/AuthorizationLink.php | 1 - .../Customer/Block/Account/Customer.php | 2 - .../Magento/Customer/Block/Account/Link.php | 2 - .../Customer/Block/Account/Navigation.php | 3 +- .../Magento/Customer/Block/Address/Edit.php | 2 +- .../Address/Renderer/RendererInterface.php | 2 +- .../Adminhtml/Edit/Tab/View/PersonalInfo.php | 4 +- .../Block/Adminhtml/Edit/UnlockButton.php | 2 +- .../Sales/Order/Address/Form/Renderer/Vat.php | 2 - app/code/Magento/Customer/Block/Form/Edit.php | 1 - .../Magento/Customer/Block/Newsletter.php | 3 - .../Command/UpgradeHashAlgorithmCommand.php | 2 +- .../Customer/Controller/Account/Confirm.php | 14 ++-- .../Controller/Account/Confirmation.php | 6 +- .../Customer/Controller/Account/Create.php | 2 +- .../Controller/Account/CreatePassword.php | 2 +- .../Controller/Account/CreatePost.php | 32 ++++----- .../Customer/Controller/Account/Edit.php | 4 +- .../Customer/Controller/Account/EditPost.php | 12 ++-- .../Customer/Controller/Account/LoginPost.php | 10 +-- .../Controller/Account/ResetPasswordPost.php | 4 +- .../Adminhtml/Customer/InvalidateToken.php | 4 +- .../Controller/Adminhtml/Group/Save.php | 1 - .../Customer/Controller/Adminhtml/Index.php | 4 +- .../Adminhtml/Index/AbstractMassAction.php | 8 +-- .../Controller/Adminhtml/Index/Cart.php | 2 +- .../Controller/Adminhtml/Index/InlineEdit.php | 5 +- .../Adminhtml/Index/MassAssignGroup.php | 4 +- .../Controller/Adminhtml/Index/MassDelete.php | 4 +- .../Adminhtml/Index/MassSubscribe.php | 6 +- .../Adminhtml/Index/MassUnsubscribe.php | 6 +- .../Controller/Adminhtml/Index/Viewfile.php | 2 +- .../Controller/Adminhtml/Locks/Unlock.php | 2 +- .../Customer/Controller/Ajax/Login.php | 6 +- .../Customer/Controller/Plugin/Account.php | 2 +- app/code/Magento/Customer/Helper/View.php | 2 +- .../Customer/Model/Account/Redirect.php | 12 ++-- .../Model/App/Action/ContextPlugin.php | 4 +- .../Model/Attribute/Data/Postcode.php | 2 +- .../Customer/Model/AttributeChecker.php | 1 - .../Model/AttributeMetadataConverter.php | 2 +- .../Magento/Customer/Model/Authentication.php | 4 +- .../Model/Checkout/ConfigProvider.php | 6 +- .../Model/Config/Source/Group/Multiselect.php | 2 +- .../GroupSourceLoggedInOnlyInterface.php | 3 +- .../Customer/Model/Customer/Source/Group.php | 4 +- .../Customer/Source/GroupSourceInterface.php | 1 - .../Magento/Customer/Model/Data/Address.php | 2 +- .../Customer/Model/Data/AttributeMetadata.php | 2 - .../Magento/Customer/Model/Data/Customer.php | 2 +- .../Customer/Model/Data/ValidationRule.php | 2 - .../Customer/Model/EmailNotification.php | 8 +-- .../Magento/Customer/Model/FileUploader.php | 1 - .../Customer/Model/GroupManagement.php | 7 +- .../Indexer/Address/AttributeProvider.php | 2 - .../Model/Indexer/Attribute/Filter.php | 4 +- .../Model/Indexer/AttributeProvider.php | 4 +- .../Model/Metadata/AttributeResolver.php | 2 +- .../Customer/Model/Metadata/Form/Postcode.php | 2 +- .../Customer/Model/ResourceModel/Customer.php | 2 +- .../Model/ResourceModel/Customer/Grid.php | 2 +- .../Customer/Model/ResourceModel/Group.php | 2 +- .../Group/Grid/ServiceCollection.php | 2 +- .../Model/ResourceModel/GroupRepository.php | 6 +- .../ResourceModel/Online/Grid/Collection.php | 5 +- app/code/Magento/Customer/Model/Vat.php | 7 +- app/code/Magento/Customer/Model/Visitor.php | 2 - .../Observer/BeforeAddressSaveObserver.php | 4 +- .../Observer/LogLastLoginAtObserver.php | 1 - .../Observer/LogLastLogoutAtObserver.php | 1 - .../UpgradeCustomerPasswordObserver.php | 4 +- .../Magento/Customer/Setup/CustomerSetup.php | 5 +- .../Magento/Customer/Setup/UpgradeData.php | 8 +-- .../Unit/Block/Account/Dashboard/InfoTest.php | 2 +- .../Test/Unit/Block/CustomerScopeDataTest.php | 4 +- .../Test/Unit/Block/Widget/DobTest.php | 5 +- .../Test/Unit/Block/Widget/GenderTest.php | 1 - .../Test/Unit/Block/Widget/NameTest.php | 14 ++-- .../Test/Unit/Block/Widget/TaxvatTest.php | 2 +- .../UpgradeHashAlgorithmCommandTest.php | 2 +- .../Controller/Account/CreatePostTest.php | 3 +- .../Controller/Adminhtml/Group/SaveTest.php | 2 +- .../Adminhtml/Index/ResetPasswordTest.php | 4 +- .../Unit/Controller/Plugin/AccountTest.php | 2 +- .../Test/Unit/Controller/Section/LoadTest.php | 4 +- .../CustomerData/Section/IdentifierTest.php | 2 +- .../Test/Unit/Model/Account/RedirectTest.php | 2 +- .../Test/Unit/Model/AttributeCheckerTest.php | 2 +- .../Model/AttributeMetadatConverterTest.php | 2 +- .../Test/Unit/Model/AttributeTest.php | 6 +- .../Model/Checkout/ConfigProviderTest.php | 8 +-- .../Attribute/Backend/PasswordTest.php | 2 +- .../Unit/Model/Customer/DataProviderTest.php | 1 - .../Unit/Model/Customer/Source/GroupTest.php | 8 +-- .../Model/Indexer/Attribute/FilterTest.php | 2 +- .../Model/Indexer/AttributeProviderTest.php | 9 +-- .../AddressMetadataManagementTest.php | 2 +- .../CustomerMetadataManagementTest.php | 2 +- .../Unit/Model/Metadata/Form/ImageTest.php | 2 +- .../Unit/Model/Metadata/Form/PostcodeTest.php | 2 +- .../Group/Grid/ServiceCollectionTest.php | 2 +- .../Unit/Model/ResourceModel/GroupTest.php | 4 +- .../BeforeAddressSaveObserverTest.php | 2 - .../CustomerLoginSuccessObserverTest.php | 1 - .../Observer/LogLastLoginAtObserverTest.php | 2 - .../Observer/LogLastLogoutAtObserverTest.php | 2 - .../Listing/Column/ConfirmationTest.php | 2 +- .../Listing/Column/InlineEditUpdaterTest.php | 4 +- .../Listing/Column/ValidationRulesTest.php | 2 +- .../Customer/Ui/Component/ColumnFactory.php | 1 - .../Ui/Component/DataProvider/Document.php | 6 +- .../Component/Listing/Column/AccountLock.php | 2 +- .../Ui/Component/Listing/Column/Actions.php | 2 +- .../Listing/Column/AttributeColumn.php | 4 +- .../Listing/Column/Group/Options.php | 2 +- .../Component/Listing/Column/Online/Type.php | 2 +- .../Ui/Component/Listing/Column/Websites.php | 2 +- .../Customer/Ui/Component/Listing/Columns.php | 8 +-- .../Ui/Component/MassAction/Group/Options.php | 2 +- .../view/adminhtml/templates/edit/js.phtml | 2 - .../frontend/templates/account/customer.phtml | 4 +- .../frontend/templates/widget/gender.phtml | 8 ++- .../view/frontend/templates/widget/name.phtml | 32 ++++++--- .../frontend/templates/widget/taxvat.phtml | 8 ++- .../Model/Import/AbstractCustomer.php | 2 +- .../Model/Import/CustomerCompositeTest.php | 4 +- .../Test/Unit/Model/Import/CustomerTest.php | 3 +- .../Magento/Deploy/Collector/Collector.php | 2 +- .../Command/App/ConfigImport/Processor.php | 14 ++-- .../Command/App/ConfigImportCommand.php | 4 +- .../InteractiveCollector.php | 2 +- .../SensitiveConfigSetFacade.php | 8 +-- .../SensitiveConfigSet/SimpleCollector.php | 2 +- .../Deploy/Console/Command/SetModeCommand.php | 2 +- .../Console/Command/ShowModeCommand.php | 4 +- .../Magento/Deploy/Console/ConsoleLogger.php | 10 +-- .../Deploy/Console/DeployStaticOptions.php | 2 +- .../Magento/Deploy/Console/InputValidator.php | 1 - .../Magento/Deploy/Model/ConfigWriter.php | 2 +- app/code/Magento/Deploy/Model/Filesystem.php | 2 +- app/code/Magento/Deploy/Model/Mode.php | 8 +-- .../Deploy/Package/Bundle/RequireJs.php | 4 +- .../Deploy/Package/BundleInterfaceFactory.php | 2 +- app/code/Magento/Deploy/Package/Package.php | 2 +- .../Magento/Deploy/Package/PackageFactory.php | 2 +- .../Magento/Deploy/Package/PackagePool.php | 2 +- .../Processor/PostProcessor/CssUrls.php | 2 +- .../Package/Processor/PostProcessor/Map.php | 8 +-- .../Package/Processor/PreProcessor/Css.php | 4 +- .../Package/Processor/PreProcessor/Less.php | 4 +- app/code/Magento/Deploy/Process/Queue.php | 2 +- .../Magento/Deploy/Process/QueueFactory.php | 2 +- app/code/Magento/Deploy/Service/Bundle.php | 2 +- .../Magento/Deploy/Service/DeployPackage.php | 2 +- .../Deploy/Service/DeployRequireJsConfig.php | 10 +-- .../Deploy/Service/DeployStaticContent.php | 4 +- .../Deploy/Service/DeployStaticFile.php | 6 +- .../Deploy/Service/MinifyTemplates.php | 2 +- app/code/Magento/Deploy/Source/Lib.php | 4 +- app/code/Magento/Deploy/Source/Modules.php | 2 +- app/code/Magento/Deploy/Source/Themes.php | 2 +- .../Magento/Deploy/Strategy/CompactDeploy.php | 2 +- .../Magento/Deploy/Strategy/QuickDeploy.php | 2 +- .../Deploy/Strategy/StandardDeploy.php | 2 +- .../App/ConfigImport/ProcessorTest.php | 14 ++-- .../Command/App/ConfigImportCommandTest.php | 2 +- .../InteractiveCollectorTest.php | 2 +- .../SimpleCollectorTest.php | 4 +- .../Console/Command/SetModeCommandTest.php | 1 - .../Console/Command/ShowModeCommandTest.php | 1 - .../Test/Unit/Model/ConfigWriterTest.php | 2 +- .../DeploymentConfig/ChangeDetectorTest.php | 6 +- .../Deploy/Test/Unit/Model/FilesystemTest.php | 4 +- .../Deploy/Test/Unit/Model/ModeTest.php | 6 +- .../Model/Plugin/ConfigChangeDetectorTest.php | 2 +- .../Deploy/Test/Unit/Process/QueueTest.php | 8 +-- .../Unit/Service/DeployStaticContentTest.php | 6 +- .../DeployTranslationsDictionaryTest.php | 6 +- .../Test/Unit/Strategy/CompactDeployTest.php | 2 +- .../Console/Command/DiInfoCommand.php | 4 +- .../Command/QueryLogDisableCommand.php | 8 +-- .../Console/Command/QueryLogEnableCommand.php | 6 +- .../Command/SourceThemeDeployCommand.php | 5 +- .../Command/TemplateHintsDisableCommand.php | 4 +- .../Command/TemplateHintsEnableCommand.php | 4 +- .../Command/XmlCatalogGenerateCommand.php | 4 +- .../Console/Command/XmlConverterCommand.php | 8 +-- .../Magento/Developer/Model/Di/PluginList.php | 2 +- .../Developer/Model/Logger/Handler/Debug.php | 2 +- .../PreProcessor/FrontendCompilation.php | 7 +- .../Model/XmlCatalog/Format/PhpStorm.php | 2 - .../System/Config/WorkflowTypeTest.php | 6 +- .../Command/SourceThemeDeployCommandTest.php | 8 +-- .../Command/XmlConverterCommandTest.php | 2 +- .../Model/Config/Backend/WorkflowTypeTest.php | 6 +- .../Test/Unit/Model/Di/InformationTest.php | 4 +- .../Unit/Model/Logger/Handler/DebugTest.php | 2 +- .../PreProcessor/FrontendCompilationTest.php | 10 +-- .../Dhl/Block/Adminhtml/Unitofmeasure.php | 4 +- app/code/Magento/Dhl/Model/Carrier.php | 11 +-- .../Dhl/Test/Unit/Model/CarrierTest.php | 2 +- .../Validator/ResponseErrorProcessorTest.php | 2 +- .../Unit/Model/Validator/XmlValidatorTest.php | 9 ++- app/code/Magento/Directory/Model/Currency.php | 4 +- .../Model/CurrencyInformationAcquirer.php | 2 +- .../Magento/Directory/Model/PriceCurrency.php | 2 +- .../Model/TopDestinationCountries.php | 2 +- .../Magento/Directory/Setup/UpgradeData.php | 2 +- .../Test/Unit/Model/AllowedCountriesTest.php | 1 - .../Model/CountryInformationAcquirerTest.php | 2 - .../Directory/Test/Unit/Model/CountryTest.php | 2 - .../Test/Unit/Model/ObserverTest.php | 4 +- .../ResourceModel/Region/CollectionTest.php | 12 ++-- .../Api/LinkRepositoryInterface.php | 2 +- .../Helper/Plugin/Downloadable.php | 6 +- .../Magento/Downloadable/Helper/Download.php | 2 +- .../Model/File/ContentUploader.php | 8 +-- .../Downloadable/Model/Link/Builder.php | 2 +- .../Downloadable/Model/Link/CreateHandler.php | 2 +- .../Model/Link/Purchased/Item.php | 2 - .../Downloadable/Model/LinkRepository.php | 4 +- .../TypeHandler/AbstractTypeHandler.php | 4 +- .../Plugin/Downloadable.php | 2 +- .../Model/ProductOptionProcessor.php | 1 - .../Model/Quote/Item/CartItemProcessor.php | 4 +- .../Downloadable/Model/Sample/Builder.php | 3 +- .../Downloadable/Model/SampleRepository.php | 6 +- .../Downloadable/Setup/UpgradeSchema.php | 2 +- .../Test/Unit/Model/Link/BuilderTest.php | 4 +- .../Test/Unit/Model/Sample/BuilderTest.php | 2 +- .../Unit/Model/Sample/CreateHandlerTest.php | 2 +- .../Unit/Model/Sample/UpdateHandlerTest.php | 2 +- .../IsAllowedGuestCheckoutObserverTest.php | 5 +- .../SaveDownloadableOrderItemObserverTest.php | 2 +- .../Observer/SetLinkStatusObserverTest.php | 8 +-- .../Product/Form/Modifier/CompositeTest.php | 10 +-- .../Product/Form/Modifier/Data/LinksTest.php | 14 ++-- .../Form/Modifier/DownloadablePanelTest.php | 7 +- .../Product/Form/Modifier/LinksTest.php | 14 ++-- .../Product/Form/Modifier/SamplesTest.php | 12 ++-- .../Product/Form/Modifier/Composite.php | 7 +- .../Product/Form/Modifier/Data/Links.php | 10 +-- .../Product/Form/Modifier/Data/Samples.php | 10 +-- .../Form/Modifier/DownloadablePanel.php | 2 +- .../Product/Form/Modifier/Links.php | 8 +-- .../Product/Form/Modifier/Samples.php | 6 +- .../Product/Form/Modifier/UsedDefault.php | 2 +- .../composite/fieldset/downloadable.phtml | 6 +- .../product/edit/downloadable/links.phtml | 6 +- .../product/edit/downloadable/samples.phtml | 2 +- .../templates/catalog/product/links.phtml | 6 +- .../Import/Product/Type/Downloadable.php | 2 +- .../Attribute/Edit/Main/AbstractMain.php | 2 +- .../Adminhtml/Attribute/PropertyLocker.php | 2 +- .../Eav/Model/Attribute/Data/Multiselect.php | 1 + .../Magento/Eav/Model/AttributeProvider.php | 4 +- .../Model/EavCustomAttributeTypeLocator.php | 4 +- .../Eav/Model/Entity/AbstractEntity.php | 7 +- .../Attribute/Frontend/AbstractFrontend.php | 8 +-- .../ResourceModel/AttributePersistor.php | 5 +- .../Entity/Attribute/Grid/Collection.php | 2 - .../Eav/Model/ResourceModel/Entity/Store.php | 1 - .../Eav/Model/ResourceModel/ReadSnapshot.php | 1 - .../Eav/Model/ResourceModel/UpdateHandler.php | 6 +- app/code/Magento/Eav/Setup/EavSetup.php | 2 +- app/code/Magento/Eav/Setup/InstallData.php | 1 - app/code/Magento/Eav/Setup/UpgradeSchema.php | 2 +- .../Unit/Model/Attribute/Data/FileTest.php | 18 +++-- .../Unit/Model/Attribute/Data/ImageTest.php | 16 ++++- .../Unit/Model/AttributeManagementTest.php | 12 ++-- .../EavCustomAttributeTypeLocatorTest.php | 13 ++-- .../Frontend/DefaultFrontendTest.php | 8 +-- .../Entity/Attribute/Source/BooleanTest.php | 26 ++++--- .../Unit/Model/Entity/AttributeLoaderTest.php | 1 - .../ResourceModel/Entity/AttributeTest.php | 3 +- .../ResourceModel/Entity/AttributeTest.php | 12 ++-- .../templates/attribute/edit/js.phtml | 2 +- .../Test/Unit/Model/AbstractTemplateTest.php | 5 +- .../Block/Adminhtml/Crypt/Key/Form.php | 2 +- app/code/Magento/Fedex/Model/Carrier.php | 3 +- .../Message/Multishipping/Plugin/ItemsBox.php | 4 +- .../Magento/GiftMessage/Helper/Message.php | 3 +- .../Model/GiftMessageConfigProvider.php | 10 +-- .../GiftMessage/Model/ItemRepository.php | 7 +- .../GiftMessage/Model/OrderItemRepository.php | 4 +- .../GiftMessage/Model/OrderRepository.php | 4 +- .../GiftMessage/Model/Plugin/QuoteItem.php | 4 +- .../Unit/Model/GuestCartRepositoryTest.php | 2 +- .../Unit/Model/OrderItemRepositoryTest.php | 2 +- .../GiftMessage/Test/Unit/Model/SaveTest.php | 3 +- .../Unit/Model/Type/Plugin/OnepageTest.php | 3 +- .../Product/Modifier/GiftMessageTest.php | 4 +- .../Product/Modifier/GiftMessage.php | 2 +- .../Magento/GoogleAnalytics/Helper/Data.php | 2 +- .../Test/Unit/Block/GaTest.php | 3 +- .../GoogleOptimizer/Block/Adminhtml/Form.php | 4 +- .../Magento/GoogleOptimizer/Helper/Data.php | 2 +- .../Plugin/Catalog/Category/DataProvider.php | 3 - .../Catalog/Product/Category/DataProvider.php | 2 +- .../Product/Form/Modifier/GoogleOptimizer.php | 4 +- .../Import/Product/Type/Grouped/LinksTest.php | 1 - .../Controller/Adminhtml/Edit/Popup.php | 4 +- .../ResourceModel/Indexer/Stock/Grouped.php | 2 +- .../Product/Indexer/Price/Grouped.php | 2 +- .../Pricing/Price/ConfiguredPrice.php | 1 - .../Test/Unit/Model/ProductTest.php | 5 +- .../Product/Link/RelationPersisterTest.php | 6 +- .../Product/Quote/Plugin/InitializerTest.php | 8 +-- .../GroupedProductDataProviderTest.php | 8 +-- .../Product/Form/Modifier/CustomOptions.php | 4 +- .../Product/Form/Modifier/Grouped.php | 36 ++++------ .../Product/GroupedProductDataProvider.php | 3 +- .../Block/Adminhtml/Export/Filter.php | 2 +- .../Grid/Column/Renderer/Download.php | 4 +- .../Adminhtml/Grid/Column/Renderer/Error.php | 4 +- .../Block/Adminhtml/Import/Frame/Result.php | 2 - .../Controller/Adminhtml/Export/Export.php | 8 +-- .../Controller/Adminhtml/Export/GetFilter.php | 2 +- .../Controller/Adminhtml/Export/Index.php | 2 +- .../Controller/Adminhtml/History/Index.php | 2 +- .../Controller/Adminhtml/Import.php | 2 - .../Controller/Adminhtml/Import/Download.php | 2 +- .../Controller/Adminhtml/Import/Index.php | 2 +- .../Controller/Adminhtml/Import/Start.php | 2 +- .../Controller/Adminhtml/Import/Validate.php | 6 +- .../Controller/Adminhtml/ImportResult.php | 3 +- .../Magento/ImportExport/Model/Export.php | 7 +- .../Model/Export/AbstractEntity.php | 2 +- .../Model/Export/Adapter/AbstractAdapter.php | 2 +- .../Model/Export/Config/Converter.php | 2 +- .../Magento/ImportExport/Model/History.php | 2 +- .../Magento/ImportExport/Model/Import.php | 4 +- .../Model/Import/AbstractSource.php | 2 - .../Model/Import/Config/Converter.php | 2 +- .../Magento/ImportExport/Model/Report/Csv.php | 2 +- .../ResourceModel/History/Collection.php | 2 +- .../ImportExport/Setup/UpgradeSchema.php | 3 +- .../CollectionByPagesIteratorTest.php | 2 +- .../Command/AbstractIndexerCommand.php | 4 +- .../Command/AbstractIndexerManageCommand.php | 2 +- .../Console/Command/IndexerReindexCommand.php | 6 +- .../Command/IndexerResetStateCommand.php | 2 - .../Console/Command/IndexerSetModeCommand.php | 8 +-- .../Magento/Indexer/Model/Config/Data.php | 1 - .../Indexer/Model/Processor/CleanCache.php | 2 +- .../Magento/Indexer/Setup/InstallData.php | 6 +- app/code/Magento/Indexer/Setup/Recurring.php | 2 +- .../Magento/Indexer/Setup/RecurringData.php | 2 +- .../Command/IndexerResetStateCommandTest.php | 2 +- .../Command/IndexerSetModeCommandTest.php | 2 +- .../Unit/Model/Indexer/CollectionTest.php | 2 +- .../Indexer/Test/Unit/Model/IndexerTest.php | 3 +- .../Indexer/DataCollectionTest.php | 4 +- .../BillingAddressChooserInterface.php | 2 +- .../DefaultBillingAddressChooser.php | 2 +- .../Magento/InstantPurchase/Model/Config.php | 1 - .../Model/InstantPurchaseChooser.php | 2 +- .../Model/InstantPurchaseOption.php | 2 +- .../DefaultShippingAddressChooser.php | 2 +- .../ShippingAddressChooserInterface.php | 2 +- .../ShippingMethodChooserInterface.php | 2 +- .../Magento/InstantPurchase/registration.php | 2 +- .../Controller/Adminhtml/Integration.php | 1 - .../Adminhtml/Integration/Delete.php | 4 +- .../Controller/Adminhtml/Integration/Edit.php | 2 +- .../Adminhtml/Integration/Index.php | 3 +- .../Controller/Adminhtml/Integration/Save.php | 4 +- .../Integration/Controller/Token/Access.php | 2 +- .../Integration/Cron/CleanExpiredTokens.php | 2 +- .../Integration/Model/AdminTokenService.php | 3 +- .../Model/ConfigBasedIntegrationManager.php | 2 +- .../Model/CustomerTokenService.php | 5 +- .../Integration/Model/IntegrationService.php | 5 +- .../Magento/Integration/Model/Oauth/Token.php | 1 - .../Model/Oauth/Token/RequestThrottler.php | 4 +- .../Integration/Model/OauthService.php | 4 +- .../Integration/Model/Plugin/Integration.php | 4 +- .../ResourceModel/Oauth/Token/RequestLog.php | 2 +- .../Magento/Integration/Setup/Recurring.php | 4 +- .../Magento/Integration/Setup/UpgradeData.php | 2 +- .../Adminhtml/Integration/DeleteTest.php | 2 +- .../Adminhtml/Integration/EditTest.php | 2 +- .../Adminhtml/Integration/SaveTest.php | 6 +- .../Test/Unit/Model/AdminTokenServiceTest.php | 2 - .../Config/Consolidated/ConverterTest.php | 2 +- .../Test/Unit/Model/Config/ConverterTest.php | 2 +- .../Config/Integration/ConverterTest.php | 2 +- .../Unit/Model/ConsolidatedConfigTest.php | 2 +- .../Unit/Model/CustomerTokenServiceTest.php | 3 - .../Test/Unit/Model/IntegrationConfigTest.php | 2 +- .../Test/Unit/Model/ManagerTest.php | 2 +- .../Unit/Model/Oauth/Token/ProviderTest.php | 2 +- .../Test/Unit/Model/Oauth/TokenTest.php | 5 +- .../Block/Navigation/FilterRenderer.php | 1 - .../Block/Navigation/State.php | 2 - ...ductAttributeFormBuildFrontTabObserver.php | 2 +- .../ProductAttributeGridBuildObserver.php | 2 +- .../Magento/Marketplace/Model/Partners.php | 2 +- .../Test/Unit/Model/PartnersTest.php | 2 +- .../view/adminhtml/templates/index.phtml | 6 +- app/code/Magento/MediaStorage/App/Media.php | 6 +- .../System/Config/System/Storage/Status.php | 1 + .../Model/File/Storage/Config.php | 2 +- .../Model/File/Storage/Response.php | 2 +- .../Model/File/Storage/Synchronization.php | 1 - .../Unit/Helper/File/Storage/DatabaseTest.php | 2 +- .../Asset/Plugin/CleanMergedJsCssTest.php | 2 +- app/code/Magento/Msrp/Helper/Data.php | 4 +- app/code/Magento/Msrp/Model/Config.php | 4 +- .../Model/ProductRender/MsrpPriceInfo.php | 2 - .../Msrp/Test/Unit/Helper/DataTest.php | 3 +- .../Quote/SetCanApplyMsrpObserverTest.php | 2 - .../Product/Form/Modifier/MsrpTest.php | 2 +- .../Listing/Collector/MsrpPriceTest.php | 5 +- .../Product/Form/Modifier/Msrp.php | 2 +- .../base/templates/product/price/msrp.phtml | 3 +- .../Block/Checkout/Address/Select.php | 4 +- .../Checkout/Address/ShippingSaved.php | 4 +- .../Controller/Checkout/Billing.php | 2 +- .../Controller/Checkout/OverviewPost.php | 2 +- .../Controller/Checkout/Shipping.php | 2 +- .../Model/Checkout/Type/Multishipping.php | 8 +-- .../Block/Checkout/Address/SelectTest.php | 8 ++- .../Test/Unit/Block/Checkout/SuccessTest.php | 3 +- .../Checkout/Address/EditAddressTest.php | 3 +- .../Checkout/Address/EditBillingTest.php | 3 +- .../Checkout/Address/EditShippingTest.php | 3 +- .../Checkout/Address/NewBillingTest.php | 3 +- .../Checkout/Address/NewShippingTest.php | 3 +- .../Model/Checkout/Type/MultishippingTest.php | 7 +- .../templates/checkout/shipping.phtml | 4 +- .../Model/Apm/Deployments.php | 2 +- .../NewRelicReporting/Model/Counter.php | 4 +- .../Model/Cron/ReportCounts.php | 4 +- .../Model/Cron/ReportNewRelicCron.php | 4 +- .../NewRelicReporting/Model/CronEvent.php | 2 +- .../Model/Observer/CheckConfig.php | 2 +- .../Test/Unit/Model/Apm/DeploymentsTest.php | 2 +- .../Test/Unit/Model/CounterTest.php | 6 +- .../Test/Unit/Model/Cron/ReportCountsTest.php | 4 +- .../Test/Unit/Model/CronEventTest.php | 2 +- .../Test/Unit/Model/Module/CollectTest.php | 14 ++-- .../Controller/Adminhtml/Queue/Preview.php | 2 +- .../Adminhtml/Subscriber/ExportCsv.php | 2 +- .../Adminhtml/Subscriber/ExportXml.php | 2 +- .../Controller/Adminhtml/Template/Preview.php | 2 +- .../Newsletter/Controller/Subscriber.php | 6 +- .../Controller/Subscriber/NewAction.php | 2 +- .../Newsletter/Model/ResourceModel/Queue.php | 2 +- .../Test/Unit/Controller/Manage/SaveTest.php | 9 ++- .../Unit/Model/CheckmoConfigProviderTest.php | 4 +- .../BeforeOrderPaymentSaveObserverTest.php | 2 +- .../System/Config/ExportTablerates.php | 2 +- .../Model/Config/Backend/Tablerate.php | 2 - .../Tablerate/CSV/ColumnNotFoundException.php | 1 - .../Carrier/Tablerate/CSV/RowParser.php | 1 - .../Test/Unit/Model/Carrier/FlatrateTest.php | 1 - .../Test/Unit/Model/Carrier/TablerateTest.php | 1 - .../Carrier/Tablerate/ImportTest.php | 2 +- .../Console/Command/GenerateVclCommand.php | 6 +- .../Exception/UnsupportedVarnishVersion.php | 1 - .../App/FrontController/VarnishPlugin.php | 8 +-- .../Magento/PageCache/Model/Cache/Server.php | 7 +- .../Model/Controller/Result/BuiltinPlugin.php | 8 +-- .../Model/Controller/Result/VarnishPlugin.php | 6 +- .../PageCache/Model/Varnish/VclGenerator.php | 4 +- .../Model/Varnish/VclTemplateLocator.php | 4 +- .../PageCache/Observer/FlushFormKey.php | 2 +- .../Unit/App/CacheIdentifierPluginTest.php | 3 +- .../App/FrontController/VarnishPluginTest.php | 10 +-- .../Test/Unit/Model/Cache/ServerTest.php | 6 +- .../Controller/Result/BuiltinPluginTest.php | 12 ++-- .../Controller/Result/VarnishPluginTest.php | 10 +-- .../Test/Unit/Observer/FlushFormKeyTest.php | 2 +- .../Payment/Block/Transparent/Form.php | 6 +- .../Gateway/Command/CommandException.php | 1 - .../Payment/Gateway/Command/CommandPool.php | 4 +- .../Gateway/Command/GatewayCommand.php | 1 - .../Gateway/Data/Order/AddressAdapter.php | 4 +- .../Gateway/Data/Quote/AddressAdapter.php | 4 +- .../Gateway/Data/Quote/QuoteAdapter.php | 3 +- .../Payment/Gateway/Helper/SubjectReader.php | 2 +- .../Payment/Gateway/Http/ClientInterface.php | 2 - .../Gateway/Validator/CountryValidator.php | 1 - .../Gateway/Validator/ValidatorComposite.php | 1 - app/code/Magento/Payment/Helper/Data.php | 10 +-- app/code/Magento/Payment/Model/CcConfig.php | 2 +- .../Payment/Model/Checks/CanUseForCountry.php | 2 +- .../CanUseForCountry/CountryProvider.php | 4 +- app/code/Magento/Payment/Model/Config.php | 1 - .../Payment/Model/Config/SchemaLocator.php | 2 - .../Payment/Model/IframeConfigProvider.php | 2 +- .../Payment/Model/PaymentMethodList.php | 1 - .../Block/Adminhtml/Transparent/FormTest.php | 3 - .../Payment/Test/Unit/Block/FormTest.php | 2 - .../Payment/Test/Unit/Block/InfoTest.php | 2 - .../Test/Unit/Block/Transparent/FormTest.php | 1 - .../Test/Unit/Gateway/Config/ConfigTest.php | 2 +- .../Gateway/Config/ConfigValueHandlerTest.php | 2 +- .../Gateway/Config/ValueHandlerPoolTest.php | 3 +- .../Gateway/Data/Order/AddressAdapterTest.php | 2 +- .../Gateway/Data/Order/OrderAdapterTest.php | 2 +- .../Data/PaymentDataObjectFactoryTest.php | 4 +- .../Gateway/Data/PaymentDataObjectTest.php | 6 +- .../Gateway/Data/Quote/AddressAdapterTest.php | 2 +- .../Gateway/Data/Quote/QuoteAdapterTest.php | 2 +- .../Unit/Gateway/Http/Client/ZendTest.php | 6 +- .../Payment/Test/Unit/Helper/DataTest.php | 4 +- .../Payment/Test/Unit/Model/CartTest.php | 2 +- .../Unit/Model/Checks/CanUseCheckoutTest.php | 2 +- .../Model/Checks/CanUseForCurrencyTest.php | 2 +- .../Unit/Model/Checks/CanUseInternalTest.php | 2 +- .../Test/Unit/Model/Checks/CompositeTest.php | 2 +- .../Model/Checks/SpecificationFactoryTest.php | 2 +- .../Unit/Model/Checks/TotalMinMaxTest.php | 2 +- .../Test/Unit/Model/Checks/ZeroTotalTest.php | 2 +- .../Unit/Model/Config/SchemaLocatorTest.php | 2 +- .../Model/Config/Source/AllmethodsTest.php | 6 +- .../Source/AllspecificcountriesTest.php | 2 +- .../Unit/Model/Config/Source/CctypeTest.php | 2 +- .../Payment/Test/Unit/Model/InfoTest.php | 2 +- .../Unit/Model/Method/AbstractMethodTest.php | 2 +- .../Payment/Test/Unit/Model/Method/CcTest.php | 2 +- .../Test/Unit/Model/MethodListTest.php | 2 +- .../Test/Unit/Model/Source/CctypeTest.php | 2 +- .../Test/Unit/Model/Source/InvoiceTest.php | 2 +- .../Billing/Agreement/View/Tab/Orders.php | 6 +- .../Block/Adminhtml/Payflowpro/CcForm.php | 1 - .../Config/Field/Enable/AbstractEnable.php | 2 +- .../System/Config/Fieldset/Expanded.php | 2 - .../Block/Express/InContext/Component.php | 6 +- .../Express/InContext/Minicart/Button.php | 9 ++- .../Magento/Paypal/Block/Express/Shortcut.php | 2 +- .../Paypal/Block/Payflow/Advanced/Info.php | 1 - .../Block/Payflow/Customer/CardRenderer.php | 1 - .../Transparent/RequestSecureToken.php | 1 - .../Paypal/Controller/Express/GetToken.php | 2 +- .../Controller/Transparent/Response.php | 4 +- .../Magento/Paypal/Model/AbstractConfig.php | 15 ++-- .../Model/BillingAgreementConfigProvider.php | 2 +- app/code/Magento/Paypal/Model/Config.php | 7 +- .../Paypal/Model/Config/Rules/Reader.php | 3 +- .../Config/Structure/Element/FieldPlugin.php | 2 +- .../Paypal/Model/Config/StructurePlugin.php | 2 +- app/code/Magento/Paypal/Model/Express.php | 4 +- .../Paypal/Model/Express/QuotePlugin.php | 4 +- .../Paypal/Model/ExpressConfigProvider.php | 2 +- app/code/Magento/Paypal/Model/Hostedpro.php | 1 - .../Paypal/Model/Hostedpro/Request.php | 2 +- app/code/Magento/Paypal/Model/Info.php | 1 + app/code/Magento/Paypal/Model/Ipn.php | 1 - .../Method/Checks/SpecificationPlugin.php | 4 +- .../Payflow/Service/Request/SecureToken.php | 4 +- .../Payflow/Service/Response/Transaction.php | 4 +- .../Response/Validator/ResponseValidator.php | 4 +- .../Paypal/Model/Payflow/Transparent.php | 14 ++-- .../Payflow/Ui/TokenUiComponentProvider.php | 2 +- app/code/Magento/Paypal/Model/Pro.php | 1 - .../Paypal/Model/Report/Settlement.php | 3 +- .../Model/System/Config/Backend/Cert.php | 1 - .../AddBillingAgreementToSessionObserver.php | 2 +- .../Observer/AddPaypalShortcutsObserver.php | 7 +- .../Observer/HtmlTransactionIdObserver.php | 2 +- ...rictAdminBillingAgreementUsageObserver.php | 2 +- .../Observer/SaveOrderAfterSubmitObserver.php | 2 +- .../SetResponseAfterSaveOrderObserver.php | 2 +- .../Adminhtml/Store/SwitcherPluginTest.php | 4 +- .../Transparent/RequestSecureTokenTest.php | 2 - .../Test/Unit/Cron/FetchReportsTest.php | 2 +- .../CustomerData/BillingAgreementTest.php | 2 +- .../Paypal/Test/Unit/Helper/BackendTest.php | 1 - .../Test/Unit/Helper/Shortcut/FactoryTest.php | 2 +- .../Test/Unit/Model/AbstractConfigTest.php | 4 +- .../Test/Unit/Model/AbstractConfigTesting.php | 3 +- .../Paypal/Test/Unit/Model/Api/NvpTest.php | 2 +- .../Paypal/Test/Unit/Model/CartTest.php | 6 +- .../Structure/Element/FieldPluginTest.php | 6 +- .../Unit/Model/Config/StructurePluginTest.php | 6 +- .../Test/Unit/Model/Express/CheckoutTest.php | 2 +- .../Method/Checks/SpecificationPluginTest.php | 8 +-- .../Service/Request/SecureTokenTest.php | 2 +- .../CreditCardValidationHandlerTest.php | 1 - .../Response/Handler/FraudHandlerTest.php | 21 ++---- .../Service/Response/TransactionTest.php | 4 +- .../Response/Validator/CVV2MatchTest.php | 2 +- .../Validator/ResponseValidatorTest.php | 4 +- .../Unit/Model/Payflow/TransparentTest.php | 2 +- .../Test/Unit/Model/PayflowConfigTest.php | 4 +- .../Test/Unit/Model/PayflowExpressTest.php | 2 +- .../Test/Unit/Model/PayflowlinkTest.php | 2 +- .../Paypal/Test/Unit/Model/PayflowproTest.php | 3 +- .../Method/Billing/AbstractAgreementStub.php | 2 +- .../Paypal/Test/Unit/Model/ProTest.php | 4 +- .../AddPaypalShortcutsObserverTest.php | 1 - .../templates/payflowpro/vault.phtml | 1 + .../templates/system/config/api_wizard.phtml | 2 +- .../templates/transparent/form.phtml | 2 +- .../templates/billing/agreement/view.phtml | 12 ++-- .../onepage/success/billing_agreement.phtml | 1 - .../view/frontend/templates/hss/form.phtml | 2 - .../templates/hss/review/button.phtml | 2 - .../frontend/templates/partner/logo.phtml | 1 - .../frontend/templates/payflowlink/form.phtml | 2 - .../templates/payflowlink/redirect.phtml | 2 - .../frontend/templates/payment/mark.phtml | 4 +- .../Magento/Persistent/Controller/Index.php | 6 +- .../Controller/Index/ExpressCheckout.php | 2 +- .../Controller/Index/SaveMethod.php | 2 +- .../Controller/Index/UnsetCookie.php | 2 +- .../Checkout/AddressDataProcessorPlugin.php | 6 +- .../Model/Checkout/ConfigProviderPlugin.php | 6 +- .../Observer/ClearExpiredCronJobObserver.php | 2 - .../SetLoadPersistentQuoteObserver.php | 3 +- .../Test/Unit/Model/ObserverTest.php | 1 - ...uestPersistenceOnEmptyCartObserverTest.php | 4 +- ...PersistentCookieOnRegisterObserverTest.php | 5 +- .../Magento/ProductAlert/Controller/Add.php | 2 +- .../ProductAlert/Controller/Add/Price.php | 10 +-- .../ProductAlert/Controller/Add/Stock.php | 6 +- .../Controller/Add/TestObserver.php | 2 +- .../Controller/Unsubscribe/Price.php | 6 +- .../Controller/Unsubscribe/PriceAll.php | 2 +- .../Controller/Unsubscribe/Stock.php | 6 +- .../Controller/Unsubscribe/StockAll.php | 2 +- .../Magento/ProductAlert/Setup/Recurring.php | 4 +- .../Catalog/Product/Gallery/ReadHandler.php | 8 +-- .../Media/ExternalVideoEntryConverter.php | 4 +- .../Product/Attribute/Media/VideoEntry.php | 2 +- .../ProductVideo/Setup/InstallSchema.php | 2 +- .../Product/Gallery/RetrieveImageTest.php | 2 - .../Observer/ChangeTemplateObserverTest.php | 2 +- .../Api/GuestShipmentEstimationInterface.php | 1 - .../Quote/Model/AddressAdditionalData.php | 2 +- .../Model/AddressAdditionalDataProcessor.php | 1 - .../Quote/Model/BillingAddressManagement.php | 5 +- .../Quote/Model/Cart/CartTotalRepository.php | 6 +- .../Magento/Quote/Model/Cart/TotalSegment.php | 2 +- app/code/Magento/Quote/Model/Cart/Totals.php | 2 +- .../Magento/Quote/Model/Cart/Totals/Item.php | 2 +- .../Quote/Model/Cart/TotalsAdditionalData.php | 2 +- .../Magento/Quote/Model/CouponManagement.php | 2 +- .../Quote/Model/CustomerManagement.php | 4 +- .../GuestBillingAddressManagement.php | 2 +- .../GuestCart/GuestCartItemRepository.php | 1 - .../Model/GuestCart/GuestCartManagement.php | 6 +- .../Model/GuestCart/GuestCartRepository.php | 2 +- .../GuestCart/GuestCartTotalManagement.php | 2 +- .../Model/GuestCart/GuestCouponManagement.php | 2 +- .../GuestPaymentMethodManagement.php | 2 +- .../GuestShippingAddressManagement.php | 1 - .../Magento/Quote/Model/QueryResolver.php | 2 +- app/code/Magento/Quote/Model/Quote.php | 4 +- .../Quote/Address/BillingAddressPersister.php | 6 +- .../Model/Quote/Address/ToOrderAddress.php | 2 +- .../Quote/Model/Quote/Address/Total.php | 2 +- .../Quote/Model/Quote/Item/AbstractItem.php | 2 +- .../Model/Quote/Item/CartItemPersister.php | 8 +-- .../Quote/Model/Quote/Item/Compare.php | 4 +- .../Quote/Model/Quote/Item/Processor.php | 8 +-- .../Quote/Model/Quote/Item/ToOrderItem.php | 4 +- .../Quote/Model/Quote/Item/Updater.php | 2 +- .../Model/Quote/Payment/ToOrderPayment.php | 6 +- .../ShippingAssignmentProcessor.php | 10 +-- .../ShippingAssignment/ShippingProcessor.php | 2 +- .../Quote/Model/Quote/TotalsCollector.php | 2 +- .../Quote/Model/Quote/TotalsCollectorList.php | 1 - .../Magento/Quote/Model/QuoteRepository.php | 15 ++-- .../Model/QuoteRepository/LoadHandler.php | 2 +- .../Plugin/AccessChangeQuoteControl.php | 2 +- .../Model/QuoteRepository/SaveHandler.php | 4 +- .../Magento/Quote/Model/QuoteValidator.php | 4 +- .../ResourceModel/Quote/Item/Collection.php | 2 +- .../Quote/Model/ShippingAddressManagement.php | 1 - .../Model/Webapi/ParamOverriderCartId.php | 2 +- .../Backend/CustomerQuoteObserver.php | 4 +- .../Quote/Observer/Webapi/SubmitObserver.php | 2 +- .../Setup/ConvertSerializedDataToJson.php | 2 +- app/code/Magento/Quote/Setup/UpgradeData.php | 2 +- .../Magento/Quote/Setup/UpgradeSchema.php | 2 +- .../GuestShippingMethodManagementTest.php | 6 +- .../Product/Plugin/UpdateQuoteItemsTest.php | 2 +- .../Test/Unit/Model/Quote/AddressTest.php | 24 +++---- .../Unit/Model/Quote/Item/CompareTest.php | 26 ++++--- .../Quote/Payment/ToOrderPaymentTest.php | 2 +- .../Test/Unit/Model/Quote/PaymentTest.php | 4 +- .../Test/Unit/Model/Quote/RelationTest.php | 2 +- .../ShippingAssignmentProcessorTest.php | 16 ++--- .../ShippingProcessorTest.php | 10 +-- .../Plugin/AccessChangeQuoteControlTest.php | 6 +- .../Plugin/AuthorizationTest.php | 2 +- .../Model/QuoteRepository/SaveHandlerTest.php | 20 +++--- .../Test/Unit/Model/QuoteRepositoryTest.php | 3 +- .../Quote/Item/CollectionTest.php | 2 +- .../Model/ShippingAddressManagementTest.php | 3 +- .../Model/Webapi/ParamOverriderCartIdTest.php | 1 - .../Address/CollectTotalsObserverTest.php | 4 +- .../Notification/MarkUserNotified.php | 4 +- .../Model/Condition/CanViewNotification.php | 4 +- .../Model/ResourceModel/Viewer/Logger.php | 2 +- .../Notification/MarkUserNotifiedTest.php | 8 +-- .../Condition/CanViewNotificationTest.php | 8 +-- .../Magento/Reports/Block/Product/Viewed.php | 2 +- .../Report/Customer/ExportAccountsCsv.php | 2 +- .../Report/Customer/ExportAccountsExcel.php | 2 +- .../Report/Customer/ExportOrdersCsv.php | 2 +- .../Report/Customer/ExportOrdersExcel.php | 2 +- .../Report/Customer/ExportTotalsCsv.php | 2 +- .../Report/Customer/ExportTotalsExcel.php | 2 +- .../Report/Product/ExportLowstockCsv.php | 2 +- .../Report/Product/ExportLowstockExcel.php | 2 +- .../Report/Product/ExportSoldCsv.php | 2 +- .../Report/Product/ExportSoldExcel.php | 2 +- .../Report/Product/ExportViewedCsv.php | 2 +- .../Report/Product/ExportViewedExcel.php | 2 +- .../Report/Review/ExportCustomerCsv.php | 2 +- .../Report/Review/ExportCustomerExcel.php | 2 +- .../Report/Review/ExportProductCsv.php | 2 +- .../Report/Review/ExportProductDetailCsv.php | 2 +- .../Review/ExportProductDetailExcel.php | 2 +- .../Report/Review/ExportProductExcel.php | 2 +- .../Report/Sales/ExportBestsellersCsv.php | 2 +- .../Report/Sales/ExportBestsellersExcel.php | 2 +- .../Report/Sales/ExportCouponsCsv.php | 2 +- .../Report/Sales/ExportCouponsExcel.php | 2 +- .../Report/Sales/ExportInvoicedCsv.php | 2 +- .../Report/Sales/ExportInvoicedExcel.php | 2 +- .../Report/Sales/ExportRefundedCsv.php | 2 +- .../Report/Sales/ExportRefundedExcel.php | 2 +- .../Adminhtml/Report/Sales/ExportSalesCsv.php | 2 +- .../Report/Sales/ExportSalesExcel.php | 2 +- .../Report/Sales/ExportShippingCsv.php | 2 +- .../Report/Sales/ExportShippingExcel.php | 2 +- .../Adminhtml/Report/Sales/ExportTaxCsv.php | 2 +- .../Adminhtml/Report/Sales/ExportTaxExcel.php | 2 +- .../Report/Shopcart/ExportAbandonedCsv.php | 2 +- .../Report/Shopcart/ExportAbandonedExcel.php | 2 +- .../Report/Shopcart/ExportProductCsv.php | 2 +- .../Report/Shopcart/ExportProductExcel.php | 2 +- app/code/Magento/Reports/Helper/Data.php | 1 - .../ResourceModel/Quote/Item/Collection.php | 4 +- app/code/Magento/Reports/Setup/Recurring.php | 4 +- .../Test/Unit/Block/Product/ComparedTest.php | 6 +- .../Report/Customer/AccountsTest.php | 2 +- .../Adminhtml/Report/Customer/OrdersTest.php | 2 +- .../Adminhtml/Report/Customer/TotalsTest.php | 2 +- .../Report/Product/DownloadsTest.php | 2 +- .../Report/Product/ExportDownloadsCsvTest.php | 2 - .../Product/ExportDownloadsExcelTest.php | 2 - .../Report/Product/ExportLowstockCsvTest.php | 2 - .../Product/ExportLowstockExcelTest.php | 2 - .../Report/Product/ExportSoldCsvTest.php | 2 - .../Report/Product/ExportSoldExcelTest.php | 2 - .../Report/Product/ExportViewedCsvTest.php | 2 - .../Report/Product/ExportViewedExcelTest.php | 2 - .../Adminhtml/Report/Product/LowstockTest.php | 1 - .../Adminhtml/Report/Product/SoldTest.php | 1 - .../Adminhtml/Report/Product/ViewedTest.php | 2 +- .../ResourceModel/Order/CollectionTest.php | 4 +- .../Report/Product/ViewedTest.php | 1 - .../Report/Quote/CollectionTest.php | 4 +- .../Test/Unit/Block/Html/Head/ConfigTest.php | 2 +- .../Test/Unit/Model/FileManagerTest.php | 2 +- .../Review/Controller/Adminhtml/Product.php | 2 +- .../Controller/Adminhtml/Product/Delete.php | 2 +- .../Controller/Adminhtml/Product/Edit.php | 2 +- .../Controller/Adminhtml/Product/Index.php | 2 +- .../Adminhtml/Product/JsonProductInfo.php | 10 +-- .../Adminhtml/Product/MassDelete.php | 4 +- .../Adminhtml/Product/MassUpdateStatus.php | 4 +- .../Adminhtml/Product/MassVisibleIn.php | 4 +- .../Adminhtml/Product/NewAction.php | 2 +- .../Controller/Adminhtml/Product/Pending.php | 2 +- .../Controller/Adminhtml/Product/Post.php | 4 +- .../Adminhtml/Product/ProductGrid.php | 8 +-- .../Adminhtml/Product/RatingItems.php | 8 +-- .../Adminhtml/Product/ReviewGrid.php | 8 +-- .../Controller/Adminhtml/Product/Save.php | 2 +- .../Controller/Adminhtml/Rating/Delete.php | 2 +- .../Controller/Adminhtml/Rating/Edit.php | 2 +- .../Controller/Adminhtml/Rating/Index.php | 2 +- .../Controller/Adminhtml/Rating/NewAction.php | 2 +- .../Controller/Adminhtml/Rating/Save.php | 2 +- .../Magento/Review/Controller/Customer.php | 2 +- .../Review/Controller/Customer/Index.php | 2 +- .../Review/Controller/Product/ListAction.php | 3 +- .../Review/Controller/Product/ListAjax.php | 2 +- .../Review/Controller/Product/Post.php | 2 +- .../Review/Controller/Product/View.php | 2 +- .../Review/Product/Collection.php | 2 +- .../Test/Unit/Block/Product/ReviewTest.php | 2 +- .../Review/Test/Unit/Model/RatingTest.php | 2 +- .../Listing/Columns/ReviewActionsTest.php | 2 +- .../Component/Listing/Columns/StatusTest.php | 2 +- .../Ui/Component/Listing/Columns/TypeTest.php | 2 +- .../Listing/Columns/VisibilityTest.php | 2 +- .../Product/Form/Modifier/ReviewTest.php | 2 +- .../Product/ReviewDataProviderTest.php | 2 +- .../Ui/Component/Listing/Columns/Status.php | 4 +- .../Component/Listing/Columns/Visibility.php | 6 +- .../Product/Form/Modifier/Review.php | 9 ++- .../Product/ReviewDataProvider.php | 5 +- .../Rss/Test/Unit/Model/UrlBuilderTest.php | 3 +- .../Adminhtml/Items/Column/DefaultColumn.php | 2 +- .../Adminhtml/Order/Create/AbstractCreate.php | 2 +- .../Order/Create/Form/AbstractForm.php | 1 - .../Sales/Block/Adminhtml/Order/Totals.php | 2 +- .../Magento/Sales/Block/Order/History.php | 4 +- app/code/Magento/Sales/Block/Order/Info.php | 4 +- .../AbstractController/OrderLoader.php | 2 +- .../AbstractCreditmemo/Pdfcreditmemos.php | 10 +-- .../AbstractCreditmemo/PrintAction.php | 2 +- .../Invoice/AbstractInvoice/Pdfinvoices.php | 10 +-- .../Invoice/AbstractInvoice/PrintAction.php | 2 +- .../Sales/Controller/Adminhtml/Order.php | 4 +- .../Adminhtml/Order/AddressSave.php | 20 +++--- .../Controller/Adminhtml/Order/Create.php | 2 +- .../Adminhtml/Order/Create/LoadBlock.php | 2 +- .../Adminhtml/Order/Create/Reorder.php | 2 +- .../Order/Create/ShowUpdateResult.php | 2 +- .../Order/Creditmemo/PrintAction.php | 2 +- .../Adminhtml/Order/CreditmemoLoader.php | 2 +- .../Adminhtml/Order/Invoice/AddComment.php | 10 +-- .../Adminhtml/Order/Invoice/Save.php | 2 +- .../Adminhtml/Order/Invoice/UpdateQty.php | 6 +- .../Adminhtml/Order/Invoice/View.php | 2 +- .../Controller/Adminhtml/Order/MassCancel.php | 4 +- .../Controller/Adminhtml/Order/MassHold.php | 6 +- .../Controller/Adminhtml/Order/MassUnhold.php | 4 +- .../Adminhtml/Order/Pdfcreditmemos.php | 14 ++-- .../Controller/Adminhtml/Order/Pdfdocs.php | 16 ++--- .../Adminhtml/Order/Pdfinvoices.php | 13 ++-- .../Adminhtml/Order/Pdfshipments.php | 12 ++-- .../Adminhtml/Order/Status/Assign.php | 2 +- .../Adminhtml/Order/Status/Edit.php | 2 +- .../Adminhtml/Order/Status/Index.php | 2 +- .../Adminhtml/Order/Status/NewAction.php | 2 +- .../Sales/Controller/Adminhtml/Order/View.php | 2 - .../AbstractShipment/Pdfshipments.php | 6 +- .../Shipment/AbstractShipment/PrintAction.php | 4 +- .../Controller/Adminhtml/Transactions.php | 3 +- .../Download/DownloadCustomOption.php | 4 +- .../Magento/Sales/Controller/Guest/View.php | 4 +- .../Sales/Controller/Order/History.php | 2 +- app/code/Magento/Sales/Helper/Guest.php | 4 +- .../Magento/Sales/Model/AbstractNotifier.php | 2 +- .../Magento/Sales/Model/AdminOrder/Create.php | 19 +++-- .../Sales/Model/AdminOrder/EmailSender.php | 2 +- .../Model/CronJob/CleanExpiredOrders.php | 2 +- .../Sales/Model/Order/AddressRepository.php | 8 +-- .../Order/Creditmemo/Sender/EmailSender.php | 2 +- .../Sales/Model/Order/CreditmemoNotifier.php | 2 +- .../Model/Order/CreditmemoRepository.php | 9 ++- .../Sales/Model/Order/Email/Sender.php | 2 +- .../Email/Sender/CreditmemoCommentSender.php | 4 +- .../Order/Email/Sender/CreditmemoSender.php | 6 +- .../Email/Sender/InvoiceCommentSender.php | 4 +- .../Order/Email/Sender/InvoiceSender.php | 4 +- .../Order/Email/Sender/OrderCommentSender.php | 4 +- .../Model/Order/Email/Sender/OrderSender.php | 4 +- .../Email/Sender/ShipmentCommentSender.php | 4 +- .../Order/Email/Sender/ShipmentSender.php | 6 +- .../Sales/Model/Order/InvoiceNotifier.php | 2 +- .../Sales/Model/Order/InvoiceRepository.php | 4 +- .../Sales/Model/Order/ItemRepository.php | 3 +- .../Sales/Model/Order/OrderValidator.php | 1 - .../Magento/Sales/Model/Order/Payment.php | 5 +- .../Sales/Model/Order/Payment/Info.php | 4 +- .../Sales/Model/Order/Payment/Processor.php | 1 - .../Order/Payment/State/AuthorizeCommand.php | 2 +- .../Order/Payment/State/CaptureCommand.php | 2 +- .../Order/Payment/State/OrderCommand.php | 2 +- .../RegisterCaptureNotificationCommand.php | 2 +- .../Order/Payment/Transaction/Repository.php | 5 +- .../OrderedProductAvailabilityChecker.php | 2 +- .../Model/Order/Shipment/TrackRepository.php | 1 - .../Model/Order/ShipmentDocumentFactory.php | 10 +-- .../Sales/Model/Order/ShipmentFactory.php | 2 - .../Sales/Model/Order/ShipmentRepository.php | 6 +- .../Magento/Sales/Model/Order/Shipping.php | 2 +- .../Sales/Model/Order/ShippingTotal.php | 2 +- .../Model/Order/Status/HistoryRepository.php | 1 - .../Model/Order/Validation/CanInvoice.php | 2 +- .../Model/Order/Validation/InvoiceOrder.php | 1 - .../Model/Order/Validation/RefundInvoice.php | 2 +- .../Model/Order/Validation/ShipOrder.php | 2 +- .../Magento/Sales/Model/OrderNotifier.php | 2 +- .../Magento/Sales/Model/OrderRepository.php | 2 +- .../Model/ResourceModel/EntityAbstract.php | 2 +- .../Model/ResourceModel/Grid/Collection.php | 2 +- .../Sales/Model/ResourceModel/Order.php | 7 +- .../Model/ResourceModel/Order/Address.php | 2 +- .../Order/Address/Collection.php | 2 +- .../Model/ResourceModel/Order/Creditmemo.php | 4 -- .../Order/Creditmemo/Comment.php | 2 +- .../Model/ResourceModel/Order/Invoice.php | 4 -- .../ResourceModel/Order/Invoice/Comment.php | 2 +- .../Order/Invoice/Grid/Collection.php | 2 +- .../ResourceModel/Order/Invoice/Relation.php | 2 +- .../ResourceModel/Order/Item/Collection.php | 2 +- .../Model/ResourceModel/Order/Payment.php | 1 - .../Model/ResourceModel/Order/Shipment.php | 3 - .../ResourceModel/Order/Shipment/Comment.php | 2 +- .../ResourceModel/Order/Shipment/Relation.php | 2 +- .../ResourceModel/Order/Shipment/Track.php | 2 +- .../Model/ResourceModel/Order/Status.php | 5 -- .../ResourceModel/Order/Status/History.php | 2 +- .../Model/ResourceModel/Sale/Collection.php | 4 +- app/code/Magento/Sales/Model/ShipOrder.php | 2 +- .../Observer/GridProcessAddressChange.php | 2 +- .../Magento/Sales/Setup/UpgradeSchema.php | 2 +- .../Adminhtml/Order/Create/Items/GridTest.php | 3 +- .../Adminhtml/Order/View/Tab/HistoryTest.php | 4 +- .../Invoice/AbstractInvoice/EmailTest.php | 4 +- .../Adminhtml/Order/Create/ReorderTest.php | 2 +- .../Adminhtml/Order/Creditmemo/SaveTest.php | 9 ++- .../Adminhtml/Order/Invoice/CancelTest.php | 1 - .../Adminhtml/Order/Invoice/CaptureTest.php | 1 - .../Order/Invoice/PrintActionTest.php | 1 - .../Adminhtml/Order/Invoice/SaveTest.php | 1 - .../Test/Unit/Cron/CleanExpiredQuotesTest.php | 2 +- .../Sales/Test/Unit/Helper/AdminTest.php | 2 - .../Sales/Test/Unit/Helper/ReorderTest.php | 2 +- .../Test/Unit/Model/AdminOrder/CreateTest.php | 3 +- .../Unit/Model/AdminOrder/EmailSenderTest.php | 2 +- ...ggregateSalesReportBestsellersDataTest.php | 2 +- .../AggregateSalesReportInvoicedDataTest.php | 2 +- .../AggregateSalesReportOrderDataTest.php | 2 +- .../AggregateSalesReportRefundedDataTest.php | 2 +- .../Test/Unit/Model/InvoiceOrderTest.php | 4 +- .../Test/Unit/Model/InvoiceRepositoryTest.php | 2 +- .../Unit/Model/Order/Address/RendererTest.php | 10 +-- .../CreateQuantityValidatorTest.php | 4 +- .../Order/CreditmemoDocumentFactoryTest.php | 18 ++--- .../Test/Unit/Model/Order/CreditmemoTest.php | 16 +++-- .../CreditmemoCommentIdentityTest.php | 2 +- .../Container/CreditmemoIdentityTest.php | 2 +- .../Container/InvoiceCommentIdentityTest.php | 2 +- .../Email/Container/InvoiceIdentityTest.php | 2 +- .../Container/OrderCommentIdentityTest.php | 2 +- .../Email/Container/OrderIdentityTest.php | 2 +- .../Container/ShipmentCommentIdentityTest.php | 2 +- .../Email/Container/ShipmentIdentityTest.php | 2 +- .../Order/Email/Container/TemplateTest.php | 2 +- .../Email/Sender/OrderCommentSenderTest.php | 2 +- .../Test/Unit/Model/Order/InvoiceTest.php | 7 +- .../Sales/Test/Unit/Model/Order/ItemTest.php | 2 +- .../Unit/Model/Order/Payment/InfoTest.php | 2 +- .../Operations/CaptureOperationTest.php | 2 - .../OrderProductAvailabilityCheckerTest.php | 2 +- .../UnavailableProductsProviderTest.php | 2 +- .../Validation/QuantityValidatorTest.php | 2 +- .../Validation/TrackValidatorTest.php | 2 +- .../Order/ShipmentDocumentFactoryTest.php | 10 +-- .../Order/Status/History/ValidatorTest.php | 2 +- .../Model/Order/Total/Config/BaseTest.php | 27 +++---- .../Order/Plugin/AuthorizationTest.php | 4 +- .../Sales/Test/Unit/Model/ShipOrderTest.php | 4 +- .../Test/Unit/Model/Status/ListStatusTest.php | 4 +- .../Component/Listing/Column/AddressTest.php | 1 - .../Listing/Column/CustomerGroupTest.php | 2 +- .../Ui/Component/DataProvider/Document.php | 4 +- .../Ui/Component/Listing/Column/Address.php | 3 +- .../Listing/Column/Creditmemo/State.php | 2 +- .../Listing/Column/CustomerGroup.php | 5 +- .../Listing/Column/Invoice/State.php | 2 +- .../Listing/Column/PaymentMethod.php | 2 +- .../Ui/Component/Listing/Column/Price.php | 2 +- .../Listing/Column/PurchasedPrice.php | 2 +- .../Ui/Component/Listing/Column/Status.php | 2 +- .../templates/order/create/abstract.phtml | 2 +- .../templates/order/create/form/address.phtml | 4 +- .../templates/order/create/items/grid.phtml | 4 +- .../templates/order/create/totals/tax.phtml | 4 +- .../order/creditmemo/create/items.phtml | 8 +-- .../order/creditmemo/view/items.phtml | 8 +-- .../order/invoice/create/items.phtml | 8 +-- .../templates/order/invoice/view/items.phtml | 8 +-- .../templates/order/totals/tax.phtml | 4 +- .../templates/order/view/items.phtml | 8 +-- .../view/frontend/templates/order/items.phtml | 8 ++- .../Model/Plugin/Order/ReturnToStockOrder.php | 2 +- .../InvoiceRefundCreationArguments.php | 6 +- .../OrderRefundCreationArguments.php | 2 +- .../Unit/Model/Order/ReturnProcessorTest.php | 2 +- .../Plugin/Order/ReturnToStockOrderTest.php | 6 +- .../InvoiceRefundCreationArgumentsTest.php | 8 +-- .../OrderRefundCreationArgumentsTest.php | 10 +-- .../Adminhtml/Promo/Quote/Generate.php | 1 - .../SalesRule/Model/Converter/ToDataModel.php | 4 +- .../SalesRule/Model/Converter/ToModel.php | 2 +- .../SalesRule/Model/CouponRepository.php | 1 - .../Magento/SalesRule/Model/Data/Rule.php | 1 - .../Plugin/QuoteConfigProductAttributes.php | 2 - .../Model/ResourceModel/ReadHandler.php | 1 - .../ResourceModel/Report/Rule/Createdat.php | 2 +- .../Model/ResourceModel/SaveHandler.php | 1 - .../Action/Discount/CalculatorFactory.php | 12 ++-- .../Model/Rule/Metadata/ValueProvider.php | 5 +- .../SalesRule/Model/RuleRepository.php | 1 - .../Magento/SalesRule/Model/Validator.php | 1 + .../Magento/SalesRule/Setup/UpgradeSchema.php | 4 +- .../Promo/Quote/Edit/DeleteButtonTest.php | 2 +- .../Unit/Model/Converter/ToDataModelTest.php | 1 - .../Model/ResourceModel/ReadHandlerTest.php | 3 +- .../ResourceModel/Report/CollectionTest.php | 8 ++- .../ResourceModel/Rule/DateApplierTest.php | 2 - .../Model/ResourceModel/SaveHandlerTest.php | 4 +- .../Unit/Model/Rule/Condition/ProductTest.php | 27 ++++--- .../Model/ResourceModel/Meta.php | 2 +- .../Model/ResourceModel/Profile.php | 1 - .../Observer/SequenceCreatorObserver.php | 4 +- .../Command/SampleDataRemoveCommand.php | 14 ++-- .../Command/SampleDataResetCommand.php | 2 +- .../Magento/SampleData/Model/Dependency.php | 2 +- .../Command/SampleDataDeployCommandTest.php | 10 +-- .../Controller/Adminhtml/Synonyms/Edit.php | 8 +-- .../Controller/Adminhtml/Term/Delete.php | 2 +- .../Search/Controller/Adminhtml/Term/Edit.php | 4 +- .../Adminhtml/Term/ExportSearchCsv.php | 4 +- .../Adminhtml/Term/ExportSearchExcel.php | 4 +- .../Controller/Adminhtml/Term/MassDelete.php | 2 +- .../Controller/Adminhtml/Term/NewAction.php | 2 +- .../Controller/Adminhtml/Term/Report.php | 2 +- .../Search/Controller/Adminhtml/Term/Save.php | 4 +- .../Search/Controller/Ajax/Suggest.php | 2 +- .../Search/Controller/Term/Popular.php | 2 +- app/code/Magento/Search/Helper/Data.php | 2 +- app/code/Magento/Search/Model/Query.php | 9 ++- .../Magento/Search/Model/QueryFactory.php | 2 +- .../Search/Model/ResourceModel/Query.php | 1 - .../Model/ResourceModel/Query/Collection.php | 1 - .../Search/Model/Synonym/DataProvider.php | 2 +- .../Magento/Search/Model/SynonymReader.php | 1 - .../Controller/Adminhtml/Ajax/SuggestTest.php | 2 +- .../Adminhtml/Term/ExportSearchCsvTest.php | 4 +- .../Controller/Adminhtml/Term/IndexTest.php | 2 +- .../Adminhtml/Term/MassDeleteTest.php | 2 +- .../Controller/Adminhtml/Term/ReportTest.php | 6 +- .../Test/Unit/Model/AutocompleteTest.php | 2 +- .../Test/Unit/Model/EngineResolverTest.php | 2 +- .../Test/Unit/Model/QueryFactoryTest.php | 6 +- .../Model/SearchEngine/MenuBuilderTest.php | 2 - .../Ui/Component/Listing/Column/StoreView.php | 4 +- .../Listing/Column/SynonymActions.php | 2 +- .../Ui/Component/Listing/Column/Website.php | 4 +- .../Listing/Column/Website/Options.php | 2 +- .../Security/Model/AdminSessionsManager.php | 4 +- .../Model/Plugin/AccountManagement.php | 2 +- .../Security/Model/Plugin/LoginController.php | 2 +- .../Magento/Security/Setup/UpgradeSchema.php | 2 +- .../Adminhtml/Session/ActivityTest.php | 2 +- .../CollectionFactoryTest.php | 2 +- .../templates/session/activity.phtml | 2 +- .../Magento/SendFriend/Controller/Product.php | 2 +- .../Controller/Product/Sendmail.php | 2 +- .../Adminhtml/Order/Shipment/AddComment.php | 2 +- .../Order/Shipment/MassPrintShippingLabel.php | 13 ++-- .../Adminhtml/Order/Shipment/PrintLabel.php | 2 +- .../Adminhtml/Order/Shipment/PrintPackage.php | 2 +- .../Adminhtml/Order/Shipment/Save.php | 1 - .../Adminhtml/Order/ShipmentLoader.php | 6 +- .../Shipment/MassPrintShippingLabel.php | 11 ++- .../Model/Carrier/AbstractCarrierOnline.php | 2 +- .../Shipping/Model/ShipmentNotifier.php | 2 +- .../Shipping/Model/Shipping/Labels.php | 2 +- .../Adminhtml/Order/Shipment/AddTrackTest.php | 4 +- .../Adminhtml/Order/Shipment/SaveTest.php | 7 +- .../Adminhtml/Order/ShipmentLoaderTest.php | 4 +- .../Carrier/AbstractCarrierOnlineTest.php | 4 +- .../Shipping/Test/Unit/Model/ShipmentTest.php | 4 +- .../Model/Shipping/LabelGeneratorTest.php | 2 - .../Shipping/Test/Unit/Model/ShippingTest.php | 4 +- .../templates/order/packaging/popup.phtml | 2 +- .../view/frontend/templates/items.phtml | 4 +- .../frontend/templates/tracking/popup.phtml | 5 +- .../System/Config/Field/WebhookUrl.php | 2 +- .../Magento/Signifyd/Model/CaseManagement.php | 4 +- .../Magento/Signifyd/Model/CaseRepository.php | 2 +- .../CaseServices/UpdatingServiceFactory.php | 2 +- .../Model/Guarantee/CreationService.php | 2 - .../MessageGenerators/GeneratorException.php | 1 - .../MessageGenerators/GeneratorFactory.php | 1 - .../Model/PaymentVerificationFactory.php | 2 +- .../SignifydGateway/Client/RequestBuilder.php | 2 - .../SignifydGateway/Client/RequestSender.php | 4 +- .../Client/ResponseHandler.php | 2 +- .../Model/SignifydGateway/Debugger/Log.php | 2 +- .../Model/SignifydGateway/Gateway.php | 1 - .../SignifydGateway/GatewayException.php | 1 - .../Request/PurchaseBuilder.php | 2 +- .../Unit/Model/CommentsHistoryUpdaterTest.php | 2 +- .../Test/Unit/Model/CustomerOrdersTest.php | 2 +- .../Model/Guarantee/CreationServiceTest.php | 2 +- .../GeneratorFactoryTest.php | 2 +- .../XmlToArrayConfigConverterTest.php | 3 +- .../Model/PaymentVerificationFactoryTest.php | 4 +- .../Client/HttpClientFactoryTest.php | 8 +-- .../Client/ResponseHandlerTest.php | 8 +-- .../Model/SignifydGateway/GatewayTest.php | 7 +- .../Response/WebhookMessageReaderTest.php | 4 +- .../Response/WebhookRequestValidatorTest.php | 2 +- .../Unit/Model/SignifydOrderSessionIdTest.php | 1 - .../Listing/Column/Guarantee/Options.php | 2 +- .../Block/Adminhtml/Grid/Renderer/Link.php | 1 - .../Model/ResourceModel/Catalog/Product.php | 2 +- .../Sitemap/Model/ResourceModel/Cms/Page.php | 6 +- app/code/Magento/Sitemap/Model/Sitemap.php | 2 +- .../Adminhtml/Sitemap/DeleteTest.php | 2 +- .../Controller/Adminhtml/Sitemap/SaveTest.php | 2 +- .../Sitemap/Test/Unit/Helper/DataTest.php | 3 +- .../Sitemap/Test/Unit/Model/SitemapTest.php | 6 +- .../Store/Api/StoreConfigManagerInterface.php | 3 - .../Store/App/Action/Plugin/Context.php | 4 +- .../Magento/Store/App/Config/Type/Scopes.php | 2 +- .../FrontController/Plugin/DefaultStore.php | 4 +- .../Console/Command/StoreListCommand.php | 2 +- .../Console/Command/WebsiteListCommand.php | 2 +- .../Store/Controller/Store/SwitchAction.php | 2 +- .../Magento/Store/Model/Address/Renderer.php | 2 +- .../Magento/Store/Model/Config/Importer.php | 2 +- .../Config/Importer/Processor/Update.php | 2 +- .../Store/Model/Config/Processor/Fallback.php | 5 -- .../Reader/Source/Dynamic/DefaultScope.php | 4 +- .../Config/Reader/Source/Dynamic/Store.php | 2 +- .../Config/Reader/Source/Dynamic/Website.php | 2 +- .../Store/Model/DefaultStoreScopeProvider.php | 3 +- .../Magento/Store/Model/GroupRepository.php | 2 +- .../Store/Model/HeaderProvider/Hsts.php | 2 +- .../Model/HeaderProvider/UpgradeInsecure.php | 2 +- .../Store/Model/Plugin/StoreCookie.php | 10 +-- .../ResourceModel/Website/Collection.php | 2 +- .../Magento/Store/Model/ScopeTreeProvider.php | 3 - .../Magento/Store/Model/ScopeValidator.php | 4 +- .../Magento/Store/Model/StoreRepository.php | 2 +- .../Store/Model/StoreScopeProvider.php | 3 +- .../Magento/Store/Model/WebsiteRepository.php | 2 +- .../Test/Unit/App/Config/Type/ScopesTest.php | 1 - .../Console/Command/StoreListCommandTest.php | 6 +- .../Command/WebsiteListCommandTest.php | 8 +-- .../Controller/Store/SwitchActionTest.php | 4 +- .../Config/Importer/Processor/UpdateTest.php | 10 +-- .../Reader/Source/Dynamic/StoreTest.php | 10 +-- .../Reader/Source/Dynamic/WebsiteTest.php | 6 +- .../Source/Initial/DefaultScopeTest.php | 2 +- .../Reader/Source/Initial/StoreTest.php | 4 +- .../Reader/Source/Initial/WebsiteTest.php | 2 +- .../Unit/Model/HeaderProvider/HstsTest.php | 8 +-- .../HeaderProvider/UpgradeInsecureTest.php | 8 +-- .../Model/Message/EmptyGroupCategoryTest.php | 6 +- .../Store/Test/Unit/Model/PathConfigTest.php | 4 +- .../Unit/Model/Plugin/StoreCookieTest.php | 10 +-- .../Test/Unit/Model/Resolver/GroupTest.php | 2 +- .../Test/Unit/Model/Resolver/StoreTest.php | 2 +- .../Test/Unit/Model/Resolver/WebsiteTest.php | 2 +- .../Unit/Model/ScopeFallbackResolverTest.php | 4 +- .../Test/Unit/Model/ScopeTreeProviderTest.php | 7 +- .../Unit/Model/ScopeTypeNormalizerTest.php | 2 +- .../Test/Unit/Model/StoreManagerTest.php | 2 - .../Test/Unit/Model/StoreRepositoryTest.php | 4 +- .../Store/Test/Unit/Model/StoreTest.php | 30 +++++--- .../Ui/Component/Listing/Column/Store.php | 2 +- .../Listing/Column/Store/Options.php | 2 +- .../Store/Url/Plugin/RouteParamsResolver.php | 4 +- .../Magento/Store/Url/Plugin/SecurityInfo.php | 4 +- .../Attribute/Edit/Options/AbstractSwatch.php | 4 +- .../Attribute/Edit/Options/Visual.php | 4 +- .../Adminhtml/Product/Attribute/Edit/Form.php | 4 +- .../Block/LayeredNavigation/RenderLayered.php | 6 +- .../Block/Product/Renderer/Configurable.php | 2 +- .../Model/SwatchAttributesProvider.php | 2 +- .../Observer/AddFieldsToAttributeObserver.php | 2 +- .../AddSwatchAttributeTypeObserver.php | 3 +- .../Plugin/Catalog/CacheInvalidate.php | 4 +- .../Magento/Swatches/Setup/InstallData.php | 4 +- .../Magento/Swatches/Setup/UpgradeData.php | 12 ++-- .../Product/Attribute/Edit/FormTest.php | 2 - .../catalog/product/attribute/visual.phtml | 4 +- .../templates/product/layered/renderer.phtml | 18 +++-- .../templates/product/view/renderer.phtml | 6 +- .../Block/Adminhtml/Items/Price/Renderer.php | 2 +- .../Magento/Tax/Block/Adminhtml/Rate/Form.php | 3 +- .../Tax/Block/Adminhtml/Rate/Toolbar/Add.php | 2 - .../Controller/Adminhtml/Rate/AjaxLoad.php | 2 +- .../Tax/Controller/Adminhtml/Rate/Delete.php | 2 +- .../Tax/Controller/Adminhtml/Rate/Edit.php | 2 +- .../Tax/Controller/Adminhtml/Rate/Save.php | 2 +- .../Adminhtml/Rule/AjaxLoadRates.php | 8 +-- app/code/Magento/Tax/Helper/Data.php | 17 +++-- .../Model/Calculation/GrandTotalDetails.php | 2 +- .../Tax/Model/Calculation/GrandTotalRates.php | 2 +- .../Tax/Model/Calculation/Rule/Validator.php | 1 - .../Model/Quote/GrandTotalDetailsPlugin.php | 4 +- .../Tax/Model/Quote/ToOrderConverter.php | 4 +- app/code/Magento/Tax/Model/Rate/Provider.php | 2 +- .../Tax/Model/Sales/Order/TaxManagement.php | 5 +- .../Sales/Total/Quote/CommonTaxCollector.php | 12 ++-- .../Tax/Model/Sales/Total/Quote/Shipping.php | 2 +- .../Tax/Model/Sales/Total/Quote/Subtotal.php | 2 +- .../Message/Notification/DiscountErrors.php | 2 +- app/code/Magento/Tax/Model/TaxCalculation.php | 9 ++- .../Magento/Tax/Model/TaxConfigProvider.php | 4 +- .../Magento/Tax/Model/TaxRateCollection.php | 4 +- .../Magento/Tax/Model/TaxRuleCollection.php | 1 - .../Magento/Tax/Model/TaxRuleRepository.php | 6 +- .../GetPriceConfigurationObserver.php | 2 +- app/code/Magento/Tax/Setup/InstallData.php | 2 +- app/code/Magento/Tax/Setup/UpgradeData.php | 8 +-- .../Block/Adminhtml/Rule/Edit/FormTest.php | 2 +- .../Adminhtml/Rate/AjaxLoadTest.php | 10 ++- .../Adminhtml/Rule/AjaxLoadRatesTest.php | 2 +- .../Magento/Tax/Test/Unit/Helper/DataTest.php | 18 +++-- .../Calculation/CalculatorFactoryTest.php | 4 +- .../Calculation/RowBaseCalculatorTest.php | 2 +- .../Test/Unit/Model/Config/TaxClassTest.php | 1 + .../Tax/Test/Unit/Model/ConfigTest.php | 8 ++- .../Test/Unit/Model/Plugin/OrderSaveTest.php | 2 +- .../Quote/GrandTotalDetailsPluginTest.php | 2 +- .../Unit/Model/Quote/ToOrderConverterTest.php | 4 +- .../Model/Sales/Order/TaxManagementTest.php | 4 +- .../Total/Quote/CommonTaxCollectorTest.php | 6 +- .../Model/Sales/Total/Quote/ShippingTest.php | 2 +- .../Unit/Model/Sales/Total/Quote/TaxTest.php | 27 ++++--- .../ApplyDiscountOnPricesTest.php | 6 +- .../Notification/DiscountErrorsTest.php | 6 +- .../Notification/RoundingErrorsTest.php | 6 +- .../System/Message/NotificationsTest.php | 6 +- .../Test/Unit/Model/TaxAddressManagerTest.php | 2 +- .../Unit/Model/TaxClass/ManagementTest.php | 2 +- .../Test/Unit/Model/TaxConfigProviderTest.php | 2 +- .../Test/Unit/Model/TaxRateCollectionTest.php | 6 +- .../Test/Unit/Model/TaxRuleCollectionTest.php | 2 +- .../Test/Unit/Model/TaxRuleRepositoryTest.php | 3 +- .../Observer/AfterAddressSaveObserverTest.php | 2 +- .../UpdateProductOptionsObserverTest.php | 15 ++-- .../Tax/Test/Unit/Pricing/AdjustmentTest.php | 4 +- .../Product/Listing/Collector/TaxTest.php | 2 +- .../frontend/templates/checkout/tax.phtml | 4 +- .../Controller/Adminhtml/Rate/ExportCsv.php | 2 +- .../Controller/Adminhtml/Rate/ExportXml.php | 2 +- .../Adminhtml/Rate/ExportPostTest.php | 2 +- .../templates/importExportHeader.phtml | 2 +- .../Api/Data/DesignConfigDataInterface.php | 2 - .../Magento/Theme/Block/Html/Header/Logo.php | 4 +- .../Console/Command/ThemeUninstallCommand.php | 10 +-- .../Adminhtml/Design/Config/Edit.php | 2 +- .../Adminhtml/Design/Config/Save.php | 4 +- .../System/Design/Theme/DownloadCss.php | 2 +- .../System/Design/Theme/DownloadCustomCss.php | 2 +- .../Design/Wysiwyg/Files/PreviewImage.php | 2 +- .../Theme/Model/Data/Design/Config/Data.php | 2 +- .../Theme/Model/Data/Design/ConfigFactory.php | 8 +-- app/code/Magento/Theme/Model/Design.php | 2 +- .../Theme/Model/Design/Backend/Favicon.php | 2 - .../Theme/Model/Design/Backend/File.php | 6 +- .../Model/Design/Config/DataProvider.php | 4 +- .../Config/DataProvider/MetadataLoader.php | 2 +- .../Config/FileUploader/FileProcessor.php | 8 +-- .../Theme/Model/Design/Config/Plugin.php | 4 +- .../Theme/Model/Design/Config/Storage.php | 4 +- .../Theme/Model/Design/Config/Validator.php | 14 ++-- .../Theme/Model/DesignConfigRepository.php | 4 +- .../Theme/Model/Indexer/Design/Config.php | 6 +- .../Theme/Model/Theme/Plugin/Registration.php | 10 +-- .../Theme/Model/Theme/Registration.php | 1 - .../Theme/Model/Theme/ThemeProvider.php | 2 +- .../Magento/Theme/Model/Uploader/Service.php | 2 - app/code/Magento/Theme/Model/View/Design.php | 1 - .../ApplyThemeCustomizationObserver.php | 3 +- app/code/Magento/Theme/Setup/UpgradeData.php | 2 +- .../Command/ThemeUninstallCommandTest.php | 4 +- .../Design/Config/FileUploader/SaveTest.php | 2 +- .../System/Design/Wysiwyg/Files/IndexTest.php | 4 +- .../Controller/Result/MessagePluginTest.php | 3 +- .../Model/Design/Backend/ExceptionsTest.php | 2 +- .../Unit/Model/Design/Backend/FileTest.php | 2 +- .../Model/Design/BackendModelFactoryTest.php | 2 +- .../Config/DataProvider/DataLoaderTest.php | 1 - .../Model/Design/Config/DataProviderTest.php | 2 - .../Unit/Model/DesignConfigRepositoryTest.php | 2 +- .../Test/Unit/Model/Favicon/FaviconTest.php | 2 +- .../Unit/Model/Indexer/Design/ConfigTest.php | 3 +- .../Model/Theme/Customization/ConfigTest.php | 2 +- .../Customization/File/CustomCssTest.php | 2 +- .../Test/Unit/Model/Theme/Image/PathTest.php | 4 +- .../Model/Theme/Plugin/RegistrationTest.php | 2 +- .../Test/Unit/Model/Theme/SingleFileTest.php | 2 +- .../Unit/Model/Theme/Source/ThemeTest.php | 2 +- .../Unit/Model/Url/Plugin/SignatureTest.php | 2 +- .../Config/SearchRobots/ResetButtonTest.php | 6 +- .../view/frontend/templates/html/title.phtml | 2 +- .../Theme/view/frontend/templates/text.phtml | 2 +- .../Magento/Translation/Model/Js/Config.php | 2 +- .../Translation/Model/Json/PreProcessor.php | 8 +-- .../Model/ResourceModel/Translate.php | 4 +- .../Model/Source/InitialTranslationSource.php | 6 +- .../Unit/App/Config/Type/TranslationTest.php | 4 -- .../Command/UninstallLanguageCommandTest.php | 8 +-- .../Test/Unit/Model/Inline/ConfigTest.php | 2 +- .../Test/Unit/Model/Inline/ParserTest.php | 10 +-- .../Test/Unit/Model/Js/DataProviderTest.php | 8 +-- .../Test/Unit/Model/Js/PreProcessorTest.php | 4 +- .../Api/Data/BookmarkExtensionInterface.php | 1 - .../Ui/Component/AbstractComponent.php | 6 +- app/code/Magento/Ui/Component/Container.php | 2 +- .../Magento/Ui/Component/Control/Action.php | 2 +- .../Ui/Component/Control/ActionPool.php | 2 +- .../Magento/Ui/Component/Control/Link.php | 2 +- app/code/Magento/Ui/Component/DataSource.php | 2 +- .../Magento/Ui/Component/ExportButton.php | 2 +- .../Ui/Component/Filters/FilterModifier.php | 4 +- .../Component/Filters/Type/AbstractFilter.php | 6 +- .../Ui/Component/Filters/Type/Select.php | 4 +- .../Magento/Ui/Component/Form/Collection.php | 2 +- .../Component/Form/Element/DataType/Date.php | 2 +- .../Ui/Component/Form/Element/Multiline.php | 4 +- .../Ui/Component/Form/Element/Wysiwyg.php | 3 +- app/code/Magento/Ui/Component/Form/Field.php | 4 +- .../Magento/Ui/Component/Form/Fieldset.php | 4 -- .../Ui/Component/Form/Fieldset/Factory.php | 2 +- app/code/Magento/Ui/Component/Layout.php | 5 +- app/code/Magento/Ui/Component/Listing.php | 2 - .../Magento/Ui/Component/Listing/Columns.php | 3 - .../Ui/Component/Listing/Columns/Column.php | 4 +- .../Ui/Component/Listing/Columns/Date.php | 2 +- .../Component/MassAction/Columns/Column.php | 4 +- .../Ui/Component/MassAction/Filter.php | 6 +- .../Magento/Ui/Component/Wrapper/Block.php | 2 +- .../Ui/Component/Wrapper/UiComponent.php | 4 +- .../Magento/Ui/Config/Argument/Parser/Url.php | 2 +- .../Magento/Ui/Config/Converter/Actions.php | 2 +- .../Magento/Ui/Config/Converter/Buttons.php | 2 +- .../Magento/Ui/Config/Converter/Options.php | 2 +- .../Ui/Config/Converter/StorageConfig.php | 2 +- app/code/Magento/Ui/Config/Converter/Url.php | 2 +- app/code/Magento/Ui/Config/Data.php | 3 +- .../Ui/Config/Reader/Definition/Data.php | 2 +- app/code/Magento/Ui/Config/Reader/Dom.php | 2 +- .../Controller/Adminhtml/AbstractAction.php | 2 +- .../Controller/Adminhtml/Export/GridToCsv.php | 2 +- .../Controller/Adminhtml/Export/GridToXml.php | 2 +- .../Ui/Controller/Adminhtml/Index/Render.php | 8 +-- app/code/Magento/Ui/Model/Bookmark.php | 2 +- app/code/Magento/Ui/Model/Config.php | 1 - .../Magento/Ui/Model/Export/ConvertToCsv.php | 2 +- .../Magento/Ui/Model/Export/ConvertToXml.php | 2 +- .../Ui/Model/Export/MetadataProvider.php | 4 +- app/code/Magento/Ui/Model/Manager.php | 6 +- .../ResourceModel/BookmarkRepository.php | 10 ++- .../Xhtml/Compiler/Element/Content.php | 2 +- .../Xhtml/Compiler/Element/Form.php | 2 +- .../Ui/TemplateEngine/Xhtml/Result.php | 6 +- .../Unit/Component/AbstractComponentTest.php | 5 +- .../Unit/Component/Control/ActionTest.php | 2 +- .../Unit/Component/Control/ContainerTest.php | 2 +- .../Test/Unit/Component/Control/LinkTest.php | 2 +- .../Component/Filters/FilterModifierTest.php | 2 +- .../Unit/Component/Filters/Type/DateTest.php | 2 +- .../Form/Element/AbstractElementTest.php | 2 +- .../Component/Form/Element/WysiwygTest.php | 4 +- .../Component/Form/Field/MultilineTest.php | 6 +- .../Ui/Test/Unit/Component/Form/FieldTest.php | 4 +- .../Ui/Test/Unit/Component/FormTest.php | 1 - .../Component/Listing/Columns/ColumnTest.php | 6 +- .../Unit/Component/Listing/ColumnsTest.php | 4 +- .../Ui/Test/Unit/Component/ListingTest.php | 3 +- .../MassAction/Columns/ColumnTest.php | 2 +- .../Ui/Test/Unit/Component/MassActionTest.php | 2 +- .../Ui/Test/Unit/Component/PagingTest.php | 2 +- .../Test/Unit/Config/Converter/DepsTest.php | 1 - .../Unit/Config/Converter/HtmlContentTest.php | 2 +- .../Test/Unit/Config/Converter/ItemTest.php | 2 +- .../Controller/Adminhtml/Index/RenderTest.php | 2 +- .../Unit/Model/Export/ConvertToXmlTest.php | 8 +-- .../Model/Export/MetadataProviderTest.php | 2 +- .../Ui/Test/Unit/Model/ManagerTest.php | 26 +++---- .../Unit/Model/UiComponentGeneratorTest.php | 1 - .../Ui/view/base/templates/stepswizard.phtml | 12 ++-- app/code/Magento/Ups/Model/Carrier.php | 4 +- .../Ups/Test/Unit/Model/CarrierTest.php | 2 +- .../Plugin/Store/Switcher/SetRedirectUrl.php | 4 +- .../UrlRewriteExceptionMessageFactory.php | 6 +- .../Model/Storage/AbstractStorage.php | 2 +- .../UrlRewrite/Model/Storage/DbStorage.php | 2 +- .../Magento/UrlRewrite/Setup/UpgradeData.php | 2 +- .../Test/Unit/Block/Catalog/Edit/FormTest.php | 9 ++- .../Test/Unit/Helper/UrlRewriteTest.php | 2 - .../UrlAlreadyExistsExceptionTest.php | 2 +- .../Test/Unit/Model/MergeDataProviderTest.php | 2 +- .../UrlRewriteExceptionMessageFactoryTest.php | 2 +- .../Test/Unit/Model/Storage/DbStorageTest.php | 3 +- .../Console/UnlockAdminAccountCommand.php | 2 +- .../User/Controller/Adminhtml/User/Delete.php | 2 +- app/code/Magento/User/Model/User.php | 2 +- .../User/Observer/Backend/AuthObserver.php | 4 +- .../Test/Unit/Block/Role/Tab/UsersTest.php | 2 +- .../Controller/Adminhtml/User/DeleteTest.php | 1 - app/code/Magento/Vault/Block/Form.php | 3 +- .../Model/AbstractPaymentTokenFactory.php | 2 +- app/code/Magento/Vault/Model/PaymentToken.php | 2 - .../Model/ResourceModel/PaymentToken.php | 2 +- .../Vault/Observer/PaymentTokenAssigner.php | 1 - .../Plugin/PaymentVaultAttributesLoad.php | 4 +- .../Magento/Vault/Setup/InstallSchema.php | 4 +- .../Model/AccountPaymentTokenFactoryTest.php | 2 +- .../Unit/Model/CreditCardTokenFactoryTest.php | 2 +- .../Test/Unit/Model/PaymentMethodListTest.php | 2 +- .../Ui/Adminhtml/TokensConfigProviderTest.php | 4 +- .../Model/Ui/TokensConfigProviderTest.php | 4 +- .../Observer/AfterPaymentSaveObserverTest.php | 1 - .../Observer/PaymentTokenAssignerTest.php | 1 - .../view/frontend/templates/token_list.phtml | 2 +- .../Version/Controller/Index/Index.php | 3 +- .../Controller/Rest/InputParamsResolver.php | 3 +- .../Controller/Rest/ParamsOverrider.php | 4 +- .../Magento/Webapi/Controller/Rest/Router.php | 2 +- .../Webapi/Controller/Rest/Router/Route.php | 2 +- .../Controller/Soap/Request/Handler.php | 10 +-- .../Model/Authorization/OauthUserContext.php | 2 +- .../Model/Authorization/TokenUserContext.php | 4 +- app/code/Magento/Webapi/Model/Config.php | 4 +- .../Webapi/Model/Config/ClassReflector.php | 4 +- .../Magento/Webapi/Model/Plugin/Manager.php | 2 +- .../Magento/Webapi/Model/Rest/Swagger.php | 2 - app/code/Magento/Webapi/Model/Soap/Server.php | 2 +- .../Webapi/Model/Soap/Wsdl/Generator.php | 6 +- .../Rest/ParamOverriderCustomerIdTest.php | 2 +- .../Controller/Rest/ParamsOverriderTest.php | 2 +- .../Unit/Controller/Rest/Router/RouteTest.php | 4 +- .../Webapi/Test/Unit/Controller/RestTest.php | 3 - .../Webapi/Test/Unit/Controller/SoapTest.php | 2 +- .../Webapi/Test/Unit/Model/ConfigTest.php | 2 +- .../Unit/Model/DataObjectProcessorTest.php | 2 +- .../Test/Unit/Model/ServiceMetadataTest.php | 6 +- .../Webapi/Test/Unit/Model/Soap/FaultTest.php | 2 +- .../Soap/Wsdl/ComplexTypeStrategyTest.php | 2 +- .../Block/Adminhtml/Items/Price/Renderer.php | 2 +- .../Magento/Weee/Block/Element/Weee/Tax.php | 2 +- .../Magento/Weee/Block/Renderer/Weee/Tax.php | 6 +- app/code/Magento/Weee/Helper/Data.php | 2 +- .../Weee/Model/Attribute/Backend/Weee/Tax.php | 2 +- .../Magento/Weee/Model/ResourceModel/Tax.php | 5 +- app/code/Magento/Weee/Model/Tax.php | 5 +- .../Weee/Model/Total/Creditmemo/Weee.php | 4 +- .../Magento/Weee/Model/Total/Invoice/Weee.php | 8 +-- .../Weee/Model/Total/Quote/WeeeTax.php | 2 - .../Weee/Observer/CustomerLoggedIn.php | 1 - .../Weee/Pricing/Render/Adjustment.php | 2 +- .../Magento/Weee/Pricing/TaxAdjustment.php | 4 +- app/code/Magento/Weee/Setup/Recurring.php | 4 +- .../Weee/Test/Unit/Model/ConfigTest.php | 2 +- .../Unit/Model/Total/Creditmemo/WeeeTest.php | 4 +- .../Unit/Model/Total/Invoice/WeeeTest.php | 4 +- .../Unit/Model/Total/Quote/WeeeTaxTest.php | 9 +-- .../Unit/Observer/AfterAddressSaveTest.php | 6 +- .../UpdateProductOptionsObserverTest.php | 2 +- .../Weee/Test/Unit/Pricing/AdjustmentTest.php | 11 ++- .../Test/Unit/Pricing/TaxAdjustmentTest.php | 6 +- .../Form/Modifier/Manager/WebsiteTest.php | 4 +- .../Product/Form/Modifier/WeeeTest.php | 7 +- .../Product/Listing/Collector/WeeeTest.php | 4 +- .../Product/Form/Modifier/Manager/Website.php | 3 +- .../base/templates/pricing/adjustment.phtml | 4 +- .../Widget/Instance/Edit/Tab/Main/Layout.php | 6 +- app/code/Magento/Widget/Helper/Conditions.php | 2 +- .../Magento/Widget/Model/Config/Converter.php | 2 +- .../Widget/Model/Config/FileResolver.php | 2 +- .../Widget/Model/Config/SchemaLocator.php | 2 - .../Widget/Setup/LayoutUpdateConverter.php | 4 +- app/code/Magento/Widget/Setup/UpgradeData.php | 4 +- .../Adminhtml/Widget/LoadOptionsTest.php | 10 +-- .../Test/Unit/Helper/ConditionsTest.php | 2 +- .../Unit/Model/Config/FileResolverTest.php | 2 +- .../Widget/Instance/Options/ThemesTest.php | 2 +- .../Unit/Model/Template/FilterEmulateTest.php | 2 +- .../Wishlist/Block/Adminhtml/WishlistTab.php | 6 +- .../Wishlist/Controller/AbstractIndex.php | 1 - .../Magento/Wishlist/Controller/Index/Add.php | 4 +- .../Wishlist/Controller/Index/Allcart.php | 5 +- .../Wishlist/Controller/Index/Cart.php | 4 +- .../Wishlist/Controller/Index/Configure.php | 2 +- .../Wishlist/Controller/Index/Fromcart.php | 5 +- .../Wishlist/Controller/Index/Index.php | 2 +- .../Wishlist/Controller/Index/Plugin.php | 2 +- .../Wishlist/Controller/Index/Remove.php | 2 +- .../Wishlist/Controller/Index/Send.php | 4 +- .../Wishlist/Controller/Index/Share.php | 1 - .../Wishlist/Controller/Index/Update.php | 2 +- .../Controller/Index/UpdateItemOptions.php | 2 +- .../Wishlist/Controller/Shared/Allcart.php | 2 +- app/code/Magento/Wishlist/Model/Item.php | 2 +- .../Magento/Wishlist/Model/Item/Option.php | 2 +- .../Magento/Wishlist/Model/ItemCarrier.php | 2 +- .../Wishlist/Observer/CustomerLogout.php | 2 +- app/code/Magento/Wishlist/Setup/Recurring.php | 4 +- .../Magento/Wishlist/Setup/UpgradeData.php | 11 ++- .../Widget/Grid/Column/Filter/TextTest.php | 2 +- .../Renderer/Actions/MoveToWishlistTest.php | 2 +- .../Unit/Controller/Index/AllcartTest.php | 2 +- .../Test/Unit/Controller/Index/CartTest.php | 6 +- .../Test/Unit/Controller/Index/RemoveTest.php | 2 +- .../Unit/Controller/Shared/AllcartTest.php | 2 +- .../Test/Unit/CustomerData/WishlistTest.php | 1 - .../Product/Collector/ButtonTest.php | 12 ++-- .../Unit/Model/AuthenticationStateTest.php | 2 +- .../Wishlist/Test/Unit/Model/ConfigTest.php | 2 +- .../Wishlist/Test/Unit/Model/ItemTest.php | 3 +- .../Model/LocaleQuantityProcessorTest.php | 2 +- .../Test/Unit/Observer/AddToCartTest.php | 2 +- .../Unit/Observer/CartUpdateBeforeTest.php | 2 +- .../Test/Unit/Observer/CustomerLoginTest.php | 2 +- .../Test/Unit/Observer/CustomerLogoutTest.php | 2 +- .../ConfigurableProductTest.php | 2 +- .../DataProvider/Product/Collector/Button.php | 3 - .../Authentication/OauthHelper.php | 2 +- .../Magento/TestFramework/Helper/Customer.php | 2 +- .../TestCase/Webapi/Adapter/Rest.php | 2 +- .../Magento/Bundle/Api/ProductServiceTest.php | 2 +- .../Api/AttributeSetManagementTest.php | 2 +- .../Catalog/Api/BasePriceStorageTest.php | 4 +- .../Catalog/Api/CartItemRepositoryTest.php | 5 +- .../Catalog/Api/CategoryManagementTest.php | 3 +- .../Catalog/Api/CategoryRepositoryTest.php | 2 +- .../Magento/Catalog/Api/CostStorageTest.php | 1 - .../Api/ProductAttributeManagementTest.php | 2 +- .../Api/ProductAttributeRepositoryTest.php | 1 - .../Api/ProductCustomOptionRepositoryTest.php | 4 +- .../Api/ProductRepositoryInterfaceTest.php | 8 +-- .../Catalog/Api/SpecialPriceStorageTest.php | 1 - .../Api/ProductRepositoryInterfaceTest.php | 12 ++-- .../Api/CartItemRepositoryTest.php | 2 +- .../Api/LinkManagementTest.php | 4 +- .../AccountManagementCustomAttributesTest.php | 3 +- .../Customer/Api/AccountManagementTest.php | 10 +-- .../Customer/Api/CustomerRepositoryTest.php | 6 +- .../Downloadable/Api/LinkRepositoryTest.php | 1 - .../Eav/Api/AttributeSetManagementTest.php | 2 +- .../Api/GuestItemRepositoryTest.php | 2 +- .../GiftMessage/Api/ItemRepositoryTest.php | 10 +-- .../Model/AdminTokenServiceTest.php | 5 +- .../Model/CustomerTokenServiceTest.php | 9 ++- .../Integration/Model/IntegrationTest.php | 2 +- .../Quote/Api/CartItemRepositoryTest.php | 4 +- .../Magento/Quote/Api/CartRepositoryTest.php | 8 +-- .../Quote/Api/CartTotalRepositoryTest.php | 4 +- .../Api/GuestCartTotalRepositoryTest.php | 4 +- .../Quote/Api/GuestShipmentEstimationTest.php | 2 +- .../Api/GuestShippingMethodManagementTest.php | 1 - .../Api/ShippingMethodManagementTest.php | 2 +- .../Service/V1/CreditMemoCreateRefundTest.php | 2 +- .../Sales/Service/V1/OrderCreateTest.php | 2 +- .../SalesRule/Api/CouponManagementTest.php | 3 +- .../SalesRule/Api/RuleRepositoryTest.php | 1 - .../Magento/Webapi/JoinDirectivesTest.php | 6 +- .../JsonGenerationFromDataObjectTest.php | 4 +- .../Magento/Webapi/Routing/BaseService.php | 1 - .../Webapi/Routing/RestErrorHandlingTest.php | 2 +- .../Webapi/Routing/SoapErrorHandlingTest.php | 2 - .../WsdlGenerationFromDataObjectTest.php | 3 +- .../Mtf/Client/Element/ConditionsElement.php | 4 +- .../Client/Element/GlobalsearchElement.php | 2 +- .../Element/MultiselectgrouplistElement.php | 2 +- .../Client/Element/OptgroupselectElement.php | 2 +- .../SeleniumSessionAnalyzer.php | 5 +- .../Mtf/Util/Command/File/Export/Reader.php | 2 +- .../lib/Magento/Mtf/Util/Generate/Factory.php | 1 - .../Util/Generate/Factory/AbstractFactory.php | 1 - .../Mtf/Util/Generate/File/Generator.php | 2 +- ...ssertAdvancedReportingSectionInvisible.php | 2 +- .../AssertAdvancedReportingSectionVisible.php | 2 +- .../Constraint/AssertBIEssentialsLink.php | 2 +- .../AssertConfigAnalyticsIndustryScope.php | 2 +- .../AssertEmptyIndustryCanNotBeSaved.php | 2 +- .../Test/Constraint/AssertIndustryIsSet.php | 2 +- .../TestCase/AdvancedReportingButtonTest.php | 2 +- .../Test/TestCase/SetIndustryTest.php | 2 +- .../Test/Block/Dashboard/Tab/Products.php | 2 +- .../Block/Dashboard/Tab/Products/Ordered.php | 2 +- .../Backend/Test/Block/Page/Header.php | 2 +- .../Test/Block/System/Config/Form/Group.php | 2 +- .../Test/Block/System/Config/PageActions.php | 2 +- .../Test/Block/System/Store/Delete/Form.php | 2 +- .../Test/Block/System/Store/StoreGrid.php | 2 +- .../Backend/Test/Block/Widget/FormTabs.php | 3 +- .../Backend/Test/Block/Widget/Grid.php | 2 +- .../Magento/Backend/Test/Block/Widget/Tab.php | 2 +- .../AssertBestsellersOnDashboard.php | 2 +- .../AssertDeveloperSectionVisibility.php | 2 +- .../Constraint/AssertGlobalSearchOrderId.php | 2 +- .../Constraint/AssertGlobalSearchPreview.php | 2 +- .../AssertGlobalSearchProductName.php | 2 +- .../Constraint/AssertHttpUsedOnFrontend.php | 4 +- .../AssertHttpsHeaderOptionsAvailable.php | 2 +- .../AssertHttpsHeaderOptionsNotAvailable.php | 2 +- .../Constraint/AssertHttpsUsedOnBackend.php | 4 +- .../Constraint/AssertLocaleCodeVisibility.php | 2 +- .../Constraint/AssertStoreCanBeLocalized.php | 4 +- .../TestCase/ConfigPageVisibilityTest.php | 2 +- .../Test/TestCase/ConfigureSecureUrlsTest.php | 4 +- .../TestCase/LoginAfterJSMinificationTest.php | 6 +- .../Test/TestCase/NavigateMenuTest.php | 2 +- .../Test/TestStep/GetDashboardOrderStep.php | 2 +- .../Braintree/Test/Block/Form/BraintreeCc.php | 2 +- .../Braintree/Test/Block/Form/Secure3d.php | 8 +-- .../CheckoutWithPaypalFromCartStep.php | 2 +- .../CheckoutWithPaypalFromMinicartStep.php | 2 +- .../PlaceOrderWith3dSecureFailedStep.php | 2 +- .../TestStep/PlaceOrderWith3dSecureStep.php | 2 +- .../TestStep/PlaceOrderWithPaypalStep.php | 2 +- .../Test/TestStep/SettleTransactionStep.php | 6 +- .../Catalog/Product/Edit/Section/Bundle.php | 2 +- .../Catalog/Product/View/Type/Bundle.php | 4 +- .../Constraint/AssertBundleInCategory.php | 4 +- .../AssertBundleOptionTitleOnStorefront.php | 2 +- .../Constraint/AssertBundleOptionsDeleted.php | 3 +- ...ProductInCustomerWishlistOnBackendGrid.php | 2 +- .../Test/Handler/BundleProduct/Curl.php | 3 +- .../UpdateBundleOptionsShoppingCartTest.php | 2 +- .../UpdateBundleProductEntityTest.php | 4 +- .../AssertImportedBundleProducts.php | 4 +- .../Test/TestCase/CaptchaOnAdminLoginTest.php | 6 +- .../Test/Block/AbstractConfigureBlock.php | 1 - .../Catalog/Test/Block/AbstractPriceBlock.php | 2 +- .../Adminhtml/Category/Edit/CategoryForm.php | 2 +- .../Category/Edit/Section/Products.php | 2 +- .../Product/Attribute/AttributeForm.php | 2 +- .../Product/Attribute/Edit/AttributeForm.php | 3 +- .../Product/Attribute/Edit/Options.php | 4 +- .../Product/Attribute/Edit/Tab/Advanced.php | 1 - .../Product/Attribute/Edit/Tab/Options.php | 2 +- .../Adminhtml/Product/Composite/Configure.php | 7 +- .../Edit/Action/Tab/UpdateAttributeTab.php | 2 +- .../Product/Edit/Section/AdvancedPricing.php | 4 +- .../Edit/Section/Attributes/Search.php | 2 +- .../Product/Edit/Section/Options.php | 6 +- .../Product/Edit/Section/ProductDetails.php | 2 +- .../Section/ProductDetails/CategoryIds.php | 4 +- .../Product/Edit/Section/Related.php | 2 +- .../Edit/Section/Websites/StoreTree.php | 2 +- .../Test/Block/Adminhtml/Product/Grid.php | 2 +- .../Adminhtml/Product/Modal/AddAttribute.php | 2 +- .../Adminhtml/Product/Modal/NewAttribute.php | 2 +- .../Catalog/Test/Block/Category/View.php | 1 - .../Catalog/Test/Block/Product/Additional.php | 6 +- .../Block/Product/Compare/ListCompare.php | 3 +- .../Product/Grouped/AssociatedProducts.php | 1 - .../ListAssociatedProducts.php | 2 +- .../Catalog/Test/Block/Product/View.php | 2 +- .../Constraint/AssertAddBeforeForPrice.php | 2 +- ...sertAddedProductAttributeOnProductForm.php | 6 +- .../AssertAttributeOptionsOnProductForm.php | 4 +- .../AssertAttributeSetGroupOnProductForm.php | 11 ++- .../AssertCategoryForAssignedProducts.php | 2 +- .../AssertCategoryOnCustomStore.php | 4 +- ...ssertCategoryWithCustomStoreOnFrontend.php | 2 +- .../AssertMassProductUpdateSuccessMessage.php | 2 +- .../AssertPaginationCorrectOnStoreFront.php | 2 +- .../AssertProductAttributeIsFilterable.php | 8 +-- .../AssertProductHasImageInGrid.php | 4 +- ...AssertProductInCategoryOnCustomWebsite.php | 2 +- .../AssertProductInCustomStoreView.php | 6 +- .../AssertProductInventoryThreshold.php | 2 +- ...AssertProductNameOnDifferentStoreViews.php | 2 +- .../Constraint/AssertProductNoImageInGrid.php | 4 +- ...ssertProductPriceOnDifferentStoreViews.php | 2 +- .../AssertProductTypeOrderOnCreate.php | 2 +- ...tProductsQtyAndStockStatusInAdminPanel.php | 2 +- .../AssertUpdatedProductStatusInGrid.php | 2 +- .../Handler/CatalogProductSimple/Curl.php | 2 +- .../Handler/CatalogProductSimple/Webapi.php | 2 +- .../Catalog/Test/Handler/Category/Webapi.php | 3 +- ...categoryNotIncludeInNavigationMenuTest.php | 2 +- .../Category/UpdateCategoryEntityTest.php | 2 +- .../Category/UpdateTopCategoryEntityTest.php | 2 +- .../AbstractProductPromotedProductsTest.php | 2 +- .../Product/CreateFlatCatalogProduct.php | 4 +- .../CreateSimpleProductEntityPartOneTest.php | 6 -- .../CreateSimpleProductEntityPartTwoTest.php | 6 -- .../Product/CreateSimpleProductEntityTest.php | 2 +- .../CreateVirtualProductEntityTest.php | 2 +- .../Product/MassProductUpdateTest.php | 8 +-- .../Product/NavigateUpSellProductsTest.php | 2 - .../ReSavingProductAfterInitialSaveTest.php | 2 +- .../Product/UpdateSimpleProductEntityTest.php | 6 +- .../UpdateVirtualProductEntityTest.php | 2 +- .../ValidateOrderOfProductTypeTest.php | 2 +- .../CreateProductWithAttributeSetStep.php | 6 +- .../SaveAttributeOnProductPageStep.php | 4 +- .../Test/TestStep/SaveAttributeStep.php | 2 +- .../Test/Constraint/AssertExportProduct.php | 4 +- .../Constraint/AssertImportedProducts.php | 6 +- .../Test/Constraint/AssertProductsInGrid.php | 2 +- .../Constraint/AssertProductsOnStorefront.php | 2 +- .../Test/TestCase/ExportProductsTest.php | 3 +- .../Test/Block/Adminhtml/Promo/Catalog.php | 4 +- .../Promo/Catalog/Edit/PromoForm.php | 2 +- ...sertCatalogPriceRuleAppliedCatalogPage.php | 3 +- ...sertCatalogPriceRuleAppliedProductPage.php | 4 +- ...ertCatalogPriceRuleAppliedShoppingCart.php | 3 +- ...tCatalogPriceRuleNotAppliedCatalogPage.php | 2 +- ...tCatalogPriceRuleNotAppliedProductPage.php | 4 +- ...AssertProductAttributeIsUsedPromoRules.php | 4 +- .../Test/Handler/CatalogRule/Curl.php | 1 - .../AbstractCatalogRuleEntityTest.php | 2 +- .../TestCase/ApplyCatalogPriceRulesTest.php | 7 +- .../CreateCatalogPriceRuleEntityTest.php | 5 +- .../DeleteCatalogPriceRuleEntityTest.php | 2 +- ...sertCatalogPriceRuleAppliedCatalogPage.php | 3 +- ...nfigurableProductCatalogPriceRulesTest.php | 5 -- .../Block/Advanced/CustomAttribute/Date.php | 2 +- .../Block/Advanced/CustomAttribute/Select.php | 2 +- .../Block/Advanced/CustomAttribute/Text.php | 2 +- .../Test/Block/Advanced/Form.php | 2 +- .../AssertAdvancedSearchNoResult.php | 2 +- ...AssertAdvancedSearchProductByAttribute.php | 4 +- .../AssertAttributeSearchableByLabel.php | 6 +- .../AssertCatalogSearchNoResult.php | 2 +- .../AssertCatalogSearchNoResultMessage.php | 2 +- .../AssertCatalogSearchQueryLength.php | 2 +- ...ertProductAddedToCartFromSearchResults.php | 4 +- ...sertProductCanBeOpenedFromSearchResult.php | 4 +- .../AssertSuggestSearchingResult.php | 2 +- ...AssertCategoryUrlDuplicateErrorMessage.php | 2 +- .../AssertProductUrlDuplicateErrorMessage.php | 4 +- .../CreateDuplicateUrlProductEntity.php | 2 +- .../Checkout/Test/Block/Cart/CartEmpty.php | 1 - .../Test/Block/Onepage/AbstractReview.php | 2 +- .../Test/Block/Onepage/Payment/Method.php | 3 +- .../Checkout/Test/Block/Onepage/Review.php | 2 - ...ertAddToCartButtonAbsentOnCategoryPage.php | 5 +- ...sertAddToCartButtonAbsentOnProductPage.php | 4 +- ...rtAddToCartButtonPresentOnCategoryPage.php | 4 +- ...ertAddToCartButtonPresentOnProductPage.php | 4 +- .../Test/Constraint/AssertCartPerCustomer.php | 2 +- .../AssertItemsCounterInMiniShoppingCart.php | 2 +- ...rtLinkGoToCartNotPresentInSummaryBlock.php | 2 +- ...ssertLinkGoToCartPresentInSummaryBlock.php | 2 +- .../AssertPagersNotPresentInShoppingCart.php | 2 +- .../AssertPagersPresentInShoppingCart.php | 2 +- .../Constraint/AssertPagersSummaryText.php | 6 +- ...sertPaymentMethodIsAbsentOnPaymentPage.php | 2 +- .../AssertPaymentMethodPersistence.php | 2 +- ...tVisibleItemsQtyInCheckoutSummaryBlock.php | 4 +- ...ssertVisibleItemsQtyInMiniShoppingCart.php | 4 +- ...eItemsQtyMessageOnCheckoutSummaryBlock.php | 2 +- .../Test/TestCase/ShoppingCartPagerTest.php | 3 +- .../TestCase/ShoppingCartPerCustomerTest.php | 4 +- ...eProductFromMiniShoppingCartEntityTest.php | 2 +- .../TestStep/EstimateShippingAndTaxStep.php | 6 +- .../TestStep/FillBillingInformationStep.php | 4 +- .../Test/TestStep/FillShippingAddressStep.php | 4 +- .../Test/TestStep/GetPlacedOrderIdStep.php | 2 +- .../RemoveProductsFromTheCartStep.php | 2 +- .../TestStep/SelectCheckoutMethodStep.php | 4 +- .../MultishippingAgreementReview.php | 2 +- .../Test/Constraint/AssertTermOnCheckout.php | 2 +- ...mRequireMessageOnMultishippingCheckout.php | 3 +- .../TestStep/CheckTermOnMultishippingStep.php | 3 +- .../Block/Adminhtml/Block/Edit/BlockForm.php | 2 +- .../Block/Adminhtml/Page/Edit/PageForm.php | 2 +- .../Block/Adminhtml/Page/Edit/Tab/Content.php | 4 +- .../Cms/Test/Block/Adminhtml/Page/Grid.php | 2 +- .../Test/Constraint/AssertCmsBlockInGrid.php | 2 +- .../Constraint/AssertCmsBlockNotInGrid.php | 2 +- .../AssertCmsBlockNotOnCategoryPage.php | 2 +- .../AssertCmsPageDuplicateErrorMessage.php | 2 +- ...rtCmsPagesOnFrontendMultipleStoreViews.php | 2 +- .../AssertUrlRewriteCmsPageRedirect.php | 4 +- .../Magento/Cms/Test/Handler/CmsPage/Curl.php | 2 +- .../Test/TestCase/CreateCmsPageEntityTest.php | 3 +- .../CreateCmsPageRewriteEntityTest.php | 2 +- .../CreateDuplicateUrlCmsPageEntityTest.php | 3 +- .../TestCase/DeleteCmsBlockEntityTest.php | 4 +- .../DeleteCmsPageUrlRewriteEntityTest.php | 2 +- .../UpdateCmsPageRewriteEntityTest.php | 2 +- .../Constraint/AssertAdminAccountSharing.php | 2 +- .../VerifyAdminAccountSharingEntityTest.php | 2 +- .../Product/AffectedAttributeSet.php | 5 +- .../Adminhtml/Product/AttributesGrid.php | 1 - .../Edit/NewConfigurableAttributeForm.php | 2 +- .../Edit/Section/Variations/Config.php | 2 +- .../Edit/Section/Variations/Config/Matrix.php | 4 +- .../Adminhtml/Product/FormPageActions.php | 1 - .../Block/Adminhtml/Product/ProductForm.php | 2 +- .../Test/Block/Product/View.php | 1 - .../Product/View/ConfigurableOptions.php | 4 +- ...ductAttributeOptionInLayeredNavigation.php | 8 +-- .../AssertConfigurableProductInCategory.php | 2 +- ...ProductInCustomerWishlistOnBackendGrid.php | 2 +- ...ertConfigurableProductsQtyAfterReorder.php | 4 +- ...tOutOfStockOptionIsAbsentOnProductPage.php | 2 +- ...ductAttributeAbsenceInVariationsSearch.php | 3 +- .../Test/Handler/ConfigurableProduct/Curl.php | 2 +- .../DeleteChildConfigurableProductTest.php | 4 +- .../Test/TestStep/UpdateChildProductStep.php | 2 +- .../UpdateConfigurableProductStep.php | 4 +- .../System/Currency/Rate/CurrencyRateForm.php | 2 +- .../Adminhtml/System/CurrencySymbolForm.php | 2 +- ...rrencySymbolOnProductPageCustomWebsite.php | 2 +- ...CurrencySymbolOnProductPageMainWebsite.php | 2 +- .../AbstractCurrencySymbolEntityTest.php | 4 +- .../EditCurrencyCustomWebsiteTest.php | 4 +- .../TestCase/EditCurrencySymbolEntityTest.php | 1 - .../ResetCurrencySymbolEntityTest.php | 1 - .../Block/Account/AuthenticationPopup.php | 2 +- .../Block/Account/AuthenticationWrapper.php | 3 - ...AssertAdditionalAddressCreatedFrontend.php | 2 +- .../AssertAddressDeletedBackend.php | 2 +- .../AssertAddressDeletedFrontend.php | 4 +- .../AssertCustomerBackendBackButton.php | 2 +- .../AssertCustomerBackendFormTitle.php | 4 +- ...rtCustomerForgotPasswordSuccessMessage.php | 2 +- ...merGroupChangedToDefaultOnCustomerForm.php | 2 +- .../AssertCustomerGroupFieldsDisabled.php | 3 +- ...CustomerGroupNotOnCatalogPriceRuleForm.php | 2 +- ...ertCustomerGroupOnCatalogPriceRuleForm.php | 2 +- .../AssertCustomerGroupOnCustomerForm.php | 2 +- .../Constraint/AssertCustomerNameFrontend.php | 4 +- .../AssertNoDeleteForSystemCustomerGroup.php | 3 +- .../Test/TestCase/AbstractApplyVatIdTest.php | 2 +- .../Customer/Test/TestCase/ApplyVatIdTest.php | 2 +- .../TestCase/ChangeCustomerPasswordTest.php | 2 +- .../CreateCustomerBackendEntityTest.php | 8 +-- .../CreateExistingCustomerBackendEntity.php | 2 +- .../DeleteCustomerGroupEntityTest.php | 2 +- .../Test/TestCase/LoginOnFrontendFailTest.php | 2 +- .../RegisterCustomerFrontendEntityTest.php | 2 +- .../UpdateCustomerBackendEntityTest.php | 2 +- .../TestStep/LogoutCustomerOnFrontendStep.php | 2 +- ...AssertCurrencyRateAppliedOnCatalogPage.php | 4 +- .../AssertCurrencyRateSuccessSaveMessage.php | 2 +- .../AssertShippingPriceWithCustomCurrency.php | 8 +-- .../Test/Handler/CurrencyRate/Curl.php | 1 - .../Test/TestCase/CreateCurrencyRateTest.php | 4 +- .../Product/Edit/Section/Downloadable.php | 6 +- .../Edit/Section/Downloadable/LinkRow.php | 1 - .../Edit/Section/Downloadable/Links.php | 1 - ...axCalculationAfterCheckoutDownloadable.php | 2 +- ...axRuleIsAppliedToAllPricesDownloadable.php | 4 +- ...ProductInCustomerWishlistOnBackendGrid.php | 2 +- .../Test/Handler/DownloadableProduct/Curl.php | 2 +- .../Handler/DownloadableProduct/Webapi.php | 2 - .../Block/Adminhtml/Order/Create/Form.php | 2 +- .../Order/Create/Items/ItemProduct.php | 2 +- .../Order/View/Items/ItemProduct.php | 2 +- .../Test/Block/Cart/Item/GiftOptions.php | 2 +- .../AssertGiftMessageInFrontendOrder.php | 4 +- .../AssertGiftMessageInFrontendOrderItems.php | 4 +- .../TestStep/AddGiftMessageBackendStep.php | 2 +- .../Product/Grouped/AssociatedProducts.php | 2 +- .../Test/Block/Cart/Sidebar.php | 4 +- .../Catalog/Product/View/Type/Grouped.php | 1 - ...ProductInCustomerWishlistOnBackendGrid.php | 2 +- ...AssertGroupedProductInItemsOrderedGrid.php | 2 +- ...oAllPricesGroupedExcludingIncludingTax.php | 4 +- .../Test/Handler/GroupedProduct/Webapi.php | 2 - .../Test/Block/Adminhtml/Export/Edit/Form.php | 2 +- .../Test/Block/Adminhtml/Import/Edit/Form.php | 2 +- .../Block/Adminhtml/IndexManagement/Grid.php | 2 +- .../CreateCatalogRulesIndexerTest.php | 24 +++---- .../Indexer/Test/TestStep/ReindexStep.php | 2 +- .../Magento/Install/Test/Block/Database.php | 2 +- .../Magento/Install/Test/Block/Landing.php | 2 +- .../Install/Test/Block/WebConfiguration.php | 2 +- .../Constraint/AssertAgreementTextPresent.php | 1 - .../Test/Constraint/AssertKeyCreated.php | 4 +- .../Test/Constraint/AssertRewritesEnabled.php | 4 +- .../Constraint/AssertSecureUrlEnabled.php | 4 +- .../Test/Constraint/AssertSuccessInstall.php | 4 +- .../Install/Test/TestCase/InstallTest.php | 16 ++--- .../AssertEmailValidationErrorGenerated.php | 2 +- .../Constraint/AssertMapOnCategoryPage.php | 2 +- .../Constraint/AssertMapOnProductView.php | 6 +- .../Constraint/AssertMsrpInShoppingCart.php | 8 +-- .../Constraint/AssertMsrpOnCategoryPage.php | 2 +- .../Constraint/AssertMsrpOnProductView.php | 6 +- .../Test/Block/Checkout/Shipping.php | 1 - ...MultishippingOrderSuccessPlacedMessage.php | 2 +- .../TestStep/FillCustomerAddressesStep.php | 2 +- .../TestStep/FillShippingInformationStep.php | 2 +- .../Test/TestStep/SelectPaymentMethodStep.php | 2 +- ...AssertCustomerIsSubscribedToNewsletter.php | 2 +- .../Test/Constraint/AssertNewsletterForm.php | 2 +- .../Constraint/AssertNewsletterInGrid.php | 2 +- .../Constraint/AssertNewsletterPreview.php | 4 +- .../Test/Constraint/AssertNewsletterQueue.php | 2 +- .../AssertNewsletterQueueSaveMessage.php | 2 +- .../AssertNewsletterSuccessCreateMessage.php | 2 +- .../ActionNewsletterTemplateEntityTest.php | 2 +- .../TestCase/CreateNewsletterQueueTest.php | 3 +- .../CreateNewsletterTemplateEntityTest.php | 2 +- .../PreviewNewsletterTemplateEntityTest.php | 2 +- .../TestCase/UpdateNewsletterTemplateTest.php | 2 +- .../PageCache/Test/Block/Cache/Grid.php | 2 +- .../AssertCacheFlushSuccessMessage.php | 2 +- .../AssertCacheInvalidateNotice.php | 2 +- .../Constraint/AssertCacheInvalidatePopUp.php | 2 +- .../Test/Constraint/AssertCategoryCaching.php | 6 +- ...tFlushStaticFilesCacheButtonVisibility.php | 2 +- .../Test/TestCase/CacheInvalidationTest.php | 6 +- .../CacheStatusOnScheduledIndexingTest.php | 8 +-- ...shStaticFilesCacheButtonVisibilityTest.php | 2 +- .../Test/Constraint/AssertFieldsAreActive.php | 2 +- .../Constraint/AssertFieldsAreDisabled.php | 2 +- .../Constraint/AssertFieldsAreEnabled.php | 2 +- .../Constraint/AssertFieldsArePresent.php | 2 +- .../Sandbox/AssertTotalPaypalReview.php | 2 +- .../CheckoutWithPaypalFromProductPageStep.php | 4 +- ...CheckoutWithPaypalFromShoppingCartStep.php | 2 +- .../TestStep/ContinuePaypalCheckoutStep.php | 2 +- ...CheckoutWithPaypalFromShoppingCartStep.php | 2 +- ...CheckoutWithPersistentShoppingCartTest.php | 8 +-- .../AssertGetVideoInfoDataIsCorrect.php | 6 +- .../Constraint/AssertNoVideoProductView.php | 2 +- .../Constraint/AssertVideoCategoryView.php | 4 +- .../AssertVideoConfigurableProductView.php | 6 +- .../Constraint/AssertVideoProductView.php | 4 +- .../Test/TestCase/AddProductVideoTest.php | 1 - .../TestCase/ConfigurableProductVideoTest.php | 6 +- .../Test/TestCase/DeleteProductVideoTest.php | 1 - .../Test/TestCase/UpdateProductVideoTest.php | 1 - .../Block/Adminhtml/Customer/Totals/Grid.php | 2 +- .../Block/Adminhtml/Product/Sold/Grid.php | 2 +- .../AbstractAssertShippingReportResult.php | 4 +- .../AssertAbandonedCartCustomerInfoResult.php | 2 +- .../AssertBestsellerReportResult.php | 2 +- .../Constraint/AssertCouponReportResult.php | 2 +- .../AssertDownloadsReportResult.php | 2 +- ...AssertLifetimeStatisticsUpdatedMessage.php | 2 +- .../AssertLowStockProductInGrid.php | 2 +- .../AssertNewAccountsReportTotalResult.php | 2 +- ...redProductReportForConfigurableProduct.php | 2 +- .../Constraint/AssertOrderedProductResult.php | 2 +- .../Constraint/AssertProductInCartResult.php | 2 +- .../AssertProductReportByCustomerInGrid.php | 2 +- ...AssertProductReportByCustomerNotInGrid.php | 2 +- ...sertProductReviewIsAvailableForProduct.php | 2 +- ...sertProductReviewReportIsVisibleInGrid.php | 2 +- .../AssertProductReviewsQtyByCustomer.php | 2 +- .../AssertProductViewsReportTotalResult.php | 2 +- .../AssertRecentStatisticsUpdatedMessage.php | 2 +- .../AssertReportStatisticsNoticeMessage.php | 3 +- .../AssertReportsUpdatedTimezone.php | 2 +- .../Constraint/AssertSearchTermReportForm.php | 2 +- .../Constraint/AssertSearchTermsInGrid.php | 2 +- .../Test/Constraint/AssertTaxReportInGrid.php | 2 +- .../Constraint/AssertTaxReportNotInGrid.php | 2 +- .../AbandonedCartsReportEntityTest.php | 8 +-- .../BestsellerProductsReportEntityTest.php | 2 +- .../CustomersOrderCountReportEntityTest.php | 4 +- .../CustomersOrderTotalReportEntityTest.php | 4 +- .../TestCase/NewAccountsReportEntityTest.php | 2 +- .../OrderedProductsReportEntityTest.php | 2 +- .../TestCase/RefreshReportsStatisticsTest.php | 2 +- .../Test/TestCase/ReviewReportEntityTest.php | 6 +- .../TestCase/SalesCouponReportEntityTest.php | 2 +- .../TestCase/SearchTermsReportEntityTest.php | 2 +- .../ViewedProductsReportEntityTest.php | 6 +- .../Block/Adminhtml/Edit/RatingElement.php | 2 +- .../Test/Block/Adminhtml/ReviewForm.php | 2 +- .../Magento/Review/Test/Block/ReviewForm.php | 4 +- .../Constraint/AssertProductRatingInGrid.php | 2 +- .../AssertProductRatingInProductPage.php | 4 +- .../AssertProductRatingNotInGrid.php | 2 +- .../AssertProductRatingNotInProductPage.php | 2 +- .../AssertProductRatingOnReviewPage.php | 2 +- ...ssertProductRatingSuccessDeleteMessage.php | 2 +- .../AssertProductRatingSuccessSaveMessage.php | 2 +- ...ProductReviewBackendSuccessSaveMessage.php | 2 +- .../Constraint/AssertProductReviewForm.php | 2 +- .../Constraint/AssertProductReviewInGrid.php | 4 +- ...ssertProductReviewInGridOnCustomerPage.php | 2 +- ...sertProductReviewIsAbsentOnProductPage.php | 2 +- ...ctReviewMassActionSuccessDeleteMessage.php | 2 +- ...tProductReviewMassActionSuccessMessage.php | 2 +- .../AssertProductReviewNotInGrid.php | 4 +- .../AssertProductReviewNotOnProductPage.php | 2 +- .../AssertProductReviewOnProductPage.php | 4 +- ...ssertReviewLinksIsPresentOnProductPage.php | 4 +- .../AssertReviewSuccessSaveMessage.php | 2 +- .../AssertSetApprovedProductReview.php | 4 +- .../Review/Test/Handler/Review/Curl.php | 6 +- .../CreateProductRatingEntityTest.php | 4 +- .../CreateProductReviewBackendEntityTest.php | 2 +- .../CreateProductReviewFrontendEntityTest.php | 4 +- .../DeleteProductRatingEntityTest.php | 4 +- ...anageProductReviewFromCustomerPageTest.php | 4 +- .../MassActionsProductReviewEntityTest.php | 2 +- .../ModerateProductReviewEntityTest.php | 2 +- ...teProductReviewEntityOnProductPageTest.php | 4 +- .../UpdateProductReviewEntityTest.php | 2 +- .../Block/Adminhtml/Order/AbstractForm.php | 2 +- .../Adminhtml/Order/AbstractItemsNewBlock.php | 2 +- .../Block/Adminhtml/Order/Create/Coupons.php | 4 +- .../Order/Create/CustomerActivities.php | 4 +- .../Sidebar/RecentlyViewedProducts.php | 2 +- .../Order/Create/Items/ItemProduct.php | 2 +- .../Order/Create/Shipping/Address.php | 4 +- .../Block/Adminhtml/Order/Create/Store.php | 2 +- .../Adminhtml/Order/Creditmemo/Form/Items.php | 2 +- .../Adminhtml/Order/Invoice/Form/Items.php | 2 +- .../Sales/Test/Block/Widget/Guest/Form.php | 6 +- .../AbstractAssertOrderOnFrontend.php | 2 +- .../Constraint/AssertCreditMemoButton.php | 2 +- .../AssertInvoiceNotInInvoicesGrid.php | 2 +- .../AssertInvoiceStatusInOrdersGrid.php | 2 +- .../AssertInvoiceSuccessCreateMessage.php | 2 +- ...ssertInvoiceWithShipmentSuccessMessage.php | 2 +- .../Constraint/AssertNoCreditMemoButton.php | 2 +- .../Test/Constraint/AssertNoInvoiceButton.php | 2 +- .../AssertOnlineInvoiceCannotBeCreated.php | 4 +- .../Test/Constraint/AssertOrderAddresses.php | 5 +- ...illingAndShippingAddressesAreDifferent.php | 2 +- .../AssertOrderButtonsAvailable.php | 2 +- .../AssertOrderButtonsUnavailable.php | 2 +- .../AssertOrderByDateInOrdersGrid.php | 2 +- ...AssertOrderCancelMassActionFailMessage.php | 2 +- ...ertOrderCancelMassActionSuccessMessage.php | 2 +- .../AssertOrderCancelSuccessMessage.php | 2 +- .../Test/Constraint/AssertOrderGrandTotal.php | 2 +- .../AssertOrderGraphImageIsVisible.php | 2 +- .../Constraint/AssertOrderInOrdersGrid.php | 2 +- .../AssertOrderInOrdersGridOnFrontend.php | 4 +- ...sertOrderItemsPagerDisplayedOnFrontend.php | 8 +-- .../AssertOrderItemsPagerHiddenOnFrontend.php | 8 +-- .../AssertOrderMassOnHoldSuccessMessage.php | 2 +- .../Constraint/AssertOrderNotInOrdersGrid.php | 2 +- .../AssertOrderNotVisibleOnMyAccount.php | 2 +- .../AssertOrderOnHoldFailMessage.php | 2 +- .../AssertOrderOnHoldSuccessMessage.php | 2 +- .../AssertOrderReleaseFailMessage.php | 2 +- .../AssertOrderReleaseSuccessMessage.php | 2 +- .../AssertOrderStatusDuplicateStatus.php | 2 +- .../Constraint/AssertOrderStatusInGrid.php | 2 +- .../AssertOrderStatusIsCanceled.php | 2 +- .../Constraint/AssertOrderStatusIsCorrect.php | 2 +- .../AssertOrderStatusNotAssigned.php | 2 +- .../AssertOrderStatusSuccessAssignMessage.php | 2 +- .../AssertOrderStatusSuccessCreateMessage.php | 2 +- ...ssertOrderStatusSuccessUnassignMessage.php | 2 +- .../AssertOrderSuccessCreateMessage.php | 2 +- .../AssertOrderSuccessVoidedMessage.php | 2 +- .../Constraint/AssertOrdersInOrdersGrid.php | 2 +- .../AssertProductInItemsOrderedGrid.php | 4 +- .../AssertProductsQtyAfterOrderCancel.php | 8 +-- .../AssertRefundInCreditMemoTab.php | 2 +- .../Constraint/AssertRefundInRefundsGrid.php | 2 +- .../AssertRefundNotInRefundsGrid.php | 2 +- ...sertRefundOrderStatusInCommentsHistory.php | 4 +- .../AssertRefundSuccessCreateMessage.php | 2 +- .../AssertRefundedGrandTotalOnFrontend.php | 2 +- .../AssertReorderStatusIsCorrect.php | 2 +- .../AssertSalesPrintOrderBillingAddress.php | 2 +- .../AssertSalesPrintOrderGrandTotal.php | 2 +- .../AssertSalesPrintOrderPaymentMethod.php | 2 +- .../AssertSalesPrintOrderProducts.php | 2 +- .../Constraint/AssertTransactionStatus.php | 2 +- .../Test/Constraint/AssertUnholdButton.php | 2 +- .../AssertVoidInCommentsHistory.php | 4 +- .../Test/Handler/OrderInjectable/Curl.php | 4 +- .../Test/Handler/OrderInjectable/Webapi.php | 5 +- .../TestCase/AssignCustomOrderStatusTest.php | 4 +- .../Test/TestCase/CancelCreatedOrderTest.php | 4 +- .../CreateCustomOrderStatusEntityTest.php | 2 +- .../Test/TestCase/HoldCreatedOrderTest.php | 2 +- ...MoveLastOrderedProductsOnOrderPageTest.php | 2 +- .../MoveProductsInComparedOnOrderPageTest.php | 2 +- ...ecentlyComparedProductsOnOrderPageTest.php | 2 +- ...eRecentlyViewedProductsOnOrderPageTest.php | 2 +- ...oveShoppingCartProductsOnOrderPageTest.php | 2 +- .../UnassignCustomOrderStatusTest.php | 2 +- .../TestCase/UpdateCustomOrderStatusTest.php | 4 +- .../Sales/Test/TestStep/AcceptPaymentStep.php | 2 +- .../Sales/Test/TestStep/AddProductsStep.php | 2 +- .../AddRecentlyViewedProductsToCartStep.php | 2 +- .../Test/TestStep/ConfigureProductsStep.php | 2 +- .../Test/TestStep/CreateNewOrderStep.php | 2 +- .../Test/TestStep/CreateShipmentStep.php | 2 +- .../Sales/Test/TestStep/DenyPaymentStep.php | 2 +- .../TestStep/FillAccountInformationStep.php | 2 +- .../Test/TestStep/FillBillingAddressStep.php | 2 +- .../Test/TestStep/FillShippingAddressStep.php | 2 +- .../Sales/Test/TestStep/OnHoldStep.php | 2 +- .../Sales/Test/TestStep/OpenOrderStep.php | 2 +- .../OpenSalesOrderOnFrontendForGuestStep.php | 2 +- .../Test/TestStep/OpenSalesOrdersStep.php | 2 +- .../TestStep/PrintOrderOnFrontendStep.php | 2 +- .../Sales/Test/TestStep/ReorderStep.php | 2 +- .../Test/TestStep/SelectCustomerOrderStep.php | 2 +- .../SelectPaymentMethodForOrderStep.php | 2 +- .../SelectShippingMethodForOrderStep.php | 2 +- .../Sales/Test/TestStep/SelectStoreStep.php | 2 +- .../Test/TestStep/SubmitOrderNegativeStep.php | 2 +- .../Sales/Test/TestStep/UnholdOrderStep.php | 2 +- .../Test/TestStep/UpdateProductsDataStep.php | 2 +- .../Test/TestStep/VoidAuthorizationStep.php | 2 +- .../Promo/Quote/Edit/PromoQuoteForm.php | 2 +- .../Constraint/AssertCartPriceRuleForm.php | 4 +- ...ssertCartPriceRuleIsNotPresentedInGrid.php | 2 +- ...ssertCartPriceRuleSuccessDeleteMessage.php | 2 +- .../AssertCartPriceRuleSuccessSaveMessage.php | 2 +- .../AssertSalesRuleOnPrintOrder.php | 2 +- .../Test/Handler/SalesRule/Webapi.php | 3 +- .../ApplySeveralSalesRuleEntityTest.php | 4 +- .../CreateSalesRuleEntityPartOneTest.php | 8 --- .../CreateSalesRuleEntityPartTwoTest.php | 8 --- .../TestCase/DeleteSalesRuleEntityTest.php | 4 +- .../TestCase/UpdateSalesRuleEntityTest.php | 4 +- .../TestStep/ApplySalesRuleOnBackendStep.php | 2 +- .../TestStep/ApplySalesRuleOnCheckoutStep.php | 2 +- .../TestStep/ApplySalesRuleOnFrontendStep.php | 2 +- .../Test/TestStep/DeleteAllSalesRuleStep.php | 2 +- .../AssertSynonymGroupDeleteMessage.php | 2 +- .../Constraint/AssertSynonymGroupInGrid.php | 2 +- .../AssertSynonymGroupSuccessSaveMessage.php | 2 +- .../Constraint/AssertSynonymGroupsSearch.php | 2 +- .../AssertSynonymMergeErrorMessage.php | 2 +- .../AssertSynonymRestrictedAccess.php | 4 +- .../AdvancedSearchWithAttributeTest.php | 30 ++++---- .../CreateMultipleSynonymGroupsTest.php | 2 +- .../TestCase/CreateSynonymGroupEntityTest.php | 4 +- .../TestCase/DeleteSynonymGroupEntityTest.php | 5 +- .../TestCase/MergeSynonymGroupEntityTest.php | 6 +- .../TestCase/UpdateSynonymGroupEntityTest.php | 6 +- .../Constraint/AssertCustomerIsLocked.php | 2 +- .../AssertCustomerPasswordRequiredClasses.php | 2 +- .../AssertCustomerResetPasswordFailed.php | 2 +- .../AssertUserPasswordResetFailed.php | 2 +- ...dminUserWhenCreatingNewIntegrationTest.php | 2 +- .../LockAdminUserWhenCreatingNewRoleTest.php | 6 +- ...ockAdminUserWhenEditingIntegrationTest.php | 4 +- .../LockAdminUserWhenEditingRoleTest.php | 8 +-- .../LockAdminUserWhenEditingUserTest.php | 6 +- .../TestCase/LockCustomerOnEditPageTest.php | 2 +- .../TestCase/LockCustomerOnLoginPageTest.php | 4 +- .../NewCustomerPasswordComplexityTest.php | 2 +- ...EntityWithDifferentPasswordClassesTest.php | 4 +- .../SecureChangingCustomerEmailTest.php | 2 +- .../SecureChangingCustomerPasswordTest.php | 2 +- .../Magento/Setup/Test/Block/CreateBackup.php | 2 - .../Setup/Test/Block/Extension/Grid.php | 2 +- .../app/Magento/Setup/Test/Block/Home.php | 2 +- .../Magento/Setup/Test/Block/Module/Grid.php | 2 +- .../Constraint/AssertApplicationVersion.php | 1 - .../Test/Constraint/AssertSuccessMessage.php | 2 +- .../AssertSuccessfulReadinessCheck.php | 2 +- .../AssertVersionAndEditionCheck.php | 2 +- .../AssertExtensionAndVersionCheck.php | 4 +- ...AssertMultipleExtensionAndVersionCheck.php | 2 +- .../AssertMultipleSuccessMessage.php | 2 +- .../Extension/AssertSuccessMessage.php | 2 +- .../Test/TestCase/AbstractExtensionTest.php | 14 ++-- .../Test/TestCase/EnableDisableModuleTest.php | 4 +- .../Test/TestCase/ExtensionMultipleTest.php | 14 ++-- .../Setup/Test/TestCase/ExtensionTest.php | 10 +-- .../Setup/Test/TestCase/UpgradeSystemTest.php | 10 +-- .../Test/Block/Adminhtml/Form/Items.php | 2 +- .../Test/Block/Adminhtml/Order/Tracking.php | 2 +- .../Shipping/Test/Block/Order/Shipment.php | 2 +- .../Test/Constraint/AssertNoShipButton.php | 2 +- .../Constraint/AssertShipTotalQuantity.php | 2 +- .../AssertShipmentInShipmentsGrid.php | 2 +- .../AssertShipmentInShipmentsTab.php | 2 +- .../Test/Constraint/AssertShipmentItems.php | 4 +- .../AssertShipmentNotInShipmentsGrid.php | 2 +- .../AssertShipmentSuccessCreateMessage.php | 2 +- .../AssertShippingMethodOnPrintOrder.php | 2 +- .../TestCase/CreateShipmentEntityTest.php | 2 +- .../SalesShippingReportEntityTest.php | 2 +- .../TestStep/FillShippingAddressesStep.php | 4 +- ...tingSignifydGuaranteeInCommentsHistory.php | 2 +- .../Test/Constraint/AssertCaseInfoOnAdmin.php | 2 +- .../AssertSignifydCaseInCommentsHistory.php | 2 +- .../AssertSignifydCaseInOrdersGrid.php | 2 +- .../Test/TestStep/OpenOrderGridStep.php | 4 +- .../SignifydFillShippingAddressStep.php | 4 +- .../Test/Constraint/AssertSitemapContent.php | 4 +- .../AssertSitemapFailFolderSaveMessage.php | 2 +- .../AssertSitemapFailPathSaveMessage.php | 2 +- .../Test/Constraint/AssertSitemapInGrid.php | 2 +- .../Constraint/AssertSitemapNotInGrid.php | 2 +- .../AssertSitemapSubmissionToRobotsTxt.php | 4 +- .../AssertSitemapSuccessDeleteMessage.php | 2 +- .../AssertSitemapSuccessGenerateMessage.php | 2 +- ...tSitemapSuccessSaveAndGenerateMessages.php | 2 +- .../AssertSitemapSuccessSaveMessage.php | 2 +- .../Sitemap/Test/Handler/Sitemap/Curl.php | 2 +- .../Test/TestCase/CreateSitemapEntityTest.php | 2 +- .../Test/TestCase/DeleteSitemapEntityTest.php | 2 +- .../TestCase/GenerateSitemapEntityTest.php | 6 +- .../Test/TestCase/UpdateSitemapEntityTest.php | 4 +- .../app/Magento/Store/Test/Block/Switcher.php | 2 +- .../Test/Constraint/AssertStoreBackend.php | 2 +- .../Test/Constraint/AssertStoreCodeInUrl.php | 2 +- .../Store/Test/Constraint/AssertStoreForm.php | 2 +- .../Test/Constraint/AssertStoreFrontend.php | 2 +- .../Test/Constraint/AssertStoreGroupForm.php | 2 +- .../Constraint/AssertStoreGroupInGrid.php | 2 +- .../Constraint/AssertStoreGroupNotInGrid.php | 2 +- .../AssertStoreGroupOnStoreViewForm.php | 2 +- .../Test/Constraint/AssertStoreInGrid.php | 2 +- .../Test/Constraint/AssertStoreNotInGrid.php | 2 +- .../Constraint/AssertStoreNotOnFrontend.php | 2 +- .../Test/Constraint/AssertWebsiteForm.php | 2 +- .../Test/Constraint/AssertWebsiteInGrid.php | 2 +- .../Constraint/AssertWebsiteNotInGrid.php | 2 +- .../Constraint/AssertWebsiteOnStoreForm.php | 2 +- .../Store/Test/Handler/Website/Curl.php | 6 +- .../Test/TestCase/CreateStoreEntityTest.php | 2 +- .../TestCase/CreateStoreGroupEntityTest.php | 2 +- .../Test/TestCase/CreateWebsiteEntityTest.php | 2 +- .../Test/TestCase/DeleteStoreEntityTest.php | 2 +- .../TestCase/DeleteStoreGroupEntityTest.php | 2 +- .../Test/TestCase/DeleteWebsiteEntityTest.php | 2 +- .../MoveStoreToOtherGroupSameWebsiteTest.php | 4 +- .../Test/TestCase/UpdateStoreEntityTest.php | 2 +- .../TestCase/UpdateStoreGroupEntityTest.php | 2 +- .../Test/TestCase/UpdateWebsiteEntityTest.php | 2 +- .../TestStep/DeleteWebsitesEntityStep.php | 6 +- .../Constraint/AssertApiInfoTitleOnPage.php | 2 +- .../AssertEndpointContentDisplay.php | 2 +- .../AssertServiceContentDisplay.php | 2 +- .../AssertSwaggerSectionLoadOnPage.php | 2 +- .../Swagger/Test/Page/SwaggerUiPage.php | 2 +- .../Test/Block/Product/ListProduct.php | 2 +- .../Block/Product/ProductList/ProductItem.php | 2 +- ...sertSelectedSwatchOptionsOnProductPage.php | 2 +- .../AssertSwatchOptionsOnProductPage.php | 3 +- ...bleProductWithSwatchToShoppingCartTest.php | 4 +- ...oductToCartFromCatalogCategoryPageStep.php | 8 +-- .../Test/Block/Adminhtml/Rule/Edit/Form.php | 4 +- .../AbstractAssertOrderTaxOnBackend.php | 6 +- ...tractAssertTaxCalculationAfterCheckout.php | 6 +- .../Tax/Test/Constraint/AssertTaxRateForm.php | 2 +- .../Test/Constraint/AssertTaxRateInGrid.php | 2 +- .../Constraint/AssertTaxRateInTaxRule.php | 4 +- .../Constraint/AssertTaxRateNotInGrid.php | 2 +- .../Constraint/AssertTaxRateNotInTaxRule.php | 2 +- .../AssertTaxRateSuccessDeleteMessage.php | 2 +- .../AssertTaxRateSuccessSaveMessage.php | 2 +- .../Test/Constraint/AssertTaxRuleApplying.php | 2 +- .../Tax/Test/Constraint/AssertTaxRuleForm.php | 2 +- .../Test/Constraint/AssertTaxRuleInGrid.php | 2 +- ...ppliedToAllPricesExcludingIncludingTax.php | 1 - ...axRuleIsAppliedToAllPricesExcludingTax.php | 1 - ...axRuleIsAppliedToAllPricesIncludingTax.php | 1 - .../Constraint/AssertTaxRuleNotInGrid.php | 2 +- .../AssertTaxRuleSuccessDeleteMessage.php | 2 +- .../AssertTaxRuleSuccessSaveMessage.php | 2 +- .../Tax/Test/Handler/TaxClass/Webapi.php | 1 - .../Magento/Tax/Test/Handler/TaxRate/Curl.php | 2 +- .../Tax/Test/Handler/TaxRate/Webapi.php | 3 +- .../Magento/Tax/Test/Handler/TaxRule/Curl.php | 2 +- .../Tax/Test/Handler/TaxRule/Webapi.php | 3 +- .../TestCase/ApplyTaxBasedOnVatIdTest.php | 6 +- .../Test/TestCase/CreateTaxRateEntityTest.php | 2 +- .../Test/TestCase/CreateTaxRuleEntityTest.php | 2 +- .../Test/TestCase/DeleteTaxRateEntityTest.php | 2 +- .../Test/TestCase/DeleteTaxRuleEntityTest.php | 4 +- .../Test/TestCase/TaxWithCrossBorderTest.php | 2 +- .../Test/TestCase/UpdateTaxRateEntityTest.php | 2 +- .../Test/TestCase/UpdateTaxRuleEntityTest.php | 4 +- .../Test/TestStep/DeleteAllTaxRulesStep.php | 2 +- .../Adminhtml/AbstractFormContainers.php | 4 +- .../Ui/Test/Block/Adminhtml/DataGrid.php | 2 +- .../Adminhtml/Catalog/Edit/UrlRewriteForm.php | 1 - .../AssertCategoryUrlWithCustomStoreView.php | 2 +- .../AssertPageByUrlRewriteIsNotFound.php | 2 +- .../AssertUrlRewriteAfterDeletingCategory.php | 4 +- .../AssertUrlRewriteCategoryInGrid.php | 2 +- .../AssertUrlRewriteCategoryNotInGrid.php | 2 +- .../AssertUrlRewriteCategoryRedirect.php | 2 +- .../AssertUrlRewriteCustomRedirect.php | 2 +- .../AssertUrlRewriteCustomSearchRedirect.php | 2 +- .../AssertUrlRewriteDeletedMessage.php | 2 +- .../Constraint/AssertUrlRewriteInGrid.php | 2 +- .../Constraint/AssertUrlRewriteNotInGrid.php | 2 +- .../AssertUrlRewriteProductInGrid.php | 3 +- .../AssertUrlRewriteProductNotInGrid.php | 2 +- .../AssertUrlRewriteProductRedirect.php | 2 +- .../AssertUrlRewriteSaveMessage.php | 2 +- ...AssertUrlRewriteSuccessOutsideRedirect.php | 2 +- .../AssertUrlRewriteUpdatedProductInGrid.php | 2 +- .../AssertUrlRewritesCategoriesInGrid.php | 2 +- .../Test/TestCase/CategoryUrlRewriteTest.php | 4 +- .../CreateCategoryRewriteEntityTest.php | 4 +- .../CreateCustomUrlRewriteEntityTest.php | 2 +- .../CreateProductUrlRewriteEntityTest.php | 2 +- .../DeleteCategoryUrlRewriteEntityTest.php | 2 +- .../DeleteCustomUrlRewriteEntityTest.php | 2 +- .../DeleteProductUrlRewriteEntityTest.php | 2 +- .../UpdateCategoryUrlRewriteEntityTest.php | 4 +- .../UpdateCustomUrlRewriteEntityTest.php | 2 +- .../UpdateProductUrlRewriteEntityTest.php | 4 +- .../Test/Block/Adminhtml/User/Edit/Form.php | 2 +- .../Test/Block/Adminhtml/User/Tab/Role.php | 2 +- .../AssertAccessTokensErrorRevokeMessage.php | 2 +- .../AssertImpossibleDeleteYourOwnAccount.php | 2 +- .../AssertImpossibleDeleteYourOwnRole.php | 2 +- .../User/Test/Constraint/AssertRoleInGrid.php | 2 +- .../Test/Constraint/AssertRoleNotInGrid.php | 2 +- .../AssertRoleSuccessDeleteMessage.php | 2 +- .../AssertRoleSuccessSaveMessage.php | 2 +- .../Constraint/AssertUserDuplicateMessage.php | 2 +- ...sertUserFailedLoginByPermissionMessage.php | 2 +- .../AssertUserFailedLoginMessage.php | 2 +- .../User/Test/Constraint/AssertUserInGrid.php | 2 +- .../AssertUserInvalidEmailHostnameMessage.php | 2 +- .../AssertUserInvalidEmailMessage.php | 2 +- .../Test/Constraint/AssertUserNotInGrid.php | 2 +- .../AssertUserSuccessDeleteMessage.php | 2 +- .../Constraint/AssertUserSuccessLogin.php | 2 +- .../AssertUserSuccessSaveMessage.php | 2 +- .../TestCase/CreateAdminUserEntityTest.php | 4 +- .../CreateAdminUserRoleEntityTest.php | 2 +- .../Test/TestCase/CustomAclPermissionTest.php | 2 +- .../TestCase/DeleteAdminUserEntityTest.php | 4 +- .../TestCase/DeleteUserRoleEntityTest.php | 4 +- ...lAccessTokensForAdminWithoutTokensTest.php | 2 +- .../UpdateAdminUserRoleEntityTest.php | 2 +- .../UserLoginAfterChangingPermissionsTest.php | 4 +- .../Test/TestStep/LoginUserOnBackendStep.php | 2 +- .../Constraint/AssertCustomVariableForm.php | 4 +- .../Constraint/AssertCustomVariableInGrid.php | 2 +- .../Constraint/AssertCustomVariableInPage.php | 4 +- .../AssertCustomVariableNotInCmsPageForm.php | 2 +- .../AssertCustomVariableNotInGrid.php | 2 +- .../AssertCustomVariableRestrictedAccess.php | 2 +- ...sertCustomVariableSuccessDeleteMessage.php | 2 +- ...AssertCustomVariableSuccessSaveMessage.php | 2 +- .../CreateCustomVariableEntityTest.php | 2 +- .../DeleteCustomVariableEntityTest.php | 2 +- .../UpdateCustomVariableEntityTest.php | 6 +- .../Block/Onepage/Payment/Method/Vault.php | 2 +- .../AssertStoredPaymentDeletedMessage.php | 2 +- .../app/Magento/Weee/Test/Block/Cart.php | 2 +- .../Weee/Test/Block/Product/ListProduct.php | 2 +- .../Test/TestCase/CreateTaxWithFptTest.php | 1 - .../Block/Adminhtml/Widget/ChosenOption.php | 2 +- .../Widget/Instance/Edit/Tab/Parameters.php | 2 +- .../ParametersType/CatalogCategoryLink.php | 2 +- .../ParametersType/CatalogNewProductsList.php | 2 - .../Tab/ParametersType/ParametersForm.php | 4 +- .../Widget/Instance/Edit/Tab/Settings.php | 4 +- .../Instance/Edit/Tab/WidgetInstance.php | 4 +- .../Tab/WidgetInstanceType/Categories.php | 2 +- .../Edit/Tab/WidgetInstanceType/Products.php | 2 +- .../WidgetInstanceType/WidgetInstanceForm.php | 2 +- .../Magento/Widget/Test/Block/WidgetView.php | 2 +- .../AssertProductInCatalogNewProductsList.php | 6 +- .../AssertWidgetAbsentOnFrontendHome.php | 2 +- .../AssertWidgetCatalogCategoryLink.php | 4 +- .../AssertWidgetCatalogNewProductsList.php | 10 +-- .../Constraint/AssertWidgetCmsPageLink.php | 4 +- .../Test/Constraint/AssertWidgetInGrid.php | 2 +- .../AssertWidgetOnFrontendInCatalog.php | 2 +- .../Constraint/AssertWidgetOnProductPage.php | 4 +- .../Constraint/AssertWidgetProductLink.php | 4 +- .../AssertWidgetRecentlyComparedProducts.php | 4 +- .../AssertWidgetRecentlyViewedProducts.php | 4 +- .../AssertWidgetSuccessDeleteMessage.php | 2 +- .../AssertWidgetSuccessSaveMessage.php | 2 +- .../Widget/Test/Handler/Widget/Curl.php | 2 +- .../AbstractCreateWidgetEntityTest.php | 6 +- .../Test/TestCase/CreateWidgetEntityTest.php | 2 +- .../Test/TestCase/CreateWidgetsEntityTest.php | 2 +- .../Test/TestCase/DeleteWidgetEntityTest.php | 2 +- .../Test/TestStep/DeleteAllWidgetsStep.php | 2 +- .../Adminhtml/Customer/Edit/Tab/Wishlist.php | 2 +- .../Customer/Edit/Tab/Wishlist/Grid.php | 2 +- .../Test/Block/Customer/Wishlist/Items.php | 2 +- .../AbstractAssertWishlistProductDetails.php | 2 +- ...sertAddProductToWishlistSuccessMessage.php | 2 +- ...ertMoveProductToWishlistSuccessMessage.php | 2 +- .../AssertProductDetailsInWishlist.php | 2 +- ...ProductInCustomerWishlistOnBackendGrid.php | 2 +- .../AssertProductIsPresentInWishlist.php | 2 +- .../AssertProductsIsAbsentInWishlist.php | 2 +- .../Test/Constraint/AssertWishlistIsEmpty.php | 2 +- .../Constraint/AssertWishlistShareMessage.php | 2 +- .../Test/TestCase/AbstractWishlistTest.php | 2 +- .../Test/TestCase/ShareWishlistEntityTest.php | 2 +- .../integration/etc/di/preferences/ce.php | 12 ++-- .../Magento/TestFramework/Application.php | 16 ++--- .../TestFramework/Backend/App/Config.php | 1 + .../TestFramework/Db/Sequence/Builder.php | 7 +- .../Isolation/DeploymentConfig.php | 2 +- .../ObjectManager/Configurator.php | 7 +- .../Magento/TestFramework/Request.php | 2 +- dev/tests/integration/framework/bootstrap.php | 2 +- .../Magento/Test/Event/PhpUnitTest.php | 4 +- .../Magento/Test/Isolation/AppConfigTest.php | 3 - .../Model/Import/AdvancedPricingTest.php | 4 +- .../Http/ReSignUpResponseResolverTest.php | 2 +- .../Dashboard/Tab/Products/ViewedTest.php | 6 +- .../Widget/Grid/Column/Renderer/TextTest.php | 4 +- .../Adminhtml/Cache/CleanStaticFilesTest.php | 2 +- .../Adminhtml/Cache/MassActionTest.php | 6 +- .../Magento/Backend/Model/MenuTest.php | 3 +- .../Backend/Model/Session/AdminConfigTest.php | 2 - .../Block/VaultTokenRendererTest.php | 4 +- .../Controller/Cards/DeleteActionTest.php | 4 +- .../PayPal/TokenUiComponentProviderTest.php | 1 - .../Model/Ui/TokensConfigProviderTest.php | 4 +- ...namicBundleWithTierPriceCalculatorTest.php | 2 +- .../FixedBundlePriceCalculatorTest.php | 2 +- ...ndleWithCatalogPriceRuleCalculatorTest.php | 2 +- ...edBundleWithSpecialPriceCalculatorTest.php | 2 +- ...FixedBundleWithTierPriceCalculatorTest.php | 4 +- .../Model/Import/Product/Type/BundleTest.php | 1 - .../Block/Product/View/OptionsTest.php | 8 +-- .../Controller/Product/CompareTest.php | 4 +- .../Cron/DeleteOutdatedPriceValuesTest.php | 1 - .../Catalog/Helper/Product/CompareTest.php | 2 +- .../Model/Category/DataProviderTest.php | 1 - .../Magento/Catalog/Model/ConfigTest.php | 7 +- .../Model/Indexer/Product/CategoryTest.php | 8 +-- .../Attribute/Backend/TierpriceTest.php | 2 +- .../Catalog/Model/Product/ImageTest.php | 3 +- .../RenderingBasedOnIsProductListFlagTest.php | 3 +- .../Pricing/Render/FinalPriceBoxTest.php | 17 +++-- .../Model/Import/ProductTest.php | 15 ++-- .../Quote/Item/QuantityValidatorTest.php | 13 ++-- .../System/Config/Backend/MinsaleqtyTest.php | 2 +- .../ResourceModel/Rule/CollectionTest.php | 6 +- ...BaseSelectAttributesSearchStrategyTest.php | 4 +- .../BaseSelectFullTextSearchStrategyTest.php | 2 +- .../Indexer/Fulltext/Action/FullTest.php | 6 +- .../Indexer/SwitcherUsedInFulltextTest.php | 2 - .../Model/Layer/Filter/CategoryTest.php | 6 +- .../Model/Layer/Filter/PriceTest.php | 4 +- .../CustomAttributeFilterTest.php | 10 +-- .../FilterMapper/StockStatusFilterTest.php | 6 +- .../FilterMapper/VisibilityFilterTest.php | 8 +-- .../Model/CategoryUrlRewriteGeneratorTest.php | 1 - ...oryProcessUrlRewriteSavingObserverTest.php | 2 +- .../Magento/Checkout/Controller/CartTest.php | 6 +- .../Magento/Cms/Controller/RouterTest.php | 3 +- .../Config/Block/System/Config/FormTest.php | 6 +- .../Console/Command/ConfigSetCommandTest.php | 2 +- .../Adminhtml/System/ConfigTest.php | 13 ++-- .../Controller/Adminhtml/ProductTest.php | 2 +- .../Model/Product/Type/ConfigurableTest.php | 3 +- .../RenderingBasedOnIsProductListFlagTest.php | 3 +- .../Magento/Cron/Model/ScheduleTest.php | 2 +- .../Observer/ProcessCronQueueObserverTest.php | 2 +- .../Adminhtml/System/Currency/IndexTest.php | 1 - .../Block/Adminhtml/Edit/Tab/ViewTest.php | 1 - .../Customer/Controller/AccountTest.php | 9 ++- .../Adminhtml/Index/MassAssignGroupTest.php | 3 +- .../Customer/Controller/AjaxLoginTest.php | 1 - .../Model/Export/AddressTest.php | 1 + .../Model/Import/CustomerTest.php | 21 ++++-- .../Command/App/ConfigImportCommandTest.php | 12 ++-- .../App/SensitiveConfigSetCommandTest.php | 2 +- .../testsuite/Magento/Deploy/DeployTest.php | 10 +-- .../Magento/Developer/Helper/DataTest.php | 2 +- .../Model/Config/Backend/AllowedIpsTest.php | 4 +- .../Model/Logger/Handler/DebugTest.php | 2 +- .../Magento/Directory/Model/ObserverTest.php | 4 +- .../Downloadable/Model/Product/TypeTest.php | 2 +- .../Model/ResourceModel/Indexer/PriceTest.php | 2 +- .../Frontend/DefaultFrontendTest.php | 8 +-- .../Adminhtml/Template/Edit/FormTest.php | 2 +- .../Api/AbstractExtensibleObjectTest.php | 6 +- .../ExtensionAttribute/JoinProcessorTest.php | 6 +- .../Framework/App/Config/InitialTest.php | 4 +- .../HeaderProvider/AbstractHeaderTestCase.php | 6 +- .../Framework/App/Utility/FilesTest.php | 1 - .../Framework/Backup/FilesystemTest.php | 3 +- .../Magento/Framework/Code/GeneratorTest.php | 9 +-- .../PreProcessor/Adapter/CssInlinerTest.php | 2 +- .../File/Collector/AggregatedTest.php | 6 +- .../Framework/DB/Adapter/Pdo/MysqlTest.php | 2 +- .../DB/DataConverter/DataConverterTest.php | 8 +-- .../Framework/Filesystem/Driver/FileTest.php | 2 - .../Framework/Interception/AbstractPlugin.php | 6 +- .../Framework/Interception/GeneralTest.php | 9 +-- .../Framework/Mview/View/ChangelogTest.php | 2 - .../Search/Adapter/Mysql/AdapterTest.php | 2 +- .../Adapter/Mysql/Builder/Query/MatchTest.php | 3 +- .../Request/Config/FileResolverStub.php | 2 +- .../Session/SaveHandler/DbTableTest.php | 2 - .../Framework/Session/SaveHandlerTest.php | 3 +- .../Stdlib/Cookie/CookieScopeTest.php | 6 +- .../testsuite/Magento/Framework/UrlTest.php | 2 +- .../Framework/View/Asset/MinifierTest.php | 6 +- .../View/Design/Fallback/RulePoolTest.php | 1 - .../View/Element/AbstractBlockTest.php | 2 - .../Config/Provider/TemplateTest.php | 2 +- .../Magento/Framework/View/FileSystemTest.php | 2 +- .../View/LayoutTestWithExceptions.php | 2 +- .../Product/Indexer/Price/GroupedTest.php | 4 +- .../Adminhtml/Import/ValidateTest.php | 3 +- .../Controller/Adminhtml/ImportTest.php | 2 - .../Model/Export/EntityAbstractTest.php | 3 +- .../CustomerData/InstantPurchaseTest.php | 2 +- .../InstantPurchase/Model/PlaceOrderTest.php | 2 +- .../Adminhtml/Integration/Edit/FormTest.php | 1 - .../Model/ResourceModel/Oauth/TokenTest.php | 4 +- .../Block/Checkout/OverviewTest.php | 3 +- .../Multishipping/Controller/CheckoutTest.php | 2 +- .../Magento/Payment/Model/ConfigTest.php | 1 - .../Adminhtml/Billing/AgreementTest.php | 2 - .../Magento/Paypal/Model/Api/NvpTest.php | 4 +- .../Paypal/Model/Hostedpro/RequestTest.php | 19 +++-- .../Magento/Paypal/Model/HostedproTest.php | 4 -- .../Magento/Paypal/Model/IpnTest.php | 10 ++- .../Model/Quote/Address/ConverterTest.php | 4 +- .../Quote/Model/QuoteRepositoryTest.php | 12 ++-- .../Magento/Quote/Model/QuoteTest.php | 3 +- .../Adminhtml/Shopcart/GridTestAbstract.php | 2 +- .../Review/Block/Adminhtml/Edit/FormTest.php | 3 +- .../Model/ResourceModel/Review/ReviewTest.php | 2 - .../Order/Create/Form/AbstractTest.php | 4 -- .../Controller/Adminhtml/Order/CreateTest.php | 2 +- .../Adminhtml/Transactions/FetchTest.php | 2 - .../Sales/Model/AdminOrder/CreateTest.php | 6 +- .../Model/CronJob/CleanExpiredOrdersTest.php | 2 +- .../Model/Order/Address/RendererTest.php | 10 +-- .../Model/Order/AddressRepositoryTest.php | 1 - .../Model/Order/Payment/RepositoryTest.php | 1 - .../SampleData/Model/DependencyTest.php | 4 +- .../Search/Model/SynonymAnalyzerTest.php | 4 +- ...ndenciesShowModulesCircularCommandTest.php | 1 - .../DependenciesShowModulesCommandTest.php | 4 +- .../DeployStaticContentCommandTest.php | 6 +- .../Setup/Module/I18n/Pack/GeneratorTest.php | 4 +- .../Php/Tokenizer/PhraseCollectorTest.php | 2 +- .../Translate/MethodCollectorTest.php | 2 +- .../Controller/Webhooks/HandlerTest.php | 8 +-- .../Request/CreateCaseBuilderTest.php | 10 +-- .../ResourceModel/Catalog/ProductTest.php | 16 ++--- .../App/Request/PathInfoProcessorTest.php | 6 +- .../Magento/Store/Block/SwitcherTest.php | 2 +- .../Magento/Store/Model/StoreManagerTest.php | 2 - .../Magento/Store/Model/StoreTest.php | 2 +- .../Tax/Block/Adminhtml/Rate/TitleTest.php | 1 - .../Tax/Controller/Adminhtml/RateTest.php | 2 +- .../Tax/Controller/Adminhtml/RuleTest.php | 6 +- .../Model/Calculation/RateRepositoryTest.php | 2 - .../Magento/Tax/Model/CalculationTest.php | 2 +- .../Magento/Tax/Model/Rate/ProviderTest.php | 3 +- .../Magento/Tax/Model/Rate/SourceTest.php | 1 - .../Tax/Model/Sales/Total/Quote/SetupUtil.php | 13 ++-- .../Tax/Model/TaxClass/ManagementTest.php | 1 - .../Adminhtml/Rate/ImportExportTest.php | 2 - .../Adminhtml/Rate/ImportPostTest.php | 2 - .../Magento/Test/Integrity/LayoutTest.php | 3 +- .../Modular/CarrierConfigFilesTest.php | 2 - .../Modular/CrontabConfigFilesTest.php | 1 - .../Modular/IndexerConfigFilesTest.php | 2 - .../Integrity/Modular/MenuConfigFilesTest.php | 2 - .../Modular/MviewConfigFilesTest.php | 2 - .../System/Design/ThemeControllerTest.php | 1 - .../Magento/Theme/Model/DesignTest.php | 1 - .../Theme/Model/Theme/ThemeProviderTest.php | 4 +- .../Magento/Ui/Api/BookmarkRepositoryTest.php | 2 +- .../Ui/Component/ConfigurationTest.php | 3 +- .../Magento/Ui/Config/ConverterTest.php | 6 +- .../Magento/Ui/Config/FileResolverStub.php | 2 +- .../Magento/Ui/Config/Reader/DomTest.php | 6 +- .../Magento/Ui/Config/ReaderTest.php | 1 - .../User/Model/ResourceModel/UserTest.php | 2 +- .../testsuite/Magento/User/Model/UserTest.php | 3 +- .../Webapi/Model/ServiceMetadataTest.php | 2 +- .../Magento/Webapi/Model/Soap/ConfigTest.php | 5 +- .../testsuite/Magento/Weee/Model/TaxTest.php | 8 ++- .../Widget/Model/Config/ReaderTest.php | 3 +- .../ResourceModel/Item/CollectionTest.php | 2 +- .../Rule/Design/FinalImplementationTest.php | 12 ++-- .../Sniffs/Arrays/ShortArraySyntaxSniff.php | 2 +- .../Sniffs/EchoTags/ShortEchoSyntaxSniff.php | 2 +- .../Magento/Sniffs/Less/AvoidIdSniff.php | 2 +- .../Sniffs/Less/BracesFormattingSniff.php | 2 +- .../Magento/Sniffs/Less/ClassNamingSniff.php | 3 +- .../Magento/Sniffs/Less/ColonSpacingSniff.php | 2 +- .../Sniffs/Less/ColourDefinitionSniff.php | 2 +- .../Less/CombinatorIndentationSniff.php | 2 +- .../Sniffs/Less/CommentLevelsSniff.php | 2 +- .../Sniffs/Less/ImportantPropertySniff.php | 2 +- .../Magento/Sniffs/Less/IndentationSniff.php | 2 +- .../Sniffs/Less/PropertiesLineBreakSniff.php | 2 +- .../Sniffs/Less/PropertiesSortingSniff.php | 3 +- .../Magento/Sniffs/Less/QuotesSniff.php | 2 +- .../Sniffs/Less/SelectorDelimiterSniff.php | 2 +- .../Sniffs/Less/SemicolonSpacingSniff.php | 2 +- .../Less/TypeSelectorConcatenationSniff.php | 2 +- .../Sniffs/Less/TypeSelectorsSniff.php | 2 +- .../Magento/Sniffs/Less/VariablesSniff.php | 2 +- .../Magento/Sniffs/Less/ZeroUnitsSniff.php | 2 +- .../LiteralNamespacesSniff.php | 2 +- .../Sniffs/MicroOptimizations/IsNullSniff.php | 2 +- .../NamingConventions/InterfaceNameSniff.php | 2 +- .../NamingConventions/ReservedWordsSniff.php | 2 +- .../Sniffs/Translation/ConstantUsageSniff.php | 2 +- .../Whitespace/EmptyLineMissedSniff.php | 2 +- .../Whitespace/MultipleEmptyLinesSniff.php | 2 +- .../CodingStandard/Tool/CodeMessDetector.php | 2 +- .../TestFramework/Dependency/DiRule.php | 2 +- .../VirtualType/VirtualTypeMapper.php | 2 +- dev/tests/static/framework/autoload.php | 2 +- dev/tests/static/framework/bootstrap.php | 2 +- ...neratedClassNotInConstructorFinderTest.php | 7 +- .../Magento/TestFramework/Utility/Foo.php | 2 +- dev/tests/static/get_github_changes.php | 12 +++- .../Magento/Test/Integrity/ClassesTest.php | 2 +- .../Test/Integrity/ComposerLockTest.php | 2 +- .../Test/Integrity/Di/CompilerTest.php | 14 ++-- .../Test/Integrity/Library/DependencyTest.php | 4 +- .../Magento/Backend/ControllerAclTest.php | 6 +- .../Test/Integrity/TestPlacementTest.php | 2 +- ...AutogeneratedClassNotInConstructorTest.php | 2 +- .../Test/Legacy/InstallUpgradeTest.php | 2 +- .../Magento/Test/Less/LiveCodeTest.php | 5 +- .../Magento/Test/Php/XssPhtmlTemplateTest.php | 2 +- .../Acl/Test/Unit/Role/RegistryTest.php | 4 +- .../Api/AbstractExtensibleObject.php | 2 - .../ExtensionAttributesGenerator.php | 4 +- ...ionAttributesInterfaceFactoryGenerator.php | 4 +- .../Api/ExtensionAttribute/Config.php | 2 +- .../Api/ExtensionAttribute/JoinProcessor.php | 5 +- .../JoinProcessorHelper.php | 1 - lib/internal/Magento/Framework/Api/Filter.php | 2 - .../Framework/Api/Search/SearchCriteria.php | 1 - .../Framework/Api/Search/SearchResult.php | 2 - .../Api/Test/Unit/DataObjectHelperTest.php | 2 +- .../ExtensibleDataObjectConverterTest.php | 2 +- .../Api/Test/Unit/Search/SearchResultTest.php | 4 +- .../PaginationProcessorTest.php | 2 +- .../Framework/Api/Test/Unit/SortOrderTest.php | 6 +- .../Magento/Framework/App/Action/Action.php | 1 - .../Magento/Framework/App/Bootstrap.php | 2 +- .../Framework/App/Cache/Frontend/Factory.php | 2 - .../Magento/Framework/App/Cache/Manager.php | 2 - .../Magento/Framework/App/Cache/Proxy.php | 4 +- .../Framework/App/Cache/Type/FrontendPool.php | 1 - .../Magento/Framework/App/Config/Initial.php | 1 - .../App/DeploymentConfig/CommentParser.php | 2 +- .../Framework/App/EnvironmentFactory.php | 4 +- .../Framework/App/EnvironmentInterface.php | 2 +- lib/internal/Magento/Framework/App/Http.php | 2 +- .../App/Interception/Cache/CompiledConfig.php | 2 +- .../App/ObjectManager/ConfigCache.php | 2 +- .../ObjectManager/ConfigLoader/Compiled.php | 4 +- .../Environment/AbstractEnvironment.php | 4 +- .../ObjectManager/Environment/Compiled.php | 6 +- .../ObjectManager/Environment/Developer.php | 4 +- .../Framework/App/ObjectManagerFactory.php | 6 +- .../Magento/Framework/App/ProductMetadata.php | 6 +- .../Framework/App/RequestContentInterface.php | 1 - .../Framework/App/ResourceConnection.php | 3 +- .../App/ResourceConnection/Config.php | 2 +- .../HeaderProvider/XContentTypeOptions.php | 2 - .../Response/HeaderProvider/XFrameOptions.php | 2 +- .../Response/HeaderProvider/XssProtection.php | 1 - .../Magento/Framework/App/Response/Http.php | 2 +- .../Framework/App/Router/ActionList.php | 4 +- .../Framework/App/Router/DefaultRouter.php | 2 +- .../Magento/Framework/App/Scope/Validator.php | 2 +- .../Framework/App/State/CleanupFiles.php | 4 +- .../Magento/Framework/App/StaticResource.php | 2 +- .../App/Test/Unit/Action/ActionFake.php | 2 +- .../App/Test/Unit/Action/ActionTest.php | 2 +- .../Framework/App/Test/Unit/AreaListTest.php | 2 +- .../Framework/App/Test/Unit/AreaTest.php | 2 +- .../Arguments/ArgumentInterpreterTest.php | 2 +- .../App/Test/Unit/Cache/ManagerTest.php | 2 +- .../App/Test/Unit/Cache/StateTest.php | 2 +- .../App/Test/Unit/Cache/Tag/ResolverTest.php | 4 +- .../Unit/Cache/Tag/Strategy/DummyTest.php | 5 +- .../Unit/Cache/Tag/Strategy/FactoryTest.php | 4 +- .../Cache/Tag/Strategy/IdentifierTest.php | 6 +- .../App/Test/Unit/Cache/Type/ConfigTest.php | 1 - .../Test/Unit/Cache/Type/FrontendPoolTest.php | 2 +- .../App/Test/Unit/Cache/TypeListTest.php | 2 +- .../Unit/Config/ConfigPathResolverTest.php | 4 +- .../Test/Unit/Config/Initial/ReaderTest.php | 2 - .../MetadataConfigTypeProcessorTest.php | 2 +- .../Unit/Config/MetadataProcessorTest.php | 6 +- .../Test/Unit/Config/Scope/ValidatorTest.php | 4 +- .../Test/Unit/Config/Storage/WriterTest.php | 1 - .../Framework/App/Test/Unit/CronTest.php | 2 +- .../DeploymentConfig/CommentParserTest.php | 2 +- .../Unit/DeploymentConfig/FileReaderTest.php | 2 +- .../Test/Unit/DeploymentConfig/WriterTest.php | 4 +- .../App/Test/Unit/DeploymentConfigTest.php | 4 +- .../App/Test/Unit/ErrorHandlerTest.php | 2 +- .../Unit/Filesystem/DirectoryListTest.php | 2 +- .../App/Test/Unit/Http/ContextTest.php | 2 +- .../Framework/App/Test/Unit/HttpTest.php | 2 +- .../App/Test/Unit/Language/ConfigTest.php | 2 +- .../App/Test/Unit/Language/DictionaryTest.php | 1 - .../App/Test/Unit/MaintenanceModeTest.php | 2 +- .../App/Test/Unit/PageCache/FormKeyTest.php | 2 +- .../Test/Unit/PageCache/IdentifierTest.php | 2 +- .../App/Test/Unit/PageCache/KernelTest.php | 6 +- .../App/Test/Unit/PageCache/VersionTest.php | 6 +- .../App/Test/Unit/Request/HttpTest.php | 2 +- .../App/Test/Unit/RequestFactoryTest.php | 2 +- .../HeaderProvider/XFrameOptionsTest.php | 4 +- .../App/Test/Unit/Response/HttpTest.php | 2 +- .../App/Test/Unit/Router/ActionListTest.php | 3 +- .../App/Test/Unit/Scope/ValidatorTest.php | 4 +- .../Framework/App/Test/Unit/SetupInfoTest.php | 2 +- .../App/Test/Unit/State/CleanupFilesTest.php | 4 +- .../Framework/App/Test/Unit/StateTest.php | 6 +- .../App/Test/Unit/StaticResourceTest.php | 1 - .../Unit/Utility/AggregateInvokerTest.php | 2 +- .../MaterializationStrategy/CopyTest.php | 4 +- .../MaterializationStrategy/FactoryTest.php | 2 +- .../MaterializationStrategy/SymlinkTest.php | 7 +- .../Test/Unit/View/Asset/PublisherTest.php | 7 +- .../Deployment/Version/Storage/FileTest.php | 2 +- .../Magento/Framework/App/Utility/Files.php | 2 +- .../Magento/Framework/Archive/Tar.php | 1 - .../Framework/Archive/Test/Unit/ZipTest.php | 2 - .../Magento/Framework/Archive/Zip.php | 2 +- .../Framework/Autoload/AutoloaderRegistry.php | 2 - .../Autoload/Test/Unit/PopulatorTest.php | 4 +- .../Backup/Filesystem/Rollback/Ftp.php | 2 - .../Framework/Cache/Backend/Eaccelerator.php | 2 +- .../Code/Minifier/Adapter/Css/CSSmin.php | 2 +- .../Code/Test/Unit/GeneratedFilesTest.php | 1 - .../Unit/Generator/InterfaceGeneratorTest.php | 6 +- .../Code/Test/Unit/ValidatorTest.php | 2 +- .../Framework/Communication/Config.php | 2 +- .../Communication/Config/Reader/EnvReader.php | 2 +- .../Config/Reader/XmlReader/Validator.php | 4 +- .../Communication/Config/Validator.php | 2 +- .../Composer/ComposerInformation.php | 2 +- .../Magento/Framework/Composer/Remove.php | 2 - .../Test/Unit/ComposerInformationTest.php | 1 - .../Magento/Framework/Config/Data.php | 2 +- .../Magento/Framework/Config/Data/Scoped.php | 2 +- .../Magento/Framework/Config/FileResolver.php | 12 ++-- .../Framework/Config/GenericSchemaLocator.php | 6 +- .../Config/Test/Unit/Composer/PackageTest.php | 2 +- .../Config/Test/Unit/Converter/DomTest.php | 4 +- .../Config/Test/Unit/Data/ConfigDataTest.php | 1 - .../Test/Unit/Dom/ArrayNodeConfigTest.php | 2 +- .../Test/Unit/Dom/NodeMergingConfigTest.php | 2 +- .../Test/Unit/Dom/NodePathMatcherTest.php | 2 +- .../Config/Test/Unit/Dom/UrnResolverTest.php | 4 +- .../Config/Test/Unit/FileIteratorTest.php | 2 +- .../Test/Unit/Reader/FilesystemTest.php | 2 +- .../Framework/Config/Test/Unit/ReaderTest.php | 2 - .../Framework/Config/Test/Unit/ScopeTest.php | 2 +- .../Console/GenerationDirectoryAccess.php | 2 +- .../Test/Unit/QuestionPerformer/YesNoTest.php | 4 +- .../Framework/Controller/AbstractResult.php | 2 +- .../Framework/Controller/Result/Redirect.php | 2 +- .../Test/Unit/Result/RedirectTest.php | 10 +-- .../Test/Unit/Router/Route/FactoryTest.php | 2 +- .../Convert/Test/Unit/ConvertArrayTest.php | 2 +- .../Convert/Test/Unit/ObjectTest.php | 2 +- .../Css/PreProcessor/File/Temporary.php | 2 +- .../FileGenerator/RelatedGenerator.php | 2 +- .../Css/PreProcessor/Instruction/Import.php | 10 +-- .../Adapter/Less/ProcessorTest.php | 6 +- .../File/Collector/AggregatedTest.php | 2 +- .../File/Collector/LibraryTest.php | 4 +- .../File/FileList/CollatorTest.php | 2 +- .../PreProcessor/Instruction/ImportTest.php | 1 - .../Magento/Framework/DB/AbstractMapper.php | 1 - .../Framework/DB/Adapter/AdapterInterface.php | 2 +- .../Magento/Framework/DB/Adapter/DdlCache.php | 2 +- .../Framework/DB/Adapter/Pdo/Mysql.php | 3 +- .../Framework/DB/Adapter/Pdo/MysqlFactory.php | 1 - .../Framework/DB/Select/ColumnsRenderer.php | 2 +- .../Framework/DB/Select/DistinctRenderer.php | 2 +- .../Framework/DB/Select/FromRenderer.php | 2 +- .../Framework/DB/Select/GroupRenderer.php | 3 +- .../Framework/DB/Select/OrderRenderer.php | 2 +- .../Framework/DB/Select/WhereRenderer.php | 2 +- .../Magento/Framework/DB/SelectFactory.php | 3 +- .../Framework/DB/TemporaryTableService.php | 1 - .../Test/Unit/DB/Logger/LoggerProxyTest.php | 4 +- .../DataConverter/SerializedToJsonTest.php | 4 +- .../Unit/FieldDataConverterFactoryTest.php | 6 +- .../DB/Test/Unit/FieldDataConverterTest.php | 10 +-- .../Test/Unit/Helper/Mysql/FulltextTest.php | 1 - .../DB/Test/Unit/Logger/FileTest.php | 2 +- .../Select/CompositeQueryModifierTest.php | 4 +- .../Test/Unit/Select/DistinctRendererTest.php | 2 +- .../DB/Test/Unit/Select/FromRendererTest.php | 2 +- .../Unit/Select/QueryModifierFactoryTest.php | 4 +- .../Framework/DB/Test/Unit/SelectTest.php | 4 +- .../Test/Unit/TemporaryTableServiceTest.php | 4 +- .../Framework/Data/AbstractSearchResult.php | 2 +- .../Magento/Framework/Data/Collection.php | 2 +- .../Framework/Data/Collection/AbstractDb.php | 6 +- .../Framework/Data/Form/Element/Date.php | 1 - .../Framework/Data/Form/Element/Editor.php | 2 +- .../Framework/Data/Form/Element/Gallery.php | 2 +- .../Framework/Data/Form/FilterFactory.php | 1 - .../Test/Unit/AbstractSearchResultTest.php | 2 +- .../Argument/Interpreter/ArrayTypeTest.php | 2 +- .../Unit/Argument/Interpreter/BooleanTest.php | 2 +- .../Argument/Interpreter/CompositeTest.php | 2 +- .../Argument/Interpreter/ConstantTest.php | 2 +- .../Argument/Interpreter/NullTypeTest.php | 2 +- .../Unit/Argument/Interpreter/NumberTest.php | 2 +- .../Test/Unit/Collection/FilesystemTest.php | 68 +++++++++--------- .../Data/Test/Unit/CollectionTest.php | 2 +- .../Data/Test/Unit/Form/AbstractFormTest.php | 2 +- .../Data/Test/Unit/Form/Element/DateTest.php | 2 +- .../Data/Test/Unit/FormFactoryTest.php | 2 +- .../Framework/Data/Test/Unit/FormTest.php | 2 +- .../Test/Unit/SearchResultProcessorTest.php | 2 +- .../Test/Unit/Tree/Node/CollectionTest.php | 2 +- .../Framework/Data/Test/Unit/TreeTest.php | 4 +- .../Framework/Data/Wysiwyg/Normalizer.php | 1 - .../Magento/Framework/DataObject/Copy.php | 3 +- .../DataObject/IdentityGeneratorInterface.php | 2 +- .../Unit/Copy/Config/SchemaLocatorTest.php | 2 - .../Encryption/Test/Unit/EncryptorTest.php | 3 +- .../EntityManager/AbstractModelHydrator.php | 2 - .../Framework/EntityManager/Db/CreateRow.php | 6 +- .../Framework/EntityManager/Db/DeleteRow.php | 2 +- .../Framework/EntityManager/Db/UpdateRow.php | 6 +- .../Framework/EntityManager/Hydrator.php | 4 +- .../Observer/AfterEntityDelete.php | 2 +- .../Observer/AfterEntityLoad.php | 2 +- .../Observer/AfterEntitySave.php | 2 +- .../Observer/BeforeEntityDelete.php | 3 +- .../EntityManager/Operation/CheckIfExists.php | 5 +- .../EntityManager/Operation/Create.php | 10 +-- .../Operation/Create/CreateAttributes.php | 2 +- .../Operation/Create/CreateExtensions.php | 2 +- .../Operation/Create/CreateMain.php | 4 +- .../EntityManager/Operation/Delete.php | 11 ++- .../Operation/Delete/DeleteAttributes.php | 2 +- .../Operation/Delete/DeleteExtensions.php | 2 +- .../Operation/Delete/DeleteMain.php | 4 +- .../EntityManager/Operation/ExtensionPool.php | 1 - .../EntityManager/Operation/Read.php | 8 +-- .../Operation/Read/ReadAttributes.php | 2 +- .../Operation/Read/ReadExtensions.php | 4 +- .../EntityManager/Operation/Read/ReadMain.php | 6 +- .../EntityManager/Operation/Update.php | 8 +-- .../Operation/Update/UpdateAttributes.php | 2 +- .../Operation/Update/UpdateExtensions.php | 2 +- .../Operation/Update/UpdateMain.php | 4 +- .../Framework/EntityManager/OperationPool.php | 7 +- .../Sequence/SequenceManager.php | 6 +- .../Test/Unit/Db/UpdateRowTest.php | 6 +- .../Test/Unit/OperationPoolTest.php | 4 +- .../Unit/Sequence/SequenceApplierTest.php | 8 +-- .../Event/Test/Unit/CollectionTest.php | 4 +- .../Event/Test/Unit/Config/ConverterTest.php | 2 +- .../Framework/Event/Test/Unit/ConfigTest.php | 2 +- .../Framework/Event/Test/Unit/ManagerTest.php | 4 +- .../Test/Unit/Observer/CollectionTest.php | 2 +- .../Event/Test/Unit/Observer/CronTest.php | 2 +- .../Event/Test/Unit/Observer/RegexTest.php | 2 +- .../Event/Test/Unit/ObserverFactoryTest.php | 2 +- .../Event/Test/Unit/ObserverTest.php | 4 +- .../Event/Test/Unit/WrapperFactoryTest.php | 2 +- .../Framework/Exception/InputException.php | 2 +- .../TemporaryState/CouldNotSaveException.php | 2 +- .../Test/Unit/AuthenticationExceptionTest.php | 2 +- .../Test/Unit/AuthorizationExceptionTest.php | 2 +- .../Unit/EmailNotConfirmedExceptionTest.php | 2 +- .../Test/Unit/InputExceptionTest.php | 2 +- .../Test/Unit/LocalizedExceptionTest.php | 2 +- .../Test/Unit/NoSuchEntityExceptionTest.php | 2 +- .../Test/Unit/State/ExpiredExceptionTest.php | 2 +- .../Unit/State/InputMismatchExceptionTest.php | 2 +- .../State/InvalidTransitionExceptionTest.php | 2 +- .../Test/Unit/StateExceptionTest.php | 2 +- .../Test/Unit/Transfer/Adapter/HttpTest.php | 2 +- .../Magento/Framework/File/Uploader.php | 5 +- .../Framework/Filesystem/File/Read.php | 2 +- .../Framework/Filesystem/File/Write.php | 2 +- .../Magento/Framework/Filesystem/Glob.php | 2 +- .../Magento/Framework/Filesystem/Io/File.php | 3 - .../Magento/Framework/Filesystem/Io/Ftp.php | 3 +- .../Framework/Filesystem/Io/IoInterface.php | 2 - .../Test/Unit/DirectoryListTest.php | 2 +- .../Filesystem/Test/Unit/Driver/HttpTest.php | 2 +- .../Filesystem/Test/Unit/Driver/HttpsTest.php | 2 +- .../Filesystem/Test/Unit/DriverPoolTest.php | 2 +- .../Test/Unit/File/ReadFactoryTest.php | 4 +- .../Filesystem/Test/Unit/File/ReadTest.php | 2 +- .../Test/Unit/File/WriteFactoryTest.php | 2 +- .../Framework/Filter/DataObject/Grid.php | 2 - .../Framework/Filter/Input/MaliciousCode.php | 2 +- .../Filter/Test/Unit/ArrayFilterTest.php | 2 +- .../Filter/Test/Unit/DataObject/GridTest.php | 4 +- .../Test/Unit/Input/MaliciousCodeTest.php | 2 +- .../Framework/Filter/Test/Unit/InputTest.php | 2 +- .../Unit/Template/Tokenizer/ParameterTest.php | 2 +- .../Unit/Template/Tokenizer/VariableTest.php | 2 +- .../Magento/Framework/HTTP/Adapter/Curl.php | 3 +- .../HTTP/Test/Unit/Adapter/CurlTest.php | 2 +- .../Test/Unit/PhpEnvironment/RequestTest.php | 2 +- .../Test/Unit/PhpEnvironment/ResponseTest.php | 2 +- .../Image/Test/Unit/AdapterFactoryTest.php | 2 +- .../Magento/Framework/Indexer/Action/Base.php | 10 +-- .../Framework/Indexer/BatchProvider.php | 2 +- .../Framework/Indexer/BatchSizeManagement.php | 2 +- .../Indexer/BatchSizeManagementInterface.php | 2 +- .../Indexer/Config/DependencyInfoProvider.php | 2 +- .../Indexer/Handler/ConcatHandler.php | 2 +- .../Indexer/SaveHandler/IndexerHandler.php | 5 +- .../Framework/Indexer/SaveHandlerFactory.php | 3 +- .../Framework/Indexer/StructureFactory.php | 2 - .../Indexer/Test/Unit/BatchProviderTest.php | 6 +- .../Test/Unit/BatchSizeManagementTest.php | 8 +-- .../Test/Unit/Config/ConverterTest.php | 3 +- .../Indexer/Test/Unit/GridStructureTest.php | 2 +- .../Indexer/Test/Unit/IndexStructureTest.php | 3 +- .../ScopeResolver/IndexScopeResolverTest.php | 2 +- .../Code/Generator/Interceptor.php | 4 +- .../Framework/Interception/Config/Config.php | 2 +- .../ObjectManager/Config/Developer.php | 2 +- .../Interception/PluginList/PluginList.php | 6 +- .../Unit/Code/Generator/InterceptorTest.php | 2 +- .../Test/Unit/Code/InterfaceValidatorTest.php | 12 ++-- .../ItemPlugin/IncompatibleArgumentsType.php | 2 +- .../ItemPlugin/ValidPlugin.php | 2 +- .../ObjectManager/Config/DeveloperTest.php | 2 +- .../Test/Unit/PluginList/PluginListTest.php | 2 +- .../Locale/Test/Unit/CurrencyTest.php | 1 - .../Locale/Test/Unit/Deployed/CodesTest.php | 2 +- .../Locale/Test/Unit/Deployed/OptionsTest.php | 2 +- .../Magento/Framework/Message/Manager.php | 2 +- .../Message/Test/Unit/AbstractMessageTest.php | 2 - .../Unit/ExceptionMessageFactoryPoolTest.php | 2 +- .../Message/Test/Unit/ManagerTest.php | 2 +- .../Model/Entity/RepositoryFactory.php | 2 +- .../Framework/Model/Entity/ScopeResolver.php | 4 +- .../Model/ResourceModel/Db/AbstractDb.php | 4 +- .../Db/Collection/AbstractCollection.php | 4 +- .../ResourceModel/Db/DeleteEntityRow.php | 1 - .../ResourceModel/Db/Relation/ActionPool.php | 2 +- .../Db/ValidateDataIntegrity.php | 2 +- .../Db/VersionControl/RelationComposite.php | 4 +- .../Test/Unit/AbstractExtensibleModelTest.php | 1 - .../EntitySnapshot/AttributeProviderTest.php | 2 +- .../ResourceModel/AbstractResourceTest.php | 4 +- .../Db/Collection/AbstractCollectionTest.php | 3 +- .../Framework/Module/ConflictChecker.php | 2 +- lib/internal/Magento/Framework/Module/Dir.php | 1 - .../Framework/Module/ModuleList/Loader.php | 6 +- .../Framework/Module/ModuleResource.php | 2 +- .../Magento/Framework/Module/PackageInfo.php | 2 +- .../Module/Plugin/DbStatusValidator.php | 4 +- .../Magento/Framework/Module/Setup.php | 2 +- .../Module/Test/Unit/ConflictCheckerTest.php | 2 +- .../Module/Test/Unit/DbVersionInfoTest.php | 2 +- .../Test/Unit/DependencyCheckerTest.php | 2 +- .../Module/Test/Unit/Dir/ReaderTest.php | 1 - .../Module/Test/Unit/FullModuleListTest.php | 2 +- .../Module/Test/Unit/ManagerTest.php | 2 - .../Test/Unit/ModuleList/LoaderTest.php | 2 +- .../Module/Test/Unit/ModuleListTest.php | 2 +- .../Test/Unit/PackageInfoFactoryTest.php | 2 +- .../Module/Test/Unit/PackageInfoTest.php | 3 +- .../Unit/Plugin/DbStatusValidatorTest.php | 4 +- .../Framework/Module/Test/Unit/SetupTest.php | 2 +- .../Framework/Module/Test/Unit/StatusTest.php | 2 +- .../Framework/Mview/Config/Converter.php | 1 - .../Framework/Mview/Config/SchemaLocator.php | 2 - .../Mview/Test/Unit/Config/Data/ProxyTest.php | 14 ++-- .../Mview/Test/Unit/Config/ReaderTest.php | 2 - .../Framework/Mview/Test/Unit/ConfigTest.php | 2 +- .../Unit/View/SubscriptionFactoryTest.php | 7 +- .../Mview/Test/Unit/View/SubscriptionTest.php | 58 ++++++++++++--- .../Framework/Mview/Test/Unit/ViewTest.php | 2 +- .../Framework/Mview/View/Changelog.php | 1 - .../View/ChangelogTableNotExistsException.php | 1 - .../Test/Unit/OauthInputExceptionTest.php | 2 +- .../Code/Generator/Repository.php | 2 +- .../ObjectManager/Config/Compiled.php | 2 +- .../Framework/ObjectManager/Config/Config.php | 2 +- .../ObjectManager/DefinitionFactory.php | 5 +- .../Test/Unit/Code/Generator/FactoryTest.php | 2 +- .../Code/Generator/GenerateRepositoryTest.php | 2 +- .../Unit/Code/Generator/RepositoryTest.php | 1 - .../Test/Unit/Config/ConfigTest.php | 2 +- .../Unit/Config/Mapper/ArgumentParserTest.php | 2 +- .../Test/Unit/Config/Mapper/DomTest.php | 2 +- .../Unit/Config/Reader/DomFactoryTest.php | 2 +- .../Test/Unit/DefinitionFactoryTest.php | 2 +- .../Test/Unit/Factory/FactoryTest.php | 2 +- .../Test/Unit/Helper/CompositeTest.php | 3 - .../Framework/Phrase/Renderer/Inline.php | 2 +- .../Test/Unit/Renderer/CompositeTest.php | 2 +- .../Test/Unit/Renderer/PlaceholderTest.php | 2 +- .../Framework/Pricing/Price/AbstractPrice.php | 2 +- .../Pricing/Render/AbstractAdjustment.php | 2 +- .../Render/AdjustmentRenderInterface.php | 2 +- .../Framework/Pricing/Render/Amount.php | 2 +- .../Pricing/Render/AmountRenderInterface.php | 2 +- .../Framework/Pricing/Render/PriceBox.php | 4 +- .../Render/PriceBoxRenderInterface.php | 2 +- .../Framework/Pricing/Render/RendererPool.php | 2 +- .../Test/Unit/Adjustment/CollectionTest.php | 2 +- .../Pricing/Test/Unit/Adjustment/PoolTest.php | 2 +- .../Test/Unit/Price/AbstractPriceTest.php | 2 +- .../Test/Unit/Price/CollectionTest.php | 4 +- .../Pricing/Test/Unit/Price/FactoryTest.php | 2 +- .../Pricing/Test/Unit/Price/PoolTest.php | 2 +- .../Pricing/Test/Unit/PriceInfo/BaseTest.php | 2 +- .../Unit/Render/AbstractAdjustmentTest.php | 2 +- .../Pricing/Test/Unit/Render/AmountTest.php | 4 +- .../Pricing/Test/Unit/Render/LayoutTest.php | 2 +- .../Pricing/Test/Unit/RenderTest.php | 2 +- .../Reflection/CustomAttributesProcessor.php | 5 +- .../ExtensionAttributesProcessor.php | 3 +- .../Framework/Reflection/FieldNamer.php | 7 +- .../Framework/Reflection/MethodsMap.php | 2 +- .../Test/Unit/AttributeTypeResolverTest.php | 2 +- .../Test/Unit/DataObjectProcessorTest.php | 2 +- .../Reflection/Test/Unit/MethodsMapTest.php | 2 +- .../Reflection/Test/Unit/NameFinderTest.php | 1 - .../Reflection/Test/Unit/TypeCasterTest.php | 4 +- .../Test/Unit/TypeProcessorTest.php | 3 +- .../RequireJs/Test/Unit/ConfigTest.php | 2 +- .../Search/Adapter/Mysql/Adapter.php | 1 - .../Mysql/Aggregation/Builder/Term.php | 1 - .../Adapter/Mysql/Query/Builder/Match.php | 2 +- .../Dynamic/Algorithm/AlgorithmInterface.php | 1 - .../Search/Dynamic/Algorithm/Auto.php | 1 - .../Search/Dynamic/Algorithm/Improved.php | 1 - .../Search/Dynamic/DataProviderFactory.php | 1 - .../Search/Dynamic/DataProviderInterface.php | 2 - .../Search/Dynamic/IntervalFactory.php | 1 - .../Framework/Search/Request/Cleaner.php | 2 +- .../Framework/Search/Request/Mapper.php | 2 +- .../Framework/Search/Response/Bucket.php | 2 - .../Magento/Framework/Search/Search.php | 2 +- .../Search/SearchResponseBuilder.php | 2 +- .../Test/Unit/Adapter/Mysql/AdapterTest.php | 1 - .../Adapter/Mysql/Aggregation/BuilderTest.php | 2 +- .../Unit/Adapter/Mysql/Filter/BuilderTest.php | 2 +- .../Test/Unit/Adapter/Mysql/MapperTest.php | 2 +- .../Adapter/Mysql/Query/Builder/MatchTest.php | 2 +- .../Mysql/Query/QueryContainerTest.php | 2 +- .../Test/Unit/Dynamic/IntervalFactoryTest.php | 1 - .../Unit/Request/Aggregation/StatusTest.php | 1 - .../Search/Test/Unit/Request/MapperTest.php | 2 +- .../Framework/Search/Test/Unit/SearchTest.php | 2 +- .../Test/Unit/Serializer/SerializeTest.php | 3 - .../Magento/Framework/Session/Config.php | 1 - .../Framework/Session/SaveHandler/DbTable.php | 1 - .../Framework/Session/SaveHandler/Redis.php | 8 +-- .../Session/SaveHandler/Redis/Config.php | 2 +- .../Session/SaveHandler/Redis/Logger.php | 2 +- .../Session/Test/Unit/ConfigTest.php | 2 +- .../Unit/SaveHandler/Redis/ConfigTest.php | 2 +- .../Test/Unit/SaveHandlerFactoryTest.php | 2 +- .../Framework/Setup/BackupRollback.php | 5 +- .../Magento/Framework/Setup/ConsoleLogger.php | 2 +- .../Framework/Setup/SampleData/Context.php | 2 +- .../Unit/BackendFrontnameGeneratorTest.php | 2 +- .../Setup/Test/Unit/FilePermissionsTest.php | 2 +- .../Unit/CommandRendererBackgroundTest.php | 2 +- .../Shell/Test/Unit/ComplexParameterTest.php | 2 +- .../Stdlib/Cookie/PhpCookieManager.php | 4 +- .../Stdlib/CookieManagerInterface.php | 8 +-- .../Framework/Stdlib/DateTime/Timezone.php | 2 +- .../Stdlib/Test/Unit/ArrayManagerTest.php | 2 +- .../Stdlib/Test/Unit/BooleanUtilsTest.php | 2 +- .../Test/Unit/Cookie/CookieScopeTest.php | 8 +-- .../Test/Unit/Cookie/PhpCookieManagerTest.php | 9 +-- .../Test/Unit/DateTime/Filter/DateTest.php | 2 +- .../Unit/DateTime/Filter/DateTimeTest.php | 2 +- .../Stdlib/Test/Unit/StringUtilsTest.php | 2 +- .../Magento/Framework/System/Dirs.php | 2 - lib/internal/Magento/Framework/System/Ftp.php | 2 - .../Framework/Test/Unit/ArchiveTest.php | 2 +- .../Test/Unit/DB/Query/BatchIteratorTest.php | 2 +- .../Framework/Test/Unit/DataObjectTest.php | 2 +- .../Framework/Test/Unit/EscaperTest.php | 2 +- .../Magento/Framework/Test/Unit/EventTest.php | 2 +- .../Framework/Test/Unit/FilesystemTest.php | 4 +- .../Framework/Test/Unit/FlagManagerTest.php | 6 +- .../Module/Plugin/DbStatusValidatorTest.php | 8 +-- .../Framework/Test/Unit/RegistryTest.php | 2 +- .../Autoloader/GeneratedClassesAutoloader.php | 2 +- .../Translate/Test/Unit/Inline/ProxyTest.php | 2 +- .../Translate/Test/Unit/Inline/StateTest.php | 2 +- .../Translate/Test/Unit/InlineTest.php | 14 ++-- .../Framework/Url/RouteParamsResolver.php | 2 - .../Framework/Url/Test/Unit/DecoderTest.php | 4 +- .../Framework/Validator/AllowedProtocols.php | 2 +- .../Framework/Validator/Entity/Properties.php | 1 - .../Magento/Framework/Validator/Exception.php | 2 +- .../Validator/Test/Unit/ConfigTest.php | 3 +- .../Magento/Framework/View/Asset/Bundle.php | 4 +- .../Framework/View/Asset/Bundle/Config.php | 2 +- .../Framework/View/Asset/Bundle/Manager.php | 4 +- .../Magento/Framework/View/Asset/Config.php | 3 +- .../View/Asset/ContentProcessorException.php | 1 - .../View/Asset/ContentProcessorInterface.php | 2 - .../Asset/PreProcessor/AlternativeSource.php | 3 +- .../Framework/View/Asset/Repository.php | 2 +- .../Magento/Framework/View/Asset/Source.php | 4 +- .../Magento/Framework/View/Config.php | 2 +- .../Magento/Framework/View/Context.php | 2 +- .../View/Design/Fallback/Rule/Simple.php | 4 -- .../View/Design/Fallback/Rule/Theme.php | 4 +- .../View/Design/Fallback/RulePool.php | 12 ++-- .../Fallback/Resolver/Alternative.php | 1 - .../Fallback/Resolver/Simple.php | 2 - .../View/Design/Theme/ThemePackageFactory.php | 2 - .../Message/Renderer/RenderersPool.php | 2 +- .../View/Element/Template/File/Validator.php | 2 +- .../Framework/View/Element/Text/ListText.php | 2 - .../View/Element/Text/TextList/Item.php | 2 - .../View/Element/Text/TextList/Link.php | 2 - .../Interpreter/ConfigurableObject.php | 2 +- .../UiComponent/BlockWrapperInterface.php | 2 +- .../FileCollector/AggregatedFileCollector.php | 2 +- .../Config/Provider/Component/Definition.php | 3 +- .../Element/UiComponent/Config/Reader.php | 4 -- .../Element/UiComponent/ContentType/Json.php | 4 +- .../Element/UiComponent/ContentType/Xml.php | 4 +- .../Element/UiComponent/ContextInterface.php | 4 +- .../DataProvider/DataProviderInterface.php | 2 - .../UiComponent/DataProvider/Document.php | 2 +- .../UiComponent/DataProvider/FilterPool.php | 2 +- .../DataProvider/FulltextFilter.php | 2 +- .../DataProvider/RegularFilter.php | 2 +- .../UiComponent/DataProvider/SearchResult.php | 4 +- .../View/Element/UiComponentFactory.php | 6 +- .../File/Collector/Decorator/ModuleOutput.php | 1 - .../View/File/Collector/Override/Base.php | 1 - .../File/Collector/Override/ThemeModular.php | 4 +- .../Framework/View/File/Collector/Theme.php | 1 - .../Framework/View/Layout/BuilderFactory.php | 1 - .../Framework/View/Layout/ConfigCondition.php | 2 +- .../Framework/View/Layout/Data/Structure.php | 2 +- .../Framework/View/Layout/Generator/Block.php | 2 +- .../View/Layout/Generator/Structure.php | 4 +- .../View/Layout/Generator/UiComponent.php | 10 +-- .../Magento/Framework/View/Layout/Generic.php | 4 +- .../Framework/View/Layout/Reader/Block.php | 2 +- .../View/Layout/Reader/UiComponent.php | 6 +- .../View/Layout/ScheduledStructure/Helper.php | 2 +- .../View/Page/Config/Generator/Head.php | 2 +- .../Framework/View/TemplateEngine/Xhtml.php | 8 +-- .../TemplateEngine/Xhtml/CompilerFactory.php | 4 +- .../TemplateEngine/Xhtml/ResultFactory.php | 2 +- .../TemplateEngine/Xhtml/TemplateFactory.php | 4 +- .../View/Test/Unit/Asset/ConfigTest.php | 1 - .../Test/Unit/Asset/LockerProcessTest.php | 6 +- .../View/Test/Unit/Asset/MergeServiceTest.php | 2 +- .../Unit/Asset/MergeStrategy/ChecksumTest.php | 4 +- .../Unit/Asset/MergeStrategy/DirectTest.php | 4 +- .../Asset/MergeStrategy/FileExistsTest.php | 4 +- .../View/Test/Unit/Asset/MergedTest.php | 6 +- .../Asset/NotationResolver/ModuleTest.php | 5 +- .../Asset/NotationResolver/VariableTest.php | 1 - .../PreProcessor/AlternativeSourceTest.php | 11 ++- .../Test/Unit/Asset/PreProcessor/PoolTest.php | 4 +- .../View/Test/Unit/Asset/SourceTest.php | 5 +- .../View/Test/Unit/BlockPoolTest.php | 2 +- .../Framework/View/Test/Unit/ContextTest.php | 2 +- .../View/Test/Unit/DataSourcePoolTest.php | 8 ++- .../Design/Fallback/Rule/CompositeTest.php | 2 +- .../Fallback/Rule/ModularSwitchTest.php | 2 +- .../Unit/Design/Fallback/Rule/ModuleTest.php | 2 +- .../Unit/Design/Fallback/Rule/SimpleTest.php | 2 +- .../Unit/Design/Fallback/Rule/ThemeTest.php | 4 +- .../Unit/Design/Fallback/RulePoolTest.php | 3 +- .../FileResolution/Fallback/FileTest.php | 4 +- .../Fallback/LocaleFileTest.php | 4 +- .../Fallback/Resolver/AlternativeTest.php | 4 +- .../Fallback/Resolver/SimpleTest.php | 4 +- .../Fallback/StaticFileTest.php | 4 +- .../Fallback/TemplateFileTest.php | 2 +- .../Unit/Design/Theme/CustomizationTest.php | 2 +- .../Design/Theme/FlyweightFactoryTest.php | 2 +- .../View/Test/Unit/Design/Theme/ImageTest.php | 6 +- .../Test/Unit/Element/AbstractBlockTest.php | 14 ++-- .../Test/Unit/Element/Html/CalendarTest.php | 2 +- .../View/Test/Unit/Element/Html/LinksTest.php | 2 +- .../Test/Unit/Element/Html/SelectTest.php | 28 ++++---- .../Message/MessageConfigurationsPoolTest.php | 8 +-- .../View/Test/Unit/Element/MessagesTest.php | 5 +- .../Element/Template/File/ValidatorTest.php | 4 +- .../Unit/Element/Text/TextList/ItemTest.php | 2 +- .../Unit/Element/Text/TextList/LinkTest.php | 2 +- .../Unit/Element/UiComponent/ContextTest.php | 2 +- .../UiComponent/Control/DummyButtonTest.php | 2 +- .../DataProvider/FulltextFilterTest.php | 12 ++-- .../Element/UiComponent/ProcessorTest.php | 2 +- .../Decorator/ModuleDependencyTest.php | 3 +- .../Collector/Decorator/ModuleOutputTest.php | 3 +- .../Unit/File/Collector/Override/BaseTest.php | 2 +- .../Unit/File/Collector/ThemeModularTest.php | 2 +- .../Test/Unit/File/FileList/CollatorTest.php | 2 +- .../View/Test/Unit/File/FileListTest.php | 6 +- .../Interpreter/Decorator/UpdaterTest.php | 2 +- .../Argument/Interpreter/HelperMethodTest.php | 2 +- .../Argument/Interpreter/NamedParamsTest.php | 2 +- .../Argument/Interpreter/ObjectTest.php | 2 +- .../Argument/Interpreter/OptionsTest.php | 2 +- .../Argument/Interpreter/PassthroughTest.php | 2 +- .../Layout/Argument/Interpreter/UrlTest.php | 2 +- .../Test/Unit/Layout/Data/StructureTest.php | 2 +- .../Test/Unit/Layout/Generator/BlockTest.php | 3 +- .../Unit/Layout/Generator/ContainerTest.php | 4 +- .../Unit/Layout/Generator/UiComponentTest.php | 4 +- .../Test/Unit/Layout/GeneratorPoolTest.php | 6 +- .../Test/Unit/Layout/Reader/ContainerTest.php | 6 +- .../View/Test/Unit/Layout/Reader/MoveTest.php | 2 +- .../Unit/Layout/Reader/UiComponentTest.php | 8 +-- .../Layout/ScheduledStructure/HelperTest.php | 2 +- .../Unit/Layout/ScheduledStructureTest.php | 2 +- .../View/Test/Unit/Page/BuilderTest.php | 2 - .../Unit/Page/Config/Generator/BodyTest.php | 4 +- .../Unit/Page/Config/Generator/HeadTest.php | 6 +- .../Test/Unit/Page/Config/RendererTest.php | 2 +- .../Test/Unit/Page/Config/StructureTest.php | 4 +- .../View/Test/Unit/Result/LayoutTest.php | 7 +- .../View/Test/Unit/Result/PageTest.php | 2 +- .../Test/Unit/TemplateEngineFactoryTest.php | 2 +- .../View/Test/Unit/TemplateEnginePoolTest.php | 2 +- .../View/Test/Unit/Url/CssResolverTest.php | 2 +- .../Magento/Framework/Webapi/Exception.php | 1 - .../Magento/Framework/Webapi/Request.php | 2 +- .../Webapi/Rest/Response/RendererFactory.php | 2 +- .../Webapi/ServiceOutputProcessor.php | 1 - .../Webapi/Test/Unit/ErrorProcessorTest.php | 6 +- .../Rest/Request/Deserializer/JsonTest.php | 2 +- .../Unit/Rest/Response/FieldsFilterTest.php | 2 +- .../Rest/Response/RendererFactoryTest.php | 2 +- .../ServiceInputProcessor/TestService.php | 5 -- .../Test/Unit/ServiceInputProcessorTest.php | 12 ++-- .../Magento/Framework/Xml/Security.php | 1 - setup/config/di.config.php | 6 +- .../Command/AbstractDependenciesCommand.php | 6 +- .../Command/AbstractModuleManageCommand.php | 7 +- .../Console/Command/DbDataUpgradeCommand.php | 2 +- .../Command/DbSchemaUpgradeCommand.php | 2 +- .../Setup/Console/Command/DbStatusCommand.php | 2 +- .../Command/DeployStaticContentCommand.php | 14 ++-- .../Console/Command/DiCompileCommand.php | 25 +++---- .../Command/I18nCollectPhrasesCommand.php | 2 +- .../Console/Command/InfoAdminUriCommand.php | 4 +- .../Command/InfoCurrencyListCommand.php | 4 +- .../Command/InfoTimezoneListCommand.php | 4 +- .../Setup/Console/Command/InstallCommand.php | 13 ++-- .../InstallStoreConfigurationCommand.php | 17 +++-- .../Command/MaintenanceAllowIpsCommand.php | 3 +- .../Command/MaintenanceStatusCommand.php | 1 - .../Console/Command/UninstallCommand.php | 4 +- .../Setup/Console/Command/UpgradeCommand.php | 2 +- .../Setup/Console/CompilerPreparation.php | 2 - .../Setup/Controller/BackupActionItems.php | 2 +- .../Setup/Controller/CompleteBackup.php | 6 +- .../Setup/Controller/CreateAdminAccount.php | 2 +- .../Setup/Controller/CustomizeYourStore.php | 3 +- .../Magento/Setup/Controller/Environment.php | 1 - .../Setup/Controller/ExtensionGrid.php | 2 +- setup/src/Magento/Setup/Controller/Home.php | 2 +- .../src/Magento/Setup/Controller/Install.php | 5 +- .../Setup/Controller/InstallExtensionGrid.php | 2 +- .../Setup/Controller/LandingInstaller.php | 2 +- .../Setup/Controller/LandingUpdater.php | 2 +- .../src/Magento/Setup/Controller/License.php | 2 +- .../Magento/Setup/Controller/Maintenance.php | 2 +- .../Magento/Setup/Controller/Marketplace.php | 10 +-- .../Controller/MarketplaceCredentials.php | 2 +- .../src/Magento/Setup/Controller/Modules.php | 2 +- .../Magento/Setup/Controller/Navigation.php | 6 +- .../Setup/Controller/OtherComponentsGrid.php | 2 +- .../Controller/ReadinessCheckInstaller.php | 4 +- .../Controller/ReadinessCheckUpdater.php | 4 +- .../Setup/Controller/SelectVersion.php | 3 +- .../Magento/Setup/Controller/StartUpdater.php | 2 +- .../Magento/Setup/Controller/SystemConfig.php | 2 +- .../Setup/Controller/UpdateExtensionGrid.php | 2 +- .../Setup/Controller/UpdaterSuccess.php | 2 +- .../src/Magento/Setup/Controller/UrlCheck.php | 4 +- .../Controller/ValidateAdminCredentials.php | 1 - .../src/Magento/Setup/Model/AdminAccount.php | 2 +- .../Setup/Model/AdminAccountFactory.php | 4 +- setup/src/Magento/Setup/Model/Bootstrap.php | 2 +- .../Magento/Setup/Model/ConfigGenerator.php | 6 +- setup/src/Magento/Setup/Model/ConfigModel.php | 4 +- .../Magento/Setup/Model/ConfigOptionsList.php | 1 - .../Setup/Model/ConfigOptionsList/Cache.php | 2 +- .../Model/ConfigOptionsList/PageCache.php | 4 +- .../Setup/Model/ConfigOptionsList/Session.php | 4 +- .../Magento/Setup/Model/Cron/AbstractJob.php | 1 - .../Model/Cron/JobComponentUninstall.php | 3 +- .../Setup/Model/Cron/JobDbRollback.php | 2 - .../Magento/Setup/Model/Cron/JobFactory.php | 4 +- .../Magento/Setup/Model/Cron/JobSetCache.php | 2 +- .../Magento/Setup/Model/Cron/JobUpgrade.php | 4 -- .../Setup/Model/DependencyReadinessCheck.php | 2 +- .../Magento/Setup/Model/InstallerFactory.php | 5 +- .../Setup/Model/ModuleRegistryUninstaller.php | 5 +- setup/src/Magento/Setup/Model/Navigation.php | 2 +- .../Setup/Model/ObjectManagerProvider.php | 4 +- .../src/Magento/Setup/Model/PackagesAuth.php | 5 +- .../Setup/Model/RequestDataConverter.php | 4 +- .../SearchTermDescriptionGeneratorFactory.php | 6 +- .../Model/StoreConfigurationDataMapper.php | 1 - .../Setup/Model/UninstallCollector.php | 1 - setup/src/Magento/Setup/Model/Updater.php | 1 - setup/src/Magento/Setup/Module/DataSetup.php | 1 - .../Operation/ApplicationCodeGenerator.php | 2 - .../Module/Di/App/Task/Operation/Area.php | 2 +- .../Di/App/Task/Operation/Interception.php | 4 +- .../Task/Operation/RepositoryGenerator.php | 2 +- .../Module/Di/App/Task/OperationFactory.php | 3 +- .../InterceptionConfigurationBuilder.php | 2 +- .../Module/Di/Code/Reader/ClassesScanner.php | 1 - .../Module/Di/Code/Reader/Decorator/Area.php | 2 +- .../Code/Reader/Decorator/Interceptions.php | 2 +- .../Di/Code/Reader/FileClassScanner.php | 6 +- .../Module/Di/Code/Reader/FileScanner.php | 30 ++++---- .../Di/Code/Reader/InvalidFileException.php | 1 - .../Module/Di/Code/Scanner/PhpScanner.php | 2 +- .../Config/Chain/ArgumentsSerialization.php | 4 +- .../Module/Di/Compiler/Config/Reader.php | 2 +- .../Di/Compiler/Config/Writer/Filesystem.php | 2 +- .../src/Magento/Setup/Module/I18n/Context.php | 2 - .../I18n/Dictionary/Options/Resolver.php | 1 - .../Setup/Module/I18n/Parser/Contextual.php | 2 +- setup/src/Magento/Setup/Module/Setup.php | 2 +- .../Setup/Mvc/Bootstrap/InitParamListener.php | 4 -- .../Console/Command/ConfigSetCommandTest.php | 3 +- .../Command/DbDataUpgradeCommandTest.php | 1 - .../Command/DbSchemaUpgradeCommandTest.php | 1 - .../Console/Command/DbStatusCommandTest.php | 4 +- .../DeployStaticContentCommandTest.php | 14 ++-- .../Command/InfoAdminUriCommandTest.php | 4 +- .../Console/Command/InstallCommandTest.php | 8 +-- .../InstallStoreConfigurationCommandTest.php | 12 ++-- .../Command/ModuleUninstallCommandTest.php | 1 - .../Console/Command/UninstallCommandTest.php | 4 +- .../Test/Unit/Console/CommandListTest.php | 6 +- .../Unit/Console/CompilerPreparationTest.php | 6 +- .../Test/Unit/Controller/AddDatabaseTest.php | 2 +- .../Unit/Controller/BackupActionItemsTest.php | 4 +- .../Unit/Controller/CompleteBackupTest.php | 2 +- .../Controller/CreateAdminAccountTest.php | 2 +- .../Test/Unit/Controller/CreateBackupTest.php | 2 +- .../Controller/CustomizeYourStoreTest.php | 2 +- .../Setup/Test/Unit/Controller/IndexTest.php | 2 +- .../Controller/InstallExtensionGridTest.php | 2 +- .../Unit/Controller/LandingInstallerTest.php | 5 +- .../Unit/Controller/LandingUpdaterTest.php | 5 +- .../Test/Unit/Controller/LicenseTest.php | 2 +- .../Test/Unit/Controller/MaintenanceTest.php | 4 +- .../Test/Unit/Controller/MarketplaceTest.php | 8 +-- .../Test/Unit/Controller/ModulesTest.php | 2 +- .../Test/Unit/Controller/NavigationTest.php | 3 +- .../Controller/OtherComponentsGridTest.php | 5 +- .../ReadinessCheckInstallerTest.php | 2 +- .../Controller/ReadinessCheckUpdaterTest.php | 2 +- .../Unit/Controller/SelectVersionTest.php | 4 +- .../Test/Unit/Controller/SessionTest.php | 2 +- .../Test/Unit/Controller/StartUpdaterTest.php | 3 +- .../Test/Unit/Controller/SuccessTest.php | 2 +- .../Test/Unit/Controller/SystemConfigTest.php | 2 +- .../Unit/Controller/UpdaterSuccessTest.php | 2 +- .../Test/Unit/Controller/UrlCheckTest.php | 4 +- .../Unit/Controller/WebConfigurationTest.php | 2 +- .../Unit/Model/AdminAccountFactoryTest.php | 2 +- .../Test/Unit/Model/BasePackageInfoTest.php | 11 ++- .../Model/Complex/ComplexGeneratorTest.php | 2 +- .../Test/Unit/Model/ConfigGeneratorTest.php | 2 +- .../Model/ConfigOptionsList/CacheTest.php | 4 +- .../Model/ConfigOptionsList/PageCacheTest.php | 4 +- .../Model/ConfigOptionsList/SessionTest.php | 4 +- .../Model/Cron/JobComponentUninstallTest.php | 3 +- .../Unit/Model/Cron/JobDbRollbackTest.php | 2 +- .../Test/Unit/Model/Cron/JobSetCacheTest.php | 2 +- .../Test/Unit/Model/CryptKeyGeneratorTest.php | 2 +- .../Test/Unit/Model/DataGeneratorTest.php | 1 - .../Model/Installer/ProgressFactoryTest.php | 2 +- .../Unit/Model/Installer/ProgressTest.php | 2 +- .../Test/Unit/Model/InstallerFactoryTest.php | 2 +- .../Setup/Test/Unit/Model/InstallerTest.php | 8 +-- .../Setup/Test/Unit/Model/LicenseTest.php | 2 +- .../Test/Unit/Model/ModuleStatusTest.php | 2 +- .../Setup/Test/Unit/Model/NavigationTest.php | 2 +- .../Unit/Model/ObjectManagerProviderTest.php | 12 ++-- .../Test/Unit/Model/PackagesAuthTest.php | 2 +- .../Test/Unit/Model/PayloadValidatorTest.php | 2 +- .../Test/Unit/Model/PhpInformationTest.php | 2 +- .../Test/Unit/Model/PhpReadinessCheckTest.php | 5 +- .../StoreConfigurationDataMapperTest.php | 14 ++-- .../Unit/Model/UpdaterTaskCreatorTest.php | 10 +-- .../Setup/Test/Unit/Model/UpdaterTest.php | 2 - .../Setup/Test/Unit/Model/WebLoggerTest.php | 2 +- .../Test/Unit/Module/ConfigGeneratorTest.php | 2 +- .../Report/Dependency/Data/DependencyTest.php | 4 +- .../App/Task/ApplicationCodeGeneratorTest.php | 2 +- .../Module/Di/App/Task/ProxyGeneratorTest.php | 2 - .../Di/App/Task/RepositoryGeneratorTest.php | 3 +- .../ServiceDataAttributesGeneratorTest.php | 2 - .../Di/Code/Reader/FileClassScannerTest.php | 4 +- .../Reader/InstancesNamesList/AreaTest.php | 2 +- .../ServiceDataAttributesScannerTest.php | 2 +- .../Chain/ArgumentsSerializationTest.php | 2 +- .../Config/Chain/BackslashTrimTest.php | 2 +- .../Compiler/Config/ModificationChainTest.php | 2 +- .../Module/Di/Definition/CollectionTest.php | 3 +- .../Test/Unit/Module/I18n/ContextTest.php | 2 +- .../Module/I18n/Dictionary/PhraseTest.php | 2 +- .../Test/Unit/Module/I18n/LocaleTest.php | 2 +- .../Module/I18n/Pack/Writer/File/CsvTest.php | 8 +-- .../Php/Tokenizer/PhraseCollectorTest.php | 4 +- .../I18n/Parser/Adapter/Php/TokenizerTest.php | 6 +- .../Unit/Module/I18n/Parser/ParserTest.php | 4 +- .../Test/Unit/Module/ResourceFactoryTest.php | 4 +- .../Mvc/Bootstrap/InitParamListenerTest.php | 4 +- .../Test/Unit/Validator/DbValidatorTest.php | 4 +- .../Validator/AdminCredentialsValidator.php | 1 - .../Magento/Setup/Validator/DbValidator.php | 4 +- setup/view/error/404.phtml | 24 +++---- setup/view/error/index.phtml | 20 +++--- .../magento/setup/customize-your-store.phtml | 6 +- .../magento/setup/navigation/side-menu.phtml | 4 +- 4302 files changed, 7377 insertions(+), 8232 deletions(-) diff --git a/app/code/Magento/AdminNotification/Model/Inbox.php b/app/code/Magento/AdminNotification/Model/Inbox.php index 174ca7545b092..c471fd68b243c 100644 --- a/app/code/Magento/AdminNotification/Model/Inbox.php +++ b/app/code/Magento/AdminNotification/Model/Inbox.php @@ -7,7 +7,6 @@ use Magento\Framework\Notification\MessageInterface; use Magento\Framework\Notification\NotifierInterface; -use Magento\AdminNotification\Model\InboxInterface; /** * AdminNotification Inbox model diff --git a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php b/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php index 02413a1899cd7..d76adac8331f4 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php +++ b/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php @@ -5,10 +5,10 @@ */ namespace Magento\AdvancedPricingImportExport\Controller\Adminhtml\Export; -use Magento\ImportExport\Controller\Adminhtml\Export as ExportController; -use Magento\Framework\Controller\ResultFactory; use Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing as ExportAdvancedPricing; use Magento\Catalog\Model\Product as CatalogProduct; +use Magento\Framework\Controller\ResultFactory; +use Magento\ImportExport\Controller\Adminhtml\Export as ExportController; class GetFilter extends ExportController { diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php index 62a7aefa77550..3f672320d5131 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php +++ b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php @@ -5,10 +5,10 @@ */ namespace Magento\AdvancedPricingImportExport\Model\Export; -use Magento\Store\Model\Store; -use Magento\CatalogImportExport\Model\Import\Product as ImportProduct; use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as ImportAdvancedPricing; use Magento\Catalog\Model\Product as CatalogProduct; +use Magento\CatalogImportExport\Model\Import\Product as ImportProduct; +use Magento\Store\Model\Store; /** * Export Advanced Pricing @@ -412,7 +412,7 @@ protected function getTierPrices(array $productLinksIds, $table) ImportAdvancedPricing::COL_TIER_PRICE => 'ap.value', ImportAdvancedPricing::COL_TIER_PRICE_PERCENTAGE_VALUE => 'ap.percentage_value', 'product_link_id' => 'ap.' - .$productEntityLinkField, + . $productEntityLinkField, ]; if ($exportFilter) { if (array_key_exists('tier_price', $exportFilter)) { @@ -431,7 +431,7 @@ protected function getTierPrices(array $productLinksIds, $table) $selectFields ) ->where( - 'ap.'.$productEntityLinkField.' IN (?)', + 'ap.' . $productEntityLinkField . ' IN (?)', $productLinksIds ); @@ -475,7 +475,7 @@ protected function _getWebsiteCode(int $websiteId): string } if ($storeName && $currencyCode) { - $code = $storeName.' ['.$currencyCode.']'; + $code = $storeName . ' [' . $currencyCode . ']'; } else { $code = $storeName; } diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php index 23829d3725119..3f107a151e02b 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php +++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php @@ -8,7 +8,6 @@ use Magento\CatalogImportExport\Model\Import\Product as ImportProduct; use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as ValidatorInterface; use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface; -use Magento\Framework\App\ResourceConnection; /** * Class AdvancedPricing @@ -68,8 +67,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract ValidatorInterface::ERROR_INVALID_TIER_PRICE_TYPE => 'Value for \'tier_price_value_type\' ' . 'attribute contains incorrect value, acceptable values are Fixed, Discount', ValidatorInterface::ERROR_TIER_DATA_INCOMPLETE => 'Tier Price data is incomplete', - ValidatorInterface::ERROR_INVALID_ATTRIBUTE_DECIMAL => - 'Value for \'%s\' attribute contains incorrect value, acceptable values are in decimal format', + ValidatorInterface::ERROR_INVALID_ATTRIBUTE_DECIMAL => 'Value for \'%s\' attribute contains incorrect value, acceptable values are in decimal format', ]; /** diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator.php index 25a9fc244fe51..f94ead3afe612 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator.php +++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator.php @@ -6,7 +6,7 @@ namespace Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing; use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface; -use \Magento\Framework\Validator\AbstractValidator; +use Magento\Framework\Validator\AbstractValidator; class Validator extends AbstractValidator implements RowValidatorInterface { diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php index 0f3f8b3389c7d..6ad4d2573b47b 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php +++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php @@ -6,8 +6,8 @@ namespace Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator; use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing; -use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator; use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface; +use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator; class Website extends AbstractImportValidator implements RowValidatorInterface { @@ -85,6 +85,6 @@ public function isValid($value) */ public function getAllWebsitesValue() { - return AdvancedPricing::VALUE_ALL_WEBSITES . ' ['.$this->websiteModel->getBaseCurrency()->getCurrencyCode().']'; + return AdvancedPricing::VALUE_ALL_WEBSITES . ' [' . $this->websiteModel->getBaseCurrency()->getCurrencyCode() . ']'; } } diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTypeTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTypeTest.php index 0dc2a0b7e6ddf..45220d7918dfe 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTypeTest.php +++ b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTypeTest.php @@ -6,7 +6,7 @@ namespace Magento\AdvancedPricingImportExport\Test\Unit\Model\Import\AdvancedPricing\Validator; -use \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing; +use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing; /** * Class TierPriceTypeTest. diff --git a/app/code/Magento/Analytics/Cron/SignUp.php b/app/code/Magento/Analytics/Cron/SignUp.php index c17b9b8c381c3..b045fb2600437 100644 --- a/app/code/Magento/Analytics/Cron/SignUp.php +++ b/app/code/Magento/Analytics/Cron/SignUp.php @@ -7,9 +7,9 @@ use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler; use Magento\Analytics\Model\Connector; -use Magento\Framework\FlagManager; use Magento\Framework\App\Config\ReinitableConfigInterface; use Magento\Framework\App\Config\Storage\WriterInterface; +use Magento\Framework\FlagManager; /** * Class SignUp diff --git a/app/code/Magento/Analytics/Cron/Update.php b/app/code/Magento/Analytics/Cron/Update.php index 9062a7bac7551..33b2825dd0923 100644 --- a/app/code/Magento/Analytics/Cron/Update.php +++ b/app/code/Magento/Analytics/Cron/Update.php @@ -8,9 +8,9 @@ use Magento\Analytics\Model\AnalyticsToken; use Magento\Analytics\Model\Config\Backend\Baseurl\SubscriptionUpdateHandler; use Magento\Analytics\Model\Connector; -use Magento\Framework\FlagManager; use Magento\Framework\App\Config\ReinitableConfigInterface; use Magento\Framework\App\Config\Storage\WriterInterface; +use Magento\Framework\FlagManager; /** * Executes by cron schedule in case base url was changed diff --git a/app/code/Magento/Analytics/Model/Connector/Http/Client/Curl.php b/app/code/Magento/Analytics/Model/Connector/Http/Client/Curl.php index c223bb1f3b07d..b7745bd6f15db 100644 --- a/app/code/Magento/Analytics/Model/Connector/Http/Client/Curl.php +++ b/app/code/Magento/Analytics/Model/Connector/Http/Client/Curl.php @@ -6,9 +6,9 @@ namespace Magento\Analytics\Model\Connector\Http\Client; use Magento\Analytics\Model\Connector\Http\ConverterInterface; -use Psr\Log\LoggerInterface; -use Magento\Framework\HTTP\Adapter\CurlFactory; use Magento\Analytics\Model\Connector\Http\ResponseFactory; +use Magento\Framework\HTTP\Adapter\CurlFactory; +use Psr\Log\LoggerInterface; /** * A CURL HTTP client. diff --git a/app/code/Magento/Analytics/Model/Connector/NotifyDataChangedCommand.php b/app/code/Magento/Analytics/Model/Connector/NotifyDataChangedCommand.php index f1a8ea6460f9d..c854d117df8b5 100644 --- a/app/code/Magento/Analytics/Model/Connector/NotifyDataChangedCommand.php +++ b/app/code/Magento/Analytics/Model/Connector/NotifyDataChangedCommand.php @@ -6,11 +6,11 @@ namespace Magento\Analytics\Model\Connector; use Magento\Analytics\Model\AnalyticsToken; +use Magento\Analytics\Model\Connector\Http\ResponseResolver; use Magento\Framework\App\Config\ScopeConfigInterface; use Magento\Framework\HTTP\ZendClient; -use Psr\Log\LoggerInterface; use Magento\Store\Model\Store; -use Magento\Analytics\Model\Connector\Http\ResponseResolver; +use Psr\Log\LoggerInterface; /** * Command notifies MBI about that data collection was finished. diff --git a/app/code/Magento/Analytics/Model/Connector/ResponseHandler/ReSignUp.php b/app/code/Magento/Analytics/Model/Connector/ResponseHandler/ReSignUp.php index c79630d6414d8..6a1491b96554b 100644 --- a/app/code/Magento/Analytics/Model/Connector/ResponseHandler/ReSignUp.php +++ b/app/code/Magento/Analytics/Model/Connector/ResponseHandler/ReSignUp.php @@ -19,7 +19,7 @@ class ReSignUp implements ResponseHandlerInterface * @var AnalyticsToken */ private $analyticsToken; - + /** * @var SubscriptionHandler */ diff --git a/app/code/Magento/Analytics/Model/Connector/SignUpCommand.php b/app/code/Magento/Analytics/Model/Connector/SignUpCommand.php index a1f23637e04b1..4ce4c5d76e084 100644 --- a/app/code/Magento/Analytics/Model/Connector/SignUpCommand.php +++ b/app/code/Magento/Analytics/Model/Connector/SignUpCommand.php @@ -9,9 +9,9 @@ use Magento\Analytics\Model\Connector\Http\ResponseResolver; use Magento\Analytics\Model\IntegrationManager; use Magento\Framework\App\Config\ScopeConfigInterface; -use Psr\Log\LoggerInterface; use Magento\Framework\HTTP\ZendClient; use Magento\Store\Model\Store; +use Psr\Log\LoggerInterface; /** * Class SignUpCommand diff --git a/app/code/Magento/Analytics/Model/Exception/State/SubscriptionUpdateException.php b/app/code/Magento/Analytics/Model/Exception/State/SubscriptionUpdateException.php index 5d127037afea9..43fb489bfe4fd 100644 --- a/app/code/Magento/Analytics/Model/Exception/State/SubscriptionUpdateException.php +++ b/app/code/Magento/Analytics/Model/Exception/State/SubscriptionUpdateException.php @@ -13,5 +13,4 @@ */ class SubscriptionUpdateException extends LocalizedException { - } diff --git a/app/code/Magento/Analytics/Model/IntegrationManager.php b/app/code/Magento/Analytics/Model/IntegrationManager.php index 61a40a955e026..54838a2f9a527 100644 --- a/app/code/Magento/Analytics/Model/IntegrationManager.php +++ b/app/code/Magento/Analytics/Model/IntegrationManager.php @@ -6,11 +6,11 @@ namespace Magento\Analytics\Model; +use Magento\Config\Model\Config as SystemConfig; use Magento\Framework\Exception\NoSuchEntityException; use Magento\Integration\Api\IntegrationServiceInterface; -use Magento\Config\Model\Config as SystemConfig; -use Magento\Integration\Model\Integration; use Magento\Integration\Api\OauthServiceInterface; +use Magento\Integration\Model\Integration; /** * Class IntegrationManager diff --git a/app/code/Magento/Analytics/ReportXml/ConnectionFactory.php b/app/code/Magento/Analytics/ReportXml/ConnectionFactory.php index e591ed2659651..8f959f9719d27 100644 --- a/app/code/Magento/Analytics/ReportXml/ConnectionFactory.php +++ b/app/code/Magento/Analytics/ReportXml/ConnectionFactory.php @@ -7,8 +7,8 @@ namespace Magento\Analytics\ReportXml; use Magento\Framework\App\ResourceConnection; -use Magento\Framework\ObjectManagerInterface; use Magento\Framework\DB\Adapter\AdapterInterface; +use Magento\Framework\ObjectManagerInterface; /** * Class ConnectionFactory diff --git a/app/code/Magento/Analytics/ReportXml/DB/Assembler/FilterAssembler.php b/app/code/Magento/Analytics/ReportXml/DB/Assembler/FilterAssembler.php index 251c43f5e1b71..e0e9241b3bca6 100644 --- a/app/code/Magento/Analytics/ReportXml/DB/Assembler/FilterAssembler.php +++ b/app/code/Magento/Analytics/ReportXml/DB/Assembler/FilterAssembler.php @@ -6,9 +6,9 @@ namespace Magento\Analytics\ReportXml\DB\Assembler; +use Magento\Analytics\ReportXml\DB\ConditionResolver; use Magento\Analytics\ReportXml\DB\NameResolver; use Magento\Analytics\ReportXml\DB\SelectBuilder; -use Magento\Analytics\ReportXml\DB\ConditionResolver; /** * Class FilterAssembler diff --git a/app/code/Magento/Analytics/ReportXml/DB/Assembler/FromAssembler.php b/app/code/Magento/Analytics/ReportXml/DB/Assembler/FromAssembler.php index 811119ace221b..ad020763941c0 100644 --- a/app/code/Magento/Analytics/ReportXml/DB/Assembler/FromAssembler.php +++ b/app/code/Magento/Analytics/ReportXml/DB/Assembler/FromAssembler.php @@ -7,8 +7,8 @@ namespace Magento\Analytics\ReportXml\DB\Assembler; use Magento\Analytics\ReportXml\DB\ColumnsResolver; -use Magento\Analytics\ReportXml\DB\SelectBuilder; use Magento\Analytics\ReportXml\DB\NameResolver; +use Magento\Analytics\ReportXml\DB\SelectBuilder; use Magento\Framework\App\ResourceConnection; /** @@ -57,8 +57,7 @@ public function assemble(SelectBuilder $selectBuilder, $queryConfig) { $selectBuilder->setFrom( [ - $this->nameResolver->getAlias($queryConfig['source']) => - $this->resourceConnection + $this->nameResolver->getAlias($queryConfig['source']) => $this->resourceConnection ->getTableName($this->nameResolver->getName($queryConfig['source'])), ] ); diff --git a/app/code/Magento/Analytics/ReportXml/DB/Assembler/JoinAssembler.php b/app/code/Magento/Analytics/ReportXml/DB/Assembler/JoinAssembler.php index f3c6540a25171..4130432b08447 100644 --- a/app/code/Magento/Analytics/ReportXml/DB/Assembler/JoinAssembler.php +++ b/app/code/Magento/Analytics/ReportXml/DB/Assembler/JoinAssembler.php @@ -6,10 +6,10 @@ namespace Magento\Analytics\ReportXml\DB\Assembler; +use Magento\Analytics\ReportXml\DB\ColumnsResolver; +use Magento\Analytics\ReportXml\DB\ConditionResolver; use Magento\Analytics\ReportXml\DB\NameResolver; use Magento\Analytics\ReportXml\DB\SelectBuilder; -use Magento\Analytics\ReportXml\DB\ConditionResolver; -use Magento\Analytics\ReportXml\DB\ColumnsResolver; use Magento\Framework\App\ResourceConnection; /** diff --git a/app/code/Magento/Analytics/ReportXml/ReportProvider.php b/app/code/Magento/Analytics/ReportXml/ReportProvider.php index 3ebe5941108bc..6478385651d6e 100644 --- a/app/code/Magento/Analytics/ReportXml/ReportProvider.php +++ b/app/code/Magento/Analytics/ReportXml/ReportProvider.php @@ -6,8 +6,6 @@ namespace Magento\Analytics\ReportXml; -use Magento\Framework\Api\SearchCriteria; - /** * Class ReportProvider * diff --git a/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Reports/ShowTest.php b/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Reports/ShowTest.php index 4f54ce5059965..e579a79ef9e33 100644 --- a/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Reports/ShowTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Reports/ShowTest.php @@ -114,7 +114,6 @@ public function testExecute() */ public function testExecuteWithException(\Exception $exception) { - $this->resultFactoryMock ->expects($this->once()) ->method('create') diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/Baseurl/SubscriptionUpdateHandlerTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/Baseurl/SubscriptionUpdateHandlerTest.php index f5f721c038c57..3661f493ff7f8 100644 --- a/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/Baseurl/SubscriptionUpdateHandlerTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/Baseurl/SubscriptionUpdateHandlerTest.php @@ -67,7 +67,7 @@ protected function setUp() $this->analyticsTokenMock = $this->getMockBuilder(AnalyticsToken::class) ->disableOriginalConstructor() ->getMock(); - + $this->flagManagerMock = $this->getMockBuilder(FlagManager::class) ->disableOriginalConstructor() ->getMock(); diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Connector/NotifyDataChangedCommandTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Connector/NotifyDataChangedCommandTest.php index cee3877631c2e..a434f9a0beec0 100644 --- a/app/code/Magento/Analytics/Test/Unit/Model/Connector/NotifyDataChangedCommandTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Model/Connector/NotifyDataChangedCommandTest.php @@ -6,13 +6,13 @@ namespace Magento\Analytics\Test\Unit\Model\Connector; use Magento\Analytics\Model\AnalyticsToken; +use Magento\Analytics\Model\Connector\Http\ClientInterface; use Magento\Analytics\Model\Connector\Http\JsonConverter; use Magento\Analytics\Model\Connector\Http\ResponseResolver; +use Magento\Analytics\Model\Connector\NotifyDataChangedCommand; use Magento\Framework\App\Config\ScopeConfigInterface; use Magento\Framework\HTTP\ZendClient; use Psr\Log\LoggerInterface; -use Magento\Analytics\Model\Connector\NotifyDataChangedCommand; -use Magento\Analytics\Model\Connector\Http\ClientInterface; class NotifyDataChangedCommandTest extends \PHPUnit\Framework\TestCase { diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Connector/OTPRequestTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Connector/OTPRequestTest.php index 8a3f4efb15cf4..1fa0ebddc8c77 100644 --- a/app/code/Magento/Analytics/Test/Unit/Model/Connector/OTPRequestTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Model/Connector/OTPRequestTest.php @@ -71,7 +71,7 @@ public function setUp() $this->responseResolverMock = $this->getMockBuilder(ResponseResolver::class) ->disableOriginalConstructor() ->getMock(); - + $this->subject = new OTPRequest( $this->analyticsTokenMock, $this->httpClientMock, diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Connector/SignUpCommandTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Connector/SignUpCommandTest.php index 5593496a957b7..78e1b03517e6c 100644 --- a/app/code/Magento/Analytics/Test/Unit/Model/Connector/SignUpCommandTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Model/Connector/SignUpCommandTest.php @@ -5,11 +5,11 @@ */ namespace Magento\Analytics\Test\Unit\Model\Connector; +use Magento\Analytics\Model\AnalyticsToken; use Magento\Analytics\Model\Connector\Http\ClientInterface; use Magento\Analytics\Model\Connector\Http\JsonConverter; use Magento\Analytics\Model\Connector\Http\ResponseResolver; use Magento\Analytics\Model\Connector\SignUpCommand; -use Magento\Analytics\Model\AnalyticsToken; use Magento\Analytics\Model\IntegrationManager; use Magento\Framework\App\Config\ScopeConfigInterface; use Magento\Integration\Model\Oauth\Token as IntegrationToken; diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Connector/UpdateCommandTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Connector/UpdateCommandTest.php index 47253a13530e5..681df9b78bf77 100644 --- a/app/code/Magento/Analytics/Test/Unit/Model/Connector/UpdateCommandTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Model/Connector/UpdateCommandTest.php @@ -7,13 +7,13 @@ use Magento\Analytics\Model\AnalyticsToken; use Magento\Analytics\Model\Config\Backend\Baseurl\SubscriptionUpdateHandler; +use Magento\Analytics\Model\Connector\Http\ClientInterface; use Magento\Analytics\Model\Connector\Http\ResponseResolver; +use Magento\Analytics\Model\Connector\UpdateCommand; use Magento\Framework\App\Config\ScopeConfigInterface; use Magento\Framework\FlagManager; use Magento\Framework\HTTP\ZendClient; use Psr\Log\LoggerInterface; -use Magento\Analytics\Model\Connector\UpdateCommand; -use Magento\Analytics\Model\Connector\Http\ClientInterface; /** * Class SignUpCommandTest diff --git a/app/code/Magento/Analytics/Test/Unit/Model/ConnectorTest.php b/app/code/Magento/Analytics/Test/Unit/Model/ConnectorTest.php index 4414b81cbc183..621c14f2d5e56 100644 --- a/app/code/Magento/Analytics/Test/Unit/Model/ConnectorTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Model/ConnectorTest.php @@ -6,8 +6,8 @@ namespace Magento\Analytics\Test\Unit\Model; use Magento\Analytics\Model\Connector; -use Magento\Framework\ObjectManagerInterface; use Magento\Analytics\Model\Connector\SignUpCommand; +use Magento\Framework\ObjectManagerInterface; /** * Class SignUpCommandTest diff --git a/app/code/Magento/Analytics/Test/Unit/Model/IntegrationManagerTest.php b/app/code/Magento/Analytics/Test/Unit/Model/IntegrationManagerTest.php index 3076a22c85be4..d341188625455 100644 --- a/app/code/Magento/Analytics/Test/Unit/Model/IntegrationManagerTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Model/IntegrationManagerTest.php @@ -6,12 +6,12 @@ namespace Magento\Analytics\Test\Unit\Model; -use Magento\Integration\Api\IntegrationServiceInterface; -use Magento\Config\Model\Config; -use Magento\Integration\Model\Integration; use Magento\Analytics\Model\IntegrationManager; -use Magento\Integration\Api\OauthServiceInterface; +use Magento\Config\Model\Config; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; +use Magento\Integration\Api\IntegrationServiceInterface; +use Magento\Integration\Api\OauthServiceInterface; +use Magento\Integration\Model\Integration; /** * Class IntegrationManagerTest diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Plugin/BaseUrlConfigPluginTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Plugin/BaseUrlConfigPluginTest.php index a89e06562383b..0b4696d9f4f6d 100644 --- a/app/code/Magento/Analytics/Test/Unit/Model/Plugin/BaseUrlConfigPluginTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Model/Plugin/BaseUrlConfigPluginTest.php @@ -7,7 +7,6 @@ use Magento\Analytics\Model\Config\Backend\Baseurl\SubscriptionUpdateHandler; use Magento\Analytics\Model\Plugin\BaseUrlConfigPlugin; -use Magento\Analytics\Model\SubscriptionStatusProvider; use Magento\Framework\App\Config\ScopeConfigInterface; use Magento\Framework\App\Config\Value; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/ConnectionFactoryTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/ConnectionFactoryTest.php index 1e4ae9142c13d..9519a760eefbb 100644 --- a/app/code/Magento/Analytics/Test/Unit/ReportXml/ConnectionFactoryTest.php +++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/ConnectionFactoryTest.php @@ -7,9 +7,9 @@ use Magento\Analytics\ReportXml\ConnectionFactory; use Magento\Framework\App\ResourceConnection; +use Magento\Framework\DB\Adapter\AdapterInterface; use Magento\Framework\DB\Adapter\Pdo\Mysql as MysqlPdoAdapter; use Magento\Framework\ObjectManagerInterface; -use Magento\Framework\DB\Adapter\AdapterInterface; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; /** diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ColumnsResolverTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ColumnsResolverTest.php index bdbe3d1d22c22..62b9166eb7cf3 100644 --- a/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ColumnsResolverTest.php +++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ColumnsResolverTest.php @@ -8,9 +8,9 @@ use Magento\Analytics\ReportXml\DB\ColumnsResolver; use Magento\Analytics\ReportXml\DB\NameResolver; use Magento\Analytics\ReportXml\DB\SelectBuilder; -use Magento\Framework\DB\Sql\ColumnValueExpression; use Magento\Framework\App\ResourceConnection; use Magento\Framework\DB\Adapter\AdapterInterface; +use Magento\Framework\DB\Sql\ColumnValueExpression; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; /** @@ -113,8 +113,7 @@ public function getColumnsDataProvider() 'expectedGroup' => [ 'name' => new ColumnValueExpression('COUNT( DISTINCT `cpe`.`name`)') ], - 'entityConfig' => - [ + 'entityConfig' => [ 'name' => 'catalog_product_entity', 'alias' => 'cpe', 'attribute' => [ @@ -132,8 +131,7 @@ public function getColumnsDataProvider() 'avg_name' => new ColumnValueExpression('AVG(`cpe`.`name`)') ], 'expectedGroup' => [], - 'entityConfig' => - [ + 'entityConfig' => [ 'name' => 'catalog_product_entity', 'alias' => 'cpe', 'attribute' => [ diff --git a/app/code/Magento/Authorization/Setup/InstallData.php b/app/code/Magento/Authorization/Setup/InstallData.php index b8b18706722a5..adf194431f5c3 100644 --- a/app/code/Magento/Authorization/Setup/InstallData.php +++ b/app/code/Magento/Authorization/Setup/InstallData.php @@ -6,11 +6,11 @@ namespace Magento\Authorization\Setup; +use Magento\Authorization\Model\Acl\Role\Group as RoleGroup; +use Magento\Authorization\Model\UserContextInterface; use Magento\Framework\Setup\InstallDataInterface; use Magento\Framework\Setup\ModuleContextInterface; use Magento\Framework\Setup\ModuleDataSetupInterface; -use Magento\Authorization\Model\Acl\Role\Group as RoleGroup; -use Magento\Authorization\Model\UserContextInterface; /** * @codeCoverageIgnore diff --git a/app/code/Magento/Authorization/Test/Unit/Model/CompositeUserContextTest.php b/app/code/Magento/Authorization/Test/Unit/Model/CompositeUserContextTest.php index 47da868f17190..4ee324bb65de4 100644 --- a/app/code/Magento/Authorization/Test/Unit/Model/CompositeUserContextTest.php +++ b/app/code/Magento/Authorization/Test/Unit/Model/CompositeUserContextTest.php @@ -6,7 +6,7 @@ namespace Magento\Authorization\Test\Unit\Model; -use \Magento\Authorization\Model\CompositeUserContext; +use Magento\Authorization\Model\CompositeUserContext; use Magento\Framework\ObjectManager\Helper\Composite as CompositeHelper; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php index b393015ce1231..9c0903ee4b419 100644 --- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php +++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php @@ -5,12 +5,12 @@ */ namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment; -use Magento\Framework\Escaper; -use Magento\Catalog\Helper\Product; +use Magento\Authorizenet\Helper\Backend\Data as DataHelper; use Magento\Backend\App\Action\Context; -use Magento\Framework\View\Result\PageFactory; use Magento\Backend\Model\View\Result\ForwardFactory; -use Magento\Authorizenet\Helper\Backend\Data as DataHelper; +use Magento\Catalog\Helper\Product; +use Magento\Framework\Escaper; +use Magento\Framework\View\Result\PageFactory; /** * Class Place diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php index 028b90bf7da50..27eb689164032 100644 --- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php +++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php @@ -6,7 +6,6 @@ */ namespace Magento\Authorizenet\Controller\Directpost\Payment; -use Magento\Framework\App\ObjectManager; use Magento\Payment\Block\Transparent\Iframe; /** diff --git a/app/code/Magento/Authorizenet/Helper/Backend/Data.php b/app/code/Magento/Authorizenet/Helper/Backend/Data.php index 24bdb23873265..a908054095020 100644 --- a/app/code/Magento/Authorizenet/Helper/Backend/Data.php +++ b/app/code/Magento/Authorizenet/Helper/Backend/Data.php @@ -6,10 +6,10 @@ namespace Magento\Authorizenet\Helper\Backend; use Magento\Authorizenet\Helper\Data as FrontendDataHelper; +use Magento\Backend\Model\UrlInterface; use Magento\Framework\App\Helper\Context; -use Magento\Store\Model\StoreManagerInterface; use Magento\Sales\Model\OrderFactory; -use Magento\Backend\Model\UrlInterface; +use Magento\Store\Model\StoreManagerInterface; /** * Authorize.net Backend Data Helper diff --git a/app/code/Magento/Authorizenet/Helper/Data.php b/app/code/Magento/Authorizenet/Helper/Data.php index 8bcc1f3f3f03c..d6403d9c70fac 100644 --- a/app/code/Magento/Authorizenet/Helper/Data.php +++ b/app/code/Magento/Authorizenet/Helper/Data.php @@ -5,12 +5,11 @@ */ namespace Magento\Authorizenet\Helper; +use Magento\Authorizenet\Model\Authorizenet; use Magento\Framework\App\Helper\AbstractHelper; use Magento\Framework\App\Helper\Context; -use Magento\Store\Model\StoreManagerInterface; use Magento\Sales\Model\OrderFactory; -use Magento\Authorizenet\Model\Directpost; -use Magento\Authorizenet\Model\Authorizenet; +use Magento\Store\Model\StoreManagerInterface; /** * Authorize.net Data Helper diff --git a/app/code/Magento/Authorizenet/Model/Authorizenet.php b/app/code/Magento/Authorizenet/Model/Authorizenet.php index ae9ac833a4395..3648dbd74017b 100644 --- a/app/code/Magento/Authorizenet/Model/Authorizenet.php +++ b/app/code/Magento/Authorizenet/Model/Authorizenet.php @@ -5,7 +5,6 @@ */ namespace Magento\Authorizenet\Model; -use Magento\Authorizenet\Model\TransactionService; use Magento\Framework\HTTP\ZendClientFactory; /** diff --git a/app/code/Magento/Authorizenet/Model/Directpost.php b/app/code/Magento/Authorizenet/Model/Directpost.php index 0f10fd633cb5b..f04d646704749 100644 --- a/app/code/Magento/Authorizenet/Model/Directpost.php +++ b/app/code/Magento/Authorizenet/Model/Directpost.php @@ -478,6 +478,7 @@ public function initialize($paymentAction, $stateObject) case self::ACTION_AUTHORIZE: $requestType = self::REQUEST_TYPE_AUTH_ONLY; //intentional + // no break case self::ACTION_AUTHORIZE_CAPTURE: $requestType = $requestType ?: self::REQUEST_TYPE_AUTH_CAPTURE; $payment = $this->getInfoInstance(); diff --git a/app/code/Magento/Authorizenet/Model/TransactionService.php b/app/code/Magento/Authorizenet/Model/TransactionService.php index fef22d6c913c0..57854b975bf7d 100644 --- a/app/code/Magento/Authorizenet/Model/TransactionService.php +++ b/app/code/Magento/Authorizenet/Model/TransactionService.php @@ -9,7 +9,6 @@ use Magento\Framework\HTTP\ZendClientFactory; use Magento\Framework\Simplexml\Element; use Magento\Framework\Xml\Security; -use Magento\Authorizenet\Model\Authorizenet; use Magento\Payment\Model\Method\Logger; /** @@ -95,7 +94,6 @@ public function getTransactionDetails(Authorizenet $context, $transactionId) */ protected function loadTransactionDetails(Authorizenet $context, $transactionId) { - $requestBody = $this->getRequestBody( $context->getConfigData('login'), $context->getConfigData('trans_key'), diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php index 6e5d55e52675e..501583b820d12 100644 --- a/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php +++ b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php @@ -5,8 +5,8 @@ */ namespace Magento\Authorizenet\Test\Unit\Model\Directpost; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; use Magento\Authorizenet\Model\Directpost; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; class ResponseTest extends \PHPUnit\Framework\TestCase { diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php index dbb6ac8333c14..33f401a88ca76 100644 --- a/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php +++ b/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php @@ -5,12 +5,12 @@ */ namespace Magento\Authorizenet\Test\Unit\Model; -use Magento\Framework\Simplexml\Element; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; use Magento\Authorizenet\Model\Directpost; -use Magento\Authorizenet\Model\TransactionService; -use Magento\Authorizenet\Model\Request; use Magento\Authorizenet\Model\Directpost\Request\Factory; +use Magento\Authorizenet\Model\Request; +use Magento\Authorizenet\Model\TransactionService; +use Magento\Framework\Simplexml\Element; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; use Magento\Sales\Model\Order; use Magento\Sales\Model\Order\Payment\Transaction\Repository as TransactionRepository; diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/TransactionServiceTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/TransactionServiceTest.php index 092d633648482..b214bfb38e39a 100644 --- a/app/code/Magento/Authorizenet/Test/Unit/Model/TransactionServiceTest.php +++ b/app/code/Magento/Authorizenet/Test/Unit/Model/TransactionServiceTest.php @@ -5,9 +5,8 @@ */ namespace Magento\Authorizenet\Test\Unit\Model; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; -use Magento\Framework\Simplexml\Element; use Magento\Authorizenet\Model\TransactionService; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; class TransactionServiceTest extends \PHPUnit\Framework\TestCase { diff --git a/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml b/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml index 60fec263352fe..1313fa8e9821a 100644 --- a/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml +++ b/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml @@ -19,34 +19,34 @@ $fraudDetails = $payment->getAdditionalInformation('fraud_details');
- + escapeHtml(__('FDS Filter Action')) ?>: escapeHtml($fraudDetails['fds_filter_action']) ?>
- + escapeHtml(__('AVS Response')) ?>: escapeHtml($fraudDetails['avs_response']) ?>
- + escapeHtml(__('Card Code Response')) ?>: escapeHtml($fraudDetails['card_code_response']) ?>
- + escapeHtml(__('CAVV Response')) ?>: escapeHtml($fraudDetails['cavv_response']) ?>
- + escapeHtml(__('Fraud Filters')) ?>:
- + escapeHtml($filter['name']) ?>: escapeHtml($filter['action']) ?>
diff --git a/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php b/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php index 992c37a23e5d1..798d1816a9a7b 100644 --- a/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php +++ b/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php @@ -7,8 +7,8 @@ */ namespace Magento\Backend\App\Action\Plugin; -use Magento\Framework\App\RequestInterface; use Magento\Backend\App\AbstractAction; +use Magento\Framework\App\RequestInterface; class MassactionKey { 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 2f9b73f0ae037..286bd3388f78d 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 @@ -6,7 +6,7 @@ namespace Magento\Backend\Block\Store\Switcher\Form\Renderer; -use \Magento\Framework\Data\Form\Element\Renderer\RendererInterface; +use Magento\Framework\Data\Form\Element\Renderer\RendererInterface; /** * Form fieldset renderer diff --git a/app/code/Magento/Backend/Block/Widget/Container.php b/app/code/Magento/Backend/Block/Widget/Container.php index 7d89430c26c7c..51a6bfa2960b0 100644 --- a/app/code/Magento/Backend/Block/Widget/Container.php +++ b/app/code/Magento/Backend/Block/Widget/Container.php @@ -8,8 +8,6 @@ namespace Magento\Backend\Block\Widget; -use Magento\Framework\View\Element\Template; - /** * @api * @since 100.0.2 diff --git a/app/code/Magento/Backend/Block/Widget/Form/Container.php b/app/code/Magento/Backend/Block/Widget/Form/Container.php index 8b7babc1bb9b6..f4ac18b923cc4 100644 --- a/app/code/Magento/Backend/Block/Widget/Form/Container.php +++ b/app/code/Magento/Backend/Block/Widget/Form/Container.php @@ -39,7 +39,7 @@ class Container extends \Magento\Backend\Block\Widget\Container * @var string */ protected $_blockGroup = 'Magento_Backend'; - + /** * @var string */ diff --git a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset/Element.php index 32cb9366c8bf8..5f21647dcb65e 100644 --- a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset/Element.php +++ b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset/Element.php @@ -7,7 +7,7 @@ namespace Magento\Backend\Block\Widget\Form\Renderer\Fieldset; use Magento\Framework\Data\Form\Element\AbstractElement; -use \Magento\Framework\Data\Form\Element\Renderer\RendererInterface; +use Magento\Framework\Data\Form\Element\Renderer\RendererInterface; /** * Fieldset element renderer diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php index b8a2e283b29a0..9df8c532adfdd 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php @@ -58,7 +58,7 @@ public function render(DataObject $row) $result .= $this->getColumn()->getEditOnly() ? '' : '' . $this->_getValue($row) . ''; - return $result . $this->_getInputValueElement($row) . '
' ; + return $result . $this->_getInputValueElement($row) . '
'; } return $this->_getValue($row); } diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php index 320713f8b57c4..db834860a40fa 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php @@ -66,11 +66,11 @@ public function render(\Magento\Framework\DataObject $row) protected function _getCheckboxHtml($value, $checked) { $id = 'id_' . rand(0, 999); - $html = ''; return $html; } } 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 8252ed1a1e2f8..93256e841d453 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php @@ -278,13 +278,13 @@ public function getGridIdsJson() } /** @var \Magento\Framework\Data\Collection $allIdsCollection */ $allIdsCollection = clone $this->getParentBlock()->getCollection(); - + if ($this->getMassactionIdField()) { $massActionIdField = $this->getMassactionIdField(); } else { $massActionIdField = $this->getParentBlock()->getMassactionIdField(); } - + $gridIds = $allIdsCollection->setPageSize(0)->getColumnValues($massActionIdField); if (!empty($gridIds)) { return join(",", $gridIds); diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php index 42f5e61bf5fa8..32e33573f4e2e 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php @@ -275,13 +275,13 @@ public function getGridIdsJson() /** @var \Magento\Framework\Data\Collection $allIdsCollection */ $allIdsCollection = clone $this->getParentBlock()->getCollection(); - + if ($this->getMassactionIdField()) { $massActionIdField = $this->getMassactionIdField(); } else { $massActionIdField = $this->getParentBlock()->getMassactionIdField(); } - + $gridIds = $allIdsCollection->setPageSize(0)->getColumnValues($massActionIdField); if (!empty($gridIds)) { diff --git a/app/code/Magento/Backend/Console/Command/AbstractCacheTypeManageCommand.php b/app/code/Magento/Backend/Console/Command/AbstractCacheTypeManageCommand.php index 2facdf165c5df..e103ce75f1c7e 100644 --- a/app/code/Magento/Backend/Console/Command/AbstractCacheTypeManageCommand.php +++ b/app/code/Magento/Backend/Console/Command/AbstractCacheTypeManageCommand.php @@ -6,10 +6,10 @@ namespace Magento\Backend\Console\Command; +use Magento\Framework\App\Cache\Manager; use Magento\Framework\Event\ManagerInterface as EventManagerInterface; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Magento\Framework\App\Cache\Manager; /** * @api diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php index 1895bd08c464f..de29cfa81b449 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php @@ -6,8 +6,8 @@ */ namespace Magento\Backend\Controller\Adminhtml\Cache; -use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Exception\LocalizedException; class CleanImages extends \Magento\Backend\Controller\Adminhtml\Cache { diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php index 521cb9806a135..59d28896ac59c 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php @@ -6,8 +6,8 @@ */ namespace Magento\Backend\Controller\Adminhtml\Cache; -use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Exception\LocalizedException; class CleanMedia extends \Magento\Backend\Controller\Adminhtml\Cache { diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php index 204105852b9f1..92cf3760c45ca 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php @@ -6,10 +6,10 @@ */ namespace Magento\Backend\Controller\Adminhtml\Cache; -use Magento\Framework\Exception\LocalizedException; -use Magento\Framework\Controller\ResultFactory; -use Magento\Framework\App\State; use Magento\Framework\App\ObjectManager; +use Magento\Framework\App\State; +use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Exception\LocalizedException; /** * Controller disables some types of cache diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php index 32acf47887c44..626384365a642 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php @@ -6,10 +6,10 @@ */ namespace Magento\Backend\Controller\Adminhtml\Cache; -use Magento\Framework\Exception\LocalizedException; -use Magento\Framework\Controller\ResultFactory; -use Magento\Framework\App\State; use Magento\Framework\App\ObjectManager; +use Magento\Framework\App\State; +use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Exception\LocalizedException; /** * Controller enables some types of cache diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php index e18aa1555e11b..780c8f950e2ee 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php @@ -6,8 +6,8 @@ */ namespace Magento\Backend\Controller\Adminhtml\Cache; -use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Exception\LocalizedException; class MassRefresh extends \Magento\Backend\Controller\Adminhtml\Cache { 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 c9bce1cbf3888..9c77ec1200502 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php @@ -5,11 +5,10 @@ */ namespace Magento\Backend\Controller\Adminhtml\System\Account; -use Magento\Framework\Validator\Exception as ValidatorException; -use Magento\Framework\Exception\AuthenticationException; -use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Exception\State\UserLockedException; +use Magento\Framework\Validator\Exception as ValidatorException; use Magento\Security\Model\SecurityCookie; /** diff --git a/app/code/Magento/Backend/Model/Auth.php b/app/code/Magento/Backend/Model/Auth.php index 08921d1615f87..d7011bcb47e96 100644 --- a/app/code/Magento/Backend/Model/Auth.php +++ b/app/code/Magento/Backend/Model/Auth.php @@ -179,7 +179,7 @@ public function login($username, $password) ['user_name' => $username, 'exception' => $e] ); self::throwException( - __($e->getMessage()? : 'You did not sign in correctly or your account is temporarily disabled.') + __($e->getMessage() ?: 'You did not sign in correctly or your account is temporarily disabled.') ); } } diff --git a/app/code/Magento/Backend/Model/Session/Quote.php b/app/code/Magento/Backend/Model/Session/Quote.php index 11edaa26f443f..43e533c63a91e 100644 --- a/app/code/Magento/Backend/Model/Session/Quote.php +++ b/app/code/Magento/Backend/Model/Session/Quote.php @@ -152,7 +152,7 @@ public function getQuote() $this->_quote->setCustomerGroupId($this->groupManagement->getDefaultGroup()->getId()); $this->_quote->setIsActive(false); $this->_quote->setStoreId($this->getStoreId()); - + $this->quoteRepository->save($this->_quote); $this->setQuoteId($this->_quote->getId()); $this->_quote = $this->quoteRepository->get($this->getQuoteId(), [$this->getStoreId()]); diff --git a/app/code/Magento/Backend/Model/Url.php b/app/code/Magento/Backend/Model/Url.php index 48b443fe7ffd3..05543d27f97fc 100644 --- a/app/code/Magento/Backend/Model/Url.php +++ b/app/code/Magento/Backend/Model/Url.php @@ -5,9 +5,9 @@ */ namespace Magento\Backend\Model; +use Magento\Framework\App\ObjectManager; use Magento\Framework\Serialize\Serializer\Json; use Magento\Framework\Url\HostChecker; -use Magento\Framework\App\ObjectManager; /** * Class \Magento\Backend\Model\UrlInterface diff --git a/app/code/Magento/Backend/Model/View/Layout/Builder.php b/app/code/Magento/Backend/Model/View/Layout/Builder.php index c37630ca8f824..52dfa5920c880 100644 --- a/app/code/Magento/Backend/Model/View/Layout/Builder.php +++ b/app/code/Magento/Backend/Model/View/Layout/Builder.php @@ -5,10 +5,6 @@ */ namespace Magento\Backend\Model\View\Layout; -use Magento\Framework\App; -use Magento\Framework\Event; -use Magento\Framework\View; - /** * @api * @since 100.0.2 diff --git a/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php b/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php index 2b44c52895805..9f4d7065b55e7 100644 --- a/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php +++ b/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php @@ -5,8 +5,8 @@ */ namespace Magento\Backend\Model\View\Layout\Reader; -use Magento\Framework\View\Layout; use Magento\Framework\Data\Argument\InterpreterInterface; +use Magento\Framework\View\Layout; use Magento\Framework\View\Layout\Reader\Visibility\Condition; /** diff --git a/app/code/Magento/Backend/Model/View/Layout/StructureManager.php b/app/code/Magento/Backend/Model/View/Layout/StructureManager.php index fdcbbeeed1e12..a9f18fc1ba159 100644 --- a/app/code/Magento/Backend/Model/View/Layout/StructureManager.php +++ b/app/code/Magento/Backend/Model/View/Layout/StructureManager.php @@ -6,8 +6,8 @@ namespace Magento\Backend\Model\View\Layout; -use Magento\Framework\View\Layout\ScheduledStructure; use Magento\Framework\View\Layout\Data\Structure; +use Magento\Framework\View\Layout\ScheduledStructure; /** * Class StructureManager diff --git a/app/code/Magento/Backend/Model/View/Page/Builder.php b/app/code/Magento/Backend/Model/View/Page/Builder.php index b0654472b1ae2..40d1f4d771e1a 100644 --- a/app/code/Magento/Backend/Model/View/Page/Builder.php +++ b/app/code/Magento/Backend/Model/View/Page/Builder.php @@ -5,9 +5,6 @@ */ namespace Magento\Backend\Model\View\Page; -use Magento\Backend\Model\View\Layout; -use Magento\Framework\App; -use Magento\Framework\Event; use Magento\Framework\View; /** diff --git a/app/code/Magento/Backend/Model/View/Result/Page.php b/app/code/Magento/Backend/Model/View/Result/Page.php index 2ea9cdf2ee7bd..d0ce14f498760 100644 --- a/app/code/Magento/Backend/Model/View/Result/Page.php +++ b/app/code/Magento/Backend/Model/View/Result/Page.php @@ -5,7 +5,6 @@ */ namespace Magento\Backend\Model\View\Result; -use Magento\Framework\Translate; use Magento\Framework\View; /** diff --git a/app/code/Magento/Backend/Model/View/Result/Redirect.php b/app/code/Magento/Backend/Model/View/Result/Redirect.php index e8e39cb64ea2b..66a2b20c1d9a1 100644 --- a/app/code/Magento/Backend/Model/View/Result/Redirect.php +++ b/app/code/Magento/Backend/Model/View/Result/Redirect.php @@ -7,7 +7,6 @@ use Magento\Backend\App\AbstractAction; use Magento\Backend\Model\Session; -use Magento\Backend\Model\UrlInterface; use Magento\Framework\App; use Magento\Framework\App\ActionFlag; use Magento\Framework\App\Response\HttpInterface as HttpResponseInterface; diff --git a/app/code/Magento/Backend/Setup/ConfigOptionsList.php b/app/code/Magento/Backend/Setup/ConfigOptionsList.php index 2d1723886b1dd..c793bd9e9b2fb 100644 --- a/app/code/Magento/Backend/Setup/ConfigOptionsList.php +++ b/app/code/Magento/Backend/Setup/ConfigOptionsList.php @@ -5,12 +5,12 @@ */ namespace Magento\Backend\Setup; +use Magento\Framework\App\DeploymentConfig; use Magento\Framework\Config\Data\ConfigData; use Magento\Framework\Config\File\ConfigFilePool; +use Magento\Framework\Setup\BackendFrontnameGenerator; use Magento\Framework\Setup\ConfigOptionsListInterface; use Magento\Framework\Setup\Option\TextConfigOption; -use Magento\Framework\App\DeploymentConfig; -use \Magento\Framework\Setup\BackendFrontnameGenerator; /** * Deployment configuration options needed for Backend module diff --git a/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php b/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php index 2f808eaf2d1b8..7968a98cf2908 100644 --- a/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php +++ b/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php @@ -5,9 +5,9 @@ */ namespace Magento\Backend\Test\Unit\App\Action\Plugin; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; use Magento\Backend\App\AbstractAction; use Magento\Framework\App\RequestInterface; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; class MassactionKeyTest extends \PHPUnit\Framework\TestCase { diff --git a/app/code/Magento/Backend/Test/Unit/Block/MenuItemCheckerTest.php b/app/code/Magento/Backend/Test/Unit/Block/MenuItemCheckerTest.php index a79050faeb84a..7f7c5dac18c23 100644 --- a/app/code/Magento/Backend/Test/Unit/Block/MenuItemCheckerTest.php +++ b/app/code/Magento/Backend/Test/Unit/Block/MenuItemCheckerTest.php @@ -5,9 +5,9 @@ */ namespace Magento\Backend\Test\Unit\Block; -use Magento\Backend\Model\Menu\Item; -use Magento\Backend\Model\Menu; use Magento\Backend\Block\MenuItemChecker; +use Magento\Backend\Model\Menu; +use Magento\Backend\Model\Menu\Item; class MenuItemCheckerTest extends \PHPUnit\Framework\TestCase { diff --git a/app/code/Magento/Backend/Test/Unit/Block/MenuTest.php b/app/code/Magento/Backend/Test/Unit/Block/MenuTest.php index f41447c608b10..f5a400efcf8ba 100644 --- a/app/code/Magento/Backend/Test/Unit/Block/MenuTest.php +++ b/app/code/Magento/Backend/Test/Unit/Block/MenuTest.php @@ -5,16 +5,16 @@ */ namespace Magento\Backend\Test\Unit\Block; -use Magento\Backend\Model\Menu\Item; -use Magento\Backend\Model\Menu as MenuModel; +use Magento\Backend\Block\AnchorRenderer; use Magento\Backend\Block\Menu; -use Magento\Backend\Model\UrlInterface; -use Magento\Backend\Model\Menu\Filter\IteratorFactory; +use Magento\Backend\Block\MenuItemChecker; use Magento\Backend\Model\Auth\Session; +use Magento\Backend\Model\Menu as MenuModel; use Magento\Backend\Model\Menu\Config; +use Magento\Backend\Model\Menu\Filter\IteratorFactory; +use Magento\Backend\Model\Menu\Item; +use Magento\Backend\Model\UrlInterface; use Magento\Framework\Locale\ResolverInterface; -use Magento\Backend\Block\MenuItemChecker; -use Magento\Backend\Block\AnchorRenderer; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; class MenuTest extends \PHPUnit\Framework\TestCase diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Massaction/ExtendedTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Massaction/ExtendedTest.php index 4525de1fee542..a74fc623cbd30 100644 --- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Massaction/ExtendedTest.php +++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Massaction/ExtendedTest.php @@ -125,13 +125,13 @@ public function testGetGridIdsJsonWithoutUseSelectAll() public function testGetGridIdsJsonWithUseSelectAll(array $items, $result) { $this->_block->setUseSelectAll(true); - + if ($this->_block->getMassactionIdField()) { $massActionIdField = $this->_block->getMassactionIdField(); } else { $massActionIdField = $this->_block->getParentBlock()->getMassactionIdField(); } - + $collectionMock = $this->getMockBuilder(\Magento\Framework\Data\Collection::class) ->disableOriginalConstructor() ->getMock(); diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php index bb389a996e1ed..dc7ba93073c3f 100644 --- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php +++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php @@ -237,7 +237,7 @@ public function testGetGridIdsJsonWithoutUseSelectAll() public function testGetGridIdsJsonWithUseSelectAll(array $items, $result) { $this->_block->setUseSelectAll(true); - + if ($this->_block->getMassactionIdField()) { $massActionIdField = $this->_block->getMassactionIdField(); } else { diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php index 556db311748bd..f1ba00566c2f6 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php @@ -5,17 +5,17 @@ */ namespace Magento\Backend\Test\Unit\Controller\Adminhtml\Cache; -use PHPUnit_Framework_MockObject_MockObject as MockObject; -use Magento\Backend\Controller\Adminhtml\Cache\MassDisable; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; -use Magento\Framework\App\State; use Magento\Backend\App\Action\Context; -use Magento\Framework\Message\ManagerInterface as MessageManager; -use Magento\Framework\Controller\ResultFactory; +use Magento\Backend\Controller\Adminhtml\Cache\MassDisable; use Magento\Backend\Model\View\Result\Redirect; -use Magento\Framework\App\RequestInterface as Request; -use Magento\Framework\App\Cache\TypeListInterface as CacheTypeList; use Magento\Framework\App\Cache\StateInterface as CacheState; +use Magento\Framework\App\Cache\TypeListInterface as CacheTypeList; +use Magento\Framework\App\RequestInterface as Request; +use Magento\Framework\App\State; +use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Message\ManagerInterface as MessageManager; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; +use PHPUnit_Framework_MockObject_MockObject as MockObject; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php index ad622ca69757a..c29bbab8d6978 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php @@ -5,17 +5,17 @@ */ namespace Magento\Backend\Test\Unit\Controller\Adminhtml\Cache; -use PHPUnit_Framework_MockObject_MockObject as MockObject; -use Magento\Backend\Controller\Adminhtml\Cache\MassEnable; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; -use Magento\Framework\App\State; use Magento\Backend\App\Action\Context; -use Magento\Framework\Message\ManagerInterface as MessageManager; -use Magento\Framework\Controller\ResultFactory; +use Magento\Backend\Controller\Adminhtml\Cache\MassEnable; use Magento\Backend\Model\View\Result\Redirect; -use Magento\Framework\App\RequestInterface as Request; -use Magento\Framework\App\Cache\TypeListInterface as CacheTypeList; use Magento\Framework\App\Cache\StateInterface as CacheState; +use Magento\Framework\App\Cache\TypeListInterface as CacheTypeList; +use Magento\Framework\App\RequestInterface as Request; +use Magento\Framework\App\State; +use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Message\ManagerInterface as MessageManager; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; +use PHPUnit_Framework_MockObject_MockObject as MockObject; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/AbstractTestCase.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/AbstractTestCase.php index dbd1cbe5ec8ec..6049ef76fb183 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/AbstractTestCase.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/AbstractTestCase.php @@ -21,8 +21,7 @@ protected function assertExecute($controllerName, $blockName) { $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); $outPut = "data"; - $resultRawMock = $this->createPartialMock(\Magento\Framework\Controller\Result\Raw::class, ['setContents']) - ; + $resultRawMock = $this->createPartialMock(\Magento\Framework\Controller\Result\Raw::class, ['setContents']); $resultRawFactoryMock = $this->createPartialMock(\Magento\Framework\Controller\Result\RawFactory::class, ['create']); $layoutFactoryMock = $this->createPartialMock(\Magento\Framework\View\LayoutFactory::class, ['create']); diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Store/IndexTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Store/IndexTest.php index 1986c41e5cfb6..71a263dc0b225 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Store/IndexTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Store/IndexTest.php @@ -6,9 +6,9 @@ */ namespace Magento\Backend\Test\Unit\Controller\Adminhtml\System\Store; -use Magento\Framework\Controller\ResultFactory; -use Magento\Backend\Model\View\Result\Page; use Magento\Backend\Controller\Adminhtml\System\Store\Index; +use Magento\Backend\Model\View\Result\Page; +use Magento\Framework\Controller\ResultFactory; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; use Magento\Framework\View\Page\Config; use Magento\Framework\View\Page\Title; diff --git a/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php b/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php index 4911dc1e9968e..8ccff487914c6 100644 --- a/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php +++ b/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php @@ -6,7 +6,6 @@ namespace Magento\Backend\Test\Unit\Model; use Magento\Backend\Model\AdminPathConfig; -use Magento\Store\Model\Store; class AdminPathConfigTest extends \PHPUnit\Framework\TestCase { diff --git a/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php b/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php index 77eb7cdb34d1f..cfd153fed2d7e 100644 --- a/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php +++ b/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php @@ -28,7 +28,7 @@ class ManagerTest extends \PHPUnit\Framework\TestCase * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\Model\Auth\Session */ protected $_authSession; - + /** * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\App\ConfigInterface */ @@ -39,14 +39,14 @@ protected function setUp() $this->_session = $this->createMock(\Magento\Backend\Model\Session::class); $this->_authSession = $this->createPartialMock(\Magento\Backend\Model\Auth\Session::class, ['getUser']); - + $this->_backendConfig = $this->getMockForAbstractClass( \Magento\Backend\App\ConfigInterface::class, [], '', false ); - + $userMock = new \Magento\Framework\DataObject(); $this->_authSession->expects($this->any())->method('getUser')->will($this->returnValue($userMock)); diff --git a/app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php b/app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php index 23d1ed5da1425..49224d2351b6d 100644 --- a/app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php +++ b/app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php @@ -37,6 +37,6 @@ public function testAfterGetResult($isPub, $times) public function afterGetResultDataProvider() { - return [[true, 1], [false, 0],]; + return [[true, 1], [false, 0]]; } } diff --git a/app/code/Magento/Backend/Test/Unit/Model/MenuTest.php b/app/code/Magento/Backend/Test/Unit/Model/MenuTest.php index 737f76a7fda33..237c27c82d53f 100644 --- a/app/code/Magento/Backend/Test/Unit/Model/MenuTest.php +++ b/app/code/Magento/Backend/Test/Unit/Model/MenuTest.php @@ -5,7 +5,6 @@ */ namespace Magento\Backend\Test\Unit\Model; -use Magento\Backend\Model\Menu\Item; use Magento\Backend\Model\Menu\Item\Factory; use Magento\Framework\Serialize\SerializerInterface; diff --git a/app/code/Magento/Backend/Test/Unit/Model/View/Layout/StructureManagerTest.php b/app/code/Magento/Backend/Test/Unit/Model/View/Layout/StructureManagerTest.php index fecb6434da83a..ab406d69ba660 100644 --- a/app/code/Magento/Backend/Test/Unit/Model/View/Layout/StructureManagerTest.php +++ b/app/code/Magento/Backend/Test/Unit/Model/View/Layout/StructureManagerTest.php @@ -7,9 +7,9 @@ namespace Magento\Backend\Test\Unit\Model\View\Layout; use Magento\Backend\Model\View\Layout\StructureManager; -use Magento\Framework\View\Layout\ScheduledStructure; -use Magento\Framework\View\Layout\Data\Structure; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; +use Magento\Framework\View\Layout\Data\Structure; +use Magento\Framework\View\Layout\ScheduledStructure; /** * Class StructureManagerTest diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml index ae123511bd478..e4443b327cb94 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml @@ -15,8 +15,8 @@ onchange="changeDiagramsPeriod(this);" class="admin__control-select"> helper('Magento\Backend\Helper\Dashboard\Data')->getDatePeriods() as $value => $label): ?> + continue; +} ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml index 1041aef59ceac..3b643b633f974 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml @@ -62,7 +62,7 @@ deps.push('Magento_Sales/order/create/form'); deps.push('mage/adminhtml/grid'); require(deps, function(getDependencyJsObject() ? 'registry' : '') ?>){ - + getDependencyJsObject()): ?> registry.get('getDependencyJsObject() ?>', function (getDependencyJsObject() ?>) { 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 bb968c57610be..fe9ca0a5abc1a 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml @@ -36,22 +36,22 @@