Merge remote-tracking branch 'falconsce/MAGETWO-63216' into MAGETWO-64335

Author: Yevhen Miroshnychenko

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

@@ -6,6 +6,8 @@
 namespace Magento\Deploy\Model;
 
 use Symfony\Component\Console\Output\OutputInterface;
+use Magento\Framework\App\State;
+use Magento\Framework\App\DeploymentConfig\Writer;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\User\Model\ResourceModel\User\Collection as UserCollection;
@@ -26,8 +28,8 @@ class Filesystem
      * Access permissions to the files are set during deploy Magento 2, directly after
      * uploading code of Magento. Also it is possible to specify the value
      * of inverse mask for setting access permissions to files generated by Magento.
-     * @see http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html.
-     * @see http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html}.
+     * @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
+     * @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
      */
     const PERMISSIONS_FILE = 0640;
 
@@ -38,8 +40,8 @@ class Filesystem
      * Access permissions to the directories are set during deploy Magento 2, directly after
      * uploading code of Magento. Also it is possible to specify the value
      * of inverse mask for setting access permissions to directories generated by Magento.
-     * @see http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html umask
-     * @see http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html}
+     * @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
+     * @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
      */
     const PERMISSIONS_DIR = 0750;
 
@@ -308,8 +310,8 @@ public function cleanupFilesystem($directoryCodeList)
      * Access permissions to the files and directories are set during deploy Magento 2, directly after
      * uploading code of Magento. Also it is possible to specify the value
      * of inverse mask for setting access permissions to files and directories generated by Magento.
-     * @see http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
-     * @see http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html}
+     * @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
+     * @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
      */
     protected function changePermissions($directoryCodeList, $dirPermissions, $filePermissions)
     {
@@ -332,8 +334,8 @@ protected function changePermissions($directoryCodeList, $dirPermissions, $fileP
      * Access permissions to the files and directories are set during deploy Magento 2, directly after
      * uploading code of Magento. Also it is possible to specify the value
      * of inverse mask for setting access permissions to files and directories generated by Magento.
-     * @see http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
-     * @see http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html}
+     * @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
+     * @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
      */
     public function lockStaticResources()
     {

app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php

@@ -8,6 +8,8 @@
 
 namespace Magento\Wishlist\Test\Unit\Model\Rss;
 
+use Magento\Directory\Helper\Data;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */

dev/tests/functional/lib/Magento/Mtf/Util/Command/GeneratedCode.php

@@ -6,6 +6,7 @@
 namespace Magento\Mtf\Util\Command;
 
 use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
 
 /**
  * GeneratedCode removes generated code of Magento (like generated/code and generated/metadata).

dev/tests/functional/lib/Magento/Mtf/Util/Command/PathChecker.php

@@ -6,6 +6,7 @@
 namespace Magento\Mtf\Util\Command;
 
 use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
 
 /**
  * PathChecker checks that path to file or directory exists.

dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php

@@ -9,6 +9,7 @@
 use Magento\Install\Test\Page\Install;
 use Magento\Install\Test\Page\DevdocsInstall;
 use Magento\Install\Test\Fixture\Install as InstallConfig;
+use Magento\User\Test\Fixture\User;
 use Magento\Mtf\Fixture\FixtureFactory;
 use Magento\Mtf\TestCase\Injectable;
 use Magento\Install\Test\Constraint\AssertAgreementTextPresent;

setup/src/Magento/Setup/Model/Installer.php

@@ -10,6 +10,7 @@
 use Magento\Framework\App\DeploymentConfig\Reader;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\MaintenanceMode;
+use Magento\Framework\App\ResourceConnection\Config;
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Config\ConfigOptionsListConstants;
 use Magento\Framework\Config\Data\ConfigData;
@@ -18,6 +19,7 @@
 use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\Framework\Module\ModuleList\Loader as ModuleLoader;
 use Magento\Framework\Module\ModuleListInterface;
+use Magento\Framework\Shell;
 use Magento\Framework\Setup\InstallSchemaInterface;
 use Magento\Framework\Setup\LoggerInterface;
 use Magento\Framework\Setup\UpgradeSchemaInterface;
@@ -31,6 +33,7 @@
 use Magento\Setup\Module\SetupFactory;
 use Magento\Store\Model\Store;
 use Magento\Setup\Module\ConnectionFactory;
+use Magento\Setup\Module\Setup;
 use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\App\State\CleanupFiles;
 use Magento\Setup\Console\Command\InstallCommand;