Skip to content

Commit d45f2e3

Browse files
magento-engcom-teammagento-engcom-team
committed
ENGCOM-3572: added config for catalog review in frontend #18895
- Merge Pull Request #18895 from torhoehn/magento2:feature/review-config - Merged commits: 1. ca9f63b 2. ca4128c 3. 42dd7a6
2 parents 3fd7a20 + 42dd7a6 commit d45f2e3

File tree

411 files changed

+6197
-3550
lines changed

Some content is hidden

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

411 files changed

+6197
-3550
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/*

‎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/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
}

‎app/code/Magento/Backend/Block/System/Store/Delete/Form.php

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,35 @@
55
*/
66
namespace Magento\Backend\Block\System\Store\Delete;
77

8+
use Magento\Backup\Helper\Data as BackupHelper;
9+
use Magento\Framework\App\ObjectManager;
10+
811
/**
912
* Adminhtml cms block edit form
1013
*
1114
* @author Magento Core Team <[email protected]>
1215
*/
1316
class Form extends \Magento\Backend\Block\Widget\Form\Generic
1417
{
18+
/**
19+
* @var BackupHelper
20+
*/
21+
private $backup;
22+
23+
/**
24+
* @inheritDoc
25+
*/
26+
public function __construct(
27+
\Magento\Backend\Block\Template\Context $context,
28+
\Magento\Framework\Registry $registry,
29+
\Magento\Framework\Data\FormFactory $formFactory,
30+
array $data = [],
31+
?BackupHelper $backup = null
32+
) {
33+
parent::__construct($context, $registry, $formFactory, $data);
34+
$this->backup = $backup ?? ObjectManager::getInstance()->get(BackupHelper::class);
35+
}
36+
1537
/**
1638
* Init form
1739
*
@@ -25,7 +47,7 @@ protected function _construct()
2547
}
2648

2749
/**
28-
* {@inheritdoc}
50+
* @inheritDoc
2951
*/
3052
protected function _prepareForm()
3153
{
@@ -45,15 +67,21 @@ protected function _prepareForm()
4567

4668
$fieldset->addField('item_id', 'hidden', ['name' => 'item_id', 'value' => $dataObject->getId()]);
4769

70+
$backupOptions = ['0' => __('No')];
71+
$backupSelected = '0';
72+
if ($this->backup->isEnabled()) {
73+
$backupOptions['1'] = __('Yes');
74+
$backupSelected = '1';
75+
}
4876
$fieldset->addField(
4977
'create_backup',
5078
'select',
5179
[
5280
'label' => __('Create DB Backup'),
5381
'title' => __('Create DB Backup'),
5482
'name' => 'create_backup',
55-
'options' => ['1' => __('Yes'), '0' => __('No')],
56-
'value' => '1'
83+
'options' => $backupOptions,
84+
'value' => $backupSelected
5785
]
5886
);
5987

‎app/code/Magento/Backend/Controller/Adminhtml/System/Store.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* Store controller
1515
*
1616
* @author Magento Core Team <[email protected]>
17+
* @SuppressWarnings(PHPMD.AllPurposeAction)
1718
*/
1819
abstract class Store extends Action
1920
{
@@ -86,6 +87,8 @@ protected function createPage()
8687
* Backup database
8788
*
8889
* @return bool
90+
*
91+
* @deprecated Backup module is to be removed.
8992
*/
9093
protected function _backupDatabase()
9194
{

‎app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ $permissions = $block->getData('permissions');
1111
?>
1212
<?php if ($permissions && $permissions->hasAccessToAdditionalActions()): ?>
1313
<div class="additional-cache-management">
14+
<h2>
15+
<span><?= $block->escapeHtml(__('Additional Cache Management')); ?></span>
16+
</h2>
1417
<?php if ($permissions->hasAccessToFlushCatalogImages()): ?>
15-
<h2>
16-
<span><?= $block->escapeHtml(__('Additional Cache Management')); ?></span>
17-
</h2>
1818
<p>
1919
<button onclick="setLocation('<?= $block->escapeJs($block->getCleanImagesUrl()); ?>')" type="button">
2020
<?= $block->escapeHtml(__('Flush Catalog Images Cache')); ?>

‎app/code/Magento/Backup/Controller/Adminhtml/Index.php

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@
77

88
use Magento\Backend\App\Action;
99
use Magento\Framework\App\Action\HttpGetActionInterface;
10+
use Magento\Backup\Helper\Data as Helper;
11+
use Magento\Framework\App\ObjectManager;
1012

1113
/**
1214
* Backup admin controller
1315
*
1416
* @author Magento Core Team <[email protected]>
1517
* @api
1618
* @since 100.0.2
19+
* @SuppressWarnings(PHPMD.AllPurposeAction)
1720
*/
1821
abstract class Index extends Action implements HttpGetActionInterface
1922
{
@@ -51,27 +54,47 @@ abstract class Index extends Action implements HttpGetActionInterface
5154
*/
5255
protected $maintenanceMode;
5356

57+
/**
58+
* @var Helper
59+
*/
60+
private $helper;
61+
5462
/**
5563
* @param \Magento\Backend\App\Action\Context $context
5664
* @param \Magento\Framework\Registry $coreRegistry
5765
* @param \Magento\Framework\Backup\Factory $backupFactory
5866
* @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
5967
* @param \Magento\Backup\Model\BackupFactory $backupModelFactory
6068
* @param \Magento\Framework\App\MaintenanceMode $maintenanceMode
69+
* @param Helper|null $helper
6170
*/
6271
public function __construct(
6372
\Magento\Backend\App\Action\Context $context,
6473
\Magento\Framework\Registry $coreRegistry,
6574
\Magento\Framework\Backup\Factory $backupFactory,
6675
\Magento\Framework\App\Response\Http\FileFactory $fileFactory,
6776
\Magento\Backup\Model\BackupFactory $backupModelFactory,
68-
\Magento\Framework\App\MaintenanceMode $maintenanceMode
77+
\Magento\Framework\App\MaintenanceMode $maintenanceMode,
78+
?Helper $helper = null
6979
) {
7080
$this->_coreRegistry = $coreRegistry;
7181
$this->_backupFactory = $backupFactory;
7282
$this->_fileFactory = $fileFactory;
7383
$this->_backupModelFactory = $backupModelFactory;
7484
$this->maintenanceMode = $maintenanceMode;
85+
$this->helper = $helper ?? ObjectManager::getInstance()->get(Helper::class);
7586
parent::__construct($context);
7687
}
88+
89+
/**
90+
* @inheritDoc
91+
*/
92+
public function dispatch(\Magento\Framework\App\RequestInterface $request)
93+
{
94+
if (!$this->helper->isEnabled()) {
95+
return $this->_redirect('*/*/disabled');
96+
}
97+
98+
return parent::dispatch($request);
99+
}
77100
}

‎app/code/Magento/Backup/Controller/Adminhtml/Index/Disabled.php

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
declare(strict_types=1);
8+
9+
namespace Magento\Backup\Controller\Adminhtml\Index;
10+
11+
use Magento\Backend\App\Action;
12+
use Magento\Backend\App\Action\Context;
13+
use Magento\Framework\App\Action\HttpGetActionInterface;
14+
use Magento\Framework\View\Result\PageFactory;
15+
16+
/**
17+
* Inform that backup is disabled.
18+
*/
19+
class Disabled extends Action implements HttpGetActionInterface
20+
{
21+
/**
22+
* @see _isAllowed()
23+
*/
24+
const ADMIN_RESOURCE = 'Magento_Backend::backup';
25+
26+
/**
27+
* @var PageFactory
28+
*/
29+
private $pageFactory;
30+
31+
/**
32+
* @param Context $context
33+
* @param PageFactory $pageFactory
34+
*/
35+
public function __construct(Context $context, PageFactory $pageFactory)
36+
{
37+
parent::__construct($context);
38+
$this->pageFactory = $pageFactory;
39+
}
40+
41+
/**
42+
* @inheritDoc
43+
*/
44+
public function execute()
45+
{
46+
return $this->pageFactory->create();
47+
}
48+
}

‎app/code/Magento/Backup/Cron/SystemBackup.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
use Magento\Framework\App\Filesystem\DirectoryList;
99
use Magento\Store\Model\ScopeInterface;
1010

11+
/**
12+
* Performs scheduled backup.
13+
*/
1114
class SystemBackup
1215
{
1316
const XML_PATH_BACKUP_ENABLED = 'system/backup/enabled';
@@ -101,6 +104,10 @@ public function __construct(
101104
*/
102105
public function execute()
103106
{
107+
if (!$this->_backupData->isEnabled()) {
108+
return $this;
109+
}
110+
104111
if (!$this->_scopeConfig->isSetFlag(self::XML_PATH_BACKUP_ENABLED, ScopeInterface::SCOPE_STORE)) {
105112
return $this;
106113
}

‎app/code/Magento/Backup/Helper/Data.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
7+
declare(strict_types=1);
8+
69
namespace Magento\Backup\Helper;
710

811
use Magento\Framework\App\Filesystem\DirectoryList;
@@ -285,4 +288,14 @@ public function extractDataFromFilename($filename)
285288

286289
return $result;
287290
}
291+
292+
/**
293+
* Is backup functionality enabled.
294+
*
295+
* @return bool
296+
*/
297+
public function isEnabled(): bool
298+
{
299+
return $this->scopeConfig->isSetFlag('system/backup/functionality_enabled');
300+
}
288301
}

0 commit comments

Comments
 (0)