From 896519cf77b73234ded21f8c81f95ec931bcaeac Mon Sep 17 00:00:00 2001
From: Rouslan Placella <rouslan@placella.com>
Date: Thu, 21 Jul 2011 14:52:30 +0100
Subject: [PATCH 1/4] E_ALL fix

---
 libraries/rte/rte_routines.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php
index 9a99b8c395..2edb4ca331 100644
--- a/libraries/rte/rte_routines.lib.php
+++ b/libraries/rte/rte_routines.lib.php
@@ -1356,6 +1356,8 @@ function PMA_RTN_getExecuteForm($routine)
     }
     $retval .= "<th>" . __('Value')    . "</th>\n";
     $retval .= "</tr>\n";
+    // Get a list of data types that are not yet supported.
+    $no_support_types = PMA_unsupportedDatatypes();
     for ($i=0; $i<$routine['item_num_params']; $i++) { // Each parameter
         if ($routine['item_type'] == 'PROCEDURE'
             && $routine['item_param_dir'][$i] == 'OUT'
@@ -1368,8 +1370,6 @@ function PMA_RTN_getExecuteForm($routine)
         $retval .= "<td>{$routine['item_param_type'][$i]}</td>\n";
         if ($cfg['ShowFunctionFields']) {
             $retval .= "<td>\n";
-            // Get a list of data types that are not yet supported.
-            $no_support_types = PMA_unsupportedDatatypes();
             if (stristr($routine['item_param_type'][$i], 'enum')
                 || stristr($routine['item_param_type'][$i], 'set')
                 || in_array(strtolower($routine['item_param_type'][$i]), $no_support_types)

From 076ec61952dead1cc534751c3ecc82e880a20145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Fri, 22 Jul 2011 11:16:46 +0200
Subject: [PATCH 2/4] Exclude external libs for phpmd run

---
 build.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.xml b/build.xml
index ad4dc40597..3bffc9fabf 100644
--- a/build.xml
+++ b/build.xml
@@ -38,6 +38,7 @@
    <arg line="${source_comma_sep}
               xml
               codesize,design,naming,unusedcode
+              --exclude test,build,PHPExcel,tcpdf
               --reportfile ${basedir}/build/logs/pmd.xml" />
   </exec>
  </target>

From 09f9a2643727c59e6b193eb9ca403ad42debc338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Fri, 22 Jul 2011 11:17:20 +0200
Subject: [PATCH 3/4] Exclude php-gettext as well

---
 build.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 3bffc9fabf..304414b301 100644
--- a/build.xml
+++ b/build.xml
@@ -38,7 +38,7 @@
    <arg line="${source_comma_sep}
               xml
               codesize,design,naming,unusedcode
-              --exclude test,build,PHPExcel,tcpdf
+              --exclude test,build,PHPExcel,tcpdf,php-gettext
               --reportfile ${basedir}/build/logs/pmd.xml" />
   </exec>
  </target>
@@ -50,6 +50,7 @@
               --exclude build
               --exclude libraries/PHPExcel
               --exclude libraries/tcpdf
+              --exclude libraries/php-gettext
               ${source}" />
   </exec>
  </target>

From dc218032df2896d173334304e8ff673709012ea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Fri, 22 Jul 2011 11:18:13 +0200
Subject: [PATCH 4/4] Add excludes to phploc call as well

---
 build.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 304414b301..9beb3aa0d8 100644
--- a/build.xml
+++ b/build.xml
@@ -57,7 +57,13 @@
 
  <target name="phploc" description="Generate phploc.csv">
   <exec executable="phploc">
-   <arg line="--log-csv ${basedir}/build/logs/phploc.csv ${source}" />
+   <arg line="--log-csv ${basedir}/build/logs/phploc.csv
+              --exclude test
+              --exclude build
+              --exclude libraries/PHPExcel
+              --exclude libraries/tcpdf
+              --exclude libraries/php-gettext
+              ${source}" />
   </exec>
  </target>