Merge pull request #534 from magento-extensibility/MAGETWO-51508-multitenant-compiler

[Extensibility] Bug fixes

Author: monkeysee

dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php

@@ -9,6 +9,7 @@
 
 use Magento\Framework\Api\Code\Generator\Mapper;
 use Magento\Framework\Api\Code\Generator\SearchResults;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\ObjectManager\Code\Generator\Converter;
 use Magento\Framework\ObjectManager\Code\Generator\Factory;
@@ -42,11 +43,6 @@ class CompilerTest extends \PHPUnit_Framework_TestCase
      */
     protected $_compilationDir;
 
-    /**
-     * @var string
-     */
-    protected $_tmpDir;
-
     /**
      * @var \Magento\Framework\ObjectManager\Config\Mapper\Dom()
      */
@@ -70,17 +66,11 @@ protected function setUp()
         $basePath = BP;
         $basePath = str_replace('\\', '/', $basePath);
 
-        $this->_tmpDir = realpath(__DIR__) . '/tmp';
-        $this->_generationDir = $this->_tmpDir . '/generation';
-        if (!file_exists($this->_generationDir)) {
-            mkdir($this->_generationDir, 0777, true);
-        }
-        $this->_compilationDir = $this->_tmpDir . '/di';
-        if (!file_exists($this->_compilationDir)) {
-            mkdir($this->_compilationDir, 0777, true);
-        }
+        $directoryList = new DirectoryList($basePath);
+        $this->_generationDir = $directoryList->getPath(DirectoryList::GENERATION);
+        $this->_compilationDir = $directoryList->getPath(DirectoryList::DI);
 
-        $this->_command = 'php ' . $basePath . '/bin/magento setup:di:compile-multi-tenant --generation=%s --di=%s';
+        $this->_command = 'php ' . $basePath . '/bin/magento setup:di:compile';
 
         $booleanUtils = new \Magento\Framework\Stdlib\BooleanUtils();
         $constInterpreter = new \Magento\Framework\Data\Argument\Interpreter\Constant();
@@ -116,14 +106,6 @@ protected function setUp()
         $this->pluginValidator = new \Magento\Framework\Interception\Code\InterfaceValidator();
     }
 
-    protected function tearDown()
-    {
-        $filesystem = new \Magento\Framework\Filesystem\Driver\File();
-        if ($filesystem->isExists($this->_tmpDir)) {
-            $filesystem->deleteDirectory($this->_tmpDir);
-        }
-    }
-
     /**
      * Validate DI config file
      *
@@ -412,7 +394,7 @@ protected function pluginDataProvider()
     public function testCompiler()
     {
         try {
-            $this->_shell->execute($this->_command, [$this->_generationDir, $this->_compilationDir]);
+            $this->_shell->execute($this->_command);
         } catch (\Magento\Framework\Exception\LocalizedException $exception) {
             $this->fail($exception->getPrevious()->getMessage());
         }

lib/internal/Magento/Framework/App/Response/Http.php

@@ -156,7 +156,7 @@ public function representJson($content)
      */
     public function __sleep()
     {
-        return ['content', 'isRedirect', 'statusCode', 'context'];
+        return ['content', 'isRedirect', 'statusCode', 'context', 'headers'];
     }
 
     /**

lib/internal/Magento/Framework/Console/GenerationDirectoryAccess.php

@@ -57,7 +57,7 @@ public function check()
                 try {
                     $probeFilePath = $generationDirectoryPath . DIRECTORY_SEPARATOR . time();
                     $fileWriteFactory->create($probeFilePath, DriverPool::FILE, 'w');
-                    $directoryWrite->delete($probeFilePath);
+                    $driver->deleteFile($probeFilePath);
                 } catch (\Exception $e) {
                     return false;
                 }

setup/src/Magento/Setup/Console/Command/DiCompileCommand.php

@@ -111,18 +111,6 @@ private function checkEnvironment()
             $messages[] = 'You cannot run this command because the Magento application is not installed.';
         }
 
-        /**
-         * By the time the command is able to execute, the Object Management configuration is already contaminated
-         * by old config info, and it's too late to just clear the files in code.
-         *
-         * TODO: reconfigure OM in runtime so DI resources can be cleared after command launches
-         *
-         */
-        $path = $this->directoryList->getPath(DirectoryList::DI);
-        if ($this->fileDriver->isExists($path)) {
-            $messages[] = "DI configuration must be cleared before running compiler. Please delete '$path'.";
-        }
-
         return $messages;
     }