Skip to content

Instantly share code, notes, and snippets.

@barbanet

barbanet/magento2-2-0-4-2-0-5.diff

Last active April 29, 2016 04:53
Show Gist options
  • Save barbanet/9ac47e36c00d9ade3c095d7a197d4b47 to your computer and use it in GitHub Desktop.
Save barbanet/9ac47e36c00d9ade3c095d7a197d4b47 to your computer and use it in GitHub Desktop.
Download ZIP
Magento2 2.0.4 - 2.0.5 diff
Raw
magento2-2-0-4-2-0-5.diff
--- /Magento-CE-2.0.4/update/vendor/composer/autoload_real.php
+++ /Magento-CE-2.0.5/update/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit3006552f64741eb88098808951e91e57
+class ComposerAutoloaderInit130d3cdd0bff2c206483eba27bffd611
{
private static $loader;
@@ -19,9 +19,9 @@
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit3006552f64741eb88098808951e91e57', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit130d3cdd0bff2c206483eba27bffd611', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit3006552f64741eb88098808951e91e57', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit130d3cdd0bff2c206483eba27bffd611', 'loadClassLoader'));
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
--- /Magento-CE-2.0.4/update/vendor/autoload.php
+++ /Magento-CE-2.0.5/update/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInit3006552f64741eb88098808951e91e57::getLoader();
+return ComposerAutoloaderInit130d3cdd0bff2c206483eba27bffd611::getLoader();
--- /Magento-CE-2.0.4/vendor/composer/autoload_real.php
+++ /Magento-CE-2.0.5/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit75289e5847f669faf95d13c12b6e3c33
+class ComposerAutoloaderInit51d8e4e0d25132bf74ae7fd9905edadb
{
private static $loader;
@@ -19,9 +19,9 @@
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit75289e5847f669faf95d13c12b6e3c33', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit51d8e4e0d25132bf74ae7fd9905edadb', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit75289e5847f669faf95d13c12b6e3c33', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit51d8e4e0d25132bf74ae7fd9905edadb', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
array_push($includePaths, get_include_path());
@@ -47,14 +47,14 @@
$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire75289e5847f669faf95d13c12b6e3c33($fileIdentifier, $file);
+ composerRequire51d8e4e0d25132bf74ae7fd9905edadb($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequire75289e5847f669faf95d13c12b6e3c33($fileIdentifier, $file)
+function composerRequire51d8e4e0d25132bf74ae7fd9905edadb($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
--- /Magento-CE-2.0.4/vendor/composer/installed.json
+++ /Magento-CE-2.0.5/vendor/composer/installed.json
@@ -1,17 +1,17 @@
[
{
"name": "magento/magento-composer-installer",
- "version": "0.1.6",
- "version_normalized": "0.1.6.0",
+ "version": "0.1.7",
+ "version_normalized": "0.1.7.0",
"source": {
"type": "git",
"url": "https://github.com/magento/magento-composer-installer.git",
- "reference": "5b5d29ebe060bc6754c2999206923489db8ca641"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/5b5d29ebe060bc6754c2999206923489db8ca641",
- "reference": "5b5d29ebe060bc6754c2999206923489db8ca641",
+ "reference": "9a415d7617d07f3270d22c374611252369f957e7"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/9a415d7617d07f3270d22c374611252369f957e7",
+ "reference": "9a415d7617d07f3270d22c374611252369f957e7",
"shasum": ""
},
"require": {
@@ -26,7 +26,7 @@
"squizlabs/php_codesniffer": "1.4.7",
"symfony/process": "*"
},
- "time": "2016-01-25 22:04:43",
+ "time": "2016-04-06 16:10:50",
"type": "composer-plugin",
"extra": {
"composer-command-registry": [
@@ -79,13 +79,13 @@
},
{
"name": "magento/framework",
- "version": "100.0.6",
- "version_normalized": "100.0.6.0",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/framework/magento-framework-100.0.6.0.zip",
- "reference": null,
- "shasum": "4dff9da487474f253224e115f8c75648692d789c"
+ "version": "100.0.7",
+ "version_normalized": "100.0.7.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/framework/magento-framework-100.0.7.0.zip",
+ "reference": null,
+ "shasum": "8d92c12b2af52d3a79421a4a8e6c2e617823d016"
},
"require": {
"ext-curl": "*",
@@ -518,13 +518,13 @@
},
{
"name": "magento/module-store",
- "version": "100.0.5",
- "version_normalized": "100.0.5.0",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-store/magento-module-store-100.0.5.0.zip",
- "reference": null,
- "shasum": "cc18ba63c51c034567593fe92c1dc6dbbf32e331"
+ "version": "100.0.6",
+ "version_normalized": "100.0.6.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-store/magento-module-store-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "2fc235b6406c86038d2b9490f47ac34e1a359c9c"
},
"require": {
"magento/framework": "100.0.*",
@@ -657,13 +657,13 @@
},
{
"name": "magento/module-backend",
- "version": "100.0.5",
- "version_normalized": "100.0.5.0",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-backend/magento-module-backend-100.0.5.0.zip",
- "reference": null,
- "shasum": "a34c57294fea7ffbc9ad9a6d50b2fc2254fade9b"
+ "version": "100.0.6",
+ "version_normalized": "100.0.6.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-backend/magento-module-backend-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "20d9d267f7a1f731bd204ea2482982f01b5bc3d7"
},
"require": {
"magento/framework": "100.0.*",
@@ -779,13 +779,13 @@
},
{
"name": "magento/module-widget",
- "version": "100.0.5",
- "version_normalized": "100.0.5.0",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-widget/magento-module-widget-100.0.5.0.zip",
- "reference": null,
- "shasum": "2287734c0e146452bf3936eb3e7a401ad424bb9b"
+ "version": "100.0.6",
+ "version_normalized": "100.0.6.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-widget/magento-module-widget-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "7e19c14760abca4c91ae80b76ad067225ce899fc"
},
"require": {
"magento/framework": "100.0.*",
@@ -900,13 +900,13 @@
},
{
"name": "magento/module-catalog",
- "version": "100.0.5",
- "version_normalized": "100.0.5.0",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-catalog/magento-module-catalog-100.0.5.0.zip",
- "reference": null,
- "shasum": "9154268a53970efbb26412b8e4c52c4c85ac5238"
+ "version": "100.0.6",
+ "version_normalized": "100.0.6.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-catalog/magento-module-catalog-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "7d6ed2305ba456f8584426c31a63f58e2d2f2c1b"
},
"require": {
"magento/framework": "100.0.*",
@@ -1036,13 +1036,13 @@
},
{
"name": "magento/module-customer",
- "version": "100.0.5",
- "version_normalized": "100.0.5.0",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-customer/magento-module-customer-100.0.5.0.zip",
- "reference": null,
- "shasum": "b0bef856dde06f364c1506e6800b78f782fe2dda"
+ "version": "100.0.6",
+ "version_normalized": "100.0.6.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-customer/magento-module-customer-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "b9ffe84b45f69293ce53f31bba309cb712727adf"
},
"require": {
"magento/framework": "100.0.*",
@@ -1222,6 +1222,189 @@
"description": "N/A"
},
{
+ "name": "magento/module-url-rewrite",
+ "version": "100.0.5",
+ "version_normalized": "100.0.5.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-url-rewrite/magento-module-url-rewrite-100.0.5.0.zip",
+ "reference": null,
+ "shasum": "7701c8037eb5d903dab47c5bfe7c42b18af6a4b7"
+ },
+ "require": {
+ "magento/framework": "100.0.*",
+ "magento/module-backend": "100.0.*",
+ "magento/module-catalog": "100.0.*",
+ "magento/module-catalog-url-rewrite": "100.0.*",
+ "magento/module-cms": "100.0.*",
+ "magento/module-cms-url-rewrite": "100.0.*",
+ "magento/module-store": "100.0.*",
+ "php": "~5.5.0|~5.6.0|~7.0.0"
+ },
+ "type": "magento2-module",
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "registration.php"
+ ],
+ "psr-4": {
+ "Magento\\UrlRewrite\\": ""
+ }
+ },
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
+ ],
+ "description": "N/A"
+ },
+ {
+ "name": "magento/module-cms-url-rewrite",
+ "version": "100.0.5",
+ "version_normalized": "100.0.5.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-cms-url-rewrite/magento-module-cms-url-rewrite-100.0.5.0.zip",
+ "reference": null,
+ "shasum": "b25a5d6b37a86edefc33d10b9a8803b2c874147c"
+ },
+ "require": {
+ "magento/framework": "100.0.*",
+ "magento/module-cms": "100.0.*",
+ "magento/module-store": "100.0.*",
+ "magento/module-url-rewrite": "100.0.*",
+ "php": "~5.5.0|~5.6.0|~7.0.0"
+ },
+ "type": "magento2-module",
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "registration.php"
+ ],
+ "psr-4": {
+ "Magento\\CmsUrlRewrite\\": ""
+ }
+ },
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
+ ],
+ "description": "N/A"
+ },
+ {
+ "name": "magento/module-cms",
+ "version": "100.0.5",
+ "version_normalized": "100.0.5.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-cms/magento-module-cms-100.0.5.0.zip",
+ "reference": null,
+ "shasum": "5e739065c857bd930225300ebc43cffa95605fbf"
+ },
+ "require": {
+ "magento/framework": "100.0.*",
+ "magento/module-backend": "100.0.*",
+ "magento/module-catalog": "100.0.*",
+ "magento/module-email": "100.0.*",
+ "magento/module-media-storage": "100.0.*",
+ "magento/module-store": "100.0.*",
+ "magento/module-theme": "100.0.*",
+ "magento/module-ui": "100.0.*",
+ "magento/module-variable": "100.0.*",
+ "magento/module-widget": "100.0.*",
+ "php": "~5.5.0|~5.6.0|~7.0.0"
+ },
+ "suggest": {
+ "magento/module-cms-sample-data": "Sample Data version:100.0.*"
+ },
+ "type": "magento2-module",
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "registration.php"
+ ],
+ "psr-4": {
+ "Magento\\Cms\\": ""
+ }
+ },
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
+ ],
+ "description": "N/A"
+ },
+ {
+ "name": "magento/module-catalog-url-rewrite",
+ "version": "100.0.5",
+ "version_normalized": "100.0.5.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-catalog-url-rewrite/magento-module-catalog-url-rewrite-100.0.5.0.zip",
+ "reference": null,
+ "shasum": "f8a72f60d0e94c4a4c39a9c2e1eab760835ce282"
+ },
+ "require": {
+ "magento/framework": "100.0.*",
+ "magento/module-backend": "100.0.*",
+ "magento/module-catalog": "100.0.*",
+ "magento/module-catalog-import-export": "100.0.*",
+ "magento/module-eav": "100.0.*",
+ "magento/module-import-export": "100.0.*",
+ "magento/module-store": "100.0.*",
+ "magento/module-url-rewrite": "100.0.*",
+ "php": "~5.5.0|~5.6.0|~7.0.0"
+ },
+ "type": "magento2-module",
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "registration.php"
+ ],
+ "psr-4": {
+ "Magento\\CatalogUrlRewrite\\": ""
+ }
+ },
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
+ ],
+ "description": "N/A"
+ },
+ {
+ "name": "magento/module-import-export",
+ "version": "100.0.5",
+ "version_normalized": "100.0.5.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-import-export/magento-module-import-export-100.0.5.0.zip",
+ "reference": null,
+ "shasum": "325a88d0b0decb78ec217dfcf8702c876cb6af7a"
+ },
+ "require": {
+ "ext-ctype": "*",
+ "magento/framework": "100.0.*",
+ "magento/module-backend": "100.0.*",
+ "magento/module-eav": "100.0.*",
+ "magento/module-media-storage": "100.0.*",
+ "magento/module-store": "100.0.*",
+ "php": "~5.5.0|~5.6.0|~7.0.0"
+ },
+ "type": "magento2-module",
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "registration.php"
+ ],
+ "psr-4": {
+ "Magento\\ImportExport\\": ""
+ }
+ },
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
+ ],
+ "description": "N/A"
+ },
+ {
"name": "magento/module-tax",
"version": "100.0.5",
"version_normalized": "100.0.5.0",
@@ -1362,6 +1545,41 @@
"description": "N/A"
},
{
+ "name": "magento/module-rule",
+ "version": "100.0.5",
+ "version_normalized": "100.0.5.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-rule/magento-module-rule-100.0.5.0.zip",
+ "reference": null,
+ "shasum": "106521d47b37f8a30c12d2f61fd7ed085560ee4b"
+ },
+ "require": {
+ "lib-libxml": "*",
+ "magento/framework": "100.0.*",
+ "magento/module-backend": "100.0.*",
+ "magento/module-catalog": "100.0.*",
+ "magento/module-eav": "100.0.*",
+ "magento/module-store": "100.0.*",
+ "php": "~5.5.0|~5.6.0|~7.0.0"
+ },
+ "type": "magento2-module",
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "registration.php"
+ ],
+ "psr-4": {
+ "Magento\\Rule\\": ""
+ }
+ },
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
+ ],
+ "description": "N/A"
+ },
+ {
"name": "magento/module-catalog-rule",
"version": "100.0.5",
"version_normalized": "100.0.5.0",
@@ -1402,41 +1620,6 @@
"description": "N/A"
},
{
- "name": "magento/module-rule",
- "version": "100.0.5",
- "version_normalized": "100.0.5.0",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-rule/magento-module-rule-100.0.5.0.zip",
- "reference": null,
- "shasum": "106521d47b37f8a30c12d2f61fd7ed085560ee4b"
- },
- "require": {
- "lib-libxml": "*",
- "magento/framework": "100.0.*",
- "magento/module-backend": "100.0.*",
- "magento/module-catalog": "100.0.*",
- "magento/module-eav": "100.0.*",
- "magento/module-store": "100.0.*",
- "php": "~5.5.0|~5.6.0|~7.0.0"
- },
- "type": "magento2-module",
- "installation-source": "dist",
- "autoload": {
- "files": [
- "registration.php"
- ],
- "psr-4": {
- "Magento\\Rule\\": ""
- }
- },
- "license": [
- "OSL-3.0",
- "AFL-3.0"
- ],
- "description": "N/A"
- },
- {
"name": "magento/module-directory",
"version": "100.0.5",
"version_normalized": "100.0.5.0",
@@ -1471,54 +1654,14 @@
"description": "N/A"
},
{
- "name": "magento/module-msrp",
- "version": "100.0.5",
- "version_normalized": "100.0.5.0",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-msrp/magento-module-msrp-100.0.5.0.zip",
- "reference": null,
- "shasum": "653c1c33ba5d5a7293da933225a5a399553b275a"
- },
- "require": {
- "magento/framework": "100.0.*",
- "magento/module-catalog": "100.0.*",
- "magento/module-downloadable": "100.0.*",
- "magento/module-eav": "100.0.*",
- "magento/module-grouped-product": "100.0.*",
- "magento/module-store": "100.0.*",
- "magento/module-tax": "100.0.*",
- "php": "~5.5.0|~5.6.0|~7.0.0"
- },
- "suggest": {
- "magento/module-bundle": "100.0.*",
- "magento/module-msrp-sample-data": "Sample Data version:100.0.*"
- },
- "type": "magento2-module",
- "installation-source": "dist",
- "autoload": {
- "files": [
- "registration.php"
- ],
- "psr-4": {
- "Magento\\Msrp\\": ""
- }
- },
- "license": [
- "OSL-3.0",
- "AFL-3.0"
- ],
- "description": "N/A"
- },
- {
"name": "magento/module-sales",
- "version": "100.0.5",
- "version_normalized": "100.0.5.0",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-sales/magento-module-sales-100.0.5.0.zip",
- "reference": null,
- "shasum": "28988c385d0fe9693c6a02914d680a7463e7d3dd"
+ "version": "100.0.6",
+ "version_normalized": "100.0.6.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-sales/magento-module-sales-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "512a7947c1f5557d7e0e449c7a05b54e2fed8a44"
},
"require": {
"magento/framework": "100.0.*",
@@ -1652,13 +1795,13 @@
},
{
"name": "magento/module-checkout",
- "version": "100.0.5",
- "version_normalized": "100.0.5.0",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-checkout/magento-module-checkout-100.0.5.0.zip",
- "reference": null,
- "shasum": "34f0e260418e77b589fdf2d0a3169a063623c228"
+ "version": "100.0.6",
+ "version_normalized": "100.0.6.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-checkout/magento-module-checkout-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "00a9f12d725ee8e7116fea63bdcc9be6808707ec"
},
"require": {
"magento/framework": "100.0.*",
@@ -1702,6 +1845,46 @@
"description": "N/A"
},
{
+ "name": "magento/module-msrp",
+ "version": "100.0.5",
+ "version_normalized": "100.0.5.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-msrp/magento-module-msrp-100.0.5.0.zip",
+ "reference": null,
+ "shasum": "653c1c33ba5d5a7293da933225a5a399553b275a"
+ },
+ "require": {
+ "magento/framework": "100.0.*",
+ "magento/module-catalog": "100.0.*",
+ "magento/module-downloadable": "100.0.*",
+ "magento/module-eav": "100.0.*",
+ "magento/module-grouped-product": "100.0.*",
+ "magento/module-store": "100.0.*",
+ "magento/module-tax": "100.0.*",
+ "php": "~5.5.0|~5.6.0|~7.0.0"
+ },
+ "suggest": {
+ "magento/module-bundle": "100.0.*",
+ "magento/module-msrp-sample-data": "Sample Data version:100.0.*"
+ },
+ "type": "magento2-module",
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "registration.php"
+ ],
+ "psr-4": {
+ "Magento\\Msrp\\": ""
+ }
+ },
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
+ ],
+ "description": "N/A"
+ },
+ {
"name": "magento/module-grouped-product",
"version": "100.0.5",
"version_normalized": "100.0.5.0",
@@ -1889,48 +2072,6 @@
],
"psr-4": {
"Magento\\SalesSequence\\": ""
- }
- },
- "license": [
- "OSL-3.0",
- "AFL-3.0"
- ],
- "description": "N/A"
- },
- {
- "name": "magento/module-cms",
- "version": "100.0.5",
- "version_normalized": "100.0.5.0",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-cms/magento-module-cms-100.0.5.0.zip",
- "reference": null,
- "shasum": "5e739065c857bd930225300ebc43cffa95605fbf"
- },
- "require": {
- "magento/framework": "100.0.*",
- "magento/module-backend": "100.0.*",
- "magento/module-catalog": "100.0.*",
- "magento/module-email": "100.0.*",
- "magento/module-media-storage": "100.0.*",
- "magento/module-store": "100.0.*",
- "magento/module-theme": "100.0.*",
- "magento/module-ui": "100.0.*",
- "magento/module-variable": "100.0.*",
- "magento/module-widget": "100.0.*",
- "php": "~5.5.0|~5.6.0|~7.0.0"
- },
- "suggest": {
- "magento/module-cms-sample-data": "Sample Data version:100.0.*"
- },
- "type": "magento2-module",
- "installation-source": "dist",
- "autoload": {
- "files": [
- "registration.php"
- ],
- "psr-4": {
- "Magento\\Cms\\": ""
}
},
"license": [
@@ -2058,13 +2199,13 @@
},
{
"name": "magento/module-newsletter",
- "version": "100.0.5",
- "version_normalized": "100.0.5.0",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-newsletter/magento-module-newsletter-100.0.5.0.zip",
- "reference": null,
- "shasum": "8a5a5951722a525953237b72824c21a25428f0ef"
+ "version": "100.0.6",
+ "version_normalized": "100.0.6.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-newsletter/magento-module-newsletter-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "74a3d1081d8635d21ab9c7133d7365c93e4968ca"
},
"require": {
"magento/framework": "100.0.*",
@@ -2138,155 +2279,14 @@
"description": "N/A"
},
{
- "name": "magento/module-url-rewrite",
- "version": "100.0.5",
- "version_normalized": "100.0.5.0",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-url-rewrite/magento-module-url-rewrite-100.0.5.0.zip",
- "reference": null,
- "shasum": "7701c8037eb5d903dab47c5bfe7c42b18af6a4b7"
- },
- "require": {
- "magento/framework": "100.0.*",
- "magento/module-backend": "100.0.*",
- "magento/module-catalog": "100.0.*",
- "magento/module-catalog-url-rewrite": "100.0.*",
- "magento/module-cms": "100.0.*",
- "magento/module-cms-url-rewrite": "100.0.*",
- "magento/module-store": "100.0.*",
- "php": "~5.5.0|~5.6.0|~7.0.0"
- },
- "type": "magento2-module",
- "installation-source": "dist",
- "autoload": {
- "files": [
- "registration.php"
- ],
- "psr-4": {
- "Magento\\UrlRewrite\\": ""
- }
- },
- "license": [
- "OSL-3.0",
- "AFL-3.0"
- ],
- "description": "N/A"
- },
- {
- "name": "magento/module-cms-url-rewrite",
- "version": "100.0.5",
- "version_normalized": "100.0.5.0",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-cms-url-rewrite/magento-module-cms-url-rewrite-100.0.5.0.zip",
- "reference": null,
- "shasum": "b25a5d6b37a86edefc33d10b9a8803b2c874147c"
- },
- "require": {
- "magento/framework": "100.0.*",
- "magento/module-cms": "100.0.*",
- "magento/module-store": "100.0.*",
- "magento/module-url-rewrite": "100.0.*",
- "php": "~5.5.0|~5.6.0|~7.0.0"
- },
- "type": "magento2-module",
- "installation-source": "dist",
- "autoload": {
- "files": [
- "registration.php"
- ],
- "psr-4": {
- "Magento\\CmsUrlRewrite\\": ""
- }
- },
- "license": [
- "OSL-3.0",
- "AFL-3.0"
- ],
- "description": "N/A"
- },
- {
- "name": "magento/module-catalog-url-rewrite",
- "version": "100.0.5",
- "version_normalized": "100.0.5.0",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-catalog-url-rewrite/magento-module-catalog-url-rewrite-100.0.5.0.zip",
- "reference": null,
- "shasum": "f8a72f60d0e94c4a4c39a9c2e1eab760835ce282"
- },
- "require": {
- "magento/framework": "100.0.*",
- "magento/module-backend": "100.0.*",
- "magento/module-catalog": "100.0.*",
- "magento/module-catalog-import-export": "100.0.*",
- "magento/module-eav": "100.0.*",
- "magento/module-import-export": "100.0.*",
- "magento/module-store": "100.0.*",
- "magento/module-url-rewrite": "100.0.*",
- "php": "~5.5.0|~5.6.0|~7.0.0"
- },
- "type": "magento2-module",
- "installation-source": "dist",
- "autoload": {
- "files": [
- "registration.php"
- ],
- "psr-4": {
- "Magento\\CatalogUrlRewrite\\": ""
- }
- },
- "license": [
- "OSL-3.0",
- "AFL-3.0"
- ],
- "description": "N/A"
- },
- {
- "name": "magento/module-import-export",
- "version": "100.0.5",
- "version_normalized": "100.0.5.0",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-import-export/magento-module-import-export-100.0.5.0.zip",
- "reference": null,
- "shasum": "325a88d0b0decb78ec217dfcf8702c876cb6af7a"
- },
- "require": {
- "ext-ctype": "*",
- "magento/framework": "100.0.*",
- "magento/module-backend": "100.0.*",
- "magento/module-eav": "100.0.*",
- "magento/module-media-storage": "100.0.*",
- "magento/module-store": "100.0.*",
- "php": "~5.5.0|~5.6.0|~7.0.0"
- },
- "type": "magento2-module",
- "installation-source": "dist",
- "autoload": {
- "files": [
- "registration.php"
- ],
- "psr-4": {
- "Magento\\ImportExport\\": ""
- }
- },
- "license": [
- "OSL-3.0",
- "AFL-3.0"
- ],
- "description": "N/A"
- },
- {
"name": "magento/module-catalog-import-export",
- "version": "100.0.5",
- "version_normalized": "100.0.5.0",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-catalog-import-export/magento-module-catalog-import-export-100.0.5.0.zip",
- "reference": null,
- "shasum": "8251ef5b8e2e446d66599e46648444f98c2c8966"
+ "version": "100.0.6",
+ "version_normalized": "100.0.6.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-catalog-import-export/magento-module-catalog-import-export-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "c8db5a5524473b3c36cdbdb86fe4c05d299e3eca"
},
"require": {
"ext-ctype": "*",
@@ -2670,13 +2670,13 @@
},
{
"name": "magento/module-swatches",
- "version": "100.0.5",
- "version_normalized": "100.0.5.0",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-swatches/magento-module-swatches-100.0.5.0.zip",
- "reference": null,
- "shasum": "f864c84df15ef97a22b99946c44e0e541a700a45"
+ "version": "100.0.6",
+ "version_normalized": "100.0.6.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-swatches/magento-module-swatches-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "d5e134be1f0f1ceba77b079869d14130a1dbb8c1"
},
"require": {
"magento/framework": "100.0.*",
@@ -3852,13 +3852,13 @@
},
{
"name": "magento/module-captcha",
- "version": "100.0.5",
- "version_normalized": "100.0.5.0",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-captcha/magento-module-captcha-100.0.5.0.zip",
- "reference": null,
- "shasum": "5bf62c15c06acfdbc0d8196071623e1aa512c55f"
+ "version": "100.0.6",
+ "version_normalized": "100.0.6.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-captcha/magento-module-captcha-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "822c0f58618485c26b5aca7c2bb38abd2a5f8277"
},
"require": {
"magento/framework": "100.0.*",
@@ -4128,13 +4128,13 @@
},
{
"name": "magento/module-advanced-pricing-import-export",
- "version": "100.0.5",
- "version_normalized": "100.0.5.0",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-advanced-pricing-import-export/magento-module-advanced-pricing-import-export-100.0.5.0.zip",
- "reference": null,
- "shasum": "d5818dae42894412d40d0b98464ebd4b93edb25b"
+ "version": "100.0.6",
+ "version_normalized": "100.0.6.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-advanced-pricing-import-export/magento-module-advanced-pricing-import-export-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "bf4c9c2a0090fc145e419cdc2ab4484ff5fcf799"
},
"require": {
"magento/framework": "100.0.*",
@@ -6687,13 +6687,13 @@
},
{
"name": "magento/magento2-base",
- "version": "2.0.4",
- "version_normalized": "2.0.4.0",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/magento2-base/magento-magento2-base-2.0.4.0.zip",
- "reference": null,
- "shasum": "f6db1626a49e6894a08024c2fd821a6fff6ca094"
+ "version": "2.0.5",
+ "version_normalized": "2.0.5.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/magento2-base/magento-magento2-base-2.0.5.0.zip",
+ "reference": null,
+ "shasum": "bf8651c1475548c710ee905166b57c65f1482aea"
},
"require": {
"braintree/braintree_php": "2.39.0",
@@ -7241,13 +7241,13 @@
},
{
"name": "magento/product-community-edition",
- "version": "2.0.4",
- "version_normalized": "2.0.4.0",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/product-community-edition/magento-product-community-edition-2.0.4.0.zip",
- "reference": null,
- "shasum": "911d62a0dd852ad7887a0e9687df05c63d74ba3a"
+ "version": "2.0.5",
+ "version_normalized": "2.0.5.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/product-community-edition/magento-product-community-edition-2.0.5.0.zip",
+ "reference": null,
+ "shasum": "a652f333b48fc07e376fdd78e317328e65c4f0a8"
},
"require": {
"braintree/braintree_php": "2.39.0",
@@ -7268,7 +7268,7 @@
"ext-zip": "*",
"lib-libxml": "*",
"magento/composer": "~1.0.0",
- "magento/framework": "100.0.6",
+ "magento/framework": "100.0.7",
"magento/language-de_de": "100.0.5",
"magento/language-en_us": "100.0.5",
"magento/language-es_es": "100.0.5",
@@ -7277,27 +7277,27 @@
"magento/language-pt_br": "100.0.5",
"magento/language-zh_hans_cn": "100.0.5",
"magento/magento-composer-installer": "*",
- "magento/magento2-base": "2.0.4",
+ "magento/magento2-base": "2.0.5",
"magento/module-admin-notification": "100.0.5",
- "magento/module-advanced-pricing-import-export": "100.0.5",
+ "magento/module-advanced-pricing-import-export": "100.0.6",
"magento/module-authorization": "100.0.5",
"magento/module-authorizenet": "100.0.5",
- "magento/module-backend": "100.0.5",
+ "magento/module-backend": "100.0.6",
"magento/module-backup": "100.0.5",
"magento/module-braintree": "100.0.5",
"magento/module-bundle": "100.0.5",
"magento/module-bundle-import-export": "100.0.5",
"magento/module-cache-invalidate": "100.0.5",
- "magento/module-captcha": "100.0.5",
- "magento/module-catalog": "100.0.5",
- "magento/module-catalog-import-export": "100.0.5",
+ "magento/module-captcha": "100.0.6",
+ "magento/module-catalog": "100.0.6",
+ "magento/module-catalog-import-export": "100.0.6",
"magento/module-catalog-inventory": "100.0.5",
"magento/module-catalog-rule": "100.0.5",
"magento/module-catalog-rule-configurable": "100.0.5",
"magento/module-catalog-search": "100.0.5",
"magento/module-catalog-url-rewrite": "100.0.5",
"magento/module-catalog-widget": "100.0.5",
- "magento/module-checkout": "100.0.5",
+ "magento/module-checkout": "100.0.6",
"magento/module-checkout-agreements": "100.0.5",
"magento/module-cms": "100.0.5",
"magento/module-cms-url-rewrite": "100.0.5",
@@ -7308,7 +7308,7 @@
"magento/module-cookie": "100.0.5",
"magento/module-cron": "100.0.5",
"magento/module-currency-symbol": "100.0.5",
- "magento/module-customer": "100.0.5",
+ "magento/module-customer": "100.0.6",
"magento/module-customer-import-export": "100.0.5",
"magento/module-deploy": "100.0.5",
"magento/module-developer": "100.0.5",
@@ -7335,7 +7335,7 @@
"magento/module-msrp": "100.0.5",
"magento/module-multishipping": "100.0.5",
"magento/module-new-relic-reporting": "100.0.5",
- "magento/module-newsletter": "100.0.5",
+ "magento/module-newsletter": "100.0.6",
"magento/module-offline-payments": "100.0.5",
"magento/module-offline-shipping": "100.0.5",
"magento/module-page-cache": "100.0.5",
@@ -7350,7 +7350,7 @@
"magento/module-review": "100.0.5",
"magento/module-rss": "100.0.5",
"magento/module-rule": "100.0.5",
- "magento/module-sales": "100.0.5",
+ "magento/module-sales": "100.0.6",
"magento/module-sales-rule": "100.0.5",
"magento/module-sales-sequence": "100.0.5",
"magento/module-sample-data": "100.0.5",
@@ -7358,9 +7358,9 @@
"magento/module-send-friend": "100.0.5",
"magento/module-shipping": "100.0.5",
"magento/module-sitemap": "100.0.5",
- "magento/module-store": "100.0.5",
+ "magento/module-store": "100.0.6",
"magento/module-swagger": "100.0.5",
- "magento/module-swatches": "100.0.5",
+ "magento/module-swatches": "100.0.6",
"magento/module-tax": "100.0.5",
"magento/module-tax-import-export": "100.0.5",
"magento/module-theme": "100.0.5",
@@ -7375,7 +7375,7 @@
"magento/module-webapi": "100.0.5",
"magento/module-webapi-security": "100.0.1",
"magento/module-weee": "100.0.5",
- "magento/module-widget": "100.0.5",
+ "magento/module-widget": "100.0.6",
"magento/module-wishlist": "100.0.5",
"magento/theme-adminhtml-backend": "100.0.5",
"magento/theme-frontend-blank": "100.0.5",
--- /Magento-CE-2.0.4/vendor/magento/framework/View/Page/Config.php
+++ /Magento-CE-2.0.5/vendor/magento/framework/View/Page/Config.php
@@ -116,6 +116,27 @@
'keywords' => null,
'robots' => null,
];
+
+ /**
+ * @var \Magento\Framework\App\State
+ */
+ private $areaResolver;
+
+ /**
+ * This getter serves as a workaround to add this dependency to this class without breaking constructor structure.
+ *
+ * @return \Magento\Framework\App\State
+ *
+ * @deprecated
+ */
+ private function getAreaResolver()
+ {
+ if ($this->areaResolver === null) {
+ $this->areaResolver = \Magento\Framework\App\ObjectManager::getInstance()
+ ->get('Magento\Framework\App\State');
+ }
+ return $this->areaResolver;
+ }
/**
* @param \Magento\Framework\View\Asset\Repository $assetRepo
@@ -350,6 +371,9 @@
*/
public function getRobots()
{
+ if ($this->getAreaResolver()->getAreaCode() !== 'frontend') {
+ return 'NOINDEX,NOFOLLOW';
+ }
$this->build();
if (empty($this->metadata['robots'])) {
$this->metadata['robots'] = $this->scopeConfig->getValue(
--- /Magento-CE-2.0.4/vendor/magento/framework/View/Template/Html/Minifier.php
+++ /Magento-CE-2.0.5/vendor/magento/framework/View/Template/Html/Minifier.php
@@ -131,7 +131,11 @@
preg_replace(
'#(?<!:)//[^\n\r]*(\s\?\>)#',
'$1',
- $this->rootDirectory->readFile($file)
+ preg_replace(
+ '#//[^\n\r]*(\<\?php)[^\n\r]*(\s\?\>)[^\n\r]*#',
+ '',
+ $this->rootDirectory->readFile($file)
+ )
)
)
)
--- /Magento-CE-2.0.4/vendor/magento/framework/View/Test/Unit/Page/ConfigTest.php
+++ /Magento-CE-2.0.5/vendor/magento/framework/View/Test/Unit/Page/ConfigTest.php
@@ -12,6 +12,11 @@
use Magento\Framework\Locale\Resolver;
use Magento\Framework\View\Page\Config;
+/**
+ * @covers Magento\Framework\View\Page\Config
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class ConfigTest extends \PHPUnit_Framework_TestCase
{
/**
@@ -58,6 +63,11 @@
* @var \Magento\Framework\View\Page\Title|\PHPUnit_Framework_MockObject_MockObject
*/
protected $title;
+
+ /**
+ * @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $areaResolverMock;
public function setUp()
{
@@ -84,6 +94,11 @@
'localeResolver' => $locale,
]
);
+
+ $this->areaResolverMock = $this->getMock('Magento\Framework\App\State', [], [], '', false);
+ $areaResolverReflection = (new \ReflectionClass(get_class($this->model)))->getProperty('areaResolver');
+ $areaResolverReflection->setAccessible(true);
+ $areaResolverReflection->setValue($this->model, $this->areaResolverMock);
}
public function testSetBuilder()
@@ -202,6 +217,7 @@
public function testRobots()
{
+ $this->areaResolverMock->expects($this->once())->method('getAreaCode')->willReturn('frontend');
$robots = 'test_robots';
$this->model->setRobots($robots);
$this->assertEquals($robots, $this->model->getRobots());
@@ -209,6 +225,7 @@
public function testRobotsEmpty()
{
+ $this->areaResolverMock->expects($this->once())->method('getAreaCode')->willReturn('frontend');
$expectedData = 'default_robots';
$this->scopeConfig->expects($this->once())->method('getValue')->with(
'design/search_engine_robots/default_robots',
@@ -218,6 +235,14 @@
$this->assertEquals($expectedData, $this->model->getRobots());
}
+ public function testRobotsAdminhtml()
+ {
+ $this->areaResolverMock->expects($this->once())->method('getAreaCode')->willReturn('adminhtml');
+ $robots = 'test_robots';
+ $this->model->setRobots($robots);
+ $this->assertEquals('NOINDEX,NOFOLLOW', $this->model->getRobots());
+ }
+
public function testGetAssetCollection()
{
$this->assertInstanceOf('Magento\Framework\View\Asset\GroupedCollection', $this->model->getAssetCollection());
--- /Magento-CE-2.0.4/vendor/magento/framework/View/Test/Unit/Template/Html/MinifierTest.php
+++ /Magento-CE-2.0.5/vendor/magento/framework/View/Test/Unit/Template/Html/MinifierTest.php
@@ -98,6 +98,10 @@
<?php echo \$block->someMethod(); ?>
<div style="width: 800px" class="<?php echo \$block->getClass() ?>" />
<script>
+ var i = 1;// comment
+ var j = 1;// <?php echo 'hi' ?>
+//<?php ?> ')){
+// if (<?php echo __('hi')) { ?>
//<![CDATA[
var someVar = 123;
testFunctionCall(function () {
@@ -118,6 +122,10 @@
$expectedContent = <<<TEXT
<?php /** * Copyright © 2016 Magento. All rights reserved. * See COPYING.txt for license details. */ ?> <?php ?> <html><head><title>Test title</title></head><body><a href="http://somelink.com/text.html">Text Link</a> <img src="test.png" alt="some text" /><?php echo \$block->someMethod(); ?> <div style="width: 800px" class="<?php echo \$block->getClass() ?>" /><script>
+ var i = 1;
+ var j = 1;
+
+
//<![CDATA[
var someVar = 123;
testFunctionCall(function () {
--- /Magento-CE-2.0.4/vendor/magento/framework/AppInterface.php
+++ /Magento-CE-2.0.5/vendor/magento/framework/AppInterface.php
@@ -17,7 +17,7 @@
/**
* Magento version
*/
- const VERSION = '2.0.4';
+ const VERSION = '2.0.5';
/**
* Launch application
--- /Magento-CE-2.0.4/vendor/magento/framework/composer.json
+++ /Magento-CE-2.0.5/vendor/magento/framework/composer.json
@@ -2,7 +2,7 @@
"name": "magento/framework",
"description": "N/A",
"type": "magento2-library",
- "version": "100.0.6",
+ "version": "100.0.7",
"license": [
"OSL-3.0",
"AFL-3.0"
--- /Magento-CE-2.0.4/vendor/magento/magento-composer-installer/src/MagentoHackathon/Composer/Magento/Installer.php
+++ /Magento-CE-2.0.5/vendor/magento/magento-composer-installer/src/MagentoHackathon/Composer/Magento/Installer.php
@@ -176,6 +176,10 @@
$this->isForced = (bool)$extra['magento-force'];
}
+ if (false !== getenv('PLATFORM_PROJECT')) {
+ $this->setDeployStrategy('none');
+ }
+
if (isset($extra['magento-deploystrategy'])) {
$this->setDeployStrategy((string)$extra['magento-deploystrategy']);
}
--- /Magento-CE-2.0.4/vendor/magento/magento2-base/CHANGELOG.md
+++ /Magento-CE-2.0.5/vendor/magento/magento2-base/CHANGELOG.md
@@ -1,3 +1,22 @@
+2.0.5
+=============
+* Fixed bugs:
+ * Fixed issue with HTML minification and comments
+ * Fixed issue with cached CAPTCHA
+ * Fixed issue with images not changing on swatches
+ * Fixed issue with admin URL being indexed in search engines
+ * Fixed issue with viewing products from shared wishlists
+ * Fixed inconsistent data during installation
+ * Fixed issue with saving custom customer attributes during checkout
+ * Fixed issue with multiple newsletter subscriptions for same email
+ * Fixed import issue for products with store code
+* GitHub requests:
+ * [#2795](https://github.com/magento/magento2/pull/2795) -- Fix Notice: Undefined property: Magento\Backend\Helper\Dashboard\Order::$_storeManager
+ * [#2989](https://github.com/magento/magento2/issues/2989) -- Custom Options not working after editing product
+* Various improvements:
+ * Improved export performance
+ * Fixed several performance issue with duplicated queries on category and CMS pages
+
2.0.3
=============
* Fixed bugs:
--- /Magento-CE-2.0.4/vendor/magento/magento2-base/composer.json
+++ /Magento-CE-2.0.5/vendor/magento/magento2-base/composer.json
@@ -2,7 +2,7 @@
"name": "magento/magento2-base",
"description": "Magento 2 Base (Community Edition)",
"type": "magento2-component",
- "version": "2.0.4",
+ "version": "2.0.5",
"require": {
"magento/magento-composer-installer": "*",
"php": "~5.5.0|~5.6.0|~7.0.0",
--- /Magento-CE-2.0.4/vendor/magento/module-advanced-pricing-import-export/Model/Import/AdvancedPricing.php
+++ /Magento-CE-2.0.5/vendor/magento/module-advanced-pricing-import-export/Model/Import/AdvancedPricing.php
@@ -531,15 +531,21 @@
{
$existingPrices = $this->_connection->fetchAssoc(
$this->_connection->select()->from(
- $this->_connection->getTableName($table),
+ ['t' => $this->_connection->getTableName($table)],
['value_id', 'entity_id', 'all_groups', 'customer_group_id']
+ )
+ ->joinInner(
+ ['e' => $this->_connection->getTableName('catalog_product_entity')],
+ 't.entity_id = e.entity_id',
+ ['e.sku']
+ )
+ ->where(
+ $this->_connection->quoteInto('e.sku IN (?)', array_keys($prices))
)
);
foreach ($existingPrices as $existingPrice) {
- foreach ($this->_oldSkus as $sku => $productId) {
- if ($existingPrice['entity_id'] == $productId && isset($prices[$sku])) {
- $this->incrementCounterUpdated($prices[$sku], $existingPrice);
- }
+ if (isset($prices[$existingPrice['sku']])) {
+ $this->incrementCounterUpdated($prices[$existingPrice['sku']], $existingPrice);
}
}
--- /Magento-CE-2.0.4/vendor/magento/module-advanced-pricing-import-export/composer.json
+++ /Magento-CE-2.0.5/vendor/magento/module-advanced-pricing-import-export/composer.json
@@ -13,7 +13,7 @@
"magento/framework": "100.0.*"
},
"type": "magento2-module",
- "version": "100.0.5",
+ "version": "100.0.6",
"license": [
"OSL-3.0",
"AFL-3.0"
--- /Magento-CE-2.0.4/vendor/magento/module-backend/Helper/Dashboard/Order.php
+++ /Magento-CE-2.0.5/vendor/magento/module-backend/Helper/Dashboard/Order.php
@@ -4,6 +4,8 @@
* See COPYING.txt for license details.
*/
namespace Magento\Backend\Helper\Dashboard;
+
+use Magento\Framework\App\ObjectManager;
/**
* Adminhtml dashboard helper for orders
@@ -14,6 +16,11 @@
* @var \Magento\Reports\Model\ResourceModel\Order\Collection
*/
protected $_orderCollection;
+
+ /**
+ * @var \Magento\Store\Model\StoreManagerInterface
+ */
+ protected $_storeManager;
/**
* @param \Magento\Framework\App\Helper\Context $context
@@ -41,17 +48,31 @@
if ($this->getParam('store')) {
$this->_collection->addFieldToFilter('store_id', $this->getParam('store'));
} elseif ($this->getParam('website')) {
- $storeIds = $this->_storeManager->getWebsite($this->getParam('website'))->getStoreIds();
+ $storeIds = $this->getStoreManager()->getWebsite($this->getParam('website'))->getStoreIds();
$this->_collection->addFieldToFilter('store_id', ['in' => implode(',', $storeIds)]);
} elseif ($this->getParam('group')) {
- $storeIds = $this->_storeManager->getGroup($this->getParam('group'))->getStoreIds();
+ $storeIds = $this->getStoreManager()->getGroup($this->getParam('group'))->getStoreIds();
$this->_collection->addFieldToFilter('store_id', ['in' => implode(',', $storeIds)]);
} elseif (!$this->_collection->isLive()) {
$this->_collection->addFieldToFilter(
'store_id',
- ['eq' => $this->_storeManager->getStore(\Magento\Store\Model\Store::ADMIN_CODE)->getId()]
+ ['eq' => $this->getStoreManager()->getStore(\Magento\Store\Model\Store::ADMIN_CODE)->getId()]
);
}
$this->_collection->load();
}
+
+ /**
+ * Get Store Manager
+ *
+ * @return \Magento\Store\Model\StoreManagerInterface
+ */
+ public function getStoreManager()
+ {
+ if (!$this->_storeManager) {
+ $this->_storeManager = ObjectManager::getInstance()->get('Magento\Store\Model\StoreManager');
+ }
+
+ return $this->_storeManager;
+ }
}
--- /Magento-CE-2.0.4/vendor/magento/module-backend/composer.json
+++ /Magento-CE-2.0.5/vendor/magento/module-backend/composer.json
@@ -21,7 +21,7 @@
"magento/framework": "100.0.*"
},
"type": "magento2-module",
- "version": "100.0.5",
+ "version": "100.0.6",
"license": [
"OSL-3.0",
"AFL-3.0"
--- /Magento-CE-2.0.4/vendor/magento/module-captcha/view/adminhtml/layout/adminhtml_auth_forgotpassword.xml
+++ /Magento-CE-2.0.5/vendor/magento/module-captcha/view/adminhtml/layout/adminhtml_auth_forgotpassword.xml
@@ -8,7 +8,7 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceContainer name="form.additional.info">
- <block class="Magento\Captcha\Block\Captcha" name="captcha">
+ <block class="Magento\Captcha\Block\Captcha" name="captcha" cacheable="false">
<action method="setFormId">
<argument name="formId" xsi:type="string">backend_forgotpassword</argument>
</action>
--- /Magento-CE-2.0.4/vendor/magento/module-captcha/view/adminhtml/layout/adminhtml_auth_login.xml
+++ /Magento-CE-2.0.5/vendor/magento/module-captcha/view/adminhtml/layout/adminhtml_auth_login.xml
@@ -8,7 +8,7 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceContainer name="form.additional.info">
- <block class="Magento\Captcha\Block\Captcha" name="captcha">
+ <block class="Magento\Captcha\Block\Captcha" name="captcha" cacheable="false">
<action method="setFormId">
<argument name="formId" xsi:type="string">backend_login</argument>
</action>
--- /Magento-CE-2.0.4/vendor/magento/module-captcha/view/frontend/layout/contact_index_index.xml
+++ /Magento-CE-2.0.5/vendor/magento/module-captcha/view/frontend/layout/contact_index_index.xml
@@ -8,7 +8,7 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceContainer name="form.additional.info">
- <block class="Magento\Captcha\Block\Captcha" name="captcha" after="-">
+ <block class="Magento\Captcha\Block\Captcha" name="captcha" after="-" cacheable="false">
<action method="setFormId">
<argument name="formId" xsi:type="string">contact_us</argument>
</action>
--- /Magento-CE-2.0.4/vendor/magento/module-captcha/view/frontend/layout/customer_account_create.xml
+++ /Magento-CE-2.0.5/vendor/magento/module-captcha/view/frontend/layout/customer_account_create.xml
@@ -8,7 +8,7 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceContainer name="form.additional.info">
- <block class="Magento\Captcha\Block\Captcha" name="captcha" after="-">
+ <block class="Magento\Captcha\Block\Captcha" name="captcha" after="-" cacheable="false">
<action method="setFormId">
<argument name="formId" xsi:type="string">user_create</argument>
</action>
--- /Magento-CE-2.0.4/vendor/magento/module-captcha/view/frontend/layout/customer_account_forgotpassword.xml
+++ /Magento-CE-2.0.5/vendor/magento/module-captcha/view/frontend/layout/customer_account_forgotpassword.xml
@@ -8,7 +8,7 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceContainer name="form.additional.info">
- <block class="Magento\Captcha\Block\Captcha" name="captcha" after="-">
+ <block class="Magento\Captcha\Block\Captcha" name="captcha" after="-" cacheable="false">
<action method="setFormId">
<argument name="formId" xsi:type="string">user_forgotpassword</argument>
</action>
--- /Magento-CE-2.0.4/vendor/magento/module-captcha/view/frontend/layout/customer_account_login.xml
+++ /Magento-CE-2.0.5/vendor/magento/module-captcha/view/frontend/layout/customer_account_login.xml
@@ -8,7 +8,7 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceContainer name="form.additional.info">
- <block class="Magento\Captcha\Block\Captcha" name="captcha" after="-">
+ <block class="Magento\Captcha\Block\Captcha" name="captcha" after="-" cacheable="false">
<action method="setFormId">
<argument name="formId" xsi:type="string">user_login</argument>
</action>
--- /Magento-CE-2.0.4/vendor/magento/module-captcha/composer.json
+++ /Magento-CE-2.0.5/vendor/magento/module-captcha/composer.json
@@ -10,7 +10,7 @@
"magento/framework": "100.0.*"
},
"type": "magento2-module",
- "version": "100.0.5",
+ "version": "100.0.6",
"license": [
"OSL-3.0",
"AFL-3.0"
--- /Magento-CE-2.0.4/vendor/magento/module-catalog/Controller/Category/View.php
+++ /Magento-CE-2.0.5/vendor/magento/module-catalog/Controller/Category/View.php
@@ -172,13 +172,15 @@
if ($settings->getPageLayout()) {
$page->getConfig()->setPageLayout($settings->getPageLayout());
}
+
+ $hasChildren = $category->hasChildren();
if ($category->getIsAnchor()) {
- $type = $category->hasChildren() ? 'layered' : 'layered_without_children';
+ $type = $hasChildren ? 'layered' : 'layered_without_children';
} else {
- $type = $category->hasChildren() ? 'default' : 'default_without_children';
- }
-
- if (!$category->hasChildren()) {
+ $type = $hasChildren ? 'default' : 'default_without_children';
+ }
+
+ if (!$hasChildren) {
// Two levels removed from parent. Need to add default page type.
$parentType = strtok($type, '_');
$page->addPageLayoutHandles(['type' => $parentType]);
--- /Magento-CE-2.0.4/vendor/magento/module-catalog/Model/Layer/Filter/DataProvider/Category.php
+++ /Magento-CE-2.0.5/vendor/magento/module-catalog/Model/Layer/Filter/DataProvider/Category.php
@@ -112,13 +112,18 @@
/** @var CategoryModel|null $category */
$category = null;
if ($this->categoryId !== null) {
- $category = $this->categoryFactory->create()
- ->setStoreId(
- $this->getLayer()
- ->getCurrentStore()
- ->getId()
- )
- ->load($this->categoryId);
+ $currentCategory = $this->coreRegistry->registry('current_category');
+ if ($currentCategory !== null && $currentCategory->getId() == $this->categoryId) {
+ $category = $currentCategory;
+ } else {
+ $category = $this->categoryFactory->create()
+ ->setStoreId(
+ $this->getLayer()
+ ->getCurrentStore()
+ ->getId()
+ )
+ ->load($this->categoryId);
+ }
}
if ($category === null || !$category->getId()) {
--- /Magento-CE-2.0.4/vendor/magento/module-catalog/Model/Product/Option/Value.php
+++ /Magento-CE-2.0.5/vendor/magento/module-catalog/Model/Product/Option/Value.php
@@ -211,7 +211,6 @@
if ($this->getData('is_delete') == '1') {
if ($this->getId()) {
$this->deleteValues($this->getId());
- $this->delete();
}
} else {
$this->save();
--- /Magento-CE-2.0.4/vendor/magento/module-catalog/Setup/InstallData.php
+++ /Magento-CE-2.0.5/vendor/magento/module-catalog/Setup/InstallData.php
@@ -49,7 +49,7 @@
->load(1)
->setId(1)
->setStoreId(0)
- ->setPath('1')
+ ->setPath(1)
->setLevel(0)
->setPosition(0)
->setChildrenCount(0)
@@ -57,17 +57,18 @@
->setInitialSetupFlag(true)
->save();
+ // Create Default Catalog Node
$category = $categorySetup->createCategory();
-
- $categorySetup->createCategory()
+ $category->load(2)
+ ->setId(2)
->setStoreId(0)
- ->setPath('1')
+ ->setPath('1/2')
->setName('Default Category')
->setDisplayMode('PRODUCTS')
- ->setAttributeSetId($category->getDefaultAttributeSetId())
->setIsActive(1)
->setLevel(1)
->setInitialSetupFlag(true)
+ ->setAttributeSetId($category->getDefaultAttributeSetId())
->save();
$data = [
--- /Magento-CE-2.0.4/vendor/magento/module-catalog/composer.json
+++ /Magento-CE-2.0.5/vendor/magento/module-catalog/composer.json
@@ -34,7 +34,7 @@
"magento/module-catalog-sample-data": "Sample Data version:100.0.*"
},
"type": "magento2-module",
- "version": "100.0.5",
+ "version": "100.0.6",
"license": [
"OSL-3.0",
"AFL-3.0"
--- /Magento-CE-2.0.4/vendor/magento/module-catalog-import-export/Model/Import/Product.php
+++ /Magento-CE-2.0.5/vendor/magento/module-catalog-import-export/Model/Import/Product.php
@@ -1168,7 +1168,6 @@
{
foreach ($attributesData as $tableName => $skuData) {
$tableData = [];
- $where = [];
foreach ($skuData as $sku => $attributes) {
$productId = $this->skuProcessor->getNewSku($sku)['entity_id'];
@@ -1181,29 +1180,7 @@
'value' => $storeValue,
];
}
- /*
- If the store based values are not provided for a particular store,
- we default to the default scope values.
- In this case, remove all the existing store based values stored in the table.
- */
- $where[] = $this->_connection->quoteInto(
- '(store_id NOT IN (?)',
- array_keys($storeValues)
- ) . $this->_connection->quoteInto(
- ' AND attribute_id = ?',
- $attributeId
- ) . $this->_connection->quoteInto(
- ' AND entity_id = ?)',
- $productId
- );
- if (count($where) >= self::ATTRIBUTE_DELETE_BUNCH) {
- $this->_connection->delete($tableName, implode(' OR ', $where));
- $where = [];
- }
- }
- }
- if (!empty($where)) {
- $this->_connection->delete($tableName, implode(' OR ', $where));
+ }
}
$this->_connection->insertOnDuplicate($tableName, $tableData, ['value']);
}
--- /Magento-CE-2.0.4/vendor/magento/module-catalog-import-export/Test/Unit/Model/Import/ProductTest.php
+++ /Magento-CE-2.0.5/vendor/magento/module-catalog-import-export/Test/Unit/Model/Import/ProductTest.php
@@ -520,18 +520,6 @@
$this->_connection->expects($this->any())
->method('quoteInto')
->willReturnCallback([$this, 'returnQuoteCallback']);
- $this->_connection
- ->expects($this->once())
- ->method('delete')
- ->with(
- $this->equalTo($testTable),
- $this->equalTo(
- '(store_id NOT IN ('
- . $storeId . ') AND attribute_id = '
- . $attributeId . ' AND entity_id = '
- . self::ENTITY_ID . ')'
- )
- );
$tableData[] = [
'entity_id' => self::ENTITY_ID,
--- /Magento-CE-2.0.4/vendor/magento/module-catalog-import-export/composer.json
+++ /Magento-CE-2.0.5/vendor/magento/module-catalog-import-export/composer.json
@@ -16,7 +16,7 @@
"ext-ctype": "*"
},
"type": "magento2-module",
- "version": "100.0.5",
+ "version": "100.0.6",
"license": [
"OSL-3.0",
"AFL-3.0"
--- /Magento-CE-2.0.4/vendor/magento/module-checkout/view/frontend/web/js/model/new-customer-address.js
+++ /Magento-CE-2.0.5/vendor/magento/module-checkout/view/frontend/web/js/model/new-customer-address.js
@@ -4,18 +4,19 @@
*/
/*jshint browser:true jquery:true*/
/*global alert*/
-define([], function() {
+define([], function () {
/**
- * @param addressData
+ * @param {Object} addressData
* Returns new address object
*/
return function (addressData) {
var identifier = Date.now();
+
return {
email: addressData.email,
countryId: (addressData.country_id) ? addressData.country_id : window.checkoutConfig.defaultCountryId,
- regionId: (addressData.region && addressData.region.region_id)
- ? addressData.region.region_id
+ regionId: (addressData.region && addressData.region.region_id) ?
+ addressData.region.region_id
: window.checkoutConfig.defaultRegionId,
regionCode: (addressData.region) ? addressData.region.region_code : null,
region: (addressData.region) ? addressData.region.region : null,
@@ -33,25 +34,26 @@
suffix: addressData.suffix,
vatId: addressData.vat_id,
saveInAddressBook: addressData.save_in_address_book,
- isDefaultShipping: function() {
+ customAttributes: addressData.custom_attributes,
+ isDefaultShipping: function () {
return addressData.default_shipping;
},
- isDefaultBilling: function() {
+ isDefaultBilling: function () {
return addressData.default_billing;
},
- getType: function() {
- return 'new-customer-address'
+ getType: function () {
+ return 'new-customer-address';
},
- getKey: function() {
+ getKey: function () {
return this.getType();
},
- getCacheKey: function() {
+ getCacheKey: function () {
return this.getType() + identifier;
},
- isEditable: function() {
+ isEditable: function () {
return true;
},
- canUseForBilling: function() {
+ canUseForBilling: function () {
return true;
}
}
--- /Magento-CE-2.0.4/vendor/magento/module-checkout/composer.json
+++ /Magento-CE-2.0.5/vendor/magento/module-checkout/composer.json
@@ -27,7 +27,7 @@
"magento/module-cookie": "100.0.*"
},
"type": "magento2-module",
- "version": "100.0.5",
+ "version": "100.0.6",
"license": [
"OSL-3.0",
"AFL-3.0"
--- /Magento-CE-2.0.4/vendor/magento/module-customer/Model/Address/AbstractAddress.php
+++ /Magento-CE-2.0.5/vendor/magento/module-customer/Model/Address/AbstractAddress.php
@@ -263,7 +263,7 @@
{
if (is_array($key)) {
$key = $this->_implodeArrayField($key);
- } elseif (is_array($value) && $this->isAddressMultilineAttribute($key)) {
+ } elseif (is_array($value) && !empty($value) && $this->isAddressMultilineAttribute($key)) {
$value = $this->_implodeArrayValues($value);
}
return parent::setData($key, $value);
@@ -276,6 +276,9 @@
*/
protected function isAddressMultilineAttribute($code)
{
+ if ($code === 'attributes') {
+ return false;
+ }
return $code == 'street' || in_array($code, $this->getCustomAttributesCodes());
}
@@ -288,7 +291,7 @@
protected function _implodeArrayField(array $data)
{
foreach ($data as $key => $value) {
- if (is_array($value) && $this->isAddressMultilineAttribute($key)) {
+ if (is_array($value) && !empty($value) && $this->isAddressMultilineAttribute($key)) {
$data[$key] = $this->_implodeArrayValues($data[$key]);
}
}
--- /Magento-CE-2.0.4/vendor/magento/module-customer/Model/Address.php
+++ /Magento-CE-2.0.5/vendor/magento/module-customer/Model/Address.php
@@ -46,6 +46,11 @@
* @var \Magento\Framework\Indexer\IndexerRegistry
*/
protected $indexerRegistry;
+
+ /**
+ * @var \Magento\Customer\Model\Address\CustomAttributeListInterface
+ */
+ private $attributeList;
/**
* @param \Magento\Framework\Model\Context $context
@@ -347,4 +352,27 @@
$indexer = $this->indexerRegistry->get(Customer::CUSTOMER_GRID_INDEXER_ID);
$indexer->reindexRow($this->getCustomerId());
}
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getCustomAttributesCodes()
+ {
+ return array_keys($this->getAttributeList()->getAttributes());
+ }
+
+ /**
+ * Get new AttributeList dependency for application code.
+ * @return \Magento\Customer\Model\Address\CustomAttributeListInterface
+ * @deprecated
+ */
+ private function getAttributeList()
+ {
+ if (!$this->attributeList) {
+ $this->attributeList = \Magento\Framework\App\ObjectManager::getInstance()->get(
+ \Magento\Customer\Model\Address\CustomAttributeListInterface::class
+ );
+ }
+ return $this->attributeList;
+ }
}
--- /Magento-CE-2.0.4/vendor/magento/module-customer/etc/di.xml
+++ /Magento-CE-2.0.5/vendor/magento/module-customer/etc/di.xml
@@ -43,6 +43,8 @@
type="Magento\Customer\Model\Metadata\AddressMetadataManagement" />
<preference for="Magento\Customer\Api\CustomerManagementInterface"
type="Magento\Customer\Model\CustomerManagement" />
+ <preference for="Magento\Customer\Model\Address\CustomAttributeListInterface"
+ type="Magento\Customer\Model\Address\CustomAttributeList" />
<type name="Magento\Customer\Model\Session">
<arguments>
<argument name="configShare" xsi:type="object">Magento\Customer\Model\Config\Share\Proxy</argument>
--- /Magento-CE-2.0.4/vendor/magento/module-customer/view/frontend/web/js/model/customer/address.js
+++ /Magento-CE-2.0.5/vendor/magento/module-customer/view/frontend/web/js/model/customer/address.js
@@ -32,6 +32,7 @@
vatId: addressData.vat_id,
sameAsBilling: addressData.same_as_billing,
saveInAddressBook: addressData.save_in_address_book,
+ customAttributes: addressData.custom_attributes,
isDefaultShipping: function() {
return addressData.default_shipping;
},
--- /Magento-CE-2.0.4/vendor/magento/module-customer/composer.json
+++ /Magento-CE-2.0.5/vendor/magento/module-customer/composer.json
@@ -29,7 +29,7 @@
"magento/module-customer-sample-data": "Sample Data version:100.0.*"
},
"type": "magento2-module",
- "version": "100.0.5",
+ "version": "100.0.6",
"license": [
"OSL-3.0",
"AFL-3.0"
--- /Magento-CE-2.0.4/vendor/magento/module-newsletter/Model/Subscriber.php
+++ /Magento-CE-2.0.5/vendor/magento/module-newsletter/Model/Subscriber.php
@@ -399,6 +399,11 @@
$this->setSubscriberConfirmCode($this->randomSequence());
}
+ $sendConfirmationEmail = true;
+ if ($this->getStatus() == self::STATUS_SUBSCRIBED && !$this->getCustomerId()) {
+ $sendConfirmationEmail = false;
+ }
+
$isConfirmNeed = $this->_scopeConfig->getValue(
self::XML_PATH_CONFIRMATION_FLAG,
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
@@ -442,12 +447,14 @@
$this->setStatusChanged(true);
try {
- if ($isConfirmNeed === true
- && $isOwnSubscribes === false
- ) {
- $this->sendConfirmationRequestEmail();
- } else {
- $this->sendConfirmationSuccessEmail();
+ if ($sendConfirmationEmail === true) {
+ if ($isConfirmNeed === true
+ && $isOwnSubscribes === false
+ ) {
+ $this->sendConfirmationRequestEmail();
+ } else {
+ $this->sendConfirmationSuccessEmail();
+ }
}
$this->save();
return $this->getStatus();
--- /Magento-CE-2.0.4/vendor/magento/module-newsletter/composer.json
+++ /Magento-CE-2.0.5/vendor/magento/module-newsletter/composer.json
@@ -15,7 +15,7 @@
"magento/framework": "100.0.*"
},
"type": "magento2-module",
- "version": "100.0.5",
+ "version": "100.0.6",
"license": [
"OSL-3.0",
"AFL-3.0"
--- /Magento-CE-2.0.4/vendor/magento/module-sales/etc/adminhtml/system.xml
+++ /Magento-CE-2.0.5/vendor/magento/module-sales/etc/adminhtml/system.xml
@@ -109,7 +109,7 @@
<group id="dashboard" translate="label,comment" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Dashboard</label>
<field id="use_aggregated_data" translate="label" sortOrder="10" type="select" showInDefault="1" showInWebsite="0" showInStore="0">
- <label>Use Aggregated Data (beta)</label>
+ <label>Use Aggregated Data</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<comment>Improves dashboard performance but provides non-realtime data.</comment>
</field>
--- /Magento-CE-2.0.4/vendor/magento/module-sales/i18n/en_US.csv
+++ /Magento-CE-2.0.5/vendor/magento/module-sales/i18n/en_US.csv
@@ -615,7 +615,7 @@
"We'll use the default description above if you leave this empty.","We'll use the default description above if you leave this empty."
"Multi-address Error to Show in Shopping Cart","Multi-address Error to Show in Shopping Cart"
"We'll use the default error above if you leave this empty.","We'll use the default error above if you leave this empty."
-"Use Aggregated Data (beta)","Use Aggregated Data (beta)"
+"Use Aggregated Data","Use Aggregated Data"
"Sales Emails","Sales Emails"
"New Order Confirmation Email Sender","New Order Confirmation Email Sender"
"New Order Confirmation Template","New Order Confirmation Template"
--- /Magento-CE-2.0.4/vendor/magento/module-sales/composer.json
+++ /Magento-CE-2.0.5/vendor/magento/module-sales/composer.json
@@ -32,7 +32,7 @@
"magento/module-sales-sample-data": "Sample Data version:100.0.*"
},
"type": "magento2-module",
- "version": "100.0.5",
+ "version": "100.0.6",
"license": [
"OSL-3.0",
"AFL-3.0"
--- /Magento-CE-2.0.4/vendor/magento/module-store/App/Action/Plugin/Context.php
+++ /Magento-CE-2.0.5/vendor/magento/module-store/App/Action/Plugin/Context.php
@@ -7,6 +7,7 @@
namespace Magento\Store\App\Action\Plugin;
use Magento\Framework\App\Http\Context as HttpContext;
+use Magento\Framework\Phrase;
use Magento\Store\Api\StoreCookieManagerInterface;
use Magento\Store\Api\StoreResolverInterface;
use Magento\Store\Model\StoreManagerInterface;
@@ -77,12 +78,19 @@
/** @var \Magento\Store\Model\Store $defaultStore */
$defaultStore = $this->storeManager->getWebsite()->getDefaultStore();
- $requestedStoreCode = $this->httpRequest->getParam(
+ $storeCode = $this->httpRequest->getParam(
StoreResolverInterface::PARAM_NAME,
$this->storeCookieManager->getStoreCodeFromCookie()
);
+
+ if (is_array($storeCode)) {
+ if (!isset($storeCode['_data']['code'])) {
+ throw new \InvalidArgumentException(new Phrase('Invalid store parameter.'));
+ }
+ $storeCode = $storeCode['_data']['code'];
+ }
/** @var \Magento\Store\Model\Store $currentStore */
- $currentStore = $requestedStoreCode ? $this->storeManager->getStore($requestedStoreCode) : $defaultStore;
+ $currentStore = $storeCode ? $this->storeManager->getStore($storeCode) : $defaultStore;
$this->httpContext->setValue(
StoreManagerInterface::CONTEXT_STORE,
--- /Magento-CE-2.0.4/vendor/magento/module-store/Model/StoreResolver.php
+++ /Magento-CE-2.0.5/vendor/magento/module-store/Model/StoreResolver.php
@@ -85,6 +85,12 @@
list($stores, $defaultStoreId) = $this->getStoresData();
$storeCode = $this->request->getParam(self::PARAM_NAME, $this->storeCookieManager->getStoreCodeFromCookie());
+ if (is_array($storeCode)) {
+ if (!isset($storeCode['_data']['code'])) {
+ throw new \InvalidArgumentException(__('Invalid store parameter.'));
+ }
+ $storeCode = $storeCode['_data']['code'];
+ }
if ($storeCode) {
try {
$store = $this->getRequestedStoreByCode($storeCode);
--- /Magento-CE-2.0.4/vendor/magento/module-store/Setup/InstallSchema.php
+++ /Magento-CE-2.0.5/vendor/magento/module-store/Setup/InstallSchema.php
@@ -10,6 +10,7 @@
use Magento\Framework\Setup\ModuleContextInterface;
use Magento\Framework\Setup\SchemaSetupInterface;
use \Magento\Framework\DB\Ddl\Table;
+use \Magento\Catalog\Setup\InstallData;
/**
* @codeCoverageIgnore
--- /Magento-CE-2.0.4/vendor/magento/module-store/Test/Unit/App/Action/Plugin/ContextTest.php
+++ /Magento-CE-2.0.5/vendor/magento/module-store/Test/Unit/App/Action/Plugin/ContextTest.php
@@ -159,34 +159,41 @@
->will($this->returnValue($this->websiteMock));
$this->storeManager->method('getDefaultStoreView')
->willReturn($this->storeMock);
- $this->storeManager->method('getStore')
- ->willReturn($this->currentStoreMock);
+
$this->websiteMock->expects($this->once())
->method('getDefaultStore')
->will($this->returnValue($this->storeMock));
- $this->storeMock->expects($this->once())
- ->method('getDefaultCurrencyCode')
- ->will($this->returnValue(self::CURRENCY_DEFAULT));
- $this->storeMock->expects($this->once())
- ->method('getCode')
- ->willReturn('default');
- $this->currentStoreMock->expects($this->once())
- ->method('getCode')
- ->willReturn('custom_store');
+
$this->storeCookieManager->expects($this->once())
->method('getStoreCodeFromCookie')
->will($this->returnValue('storeCookie'));
+ $this->currentStoreMock->expects($this->any())
+ ->method('getDefaultCurrencyCode')
+ ->will($this->returnValue(self::CURRENCY_CURRENT_STORE));
+ }
+
+ public function testAroundDispatchCurrencyFromSession()
+ {
+ $this->storeMock->expects($this->once())
+ ->method('getDefaultCurrencyCode')
+ ->will($this->returnValue(self::CURRENCY_DEFAULT));
+
+ $this->storeMock->expects($this->once())
+ ->method('getCode')
+ ->willReturn('default');
+ $this->currentStoreMock->expects($this->once())
+ ->method('getCode')
+ ->willReturn('custom_store');
+
$this->httpRequestMock->expects($this->once())
->method('getParam')
->with($this->equalTo('___store'))
->will($this->returnValue('default'));
- $this->currentStoreMock->expects($this->any())
- ->method('getDefaultCurrencyCode')
- ->will($this->returnValue(self::CURRENCY_CURRENT_STORE));
- }
-
- public function testAroundDispatchCurrencyFromSession()
- {
+
+ $this->storeManager->method('getStore')
+ ->with('default')
+ ->willReturn($this->currentStoreMock);
+
$this->sessionMock->expects($this->any())
->method('getCurrencyCode')
->will($this->returnValue(self::CURRENCY_SESSION));
@@ -207,6 +214,26 @@
public function testDispatchCurrentStoreCurrency()
{
+ $this->storeMock->expects($this->once())
+ ->method('getDefaultCurrencyCode')
+ ->will($this->returnValue(self::CURRENCY_DEFAULT));
+
+ $this->storeMock->expects($this->once())
+ ->method('getCode')
+ ->willReturn('default');
+ $this->currentStoreMock->expects($this->once())
+ ->method('getCode')
+ ->willReturn('custom_store');
+
+ $this->httpRequestMock->expects($this->once())
+ ->method('getParam')
+ ->with($this->equalTo('___store'))
+ ->will($this->returnValue('default'));
+
+ $this->storeManager->method('getStore')
+ ->with('default')
+ ->willReturn($this->currentStoreMock);
+
$this->httpContextMock->expects($this->at(0))
->method('setValue')
->with(StoreManagerInterface::CONTEXT_STORE, 'custom_store', 'default');
@@ -220,4 +247,78 @@
$this->plugin->aroundDispatch($this->subjectMock, $this->closureMock, $this->requestMock)
);
}
+
+ public function testDispatchStoreParameterIsArray()
+ {
+ $this->storeMock->expects($this->once())
+ ->method('getDefaultCurrencyCode')
+ ->will($this->returnValue(self::CURRENCY_DEFAULT));
+
+ $this->storeMock->expects($this->once())
+ ->method('getCode')
+ ->willReturn('default');
+ $this->currentStoreMock->expects($this->once())
+ ->method('getCode')
+ ->willReturn('custom_store');
+
+ $store = [
+ '_data' => [
+ 'code' => 500,
+ ]
+ ];
+
+ $this->httpRequestMock->expects($this->once())
+ ->method('getParam')
+ ->with($this->equalTo('___store'))
+ ->will($this->returnValue($store));
+
+ $this->storeManager->expects($this->once())
+ ->method('getStore')
+ ->with('500')
+ ->willReturn($this->currentStoreMock);
+
+ $this->httpContextMock->expects($this->at(0))
+ ->method('setValue')
+ ->with(StoreManagerInterface::CONTEXT_STORE, 'custom_store', 'default');
+ /** Make sure that current currency is taken from current store if no value is provided in session */
+ $this->httpContextMock->expects($this->at(1))
+ ->method('setValue')
+ ->with(Context::CONTEXT_CURRENCY, self::CURRENCY_CURRENT_STORE, self::CURRENCY_DEFAULT);
+
+ $result = $this->plugin->aroundDispatch($this->subjectMock, $this->closureMock, $this->requestMock);
+ $this->assertEquals(
+ 'ExpectedValue',
+ $result
+ );
+ }
+
+ /**
+ * @expectedException \InvalidArgumentException
+ * @expectedExceptionMessage Invalid store parameter.
+ */
+ public function testDispatchStoreParameterIsInvalidArray()
+ {
+ $this->storeMock->expects($this->never())
+ ->method('getDefaultCurrencyCode')
+ ->will($this->returnValue(self::CURRENCY_DEFAULT));
+
+ $this->storeMock->expects($this->never())
+ ->method('getCode')
+ ->willReturn('default');
+ $this->currentStoreMock->expects($this->never())
+ ->method('getCode')
+ ->willReturn('custom_store');
+
+ $store = [
+ 'some' => [
+ 'code' => 500,
+ ]
+ ];
+
+ $this->httpRequestMock->expects($this->once())
+ ->method('getParam')
+ ->with($this->equalTo('___store'))
+ ->will($this->returnValue($store));
+ $this->plugin->aroundDispatch($this->subjectMock, $this->closureMock, $this->requestMock);
+ }
}
--- /Magento-CE-2.0.4/vendor/magento/module-store/composer.json
+++ /Magento-CE-2.0.5/vendor/magento/module-store/composer.json
@@ -11,7 +11,7 @@
"magento/framework": "100.0.*"
},
"type": "magento2-module",
- "version": "100.0.5",
+ "version": "100.0.6",
"license": [
"OSL-3.0",
"AFL-3.0"
--- /Magento-CE-2.0.4/vendor/magento/module-swatches/Block/Product/Renderer/Configurable.php
+++ /Magento-CE-2.0.5/vendor/magento/module-swatches/Block/Product/Renderer/Configurable.php
@@ -390,6 +390,6 @@
*/
public function getMediaCallback()
{
- return $this->getBaseUrl() . self::MEDIA_CALLBACK_ACTION;
+ return $this->getUrl(self::MEDIA_CALLBACK_ACTION, ['_secure' => $this->getRequest()->isSecure()]);
}
}
--- /Magento-CE-2.0.4/vendor/magento/module-swatches/Test/Unit/Block/Product/Renderer/ConfigurableTest.php
+++ /Magento-CE-2.0.5/vendor/magento/module-swatches/Test/Unit/Block/Product/Renderer/ConfigurableTest.php
@@ -311,7 +311,13 @@
public function testGetMediaCallback()
{
- $this->urlBuilder->expects($this->once())->method('getBaseUrl')->willReturn('http://magento.com/');
- $this->assertContains(Configurable::MEDIA_CALLBACK_ACTION, $this->configurable->getMediaCallback());
+ $url = 'http://localhost/' . Configurable::MEDIA_CALLBACK_ACTION;
+
+ $this->urlBuilder->expects($this->once())
+ ->method('getUrl')
+ ->with(Configurable::MEDIA_CALLBACK_ACTION)
+ ->willReturn($url);
+
+ $this->assertEquals($url, $this->configurable->getMediaCallback());
}
}
--- /Magento-CE-2.0.4/vendor/magento/module-swatches/composer.json
+++ /Magento-CE-2.0.5/vendor/magento/module-swatches/composer.json
@@ -19,7 +19,7 @@
"magento/module-swatches-sample-data": "Sample Data version:100.0.*"
},
"type": "magento2-module",
- "version": "100.0.5",
+ "version": "100.0.6",
"license": [
"proprietary"
],
--- /Magento-CE-2.0.4/vendor/magento/module-widget/Model/ResourceModel/Layout/Update.php
+++ /Magento-CE-2.0.5/vendor/magento/module-widget/Model/ResourceModel/Layout/Update.php
@@ -17,6 +17,11 @@
* @var \Magento\Framework\Cache\FrontendInterface
*/
private $_cache;
+
+ /**
+ * @var array
+ */
+ private $layoutUpdateCache;
/**
* @param \Magento\Framework\Model\ResourceModel\Db\Context $context
@@ -55,14 +60,18 @@
\Magento\Framework\View\Design\ThemeInterface $theme,
\Magento\Framework\App\ScopeInterface $store
) {
- $bind = ['layout_update_handle' => $handle, 'theme_id' => $theme->getId(), 'store_id' => $store->getId()];
- $result = '';
- $connection = $this->getConnection();
- if ($connection) {
- $select = $this->_getFetchUpdatesByHandleSelect();
- $result = join('', $connection->fetchCol($select, $bind));
+ $bind = ['theme_id' => $theme->getId(), 'store_id' => $store->getId()];
+ $cacheKey = implode('-', $bind);
+ if (!isset($this->layoutUpdateCache[$cacheKey])) {
+ $this->layoutUpdateCache[$cacheKey] = [];
+ foreach ($this->getConnection()->fetchAll($this->_getFetchUpdatesByHandleSelect(), $bind) as $layout) {
+ if (!isset($this->layoutUpdateCache[$cacheKey][$layout['handle']])) {
+ $this->layoutUpdateCache[$cacheKey][$layout['handle']] = '';
+ }
+ $this->layoutUpdateCache[$cacheKey][$layout['handle']] .= $layout['xml'];
+ }
}
- return $result;
+ return isset($this->layoutUpdateCache[$cacheKey][$handle]) ? $this->layoutUpdateCache[$cacheKey][$handle] : '';
}
/**
@@ -79,7 +88,7 @@
$select = $this->getConnection()->select()->from(
['layout_update' => $this->getMainTable()],
- ['xml']
+ ['xml', 'handle']
)->join(
['link' => $this->getTable('layout_link')],
'link.layout_update_id=layout_update.layout_update_id',
@@ -88,8 +97,6 @@
'link.store_id IN (0, :store_id)'
)->where(
'link.theme_id = :theme_id'
- )->where(
- 'layout_update.handle = :layout_update_handle'
)->order(
'layout_update.sort_order ' . \Magento\Framework\DB\Select::SQL_ASC
);
--- /Magento-CE-2.0.4/vendor/magento/module-widget/composer.json
+++ /Magento-CE-2.0.5/vendor/magento/module-widget/composer.json
@@ -16,7 +16,7 @@
"magento/module-widget-sample-data": "Sample Data version:100.0.*"
},
"type": "magento2-module",
- "version": "100.0.5",
+ "version": "100.0.6",
"license": [
"OSL-3.0",
"AFL-3.0"
--- /Magento-CE-2.0.4/vendor/autoload.php
+++ /Magento-CE-2.0.5/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInit75289e5847f669faf95d13c12b6e3c33::getLoader();
+return ComposerAutoloaderInit51d8e4e0d25132bf74ae7fd9905edadb::getLoader();
--- /Magento-CE-2.0.4/CHANGELOG.md
+++ /Magento-CE-2.0.5/CHANGELOG.md
@@ -1,3 +1,22 @@
+2.0.5
+=============
+* Fixed bugs:
+ * Fixed issue with HTML minification and comments
+ * Fixed issue with cached CAPTCHA
+ * Fixed issue with images not changing on swatches
+ * Fixed issue with admin URL being indexed in search engines
+ * Fixed issue with viewing products from shared wishlists
+ * Fixed inconsistent data during installation
+ * Fixed issue with saving custom customer attributes during checkout
+ * Fixed issue with multiple newsletter subscriptions for same email
+ * Fixed import issue for products with store code
+* GitHub requests:
+ * [#2795](https://github.com/magento/magento2/pull/2795) -- Fix Notice: Undefined property: Magento\Backend\Helper\Dashboard\Order::$_storeManager
+ * [#2989](https://github.com/magento/magento2/issues/2989) -- Custom Options not working after editing product
+* Various improvements:
+ * Improved export performance
+ * Fixed several performance issue with duplicated queries on category and CMS pages
+
2.0.3
=============
* Fixed bugs:
--- /Magento-CE-2.0.4/composer.json
+++ /Magento-CE-2.0.5/composer.json
@@ -2,7 +2,7 @@
"name": "magento/project-community-edition",
"description": "eCommerce Platform for Growth (Community Edition)",
"type": "project",
- "version": "2.0.4",
+ "version": "2.0.5",
"license": [
"OSL-3.0",
"AFL-3.0"
@@ -14,7 +14,7 @@
}
],
"require": {
- "magento/product-community-edition": "2.0.4",
+ "magento/product-community-edition": "2.0.5",
"composer/composer": "@alpha"
},
"require-dev": {
--- /Magento-CE-2.0.4/composer.lock
+++ /Magento-CE-2.0.5/composer.lock
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "86bdd1731004c47f6950fdf258d13c04",
- "content-hash": "0db84b1f964fba72f89187ba10ca36b8",
+ "hash": "f6359ef06edcf8618a448d22fe90bddb",
+ "content-hash": "105f002e28e8b66f04527f536399a388",
"packages": [
{
"name": "braintree/braintree_php",
@@ -217,12 +217,12 @@
},
{
"name": "magento/framework",
- "version": "100.0.6",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/framework/magento-framework-100.0.6.0.zip",
- "reference": null,
- "shasum": "4dff9da487474f253224e115f8c75648692d789c"
+ "version": "100.0.7",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/framework/magento-framework-100.0.7.0.zip",
+ "reference": null,
+ "shasum": "8d92c12b2af52d3a79421a4a8e6c2e617823d016"
},
"require": {
"ext-curl": "*",
@@ -426,16 +426,16 @@
},
{
"name": "magento/magento-composer-installer",
- "version": "0.1.6",
+ "version": "0.1.7",
"source": {
"type": "git",
"url": "https://github.com/magento/magento-composer-installer.git",
- "reference": "5b5d29ebe060bc6754c2999206923489db8ca641"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/5b5d29ebe060bc6754c2999206923489db8ca641",
- "reference": "5b5d29ebe060bc6754c2999206923489db8ca641",
+ "reference": "9a415d7617d07f3270d22c374611252369f957e7"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/9a415d7617d07f3270d22c374611252369f957e7",
+ "reference": "9a415d7617d07f3270d22c374611252369f957e7",
"shasum": ""
},
"require": {
@@ -498,16 +498,16 @@
"composer-installer",
"magento"
],
- "time": "2016-01-25 22:04:43"
+ "time": "2016-04-06 16:10:50"
},
{
"name": "magento/magento2-base",
- "version": "2.0.4",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/magento2-base/magento-magento2-base-2.0.4.0.zip",
- "reference": null,
- "shasum": "f6db1626a49e6894a08024c2fd821a6fff6ca094"
+ "version": "2.0.5",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/magento2-base/magento-magento2-base-2.0.5.0.zip",
+ "reference": null,
+ "shasum": "bf8651c1475548c710ee905166b57c65f1482aea"
},
"require": {
"braintree/braintree_php": "2.39.0",
@@ -1086,12 +1086,12 @@
},
{
"name": "magento/module-advanced-pricing-import-export",
- "version": "100.0.5",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-advanced-pricing-import-export/magento-module-advanced-pricing-import-export-100.0.5.0.zip",
- "reference": null,
- "shasum": "d5818dae42894412d40d0b98464ebd4b93edb25b"
+ "version": "100.0.6",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-advanced-pricing-import-export/magento-module-advanced-pricing-import-export-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "bf4c9c2a0090fc145e419cdc2ab4484ff5fcf799"
},
"require": {
"magento/framework": "100.0.*",
@@ -1184,12 +1184,12 @@
},
{
"name": "magento/module-backend",
- "version": "100.0.5",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-backend/magento-module-backend-100.0.5.0.zip",
- "reference": null,
- "shasum": "a34c57294fea7ffbc9ad9a6d50b2fc2254fade9b"
+ "version": "100.0.6",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-backend/magento-module-backend-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "20d9d267f7a1f731bd204ea2482982f01b5bc3d7"
},
"require": {
"magento/framework": "100.0.*",
@@ -1409,12 +1409,12 @@
},
{
"name": "magento/module-captcha",
- "version": "100.0.5",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-captcha/magento-module-captcha-100.0.5.0.zip",
- "reference": null,
- "shasum": "5bf62c15c06acfdbc0d8196071623e1aa512c55f"
+ "version": "100.0.6",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-captcha/magento-module-captcha-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "822c0f58618485c26b5aca7c2bb38abd2a5f8277"
},
"require": {
"magento/framework": "100.0.*",
@@ -1441,12 +1441,12 @@
},
{
"name": "magento/module-catalog",
- "version": "100.0.5",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-catalog/magento-module-catalog-100.0.5.0.zip",
- "reference": null,
- "shasum": "9154268a53970efbb26412b8e4c52c4c85ac5238"
+ "version": "100.0.6",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-catalog/magento-module-catalog-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "7d6ed2305ba456f8584426c31a63f58e2d2f2c1b"
},
"require": {
"magento/framework": "100.0.*",
@@ -1497,12 +1497,12 @@
},
{
"name": "magento/module-catalog-import-export",
- "version": "100.0.5",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-catalog-import-export/magento-module-catalog-import-export-100.0.5.0.zip",
- "reference": null,
- "shasum": "8251ef5b8e2e446d66599e46648444f98c2c8966"
+ "version": "100.0.6",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-catalog-import-export/magento-module-catalog-import-export-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "c8db5a5524473b3c36cdbdb86fe4c05d299e3eca"
},
"require": {
"ext-ctype": "*",
@@ -1748,12 +1748,12 @@
},
{
"name": "magento/module-checkout",
- "version": "100.0.5",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-checkout/magento-module-checkout-100.0.5.0.zip",
- "reference": null,
- "shasum": "34f0e260418e77b589fdf2d0a3169a063623c228"
+ "version": "100.0.6",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-checkout/magento-module-checkout-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "00a9f12d725ee8e7116fea63bdcc9be6808707ec"
},
"require": {
"magento/framework": "100.0.*",
@@ -2142,12 +2142,12 @@
},
{
"name": "magento/module-customer",
- "version": "100.0.5",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-customer/magento-module-customer-100.0.5.0.zip",
- "reference": null,
- "shasum": "b0bef856dde06f364c1506e6800b78f782fe2dda"
+ "version": "100.0.6",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-customer/magento-module-customer-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "b9ffe84b45f69293ce53f31bba309cb712727adf"
},
"require": {
"magento/framework": "100.0.*",
@@ -3075,12 +3075,12 @@
},
{
"name": "magento/module-newsletter",
- "version": "100.0.5",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-newsletter/magento-module-newsletter-100.0.5.0.zip",
- "reference": null,
- "shasum": "8a5a5951722a525953237b72824c21a25428f0ef"
+ "version": "100.0.6",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-newsletter/magento-module-newsletter-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "74a3d1081d8635d21ab9c7133d7365c93e4968ca"
},
"require": {
"magento/framework": "100.0.*",
@@ -3611,12 +3611,12 @@
},
{
"name": "magento/module-sales",
- "version": "100.0.5",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-sales/magento-module-sales-100.0.5.0.zip",
- "reference": null,
- "shasum": "28988c385d0fe9693c6a02914d680a7463e7d3dd"
+ "version": "100.0.6",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-sales/magento-module-sales-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "512a7947c1f5557d7e0e449c7a05b54e2fed8a44"
},
"require": {
"magento/framework": "100.0.*",
@@ -3916,12 +3916,12 @@
},
{
"name": "magento/module-store",
- "version": "100.0.5",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-store/magento-module-store-100.0.5.0.zip",
- "reference": null,
- "shasum": "cc18ba63c51c034567593fe92c1dc6dbbf32e331"
+ "version": "100.0.6",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-store/magento-module-store-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "2fc235b6406c86038d2b9490f47ac34e1a359c9c"
},
"require": {
"magento/framework": "100.0.*",
@@ -3977,12 +3977,12 @@
},
{
"name": "magento/module-swatches",
- "version": "100.0.5",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-swatches/magento-module-swatches-100.0.5.0.zip",
- "reference": null,
- "shasum": "f864c84df15ef97a22b99946c44e0e541a700a45"
+ "version": "100.0.6",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-swatches/magento-module-swatches-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "d5e134be1f0f1ceba77b079869d14130a1dbb8c1"
},
"require": {
"magento/framework": "100.0.*",
@@ -4501,12 +4501,12 @@
},
{
"name": "magento/module-widget",
- "version": "100.0.5",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/module-widget/magento-module-widget-100.0.5.0.zip",
- "reference": null,
- "shasum": "2287734c0e146452bf3936eb3e7a401ad424bb9b"
+ "version": "100.0.6",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/module-widget/magento-module-widget-100.0.6.0.zip",
+ "reference": null,
+ "shasum": "7e19c14760abca4c91ae80b76ad067225ce899fc"
},
"require": {
"magento/framework": "100.0.*",
@@ -4585,12 +4585,12 @@
},
{
"name": "magento/product-community-edition",
- "version": "2.0.4",
- "dist": {
- "type": "zip",
- "url": "https://repo.magento.com/archives/magento/product-community-edition/magento-product-community-edition-2.0.4.0.zip",
- "reference": null,
- "shasum": "911d62a0dd852ad7887a0e9687df05c63d74ba3a"
+ "version": "2.0.5",
+ "dist": {
+ "type": "zip",
+ "url": "https://repo.magento.com/archives/magento/product-community-edition/magento-product-community-edition-2.0.5.0.zip",
+ "reference": null,
+ "shasum": "a652f333b48fc07e376fdd78e317328e65c4f0a8"
},
"require": {
"braintree/braintree_php": "2.39.0",
@@ -4611,7 +4611,7 @@
"ext-zip": "*",
"lib-libxml": "*",
"magento/composer": "~1.0.0",
- "magento/framework": "100.0.6",
+ "magento/framework": "100.0.7",
"magento/language-de_de": "100.0.5",
"magento/language-en_us": "100.0.5",
"magento/language-es_es": "100.0.5",
@@ -4620,27 +4620,27 @@
"magento/language-pt_br": "100.0.5",
"magento/language-zh_hans_cn": "100.0.5",
"magento/magento-composer-installer": "*",
- "magento/magento2-base": "2.0.4",
+ "magento/magento2-base": "2.0.5",
"magento/module-admin-notification": "100.0.5",
- "magento/module-advanced-pricing-import-export": "100.0.5",
+ "magento/module-advanced-pricing-import-export": "100.0.6",
"magento/module-authorization": "100.0.5",
"magento/module-authorizenet": "100.0.5",
- "magento/module-backend": "100.0.5",
+ "magento/module-backend": "100.0.6",
"magento/module-backup": "100.0.5",
"magento/module-braintree": "100.0.5",
"magento/module-bundle": "100.0.5",
"magento/module-bundle-import-export": "100.0.5",
"magento/module-cache-invalidate": "100.0.5",
- "magento/module-captcha": "100.0.5",
- "magento/module-catalog": "100.0.5",
- "magento/module-catalog-import-export": "100.0.5",
+ "magento/module-captcha": "100.0.6",
+ "magento/module-catalog": "100.0.6",
+ "magento/module-catalog-import-export": "100.0.6",
"magento/module-catalog-inventory": "100.0.5",
"magento/module-catalog-rule": "100.0.5",
"magento/module-catalog-rule-configurable": "100.0.5",
"magento/module-catalog-search": "100.0.5",
"magento/module-catalog-url-rewrite": "100.0.5",
"magento/module-catalog-widget": "100.0.5",
- "magento/module-checkout": "100.0.5",
+ "magento/module-checkout": "100.0.6",
"magento/module-checkout-agreements": "100.0.5",
"magento/module-cms": "100.0.5",
"magento/module-cms-url-rewrite": "100.0.5",
@@ -4651,7 +4651,7 @@
"magento/module-cookie": "100.0.5",
"magento/module-cron": "100.0.5",
"magento/module-currency-symbol": "100.0.5",
- "magento/module-customer": "100.0.5",
+ "magento/module-customer": "100.0.6",
"magento/module-customer-import-export": "100.0.5",
"magento/module-deploy": "100.0.5",
"magento/module-developer": "100.0.5",
@@ -4678,7 +4678,7 @@
"magento/module-msrp": "100.0.5",
"magento/module-multishipping": "100.0.5",
"magento/module-new-relic-reporting": "100.0.5",
- "magento/module-newsletter": "100.0.5",
+ "magento/module-newsletter": "100.0.6",
"magento/module-offline-payments": "100.0.5",
"magento/module-offline-shipping": "100.0.5",
"magento/module-page-cache": "100.0.5",
@@ -4693,7 +4693,7 @@
"magento/module-review": "100.0.5",
"magento/module-rss": "100.0.5",
"magento/module-rule": "100.0.5",
- "magento/module-sales": "100.0.5",
+ "magento/module-sales": "100.0.6",
"magento/module-sales-rule": "100.0.5",
"magento/module-sales-sequence": "100.0.5",
"magento/module-sample-data": "100.0.5",
@@ -4701,9 +4701,9 @@
"magento/module-send-friend": "100.0.5",
"magento/module-shipping": "100.0.5",
"magento/module-sitemap": "100.0.5",
- "magento/module-store": "100.0.5",
+ "magento/module-store": "100.0.6",
"magento/module-swagger": "100.0.5",
- "magento/module-swatches": "100.0.5",
+ "magento/module-swatches": "100.0.6",
"magento/module-tax": "100.0.5",
"magento/module-tax-import-export": "100.0.5",
"magento/module-theme": "100.0.5",
@@ -4718,7 +4718,7 @@
"magento/module-webapi": "100.0.5",
"magento/module-webapi-security": "100.0.1",
"magento/module-weee": "100.0.5",
- "magento/module-widget": "100.0.5",
+ "magento/module-widget": "100.0.6",
"magento/module-wishlist": "100.0.5",
"magento/theme-adminhtml-backend": "100.0.5",
"magento/theme-frontend-blank": "100.0.5",
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment