Merge pull request #161 from magento-architects/ECP-513-stabilization

ECP-513: Static tests fixes for Catalog Storefront

Author: Igor Melnikov

dev/tests/integration/framework/Magento/TestFramework/Application.php

@@ -168,10 +168,12 @@ public function __construct(
         $loadTestExtensionAttributes = false
     ) {
         if (getcwd() != BP . '/dev/tests/integration') {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             chdir(BP . '/dev/tests/integration');
         }
         $this->_shell = $shell;
         $this->installConfigFile = $installConfigFile;
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         $this->_globalConfigDir = realpath($globalConfigDir);
         $this->_appMode = $appMode;
         $this->installDir = $installDir;
@@ -251,6 +253,7 @@ public function getDbInstance()
     protected function getInstallConfig()
     {
         if (null === $this->installConfig) {
+            // phpcs:ignore Magento2.Security.IncludeFile
             $this->installConfig = include $this->installConfigFile;
         }
         return $this->installConfig;
@@ -293,6 +296,7 @@ public function getInitParams()
      */
     public function isInstalled()
     {
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         return is_file($this->getLocalConfig());
     }
 
@@ -426,6 +430,8 @@ public function initialize($overriddenParams = [])
 
     /**
      * Create dynamic tables
+     *
+     * @return void
      */
     protected function createDynamicTables()
     {
@@ -562,8 +568,10 @@ private function copyAppConfigFiles()
         );
         foreach ($globalConfigFiles as $file) {
             $targetFile = $this->_configDir . str_replace($this->_globalConfigDir, '', $file);
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $this->_ensureDirExists(dirname($targetFile));
             if ($file !== $targetFile) {
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
                 copy($file, $targetFile);
             }
         }
@@ -577,6 +585,7 @@ private function copyAppConfigFiles()
     private function copyGlobalConfigFile()
     {
         $targetFile = $this->_configDir . '/config.local.php';
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         copy($this->globalConfigFile, $targetFile);
     }
 
@@ -646,10 +655,13 @@ protected function _resetApp()
      */
     protected function _ensureDirExists($dir)
     {
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         if (!file_exists($dir)) {
             $old = umask(0);
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             mkdir($dir, 0777, true);
             umask($old);
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         } elseif (!is_dir($dir)) {
             throw new \Magento\Framework\Exception\LocalizedException(__("'%1' is not a directory.", $dir));
         }

dev/tests/setup-integration/framework/Magento/TestFramework/SetupApplication.php

@@ -32,15 +32,17 @@ class SetupApplication extends Application
      */
     public function run()
     {
+        // phpcs:ignore Magento2.Exceptions.DirectThrow
         throw new \Exception("Can't start application.");
     }
 
     /**
      * Create dynamic tables
      *
-     * phpcs:ignore Generic.CodeAnalysis.EmptyStatement
+     * @return null
      */
     protected function createDynamicTables()
     {
+        return null;
     }
 }