Remove no longer needed excludes from build configuration

Signed-off-by: Michal Čihař <michal@cihar.com>
phpmyadmin · Feb 22, 2016 · 315e7d3 · 315e7d3
1 parent 08277b0
commit 315e7d3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/build.xml b/build.xml
@@ -55,7 +55,7 @@
    <arg line="${source_comma_sep}
               xml
               codesize,design,naming,unusedcode
-              --exclude test,build,tcpdf,php-gettext,bfShapeFiles,PMAStandard,phpseclib,recaptchalib.php,vendor,sql-parser
+              --exclude test,build,bfShapeFiles,PMAStandard,recaptchalib.php,vendor
               --reportfile '${basedir}/build/logs/pmd.xml'" />
   </exec>
  </target>
@@ -67,12 +67,9 @@
               --exclude PMAStandard
               --exclude build
               --exclude vendor
-              --exclude libraries/tcpdf
               --exclude libraries/php-gettext
               --exclude libraries/bfShapeFiles
-              --exclude libraries/phpseclib
               --exclude libraries/plugins/auth/recaptcha/recaptchalib.php
-              --exclude libraries/sql-parser
               ${source}" />
   </exec>
  </target>
@@ -84,20 +81,17 @@
               --exclude PMAStandard
               --exclude build
               --exclude vendor
-              --exclude libraries/tcpdf
               --exclude libraries/php-gettext
               --exclude libraries/bfShapeFiles
-              --exclude libraries/phpseclib
               --exclude libraries/plugins/auth/recaptcha/recaptchalib.php
-              --exclude libraries/sql-parser
               ${source}" />
   </exec>
  </target>
 
  <target name="phpcs" description="Generate checkstyle.xml using PHP_CodeSniffer excluding third party libraries">
   <exec executable="phpcs">
    <arg line="
-              --ignore=*/php-gettext/*,*/vendor/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/openlayers/*,*/jquery/*,*/jqplot/*,*/build/*,*/bfShapeFiles/*,*/PMAStandard/*,*/phpseclib/*,*/recaptcha/*,*/sql-parser/*
+              --ignore=*/php-gettext/*,*/vendor/*,*/canvg/*,*/codemirror/*,*/openlayers/*,*/jquery/*,*/jqplot/*,*/build/*,*/bfShapeFiles/*,*/PMAStandard/*,*/recaptcha/*
               --report=checkstyle
               --extensions=php
               --report-file='${basedir}/build/logs/checkstyle.xml'

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -47,9 +47,6 @@
                 <directory suffix=".inc">libraries/php-gettext</directory>
                 <directory suffix=".php">libraries/bfShapeFiles</directory>
                 <directory suffix=".php">libraries/php-gettext</directory>
-                <directory suffix=".php">libraries/phpseclib</directory>
-                <directory suffix=".php">libraries/sql-parser</directory>
-                <directory suffix=".php">libraries/tcpdf</directory>
                 <!-- code sniffer checker -->
                 <directory suffix=".php">PMAStandard</directory>
                 <!-- examples for users -->