Skip to content

Commit 20314b9

Browse files
AndriyNasinnykAndriyNasinnyk
committed
Merge pull request #122 from magento-south/MAGETWO-33401
[South] JS Bundling, bug with logger and bug with luma template
2 parents 2c52e17 + 054c3ea commit 20314b9

File tree

250 files changed

+4262
-1672
lines changed

Some content is hidden

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

250 files changed

+4262
-1672
lines changed

‎Gruntfile.js

+81-620
Large diffs are not rendered by default.

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

+4-4
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

+1-1
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

+1-1
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

+4-22
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

-2
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

+2-2
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

+2-2
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

+2-1
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

+4-1
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();

‎app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
class Image extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
1717
{
1818
/**
19-
* @var \Magento\Core\Model\File\UploaderFactory
19+
* @var \Magento\MediaStorage\Model\File\UploaderFactory
2020
*/
2121
protected $_uploaderFactory;
2222

@@ -30,7 +30,7 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
3030
/**
3131
* File Uploader factory
3232
*
33-
* @var \Magento\Core\Model\File\UploaderFactory
33+
* @var \Magento\MediaStorage\Model\File\UploaderFactory
3434
*/
3535
protected $_fileUploaderFactory;
3636

@@ -44,12 +44,12 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
4444
*
4545
* @param \Psr\Log\LoggerInterface $logger
4646
* @param \Magento\Framework\Filesystem $filesystem
47-
* @param \Magento\Core\Model\File\UploaderFactory $fileUploaderFactory
47+
* @param \Magento\MediaStorage\Model\File\UploaderFactory $fileUploaderFactory
4848
*/
4949
public function __construct(
5050
\Psr\Log\LoggerInterface $logger,
5151
\Magento\Framework\Filesystem $filesystem,
52-
\Magento\Core\Model\File\UploaderFactory $fileUploaderFactory
52+
\Magento\MediaStorage\Model\File\UploaderFactory $fileUploaderFactory
5353
) {
5454
$this->_filesystem = $filesystem;
5555
$this->_fileUploaderFactory = $fileUploaderFactory;
@@ -84,7 +84,7 @@ public function afterSave($object)
8484
);
8585

8686
try {
87-
/** @var $uploader \Magento\Core\Model\File\Uploader */
87+
/** @var $uploader \Magento\MediaStorage\Model\File\Uploader */
8888
$uploader = $this->_fileUploaderFactory->create(['fileId' => $this->getAttribute()->getName()]);
8989
$uploader->setAllowedExtensions(['jpg', 'jpeg', 'gif', 'png']);
9090
$uploader->setAllowRenameFiles(true);
@@ -93,7 +93,7 @@ public function afterSave($object)
9393
$object->setData($this->getAttribute()->getName(), $result['file']);
9494
$this->getAttribute()->getEntity()->saveAttribute($object, $this->getAttribute()->getName());
9595
} catch (\Exception $e) {
96-
if ($e->getCode() != \Magento\Core\Model\File\Uploader::TMP_NAME_EMPTY) {
96+
if ($e->getCode() != \Magento\MediaStorage\Model\File\Uploader::TMP_NAME_EMPTY) {
9797
$this->_logger->critical($e);
9898
}
9999
}

‎app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media.php

+10-10
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class Media extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
5252
/**
5353
* Core file storage database
5454
*
55-
* @var \Magento\Core\Helper\File\Storage\Database
55+
* @var \Magento\MediaStorage\Helper\File\Storage\Database
5656
*/
5757
protected $_fileStorageDb = null;
5858

@@ -75,7 +75,7 @@ class Media extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
7575
*
7676
* @param \Magento\Catalog\Model\Resource\ProductFactory $productFactory
7777
* @param \Magento\Framework\Event\ManagerInterface $eventManager
78-
* @param \Magento\Core\Helper\File\Storage\Database $fileStorageDb
78+
* @param \Magento\MediaStorage\Helper\File\Storage\Database $fileStorageDb
7979
* @param \Magento\Framework\Json\Helper\Data $jsonHelper
8080
* @param \Magento\Catalog\Model\Product\Media\Config $mediaConfig
8181
* @param \Magento\Framework\Filesystem $filesystem
@@ -84,7 +84,7 @@ class Media extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
8484
public function __construct(
8585
\Magento\Catalog\Model\Resource\ProductFactory $productFactory,
8686
\Magento\Framework\Event\ManagerInterface $eventManager,
87-
\Magento\Core\Helper\File\Storage\Database $fileStorageDb,
87+
\Magento\MediaStorage\Helper\File\Storage\Database $fileStorageDb,
8888
\Magento\Framework\Json\Helper\Data $jsonHelper,
8989
\Magento\Catalog\Model\Product\Media\Config $mediaConfig,
9090
\Magento\Framework\Filesystem $filesystem,
@@ -376,16 +376,16 @@ public function addImage(
376376
throw new LocalizedException(__('Please correct the image file type.'));
377377
}
378378

379-
$fileName = \Magento\Core\Model\File\Uploader::getCorrectFileName($pathinfo['basename']);
380-
$dispretionPath = \Magento\Core\Model\File\Uploader::getDispretionPath($fileName);
379+
$fileName = \Magento\MediaStorage\Model\File\Uploader::getCorrectFileName($pathinfo['basename']);
380+
$dispretionPath = \Magento\MediaStorage\Model\File\Uploader::getDispretionPath($fileName);
381381
$fileName = $dispretionPath . '/' . $fileName;
382382

383383
$fileName = $this->_getNotDuplicatedFilename($fileName, $dispretionPath);
384384

385385
$destinationFile = $this->_mediaConfig->getTmpMediaPath($fileName);
386386

387387
try {
388-
/** @var $storageHelper \Magento\Core\Helper\File\Storage\Database */
388+
/** @var $storageHelper \Magento\MediaStorage\Helper\File\Storage\Database */
389389
$storageHelper = $this->_fileStorageDb;
390390
if ($move) {
391391
$this->_mediaDirectory->renameFile($file, $destinationFile);
@@ -636,7 +636,7 @@ protected function _moveImageFromTmp($file)
636636
}
637637
$destinationFile = $this->_getUniqueFileName($file);
638638

639-
/** @var $storageHelper \Magento\Core\Helper\File\Storage\Database */
639+
/** @var $storageHelper \Magento\MediaStorage\Helper\File\Storage\Database */
640640
$storageHelper = $this->_fileStorageDb;
641641

642642
if ($storageHelper->checkDbUsage()) {
@@ -673,7 +673,7 @@ protected function _getUniqueFileName($file)
673673
} else {
674674
$destFile = dirname(
675675
$file
676-
) . '/' . \Magento\Core\Model\File\Uploader::getNewFileName(
676+
) . '/' . \Magento\MediaStorage\Model\File\Uploader::getNewFileName(
677677
$this->_mediaDirectory->getAbsolutePath($this->_mediaConfig->getMediaPath($file))
678678
);
679679
}
@@ -751,10 +751,10 @@ public function duplicate($object)
751751
*/
752752
protected function _getNotDuplicatedFilename($fileName, $dispretionPath)
753753
{
754-
$fileMediaName = $dispretionPath . '/' . \Magento\Core\Model\File\Uploader::getNewFileName(
754+
$fileMediaName = $dispretionPath . '/' . \Magento\MediaStorage\Model\File\Uploader::getNewFileName(
755755
$this->_mediaConfig->getMediaPath($fileName)
756756
);
757-
$fileTmpMediaName = $dispretionPath . '/' . \Magento\Core\Model\File\Uploader::getNewFileName(
757+
$fileTmpMediaName = $dispretionPath . '/' . \Magento\MediaStorage\Model\File\Uploader::getNewFileName(
758758
$this->_mediaConfig->getTmpMediaPath($fileName)
759759
);
760760

‎app/code/Magento/Catalog/Model/Product/Image.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ class Image extends \Magento\Framework\Model\AbstractModel
142142
/**
143143
* Core file storage database
144144
*
145-
* @var \Magento\Core\Helper\File\Storage\Database
145+
* @var \Magento\MediaStorage\Helper\File\Storage\Database
146146
*/
147147
protected $_coreFileStorageDatabase = null;
148148

@@ -172,7 +172,7 @@ class Image extends \Magento\Framework\Model\AbstractModel
172172
* @param \Magento\Framework\Registry $registry
173173
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
174174
* @param \Magento\Catalog\Model\Product\Media\Config $catalogProductMediaConfig
175-
* @param \Magento\Core\Helper\File\Storage\Database $coreFileStorageDatabase
175+
* @param \Magento\MediaStorage\Helper\File\Storage\Database $coreFileStorageDatabase
176176
* @param \Magento\Framework\Filesystem $filesystem
177177
* @param \Magento\Framework\Image\Factory $imageFactory
178178
* @param \Magento\Framework\View\Asset\Repository $assetRepo
@@ -189,7 +189,7 @@ public function __construct(
189189
\Magento\Framework\Registry $registry,
190190
\Magento\Store\Model\StoreManagerInterface $storeManager,
191191
\Magento\Catalog\Model\Product\Media\Config $catalogProductMediaConfig,
192-
\Magento\Core\Helper\File\Storage\Database $coreFileStorageDatabase,
192+
\Magento\MediaStorage\Helper\File\Storage\Database $coreFileStorageDatabase,
193193
\Magento\Framework\Filesystem $filesystem,
194194
\Magento\Framework\Image\Factory $imageFactory,
195195
\Magento\Framework\View\Asset\Repository $assetRepo,

‎app/code/Magento/Catalog/Model/Product/Option/Type/File.php

+5-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class File extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
3636
/**
3737
* Core file storage database
3838
*
39-
* @var \Magento\Core\Helper\File\Storage\Database
39+
* @var \Magento\MediaStorage\Helper\File\Storage\Database
4040
*/
4141
protected $_coreFileStorageDatabase = null;
4242

@@ -75,7 +75,7 @@ class File extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
7575
* @param \Magento\Quote\Model\Quote\Item\OptionFactory $itemOptionFactory
7676
* @param \Magento\Catalog\Model\Product\Option\UrlBuilder $urlBuilder
7777
* @param \Magento\Framework\Escaper $escaper
78-
* @param \Magento\Core\Helper\File\Storage\Database $coreFileStorageDatabase
78+
* @param \Magento\MediaStorage\Helper\File\Storage\Database $coreFileStorageDatabase
7979
* @param File\ValidatorInfo $validatorInfo
8080
* @param File\ValidatorFile $validatorFile
8181
* @param array $data
@@ -85,7 +85,7 @@ public function __construct(
8585
\Magento\Checkout\Model\Session $checkoutSession,
8686
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
8787
\Magento\Quote\Model\Quote\Item\OptionFactory $itemOptionFactory,
88-
\Magento\Core\Helper\File\Storage\Database $coreFileStorageDatabase,
88+
\Magento\MediaStorage\Helper\File\Storage\Database $coreFileStorageDatabase,
8989
\Magento\Catalog\Model\Product\Option\Type\File\ValidatorInfo $validatorInfo,
9090
\Magento\Catalog\Model\Product\Option\Type\File\ValidatorFile $validatorFile,
9191
\Magento\Catalog\Model\Product\Option\UrlBuilder $urlBuilder,
@@ -399,6 +399,8 @@ public function getEditableOptionValue($optionValue)
399399
* @param string $optionValue
400400
* @param array $productOptionValues Values for product option
401401
* @return string|null
402+
*
403+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
402404
*/
403405
public function parseOptionValue($optionValue, $productOptionValues)
404406
{

‎app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ public function validate($processingParams, $option)
138138
if ($upload->isUploaded($file) && $upload->isValid($file)) {
139139
$extension = pathinfo(strtolower($fileInfo['name']), PATHINFO_EXTENSION);
140140

141-
$fileName = \Magento\Core\Model\File\Uploader::getCorrectFileName($fileInfo['name']);
142-
$dispersion = \Magento\Core\Model\File\Uploader::getDispretionPath($fileName);
141+
$fileName = \Magento\MediaStorage\Model\File\Uploader::getCorrectFileName($fileInfo['name']);
142+
$dispersion = \Magento\MediaStorage\Model\File\Uploader::getDispretionPath($fileName);
143143

144144
$filePath = $dispersion;
145145

0 commit comments

Comments
 (0)