diff --git a/app/code/Magento/Deploy/Model/Filesystem.php b/app/code/Magento/Deploy/Model/Filesystem.php
index f5b725dc5fb9d10f7f9104208c9e0b882d03e406..8f5b1951ed546584708c8043098776193c8d8de6 100644
--- a/app/code/Magento/Deploy/Model/Filesystem.php
+++ b/app/code/Magento/Deploy/Model/Filesystem.php
@@ -13,7 +13,7 @@ use Magento\Framework\Exception\LocalizedException;
use Magento\User\Model\ResourceModel\User\Collection as UserCollection;
/**
- * Generate static files, compile; clear var/generation, var/di/, var/view_preprocessed and pub/static directories
+ * Generate static files, compile; clear generated/code, generated/metadata/, var/view_preprocessed and pub/static directories
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
@@ -129,7 +129,7 @@ class Filesystem
public function regenerateStatic(
OutputInterface $output
) {
- // Сlear var/generation, var/di/, var/view_preprocessed and pub/static directories
+ // Сlear generated/code, generated/metadata/, var/view_preprocessed and pub/static directories
$this->cleanupFilesystem(
[
DirectoryList::CACHE,
@@ -315,7 +315,7 @@ class Filesystem
*/
public function lockStaticResources()
{
- // Lock /var/generation, /var/di/ and /var/view_preprocessed directories
+ // Lock /generated/code, /generated/metadata/ and /var/view_preprocessed directories
$this->changePermissions(
[
DirectoryList::GENERATION,
diff --git a/composer.json b/composer.json
index 7840f84720b6cac97073647c90c184315a80eb4b..c4df59e3f5711aa4392a4ac85d9c21814d39c8d7 100644
--- a/composer.json
+++ b/composer.json
@@ -226,7 +226,7 @@
"psr-0": {
"": [
"app/code/",
- "var/generation"
+ "generated/code"
]
},
"files": [
diff --git a/composer.lock b/composer.lock
index 7b3c6ccc9928df82fc72f6e397d1b98d3f2823d0..670d7d831a8573b9f64b3ba9a9b67c805a61b06f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "8c0f23eee8426e8aeba5a897f6f2ccbd",
+ "hash": "db5eb5dcf9b4af8ae63345ebda1c92f4",
"content-hash": "600aca1692cf3fe5c2ea1cbf66de09ab",
"packages": [
{
@@ -56,7 +56,7 @@
},
{
"name": "colinmollenhour/cache-backend-file",
- "version": "1.4.0",
+ "version": "1.4",
"source": {
"type": "git",
"url": "https://github.com/colinmollenhour/Cm_Cache_Backend_File.git",
@@ -554,16 +554,16 @@
},
{
"name": "magento/magento-composer-installer",
- "version": "0.1.11",
+ "version": "0.1.12",
"source": {
"type": "git",
"url": "https://github.com/magento/magento-composer-installer.git",
- "reference": "a12b9577cd9859af67d2365ae38d23ddfc57cf4d"
+ "reference": "10c600e88ad34fec71bb6b435ea8415ce92d51de"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/a12b9577cd9859af67d2365ae38d23ddfc57cf4d",
- "reference": "a12b9577cd9859af67d2365ae38d23ddfc57cf4d",
+ "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/10c600e88ad34fec71bb6b435ea8415ce92d51de",
+ "reference": "10c600e88ad34fec71bb6b435ea8415ce92d51de",
"shasum": ""
},
"require": {
@@ -629,7 +629,7 @@
"composer-installer",
"magento"
],
- "time": "2016-06-15 04:02:25"
+ "time": "2016-10-06 16:05:07"
},
{
"name": "magento/zendframework1",
@@ -818,16 +818,16 @@
},
{
"name": "paragonie/random_compat",
- "version": "v2.0.3",
+ "version": "v2.0.4",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
- "reference": "c0125896dbb151380ab47e96c621741e79623beb"
+ "reference": "a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/c0125896dbb151380ab47e96c621741e79623beb",
- "reference": "c0125896dbb151380ab47e96c621741e79623beb",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e",
+ "reference": "a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e",
"shasum": ""
},
"require": {
@@ -862,7 +862,7 @@
"pseudorandom",
"random"
],
- "time": "2016-10-17 15:23:22"
+ "time": "2016-11-07 23:38:38"
},
{
"name": "pelago/emogrifier",
@@ -1189,16 +1189,16 @@
},
{
"name": "seld/jsonlint",
- "version": "1.4.1",
+ "version": "1.5.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/jsonlint.git",
- "reference": "e827b5254d3e58c736ea2c5616710983d80b0b70"
+ "reference": "19495c181d6d53a0a13414154e52817e3b504189"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/e827b5254d3e58c736ea2c5616710983d80b0b70",
- "reference": "e827b5254d3e58c736ea2c5616710983d80b0b70",
+ "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/19495c181d6d53a0a13414154e52817e3b504189",
+ "reference": "19495c181d6d53a0a13414154e52817e3b504189",
"shasum": ""
},
"require": {
@@ -1231,7 +1231,7 @@
"parser",
"validator"
],
- "time": "2016-09-14 15:17:56"
+ "time": "2016-11-14 17:59:58"
},
{
"name": "seld/phar-utils",
@@ -1390,16 +1390,16 @@
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.8.12",
+ "version": "v2.8.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "889983a79a043dfda68f38c38b6dba092dd49cd8"
+ "reference": "25c576abd4e0f212e678fe8b2bd9a9a98c7ea934"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/889983a79a043dfda68f38c38b6dba092dd49cd8",
- "reference": "889983a79a043dfda68f38c38b6dba092dd49cd8",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/25c576abd4e0f212e678fe8b2bd9a9a98c7ea934",
+ "reference": "25c576abd4e0f212e678fe8b2bd9a9a98c7ea934",
"shasum": ""
},
"require": {
@@ -1446,20 +1446,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2016-07-28 16:56:28"
+ "time": "2016-10-13 01:43:15"
},
{
"name": "symfony/filesystem",
- "version": "v2.8.12",
+ "version": "v2.8.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "44b499521defddf2eae17a18c811bbdae4f98bdf"
+ "reference": "a3784111af9f95f102b6411548376e1ae7c93898"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/44b499521defddf2eae17a18c811bbdae4f98bdf",
- "reference": "44b499521defddf2eae17a18c811bbdae4f98bdf",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/a3784111af9f95f102b6411548376e1ae7c93898",
+ "reference": "a3784111af9f95f102b6411548376e1ae7c93898",
"shasum": ""
},
"require": {
@@ -1495,20 +1495,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
- "time": "2016-09-06 10:55:00"
+ "time": "2016-10-18 04:28:30"
},
{
"name": "symfony/finder",
- "version": "v3.1.5",
+ "version": "v3.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "205b5ffbb518a98ba2ae60a52656c4a31ab00c6f"
+ "reference": "a69cb5d455b4885ca376dc5bb3e1155cc8c08c4b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/205b5ffbb518a98ba2ae60a52656c4a31ab00c6f",
- "reference": "205b5ffbb518a98ba2ae60a52656c4a31ab00c6f",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/a69cb5d455b4885ca376dc5bb3e1155cc8c08c4b",
+ "reference": "a69cb5d455b4885ca376dc5bb3e1155cc8c08c4b",
"shasum": ""
},
"require": {
@@ -1517,7 +1517,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -1544,20 +1544,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2016-09-28 00:11:12"
+ "time": "2016-12-13 09:39:43"
},
{
"name": "symfony/process",
- "version": "v2.8.12",
+ "version": "v2.8.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "024de37f8a6b9e5e8244d9eb3fcf3e467dd2a93f"
+ "reference": "1a1bd056395540d0bc549d39818316513565d278"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/024de37f8a6b9e5e8244d9eb3fcf3e467dd2a93f",
- "reference": "024de37f8a6b9e5e8244d9eb3fcf3e467dd2a93f",
+ "url": "https://api.github.com/repos/symfony/process/zipball/1a1bd056395540d0bc549d39818316513565d278",
+ "reference": "1a1bd056395540d0bc549d39818316513565d278",
"shasum": ""
},
"require": {
@@ -1593,7 +1593,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2016-09-29 14:03:54"
+ "time": "2016-11-24 00:43:03"
},
{
"name": "tedivm/jshrink",
@@ -1687,7 +1687,7 @@
},
{
"name": "zendframework/zend-code",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-code.git",
@@ -1740,7 +1740,7 @@
},
{
"name": "zendframework/zend-config",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-config.git",
@@ -1797,7 +1797,7 @@
},
{
"name": "zendframework/zend-console",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-console.git",
@@ -1847,7 +1847,7 @@
},
{
"name": "zendframework/zend-crypt",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-crypt.git",
@@ -1899,7 +1899,7 @@
},
{
"name": "zendframework/zend-di",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-di.git",
@@ -1950,7 +1950,7 @@
},
{
"name": "zendframework/zend-escaper",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-escaper.git",
@@ -1995,7 +1995,7 @@
},
{
"name": "zendframework/zend-eventmanager",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-eventmanager.git",
@@ -2041,7 +2041,7 @@
},
{
"name": "zendframework/zend-filter",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-filter.git",
@@ -2097,7 +2097,7 @@
},
{
"name": "zendframework/zend-form",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-form.git",
@@ -2168,7 +2168,7 @@
},
{
"name": "zendframework/zend-http",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-http.git",
@@ -2219,7 +2219,7 @@
},
{
"name": "zendframework/zend-i18n",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-i18n.git",
@@ -2283,7 +2283,7 @@
},
{
"name": "zendframework/zend-inputfilter",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-inputfilter.git",
@@ -2334,7 +2334,7 @@
},
{
"name": "zendframework/zend-json",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-json.git",
@@ -2388,7 +2388,7 @@
},
{
"name": "zendframework/zend-loader",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-loader.git",
@@ -2433,7 +2433,7 @@
},
{
"name": "zendframework/zend-log",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-log.git",
@@ -2495,7 +2495,7 @@
},
{
"name": "zendframework/zend-math",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-math.git",
@@ -2546,7 +2546,7 @@
},
{
"name": "zendframework/zend-modulemanager",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-modulemanager.git",
@@ -2604,7 +2604,7 @@
},
{
"name": "zendframework/zend-mvc",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-mvc.git",
@@ -2692,7 +2692,7 @@
},
{
"name": "zendframework/zend-serializer",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-serializer.git",
@@ -2745,7 +2745,7 @@
},
{
"name": "zendframework/zend-server",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-server.git",
@@ -2792,7 +2792,7 @@
},
{
"name": "zendframework/zend-servicemanager",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-servicemanager.git",
@@ -2842,7 +2842,7 @@
},
{
"name": "zendframework/zend-soap",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-soap.git",
@@ -2894,7 +2894,7 @@
},
{
"name": "zendframework/zend-stdlib",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-stdlib.git",
@@ -2949,7 +2949,7 @@
},
{
"name": "zendframework/zend-text",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-text.git",
@@ -2996,7 +2996,7 @@
},
{
"name": "zendframework/zend-uri",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-uri.git",
@@ -3044,7 +3044,7 @@
},
{
"name": "zendframework/zend-validator",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-validator.git",
@@ -3109,7 +3109,7 @@
},
{
"name": "zendframework/zend-view",
- "version": "2.4.10",
+ "version": "2.4.11",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-view.git",
@@ -3242,16 +3242,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v1.12.2",
+ "version": "v1.13.1",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
- "reference": "baa7112bef3b86c65fcfaae9a7a50436e3902b41"
+ "reference": "0ea4f7ed06ca55da1d8fc45da26ff87f261c4088"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/baa7112bef3b86c65fcfaae9a7a50436e3902b41",
- "reference": "baa7112bef3b86c65fcfaae9a7a50436e3902b41",
+ "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/0ea4f7ed06ca55da1d8fc45da26ff87f261c4088",
+ "reference": "0ea4f7ed06ca55da1d8fc45da26ff87f261c4088",
"shasum": ""
},
"require": {
@@ -3296,7 +3296,7 @@
}
],
"description": "A tool to automatically fix PHP code style",
- "time": "2016-09-27 07:57:59"
+ "time": "2016-12-01 00:05:05"
},
{
"name": "lusitanian/oauth",
@@ -3407,21 +3407,21 @@
},
{
"name": "phpmd/phpmd",
- "version": "2.4.3",
+ "version": "2.5.0",
"source": {
"type": "git",
"url": "https://github.com/phpmd/phpmd.git",
- "reference": "2b9c2417a18696dfb578b38c116cd0ddc19b256e"
+ "reference": "9298602a922cd8c46666df8d540a60bc5925ce55"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpmd/phpmd/zipball/2b9c2417a18696dfb578b38c116cd0ddc19b256e",
- "reference": "2b9c2417a18696dfb578b38c116cd0ddc19b256e",
+ "url": "https://api.github.com/repos/phpmd/phpmd/zipball/9298602a922cd8c46666df8d540a60bc5925ce55",
+ "reference": "9298602a922cd8c46666df8d540a60bc5925ce55",
"shasum": ""
},
"require": {
"pdepend/pdepend": "^2.0.4",
- "php": ">=5.3.0"
+ "php": ">=5.3.9"
},
"require-dev": {
"phpunit/phpunit": "^4.0",
@@ -3468,7 +3468,7 @@
"phpmd",
"pmd"
],
- "time": "2016-04-04 11:52:04"
+ "time": "2016-11-23 20:33:32"
},
{
"name": "phpunit/php-code-coverage",
@@ -3664,16 +3664,16 @@
},
{
"name": "phpunit/php-token-stream",
- "version": "1.4.8",
+ "version": "1.4.9",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
- "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
+ "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
- "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3b402f65a4cc90abf6e1104e388b896ce209631b",
+ "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b",
"shasum": ""
},
"require": {
@@ -3709,7 +3709,7 @@
"keywords": [
"tokenizer"
],
- "time": "2015-09-15 10:49:45"
+ "time": "2016-11-15 14:06:22"
},
{
"name": "phpunit/phpunit",
@@ -3843,22 +3843,22 @@
},
{
"name": "sebastian/comparator",
- "version": "1.2.0",
+ "version": "1.2.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
+ "reference": "6a1ed12e8b2409076ab22e3897126211ff8b1f7f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
- "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/6a1ed12e8b2409076ab22e3897126211ff8b1f7f",
+ "reference": "6a1ed12e8b2409076ab22e3897126211ff8b1f7f",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"sebastian/diff": "~1.2",
- "sebastian/exporter": "~1.2"
+ "sebastian/exporter": "~1.2 || ~2.0"
},
"require-dev": {
"phpunit/phpunit": "~4.4"
@@ -3903,7 +3903,7 @@
"compare",
"equality"
],
- "time": "2015-07-26 15:48:44"
+ "time": "2016-11-19 09:18:40"
},
{
"name": "sebastian/diff",
@@ -4329,22 +4329,25 @@
},
{
"name": "symfony/config",
- "version": "v2.8.12",
+ "version": "v2.8.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
- "reference": "f8b1922bbda9d2ac86aecd649399040bce849fde"
+ "reference": "b522856007b258f46d5ee35d3b7b235c11e76e86"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/config/zipball/f8b1922bbda9d2ac86aecd649399040bce849fde",
- "reference": "f8b1922bbda9d2ac86aecd649399040bce849fde",
+ "url": "https://api.github.com/repos/symfony/config/zipball/b522856007b258f46d5ee35d3b7b235c11e76e86",
+ "reference": "b522856007b258f46d5ee35d3b7b235c11e76e86",
"shasum": ""
},
"require": {
"php": ">=5.3.9",
"symfony/filesystem": "~2.3|~3.0.0"
},
+ "require-dev": {
+ "symfony/yaml": "~2.7|~3.0.0"
+ },
"suggest": {
"symfony/yaml": "To use the yaml reference dumper"
},
@@ -4378,20 +4381,20 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
- "time": "2016-09-14 20:31:12"
+ "time": "2016-12-10 08:21:45"
},
{
"name": "symfony/dependency-injection",
- "version": "v2.8.12",
+ "version": "v2.8.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "ee9ec9ac2b046462d341e9de7c4346142d335e75"
+ "reference": "51a7b5385fb0f42e5edbdb2cfbad1a011ecdaee7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/ee9ec9ac2b046462d341e9de7c4346142d335e75",
- "reference": "ee9ec9ac2b046462d341e9de7c4346142d335e75",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/51a7b5385fb0f42e5edbdb2cfbad1a011ecdaee7",
+ "reference": "51a7b5385fb0f42e5edbdb2cfbad1a011ecdaee7",
"shasum": ""
},
"require": {
@@ -4441,20 +4444,20 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
- "time": "2016-09-24 09:47:20"
+ "time": "2016-12-08 14:41:31"
},
{
"name": "symfony/stopwatch",
- "version": "v3.1.5",
+ "version": "v3.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
- "reference": "bb42806b12c5f89db4ebf64af6741afe6d8457e1"
+ "reference": "5b139e1c4290e6c7640ba80d9c9b5e49ef22b841"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/stopwatch/zipball/bb42806b12c5f89db4ebf64af6741afe6d8457e1",
- "reference": "bb42806b12c5f89db4ebf64af6741afe6d8457e1",
+ "url": "https://api.github.com/repos/symfony/stopwatch/zipball/5b139e1c4290e6c7640ba80d9c9b5e49ef22b841",
+ "reference": "5b139e1c4290e6c7640ba80d9c9b5e49ef22b841",
"shasum": ""
},
"require": {
@@ -4463,7 +4466,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -4490,20 +4493,20 @@
],
"description": "Symfony Stopwatch Component",
"homepage": "https://symfony.com",
- "time": "2016-06-29 05:41:56"
+ "time": "2016-06-29 05:43:10"
},
{
"name": "symfony/yaml",
- "version": "v2.8.12",
+ "version": "v2.8.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "e7540734bad981fe59f8ef14b6fc194ae9df8d9c"
+ "reference": "befb26a3713c97af90d25dd12e75621ef14d91ff"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/e7540734bad981fe59f8ef14b6fc194ae9df8d9c",
- "reference": "e7540734bad981fe59f8ef14b6fc194ae9df8d9c",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/befb26a3713c97af90d25dd12e75621ef14d91ff",
+ "reference": "befb26a3713c97af90d25dd12e75621ef14d91ff",
"shasum": ""
},
"require": {
@@ -4539,7 +4542,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2016-09-02 01:57:56"
+ "time": "2016-11-14 16:15:57"
},
{
"name": "theseer/fdomdocument",
diff --git a/dev/tests/static/framework/autoload.php b/dev/tests/static/framework/autoload.php
index 479225bef078f5ddd20a94bdaff30c5adfb541f4..b4379f03bc3595da751a98ebbf860956015e0a0c 100644
--- a/dev/tests/static/framework/autoload.php
+++ b/dev/tests/static/framework/autoload.php
@@ -4,6 +4,8 @@
* See COPYING.txt for license details.
*/
+use \Magento\Framework\App\Filesystem\DirectoryList;
+
$baseDir = realpath(__DIR__ . '/../../../../');
require $baseDir . '/app/autoload.php';
$testsBaseDir = $baseDir . '/dev/tests/static';
@@ -16,4 +18,6 @@ $autoloadWrapper->addPsr4(
$testsBaseDir . '/../integration/framework/Magento/TestFramework/',
]
);
-$autoloadWrapper->addPsr4('Magento\\', $baseDir . '/var/generation/Magento/');
+
+$generatedCode = DirectoryList::getDefaultConfig()[DirectoryList::GENERATION][DirectoryList::PATH];
+$autoloadWrapper->addPsr4('Magento\\', $baseDir . '/' . $generatedCode . '/Magento/');
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
index 3afe3af79b14ff3177a0dc1c5ea9fe42e93b6331..ebe8501337efff410bba83f4f291b3433247a893 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
@@ -109,7 +109,7 @@ Magento/SalesRule/Model/Resource/Report/Rule
Magento/SalesRule/Model/Resource/Rule
Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit
Magento/User/Block/User/Edit
-var/generation
+generated/code
Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer
Magento/Newsletter/Model/Template/Filter
Magento/Newsletter/Model/Resource/Subscriber
diff --git a/dev/tests/unit/framework/autoload.php b/dev/tests/unit/framework/autoload.php
index 6bac39ae627b32690cfe5ab11aabe5701c265a8e..f6bfbf37bac2324251b288856f0971500375de5c 100644
--- a/dev/tests/unit/framework/autoload.php
+++ b/dev/tests/unit/framework/autoload.php
@@ -4,10 +4,12 @@
* See COPYING.txt for license details.
*/
+use Magento\Framework\App\Filesystem\DirectoryList;
+
$autoloader = new \Magento\Framework\TestFramework\Unit\Autoloader\ExtensionGeneratorAutoloader(
new \Magento\Framework\Code\Generator\Io(
new \Magento\Framework\Filesystem\Driver\File(),
- TESTS_TEMP_DIR . '/var/generation'
+ TESTS_TEMP_DIR . '/'. DirectoryList::getDefaultConfig()[DirectoryList::GENERATION][DirectoryList::PATH]
)
);
spl_autoload_register([$autoloader, 'load']);
diff --git a/generated/.htacceess b/generated/.htacceess
new file mode 100644
index 0000000000000000000000000000000000000000..896fbc5a341ea313ff3abd503808842757678c1d
--- /dev/null
+++ b/generated/.htacceess
@@ -0,0 +1,2 @@
+Order deny,allow
+Deny from all
\ No newline at end of file
diff --git a/lib/internal/Magento/Framework/App/Filesystem/DirectoryList.php b/lib/internal/Magento/Framework/App/Filesystem/DirectoryList.php
index 8e31ddce9983fd23835ed01bdd2a6c4926911816..b5bf4ab90dd46ca8c4bc806e0feade27bc417ef0 100644
--- a/lib/internal/Magento/Framework/App/Filesystem/DirectoryList.php
+++ b/lib/internal/Magento/Framework/App/Filesystem/DirectoryList.php
@@ -120,8 +120,8 @@ class DirectoryList extends \Magento\Framework\Filesystem\DirectoryList
self::VAR_DIR => [parent::PATH => 'var'],
self::CACHE => [parent::PATH => 'var/cache'],
self::LOG => [parent::PATH => 'var/log'],
- self::DI => [parent::PATH => 'var/di'],
- self::GENERATION => [parent::PATH => 'var/generation'],
+ self::DI => [parent::PATH => 'generated/metadata'],
+ self::GENERATION => [parent::PATH => 'generated/code'],
self::SESSION => [parent::PATH => 'var/session'],
self::MEDIA => [parent::PATH => 'pub/media', parent::URL_PATH => 'pub/media'],
self::STATIC_VIEW => [parent::PATH => 'pub/static', parent::URL_PATH => 'pub/static'],
diff --git a/lib/internal/Magento/Framework/Code/GeneratedFiles.php b/lib/internal/Magento/Framework/Code/GeneratedFiles.php
index f3d3c2bd611d5c0bb1795aaacc24c4701009d573..a44231fcac6b90f67d804808646a4e3563a5aa23 100644
--- a/lib/internal/Magento/Framework/Code/GeneratedFiles.php
+++ b/lib/internal/Magento/Framework/Code/GeneratedFiles.php
@@ -57,7 +57,7 @@ class GeneratedFiles
}
/**
- * Clean var/generation, var/di and var/cache
+ * Clean generated/code, generated/metadata and var/cache
*
* @return void
*/
@@ -81,12 +81,12 @@ class GeneratedFiles
$generationPath = $this->write->getRelativePath($this->directoryList->getPath(DirectoryList::GENERATION));
$diPath = $this->write->getRelativePath($this->directoryList->getPath(DirectoryList::DI));
- // Clean var/generation dir
+ // Clean generated/code dir
if ($this->write->isDirectory($generationPath)) {
$this->write->delete($generationPath);
}
- // Clean var/di
+ // Clean generated/metadata
if ($this->write->isDirectory($diPath)) {
$this->write->delete($diPath);
}
@@ -101,7 +101,7 @@ class GeneratedFiles
}
/**
- * Create flag for cleaning up var/generation, var/di and var/cache directories for subsequent
+ * Create flag for cleaning up generated/code, generated/metadata and var/cache directories for subsequent
* regeneration of this content
*
* @return void
diff --git a/lib/internal/Magento/Framework/Code/Generator/Io.php b/lib/internal/Magento/Framework/Code/Generator/Io.php
index aac1eea8d6cbe515796e1fe30b31e2585a1e835b..cb4c58f9ea5fcfab183f2248f190c1794137c8b2 100644
--- a/lib/internal/Magento/Framework/Code/Generator/Io.php
+++ b/lib/internal/Magento/Framework/Code/Generator/Io.php
@@ -14,7 +14,7 @@ class Io
* Default code generation directory
* Should correspond the value from \Magento\Framework\Filesystem
*/
- const DEFAULT_DIRECTORY = 'var/generation';
+ const DEFAULT_DIRECTORY = 'generated/code';
/**
* Path to directory where new file must be created
diff --git a/lib/internal/Magento/Framework/Console/Cli.php b/lib/internal/Magento/Framework/Console/Cli.php
index 4da186fcf8864f60b088d35aa02e8f9bbf8842c3..13ce11e1af7ef6ed6f68caa92c18499d4ba12d70 100644
--- a/lib/internal/Magento/Framework/Console/Cli.php
+++ b/lib/internal/Magento/Framework/Console/Cli.php
@@ -60,7 +60,7 @@ class Cli extends SymfonyApplication
if (!$generationDirectoryAccess->check()) {
$output = new ConsoleOutput();
$output->writeln(
- '<error>Command line user does not have read and write permissions on var/generation directory. Please'
+ '<error>Command line user does not have read and write permissions on generated/code directory. Please'
. ' address this issue before using Magento command line.</error>'
);
exit(0);
@@ -97,7 +97,7 @@ class Cli extends SymfonyApplication
if ($this->initException) {
$output->writeln(
"<error>We're sorry, an error occurred. Try clearing the cache and code generation directories. "
- . "By default, they are: var/cache, var/di, var/generation, and var/page_cache.</error>"
+ . "By default, they are: var/cache, generated/metadata, generated/code, and var/page_cache.</error>"
);
throw $this->initException;
}
diff --git a/lib/internal/Magento/Framework/Console/GenerationDirectoryAccess.php b/lib/internal/Magento/Framework/Console/GenerationDirectoryAccess.php
index 4a65ff259b68e23f4d75d60a14e4be80fcf8088f..378504cf82047c4cee4092ceac6f0e9822fa60ef 100644
--- a/lib/internal/Magento/Framework/Console/GenerationDirectoryAccess.php
+++ b/lib/internal/Magento/Framework/Console/GenerationDirectoryAccess.php
@@ -14,7 +14,7 @@ use Zend\ServiceManager\ServiceManager;
use Magento\Setup\Mvc\Bootstrap\InitParamListener;
/**
- * Check var/generation read and write access
+ * Check generated/code read and write access
*/
class GenerationDirectoryAccess
{
@@ -33,7 +33,7 @@ class GenerationDirectoryAccess
}
/**
- * Check var/generation read and write access
+ * Check generated/code read and write access
*
* @return bool
*/
diff --git a/lib/internal/Magento/Framework/Setup/FilePermissions.php b/lib/internal/Magento/Framework/Setup/FilePermissions.php
index 2f30a626253db7733ff257f172e8fa2ad7958f2d..7bf5714d92fbbb32497ef5ac162e8a9459aefabd 100644
--- a/lib/internal/Magento/Framework/Setup/FilePermissions.php
+++ b/lib/internal/Magento/Framework/Setup/FilePermissions.php
@@ -130,7 +130,7 @@ class FilePermissions
}
/**
- * Check all sub-directories and files except for var/generation and var/di
+ * Check all sub-directories and files except for generated/code and generated/metadata
*
* @param string $directory
* @return bool
diff --git a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
index ad2ad3d7b6969dcf241bd9f273ae4330d9fedcd2..c52c74d5a4c996fcac34540336f670471e086f5c 100644
--- a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
@@ -17,7 +17,7 @@ use Symfony\Component\Console\Output\OutputInterface;
class UpgradeCommand extends AbstractSetupCommand
{
/**
- * Option to skip deletion of var/generation directory
+ * Option to skip deletion of generated/code directory
*/
const INPUT_KEY_KEEP_GENERATED = 'keep-generated';
diff --git a/setup/src/Magento/Setup/Model/Installer.php b/setup/src/Magento/Setup/Model/Installer.php
index 636b87c490dd8ba25cdcd6dcaf8c453d37cae3da..0b2b50ee89bd87a7fb1ea944afbb3b947c2d0072 100644
--- a/setup/src/Magento/Setup/Model/Installer.php
+++ b/setup/src/Magento/Setup/Model/Installer.php
@@ -1262,7 +1262,7 @@ class Installer
}
/**
- * Clear var/generation and reset object manager
+ * Clear generated/code and reset object manager
*
* @return void
*/
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Reader/Decorator/Interceptions.php b/setup/src/Magento/Setup/Module/Di/Code/Reader/Decorator/Interceptions.php
index c4bcc79f9ae9866a80f770421f17cdcd52bfd9e7..82bbf916aabd4049b0554c08bf4aa877fe35566a 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Reader/Decorator/Interceptions.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Reader/Decorator/Interceptions.php
@@ -6,6 +6,7 @@
namespace Magento\Setup\Module\Di\Code\Reader\Decorator;
use Magento\Setup\Module\Di\Compiler\Log\Log;
+use Magento\Framework\App\Filesystem\DirectoryList;
/**
* Class Interceptions
@@ -71,7 +72,8 @@ class Interceptions implements \Magento\Setup\Module\Di\Code\Reader\ClassesScann
$nameList = [];
foreach ($this->classesScanner->getList($path) as $className) {
try {
- if (!strpos($path, 'generation')) { // validate all classes except classes in var/generation dir
+ // validate all classes except classes in generated/code dir
+ if (!strpos($path, DirectoryList::getDefaultConfig()[DirectoryList::GENERATION][DirectoryList::PATH])) {
$this->validator->validate($className);
}
$nameList[] = $className;
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/InstancesNamesList/DirectoryTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/InstancesNamesList/DirectoryTest.php
index 7e6c2f1ff1b03baf423c5b6663c45b044e0aa42c..387767e56c079dd0a2d0f1a06205c90ba800cfa7 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/InstancesNamesList/DirectoryTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/InstancesNamesList/DirectoryTest.php
@@ -66,7 +66,7 @@ class DirectoryTest extends \PHPUnit_Framework_TestCase
$this->classReaderMock,
$this->classesScanner,
$this->validatorMock,
- '/var/generation'
+ '/generated/code'
);
}
@@ -111,7 +111,7 @@ class DirectoryTest extends \PHPUnit_Framework_TestCase
public function testGetListNoValidation()
{
- $path = '/var/generation';
+ $path = '/generated/code';
$classes = ['NameSpace1\ClassName1', 'NameSpace1\ClassName2'];
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/InstancesNamesList/InterceptionsTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/InstancesNamesList/InterceptionsTest.php
index 212575e644d7ca377f14c16a9531dd1b587129c2..3bd30900b39c2ee8b06ce4a58a07e205d5e687a4 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/InstancesNamesList/InterceptionsTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/InstancesNamesList/InterceptionsTest.php
@@ -97,7 +97,7 @@ class InterceptionsTest extends \PHPUnit_Framework_TestCase
public function testGetListNoValidation()
{
- $path = '/var/generation';
+ $path = '/generated/code';
$classes = ['NameSpace1\ClassName1', 'NameSpace1\ClassName2'];