Completed
Push — master ( 5d3395...b30145 )
by Mark
02:17
created
_test/general.test.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
      * Simple test to make sure the plugin.info.txt is in correct format
28 28
      */
29 29
     public function test_plugininfo() {
30
-        $file = __DIR__ . '/../plugin.info.txt';
30
+        $file = __DIR__.'/../plugin.info.txt';
31 31
         $this->assertFileExists($file);
32 32
 
33 33
         $info = confToHash($file);
Please login to merge, or discard this patch.
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -55,8 +55,8 @@
 block discarded – undo
55 55
     public function test_plugin_backlinks_isloaded() {
56 56
         global $plugin_controller;
57 57
         $this->assertTrue(
58
-                   in_array('backlinks', $plugin_controller->getList()),
59
-                   "backlinks plugin is loaded"
60
-                         );
58
+                    in_array('backlinks', $plugin_controller->getList()),
59
+                    "backlinks plugin is loaded"
60
+                            );
61 61
     }
62 62
 }
Please login to merge, or discard this patch.
_test/syntax.test.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
     public function testIndex() {
73 73
         $query = array('ross');
74 74
         $this->assertEquals(
75
-                 array('ross' => array(
75
+                    array('ross' => array(
76 76
                     'link' => '3',
77 77
                     'bob_ross_says' => '1',
78 78
                     'backlinks_syntax' => '2',
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
                     'include:link' => '3',
83 83
                     'exclude:link' => '3'
84 84
                     )),
85
-                 idx_lookup($query)
85
+                    idx_lookup($query)
86 86
         );
87 87
     }
88 88
 
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
             strpos($response->getContent(), 'A link to Bob Ross') !== false,
95 95
             'A link to Bob Ross was not in the output'
96 96
         );
97
-     }
97
+        }
98 98
 
99 99
     public function testStoryPage() {
100 100
         $request = new TestRequest();
@@ -119,18 +119,18 @@  discard block
 block discarded – undo
119 119
         //look for id="plugin__backlinks"
120 120
         $this->assertEquals(1, pq('#plugin__backlinks', $doc)->length,
121 121
                             'There should be one backlinks element'
122
-                           );
122
+                            );
123 123
 
124 124
         $wikilinks = pq('#plugin__backlinks ul li', $doc);
125 125
         dbglog($wikilinks->text(), 'found backlinks');
126 126
         $this->assertEquals(4, $wikilinks->contents()->length,
127 127
                             'There should be 4 backlinks'
128
-                           );
128
+                            );
129 129
 
130 130
         $lastlink = pq('a:last',$wikilinks);
131 131
         dbglog($lastlink->text(),"last backlink");
132 132
         $this->assertEquals($lastlink->text(),'A link to Bob Ross',
133 133
                             'The last backlink should be a link to Bob Ross'
134
-                           );
134
+                            );
135 135
     }
136 136
 }
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -28,12 +28,12 @@  discard block
 block discarded – undo
28 28
     /**
29 29
      * copy data and add pages to the index.
30 30
      */
31
-    public static function setUpBeforeClass(){
31
+    public static function setUpBeforeClass() {
32 32
         parent::setUpBeforeClass();
33 33
         global $conf;
34 34
         $conf['allowdebug'] = 1;
35 35
 
36
-        TestUtils::rcopy(TMP_DIR, dirname(__FILE__) . '/data/');
36
+        TestUtils::rcopy(TMP_DIR, dirname(__FILE__).'/data/');
37 37
 
38 38
         dbglog("\nset up class syntax_plugin_backlinks_test");
39 39
     }
@@ -52,13 +52,13 @@  discard block
 block discarded – undo
52 52
 
53 53
         $verbose = false;
54 54
         $force = false;
55
-        foreach($data as $val) {
55
+        foreach ($data as $val) {
56 56
             idx_addPage($val['id'], $verbose, $force);
57 57
         }
58 58
         //idx_addPage('bob_ross_says', $verbose, $force);
59 59
         //idx_addPage('link', $verbose, $force);
60 60
         //idx_addPage('backlinks_syntax', $verbose, $force);
61
-        if($conf['allowdebug']) {
61
+        if ($conf['allowdebug']) {
62 62
             touch(DOKU_TMP_DATA.'cache/debug.log');
63 63
         }
64 64
     }
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 
69 69
         global $conf;
70 70
         // try to get the debug log after running the test, print and clear
71
-        if($conf['allowdebug']) {
71
+        if ($conf['allowdebug']) {
72 72
             print "\n";
73 73
             readfile(DOKU_TMP_DATA.'cache/debug.log');
74 74
             unlink(DOKU_TMP_DATA.'cache/debug.log');
@@ -137,8 +137,8 @@  discard block
 block discarded – undo
137 137
                             'There should be 4 backlinks'
138 138
                            );
139 139
 
140
-        $lastlink = pq('a:last',$wikilinks);
141
-        dbglog($lastlink->text(),"last backlink");
140
+        $lastlink = pq('a:last', $wikilinks);
141
+        dbglog($lastlink->text(), "last backlink");
142 142
         $this->assertEquals(
143 143
                             $lastlink->text(),
144 144
                             'A link to Bob Ross',
Please login to merge, or discard this patch.
_test/syntax_exclude.test.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -28,12 +28,12 @@  discard block
 block discarded – undo
28 28
     /**
29 29
      * copy data and add pages to the index.
30 30
      */
31
-    public static function setUpBeforeClass(){
31
+    public static function setUpBeforeClass() {
32 32
         parent::setUpBeforeClass();
33 33
         global $conf;
34 34
         $conf['allowdebug'] = 1;
35 35
 
36
-        TestUtils::rcopy(TMP_DIR, dirname(__FILE__) . '/data/');
36
+        TestUtils::rcopy(TMP_DIR, dirname(__FILE__).'/data/');
37 37
 
38 38
         dbglog("\nset up class syntax_plugin_backlinks_test");
39 39
     }
@@ -52,13 +52,13 @@  discard block
 block discarded – undo
52 52
 
53 53
         $verbose = false;
54 54
         $force = false;
55
-        foreach($data as $val) {
55
+        foreach ($data as $val) {
56 56
             idx_addPage($val['id'], $verbose, $force);
57 57
         }
58 58
         //idx_addPage('bob_ross_says', $verbose, $force);
59 59
         //idx_addPage('link', $verbose, $force);
60 60
         //idx_addPage('backlinks_syntax', $verbose, $force);
61
-        if($conf['allowdebug']) {
61
+        if ($conf['allowdebug']) {
62 62
             touch(DOKU_TMP_DATA.'cache/debug.log');
63 63
         }
64 64
     }
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 
69 69
         global $conf;
70 70
         // try to get the debug log after running the test, print and clear
71
-        if($conf['allowdebug']) {
71
+        if ($conf['allowdebug']) {
72 72
             print "\n";
73 73
             readfile(DOKU_TMP_DATA.'cache/debug.log');
74 74
             unlink(DOKU_TMP_DATA.'cache/debug.log');
@@ -137,8 +137,8 @@  discard block
 block discarded – undo
137 137
                             'There should be 4 backlinks'
138 138
                            );
139 139
 
140
-        $lastlink = pq('a:last',$wikilinks);
141
-        dbglog($lastlink->text(),"last backlink");
140
+        $lastlink = pq('a:last', $wikilinks);
141
+        dbglog($lastlink->text(), "last backlink");
142 142
         $this->assertEquals(
143 143
                             $lastlink->text(),
144 144
                             'A link to Bob Ross',
Please login to merge, or discard this patch.
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
                             1,
89 89
                             pq('#plugin__backlinks', $doc)->length,
90 90
                             'There should be one backlinks element'
91
-                           );
91
+                            );
92 92
 
93 93
         $wikilinks = pq('#plugin__backlinks ul li', $doc);
94 94
         dbglog($wikilinks->text(), 'found backlinks');
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
                             1,
97 97
                             $wikilinks->contents()->length,
98 98
                             'There should be 1 backlink'
99
-                           );
99
+                            );
100 100
 
101 101
         $lastlink = pq('a:last',$wikilinks);
102 102
         dbglog($lastlink->text(),"last backlink");
@@ -104,6 +104,6 @@  discard block
 block discarded – undo
104 104
                             $lastlink->text(),
105 105
                             'An included link to Bob Ross',
106 106
                             'The last backlink should be "An included link to Bob Ross"'
107
-                           );
107
+                            );
108 108
     }
109 109
 }
Please login to merge, or discard this patch.
_test/syntax_include.test.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
                             1,
89 89
                             pq('#plugin__backlinks', $doc)->length,
90 90
                             'There should be one backlinks element'
91
-                           );
91
+                            );
92 92
 
93 93
         $wikilinks = pq('#plugin__backlinks ul li', $doc);
94 94
         dbglog($wikilinks->text(), 'found backlinks');
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
                             1,
97 97
                             $wikilinks->contents()->length,
98 98
                             'There should be 1 backlink'
99
-                           );
99
+                            );
100 100
 
101 101
         $lastlink = pq('a:last',$wikilinks);
102 102
         dbglog($lastlink->text(),"last backlink");
@@ -104,6 +104,6 @@  discard block
 block discarded – undo
104 104
                             $lastlink->text(),
105 105
                             'An included link to Bob Ross',
106 106
                             'The last backlink should be "An included link to Bob Ross"'
107
-                           );
107
+                            );
108 108
     }
109 109
 }
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -28,12 +28,12 @@  discard block
 block discarded – undo
28 28
     /**
29 29
      * copy data and add pages to the index.
30 30
      */
31
-    public static function setUpBeforeClass(){
31
+    public static function setUpBeforeClass() {
32 32
         parent::setUpBeforeClass();
33 33
         global $conf;
34 34
         $conf['allowdebug'] = 1;
35 35
 
36
-        TestUtils::rcopy(TMP_DIR, dirname(__FILE__) . '/data/');
36
+        TestUtils::rcopy(TMP_DIR, dirname(__FILE__).'/data/');
37 37
 
38 38
         dbglog("\nset up class syntax_plugin_backlinks_test");
39 39
     }
@@ -52,13 +52,13 @@  discard block
 block discarded – undo
52 52
 
53 53
         $verbose = false;
54 54
         $force = false;
55
-        foreach($data as $val) {
55
+        foreach ($data as $val) {
56 56
             idx_addPage($val['id'], $verbose, $force);
57 57
         }
58 58
         //idx_addPage('bob_ross_says', $verbose, $force);
59 59
         //idx_addPage('link', $verbose, $force);
60 60
         //idx_addPage('backlinks_syntax', $verbose, $force);
61
-        if($conf['allowdebug']) {
61
+        if ($conf['allowdebug']) {
62 62
             touch(DOKU_TMP_DATA.'cache/debug.log');
63 63
         }
64 64
     }
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 
69 69
         global $conf;
70 70
         // try to get the debug log after running the test, print and clear
71
-        if($conf['allowdebug']) {
71
+        if ($conf['allowdebug']) {
72 72
             print "\n";
73 73
             readfile(DOKU_TMP_DATA.'cache/debug.log');
74 74
             unlink(DOKU_TMP_DATA.'cache/debug.log');
@@ -137,8 +137,8 @@  discard block
 block discarded – undo
137 137
                             'There should be 4 backlinks'
138 138
                            );
139 139
 
140
-        $lastlink = pq('a:last',$wikilinks);
141
-        dbglog($lastlink->text(),"last backlink");
140
+        $lastlink = pq('a:last', $wikilinks);
141
+        dbglog($lastlink->text(), "last backlink");
142 142
         $this->assertEquals(
143 143
                             $lastlink->text(),
144 144
                             'A link to Bob Ross',
Please login to merge, or discard this patch.
syntax.php 2 patches
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
      * Needs to return one of the mode types defined in $PARSER_MODES in parser.php
33 33
      * @see DokuWiki_Syntax_Plugin::getType()
34 34
      */
35
-    function getType()  { return 'substition'; }
35
+    function getType() { return 'substition'; }
36 36
 
37 37
     /**
38 38
      * @see DokuWiki_Syntax_Plugin::getPType()
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
     /**
43 43
      * @see Doku_Parser_Mode::getSort()
44 44
      */
45
-    function getSort()  { return 304; }
45
+    function getSort() { return 304; }
46 46
 
47 47
     /**
48 48
      * Connect pattern to lexer.
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
      * Handler to prepare matched data for the rendering process.
57 57
      * @see DokuWiki_Syntax_Plugin::handle()
58 58
      */
59
-    function handle($match, $state, $pos, Doku_Handler $handler){
59
+    function handle($match, $state, $pos, Doku_Handler $handler) {
60 60
 
61 61
         // Take the id of the source
62 62
         // It can be a rendering of a sidebar
@@ -69,17 +69,17 @@  discard block
 block discarded – undo
69 69
         }
70 70
 
71 71
         // strip {{backlinks> from start and }} from end
72
-        $match = substr($match,12,-2);
72
+        $match = substr($match, 12, -2);
73 73
 
74
-        if(strstr($match, "#")){
74
+        if (strstr($match, "#")) {
75 75
             $includeNS = substr(strstr($match, "#", FALSE), 1);
76
-            $match= strstr($match, "#", TRUE);
76
+            $match = strstr($match, "#", TRUE);
77 77
         }
78 78
 
79 79
         $match = ($match == '.') ? $id : $match;
80 80
 
81
-        if(strstr($match,".:")) {
82
-            resolve_pageid(getNS($id),$match,$exists);
81
+        if (strstr($match, ".:")) {
82
+            resolve_pageid(getNS($id), $match, $exists);
83 83
         }
84 84
 
85 85
         return (array($match, $includeNS));
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
     function render($mode, Doku_Renderer $renderer, $data) {
93 93
         global $lang;
94 94
 
95
-        if($mode == 'xhtml'){
95
+        if ($mode == 'xhtml') {
96 96
             $renderer->info['cache'] = false;
97 97
 
98 98
             @require_once(DOKU_INC.'inc/fulltext.php');
@@ -100,19 +100,19 @@  discard block
 block discarded – undo
100 100
 
101 101
             dbglog($backlinks, "backlinks: all backlinks to: $data[0]");
102 102
 
103
-            $renderer->doc .= '<div id="plugin__backlinks">' . DW_LF;
103
+            $renderer->doc .= '<div id="plugin__backlinks">'.DW_LF;
104 104
 
105 105
             $filterNS = $data[1];
106
-            if(!empty($backlinks) && !empty($filterNS)) {
106
+            if (!empty($backlinks) && !empty($filterNS)) {
107 107
                 if (stripos($filterNS, "!", 0) === 0) {
108 108
                     $filterNS = substr($filterNS, 1);
109 109
                     dbglog($filterNS, "backlinks: exluding all of namespace: $filterNS");
110
-                    $backlinks= array_filter($backlinks, function($ns) use($filterNS) {
110
+                    $backlinks = array_filter($backlinks, function($ns) use($filterNS) {
111 111
                         return stripos($ns, $filterNS, 0) !== 0;
112 112
                     });
113 113
                 } else {
114 114
                     dbglog($filterNS, "backlinks: including namespace: $filterNS only");
115
-                    $backlinks= array_filter($backlinks, function($ns) use($filterNS) {
115
+                    $backlinks = array_filter($backlinks, function($ns) use($filterNS) {
116 116
                         return stripos($ns, $filterNS, 0) === 0;
117 117
                     });
118 118
                 }
@@ -120,24 +120,24 @@  discard block
 block discarded – undo
120 120
 
121 121
             dbglog($backlinks, "backlinks: all backlinks to be rendered");
122 122
 
123
-            if(!empty($backlinks)) {
123
+            if (!empty($backlinks)) {
124 124
 
125 125
                 $renderer->doc .= '<ul class="idx">';
126 126
 
127
-                foreach($backlinks as $backlink){
127
+                foreach ($backlinks as $backlink) {
128 128
                     $name = p_get_metadata($backlink, 'title');
129
-                    if(empty($name)) $name = $backlink;
129
+                    if (empty($name)) $name = $backlink;
130 130
                     $renderer->doc .= '<li><div class="li">';
131 131
                     $renderer->doc .= html_wikilink(':'.$backlink, $name);
132
-                    $renderer->doc .= '</div></li>' . DW_LF;
132
+                    $renderer->doc .= '</div></li>'.DW_LF;
133 133
                 }
134 134
 
135
-                $renderer->doc .= '</ul>' . DW_LF;
135
+                $renderer->doc .= '</ul>'.DW_LF;
136 136
             } else {
137
-                $renderer->doc .= "<strong>Plugin Backlinks: " . $lang['nothingfound'] . "</strong>" . DW_LF;
137
+                $renderer->doc .= "<strong>Plugin Backlinks: ".$lang['nothingfound']."</strong>".DW_LF;
138 138
             }
139 139
 
140
-            $renderer->doc .= '</div>' . DW_LF;
140
+            $renderer->doc .= '</div>'.DW_LF;
141 141
 
142 142
             return true;
143 143
         }
Please login to merge, or discard this patch.
Braces   +12 added lines, -4 removed lines patch added patch discarded remove patch
@@ -13,10 +13,16 @@  discard block
 block discarded – undo
13 13
  * @author  Michael Klier <[email protected]>
14 14
  * @author  Mark C. Prins <[email protected]>
15 15
  */
16
-if (!defined('DOKU_INC')) die();
16
+if (!defined('DOKU_INC')) {
17
+    die();
18
+}
17 19
 
18
-if (!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN', DOKU_INC.'lib/plugins/');
19
-if (!defined('DW_LF')) define('DW_LF', "\n");
20
+if (!defined('DOKU_PLUGIN')) {
21
+    define('DOKU_PLUGIN', DOKU_INC.'lib/plugins/');
22
+}
23
+if (!defined('DW_LF')) {
24
+    define('DW_LF', "\n");
25
+}
20 26
 
21 27
 require_once(DOKU_PLUGIN.'syntax.php');
22 28
 require_once(DOKU_INC.'inc/parserutils.php');
@@ -126,7 +132,9 @@  discard block
 block discarded – undo
126 132
 
127 133
                 foreach($backlinks as $backlink){
128 134
                     $name = p_get_metadata($backlink, 'title');
129
-                    if(empty($name)) $name = $backlink;
135
+                    if(empty($name)) {
136
+                        $name = $backlink;
137
+                    }
130 138
                     $renderer->doc .= '<li><div class="li">';
131 139
                     $renderer->doc .= html_wikilink(':'.$backlink, $name);
132 140
                     $renderer->doc .= '</div></li>' . DW_LF;
Please login to merge, or discard this patch.