diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Notifier.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Notifier.php index 9f41a9ddd966a..14e9330c65036 100644 --- a/app/code/Magento/Sales/Model/Order/Creditmemo/Notifier.php +++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Notifier.php @@ -1,7 +1,7 @@ getMockBuilder(Data::class) ->disableOriginalConstructor() ->getMock(); - $this->priceCurrency = $this->getMockBuilder( - PriceCurrencyInterface::class - )->getMock(); + $this->priceCurrency = $this->getMockBuilder(PriceCurrencyInterface::class) + ->getMock(); $sessionMock = $this->getMockBuilder(Quote::class) ->disableOriginalConstructor() ->onlyMethods(['getQuote']) ->getMock(); - $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class) ->disableOriginalConstructor() ->onlyMethods(['getStore']) ->getMock(); - $storeMock = $this->getMockBuilder(Store::class) ->disableOriginalConstructor() ->getMock(); @@ -115,7 +112,7 @@ protected function setUp(): void ->addMethods(['methods']) ->getMock(); - $giftMessageSave = $this->getMockBuilder(\Magento\Giftmessage\Model\Save::class) + $giftMessageSave = $this->getMockBuilder(\Magento\GiftMessage\Model\Save::class) ->disableOriginalConstructor() ->getMock(); diff --git a/app/code/Magento/Tax/Block/Item/Price/Renderer.php b/app/code/Magento/Tax/Block/Item/Price/Renderer.php index caefd2661853d..5de5a5f27d895 100644 --- a/app/code/Magento/Tax/Block/Item/Price/Renderer.php +++ b/app/code/Magento/Tax/Block/Item/Price/Renderer.php @@ -1,7 +1,7 @@ * @since 100.0.2 */ class Renderer extends \Magento\Framework\View\Element\Template @@ -106,6 +105,8 @@ public function setZone($zone) } /** + * Get store id + * * @return int|null|string */ public function getStoreId() @@ -201,8 +202,7 @@ public function formatPrice($price) } /** - * Get item price in display currency or order currency depending - * on item type + * Get item price in display currency or order currency depending on item type * * @return float */ diff --git a/app/code/Magento/Tax/Model/Api/SearchCriteria/JoinProcessor/CalculationData.php b/app/code/Magento/Tax/Model/Api/SearchCriteria/JoinProcessor/CalculationData.php index 7ba5f62da73b8..b7bb322c5d5e4 100644 --- a/app/code/Magento/Tax/Model/Api/SearchCriteria/JoinProcessor/CalculationData.php +++ b/app/code/Magento/Tax/Model/Api/SearchCriteria/JoinProcessor/CalculationData.php @@ -1,23 +1,21 @@ getSelect()->getPart(\Magento\Framework\Db\Select::FROM) + $collection->getSelect()->getPart(\Magento\Framework\DB\Select::FROM) ); if ($isNotApplied) { $collection->joinCalculationData(self::CALCULATION_DATA_ALIAS); diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/SelectGenerator.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/SelectGenerator.php index 08da74fb6a2b6..403a1c086ced6 100644 --- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/SelectGenerator.php +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/SelectGenerator.php @@ -1,13 +1,13 @@ reader->isExist($basePackageComposerFilePath)) { diff --git a/setup/src/Magento/Setup/Test/Unit/Model/BasePackageInfoTest.php b/setup/src/Magento/Setup/Test/Unit/Model/BasePackageInfoTest.php index 5d38993f421c4..65751bcd4a430 100644 --- a/setup/src/Magento/Setup/Test/Unit/Model/BasePackageInfoTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Model/BasePackageInfoTest.php @@ -1,7 +1,7 @@