Skip to content

Commit 21d37c1

Browse files
sidolovsidolov
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.

‎app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php renamed to ‎app/code/Magento/Elasticsearch/ElasticAdapter/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php

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;

‎app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProviderProxy.php renamed to ‎app/code/Magento/Elasticsearch/ElasticAdapter/Model/Adapter/BatchDataMapper/CategoryFieldsProviderProxy.php

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()

‎app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php renamed to ‎app/code/Magento/Elasticsearch/ElasticAdapter/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php

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

‎app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolver.php renamed to ‎app/code/Magento/Elasticsearch/ElasticAdapter/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolver.php

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;

‎app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php renamed to ‎app/code/Magento/Elasticsearch/ElasticAdapter/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php

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

‎app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/CompositeResolver.php renamed to ‎app/code/Magento/Elasticsearch/ElasticAdapter/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/CompositeResolver.php

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;

‎app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerType.php renamed to ‎app/code/Magento/Elasticsearch/ElasticAdapter/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerType.php

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\ConverterInterface;

‎app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/KeywordType.php renamed to ‎app/code/Magento/Elasticsearch/ElasticAdapter/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/KeywordType.php

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\ConverterInterface;

‎app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php renamed to ‎app/code/Magento/Elasticsearch/ElasticAdapter/Model/Adapter/FieldMapper/ProductFieldMapper.php

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;
8+
namespace Magento\Elasticsearch\ElasticAdapter\Model\Adapter\FieldMapper;
99

1010
use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
1111
use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;

‎app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperProxy.php renamed to ‎app/code/Magento/Elasticsearch/ElasticAdapter/Model/Adapter/FieldMapper/ProductFieldMapperProxy.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper;
6+
namespace Magento\Elasticsearch\ElasticAdapter\Model\Adapter\FieldMapper;
77

88
use Magento\AdvancedSearch\Model\Client\ClientResolver;
99
use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
@@ -37,6 +37,8 @@ public function __construct(
3737
}
3838

3939
/**
40+
* Get Product Field Mapper
41+
*
4042
* @return FieldMapperInterface
4143
*/
4244
private function getProductFieldMapper()

‎app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/ClientFactoryProxy.php renamed to ‎app/code/Magento/Elasticsearch/ElasticAdapter/Model/Client/ClientFactoryProxy.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Elasticsearch\Elasticsearch5\Model\Client;
6+
namespace Magento\Elasticsearch\ElasticAdapter\Model\Client;
77

88
use Magento\AdvancedSearch\Model\Client\ClientFactoryInterface;
99
use Magento\AdvancedSearch\Model\Client\ClientResolver;
@@ -37,6 +37,8 @@ public function __construct(
3737
}
3838

3939
/**
40+
* Get Client Factory
41+
*
4042
* @return ClientFactoryInterface
4143
*/
4244
private function getClientFactory()

‎app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Adapter.php renamed to ‎app/code/Magento/Elasticsearch/ElasticAdapter/SearchAdapter/Adapter.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Elasticsearch\Elasticsearch5\SearchAdapter;
6+
namespace Magento\Elasticsearch\ElasticAdapter\SearchAdapter;
77

88
use Magento\Elasticsearch\SearchAdapter\Aggregation\Builder as AggregationBuilder;
99
use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
@@ -27,8 +27,6 @@ class Adapter implements AdapterInterface
2727
private $mapper;
2828

2929
/**
30-
* Response Factory
31-
*
3230
* @var ResponseFactory
3331
*/
3432
private $responseFactory;

‎app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Aggregation/Interval.php renamed to ‎app/code/Magento/Elasticsearch/ElasticAdapter/SearchAdapter/Aggregation/Interval.php

Lines changed: 3 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\SearchAdapter\Aggregation;
8+
namespace Magento\Elasticsearch\ElasticAdapter\SearchAdapter\Aggregation;
99

1010
use Magento\Framework\Search\Dynamic\IntervalInterface;
1111
use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
@@ -22,7 +22,7 @@ class Interval implements IntervalInterface
2222
/**
2323
* Minimal possible value
2424
*/
25-
const DELTA = 0.005;
25+
private const DELTA = 0.005;
2626

2727
/**
2828
* @var ConnectionManager
@@ -120,6 +120,7 @@ public function load($limit, $offset = null, $lower = null, $upper = null)
120120
*/
121121
public function loadPrevious($data, $index, $lower = null)
122122
{
123+
$from = $to = [];
123124
if ($lower) {
124125
$from = ['gte' => $lower - self::DELTA];
125126
}

‎app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Mapper.php renamed to ‎app/code/Magento/Elasticsearch/ElasticAdapter/SearchAdapter/Mapper.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Magento\Elasticsearch\Elasticsearch5\SearchAdapter;
7+
namespace Magento\Elasticsearch\ElasticAdapter\SearchAdapter;
88

99
use InvalidArgumentException;
10-
use Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Query\Builder as QueryBuilder;
10+
use Magento\Elasticsearch\ElasticAdapter\SearchAdapter\Query\Builder as QueryBuilder;
1111
use Magento\Elasticsearch\SearchAdapter\Filter\Builder as FilterBuilder;
1212
use Magento\Elasticsearch\SearchAdapter\Query\Builder\MatchQuery as MatchQueryBuilder;
1313
use Magento\Framework\Search\Request\Query\BoolExpression as BoolQuery;
@@ -17,7 +17,7 @@
1717
use Magento\Framework\Search\RequestInterface;
1818

1919
/**
20-
* Mapper class for Elasticsearch5
20+
* Mapper class for ElasticAdapter
2121
*
2222
* @api
2323
* @since 100.2.2

‎app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Query/Builder.php renamed to ‎app/code/Magento/Elasticsearch/ElasticAdapter/SearchAdapter/Query/Builder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Query;
7+
namespace Magento\Elasticsearch\ElasticAdapter\SearchAdapter\Query;
88

99
use Magento\Elasticsearch\SearchAdapter\Query\Builder\Sort;
1010
use Magento\Framework\App\ObjectManager;

0 commit comments

Comments
 (0)