Merge remote-tracking branch 'falcon/MAGETWO-62198' into MAGETWO-62964

Author: oshmyheliuk

app/code/Magento/Deploy/Model/Filesystem.php

@@ -13,7 +13,8 @@
 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
+ * Сlear generated/code, generated/metadata/, var/view_preprocessed and pub/static directories
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -129,7 +130,7 @@ public function __construct(
     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 +316,7 @@ protected function changePermissions($directoryCodeList, $dirPermissions, $fileP
      */
     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,

composer.json

@@ -226,7 +226,7 @@
         "psr-0": {
             "": [
                 "app/code/",
-                "var/generation"
+                "generated/code"
             ]
         },
         "files": [

composer.lock

@@ -1,6 +1,6 @@
 ##############################################
 ## Allow access to command.php and website.php
-    <FilesMatch "command.php|website.php|export.php">
+    <FilesMatch "command.php|website.php|export.php|pathChecker.php|deleteMagentoGeneratedCode.php">
          order allow,deny
          allow from all
     </FilesMatch>

dev/tests/functional/.htaccess.sample

@@ -18,6 +18,11 @@ class Setup extends Cli
      */
     const PARAM_SETUP_UNINSTALL = 'setup:uninstall';
 
+    /**
+     * Parameter for DI compile Magento command.
+     */
+    const PARAM_SETUP_DI_COMPILE = 'setup:di:compile';
+
     /**
      * Options for uninstall Magento command.
      *
@@ -34,4 +39,14 @@ public function uninstall()
     {
         parent::execute(Setup::PARAM_SETUP_UNINSTALL, $this->options);
     }
+
+    /**
+     * DI Compile.
+     *
+     * @return void
+     */
+    public function diCompile()
+    {
+        parent::execute(Setup::PARAM_SETUP_DI_COMPILE);
+    }
 }