From 6f0d8691e8381e4d1943ccb52157a89df3becc5e Mon Sep 17 00:00:00 2001 From: Pieter Hoste Date: Sat, 3 Jun 2023 16:06:24 +0200 Subject: [PATCH 1/2] Fixes incorrectly cased namespace usages. --- app/code/Magento/Sales/Model/Order/Creditmemo/Notifier.php | 4 ++-- .../Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php | 2 +- app/code/Magento/Tax/Block/Item/Price/Renderer.php | 2 +- .../Api/SearchCriteria/JoinProcessor/CalculationData.php | 2 +- .../Setup/Declaration/Schema/DataSavior/SelectGenerator.php | 2 +- .../Framework/View/Element/Template/File/Validator.php | 2 +- setup/src/Magento/Setup/Model/BasePackageInfo.php | 2 +- .../src/Magento/Setup/Test/Unit/Model/BasePackageInfoTest.php | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Notifier.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Notifier.php index 9f41a9ddd966a..f821bb66f5cfe 100644 --- a/app/code/Magento/Sales/Model/Order/Creditmemo/Notifier.php +++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Notifier.php @@ -14,12 +14,12 @@ class Notifier implements \Magento\Sales\Model\Order\Creditmemo\NotifierInterface { /** - * @var \Magento\Sales\Model\Order\CreditMemo\SenderInterface[] + * @var \Magento\Sales\Model\Order\Creditmemo\SenderInterface[] */ private $senders; /** - * @param \Magento\Sales\Model\Order\CreditMemo\SenderInterface[] $senders + * @param \Magento\Sales\Model\Order\Creditmemo\SenderInterface[] $senders */ public function __construct(array $senders = []) { diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php index d82b6786f15fb..280b9a41b6162 100644 --- a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php +++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php @@ -115,7 +115,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..880deb48aa31a 100644 --- a/app/code/Magento/Tax/Block/Item/Price/Renderer.php +++ b/app/code/Magento/Tax/Block/Item/Price/Renderer.php @@ -9,7 +9,7 @@ use Magento\Framework\Pricing\Render as PricingRender; use Magento\Framework\View\Element\Template\Context; use Magento\Quote\Model\Quote\Item\AbstractItem as QuoteItem; -use Magento\Sales\Model\Order\CreditMemo\Item as CreditMemoItem; +use Magento\Sales\Model\Order\Creditmemo\Item as CreditMemoItem; use Magento\Sales\Model\Order\Invoice\Item as InvoiceItem; use Magento\Sales\Model\Order\Item as OrderItem; use Magento\Tax\Helper\Data as TaxHelper; 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..caf4f832f84ca 100644 --- a/app/code/Magento/Tax/Model/Api/SearchCriteria/JoinProcessor/CalculationData.php +++ b/app/code/Magento/Tax/Model/Api/SearchCriteria/JoinProcessor/CalculationData.php @@ -25,7 +25,7 @@ public function apply(AbstractDb $collection) { $isNotApplied = !array_key_exists( self::CALCULATION_DATA_ALIAS, - $collection->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..cf7fdeebded0e 100644 --- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/SelectGenerator.php +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/SelectGenerator.php @@ -7,7 +7,7 @@ namespace Magento\Framework\Setup\Declaration\Schema\DataSavior; use Magento\Framework\App\ResourceConnection; -use Magento\Framework\Db\Select; +use Magento\Framework\DB\Select; /** * Yields data from database by select objects diff --git a/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php b/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php index 1875c41511610..2f3c1caf377a2 100644 --- a/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php +++ b/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php @@ -26,7 +26,7 @@ class Validator /** * View filesystem * - * @var \Magento\Framework\FileSystem + * @var \Magento\Framework\Filesystem */ protected $_filesystem; diff --git a/setup/src/Magento/Setup/Model/BasePackageInfo.php b/setup/src/Magento/Setup/Model/BasePackageInfo.php index a59adc48640e0..484087b66d33d 100644 --- a/setup/src/Magento/Setup/Model/BasePackageInfo.php +++ b/setup/src/Magento/Setup/Model/BasePackageInfo.php @@ -5,7 +5,7 @@ */ namespace Magento\Setup\Model; -use Magento\Framework\FileSystem\Directory\ReadFactory; +use Magento\Framework\Filesystem\Directory\ReadFactory; /** * Information about the Magento base package. diff --git a/setup/src/Magento/Setup/Test/Unit/Model/BasePackageInfoTest.php b/setup/src/Magento/Setup/Test/Unit/Model/BasePackageInfoTest.php index 5d38993f421c4..1fc396180d337 100644 --- a/setup/src/Magento/Setup/Test/Unit/Model/BasePackageInfoTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Model/BasePackageInfoTest.php @@ -16,12 +16,12 @@ class BasePackageInfoTest extends \PHPUnit\Framework\TestCase { /** - * @var \PHPUnit\Framework\MockObject\MockObject|\Magento\Framework\FileSystem\Directory\ReadFactory + * @var \PHPUnit\Framework\MockObject\MockObject|\Magento\Framework\Filesystem\Directory\ReadFactory */ private $readFactoryMock; /** - * @var \PHPUnit\Framework\MockObject\MockObject|\Magento\Framework\FileSystem\Directory\ReadInterface + * @var \PHPUnit\Framework\MockObject\MockObject|\Magento\Framework\Filesystem\Directory\ReadInterface */ private $readerMock; From ab8b57e9d5fc8971199ad84695805862a8b2824c Mon Sep 17 00:00:00 2001 From: Pieter Hoste Date: Sat, 3 Jun 2023 17:16:04 +0200 Subject: [PATCH 2/2] Fix static tests. --- .../Sales/Model/Order/Creditmemo/Notifier.php | 6 +++--- .../Block/Adminhtml/Order/Create/Items/GridTest.php | 11 ++++------- app/code/Magento/Tax/Block/Item/Price/Renderer.php | 10 +++++----- .../SearchCriteria/JoinProcessor/CalculationData.php | 12 +++++------- .../Schema/DataSavior/SelectGenerator.php | 4 ++-- .../View/Element/Template/File/Validator.php | 4 ++-- setup/src/Magento/Setup/Model/BasePackageInfo.php | 12 +++++++----- .../Setup/Test/Unit/Model/BasePackageInfoTest.php | 4 ++-- 8 files changed, 30 insertions(+), 33 deletions(-) diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Notifier.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Notifier.php index f821bb66f5cfe..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(); diff --git a/app/code/Magento/Tax/Block/Item/Price/Renderer.php b/app/code/Magento/Tax/Block/Item/Price/Renderer.php index 880deb48aa31a..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 caf4f832f84ca..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 @@ 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 1fc396180d337..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 @@