MAGETWO-68928: Fatal error after disabling module

Author: shiftedreality

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

@@ -7,10 +7,8 @@
 
 use Magento\Framework\App\Bootstrap;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem\DriverInterface;
+use Magento\Framework\Filesystem\Directory\WriteFactory;
 use Magento\Framework\Filesystem\DriverPool;
-use Magento\Framework\Filesystem\File\WriteFactory;
-use Magento\Framework\Filesystem\Directory\Write;
 use Zend\ServiceManager\ServiceManager;
 use Magento\Setup\Mvc\Bootstrap\InitParamListener;
 
@@ -34,7 +32,7 @@ public function __construct(
     }
 
     /**
-     * Check generated/code read and write access
+     * Check write permissions to generation folders
      *
      * @return bool
      */
@@ -47,8 +45,6 @@ public function check()
         $directoryList = new DirectoryList(BP, $filesystemDirPaths);
         $driverPool = new DriverPool();
         $fileWriteFactory = new WriteFactory($driverPool);
-        /** @var \Magento\Framework\Filesystem\DriverInterface $driver */
-        $driver = $driverPool->getDriver(DriverPool::FILE);
 
         $generationDirs = [
             DirectoryList::GENERATED,
@@ -58,50 +54,21 @@ public function check()
 
         foreach ($generationDirs as $generationDirectory) {
             $directoryPath = $directoryList->getPath($generationDirectory);
+            $directoryWrite = $fileWriteFactory->create($directoryPath);
 
-            if (!$this->checkDirectory($fileWriteFactory, $driver, $directoryPath)) {
-                return false;
+            if (!$directoryWrite->isExist()) {
+                try {
+                    $directoryWrite->create();
+                } catch (\Exception $e) {
+                    return false;
+                }
             }
-        }
-
-        return true;
-    }
 
-    /**
-     * Checks the permissions to specific directory
-     *
-     * @param WriteFactory $fileWriteFactory The factory of file writers
-     * @param DriverInterface $driver The driver
-     * @param string $directoryPath The directory path
-     * @return bool
-     */
-    private function checkDirectory(
-        WriteFactory $fileWriteFactory,
-        DriverInterface $driver,
-        $directoryPath
-    ) {
-        $directoryWrite = new Write($fileWriteFactory, $driver, $directoryPath);
-
-        if (!$directoryWrite->isExist()) {
-            try {
-                $directoryWrite->create();
-            } catch (\Exception $e) {
+            if (!$directoryWrite->isWritable()) {
                 return false;
             }
         }
 
-        if (!$directoryWrite->isDirectory() || !$directoryWrite->isReadable()) {
-            return false;
-        }
-
-        try {
-            $probeFilePath = $directoryPath . DIRECTORY_SEPARATOR . uniqid(mt_rand()) . 'tmp';
-            $fileWriteFactory->create($probeFilePath, DriverPool::FILE, 'w');
-            $driver->deleteFile($probeFilePath);
-        } catch (\Exception $e) {
-            return false;
-        }
-
         return true;
     }
 }

setup/src/Magento/Setup/Console/CompilerPreparation.php

@@ -72,6 +72,10 @@ public function handleCompilerEnvironment()
             return;
         }
 
+        if (!$this->getGenerationDirectoryAccess()->check()) {
+            throw new GenerationDirectoryAccessException();
+        }
+
         $mageInitParams = $this->serviceManager->get(InitParamListener::BOOTSTRAP_PARAM);
         $mageDirs = isset($mageInitParams[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS])
             ? $mageInitParams[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS]
@@ -82,10 +86,6 @@ public function handleCompilerEnvironment()
             $directoryList->getPath(DirectoryList::GENERATED_METADATA),
         ];
 
-        if (!$this->getGenerationDirectoryAccess()->check()) {
-            throw new GenerationDirectoryAccessException();
-        }
-
         foreach ($compileDirList as $compileDir) {
             if ($this->filesystemDriver->isExists($compileDir)) {
                 $this->filesystemDriver->deleteDirectory($compileDir);