Merge branch 'QA_4_6'

phpmyadmin · Apr 19, 2016 · c2419ee · c2419ee
2 parents d019757 + 8b29917
commit c2419ee
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 1,143 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -3,7 +3,7 @@ imports:
     - javascript
     - php
 filter:
-    excluded_paths: [libraries/bfShapeFiles/*, PMAStandard/*, js/jquery/*, js/jqplot/*, js/openlayers/*, js/codemirror/*, js/canvg/*, js/tracekit/*, js/sprintf.js]
+    excluded_paths: [libraries/bfShapeFiles/*, js/jquery/*, js/jqplot/*, js/openlayers/*, js/codemirror/*, js/canvg/*, js/tracekit/*, js/sprintf.js]
 tools:
     php_code_sniffer:
         config:

diff --git a/PMAStandard/Sniffs/Commenting/ClassCommentSniff.php b/PMAStandard/Sniffs/Commenting/ClassCommentSniff.php