Merge remote-tracking branch 'origin/MAGETWO-31575' into static_tests

Author: dkvashninbay

dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/BlacklistInterface.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\TestFramework\CodingStandard\Tool;
+
+interface BlacklistInterface
+{
+    /**
+     * Set list of paths to be excluded from tool run
+     *
+     * @param array $blackList
+     * @return void
+     */
+    public function setBlackList(array $blackList);
+}

dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeMessDetector.php

@@ -8,21 +8,23 @@
  */
 namespace Magento\TestFramework\CodingStandard\Tool;
 
-class CodeMessDetector implements \Magento\TestFramework\CodingStandard\ToolInterface
+use \Magento\TestFramework\CodingStandard\ToolInterface;
+
+class CodeMessDetector implements ToolInterface
 {
     /**
      * Ruleset directory
      *
      * @var string
      */
-    protected $_rulesetFile;
+    private $rulesetFile;
 
     /**
      * Report file
      *
      * @var string
      */
-    protected $_reportFile;
+    private $reportFile;
 
     /**
      * Constructor
@@ -32,8 +34,8 @@ class CodeMessDetector implements \Magento\TestFramework\CodingStandard\ToolInte
      */
     public function __construct($rulesetFile, $reportFile)
     {
-        $this->_reportFile = $reportFile;
-        $this->_rulesetFile = $rulesetFile;
+        $this->reportFile = $reportFile;
+        $this->rulesetFile = $rulesetFile;
     }
 
     /**
@@ -47,25 +49,21 @@ public function canRun()
     }
 
     /**
-     * Run tool for files specified
-     *
-     * @param array $whiteList Files/directories to be inspected
-     * @param array $blackList Files/directories to be excluded from the inspection
-     * @param array $extensions Array of alphanumeric strings, for example: 'php', 'xml', 'phtml', 'css'...
-     *
-     * @return int
+     * {@inheritdoc}
      */
-    public function run(array $whiteList, array $blackList = [], array $extensions = [])
+    public function run(array $whiteList)
     {
+        if (empty($whiteList)) {
+            return \PHP_PMD_TextUI_Command::EXIT_SUCCESS;
+        }
+
         $commandLineArguments = [
             'run_file_mock', //emulate script name in console arguments
             implode(',', $whiteList),
             'xml', //report format
-            $this->_rulesetFile,
-            '--exclude',
-            implode(',', $blackList),
+            $this->rulesetFile,
             '--reportfile',
-            $this->_reportFile,
+            $this->reportFile,
         ];
 
         $options = new \PHP_PMD_TextUI_CommandLineOptions($commandLineArguments);

dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer.php

@@ -11,28 +11,35 @@
 use Magento\TestFramework\CodingStandard\Tool\CodeSniffer\Wrapper;
 use Magento\TestFramework\CodingStandard\ToolInterface;
 
-class CodeSniffer implements ToolInterface
+class CodeSniffer implements ToolInterface, ExtensionInterface
 {
     /**
      * Ruleset directory
      *
      * @var string
      */
-    protected $rulesetDir;
+    private $rulesetDir;
 
     /**
      * Report file
      *
      * @var string
      */
-    protected $reportFile;
+    private $reportFile;
 
     /**
      * PHPCS cli tool wrapper
      *
      * @var Wrapper
      */
-    protected $wrapper;
+    private $wrapper;
+
+    /**
+     * List of extensions for tool run
+     *
+     * @var array
+     */
+    private $extensions = ['php'];
 
     /**
      * Constructor
@@ -49,64 +56,41 @@ public function __construct($rulesetDir, $reportFile, Wrapper $wrapper)
     }
 
     /**
-     * Whether the tool can be ran on the current environment
-     *
-     * @return bool
+     * {@inheritdoc}
      */
-    public function canRun()
+    public function setExtensions(array $extensions)
     {
-        return class_exists('PHP_CodeSniffer_CLI');
+        $this->extensions = $extensions;
     }
 
     /**
-     * Return the version of code sniffer found
+     * Whether the tool can be ran on the current environment
      *
-     * @return string
+     * @return bool
      */
-    public function version()
+    public function canRun()
     {
-        return $this->wrapper->version();
+        return class_exists('PHP_CodeSniffer_CLI');
     }
 
     /**
-     * Run tool for files specified
-     *
-     * @param array $whiteList Files/directories to be inspected
-     * @param array $blackList Files/directories to be excluded from the inspection
-     * @param array $extensions Array of alphanumeric strings, for example: 'php', 'xml', 'phtml', 'css'...
-     * @param int $warningSeverity Severity level of warnings, default is 0
-     *
-     * @return int
+     * {@inheritdoc}
      */
-    public function run(
-        array $whiteList,
-        array $blackList = [],
-        array $extensions = [],
-        $warningSeverity = 0
-    ) {
-        $whiteList = array_map(
-            function ($item) {
-                return $item;
-            },
-            $whiteList
-        );
-
-        $blackList = array_map(
-            function ($item) {
-                return preg_quote($item);
-            },
-            $blackList
-        );
+    public function run(array $whiteList)
+    {
+        if (empty($whiteList)) {
+            return 0;
+        }
 
         $this->wrapper->checkRequirements();
         $settings = $this->wrapper->getDefaults();
         $settings['files'] = $whiteList;
         $settings['standard'] = [$this->rulesetDir];
-        $settings['ignored'] = $blackList;
-        $settings['extensions'] = $extensions;
+        $settings['extensions'] = $this->extensions;
         $settings['reportFile'] = $this->reportFile;
-        $settings['warningSeverity'] = $warningSeverity;
+        $settings['warningSeverity'] = 0;
         $settings['reports']['checkstyle'] = null;
+
         $this->wrapper->setValues($settings);
 
         ob_start();
@@ -115,14 +99,4 @@ function ($item) {
 
         return $result;
     }
-
-    /**
-     * Get report file
-     *
-     * @return string
-     */
-    public function getReportFile()
-    {
-        return $this->reportFile;
-    }
 }

dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CopyPasteDetector.php

@@ -8,14 +8,23 @@
  */
 namespace Magento\TestFramework\CodingStandard\Tool;
 
-class CopyPasteDetector implements \Magento\TestFramework\CodingStandard\ToolInterface
+use Magento\TestFramework\CodingStandard\ToolInterface;
+
+class CopyPasteDetector implements ToolInterface, BlacklistInterface
 {
     /**
      * Report file
      *
      * @var string
      */
-    protected $_reportFile;
+    private $reportFile;
+
+    /**
+     * List of paths to be excluded from tool run
+     *
+     * @var array
+     */
+    private $blacklist;
 
     /**
      * Constructor
@@ -24,7 +33,15 @@ class CopyPasteDetector implements \Magento\TestFramework\CodingStandard\ToolInt
      */
     public function __construct($reportFile)
     {
-        $this->_reportFile = $reportFile;
+        $this->reportFile = $reportFile;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setBlackList(array $blackList)
+    {
+        $this->blacklist = $blackList;
     }
 
     /**
@@ -44,17 +61,14 @@ public function canRun()
      * Run tool for files specified
      *
      * @param array $whiteList Files/directories to be inspected
-     * @param array $blackList Files/directories to be excluded from the inspection
-     * @param array $extensions Array of alphanumeric strings, for example: 'php', 'xml', 'phtml', 'css'...
+     * @return int
      *
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     *
-     * @return int
      */
-    public function run(array $whiteList, array $blackList = [], array $extensions = [])
+    public function run(array $whiteList)
     {
         $blackListStr = ' ';
-        foreach ($blackList as $file) {
+        foreach ($this->blacklist as $file) {
             $file = escapeshellarg(trim($file));
             if (!$file) {
                 continue;
@@ -63,8 +77,8 @@ public function run(array $whiteList, array $blackList = [], array $extensions =
         }
 
         $command = 'phpcpd' . ' --log-pmd ' . escapeshellarg(
-            $this->_reportFile
-        ) . ' --min-lines 13' . $blackListStr . ' ' . BP;
+                $this->reportFile
+            ) . ' --min-lines 13' . $blackListStr . ' ' . implode(' ', $whiteList);
 
         exec($command, $output, $exitCode);
 

dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/ExtensionInterface.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\TestFramework\CodingStandard\Tool;
+
+interface ExtensionInterface
+{
+    /**
+     * Set extensions for tool to run
+     * Example: 'php', 'xml', 'phtml', 'css'
+     *
+     * @param array $extensions
+     * @return void
+     */
+    public function setExtensions(array $extensions);
+}

dev/tests/static/framework/Magento/TestFramework/CodingStandard/ToolInterface.php

@@ -18,13 +18,10 @@ interface ToolInterface
     public function canRun();
 
     /**
-     * Run tool for files cpecified
+     * Run tool for files specified
      *
      * @param array $whiteList Files/directories to be inspected
-     * @param array $blackList Files/directories to be excluded from the inspection
-     * @param array $extensions Array of alphanumeric strings, for example: 'php', 'xml', 'phtml', 'css'...
-     *
      * @return int
      */
-    public function run(array $whiteList, array $blackList = [], array $extensions = []);
+    public function run(array $whiteList);
 }

dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php

@@ -5,6 +5,8 @@
 
 namespace Magento\TestFramework\Utility;
 
+use Magento\Framework\Test\Utility\Files;
+
 /**
  * A helper to gather various changed files
  * if INCREMENTAL_BUILD env variable is set by CI build infrastructure, only files changed in the
@@ -23,7 +25,12 @@ public static function getPhpFiles($changedFilesList)
         $fileHelper = \Magento\Framework\Test\Utility\Files::init();
         $allPhpFiles = $fileHelper->getPhpFiles();
         if (isset($_ENV['INCREMENTAL_BUILD'])) {
-            $phpFiles = file($changedFilesList, FILE_IGNORE_NEW_LINES);
+            try {
+                $phpFiles = Files::readLists($changedFilesList);
+            } catch (\Exception $e){
+                $phpFiles = [];
+            }
+
             foreach ($phpFiles as $key => $phpFile) {
                 $phpFiles[$key] = $fileHelper->getPathToSource() . '/' . $phpFile;
             }

dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php

@@ -60,9 +60,4 @@ public function testRun()
 
         $this->_tool->run($whiteList, $blackList, $extensions);
     }
-
-    public function testGetReportFile()
-    {
-        $this->assertEquals(self::REPORT_FILE, $this->_tool->getReportFile());
-    }
 }

dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php

@@ -129,7 +129,7 @@ function ($file) {
                 $this->_testObsoleteConstants($content);
                 $this->_testObsoletePropertySkipCalculate($content);
             },
-            \Magento\TestFramework\Utility\ChangedFiles::getPhpFiles(__DIR__ . '/_files/changed_files.txt')
+            \Magento\TestFramework\Utility\ChangedFiles::getPhpFiles(__DIR__ . '/_files/changed_files')
         );
     }