Skip to content

Address code style issues #365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
splitbrain wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Address code style issues #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
15bd568
automatic code style fixes
splitbrain Jul 4, 2025
26ba47f
cleanup for wrap syntax
splitbrain Jul 4, 2025
5cfa41d
cleaned readmore syntax
splitbrain Jul 4, 2025
901dd1a
cleaned up locallink syntax
splitbrain Jul 4, 2025
86eb5c0
cleaned header syntax
splitbrain Jul 4, 2025
2503385
cleaned edit button syntax
splitbrain Jul 4, 2025
1e26a1e
cleaned last section edit finish syntax
splitbrain Jul 4, 2025
8eb3419
cleaned up footer syntax
splitbrain Jul 4, 2025
3fbe59d
cleaned up include syntax
splitbrain Jul 4, 2025
1739944
clened up sorttag syntax
splitbrain Jul 4, 2025
5b20ec9
clean up helper
splitbrain Jul 4, 2025
8d62317
cleanup action
splitbrain Jul 4, 2025
2cfc6e2
adjusted files for renamed methods
splitbrain Jul 4, 2025
c69a46a
fix use of get_flags()
splitbrain Jul 4, 2025
f9b92ab
fix overlong line in config metadata
splitbrain Jul 4, 2025
15b2a7c
fix type hints and pass by reference for event handlers
splitbrain Jul 5, 2025
431a77a
replace deprecated dbg_log calls
splitbrain Jul 5, 2025
3ea2da3
add backwards compatibility to helper
splitbrain Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion GenericResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
<?php

namespace dokuwiki\plugin\include;

use dokuwiki\File\Resolver;

/**
* Resolves ids without cleaning them.
*
* @package dokuwiki\plugin\include
*/
class GenericResolver extends Resolver {
class GenericResolver extends Resolver
{
}
44 changes: 22 additions & 22 deletions _test/namespace_includes.test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ protected function getDirContent ($dir) {
* Test hiding of hidden pages in namespace includes
*/
public function test_hidden() {
$flags = $this->helper->get_flags(array());
$pages = $this->helper->_get_included_pages('namespace', 'inclhidden:', '', '', $flags);
$flags = $this->helper->getFlags(array());
$pages = $this->helper->getIncludedPages('namespace', 'inclhidden:', '', '', $flags);
$this->assertEquals(array(
array('id' => 'inclhidden:visible', 'exists' => true, 'parent_id' => ''),
), $pages);
Expand All @@ -76,37 +76,37 @@ public function test_hidden() {
* Test include depth limit
*/
public function test_depth() {
$flags = $this->helper->get_flags(array());
$pages = $this->helper->_get_included_pages('namespace', 'incltest:', '', '', $flags);
$flags = $this->helper->getFlags(array());
$pages = $this->helper->getIncludedPages('namespace', 'incltest:', '', '', $flags);
$this->assertEquals(array(
array('id' => 'incltest:level1', 'exists' => true, 'parent_id' => ''),
), $pages);
$flags = $this->helper->get_flags(array('depth=2'));
$pages = $this->helper->_get_included_pages('namespace', 'incltest:', '', '', $flags);
$flags = $this->helper->getFlags(array('depth=2'));
$pages = $this->helper->getIncludedPages('namespace', 'incltest:', '', '', $flags);
$this->assertEquals(array(
array('id' => 'incltest:level1', 'exists' => true, 'parent_id' => ''),
array('id' => 'incltest:ns:level2', 'exists' => true, 'parent_id' => ''),
), $pages);
$flags = $this->helper->get_flags(array('depth=2'));
$pages = $this->helper->_get_included_pages('namespace', 'incltest:ns', '', '', $flags);
$flags = $this->helper->getFlags(array('depth=2'));
$pages = $this->helper->getIncludedPages('namespace', 'incltest:ns', '', '', $flags);
$this->assertEquals(array(
array('id' => 'incltest:ns:level2', 'exists' => true, 'parent_id' => ''),
array('id' => 'incltest:ns:ns:level3', 'exists' => true, 'parent_id' => ''),
), $pages);
$flags = $this->helper->get_flags(array('depth=0'));
$pages = $this->helper->_get_included_pages('namespace', 'incltest:', '', '', $flags);
$flags = $this->helper->getFlags(array('depth=0'));
$pages = $this->helper->getIncludedPages('namespace', 'incltest:', '', '', $flags);
$this->assertEquals(array(
array('id' => 'incltest:level1', 'exists' => true, 'parent_id' => ''),
array('id' => 'incltest:ns:level2', 'exists' => true, 'parent_id' => ''),
array('id' => 'incltest:ns:ns:level3', 'exists' => true, 'parent_id' => ''),
), $pages);

// test include of the root namespace
$flags = $this->helper->get_flags(array());
$pages = $this->helper->_get_included_pages('namespace', ':', '', '', $flags);
$flags = $this->helper->getFlags(array());
$pages = $this->helper->getIncludedPages('namespace', ':', '', '', $flags);
$this->assertEquals(array(array('id' => 'mailinglist', 'exists' => true, 'parent_id' => '')), $pages);
$flags = $this->helper->get_flags(array('depth=2'));
$pages = $this->helper->_get_included_pages('namespace', ':', '', '', $flags);
$flags = $this->helper->getFlags(array('depth=2'));
$pages = $this->helper->getIncludedPages('namespace', ':', '', '', $flags);
$expected = array(
array('id' => 'inclhidden:visible', 'exists' => true, 'parent_id' => ''),
array('id' => 'inclorder:page1', 'exists' => true, 'parent_id' => ''),
Expand Down Expand Up @@ -143,8 +143,8 @@ public function test_depth() {
*/
public function test_order() {

$flags = $this->helper->get_flags(array());
$pages = $this->helper->_get_included_pages('namespace', 'inclorder:', '', '', $flags);
$flags = $this->helper->getFlags(array());
$pages = $this->helper->getIncludedPages('namespace', 'inclorder:', '', '', $flags);

$this->assertEquals(array(
array('id' => 'inclorder:page1', 'exists' => true, 'parent_id' => ''),
Expand All @@ -153,25 +153,25 @@ public function test_order() {
array('id' => 'inclorder:page4', 'exists' => true, 'parent_id' => ''),
), $pages);

$flags = $this->helper->get_flags(array('rsort'));
$pages = $this->helper->_get_included_pages('namespace', 'inclorder:', '', '', $flags);
$flags = $this->helper->getFlags(array('rsort'));
$pages = $this->helper->getIncludedPages('namespace', 'inclorder:', '', '', $flags);
$this->assertEquals(array(
array('id' => 'inclorder:page4', 'exists' => true, 'parent_id' => ''),
array('id' => 'inclorder:page3', 'exists' => true, 'parent_id' => ''),
array('id' => 'inclorder:page2', 'exists' => true, 'parent_id' => ''),
array('id' => 'inclorder:page1', 'exists' => true, 'parent_id' => ''),
), $pages);
$flags = $this->helper->get_flags(array('order=custom'));
$pages = $this->helper->_get_included_pages('namespace', 'inclorder:', '', '', $flags);
$flags = $this->helper->getFlags(array('order=custom'));
$pages = $this->helper->getIncludedPages('namespace', 'inclorder:', '', '', $flags);
$this->assertEquals(array(
array('id' => 'inclorder:page4', 'exists' => true, 'parent_id' => ''),
array('id' => 'inclorder:page3', 'exists' => true, 'parent_id' => ''),
array('id' => 'inclorder:page1', 'exists' => true, 'parent_id' => ''),
array('id' => 'inclorder:page2', 'exists' => true, 'parent_id' => ''),
), $pages);

$flags = $this->helper->get_flags(array('order=custom', 'rsort'));
$pages = $this->helper->_get_included_pages('namespace', 'inclorder:', '', '', $flags);
$flags = $this->helper->getFlags(array('order=custom', 'rsort'));
$pages = $this->helper->getIncludedPages('namespace', 'inclorder:', '', '', $flags);
$this->assertEquals(array(
array('id' => 'inclorder:page2', 'exists' => true, 'parent_id' => ''),
array('id' => 'inclorder:page1', 'exists' => true, 'parent_id' => ''),
Expand Down
Loading