From f56c0f85a3972c005d9dd3cf1e81fa44d7e4ac3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Thu, 26 Apr 2012 15:42:29 +0200
Subject: [PATCH 1/4] Exclude coding standard data from tarball

---
 scripts/create-release.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index 5f229d2bd6..4c9672f1d7 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -132,6 +132,9 @@ echo "* Removing unneeded files"
 # if someone runs /test/wui.php and there are test failures
 rm -rf test
 
+# Remove phpcs coding standard definition
+rm -rf PMAStandard
+
 # Testsuite setup
 rm -f build.xml phpunit.xml.dist
 

From 8f1a74a02159352a14c2cfbe442f5031c7f1b72c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Thu, 26 Apr 2012 16:02:38 +0200
Subject: [PATCH 2/4] Check if variable is set (not set in tests)

---
 libraries/common.lib.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 240b27c12a..007de7d922 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -3316,7 +3316,8 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array())
  */
 function PMA_browseUploadFile($max_upload_size)
 {
-    if ($GLOBALS['is_upload'] && !empty($GLOBALS['cfg']['UploadDir'])) {
+    if (isset($GLOBALS['is_upload']) && $GLOBALS['is_upload']
+            && !empty($GLOBALS['cfg']['UploadDir'])) {
         echo '<label for="radio_import_file">';
     } else {
         echo '<label for="input_import_file">';

From ed6d9776dc165a38004fd620b9bed4f25afadfd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Thu, 26 Apr 2012 16:04:21 +0200
Subject: [PATCH 3/4] Define LimitChars when we are using that

---
 test/libraries/common/PMA_extractColumnSpec_test.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/libraries/common/PMA_extractColumnSpec_test.php b/test/libraries/common/PMA_extractColumnSpec_test.php
index fbb2dfe036..36c5f33d1f 100644
--- a/test/libraries/common/PMA_extractColumnSpec_test.php
+++ b/test/libraries/common/PMA_extractColumnSpec_test.php
@@ -17,6 +17,12 @@ require_once 'libraries/common.lib.php';
  */
 class PMA_extractColumnSpec_test extends PHPUnit_Framework_TestCase
 {
+
+    protected function setUp()
+    {
+        $GLOBALS['cfg']['LimitChars'] = 1000;
+    }
+
     /**
      * Test case for parsing SHOW COLUMNS output
      *

From eb8ebf466799f6a9a3c1e4ea08b84d0f99e5489c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Thu, 26 Apr 2012 16:05:57 +0200
Subject: [PATCH 4/4] Exclude coding standard files

---
 build.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index eff834f884..731b2f9207 100644
--- a/build.xml
+++ b/build.xml
@@ -38,7 +38,7 @@
    <arg line="${source_comma_sep}
               xml
               codesize,design,naming,unusedcode
-              --exclude test,build,tcpdf,php-gettext,bfShapeFiles
+              --exclude test,build,tcpdf,php-gettext,bfShapeFiles,PMAStandard
               --reportfile ${basedir}/build/logs/pmd.xml" />
   </exec>
  </target>
@@ -47,6 +47,7 @@
   <exec executable="phpcpd">
    <arg line="--log-pmd ${basedir}/build/logs/pmd-cpd.xml
               --exclude test
+              --exclude PMAStandard
               --exclude build
               --exclude libraries/tcpdf
               --exclude libraries/php-gettext
@@ -59,6 +60,7 @@
   <exec executable="phploc">
    <arg line="--log-csv ${basedir}/build/logs/phploc.csv
               --exclude test
+              --exclude PMAStandard
               --exclude build
               --exclude libraries/tcpdf
               --exclude libraries/php-gettext
@@ -70,7 +72,7 @@
  <target name="phpcs" description="Generate checkstyle.xml using PHP_CodeSniffer excluding test, tcpdf directories">
   <exec executable="phpcs">
    <arg line="
-              --ignore=*/php-gettext/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/highcharts/*,*/openlayers/*,*/jquery/*,*/build/*,*/bfShapeFiles/*
+              --ignore=*/php-gettext/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/highcharts/*,*/openlayers/*,*/jquery/*,*/build/*,*/bfShapeFiles/*,*/PMAStandard/*
               --report=checkstyle
               --report-file=${basedir}/build/logs/checkstyle.xml
               --standard=PMAStandard