Skip to content

Commit 326e3a9

Browse files
arkadiycharkadiych
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-31507-Move-Factory-And-EntityFactory-To-The-Magento-Framework
2 parents 98f59df + 46c48d3 commit 326e3a9

File tree

1,381 files changed

+8778
-4326
lines changed

Some content is hidden

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

1,381 files changed

+8778
-4326
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ atlassian*
3232
/pub/media/theme/*
3333
/pub/media/theme_customization/*
3434
!/pub/media/theme_customization/.htaccess
35+
/pub/media/wysiwyg/*
36+
!/pub/media/wysiwyg/.htaccess
3537
/pub/media/tmp/*
3638
!/pub/media/tmp/.htaccess
3739
/pub/static/*

‎CHANGELOG.md

Lines changed: 139 additions & 89 deletions
Large diffs are not rendered by default.

‎COPYING.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
22

33
http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
4-
Please see <insert file name of the OSL license> for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
4+
Please see LICENSE.txt for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
55

6-
Subject to Licensee�s payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
6+
Subject to Licensee's payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
77
Please see <insert file name of the MEE license> for the full text of the MEE License or visit http://magento.com/legal/terms/enterprise.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta3",
7-
"magento/module-core": "0.42.0-beta3",
8-
"magento/module-backend": "0.42.0-beta3",
9-
"magento/framework": "0.42.0-beta3",
6+
"magento/module-store": "0.42.0-beta4",
7+
"magento/module-core": "0.42.0-beta4",
8+
"magento/module-backend": "0.42.0-beta4",
9+
"magento/framework": "0.42.0-beta4",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta3",
14+
"version": "0.42.0-beta4",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.42.0-beta3",
7-
"magento/framework": "0.42.0-beta3",
6+
"magento/module-backend": "0.42.0-beta4",
7+
"magento/framework": "0.42.0-beta4",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.42.0-beta3",
11+
"version": "0.42.0-beta4",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta3",
7-
"magento/module-directory": "0.42.0-beta3",
8-
"magento/module-core": "0.42.0-beta3",
9-
"magento/module-eav": "0.42.0-beta3",
10-
"magento/module-cron": "0.42.0-beta3",
11-
"magento/module-theme": "0.42.0-beta3",
12-
"magento/module-reports": "0.42.0-beta3",
13-
"magento/module-sales": "0.42.0-beta3",
14-
"magento/module-quote": "0.42.0-beta3",
15-
"magento/module-catalog": "0.42.0-beta3",
16-
"magento/module-user": "0.42.0-beta3",
17-
"magento/module-backup": "0.42.0-beta3",
18-
"magento/module-email": "0.42.0-beta3",
19-
"magento/module-customer": "0.42.0-beta3",
20-
"magento/module-translation": "0.42.0-beta3",
21-
"magento/module-require-js": "0.42.0-beta3",
22-
"magento/framework": "0.42.0-beta3",
6+
"magento/module-store": "0.42.0-beta4",
7+
"magento/module-directory": "0.42.0-beta4",
8+
"magento/module-core": "0.42.0-beta4",
9+
"magento/module-eav": "0.42.0-beta4",
10+
"magento/module-cron": "0.42.0-beta4",
11+
"magento/module-theme": "0.42.0-beta4",
12+
"magento/module-reports": "0.42.0-beta4",
13+
"magento/module-sales": "0.42.0-beta4",
14+
"magento/module-quote": "0.42.0-beta4",
15+
"magento/module-catalog": "0.42.0-beta4",
16+
"magento/module-user": "0.42.0-beta4",
17+
"magento/module-backup": "0.42.0-beta4",
18+
"magento/module-email": "0.42.0-beta4",
19+
"magento/module-customer": "0.42.0-beta4",
20+
"magento/module-translation": "0.42.0-beta4",
21+
"magento/module-require-js": "0.42.0-beta4",
22+
"magento/framework": "0.42.0-beta4",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "0.42.0-beta3",
26+
"version": "0.42.0-beta4",
2727
"license": [
2828
"OSL-3.0",
2929
"AFL-3.0"

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<preference for="Magento\Backend\Model\Config\Structure\SearchInterface" type="Magento\Backend\Model\Config\Structure" />
1313
<preference for="Magento\Backend\Model\Config\Backend\File\RequestData\RequestDataInterface" type="Magento\Backend\Model\Config\Backend\File\RequestData" />
1414
<preference for="Magento\Backend\Model\Auth\Credential\StorageInterface" type="Magento\User\Model\User" />
15-
<preference for="Magento\Adminhtml\Helper\Data" type="Magento\Backend\Helper\Data" />
1615
<preference for="Magento\Backend\App\ConfigInterface" type="Magento\Backend\App\Config" />
1716
<preference for="Magento\Backend\Model\UrlInterface" type="Magento\Backend\Model\Url" />
1817
<preference for="Magento\Backend\Block\Widget\Button\ToolbarInterface" type="Magento\Backend\Block\Widget\Button\Toolbar" />

‎app/code/Magento/Backup/Model/Backup.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
namespace Magento\Backup\Model;
77

88
use Magento\Framework\App\Filesystem\DirectoryList;
9+
use Magento\Framework\Filesystem\DriverPool;
910

1011
/**
1112
* Backup file item model
@@ -292,11 +293,10 @@ public function open($write = false)
292293

293294
try {
294295
/** @var \Magento\Framework\Filesystem\Directory\WriteInterface $varDirectory */
295-
$varDirectory = $this->_filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
296+
$varDirectory = $this->_filesystem->getDirectoryWrite(DirectoryList::VAR_DIR, DriverPool::ZLIB);
296297
$this->_stream = $varDirectory->openFile(
297298
$this->_getFilePath(),
298-
$mode,
299-
\Magento\Framework\Filesystem\DriverPool::ZLIB
299+
$mode
300300
);
301301
} catch (\Magento\Framework\Filesystem\FilesystemException $e) {
302302
throw new \Magento\Framework\Backup\Exception\NotEnoughPermissions(

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta3",
7-
"magento/module-core": "0.42.0-beta3",
8-
"magento/module-backend": "0.42.0-beta3",
9-
"magento/module-cron": "0.42.0-beta3",
10-
"magento/framework": "0.42.0-beta3",
6+
"magento/module-store": "0.42.0-beta4",
7+
"magento/module-core": "0.42.0-beta4",
8+
"magento/module-backend": "0.42.0-beta4",
9+
"magento/module-cron": "0.42.0-beta4",
10+
"magento/framework": "0.42.0-beta4",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta3",
14+
"version": "0.42.0-beta4",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ protected function calculateDynamicBundleAmount($basePriceValue, $bundleProduct,
314314

315315
/** @var Store $store */
316316
$store = $bundleProduct->getStore();
317-
$roundingMethod = $this->taxHelper->getCalculationAgorithm($store);
317+
$roundingMethod = $this->taxHelper->getCalculationAlgorithm($store);
318318
foreach ($amountList as $amountInfo) {
319319
/** @var \Magento\Framework\Pricing\Amount\AmountInterface $itemAmount */
320320
$itemAmount = $amountInfo['amount'];

0 commit comments

Comments
 (0)