From f164cbc03f43e3ec519b9006ca9eefb14df5831f Mon Sep 17 00:00:00 2001 From: Zefiryn Date: Sun, 17 Sep 2017 14:03:47 +0200 Subject: [PATCH 01/16] #10922 add is_active to Magento\Store\Api\Data\StoreInterface to show the flag in the rest endpoint --- .../Magento/Store/Api/Data/StoreInterface.php | 11 +++++++++++ app/code/Magento/Store/Model/Store.php | 17 ++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Store/Api/Data/StoreInterface.php b/app/code/Magento/Store/Api/Data/StoreInterface.php index 7d9070fdc496..0f724a23fc09 100644 --- a/app/code/Magento/Store/Api/Data/StoreInterface.php +++ b/app/code/Magento/Store/Api/Data/StoreInterface.php @@ -66,6 +66,17 @@ public function setWebsiteId($websiteId); */ public function getStoreGroupId(); + /** + * @param int $isActive + * @return $this + */ + public function setIsActive($isActive); + + /** + * @return int + */ + public function getIsActive(); + /** * @param int $storeGroupId * @return $this diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php index 06b04603d483..34d338b1b344 100644 --- a/app/code/Magento/Store/Model/Store.php +++ b/app/code/Magento/Store/Model/Store.php @@ -27,7 +27,6 @@ * @method int getSortOrder() * @method int getStoreId() * @method Store setSortOrder($value) - * @method Store setIsActive($value) * * @SuppressWarnings(PHPMD.TooManyFields) * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) @@ -1088,6 +1087,22 @@ public function setStoreGroupId($storeGroupId) return $this->setGroupId($storeGroupId); } + /** + * @inheritdoc + */ + public function getIsActive() + { + return $this->_getData('is_active'); + } + + /** + * @inheritdoc + */ + public function setIsActive($isActive) + { + return $this->setData('is_active', $isActive); + } + /** * Retrieve default group identifier * From 5f7fcf619671ca8e0a511e5fc0273051f6002069 Mon Sep 17 00:00:00 2001 From: Mayank Date: Fri, 29 Sep 2017 11:23:45 +0530 Subject: [PATCH 02/16] Property name should not be prefixed with an underscore to indicate visibility --- app/code/Magento/Wishlist/Model/Config.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/code/Magento/Wishlist/Model/Config.php b/app/code/Magento/Wishlist/Model/Config.php index 5dd7e0ef064f..1620c61d79da 100644 --- a/app/code/Magento/Wishlist/Model/Config.php +++ b/app/code/Magento/Wishlist/Model/Config.php @@ -22,19 +22,19 @@ class Config /** * @var \Magento\Catalog\Model\Config */ - private $_catalogConfig; + private $catalogConfig; /** * @var \Magento\Catalog\Model\Attribute\Config */ - private $_attributeConfig; + private $attributeConfig; /** * Number of emails allowed for sharing wishlist * * @var int */ - private $_sharingEmailLimit; + private $sharingEmailLimit; /** * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig @@ -54,10 +54,10 @@ public function __construct( self::XML_PATH_SHARING_TEXT_LIMIT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE ); - $this->_sharingEmailLimit = $emailLimitInConfig ?: self::SHARING_EMAIL_LIMIT; + $this->sharingEmailLimit = $emailLimitInConfig ?: self::SHARING_EMAIL_LIMIT; $this->_sharignTextLimit = $textLimitInConfig ?: self::SHARING_TEXT_LIMIT; - $this->_catalogConfig = $catalogConfig; - $this->_attributeConfig = $attributeConfig; + $this->catalogConfig = $catalogConfig; + $this->attributeConfig = $attributeConfig; } /** @@ -67,8 +67,8 @@ public function __construct( */ public function getProductAttributes() { - $catalogAttributes = $this->_catalogConfig->getProductAttributes(); - $wishlistAttributes = $this->_attributeConfig->getAttributeNames('wishlist_item'); + $catalogAttributes = $this->catalogConfig->getProductAttributes(); + $wishlistAttributes = $this->attributeConfig->getAttributeNames('wishlist_item'); return array_merge($catalogAttributes, $wishlistAttributes); } @@ -79,7 +79,7 @@ public function getProductAttributes() */ public function getSharingEmailLimit() { - return $this->_sharingEmailLimit; + return $this->sharingEmailLimit; } /** From 1e105b3b9a93f4e48fdda99186dbf853e9bc0d40 Mon Sep 17 00:00:00 2001 From: Mayank Date: Wed, 4 Oct 2017 11:27:37 +0530 Subject: [PATCH 03/16] Product Repeat Isuue after filter on category listing page.Issue : #11139 --- .../Magento/Catalog/Block/Product/ProductList/Toolbar.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php index f461b5251525..c7dd1bfab794 100644 --- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php +++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php @@ -192,7 +192,11 @@ public function setCollection($collection) $this->_collection->setPageSize($limit); } if ($this->getCurrentOrder()) { - $this->_collection->setOrder($this->getCurrentOrder(), $this->getCurrentDirection()); + if (($this->getCurrentOrder()) == 'position') { + $this->_collection->addAttributeToSort($this->getCurrentOrder(), $this->getCurrentDirection())->addAttributeToSort('entity_id', $this->getCurrentDirection()); + } else { + $this->_collection->setOrder($this->getCurrentOrder(), $this->getCurrentDirection()); + } } return $this; } From 10ef2e79bb8641f1b0118c380d04aecdfc6d370f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Mateos?= Date: Wed, 4 Oct 2017 15:17:12 +0200 Subject: [PATCH 04/16] FR#RemoveImages Improve performance --- .../Magento/Catalog/Model/Product/Gallery/UpdateHandler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php index d4f6bd2ca0d6..53083d7168b4 100644 --- a/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php +++ b/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php @@ -36,7 +36,7 @@ protected function processDeletedImages($product, array &$images) $catalogPath = $this->mediaConfig->getBaseMediaPath(); $isFile = $this->mediaDirectory->isFile($catalogPath . $image['file']); // only delete physical files if they are not used by any other products and if this file exist - if (!($this->resourceModel->countImageUses($image['file']) > 1) && $isFile) { + if ($isFile && !($this->resourceModel->countImageUses($image['file']) > 1)) { $filesToDelete[] = ltrim($image['file'], '/'); } } From 7cd9bb5e95efecde04f898d040aa0b84f633ef12 Mon Sep 17 00:00:00 2001 From: Anton Evers Date: Sun, 8 Oct 2017 12:11:45 +0600 Subject: [PATCH 05/16] Provide a cache.xml entry for compiled_config cache This seems to be missing as it is the only subclass of `\Magento\Framework\Cache\Frontend\Decorator\TagScope` that does not appear in any `cache.xml` file. Fixes #11295 --- app/code/Magento/Store/etc/cache.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/code/Magento/Store/etc/cache.xml b/app/code/Magento/Store/etc/cache.xml index e01e1efe49a9..812547ea4191 100644 --- a/app/code/Magento/Store/etc/cache.xml +++ b/app/code/Magento/Store/etc/cache.xml @@ -30,4 +30,8 @@ Results of DDL queries, such as describing tables or indexes + + + Compliation configuration + From d81b9f295ee3d1e2323a3a0e1a2f39e9cfeb53f4 Mon Sep 17 00:00:00 2001 From: Anton Evers Date: Mon, 9 Oct 2017 17:55:33 +0600 Subject: [PATCH 06/16] Add translation of compiled_config label,description --- app/code/Magento/Store/i18n/en_US.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/code/Magento/Store/i18n/en_US.csv b/app/code/Magento/Store/i18n/en_US.csv index 8eb1ea56dd67..bc7eb79da03f 100644 --- a/app/code/Magento/Store/i18n/en_US.csv +++ b/app/code/Magento/Store/i18n/en_US.csv @@ -41,3 +41,5 @@ Layouts,Layouts "API interfaces reflection data","API interfaces reflection data" "Database DDL operations","Database DDL operations" "Results of DDL queries, such as describing tables or indexes","Results of DDL queries, such as describing tables or indexes" +"Compiled Config","Compiled Config" +"Compliation configuration","Compliation configuration" From d5cd66f3012d6accea5e30ca4ac39f723505a6db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Mateos?= Date: Mon, 9 Oct 2017 17:11:21 +0200 Subject: [PATCH 07/16] Change visibilty function --- .../Magento/Sales/Controller/Adminhtml/Order/AddressSave.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php index 64499ba993fe..a371d918ae02 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php @@ -133,7 +133,7 @@ public function execute() * @param array $attributeValues * @return array */ - protected function updateRegionData($attributeValues) + private function updateRegionData($attributeValues) { if (!empty($attributeValues['region_id'])) { $newRegion = $this->regionFactory->create()->load($attributeValues['region_id']); From 551e5eade07c54524704d7c3d3d1df3d37ca352c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Mart=C3=ADnez?= Date: Wed, 11 Oct 2017 01:12:26 +0200 Subject: [PATCH 08/16] Use whitelist for testing code style, full testing if no changes are detected --- dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php index f3dc7841d2df..a67cf20719a7 100644 --- a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php +++ b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php @@ -76,7 +76,7 @@ public static function getWhitelist($fileTypes = ['php'], $changedFilesBaseDir = { $changedFiles = self::getChangedFilesList($changedFilesBaseDir); if (empty($changedFiles)) { - return []; + return self::getFullWhitelist(); } $globPatternsFolder = ('' !== $baseFilesFolder) ? $baseFilesFolder : self::getBaseFilesFolder(); @@ -205,7 +205,7 @@ public function testCodeStyle() $codeSniffer = new CodeSniffer('Magento', $reportFile, new Wrapper()); $this->assertEquals( 0, - $result = $codeSniffer->run($this->getFullWhitelist()), + $result = $codeSniffer->run(self::getWhitelist(['php'])), "PHP Code Sniffer detected {$result} violation(s): " . PHP_EOL . file_get_contents($reportFile) ); } From e730d683b44d0312890a03458131769204ab7aa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Mart=C3=ADnez?= Date: Wed, 11 Oct 2017 01:21:18 +0200 Subject: [PATCH 09/16] Change getFullWhiteList method to static --- dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php index a67cf20719a7..e54a0c3d9088 100644 --- a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php +++ b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php @@ -194,7 +194,7 @@ function ($file) use ($fileHasAllowedType, $fileIsInAllowedDirectory) { * * @return array */ - private function getFullWhitelist() + private static function getFullWhitelist() { return Files::init()->readLists(__DIR__ . '/_files/whitelist/common.txt'); } From 976e570f7175fdad546e1fa3efc736ba2975268f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Mart=C3=ADnez?= Date: Wed, 11 Oct 2017 15:37:55 +0200 Subject: [PATCH 10/16] Change whitelist files to process selection approach --- dev/tests/static/phpunit.xml.dist | 1 + .../testsuite/Magento/Test/Php/LiveCodeTest.php | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dev/tests/static/phpunit.xml.dist b/dev/tests/static/phpunit.xml.dist index 45fe39211edb..bf51b53f1c55 100644 --- a/dev/tests/static/phpunit.xml.dist +++ b/dev/tests/static/phpunit.xml.dist @@ -30,6 +30,7 @@ + diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php index e54a0c3d9088..070092c5d760 100644 --- a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php +++ b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php @@ -76,7 +76,7 @@ public static function getWhitelist($fileTypes = ['php'], $changedFilesBaseDir = { $changedFiles = self::getChangedFilesList($changedFilesBaseDir); if (empty($changedFiles)) { - return self::getFullWhitelist(); + return []; } $globPatternsFolder = ('' !== $baseFilesFolder) ? $baseFilesFolder : self::getBaseFilesFolder(); @@ -194,18 +194,23 @@ function ($file) use ($fileHasAllowedType, $fileIsInAllowedDirectory) { * * @return array */ - private static function getFullWhitelist() + private function getFullWhitelist() { return Files::init()->readLists(__DIR__ . '/_files/whitelist/common.txt'); } public function testCodeStyle() { + $useWhiteList = isset($_ENV['phpunit.static.testcodestyle.use_whitelist']) + && $_ENV['phpunit.static.testcodestyle.use_whitelist'] === '1'; + + $whiteList = $useWhiteList ? self::getWhitelist(['php']) : $this->getFullWhitelist(); + $reportFile = self::$reportDir . '/phpcs_report.txt'; $codeSniffer = new CodeSniffer('Magento', $reportFile, new Wrapper()); $this->assertEquals( 0, - $result = $codeSniffer->run(self::getWhitelist(['php'])), + $result = $codeSniffer->run($whiteList), "PHP Code Sniffer detected {$result} violation(s): " . PHP_EOL . file_get_contents($reportFile) ); } From 5bfdb3835ae58984373892a2b55d5fecae47cd53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Mart=C3=ADnez?= Date: Wed, 11 Oct 2017 16:06:02 +0200 Subject: [PATCH 11/16] Change whitelist files to process selection approach, change env value to const --- dev/tests/static/phpunit.xml.dist | 2 +- .../static/testsuite/Magento/Test/Php/LiveCodeTest.php | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dev/tests/static/phpunit.xml.dist b/dev/tests/static/phpunit.xml.dist index bf51b53f1c55..0afaddb34cae 100644 --- a/dev/tests/static/phpunit.xml.dist +++ b/dev/tests/static/phpunit.xml.dist @@ -30,7 +30,7 @@ - + diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php index 070092c5d760..5058ef402cbd 100644 --- a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php +++ b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php @@ -201,10 +201,8 @@ private function getFullWhitelist() public function testCodeStyle() { - $useWhiteList = isset($_ENV['phpunit.static.testcodestyle.use_whitelist']) - && $_ENV['phpunit.static.testcodestyle.use_whitelist'] === '1'; - - $whiteList = $useWhiteList ? self::getWhitelist(['php']) : $this->getFullWhitelist(); + $whiteList = defined('TESTCODESTYLE_IS_FULL_SCAN') && TESTCODESTYLE_IS_FULL_SCAN === '1' + ? $this->getFullWhitelist() : self::getWhitelist(['php', 'phtml']); $reportFile = self::$reportDir . '/phpcs_report.txt'; $codeSniffer = new CodeSniffer('Magento', $reportFile, new Wrapper()); From c2c997f60af5eba5540e7a2d8e7e6f2ee57ab2c6 Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Wed, 11 Oct 2017 22:23:48 +0300 Subject: [PATCH 12/16] MAGETWO-80828: A solution for Product Repeat Issue after filter on category listing page. #11206 - fix static test --- .../Magento/Catalog/Block/Product/ProductList/Toolbar.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php index c7dd1bfab794..a1f962c07df6 100644 --- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php +++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php @@ -193,7 +193,10 @@ public function setCollection($collection) } if ($this->getCurrentOrder()) { if (($this->getCurrentOrder()) == 'position') { - $this->_collection->addAttributeToSort($this->getCurrentOrder(), $this->getCurrentDirection())->addAttributeToSort('entity_id', $this->getCurrentDirection()); + $this->_collection->addAttributeToSort( + $this->getCurrentOrder(), + $this->getCurrentDirection())->addAttributeToSort('entity_id', $this->getCurrentDirection() + ); } else { $this->_collection->setOrder($this->getCurrentOrder(), $this->getCurrentDirection()); } From 8225f66265aa61d0bce3c41facfcf8035fb6ed5f Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Thu, 12 Oct 2017 12:03:37 +0300 Subject: [PATCH 13/16] MAGETWO-75322: #10922 add is_active to Magento\Store\Api\Data\StoreInterface #10923 - fix WebAPI test --- .../testsuite/Magento/Store/Api/StoreRepositoryTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/api-functional/testsuite/Magento/Store/Api/StoreRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Store/Api/StoreRepositoryTest.php index df1c53f0659d..7881c1660c5a 100644 --- a/dev/tests/api-functional/testsuite/Magento/Store/Api/StoreRepositoryTest.php +++ b/dev/tests/api-functional/testsuite/Magento/Store/Api/StoreRepositoryTest.php @@ -40,7 +40,7 @@ public function testGetList() $storeViews = $this->_webApiCall($serviceInfo, $requestData); $this->assertNotNull($storeViews); $this->assertGreaterThan(1, count($storeViews)); - $keys = ['id', 'code', 'name', 'website_id', 'store_group_id']; + $keys = ['id', 'code', 'name', 'website_id', 'store_group_id', 'is_active']; $this->assertEquals($keys, array_keys($storeViews[0])); } } From 98bd8bed70499dd690ab850a75a0b866b0854ee7 Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Thu, 12 Oct 2017 13:05:39 +0300 Subject: [PATCH 14/16] MAGETWO-80828: A solution for Product Repeat Issue after filter on category listing page. #11206 - fix static test --- .../Magento/Catalog/Block/Product/ProductList/Toolbar.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php index a1f962c07df6..46080ab5c333 100644 --- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php +++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php @@ -195,8 +195,8 @@ public function setCollection($collection) if (($this->getCurrentOrder()) == 'position') { $this->_collection->addAttributeToSort( $this->getCurrentOrder(), - $this->getCurrentDirection())->addAttributeToSort('entity_id', $this->getCurrentDirection() - ); + $this->getCurrentDirection() + )->addAttributeToSort('entity_id', $this->getCurrentDirection()); } else { $this->_collection->setOrder($this->getCurrentOrder(), $this->getCurrentDirection()); } From df4905c6b245bb1bf36b2852b1126d931effc6ff Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Thu, 12 Oct 2017 13:17:55 +0300 Subject: [PATCH 15/16] MAGETWO-81744: [Jenkins] Random fail of Requisition List Test and CreateExistingCustomerBackendEntity --- .../Test/TestCase/CreateExistingCustomerBackendEntity.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerBackendEntity.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerBackendEntity.xml index 5990157d6c5e..f0a0e092bbdc 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerBackendEntity.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerBackendEntity.xml @@ -9,6 +9,7 @@ default + MAGETWO-81744: [Jenkins] Random fail of Requisition List Test and CreateExistingCustomerBackendEntity From f21a58e928da299d3e0656b8ba963665339cdc44 Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Thu, 12 Oct 2017 15:02:19 +0300 Subject: [PATCH 16/16] MAGETWO-80916: Save region correctly to save sales address from admin #11234 --- .../Magento/Sales/Controller/Adminhtml/Order/AddressSave.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php index a371d918ae02..dde2192c3b82 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php @@ -14,7 +14,7 @@ use Magento\Sales\Api\OrderRepositoryInterface; use Magento\Sales\Api\Data\OrderAddressInterface; use Magento\Sales\Controller\Adminhtml\Order; -use Magento\Sales\Model\Order\Address; +use Magento\Sales\Model\Order\Address as AddressModel; use Psr\Log\LoggerInterface; use Magento\Framework\Registry; use Magento\Framework\App\Response\Http\FileFactory; @@ -97,7 +97,7 @@ public function __construct( public function execute() { $addressId = $this->getRequest()->getParam('address_id'); - /** @var $address OrderAddressInterface|Address */ + /** @var $address OrderAddressInterface|AddressModel */ $address = $this->_objectManager->create( OrderAddressInterface::class )->load($addressId);