rector and codesniffer fixes

8 files changed, 13 insertions, 27 deletions

diff --git a/inc/TreeBuilder/AbstractBuilder.php b/inc/TreeBuilder/AbstractBuilder.php
index 76758430d..069f17026 100644
--- a/inc/TreeBuilder/AbstractBuilder.php
+++ b/inc/TreeBuilder/AbstractBuilder.php
@@ -2,7 +2,6 @@
 
 namespace dokuwiki\TreeBuilder;
 
-
 use dokuwiki\test\mock\Doku_Renderer;
 use dokuwiki\TreeBuilder\Node\AbstractNode;
 use dokuwiki\TreeBuilder\Node\ExternalLink;
@@ -145,7 +144,7 @@ abstract class AbstractBuilder
     public function getAll(): array
     {
         if (!$this->generated) throw new \RuntimeException('need to call generate() first');
-        if (empty($this->nodes)) {
+        if ($this->nodes === []) {
             $this->nodes = [];
             foreach ($this->top->getDescendants() as $node) {
                 $this->nodes[$node->getId()] = $node;
@@ -163,9 +162,7 @@ abstract class AbstractBuilder
     public function getLeaves(): array
     {
         if (!$this->generated) throw new \RuntimeException('need to call generate() first');
-        return array_filter($this->getAll(), function ($page) {
-            return !$page->getChildren();
-        });
+        return array_filter($this->getAll(), fn($page) => !$page->getChildren());
     }
 
     /**
@@ -176,9 +173,7 @@ abstract class AbstractBuilder
     public function getBranches(): array
     {
         if (!$this->generated) throw new \RuntimeException('need to call generate() first');
-        return array_filter($this->getAll(), function ($page) {
-            return !!$page->getChildren();
-        });
+        return array_filter($this->getAll(), fn($page) => (bool) $page->getChildren());
     }
 
     /**
@@ -218,7 +213,7 @@ abstract class AbstractBuilder
         foreach ($top->getChildren() as $node) {
             $R->listitem_open(1, $node->hasChildren());
             $R->listcontent_open();
-            if (is_a($node, ExternalLink::class)) {
+            if ($node instanceof ExternalLink) {
                 $R->externallink($node->getId(), $node->getTitle());
             } else {
                 $R->internallink($node->getId(), $node->getTitle());
@@ -261,6 +256,6 @@ abstract class AbstractBuilder
      */
     public function __toString(): string
     {
-        return join("\n", $this->getAll());
+        return implode("\n", $this->getAll());
     }
 }
diff --git a/inc/TreeBuilder/ControlPageBuilder.php b/inc/TreeBuilder/ControlPageBuilder.php
index 225989868..85a20b0d1 100644
--- a/inc/TreeBuilder/ControlPageBuilder.php
+++ b/inc/TreeBuilder/ControlPageBuilder.php
@@ -17,9 +17,9 @@ use dokuwiki\TreeBuilder\Node\WikiPage;
 class ControlPageBuilder extends AbstractBuilder
 {
     /** @var int do not include internal links */
-    const FLAG_NOINTERNAL = 1;
+    public const FLAG_NOINTERNAL = 1;
     /** @var int do not include external links */
-    const FLAG_NOEXTERNAL = 2;
+    public const FLAG_NOEXTERNAL = 2;
 
     /** @var string */
     protected string $controlPage;
@@ -66,7 +66,7 @@ class ControlPageBuilder extends AbstractBuilder
                     break;
                 case 'listu_close':
                     // if we had a node on this level, remove it from the parents
-                    if(isset($parents[$level])) {
+                    if (isset($parents[$level])) {
                         unset($parents[$level]);
                     }
                     $level--; // close list level
@@ -89,7 +89,7 @@ class ControlPageBuilder extends AbstractBuilder
                         );
                     }
 
-                    if($level) {
+                    if ($level) {
                         // remember this page as the parent for this level
                         $parents[$level] = $newpage;
                         // parent is the last page on the previous level
@@ -102,7 +102,7 @@ class ControlPageBuilder extends AbstractBuilder
 
                     $newpage->setParent($parent);
                     $newpage = $this->applyNodeProcessor($newpage);
-                    if($newpage instanceof AbstractNode) {
+                    if ($newpage instanceof AbstractNode) {
                         $parent->addChild($newpage);
                     }
                     break;
diff --git a/inc/TreeBuilder/Node/AbstractNode.php b/inc/TreeBuilder/Node/AbstractNode.php
index 0897ec71c..b3299e75f 100644
--- a/inc/TreeBuilder/Node/AbstractNode.php
+++ b/inc/TreeBuilder/Node/AbstractNode.php
@@ -91,7 +91,7 @@ abstract class AbstractNode
      */
     public function hasChildren(): bool
     {
-        return !empty($this->children);
+        return $this->children !== [];
     }
 
     /**
@@ -178,10 +178,7 @@ abstract class AbstractNode
      */
     public function getProperty(string $name, $default = null)
     {
-        if (isset($this->properties[$name])) {
-            return $this->properties[$name];
-        }
-        return $default;
+        return $this->properties[$name] ?? $default;
     }
 
     /**
diff --git a/inc/TreeBuilder/Node/ExternalLink.php b/inc/TreeBuilder/Node/ExternalLink.php
index 92078abc0..dbd363d2d 100644
--- a/inc/TreeBuilder/Node/ExternalLink.php
+++ b/inc/TreeBuilder/Node/ExternalLink.php
@@ -7,5 +7,4 @@ namespace dokuwiki\TreeBuilder\Node;
  */
 class ExternalLink extends AbstractNode
 {
-
 }
diff --git a/inc/TreeBuilder/Node/WikiNamespace.php b/inc/TreeBuilder/Node/WikiNamespace.php
index 69292b793..8f71cb570 100644
--- a/inc/TreeBuilder/Node/WikiNamespace.php
+++ b/inc/TreeBuilder/Node/WikiNamespace.php
@@ -7,5 +7,4 @@ namespace dokuwiki\TreeBuilder\Node;
  */
 class WikiNamespace extends AbstractNode
 {
-
 }
diff --git a/inc/TreeBuilder/Node/WikiPage.php b/inc/TreeBuilder/Node/WikiPage.php
index 9e0996bb1..d3b3c6bee 100644
--- a/inc/TreeBuilder/Node/WikiPage.php
+++ b/inc/TreeBuilder/Node/WikiPage.php
@@ -7,5 +7,4 @@ namespace dokuwiki\TreeBuilder\Node;
  */
 class WikiPage extends AbstractNode
 {
-
 }
diff --git a/inc/TreeBuilder/Node/WikiStartpage.php b/inc/TreeBuilder/Node/WikiStartpage.php
index 7bb4654c2..caf5ee135 100644
--- a/inc/TreeBuilder/Node/WikiStartpage.php
+++ b/inc/TreeBuilder/Node/WikiStartpage.php
@@ -34,5 +34,4 @@ class WikiStartpage extends WikiNamespace
     {
         return $this->originalNamespace;
     }
-
 }
diff --git a/inc/TreeBuilder/PageTreeBuilder.php b/inc/TreeBuilder/PageTreeBuilder.php
index e6e9c97eb..2fe9a6274 100644
--- a/inc/TreeBuilder/PageTreeBuilder.php
+++ b/inc/TreeBuilder/PageTreeBuilder.php
@@ -232,7 +232,7 @@ class PageTreeBuilder extends AbstractBuilder
         $dir = wikiFN($namespace . ':xxx');
         $dir = substr($dir, strlen($base));
         $dir = dirname($dir); // remove the 'xxx' part
-        if($dir === '.') $dir = ''; // dirname returns '.' for root namespace
+        if ($dir === '.') $dir = ''; // dirname returns '.' for root namespace
         return $dir;
     }
 
@@ -255,6 +255,4 @@ class PageTreeBuilder extends AbstractBuilder
         }
         return parent::applyNodeProcessor($node);
     }
-
-
 }