Merge remote-tracking branch 'falcons/MAGETWO-63341' into MAGETWO-63936-2

Bohdan Korablov · Bohdan Korablov · commit d7b0afe0321a · 2017-02-06T11:51:21.000+02:00
diff --git a/app/code/Magento/Deploy/Model/Filesystem.php b/app/code/Magento/Deploy/Model/Filesystem.php
@@ -134,8 +134,8 @@ public function regenerateStatic(
         $this->cleanupFilesystem(
             [
                 DirectoryList::CACHE,
-                DirectoryList::GENERATION,
-                DirectoryList::DI,
+                DirectoryList::GENERATED_CODE,
+                DirectoryList::GENERATED_METADATA,
                 DirectoryList::TMP_MATERIALIZATION_DIR
             ]
         );
@@ -230,8 +230,8 @@ protected function compile(OutputInterface $output)
         $this->cleanupFilesystem(
             [
                 DirectoryList::CACHE,
-                DirectoryList::GENERATION,
-                DirectoryList::DI,
+                DirectoryList::GENERATED_CODE,
+                DirectoryList::GENERATED_METADATA,
             ]
         );
         $cmd = $this->functionCallPath . 'setup:di:compile';
@@ -319,8 +319,8 @@ public function lockStaticResources()
         // Lock /generated/code, /generated/metadata/ and /var/view_preprocessed directories
         $this->changePermissions(
             [
-                DirectoryList::GENERATION,
-                DirectoryList::DI,
+                DirectoryList::GENERATED_CODE,
+                DirectoryList::GENERATED_METADATA,
                 DirectoryList::TMP_MATERIALIZATION_DIR,
             ],
             self::PERMISSIONS_DIR,
diff --git a/app/code/Magento/Deploy/Model/Mode.php b/app/code/Magento/Deploy/Model/Mode.php
@@ -105,8 +105,8 @@ public function enableDeveloperMode()
         $this->filesystem->cleanupFilesystem(
             [
                 DirectoryList::CACHE,
-                DirectoryList::GENERATION,
-                DirectoryList::DI,
+                DirectoryList::GENERATED_CODE,
+                DirectoryList::GENERATED_METADATA,
                 DirectoryList::TMP_MATERIALIZATION_DIR,
                 DirectoryList::STATIC_VIEW,
             ]
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Application.php b/dev/tests/integration/framework/Magento/TestFramework/Application.php
@@ -636,7 +636,7 @@ protected function getCustomDirs()
             DirectoryList::VAR_DIR => [$path => $var],
             DirectoryList::MEDIA => [$path => "{$this->installDir}/pub/media"],
             DirectoryList::STATIC_VIEW => [$path => "{$this->installDir}/pub/static"],
-            DirectoryList::GENERATION => [$path => "{$generated}/code"],
+            DirectoryList::GENERATED_CODE => [$path => "{$generated}/code"],
             DirectoryList::CACHE => [$path => "{$var}/cache"],
             DirectoryList::LOG => [$path => "{$var}/log"],
             DirectoryList::SESSION => [$path => "{$var}/session"],
diff --git a/dev/tests/static/framework/autoload.php b/dev/tests/static/framework/autoload.php
@@ -19,5 +19,5 @@
     ]
 );
 
-$generatedCode = DirectoryList::getDefaultConfig()[DirectoryList::GENERATION][DirectoryList::PATH];
+$generatedCode = DirectoryList::getDefaultConfig()[DirectoryList::GENERATED_CODE][DirectoryList::PATH];
 $autoloadWrapper->addPsr4('Magento\\', $baseDir . '/' . $generatedCode . '/Magento/');
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php
@@ -69,8 +69,8 @@ protected function setUp()
         $basePath = str_replace('\\', '/', $basePath);
 
         $directoryList = new DirectoryList($basePath);
-        $this->_generationDir = $directoryList->getPath(DirectoryList::GENERATION);
-        $this->_compilationDir = $directoryList->getPath(DirectoryList::DI);
+        $this->_generationDir = $directoryList->getPath(DirectoryList::GENERATED_CODE);
+        $this->_compilationDir = $directoryList->getPath(DirectoryList::GENERATED_METADATA);
 
         $this->_command = 'php ' . $basePath . '/bin/magento setup:di:compile';
 
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
@@ -562,10 +562,13 @@
         '\Magento\Framework\App\Filesystem',
         '\Magento\Framework\App\Filesystem\DirectoryList::SESSION',
     ],
-    ['DI_DIR', '\Magento\Framework\App\Filesystem', '\Magento\Framework\App\Filesystem\DirectoryList::DI'],
+    ['DI_DIR',
+        '\Magento\Framework\App\Filesystem',
+        '\Magento\Framework\App\Filesystem\DirectoryList::GENERATED_METADATA'
+    ],
     ['GENERATION_DIR',
         '\Magento\Framework\App\Filesystem',
-        '\Magento\Framework\App\Filesystem\DirectoryList::GENERATION',
+        '\Magento\Framework\App\Filesystem\DirectoryList::GENERATED_CODE',
     ],
     ['UPLOAD_DIR',
         '\Magento\Framework\App\Filesystem',
diff --git a/dev/tests/unit/framework/autoload.php b/dev/tests/unit/framework/autoload.php
@@ -9,7 +9,7 @@
 $autoloader = new \Magento\Framework\TestFramework\Unit\Autoloader\ExtensionGeneratorAutoloader(
     new \Magento\Framework\Code\Generator\Io(
         new \Magento\Framework\Filesystem\Driver\File(),
-        TESTS_TEMP_DIR . '/'. DirectoryList::getDefaultConfig()[DirectoryList::GENERATION][DirectoryList::PATH]
+        TESTS_TEMP_DIR . '/'. DirectoryList::getDefaultConfig()[DirectoryList::GENERATED_CODE][DirectoryList::PATH]
     )
 );
 spl_autoload_register([$autoloader, 'load']);
diff --git a/lib/internal/Magento/Framework/App/Filesystem/DirectoryList.php b/lib/internal/Magento/Framework/App/Filesystem/DirectoryList.php
@@ -84,11 +84,18 @@ class DirectoryList extends \Magento\Framework\Filesystem\DirectoryList
 
     /**
      * Dependency injection related file directory
+     *
+     * @deprecated this constant become unused after moving folder for generated DI configuration files
+     * to generated/metadata
+     * @see self::GENERATED_METADATA
      */
     const DI = 'di';
 
     /**
      * Relative directory key for generated code
+     *
+     * @deprecated this constant become unused after moving folder for generated files to generated/code
+     * @see self::GENERATED_CODE
      */
     const GENERATION = 'generation';
 
@@ -114,6 +121,16 @@ class DirectoryList extends \Magento\Framework\Filesystem\DirectoryList
      */
     const GENERATED = 'generated';
 
+    /**
+     * Relative directory key for generated code
+     */
+    const GENERATED_CODE = 'code';
+
+    /**
+     * Relative directory key for generated metadata
+     */
+    const GENERATED_METADATA = 'metadata';
+
     /**
      * {@inheritdoc}
      */
@@ -141,6 +158,8 @@ public static function getDefaultConfig()
             self::SETUP => [parent::PATH => 'setup/src'],
             self::COMPOSER_HOME => [parent::PATH => 'var/composer_home'],
             self::GENERATED => [parent::PATH => 'generated'],
+            self::GENERATED_CODE => [parent::PATH => Io::DEFAULT_DIRECTORY],
+            self::GENERATED_METADATA => [parent::PATH => 'generated/metadata'],
         ];
         return parent::getDefaultConfig() + $result;
     }
diff --git a/lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader/Compiled.php b/lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader/Compiled.php
@@ -45,7 +45,7 @@ public function load($area)
      */
     public static function getFilePath($area)
     {
-        $diPath = DirectoryList::getDefaultConfig()[DirectoryList::DI][DirectoryList::PATH];
+        $diPath = DirectoryList::getDefaultConfig()[DirectoryList::GENERATED_METADATA][DirectoryList::PATH];
         return BP . '/' . $diPath . '/' . $area . '.ser';
     }
 
diff --git a/lib/internal/Magento/Framework/App/ObjectManagerFactory.php b/lib/internal/Magento/Framework/App/ObjectManagerFactory.php
@@ -108,7 +108,7 @@ public function create(array $arguments)
         $arguments = array_merge($deploymentConfig->get(), $arguments);
         $definitionFactory = new \Magento\Framework\ObjectManager\DefinitionFactory(
             $this->driverPool->getDriver(DriverPool::FILE),
-            $this->directoryList->getPath(DirectoryList::GENERATION)
+            $this->directoryList->getPath(DirectoryList::GENERATED_CODE)
         );
 
         $definitions = $definitionFactory->createClassDefinition();
diff --git a/lib/internal/Magento/Framework/App/State/CleanupFiles.php b/lib/internal/Magento/Framework/App/State/CleanupFiles.php
@@ -52,7 +52,10 @@ public function clearCodeGeneratedFiles()
      */
     public function clearCodeGeneratedClasses()
     {
-        return array_merge($this->emptyDir(DirectoryList::GENERATION), $this->emptyDir(DirectoryList::DI));
+        return array_merge(
+            $this->emptyDir(DirectoryList::GENERATED_CODE),
+            $this->emptyDir(DirectoryList::GENERATED_METADATA)
+        );
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Filesystem/DirectoryListTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Filesystem/DirectoryListTest.php
@@ -44,8 +44,8 @@ public function testGetDefaultConfig()
         $defaultConfig = DirectoryList::getDefaultConfig();
 
         $this->assertArrayHasKey(DirectoryList::GENERATED, $defaultConfig);
-        $this->assertArrayHasKey(DirectoryList::DI, $defaultConfig);
-        $this->assertArrayHasKey(DirectoryList::GENERATION, $defaultConfig);
+        $this->assertArrayHasKey(DirectoryList::GENERATED_METADATA, $defaultConfig);
+        $this->assertArrayHasKey(DirectoryList::GENERATED_CODE, $defaultConfig);
         $this->assertArrayHasKey(DirectoryList::ROOT, $defaultConfig);
         $this->assertArrayHasKey(DirectoryList::APP, $defaultConfig);
         $this->assertArrayHasKey(DirectoryList::CONFIG, $defaultConfig);
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/State/CleanupFilesTest.php b/lib/internal/Magento/Framework/App/Test/Unit/State/CleanupFilesTest.php
@@ -38,8 +38,8 @@ public function testClearCodeGeneratedClasses()
             ->will(
                 $this->returnValueMap(
                     [
-                        [DirectoryList::GENERATION, DriverPool::FILE, $dir1],
-                        [DirectoryList::DI, DriverPool::FILE, $dir2],
+                        [DirectoryList::GENERATED_CODE, DriverPool::FILE, $dir1],
+                        [DirectoryList::GENERATED_METADATA, DriverPool::FILE, $dir2],
                     ]
                 )
             );
diff --git a/lib/internal/Magento/Framework/Autoload/Populator.php b/lib/internal/Magento/Framework/Autoload/Populator.php
@@ -22,7 +22,7 @@ class Populator
      */
     public static function populateMappings(AutoloaderInterface $autoloader, DirectoryList $dirList)
     {
-        $generationDir = $dirList->getPath(DirectoryList::GENERATION);
+        $generationDir = $dirList->getPath(DirectoryList::GENERATED_CODE);
         $frameworkDir = $dirList->getPath(DirectoryList::LIB_INTERNAL);
 
         $autoloader->addPsr4('Magento\\', [$generationDir . '/Magento/'], true);
diff --git a/lib/internal/Magento/Framework/Autoload/Test/Unit/PopulatorTest.php b/lib/internal/Magento/Framework/Autoload/Test/Unit/PopulatorTest.php
@@ -35,7 +35,7 @@ public function testPopulateMappings()
             ->method('addPsr4')
             ->with(
                 'Magento\\',
-                [DirectoryList::GENERATION . '/Magento/'],
+                [DirectoryList::GENERATED_CODE . '/Magento/'],
                 true
             );
         $mockAutoloader->expects($this->at(1))
@@ -46,7 +46,7 @@ public function testPopulateMappings()
             ->with('Credis_', DirectoryList::LIB_INTERNAL, true);
         $mockAutoloader->expects($this->at(3))
             ->method('addPsr0')
-            ->with('', [DirectoryList::GENERATION]);
+            ->with('', [DirectoryList::GENERATED_CODE]);
 
         Populator::populateMappings($mockAutoloader, $this->mockDirectoryList);
     }
diff --git a/lib/internal/Magento/Framework/Code/GeneratedFiles.php b/lib/internal/Magento/Framework/Code/GeneratedFiles.php
@@ -78,8 +78,10 @@ public function cleanGeneratedFiles()
             //TODO: Till here
 
             $cachePath = $this->write->getRelativePath($this->directoryList->getPath(DirectoryList::CACHE));
-            $generationPath = $this->write->getRelativePath($this->directoryList->getPath(DirectoryList::GENERATION));
-            $diPath = $this->write->getRelativePath($this->directoryList->getPath(DirectoryList::DI));
+            $generationPath = $this->write->getRelativePath(
+                $this->directoryList->getPath(DirectoryList::GENERATED_CODE)
+            );
+            $diPath = $this->write->getRelativePath($this->directoryList->getPath(DirectoryList::GENERATED_METADATA));
 
             // Clean generated/code dir
             if ($this->write->isDirectory($generationPath)) {
diff --git a/lib/internal/Magento/Framework/Code/Generator/Io.php b/lib/internal/Magento/Framework/Code/Generator/Io.php
@@ -6,7 +6,6 @@
 namespace Magento\Framework\Code\Generator;
 
 use Magento\Framework\Exception\FileSystemException;
-use Magento\Framework\Filesystem\DriverInterface;
 
 class Io
 {
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratedFilesTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratedFilesTest.php
@@ -77,8 +77,8 @@ public function cleanGeneratedFilesDataProvider()
         $pathToConfig = 'path/to/config';
 
         $getPathMap =     [
-            [DirectoryList::GENERATION, $pathToGeneration],
-            [DirectoryList::DI, $pathToDi],
+            [DirectoryList::GENERATED_CODE, $pathToGeneration],
+            [DirectoryList::GENERATED_METADATA, $pathToDi],
             [DirectoryList::CACHE, $pathToCache],
             [DirectoryList::CONFIG, $pathToConfig],
         ];
diff --git a/lib/internal/Magento/Framework/Console/Cli.php b/lib/internal/Magento/Framework/Console/Cli.php
@@ -98,8 +98,8 @@ public function doRun(Console\Input\InputInterface $input, Console\Output\Output
             $output->writeln(
                 "<error>We're sorry, an error occurred. Try clearing the cache and code generation directories. "
                 . "By default, they are: " . $this->getDefaultDirectoryPath(DirectoryList::CACHE) . ", "
-                . $this->getDefaultDirectoryPath(DirectoryList::DI) . ", "
-                . $this->getDefaultDirectoryPath(DirectoryList::GENERATION) . ", and var/page_cache.</error>"
+                . $this->getDefaultDirectoryPath(DirectoryList::GENERATED_METADATA) . ", "
+                . $this->getDefaultDirectoryPath(DirectoryList::GENERATED_CODE) . ", and var/page_cache.</error>"
             );
 
             throw $this->initException;
@@ -241,7 +241,7 @@ private function writeGenerationDirectoryReadError()
         $output->writeln(
             '<error>'
             . 'Command line user does not have read and write permissions on '
-            . $this->getDefaultDirectoryPath(DirectoryList::GENERATION) . ' directory. '
+            . $this->getDefaultDirectoryPath(DirectoryList::GENERATED_CODE) . ' directory. '
             . 'Please address this issue before using Magento command line.'
             . '</error>'
         );
diff --git a/lib/internal/Magento/Framework/Console/GenerationDirectoryAccess.php b/lib/internal/Magento/Framework/Console/GenerationDirectoryAccess.php
@@ -44,7 +44,7 @@ public function check()
             ? $initParams[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS]
             : [];
         $directoryList = new DirectoryList(BP, $filesystemDirPaths);
-        $generationDirectoryPath = $directoryList->getPath(DirectoryList::GENERATION);
+        $generationDirectoryPath = $directoryList->getPath(DirectoryList::GENERATED_CODE);
         $driverPool = new DriverPool();
         $fileWriteFactory = new WriteFactory($driverPool);
         /** @var \Magento\Framework\Filesystem\DriverInterface $driver */
diff --git a/lib/internal/Magento/Framework/Setup/FilePermissions.php b/lib/internal/Magento/Framework/Setup/FilePermissions.php
@@ -143,8 +143,8 @@ private function checkRecursiveDirectories($directory)
             \RecursiveIteratorIterator::CHILD_FIRST
         );
         $noWritableFilesFolders = [
-            $this->directoryList->getPath(DirectoryList::GENERATION) . '/',
-            $this->directoryList->getPath(DirectoryList::DI) . '/',
+            $this->directoryList->getPath(DirectoryList::GENERATED_CODE) . '/',
+            $this->directoryList->getPath(DirectoryList::GENERATED_METADATA) . '/',
         ];
 
         $directoryIterator = new Filter($directoryIterator, $noWritableFilesFolders);
diff --git a/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php b/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
@@ -132,7 +132,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $modulePaths = $this->componentRegistrar->getPaths(ComponentRegistrar::MODULE);
         $libraryPaths = $this->componentRegistrar->getPaths(ComponentRegistrar::LIBRARY);
-        $generationPath = $this->directoryList->getPath(DirectoryList::GENERATION);
+        $generationPath = $this->directoryList->getPath(DirectoryList::GENERATED_CODE);
 
         $this->objectManager->get(\Magento\Framework\App\Cache::class)->clean();
         $compiledPathsList = [
@@ -152,7 +152,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->cleanupFilesystem(
                 [
                     DirectoryList::CACHE,
-                    DirectoryList::DI,
+                    DirectoryList::GENERATED_METADATA,
                 ]
             );
             foreach ($operations as $operationCode => $arguments) {
diff --git a/setup/src/Magento/Setup/Console/CompilerPreparation.php b/setup/src/Magento/Setup/Console/CompilerPreparation.php
@@ -73,8 +73,8 @@ public function handleCompilerEnvironment()
             ? $mageInitParams[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS]
             : [];
         $directoryList = new DirectoryList(BP, $mageDirs);
-        $compileDirList[] = $directoryList->getPath(DirectoryList::GENERATION);
-        $compileDirList[] = $directoryList->getPath(DirectoryList::DI);
+        $compileDirList[] = $directoryList->getPath(DirectoryList::GENERATED_CODE);
+        $compileDirList[] = $directoryList->getPath(DirectoryList::GENERATED_METADATA);
 
         if (!$this->getGenerationDirectoryAccess()->check()) {
             throw new FileSystemException(
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
@@ -73,7 +73,8 @@ public function getList($path)
         foreach ($this->classesScanner->getList($path) as $className) {
             try {
                 // validate all classes except classes in generated/code dir
-                if (!strpos($path, DirectoryList::getDefaultConfig()[DirectoryList::GENERATION][DirectoryList::PATH])) {
+                $generatedCodeDir = DirectoryList::getDefaultConfig()[DirectoryList::GENERATED_CODE];
+                if (!strpos($path, $generatedCodeDir[DirectoryList::PATH])) {
                     $this->validator->validate($className);
                 }
                 $nameList[] = $className;
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Writer/Filesystem.php b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Writer/Filesystem.php
@@ -46,7 +46,7 @@ public function write($key, array $config)
         $this->initialize();
 
         file_put_contents(
-            $this->directoryList->getPath(DirectoryList::DI) . '/' . $key  . '.ser',
+            $this->directoryList->getPath(DirectoryList::GENERATED_METADATA) . '/' . $key  . '.ser',
             $this->getSerializer()->serialize($config)
         );
     }
@@ -58,8 +58,8 @@ public function write($key, array $config)
      */
     private function initialize()
     {
-        if (!file_exists($this->directoryList->getPath(DirectoryList::DI))) {
-            mkdir($this->directoryList->getPath(DirectoryList::DI));
+        if (!file_exists($this->directoryList->getPath(DirectoryList::GENERATED_METADATA))) {
+            mkdir($this->directoryList->getPath(DirectoryList::GENERATED_METADATA));
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -105,8 +105,8 @@ public function enableDeveloperMode()`
`105`	`105`	`$this->filesystem->cleanupFilesystem(`
`106`	`106`	`[`
`107`	`107`	`DirectoryList::CACHE,`
`108`		`- DirectoryList::GENERATION,`
`109`		`- DirectoryList::DI,`
	`108`	`+ DirectoryList::GENERATED_CODE,`
	`109`	`+ DirectoryList::GENERATED_METADATA,`
`110`	`110`	`DirectoryList::TMP_MATERIALIZATION_DIR,`
`111`	`111`	`DirectoryList::STATIC_VIEW,`
`112`	`112`	`]`
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,5 @@`
`19`	`19`	`]`
`20`	`20`	`);`
`21`	`21`
`22`		`-$generatedCode = DirectoryList::getDefaultConfig()[DirectoryList::GENERATION][DirectoryList::PATH];`
	`22`	`+$generatedCode = DirectoryList::getDefaultConfig()[DirectoryList::GENERATED_CODE][DirectoryList::PATH];`
`23`	`23`	`$autoloadWrapper->addPsr4('Magento\\', $baseDir . '/' . $generatedCode . '/Magento/');`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`$autoloader = new \Magento\Framework\TestFramework\Unit\Autoloader\ExtensionGeneratorAutoloader(`
`10`	`10`	`new \Magento\Framework\Code\Generator\Io(`
`11`	`11`	`new \Magento\Framework\Filesystem\Driver\File(),`
`12`		`- TESTS_TEMP_DIR . '/'. DirectoryList::getDefaultConfig()[DirectoryList::GENERATION][DirectoryList::PATH]`
	`12`	`+ TESTS_TEMP_DIR . '/'. DirectoryList::getDefaultConfig()[DirectoryList::GENERATED_CODE][DirectoryList::PATH]`
`13`	`13`	`)`
`14`	`14`	`);`
`15`	`15`	`spl_autoload_register([$autoloader, 'load']);`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function load($area)`
`45`	`45`	`*/`
`46`	`46`	`public static function getFilePath($area)`
`47`	`47`	`{`
`48`		`- $diPath = DirectoryList::getDefaultConfig()[DirectoryList::DI][DirectoryList::PATH];`
	`48`	`+ $diPath = DirectoryList::getDefaultConfig()[DirectoryList::GENERATED_METADATA][DirectoryList::PATH];`
`49`	`49`	`return BP . '/' . $diPath . '/' . $area . '.ser';`
`50`	`50`	`}`
`51`	`51`