Skip to content

Commit 21d37c1

Browse files
authored
Merge pull request #8487 from magento-gl/Hammer_Platform_Health_Scope_21082023
Hammer platform health scope 21082023
2 parents 8dc8c7e + 4586df9 commit 21d37c1

File tree

129 files changed

+6478
-9348
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+6478
-9348
lines changed

app/code/Magento/Backend/view/adminhtml/web/js/dashboard/chart.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ define([
1717
$.widget('mage.dashboardChart', {
1818
options: {
1919
updateUrl: '',
20+
responsive: true,
21+
maintainAspectRatio: false,
2022
periodSelect: null,
2123
periodUnits: [],
2224
precision: 0,

app/code/Magento/CatalogImportExport/Model/Export/Product.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,6 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
116116
*/
117117
protected $_productTypeModels = [];
118118

119-
/**
120-
* Array of pairs store ID to its code.
121-
*
122-
* @var array
123-
*/
124-
protected $_storeIdToCode = [];
125-
126119
/**
127120
* Array of Website ID-to-code.
128121
*

app/code/Magento/Dhl/Model/Carrier.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,6 @@ class Carrier extends AbstractDhl implements CarrierInterface
115115
*/
116116
protected $_request;
117117

118-
/**
119-
* Rate result data
120-
*
121-
* @var Result|null
122-
*/
123-
protected $_result;
124-
125118
/**
126119
* Countries parameters data
127120
*

app/code/Magento/Elasticsearch/Block/Adminhtml/System/Config/Elasticsearch5/TestConnection.php

Lines changed: 0 additions & 32 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\BatchDataMapper;
8+
namespace Magento\Elasticsearch\ElasticAdapter\Model\Adapter\BatchDataMapper;
99

1010
use Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface;
1111
use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\BatchDataMapper;
6+
namespace Magento\Elasticsearch\ElasticAdapter\Model\Adapter\BatchDataMapper;
77

8-
use Magento\AdvancedSearch\Model\Client\ClientResolver;
98
use Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface;
9+
use Magento\AdvancedSearch\Model\Client\ClientResolver;
1010

1111
/**
1212
* Proxy for data mapping of categories fields
@@ -37,6 +37,8 @@ public function __construct(
3737
}
3838

3939
/**
40+
* Get Category Fields Provider
41+
*
4042
* @return AdditionalFieldsProviderInterface
4143
*/
4244
private function getCategoryFieldsProvider()
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;
8+
namespace Magento\Elasticsearch\ElasticAdapter\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;
99

1010
use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface;
1111

@@ -35,7 +35,7 @@ class Converter implements ConverterInterface
3535
];
3636

3737
/**
38-
* Get service field index type for elasticsearch 5.
38+
* Get service field index type for elasticsearch 7.x and 8.x.
3939
*
4040
* @param string $internalType
4141
* @return string|boolean
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;
8+
namespace Magento\Elasticsearch\ElasticAdapter\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;
99

1010
use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
1111
use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ResolverInterface;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType;
8+
namespace Magento\Elasticsearch\ElasticAdapter\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType;
99

1010
use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface;
1111

@@ -38,7 +38,7 @@ class Converter implements ConverterInterface
3838
];
3939

4040
/**
41-
* Get service field type for elasticsearch 5.
41+
* Get service field type for elasticsearch.
4242
*
4343
* @param string $internalType
4444
* @return string
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
8+
namespace Magento\Elasticsearch\ElasticAdapter\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
99

1010
use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
1111
use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface;

0 commit comments

Comments
 (0)