mprins / dokuwiki-yalist-plugin

syntax.php

Spacing +66 added lines, -66 removed lines

@@ -59,7 +59,7 @@ 
     public function handle($match, $state, $pos, Doku_Handler $handler) {
         $output = array();
         $level  = 0;
-        switch($state) {
+        switch ($state) {
             case DOKU_LEXER_ENTER:
                 $frame = $this->interpretMatch($match);
                 $level = $frame['level'] = 1;
@@ -69,19 +69,19 @@ 
                     "${frame['item']}_open",
                     "${frame['item']}_content_open"
                 );
-                if($frame['paras']) {
+                if ($frame['paras']) {
                     array_push($output, 'p_open');
                 }
                 array_push($this->stack, $frame);
                 break;
             case DOKU_LEXER_EXIT:
                 $close_content = true;
-                while($frame = array_pop($this->stack)) {
+                while ($frame = array_pop($this->stack)) {
                     // for the first frame we pop off the stack, we'll need to
                     // close the content tag; for the rest it will have been
                     // closed already
-                    if($close_content) {
-                        if($frame['paras']) {
+                    if ($close_content) {
+                        if ($frame['paras']) {
                             array_push($output, 'p_close');
                         }
                         array_push($output, "${frame['item']}_content_close");
@@ -96,14 +96,14 @@ 
                 break;
             case DOKU_LEXER_MATCHED:
                 $last_frame = end($this->stack);
-                if(substr($match, -2) == '..') {
+                if (substr($match, -2) == '..') {
                     // new paragraphs cannot be deeper than the current depth,
                     // but they may be shallower
                     $para_depth    = count(explode('  ', str_replace("\t", '  ', $match)));
                     $close_content = true;
-                    while($para_depth < $last_frame['depth'] && count($this->stack) > 1) {
-                        if($close_content) {
-                            if($last_frame['paras']) {
+                    while ($para_depth < $last_frame['depth'] && count($this->stack) > 1) {
+                        if ($close_content) {
+                            if ($last_frame['paras']) {
                                 array_push($output, 'p_close');
                             }
                             array_push($output, "${last_frame['item']}_content_close");
@@ -117,8 +117,8 @@ 
                         array_pop($this->stack);
                         $last_frame = end($this->stack);
                     }
-                    if($last_frame['paras']) {
-                        if($close_content) {
+                    if ($last_frame['paras']) {
+                        if ($close_content) {
                             // depth did not change
                             array_push($output, 'p_close', 'p_open');
                         } else {
@@ -136,10 +136,10 @@ 
                     break;
                 }
                 $curr_frame = $this->interpretMatch($match);
-                if($curr_frame['depth'] > $last_frame['depth']) {
+                if ($curr_frame['depth'] > $last_frame['depth']) {
                     // going one level deeper
                     $level = $last_frame['level'] + 1;
-                    if($last_frame['paras']) {
+                    if ($last_frame['paras']) {
                         array_push($output, 'p_close');
                     }
                     array_push(
@@ -153,12 +153,12 @@ 
                     // keep popping frames off the stack until we find a frame
                     // that's at least as deep as this one, or until only the
                     // bottom frame (i.e. the initial list markup) remains
-                    while($curr_frame['depth'] < $last_frame['depth'] &&
+                    while ($curr_frame['depth'] < $last_frame['depth'] &&
                         count($this->stack) > 1) {
                         // again, we need to close the content tag only for
                         // the first frame popped off the stack
-                        if($close_content) {
-                            if($last_frame['paras']) {
+                        if ($close_content) {
+                            if ($last_frame['paras']) {
                                 array_push($output, 'p_close');
                             }
                             array_push($output, "${last_frame['item']}_content_close");
@@ -176,15 +176,15 @@ 
                     // it will be replaced by the current frame
                     array_pop($this->stack);
                     $level = $last_frame['level'];
-                    if($close_content) {
-                        if($last_frame['paras']) {
+                    if ($close_content) {
+                        if ($last_frame['paras']) {
                             array_push($output, 'p_close');
                         }
                         array_push($output, "${last_frame['item']}_content_close");
                         $close_content = false;
                     }
                     array_push($output, "${last_frame['item']}_close");
-                    if($curr_frame['list'] != $last_frame['list']) {
+                    if ($curr_frame['list'] != $last_frame['list']) {
                         // change list types
                         array_push(
                             $output,
@@ -199,7 +199,7 @@ 
                     "${curr_frame['item']}_open",
                     "${curr_frame['item']}_content_open"
                 );
-                if($curr_frame['paras']) {
+                if ($curr_frame['paras']) {
                     array_push($output, 'p_open');
                 }
                 $curr_frame['level'] = $level;
@@ -219,7 +219,7 @@ 
             '?' => 'dt',
             ':' => 'dd',
         );
-        $tag       = $tag_table[substr($match, -1)];
+        $tag = $tag_table[substr($match, -1)];
         return array(
             'depth' => count(explode('  ', str_replace("\t", '  ', $match))),
             'list'  => substr($tag, 0, 1) . 'l',
@@ -229,19 +229,19 @@ 
     }
 
     public function render($mode, Doku_Renderer $renderer, $data) {
-        if($mode != 'xhtml' && $mode != 'latex' && $mode != 'odt') {
+        if ($mode != 'xhtml' && $mode != 'latex' && $mode != 'odt') {
             return false;
         }
-        if($data['state'] == DOKU_LEXER_UNMATCHED) {
-            if($mode != 'odt') {
+        if ($data['state'] == DOKU_LEXER_UNMATCHED) {
+            if ($mode != 'odt') {
                 $renderer->doc .= $renderer->_xmlEntities($data['output']);
             } else {
                 $renderer->cdata($data['output']);
             }
             return true;
         }
-        foreach($data['output'] as $i) {
-            switch($mode) {
+        foreach ($data['output'] as $i) {
+            switch ($mode) {
                 case 'xhtml':
                     $this->renderXhtmlItem($renderer, $i, $data);
                     break;
@@ -253,8 +253,8 @@ 
                     break;
             }
         }
-        if($data['state'] == DOKU_LEXER_EXIT) {
-            if($mode != 'odt') {
+        if ($data['state'] == DOKU_LEXER_EXIT) {
+            if ($mode != 'odt') {
                 $renderer->doc .= "\n";
             } else {
                 $renderer->linebreak();
@@ -265,7 +265,7 @@ 
 
     private function renderXhtmlItem(Doku_Renderer $renderer, $item, $data) {
         $markup = '';
-        switch($item) {
+        switch ($item) {
             case 'ol_open':
                 $markup = "<ol>\n";
                 break;
@@ -330,7 +330,7 @@ 
 
     private function renderLatexItem(Doku_Renderer $renderer, $item) {
         $markup = '';
-        switch($item) {
+        switch ($item) {
             case 'ol_open':
                 $markup = "\\begin{enumerate}\n";
                 break;
@@ -397,7 +397,7 @@ 
      * @author LarsDW223
      */
     private function renderOdtItem(Doku_Renderer $renderer, $item) {
-        switch($item) {
+        switch ($item) {
             case 'ol_open':
                 $renderer->listo_open();
                 break;
@@ -405,7 +405,7 @@ 
                 $renderer->listu_open();
                 break;
             case 'dl_open':
-                if($this->getConf('def_list_odt_export') != 'table') {
+                if ($this->getConf('def_list_odt_export') != 'table') {
                     $renderer->listu_open();
                 } else {
                     $renderer->table_open(2);
@@ -422,9 +422,9 @@ 
                 break;
             case 'dl_close':
                 $config = $this->getConf('def_list_odt_export');
-                if($config != 'table') {
-                    if(self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] != 2) {
-                        if($config == 'listheader' && method_exists($renderer, 'listheader_close')) {
+                if ($config != 'table') {
+                    if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] != 2) {
+                        if ($config == 'listheader' && method_exists($renderer, 'listheader_close')) {
                             $renderer->listheader_close();
                         } else {
                             $renderer->listitem_close();
@@ -433,20 +433,20 @@ 
                     self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 0;
                     $renderer->list_close();
                 } else {
-                    if(self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] == 0) {
+                    if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] == 0) {
                         $properties            = array();
                         $properties ['border'] = 'none';
                         $renderer->_odtTableCellOpenUseProperties($properties);
                         $renderer->tablecell_close();
                     }
                     self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 0;
-                    if(self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) {
+                    if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) {
                         $renderer->tablerow_close(1);
                         self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false;
                     }
                     $renderer->table_close();
                 }
-                if(self::$odt_table_stack_index > 0) {
+                if (self::$odt_table_stack_index > 0) {
                     self::$odt_table_stack_index--;
                     unset(self::$odt_table_stack [self::$odt_table_stack_index]);
                 }
@@ -466,18 +466,18 @@ 
                 break;
 
             case 'dt_open': // unconditional: DT tags can't contain paragraphs. That would not be legal XHTML.
-                switch($this->getConf('def_list_odt_export')) {
+                switch ($this->getConf('def_list_odt_export')) {
                     case 'listheader':
-                        if(self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) {
-                            if(method_exists($renderer, 'listheader_close')) {
+                        if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) {
+                            if (method_exists($renderer, 'listheader_close')) {
                                 $renderer->listheader_close();
                             } else {
                                 $renderer->listitem_close();
                             }
                             self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false;
                         }
-                        if(self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) {
-                            if(method_exists($renderer, 'listheader_open')) {
+                        if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) {
+                            if (method_exists($renderer, 'listheader_open')) {
                                 $renderer->listheader_open(1);
                             } else {
                                 $renderer->listitem_open(1);
@@ -486,18 +486,18 @@ 
                         }
                         break;
                     case 'table':
-                        if(self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] == 0) {
+                        if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] == 0) {
                             $properties            = array();
                             $properties ['border'] = 'none';
                             $renderer->_odtTableCellOpenUseProperties($properties);
                             $renderer->tablecell_close();
                         }
 
-                        if(self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) {
+                        if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) {
                             $renderer->tablerow_close();
                             self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false;
                         }
-                        if(self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) {
+                        if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) {
                             $renderer->tablerow_open(1);
                             self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true;
                         }
@@ -506,11 +506,11 @@ 
                         $renderer->_odtTableCellOpenUseProperties($properties);
                         break;
                     default:
-                        if(self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) {
+                        if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) {
                             $renderer->listitem_close();
                             self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false;
                         }
-                        if(self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) {
+                        if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) {
                             $renderer->listitem_open(1);
                             self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true;
                         }
@@ -520,10 +520,10 @@ 
                 self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 0;
                 break;
             case 'dd_open':
-                switch($this->getConf('def_list_odt_export')) {
+                switch ($this->getConf('def_list_odt_export')) {
                     case 'listheader':
-                        if(self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) {
-                            if(method_exists($renderer, 'listheader_open')) {
+                        if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) {
+                            if (method_exists($renderer, 'listheader_open')) {
                                 $renderer->listheader_open(1);
                             } else {
                                 $renderer->listitem_open(1);
@@ -532,14 +532,14 @@ 
                         }
                         break;
                     case 'table':
-                        if(self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) {
+                        if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) {
                             $renderer->tablerow_open(1);
                             self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true;
                         }
-                        if(self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] == 1) {
+                        if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] == 1) {
                             $renderer->tablecell_close();
                         }
-                        if(self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] == 0) {
+                        if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] == 0) {
                             $properties            = array();
                             $properties ['border'] = 'none';
                             $renderer->_odtTableCellOpenUseProperties($properties);
@@ -551,7 +551,7 @@ 
                         $renderer->_odtTableCellOpenUseProperties($properties);
                         break;
                     default:
-                        if(self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) {
+                        if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) {
                             $renderer->listitem_open(1);
                             self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true;
                         }
@@ -561,7 +561,7 @@ 
                 self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 1;
                 break;
             case 'dt_content_open':
-                switch($this->getConf('def_list_odt_export')) {
+                switch ($this->getConf('def_list_odt_export')) {
                     case 'table':
                         $renderer->p_open();
                         break;
@@ -572,7 +572,7 @@ 
                 $this->renderODTOpenSpan($renderer);
                 break;
             case 'dd_content_open':
-                switch($this->getConf('def_list_odt_export')) {
+                switch ($this->getConf('def_list_odt_export')) {
                     case 'table':
                         $renderer->p_open();
                         break;
@@ -583,7 +583,7 @@ 
                 break;
             case 'dt_content_close':
                 $this->renderODTCloseSpan($renderer);
-                switch($this->getConf('def_list_odt_export')) {
+                switch ($this->getConf('def_list_odt_export')) {
                     case 'table':
                         $renderer->p_close();
                         break;
@@ -593,7 +593,7 @@ 
                 }
                 break;
             case 'dd_content_close':
-                switch($this->getConf('def_list_odt_export')) {
+                switch ($this->getConf('def_list_odt_export')) {
                     case 'table':
                         $renderer->p_close();
                         break;
@@ -603,7 +603,7 @@ 
                 }
                 break;
             case 'dt_close':
-                switch($this->getConf('def_list_odt_export')) {
+                switch ($this->getConf('def_list_odt_export')) {
                     case 'listheader':
                         $renderer->linebreak();
                         break;
@@ -618,10 +618,10 @@ 
                 break;
 
             case 'dd_close':
-                switch($this->getConf('def_list_odt_export')) {
+                switch ($this->getConf('def_list_odt_export')) {
                     case 'listheader':
-                        if(self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) {
-                            if(method_exists($renderer, 'listheader_close')) {
+                        if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) {
+                            if (method_exists($renderer, 'listheader_close')) {
                                 $renderer->listheader_close();
                             } else {
                                 $renderer->listitem_close();
@@ -631,13 +631,13 @@ 
                         break;
                     case 'table':
                         $renderer->tablecell_close();
-                        if(self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) {
+                        if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) {
                             $renderer->tablerow_close(1);
                             self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false;
                         }
                         break;
                     default:
-                        if(self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) {
+                        if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) {
                             $renderer->listitem_close(1);
                             self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false;
                         }
@@ -680,7 +680,7 @@ 
      * @author LarsDW223
      */
     private function renderODTCloseSpan($renderer) {
-        if(method_exists($renderer, '_odtSpanClose') === false) {
+        if (method_exists($renderer, '_odtSpanClose') === false) {
             // Function is not supported by installed ODT plugin version, return.
             return;
         }

_test/syntax.test.php

Spacing +3 added lines, -3 removed lines

@@ -44,10 +44,10 @@ 
         search($data, $conf['datadir'], 'search_allpages', array('skipacl' => true));
         $verbose = false;
         $force   = false;
-        foreach($data as $val) {
+        foreach ($data as $val) {
             idx_addPage($val['id'], $verbose, $force);
         }
-        if($conf['allowdebug']) {
+        if ($conf['allowdebug']) {
             touch(DOKU_TMP_DATA . 'cache/debug.log');
         }
     }
@@ -56,7 +56,7 @@ 
         parent::tearDown();
         global $conf;
         // try to get the debug log after running the test, print and clear
-        if($conf['allowdebug']) {
+        if ($conf['allowdebug']) {
             print "\n";
             readfile(DOKU_TMP_DATA . 'cache/debug.log');
             unlink(DOKU_TMP_DATA . 'cache/debug.log');