Skip to content

Commit e038c3c

Browse files
mazhalaimazhalai
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-23407-memory-usage
2 parents f81cd43 + 20314b9 commit e038c3c

File tree

253 files changed

+4296
-1679
lines changed

Some content is hidden

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

253 files changed

+4296
-1679
lines changed

‎Gruntfile.js

Lines changed: 81 additions & 620 deletions
Large diffs are not rendered by default.

‎app/code/Magento/AdminNotification/Model/System/Message/Media/AbstractSynchronization.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
abstract class AbstractSynchronization implements \Magento\Framework\Notification\MessageInterface
99
{
1010
/**
11-
* @var \Magento\Core\Model\File\Storage\Flag
11+
* @var \Magento\MediaStorage\Model\File\Storage\Flag
1212
*/
1313
protected $_syncFlag;
1414

@@ -27,9 +27,9 @@ abstract class AbstractSynchronization implements \Magento\Framework\Notificatio
2727
protected $_isDisplayed = null;
2828

2929
/**
30-
* @param \Magento\Core\Model\File\Storage\Flag $fileStorage
30+
* @param \Magento\MediaStorage\Model\File\Storage\Flag $fileStorage
3131
*/
32-
public function __construct(\Magento\Core\Model\File\Storage\Flag $fileStorage)
32+
public function __construct(\Magento\MediaStorage\Model\File\Storage\Flag $fileStorage)
3333
{
3434
$this->_syncFlag = $fileStorage->loadSelf();
3535
}
@@ -61,7 +61,7 @@ public function isDisplayed()
6161
if (null === $this->_isDisplayed) {
6262
$output = $this->_shouldBeDisplayed();
6363
if ($output) {
64-
$this->_syncFlag->setState(\Magento\Core\Model\File\Storage\Flag::STATE_NOTIFIED);
64+
$this->_syncFlag->setState(\Magento\MediaStorage\Model\File\Storage\Flag::STATE_NOTIFIED);
6565
$this->_syncFlag->save();
6666
}
6767
$this->_isDisplayed = $output;

‎app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ protected function _shouldBeDisplayed()
2424
$state = $this->_syncFlag->getState();
2525
$data = $this->_syncFlag->getFlagData();
2626
$hasErrors = isset($data['has_errors']) && true == $data['has_errors'] ? true : false;
27-
return false == $hasErrors && \Magento\Core\Model\File\Storage\Flag::STATE_FINISHED == $state;
27+
return false == $hasErrors && \Magento\MediaStorage\Model\File\Storage\Flag::STATE_FINISHED == $state;
2828
}
2929

3030
/**

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"require": {
55
"php": "~5.5.0|~5.6.0",
66
"magento/module-store": "0.42.0-beta10",
7-
"magento/module-core": "0.42.0-beta10",
87
"magento/module-backend": "0.42.0-beta10",
8+
"magento/module-media-storage": "0.42.0-beta10",
99
"magento/framework": "0.42.0-beta10",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"

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

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,10 @@
200200
<label>Merge JavaScript Files</label>
201201
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
202202
</field>
203+
<field id="enable_js_bundling" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
204+
<label>Enable Javascript Bundling</label>
205+
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
206+
</field>
203207
<field id="minify_files" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
204208
<label>Minify JavaScript Files</label>
205209
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
@@ -349,28 +353,6 @@
349353
</depends>
350354
</field>
351355
</group>
352-
<group id="media_storage_configuration" translate="label" type="text" sortOrder="900" showInDefault="1" showInWebsite="1" showInStore="1">
353-
<label>Storage Configuration for Media</label>
354-
<field id="media_storage" translate="label" type="select" sortOrder="100" showInDefault="1" showInWebsite="0" showInStore="0">
355-
<label>Media Storage</label>
356-
<source_model>Magento\Config\Model\Config\Source\Storage\Media\Storage</source_model>
357-
</field>
358-
<field id="media_database" translate="label" type="select" sortOrder="200" showInDefault="1" showInWebsite="0" showInStore="0">
359-
<label>Select Media Database</label>
360-
<source_model>Magento\Config\Model\Config\Source\Storage\Media\Database</source_model>
361-
<backend_model>Magento\Config\Model\Config\Backend\Storage\Media\Database</backend_model>
362-
<depends>
363-
<field id="media_storage">1</field>
364-
</depends>
365-
</field>
366-
<field id="synchronize" translate="label comment" type="button" sortOrder="300" showInDefault="1" showInWebsite="0" showInStore="0">
367-
<frontend_model>Magento\Config\Block\System\Config\System\Storage\Media\Synchronize</frontend_model>
368-
<comment>After selecting a new media storage location, press the Synchronize button to transfer all media to that location. Media will not be available in the new location until the synchronization process is complete.</comment>
369-
</field>
370-
<field id="configuration_update_time" translate="label" type="text" sortOrder="400" showInDefault="1" showInWebsite="0" showInStore="0">
371-
<label>Environment Update Time</label>
372-
</field>
373-
</group>
374356
</section>
375357
<section id="admin" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
376358
<label>Admin</label>

‎app/code/Magento/Backend/view/adminhtml/layout/default.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
99
<head>
1010
<title>Magento Admin</title>
11-
<link src="legacy-build.min.js"/>
1211
<link src="requirejs/require.js"/>
13-
<link src="jquery.js"/>
1412
<css src="mage/calendar.css"/>
1513
<css src="extjs/resources/css/ext-all.css"/>
1614
<css src="extjs/resources/css/ytheme-magento.css"/>

‎app/code/Magento/Bundle/Model/Product/Type.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
144144
* @param \Magento\Eav\Model\Config $eavConfig
145145
* @param \Magento\Catalog\Model\Product\Type $catalogProductType
146146
* @param \Magento\Framework\Event\ManagerInterface $eventManager
147-
* @param \Magento\Core\Helper\File\Storage\Database $fileStorageDb
147+
* @param \Magento\MediaStorage\Helper\File\Storage\Database $fileStorageDb
148148
* @param \Magento\Framework\Filesystem $filesystem
149149
* @param \Magento\Framework\Registry $coreRegistry
150150
* @param \Psr\Log\LoggerInterface $logger
@@ -169,7 +169,7 @@ public function __construct(
169169
\Magento\Eav\Model\Config $eavConfig,
170170
\Magento\Catalog\Model\Product\Type $catalogProductType,
171171
\Magento\Framework\Event\ManagerInterface $eventManager,
172-
\Magento\Core\Helper\File\Storage\Database $fileStorageDb,
172+
\Magento\MediaStorage\Helper\File\Storage\Database $fileStorageDb,
173173
\Magento\Framework\Filesystem $filesystem,
174174
\Magento\Framework\Registry $coreRegistry,
175175
\Psr\Log\LoggerInterface $logger,

‎app/code/Magento/Bundle/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-config": "0.42.0-beta10",
76
"magento/module-store": "0.42.0-beta10",
87
"magento/module-catalog": "0.42.0-beta10",
98
"magento/module-tax": "0.42.0-beta10",
10-
"magento/module-core": "0.42.0-beta10",
119
"magento/module-backend": "0.42.0-beta10",
1210
"magento/module-sales": "0.42.0-beta10",
1311
"magento/module-checkout": "0.42.0-beta10",
1412
"magento/module-catalog-inventory": "0.42.0-beta10",
1513
"magento/module-customer": "0.42.0-beta10",
1614
"magento/module-catalog-rule": "0.42.0-beta10",
1715
"magento/module-eav": "0.42.0-beta10",
16+
"magento/module-config": "0.42.0-beta10",
1817
"magento/module-gift-message": "0.42.0-beta10",
1918
"magento/framework": "0.42.0-beta10",
2019
"magento/module-quote": "0.42.0-beta10",
20+
"magento/module-media-storage": "0.42.0-beta10",
2121
"magento/magento-composer-installer": "*"
2222
},
2323
"suggest": {

‎app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@
9898
<script>
9999
require([
100100
'jquery',
101-
'mage/template'
101+
'mage/template',
102+
'prototype'
102103
], function(jQuery, mageTemplate){
103104
var bundleTemplateBox = jQuery('#bundle-option-selection-box-template').html(),
104105
bundleTemplateRow = jQuery('#bundle-option-selection-row-template').html();

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ protected function _isAllowed()
4141
public function execute()
4242
{
4343
try {
44-
$uploader = $this->_objectManager->create('Magento\Core\Model\File\Uploader', ['fileId' => 'image']);
44+
$uploader = $this->_objectManager->create(
45+
'Magento\MediaStorage\Model\File\Uploader',
46+
['fileId' => 'image']
47+
);
4548
$uploader->setAllowedExtensions(['jpg', 'jpeg', 'gif', 'png']);
4649
/** @var \Magento\Framework\Image\Adapter\AdapterInterface $imageAdapter */
4750
$imageAdapter = $this->_objectManager->get('Magento\Framework\Image\AdapterFactory')->create();

0 commit comments

Comments
 (0)