From 7ef8e99fe605c5da36ab6b5d317b22fcd17f665b Mon Sep 17 00:00:00 2001
From: Matt Perry <matt@mattperry.com>
Date: Thu, 22 Aug 2013 01:01:41 -0700
Subject: Fix CodeSniffer violations

Change indentation to ensure code confirms to CodeSniffer rules.
---
 inc/parser/parser.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'inc/parser/parser.php')

diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index 4af1cd333..064178a54 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -621,7 +621,7 @@ class Doku_Parser_Mode_acronym extends Doku_Parser_Mode {
     var $pattern = '';
 
     function Doku_Parser_Mode_acronym($acronyms) {
-    	usort($acronyms,array($this,'_compare'));
+        usort($acronyms,array($this,'_compare'));
         $this->acronyms = $acronyms;
     }
 
@@ -652,12 +652,12 @@ class Doku_Parser_Mode_acronym extends Doku_Parser_Mode {
         $a_len = strlen($a);
         $b_len = strlen($b);
         if ($a_len > $b_len) {
-          return -1;
+            return -1;
         } else if ($a_len < $b_len) {
-          return 1;
+            return 1;
         }
 
-    	return 0;
+        return 0;
     }
 }
 
-- 
cgit v1.2.3


From c404cb3b0b4946f6308f66b6324a24489b2ef5b8 Mon Sep 17 00:00:00 2001
From: Matt Perry <matt@mattperry.com>
Date: Fri, 23 Aug 2013 03:08:41 -0700
Subject: Fix CodeSniffer violations for PHP files

Fix violations for Squiz.Commenting.DocCommentAlignment.SpaceBeforeTag

Conflicts:
	inc/parser/xhtml.php
---
 inc/parser/parser.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'inc/parser/parser.php')

diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index 064178a54..3caad834a 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -45,9 +45,9 @@ $PARSER_MODES = array(
 //-------------------------------------------------------------------
 
 /**
-* Sets up the Lexer with modes and points it to the Handler
-* For an intro to the Lexer see: wiki:parser
-*/
+ * Sets up the Lexer with modes and points it to the Handler
+ * For an intro to the Lexer see: wiki:parser
+ */
 class Doku_Parser {
 
     var $Handler;
@@ -70,9 +70,9 @@ class Doku_Parser {
     }
 
     /**
-    * PHP preserves order of associative elements
-    * Mode sequence is important
-    */
+     * PHP preserves order of associative elements
+     * Mode sequence is important
+     */
     function addMode($name, & $Mode) {
         if ( !isset($this->modes['base']) ) {
             $this->addBaseMode(new Doku_Parser_Mode_base());
@@ -134,7 +134,7 @@ class Doku_Parser {
  * all modes are registered
  *
  * @author Harry Fuecks <hfuecks@gmail.com>
-*/
+ */
 class Doku_Parser_Mode {
 
     /**
-- 
cgit v1.2.3


From 2f7a0e94cadfbc1ece3bd1d3ff23483b845cd420 Mon Sep 17 00:00:00 2001
From: Matt Perry <matt@mattperry.com>
Date: Tue, 10 Sep 2013 22:17:43 -0700
Subject: Fix CodeSniffer whitespace violoations

Removed extraneous whitespace to eliminate errors reported by the
Squiz.WhiteSpace.SuperfluousWhitespace sniff.
---
 inc/parser/parser.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'inc/parser/parser.php')

diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index 3caad834a..e39a4daf5 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -807,7 +807,6 @@ class Doku_Parser_Mode_quotes extends Doku_Parser_Mode {
                     "\"",$mode,'doublequoteclosing'
                 );
 
-
     }
 
     function getSort() {
-- 
cgit v1.2.3


From 5a41afe6e3b958291893a0a10105cd41971fb141 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sun, 1 Dec 2013 17:57:03 +0000
Subject: FS#1833 (b) Prevent table entry syntax swallowing multiple preceeding
 blank lines (a) this shouldn't be necessary, blank lines are handled by
 paragraph     processing (b) avoids issues with greedy table syntax competing
 with plugins

---
 inc/parser/parser.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc/parser/parser.php')

diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index e39a4daf5..1f14b98a3 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -454,8 +454,8 @@ class Doku_Parser_Mode_table extends Doku_Parser_Mode {
     }
 
     function connectTo($mode) {
-        $this->Lexer->addEntryPattern('\s*\n\^',$mode,'table');
-        $this->Lexer->addEntryPattern('\s*\n\|',$mode,'table');
+        $this->Lexer->addEntryPattern('[\t ]*\n\^',$mode,'table');
+        $this->Lexer->addEntryPattern('[\t ]*\n\|',$mode,'table');
     }
 
     function postConnect() {
-- 
cgit v1.2.3