ntd /
silverstripe-autotoc
@@ -63,12 +63,12 @@ discard block |
||
| 63 | 63 | { |
| 64 | 64 | $c = $this->owner; |
| 65 | 65 | $model = $c->customisedObject ? $c->customisedObject : $c->data(); |
| 66 | - if (! $model) { |
|
| 66 | + if (!$model) { |
|
| 67 | 67 | return null; |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | $field = $this->_contentField(); |
| 71 | - if (! $model->hasField($field)) { |
|
| 71 | + if (!$model->hasField($field)) { |
|
| 72 | 72 | return null; |
| 73 | 73 | } |
| 74 | 74 | |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | public function getAutotoc() |
| 89 | 89 | { |
| 90 | 90 | $tocifier = $this->_getTocifier(); |
| 91 | - if (! $tocifier) { |
|
| 91 | + if (!$tocifier) { |
|
| 92 | 92 | return null; |
| 93 | 93 | } |
| 94 | 94 | |
@@ -89,7 +89,7 @@ |
||
| 89 | 89 | |
| 90 | 90 | $body = $doc->getElementsByTagName('body')->item(0); |
| 91 | 91 | $this->_html = str_replace(array('<body>', '</body>'), '', |
| 92 | - $doc->saveHTML($body)); |
|
| 92 | + $doc->saveHTML($body)); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | private function _dumpBranch($node, $indent = '') |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | // Consider this node a potential dangling parent |
| 84 | - $this->_dangling[$level] =& $node; |
|
| 84 | + $this->_dangling[$level] = & $node; |
|
| 85 | 85 | |
| 86 | 86 | return $node; |
| 87 | 87 | } |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | */ |
| 94 | 94 | private function _processDocument($doc) |
| 95 | 95 | { |
| 96 | - $this->_tree =& $this->_newNode(self::$prefix, '', 0); |
|
| 96 | + $this->_tree = & $this->_newNode(self::$prefix, '', 0); |
|
| 97 | 97 | $n = 1; |
| 98 | 98 | |
| 99 | 99 | $xpath = new DOMXPath($doc); |
@@ -102,16 +102,16 @@ discard block |
||
| 102 | 102 | foreach ($xpath->query($query) as $h) { |
| 103 | 103 | $text = $this->_getPlainText($h); |
| 104 | 104 | $level = (int) substr($h->tagName, 1); |
| 105 | - $id = self::$prefix . $n; |
|
| 105 | + $id = self::$prefix.$n; |
|
| 106 | 106 | ++$n; |
| 107 | 107 | |
| 108 | 108 | // Build the tree |
| 109 | - $parent =& $this->_getParent($level); |
|
| 110 | - $node =& $this->_newNode($id, $text, $level); |
|
| 111 | - if (! isset($parent['children'])) { |
|
| 109 | + $parent = & $this->_getParent($level); |
|
| 110 | + $node = & $this->_newNode($id, $text, $level); |
|
| 111 | + if (!isset($parent['children'])) { |
|
| 112 | 112 | $parent['children'] = array(); |
| 113 | 113 | } |
| 114 | - $parent['children'][] =& $node; |
|
| 114 | + $parent['children'][] = & $node; |
|
| 115 | 115 | |
| 116 | 116 | // Prepend the anchor |
| 117 | 117 | $anchor = $doc->createElement('a'); |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | */ |
| 134 | 134 | private function _dumpBranch($node, $indent = '') |
| 135 | 135 | { |
| 136 | - echo $indent . $node['title'] . "\n"; |
|
| 136 | + echo $indent.$node['title']."\n"; |
|
| 137 | 137 | if (isset($node['children'])) { |
| 138 | 138 | foreach ($node['children'] as &$child) { |
| 139 | 139 | $this->_dumpBranch($child, "$indent\t"); |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | public function process() |
| 176 | 176 | { |
| 177 | 177 | // Check if $this->_raw_html is valid |
| 178 | - if (! is_string($this->_raw_html) || empty($this->_raw_html)) { |
|
| 178 | + if (!is_string($this->_raw_html) || empty($this->_raw_html)) { |
|
| 179 | 179 | return false; |
| 180 | 180 | } |
| 181 | 181 | |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | |
| 187 | 187 | // Parse the HTML into a DOMDocument tree |
| 188 | 188 | $doc = new DOMDocument(); |
| 189 | - if (! @$doc->loadHTML($html)) { |
|
| 189 | + if (!@$doc->loadHTML($html)) { |
|
| 190 | 190 | return false; |
| 191 | 191 | } |
| 192 | 192 | |
@@ -8,8 +8,8 @@ |
||
| 8 | 8 | spl_autoload_register(function ($class) { |
| 9 | 9 | switch ($class) { |
| 10 | 10 | |
| 11 | - case 'Tocifier': |
|
| 12 | - require_once __DIR__ . '/../code/Tocifier.php'; |
|
| 13 | - break; |
|
| 11 | + case 'Tocifier': |
|
| 12 | + require_once __DIR__ . '/../code/Tocifier.php'; |
|
| 13 | + break; |
|
| 14 | 14 | } |
| 15 | 15 | }); |
@@ -5,11 +5,11 @@ |
||
| 5 | 5 | * phpunit --bootstrap tests/Bootstrap.php tests/ |
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | -spl_autoload_register(function ($class) { |
|
| 8 | +spl_autoload_register(function($class) { |
|
| 9 | 9 | switch ($class) { |
| 10 | 10 | |
| 11 | 11 | case 'Tocifier': |
| 12 | - require_once __DIR__ . '/../code/Tocifier.php'; |
|
| 12 | + require_once __DIR__.'/../code/Tocifier.php'; |
|
| 13 | 13 | break; |
| 14 | 14 | } |
| 15 | 15 | }); |
@@ -22,26 +22,26 @@ discard block |
||
| 22 | 22 | |
| 23 | 23 | public function testPrependAnchor() |
| 24 | 24 | { |
| 25 | - $tocifier = new Tocifier(file_get_contents(__DIR__ . '/test1')); |
|
| 25 | + $tocifier = new Tocifier(file_get_contents(__DIR__.'/test1')); |
|
| 26 | 26 | $this->assertEquals($tocifier->getHtml(), ''); |
| 27 | 27 | $this->assertTrue($tocifier->process()); |
| 28 | 28 | |
| 29 | 29 | // The default augmenting method should already be prependAnchor |
| 30 | - $this->assertStringEqualsFile(__DIR__ . '/html1', $tocifier->getHtml()); |
|
| 30 | + $this->assertStringEqualsFile(__DIR__.'/html1', $tocifier->getHtml()); |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | public function testSetId() |
| 34 | 34 | { |
| 35 | - $tocifier = new Tocifier(file_get_contents(__DIR__ . '/test1')); |
|
| 35 | + $tocifier = new Tocifier(file_get_contents(__DIR__.'/test1')); |
|
| 36 | 36 | $tocifier->setAugmentCallback(array('Tocifier', 'setId')); |
| 37 | 37 | $this->assertEquals($tocifier->getHtml(), ''); |
| 38 | 38 | $this->assertTrue($tocifier->process()); |
| 39 | - $this->assertStringEqualsFile(__DIR__ . '/html2', $tocifier->getHtml()); |
|
| 39 | + $this->assertStringEqualsFile(__DIR__.'/html2', $tocifier->getHtml()); |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | public function testTOC() |
| 43 | 43 | { |
| 44 | - $tocifier = new Tocifier(file_get_contents(__DIR__ . '/test1')); |
|
| 44 | + $tocifier = new Tocifier(file_get_contents(__DIR__.'/test1')); |
|
| 45 | 45 | $this->assertEquals($tocifier->getTOC(), array()); |
| 46 | 46 | $this->assertTrue($tocifier->process()); |
| 47 | 47 | $this->assertNotNull($tocifier->getTOC()); |
@@ -49,17 +49,17 @@ discard block |
||
| 49 | 49 | ob_start(); |
| 50 | 50 | $tocifier->dumpTOC(); |
| 51 | 51 | $returned = ob_get_clean(); |
| 52 | - $this->assertStringEqualsFile(__DIR__ . '/toc1', $returned); |
|
| 52 | + $this->assertStringEqualsFile(__DIR__.'/toc1', $returned); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | public function testDataHideFromTOC() |
| 56 | 56 | { |
| 57 | - $tocifier = new Tocifier(file_get_contents(__DIR__ . '/test2')); |
|
| 57 | + $tocifier = new Tocifier(file_get_contents(__DIR__.'/test2')); |
|
| 58 | 58 | $this->assertEquals($tocifier->getHtml(), ''); |
| 59 | 59 | $this->assertTrue($tocifier->process()); |
| 60 | 60 | |
| 61 | 61 | // Check the augmented HTML is equal to the original one |
| 62 | - $this->assertStringEqualsFile(__DIR__ . '/test2', $tocifier->getHtml()); |
|
| 62 | + $this->assertStringEqualsFile(__DIR__.'/test2', $tocifier->getHtml()); |
|
| 63 | 63 | |
| 64 | 64 | ob_start(); |
| 65 | 65 | $tocifier->dumpTOC(); |
