Merge remote-tracking branch 'origin/master'

build.xml

@@ -44,7 +44,7 @@
    <arg line="${source_comma_sep}
               xml
               codesize,design,naming,unusedcode
-              --exclude lib/Cake/,vendors/
+              --exclude test,build,tcpdf,php-gettext,bfShapeFiles,PMAStandard,phpseclib,recaptchalib.php,swekey.php
               --reportfile '${basedir}/build/logs/pmd.xml'" />
   </exec>
  </target>
@@ -86,6 +86,7 @@
    <arg line="
 	      --ignore=*/php-gettext/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/openlayers/*,*/jquery/*,*/jqplot/*,*/build/*,*/bfShapeFiles/*,*/PMAStandard/*,*/phpseclib/*,*/recaptchalib.php,*/swekey.php
               --report=checkstyle
+              --extensions=php
               --report-file='${basedir}/build/logs/checkstyle.xml'
               --standard=PMAStandard
               ${source}" />