Skip to content

Commit 7ac4278

Browse files
magento-teammagento-team
committed
2.0.0.0-dev79
* Tax calculation updates: * Fixed issues in tax calculation rounding with discount applied * Fixed an issue with extra penny when exact tax amount ended with 0.5 cent * Fixed an issue where there were tax calculation errors when customer tax rate was different from store tax rate * Added support to round tax at individual tax rate * Fixed price inconsistencies between catalog and shopping cart * Added support for maintaining consistent price including tax for customers with different tax rates * Added support for applying tax rules with different priorities to subtotal only * Fixed bugs: * Removed the extra '%' sign in the error\notice message on Gift Card Accounts page on the backend * Fixed an issue with image uploading functionality in the Catalog configuration * Fixed an issue where a customer could not navigate the store when downloading the downloadable product * Fixed an issue where adding CMS block Catalog Events Lister caused an error * Fixed an issue where the price was displayed twice on the Product page on the frontend * Fixed an issue where an admin could not open search results on the backend * Fixed an issue where the Rule Based Product Relations functionality was generating incorrect SQL when product category attribute was set through "is one of" or "contains" operator by constant value * Fixed an issue where it was impossible to add a product to the Compare list for categories with three-column page layout * Fixed an issue where a blank page opened when changing store view on a product page on the frontend * Fixed an issue where the "Please specify at least one search term." error message was not displayed if search is performed without search data specified on the frontend * Fixed a Google Chrome specific issue where page layout was broken when updating status for reviews on the backend * Fixed admin look and feel issues * Fixed an issue where the order notices and error messages were not red * Fixed a UI issue which appeared during custom attribute creation * Fixed an issue where the popup did not open after clicking What's this? next to the Remember Me check box when persistent shopping cart was enabled * Fixed an issue where the options of the Add Product split dropdown did not fit the page * Fixed an issue where the default theme preview image sample link was missing * Fixed a Safari and Internet Explorer 9 specific issue where the backend menu is not displayed for users with custom admin roles * Fixed an issue where the price of bundle products was not displayed correctly on the product page on the frontend * Fixed a UI issue in the debug mode configuration * Fixed minor issues with page layout * Fixed an issue where the mini shopping cart loaded data from cache * Fixed an issue where there was an incorrect value in the Grand Total (Base) column in the Orders grid if Catalog Price Scope was set to Website * Fixed an issue where the Entity Generator tool did not accept the "class" parameter * Fixed an issue where the default email template was not applied when the custom template in use was deleted * Fixed an issue where shipping price for flat rate was set to 0 in the side block during checkout of a product with a configured recurring profile * Fixed an issue where it was possible to create more Shipping Labels than there were products in the shipment * Fixed an issue where data about "SHA-IN Pass Phrase" was missing after changing "Payment Action" in the Ogone payment method configuration * Fixed performance issues with reindexing of the Price indexer * Fixed an issue where importing tax rates with postal code = * led to incorrect data entered into database * Fixed an issue where incorrect link to reset password was sent if secure URL was used on the frontend * Fixed an issue where the Links section was absent while editing downloadable products from the Wishlist * Fixed an issue where specified details for composite products were lost after adding to Gift Card and Downloadable products to the Wishlist * Fixed and issue where the Date widget was set to incorrect date when creating a new customer * Fixed an issue where a customer was redirected to Dashboard if the Redirect user to dashboard after login option was set to No * Fixed an issue where a customer was not able to register during checkout if Guest Checkout was not allowed * Fixed an issue where System logs were not generated properly in integration tests * Fixed benchmarking script * Fixed an issue where it was impossible to put store to the maintenance mode during backup * Fixed insecure use of mt_rand() * Fixed an issue where Quoted price was displayed incorrectly from the shopping cart in the backend * Functional tests: * Tax Rule Creation * Admin User Roe Creation * Simple Product Creation * Customer Group Creation * Update Backend Customer * Newsletter Creation * Updated composer.json.dist to download and install MTF from Public GitHub repository * GitHub requests: * [magento#542] (magento#542) Fix ImportExport bug which occurs while importing multiple rows per entity * [magento#507] (magento#507) "Insert Image" window is overlapped on menu
1 parent f78121f commit 7ac4278

File tree

401 files changed

+17128
-4350
lines changed

Some content is hidden

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

401 files changed

+17128
-4350
lines changed

‎CHANGELOG.md

Lines changed: 65 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,67 @@
1+
2.0.0.0-dev79
2+
=============
3+
* Tax calculation updates:
4+
* Fixed issues in tax calculation rounding with discount applied
5+
* Fixed an issue with extra penny when exact tax amount ended with 0.5 cent
6+
* Fixed an issue where there were tax calculation errors when customer tax rate was different from store tax rate
7+
* Added support to round tax at individual tax rate
8+
* Fixed price inconsistencies between catalog and shopping cart
9+
* Added support for maintaining consistent price including tax for customers with different tax rates
10+
* Added support for applying tax rules with different priorities to subtotal only
11+
* Fixed bugs:
12+
* Removed the extra '%' sign in the error\notice message on Gift Card Accounts page on the backend
13+
* Fixed an issue with image uploading functionality in the Catalog configuration
14+
* Fixed an issue where a customer could not navigate the store when downloading the downloadable product
15+
* Fixed an issue where adding CMS block Catalog Events Lister caused an error
16+
* Fixed an issue where the price was displayed twice on the Product page on the frontend
17+
* Fixed an issue where an admin could not open search results on the backend
18+
* Fixed an issue where the Rule Based Product Relations functionality was generating incorrect SQL when product category attribute was set through "is one of" or "contains" operator by constant value
19+
* Fixed an issue where it was impossible to add a product to the Compare list for categories with three-column page layout
20+
* Fixed an issue where a blank page opened when changing store view on a product page on the frontend
21+
* Fixed an issue where the "Please specify at least one search term." error message was not displayed if search is performed without search data specified on the frontend
22+
* Fixed a Google Chrome specific issue where page layout was broken when updating status for reviews on the backend
23+
* Fixed admin look and feel issues
24+
* Fixed an issue where the order notices and error messages were not red
25+
* Fixed a UI issue which appeared during custom attribute creation
26+
* Fixed an issue where the popup did not open after clicking What's this? next to the Remember Me check box when persistent shopping cart was enabled
27+
* Fixed an issue where the options of the Add Product split dropdown did not fit the page
28+
* Fixed an issue where the default theme preview image sample link was missing
29+
* Fixed a Safari and Internet Explorer 9 specific issue where the backend menu is not displayed for users with custom admin roles
30+
* Fixed an issue where the price of bundle products was not displayed correctly on the product page on the frontend
31+
* Fixed a UI issue in the debug mode configuration
32+
* Fixed minor issues with page layout
33+
* Fixed an issue where the mini shopping cart loaded data from cache
34+
* Fixed an issue where there was an incorrect value in the Grand Total (Base) column in the Orders grid if Catalog Price Scope was set to Website
35+
* Fixed an issue where the Entity Generator tool did not accept the "class" parameter
36+
* Fixed an issue where the default email template was not applied when the custom template in use was deleted
37+
* Fixed an issue where shipping price for flat rate was set to 0 in the side block during checkout of a product with a configured recurring profile
38+
* Fixed an issue where it was possible to create more Shipping Labels than there were products in the shipment
39+
* Fixed an issue where data about "SHA-IN Pass Phrase" was missing after changing "Payment Action" in the Ogone payment method configuration
40+
* Fixed performance issues with reindexing of the Price indexer
41+
* Fixed an issue where importing tax rates with postal code = * led to incorrect data entered into database
42+
* Fixed an issue where incorrect link to reset password was sent if secure URL was used on the frontend
43+
* Fixed an issue where the Links section was absent while editing downloadable products from the Wishlist
44+
* Fixed an issue where specified details for composite products were lost after adding to Gift Card and Downloadable products to the Wishlist
45+
* Fixed and issue where the Date widget was set to incorrect date when creating a new customer
46+
* Fixed an issue where a customer was redirected to Dashboard if the Redirect user to dashboard after login option was set to ‘No’
47+
* Fixed an issue where a customer was not able to register during checkout if Guest Checkout was not allowed
48+
* Fixed an issue where System logs were not generated properly in integration tests
49+
* Fixed benchmarking script
50+
* Fixed an issue where it was impossible to put store to the maintenance mode during backup
51+
* Fixed insecure use of mt_rand()
52+
* Fixed an issue where Quoted price was displayed incorrectly from the shopping cart in the backend
53+
* Functional tests:
54+
* Tax Rule Creation
55+
* Admin User Roe Creation
56+
* Simple Product Creation
57+
* Customer Group Creation
58+
* Update Backend Customer
59+
* Newsletter Creation
60+
* Updated composer.json.dist to download and install MTF from Public GitHub repository
61+
* GitHub requests:
62+
* [#542] (https://github.com/magento/magento2/pull/542) Fix ImportExport bug which occurs while importing multiple rows per entity
63+
* [#507] (https://github.com/magento/magento2/issues/507) "Insert Image" window is overlapped on menu
64+
165
2.0.0.0-dev78
266
=============
367
* Fixed bugs:
@@ -158,7 +222,7 @@
158222
* `lib/Magento/Framework/Data/Form/Element/Submit.php`
159223
* `lib/Magento/Framework/Data/Form/Element/Text.php`
160224
* `lib/Magento/Framework/Data/Form/Element/Textarea.php`
161-
225+
162226
2.0.0.0-dev75
163227
=============
164228
* Modularity improvements:
@@ -2678,4 +2742,3 @@ Deprecated code & minor fixes update:
26782742
2.0.0.0-dev01
26792743
=============
26802744
* Added initial version of Magento 2.x CE to public repository
2681-

‎app/bootstrap.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,10 @@
7272
}
7373

7474
if (!defined('BARE_BOOTSTRAP')) {
75-
if (file_exists(BP . '/maintenance.flag')) {
76-
77-
if (!in_array($_SERVER['REMOTE_ADDR'], explode(",", file_get_contents(BP . '/maintenance.flag')))) {
75+
$maintenanceFlag = BP . '/' . \Magento\Framework\App\State\MaintenanceMode::FLAG_DIR . '/'
76+
. \Magento\Framework\App\State\MaintenanceMode::FLAG_FILENAME;
77+
if (file_exists($maintenanceFlag)) {
78+
if (!in_array($_SERVER['REMOTE_ADDR'], explode(",", file_get_contents($maintenanceFlag)))) {
7879
if (PHP_SAPI == 'cli') {
7980
echo 'Service temporarily unavailable due to maintenance downtime.';
8081
} else {

‎app/code/Magento/Backend/Block/System/Config/Form/Field/Image.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727
*/
2828
namespace Magento\Backend\Block\System\Config\Form\Field;
2929

30+
/**
31+
* Class Image Field
32+
* @method getFieldConfig()
33+
* @method setFieldConfig()
34+
*/
3035
class Image extends \Magento\Framework\Data\Form\Element\Image
3136
{
3237
/**
@@ -39,10 +44,10 @@ protected function _getUrl()
3944
$url = parent::_getUrl();
4045
$config = $this->getFieldConfig();
4146
/* @var $config array */
42-
if (array_key_exists('base_url', $config)) {
47+
if (isset($config['base_url'])) {
4348
$element = $config['base_url'];
4449
$urlType = empty($element['type']) ? 'link' : (string)$element['type'];
45-
$url = $this->_urlBuilder->getBaseUrl($urlType) . $element['value'] . '/' . $url;
50+
$url = $this->_urlBuilder->getBaseUrl(['_type' => $urlType]) . $element['value'] . '/' . $url;
4651
}
4752
return $url;
4853
}

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
5757
/**
5858
* @var \Magento\Directory\Model\Currency
5959
*/
60-
protected $_baseCurrency;
60+
protected $_defaultBaseCurrency;
6161

6262
/**
6363
* @var \Magento\Framework\Locale\CurrencyInterface
@@ -84,11 +84,11 @@ public function __construct(
8484
$this->_storeManager = $storeManager;
8585
$this->_currencyLocator = $currencyLocator;
8686
$this->_localeCurrency = $localeCurrency;
87-
$baseCurrencyCode = $this->_scopeConfig->getValue(
87+
$defaultBaseCurrencyCode = $this->_scopeConfig->getValue(
8888
\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
8989
'default'
9090
);
91-
$this->_baseCurrency = $currencyFactory->create()->load($baseCurrencyCode);
91+
$this->_defaultBaseCurrency = $currencyFactory->create()->load($defaultBaseCurrencyCode);
9292
}
9393

9494
/**
@@ -142,7 +142,7 @@ protected function _getRate($row)
142142
if ($rate = $row->getData($this->getColumn()->getRateField())) {
143143
return floatval($rate);
144144
}
145-
return $this->_baseCurrency->getRate($this->_getCurrencyCode($row));
145+
return $this->_defaultBaseCurrency->getRate($this->_getCurrencyCode($row));
146146
}
147147

148148
/**

‎app/code/Magento/Backend/etc/adminhtml/di.xml

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -51,40 +51,8 @@
5151
<argument name="sessionName" xsi:type="string">adminhtml</argument>
5252
</arguments>
5353
</type>
54-
<type name="Magento\Backend\Model\Config\Structure\Data">
55-
<arguments>
56-
<argument name="cacheId" xsi:type="string">backend_system_configuration_structure</argument>
57-
</arguments>
58-
</type>
5954
<type name="Magento\Backend\Model\Config\Structure\Element\Iterator\Tab" shared="false" />
6055
<type name="Magento\Backend\Model\Config\Structure\Element\Iterator\Section" shared="false" />
61-
<type name="Magento\Backend\Model\Config\Structure\Element\Iterator\Group" shared="false" />
62-
<type name="Magento\Backend\Model\Config\Structure\Element\Iterator\Field" shared="false">
63-
<arguments>
64-
<argument name="groupFlyweight" xsi:type="object">Magento\Backend\Model\Config\Structure\Element\Group\Proxy</argument>
65-
</arguments>
66-
</type>
67-
<type name="Magento\Backend\Model\Config\Structure\Element\Dependency\Mapper" shared="false">
68-
<arguments>
69-
<argument name="fieldLocator" xsi:type="object">Magento\Backend\Model\Config\Structure\Search\Proxy</argument>
70-
</arguments>
71-
</type>
72-
<type name="Magento\Backend\Model\Config\Structure\Element\Tab" shared="false">
73-
<arguments>
74-
<argument name="childrenIterator" xsi:type="object">Magento\Backend\Model\Config\Structure\Element\Iterator\Section</argument>
75-
</arguments>
76-
</type>
77-
<type name="Magento\Backend\Model\Config\Structure\Element\Section" shared="false">
78-
<arguments>
79-
<argument name="childrenIterator" xsi:type="object">Magento\Backend\Model\Config\Structure\Element\Iterator\Group</argument>
80-
</arguments>
81-
</type>
82-
<type name="Magento\Backend\Model\Config\Structure\Element\Group" shared="false">
83-
<arguments>
84-
<argument name="childrenIterator" xsi:type="object">Magento\Backend\Model\Config\Structure\Element\Iterator\Field</argument>
85-
</arguments>
86-
</type>
87-
<type name="Magento\Backend\Model\Config\Structure\Element\Group\Proxy" shared="false" />
8856
<type name="Magento\Framework\View\Layout">
8957
<arguments>
9058
<argument name="area" xsi:type="string">adminhtml</argument>

‎app/code/Magento/Backend/etc/di.xml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,4 +183,38 @@
183183
<argument name="storage" xsi:type="object">Magento\Backend\Model\Session\Quote\Storage</argument>
184184
</arguments>
185185
</type>
186+
187+
<type name="Magento\Backend\Model\Config\Structure\Element\Iterator\Group" shared="false" />
188+
<type name="Magento\Backend\Model\Config\Structure\Element\Group\Proxy" shared="false" />
189+
190+
<type name="Magento\Backend\Model\Config\Structure\Element\Dependency\Mapper" shared="false">
191+
<arguments>
192+
<argument name="fieldLocator" xsi:type="object">Magento\Backend\Model\Config\Structure\Search\Proxy</argument>
193+
</arguments>
194+
</type>
195+
<type name="Magento\Backend\Model\Config\Structure\Data">
196+
<arguments>
197+
<argument name="cacheId" xsi:type="string">backend_system_configuration_structure</argument>
198+
</arguments>
199+
</type>
200+
<type name="Magento\Backend\Model\Config\Structure\Element\Tab" shared="false">
201+
<arguments>
202+
<argument name="childrenIterator" xsi:type="object">Magento\Backend\Model\Config\Structure\Element\Iterator\Section</argument>
203+
</arguments>
204+
</type>
205+
<type name="Magento\Backend\Model\Config\Structure\Element\Section" shared="false">
206+
<arguments>
207+
<argument name="childrenIterator" xsi:type="object">Magento\Backend\Model\Config\Structure\Element\Iterator\Group</argument>
208+
</arguments>
209+
</type>
210+
<type name="Magento\Backend\Model\Config\Structure\Element\Iterator\Field" shared="false">
211+
<arguments>
212+
<argument name="groupFlyweight" xsi:type="object">Magento\Backend\Model\Config\Structure\Element\Group\Proxy</argument>
213+
</arguments>
214+
</type>
215+
<type name="Magento\Backend\Model\Config\Structure\Element\Group" shared="false">
216+
<arguments>
217+
<argument name="childrenIterator" xsi:type="object">Magento\Backend\Model\Config\Structure\Element\Iterator\Field</argument>
218+
</arguments>
219+
</type>
186220
</config>

‎app/code/Magento/Backend/view/adminhtml/page/js/calendar.phtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@
6464
showHour: false,
6565
showMinute: false,
6666
localTimezone: <?php echo $this->getTimezoneOffsetSeconds() ?>,
67-
serverTimezoneSeconds:<?php echo $this->getStoreTimestamp() ?>
67+
serverTimezoneSeconds:<?php echo $this->getStoreTimestamp() ?>,
68+
yearRange: '<?php echo $this->getYearRange() ?>'
6869
}
6970
});
7071
})(jQuery);

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,24 +52,32 @@ class Index extends \Magento\Backend\App\Action
5252
*/
5353
protected $_backupModelFactory;
5454

55+
/**
56+
* @var \Magento\Framework\App\State\MaintenanceMode
57+
*/
58+
protected $maintenanceMode;
59+
5560
/**
5661
* @param \Magento\Backend\App\Action\Context $context
5762
* @param \Magento\Framework\Registry $coreRegistry
5863
* @param \Magento\Framework\Backup\Factory $backupFactory
5964
* @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
6065
* @param \Magento\Backup\Model\BackupFactory $backupModelFactory
66+
* @param \Magento\Framework\App\State\MaintenanceMode $maintenanceMode
6167
*/
6268
public function __construct(
6369
\Magento\Backend\App\Action\Context $context,
6470
\Magento\Framework\Registry $coreRegistry,
6571
\Magento\Framework\Backup\Factory $backupFactory,
6672
\Magento\Framework\App\Response\Http\FileFactory $fileFactory,
67-
\Magento\Backup\Model\BackupFactory $backupModelFactory
73+
\Magento\Backup\Model\BackupFactory $backupModelFactory,
74+
\Magento\Framework\App\State\MaintenanceMode $maintenanceMode
6875
) {
6976
$this->_coreRegistry = $coreRegistry;
7077
$this->_backupFactory = $backupFactory;
7178
$this->_fileFactory = $fileFactory;
7279
$this->_backupModelFactory = $backupModelFactory;
80+
$this->maintenanceMode = $maintenanceMode;
7381
parent::__construct($context);
7482
}
7583

@@ -150,9 +158,7 @@ public function createAction()
150158
$this->_coreRegistry->register('backup_manager', $backupManager);
151159

152160
if ($this->getRequest()->getParam('maintenance_mode')) {
153-
$turnedOn = $helper->turnOnMaintenanceMode();
154-
155-
if (!$turnedOn) {
161+
if (!$this->maintenanceMode->turnOn()) {
156162
$response->setError(
157163
__(
158164
'You need more permissions to activate maintenance mode right now.'
@@ -202,7 +208,7 @@ public function createAction()
202208
}
203209

204210
if ($this->getRequest()->getParam('maintenance_mode')) {
205-
$helper->turnOffMaintenanceMode();
211+
$this->maintenanceMode->turnOff();
206212
}
207213

208214
$this->getResponse()->setBody($response->toJson());
@@ -306,9 +312,7 @@ public function rollbackAction()
306312
}
307313

308314
if ($this->getRequest()->getParam('maintenance_mode')) {
309-
$turnedOn = $helper->turnOnMaintenanceMode();
310-
311-
if (!$turnedOn) {
315+
if (!$this->maintenanceMode->turnOn()) {
312316
$response->setError(
313317
__(
314318
'You need more permissions to activate maintenance mode right now.'
@@ -373,7 +377,7 @@ public function rollbackAction()
373377
}
374378

375379
if ($this->getRequest()->getParam('maintenance_mode')) {
376-
$helper->turnOffMaintenanceMode();
380+
$this->maintenanceMode->turnOff();
377381
}
378382

379383
$this->getResponse()->setBody($response->toJson());

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

Lines changed: 4 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
*/
2424
namespace Magento\Backup\Helper;
2525

26+
use Magento\Framework\App\State\MaintenanceMode;
27+
2628
/**
2729
* Backup data helper
2830
*/
@@ -191,7 +193,7 @@ public function getBackupIgnorePaths()
191193
return array(
192194
'.git',
193195
'.svn',
194-
'maintenance.flag',
196+
$this->_filesystem->getPath(MaintenanceMode::FLAG_DIR) . '/' . MaintenanceMode::FLAG_FILENAME,
195197
$this->_filesystem->getPath(\Magento\Framework\App\Filesystem::SESSION_DIR),
196198
$this->_filesystem->getPath(\Magento\Framework\App\Filesystem::CACHE_DIR),
197199
$this->_filesystem->getPath(\Magento\Framework\App\Filesystem::LOG_DIR),
@@ -211,7 +213,7 @@ public function getRollbackIgnorePaths()
211213
return array(
212214
'.svn',
213215
'.git',
214-
'maintenance.flag',
216+
$this->_filesystem->getPath(MaintenanceMode::FLAG_DIR) . '/' . MaintenanceMode::FLAG_FILENAME,
215217
$this->_filesystem->getPath(\Magento\Framework\App\Filesystem::SESSION_DIR),
216218
$this->_filesystem->getPath(\Magento\Framework\App\Filesystem::LOG_DIR),
217219
$this->_filesystem->getPath(\Magento\Framework\App\Filesystem::VAR_DIR) . '/locks',
@@ -221,35 +223,6 @@ public function getRollbackIgnorePaths()
221223
);
222224
}
223225

224-
/**
225-
* Put store into maintenance mode
226-
*
227-
* @return bool
228-
*/
229-
public function turnOnMaintenanceMode()
230-
{
231-
$maintenanceFlagFile = $this->getMaintenanceFlagFilePath();
232-
$result = $this->_filesystem->getDirectoryWrite(
233-
\Magento\Framework\App\Filesystem::ROOT_DIR
234-
)->writeFile(
235-
$maintenanceFlagFile,
236-
'maintenance'
237-
);
238-
239-
return $result !== false;
240-
}
241-
242-
/**
243-
* Turn off store maintenance mode
244-
*
245-
* @return void
246-
*/
247-
public function turnOffMaintenanceMode()
248-
{
249-
$maintenanceFlagFile = $this->getMaintenanceFlagFilePath();
250-
$this->_filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem::ROOT_DIR)->delete($maintenanceFlagFile);
251-
}
252-
253226
/**
254227
* Get backup create success message by backup type
255228
*
@@ -274,16 +247,6 @@ public function getCreateSuccessMessageByType($type)
274247
return $messagesMap[$type];
275248
}
276249

277-
/**
278-
* Get path to maintenance flag file
279-
*
280-
* @return string
281-
*/
282-
protected function getMaintenanceFlagFilePath()
283-
{
284-
return 'maintenance.flag';
285-
}
286-
287250
/**
288251
* Invalidate Cache
289252
*

0 commit comments

Comments
 (0)