Merge pull request #35 from magento-extensibility/MAGETWO-32602-stati…

…c-tests-not-run Magetwo 32602 static tests not run
magento · Jan 14, 2015 · 9d94e6c · 9d94e6c
2 parents c92a39f + 6d638bb
commit 9d94e6c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -183,6 +183,9 @@
             "tinymce/tinymce": "lib/web/tiny_mce"
         }
     },
+    "config": {
+        "use-include-path": true
+    },
     "autoload": {
         "psr-4": {
             "Magento\\Framework\\": "lib/internal/Magento/Framework/"

diff --git a/composer.lock b/composer.lock
diff --git a/dev/tests/static/framework/Magento/TestFramework/Inspection/WordsFinder.php b/dev/tests/static/framework/Magento/TestFramework/Inspection/WordsFinder.php
@@ -240,6 +240,7 @@ public function findWords($file)
      *
      * @param  string $file
      * @return array
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     protected function _findWords($file)
     {