Skip to content

Commit 9cc1231

Browse files
oksana-kroksana-kr
committed
Merge branch '2.3-develop-github' into MAGETWO-96420-github
2 parents 072409e + f77f96b commit 9cc1231

File tree

570 files changed

+9925
-4196
lines changed

Some content is hidden

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

570 files changed

+9925
-4196
lines changed

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ atlassian*
3333
/.php_cs
3434
/.php_cs.cache
3535
/grunt-config.json
36-
/dev/tools/grunt/configs/local-themes.js
3736
/pub/media/*.*
3837
!/pub/media/.htaccess
3938
/pub/media/attribute/*

‎.travis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ env:
3333
- TEST_SUITE=integration INTEGRATION_INDEX=2
3434
- TEST_SUITE=integration INTEGRATION_INDEX=3
3535
- TEST_SUITE=functional
36+
- TEST_SUITE=graphql-api-functional
3637
matrix:
3738
exclude:
3839
- php: 7.1
@@ -43,6 +44,8 @@ matrix:
4344
env: TEST_SUITE=js GRUNT_COMMAND=static
4445
- php: 7.1
4546
env: TEST_SUITE=functional
47+
- php: 7.1
48+
env: TEST_SUITE=graphql-api-functional
4649
cache:
4750
apt: true
4851
directories:
@@ -61,5 +64,6 @@ script:
6164

6265
# The scripts for grunt/phpunit type tests
6366
- if [ $TEST_SUITE == "functional" ]; then dev/tests/functional/vendor/phpunit/phpunit/phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
64-
- if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
67+
- if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js"] && [ $TEST_SUITE != "graphql-api-functional" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
6568
- if [ $TEST_SUITE == "js" ]; then grunt $GRUNT_COMMAND; fi
69+
- if [ $TEST_SUITE == "graphql-api-functional" ]; then phpunit -c dev/tests/api-functional; fi

‎app/autoload.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
/* 'composer install' validation */
2929
if (file_exists($vendorAutoload)) {
3030
$composerAutoloader = include $vendorAutoload;
31+
} else if (file_exists("{$vendorDir}/autoload.php")) {
32+
$vendorAutoload = "{$vendorDir}/autoload.php";
33+
$composerAutoloader = include $vendorAutoload;
3134
} else {
3235
throw new \Exception(
3336
'Vendor autoload is not found. Please run \'composer install\' under application root directory.'

‎app/bootstrap.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
#ini_set('display_errors', 1);
1212

1313
/* PHP version validation */
14-
if (!defined('PHP_VERSION_ID') || !(PHP_VERSION_ID === 70002 || PHP_VERSION_ID === 70004 || PHP_VERSION_ID >= 70006)) {
14+
if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 70103) {
1515
if (PHP_SAPI == 'cli') {
16-
echo 'Magento supports 7.0.2, 7.0.4, and 7.0.6 or later. ' .
17-
'Please read http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html';
16+
echo 'Magento supports PHP 7.1.3 or later. ' .
17+
'Please read https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements-tech.html';
1818
} else {
1919
echo <<<HTML
2020
<div style="font:12px/1.35em arial, helvetica, sans-serif;">
21-
<p>Magento supports PHP 7.0.2, 7.0.4, and 7.0.6 or later. Please read
22-
<a target="_blank" href="http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html">
21+
<p>Magento supports PHP 7.1.3 or later. Please read
22+
<a target="_blank" href="https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements-tech.html">
2323
Magento System Requirements</a>.
2424
</div>
2525
HTML;

‎app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MAGETWO-63898"/>
1919
<group value="analytics"/>
20-
<skip>
21-
<issueId value="MAGETWO-96223"/>
22-
</skip>
2320
</annotations>
2421

2522
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>

‎app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ $fraudDetails = $payment->getAdditionalInformation('fraud_details');
4444
<?php endif; ?>
4545

4646
<?php if(!empty($fraudDetails['fraud_filters'])): ?>
47-
<b><?= $block->escapeHtml(__('Fraud Filters')) ?>:
48-
</b></br>
47+
<strong><?= $block->escapeHtml(__('Fraud Filters')) ?>:
48+
</strong></br>
4949
<?php foreach($fraudDetails['fraud_filters'] as $filter): ?>
5050
<?= $block->escapeHtml($filter['name']) ?>:
5151
<?= $block->escapeHtml($filter['action']) ?>

‎app/code/Magento/Authorizenet/view/frontend/requirejs-config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
var config = {
77
map: {
88
'*': {
9-
transparent: 'Magento_Payment/js/transparent'
9+
transparent: 'Magento_Payment/js/transparent',
10+
'Magento_Payment/transparent': 'Magento_Payment/js/transparent'
1011
}
1112
}
1213
};

‎app/code/Magento/Backend/Block/DataProviders/ImageUploadConfig.php

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\Backend\Block\DataProviders;
9+
10+
use Magento\Framework\View\Element\Block\ArgumentInterface;
11+
use Magento\Backend\Model\Image\UploadResizeConfigInterface;
12+
13+
/**
14+
* Provides additional data for image uploader
15+
*/
16+
class ImageUploadConfig implements ArgumentInterface
17+
{
18+
/**
19+
* @var UploadResizeConfigInterface
20+
*/
21+
private $imageUploadConfig;
22+
23+
/**
24+
* @param UploadResizeConfigInterface $imageUploadConfig
25+
*/
26+
public function __construct(UploadResizeConfigInterface $imageUploadConfig)
27+
{
28+
$this->imageUploadConfig = $imageUploadConfig;
29+
}
30+
31+
/**
32+
* Get image resize configuration
33+
*
34+
* @return int
35+
*/
36+
public function getIsResizeEnabled(): int
37+
{
38+
return (int)$this->imageUploadConfig->isResizeEnabled();
39+
}
40+
}

‎app/code/Magento/Backend/Block/Media/Uploader.php

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Magento\Framework\App\ObjectManager;
1111
use Magento\Framework\Serialize\Serializer\Json;
1212
use Magento\Framework\Image\Adapter\UploadConfigInterface;
13+
use Magento\Backend\Model\Image\UploadResizeConfigInterface;
1314

1415
/**
1516
* Adminhtml media library uploader
@@ -38,8 +39,15 @@ class Uploader extends \Magento\Backend\Block\Widget
3839
*/
3940
private $jsonEncoder;
4041

42+
/**
43+
* @var UploadResizeConfigInterface
44+
*/
45+
private $imageUploadConfig;
46+
4147
/**
4248
* @var UploadConfigInterface
49+
* @deprecated
50+
* @see \Magento\Backend\Model\Image\UploadResizeConfigInterface
4351
*/
4452
private $imageConfig;
4553

@@ -49,18 +57,22 @@ class Uploader extends \Magento\Backend\Block\Widget
4957
* @param array $data
5058
* @param Json $jsonEncoder
5159
* @param UploadConfigInterface $imageConfig
60+
* @param UploadResizeConfigInterface $imageUploadConfig
5261
*/
5362
public function __construct(
5463
\Magento\Backend\Block\Template\Context $context,
5564
\Magento\Framework\File\Size $fileSize,
5665
array $data = [],
5766
Json $jsonEncoder = null,
58-
UploadConfigInterface $imageConfig = null
67+
UploadConfigInterface $imageConfig = null,
68+
UploadResizeConfigInterface $imageUploadConfig = null
5969
) {
6070
$this->_fileSizeService = $fileSize;
6171
$this->jsonEncoder = $jsonEncoder ?: ObjectManager::getInstance()->get(Json::class);
62-
$this->imageConfig = $imageConfig ?: ObjectManager::getInstance()->get(UploadConfigInterface::class);
63-
72+
$this->imageConfig = $imageConfig
73+
?: ObjectManager::getInstance()->get(UploadConfigInterface::class);
74+
$this->imageUploadConfig = $imageUploadConfig
75+
?: ObjectManager::getInstance()->get(UploadResizeConfigInterface::class);
6476
parent::__construct($context, $data);
6577
}
6678

@@ -111,7 +123,7 @@ public function getFileSizeService()
111123
*/
112124
public function getImageUploadMaxWidth()
113125
{
114-
return $this->imageConfig->getMaxWidth();
126+
return $this->imageUploadConfig->getMaxWidth();
115127
}
116128

117129
/**
@@ -121,7 +133,7 @@ public function getImageUploadMaxWidth()
121133
*/
122134
public function getImageUploadMaxHeight()
123135
{
124-
return $this->imageConfig->getMaxHeight();
136+
return $this->imageUploadConfig->getMaxHeight();
125137
}
126138

127139
/**

‎app/code/Magento/Backend/Block/Page/Footer.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function __construct(
4040
}
4141

4242
/**
43-
* @return void
43+
* @inheritdoc
4444
*/
4545
protected function _construct()
4646
{
@@ -57,4 +57,12 @@ public function getMagentoVersion()
5757
{
5858
return $this->productMetadata->getVersion();
5959
}
60+
61+
/**
62+
* @inheritdoc
63+
*/
64+
protected function getCacheLifetime()
65+
{
66+
return 3600 * 24 * 10;
67+
}
6068
}

0 commit comments

Comments
 (0)