Resolve phpcs and phpstan issues; and remove a redundant directive

phpDocumentor · Feb 27, 2021 · 0125289 · 0125289
1 parent 2870c2b
commit 0125289
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 73 deletions.
diff --git a/src/Guides/Nodes/CodeNode.php b/src/Guides/Nodes/CodeNode.php
@@ -50,7 +50,7 @@ public function getLanguage() : ?string
         return $this->language;
     }
 
-    public function setStartingLineNumber(?int $lineNumber): void
+    public function setStartingLineNumber(?int $lineNumber) : void
     {
         $this->startingLineNumber = $lineNumber;
     }

diff --git a/src/Guides/Renderers/Html/CodeNodeRenderer.php b/src/Guides/Renderers/Html/CodeNodeRenderer.php
@@ -13,21 +13,9 @@
 
 namespace phpDocumentor\Guides\Renderers\Html;
 
-use Highlight\Highlighter;
 use phpDocumentor\Guides\Nodes\CodeNode;
 use phpDocumentor\Guides\Renderer;
 use phpDocumentor\Guides\Renderers\NodeRenderer;
-use function array_keys;
-use function array_merge;
-use function array_reverse;
-use function count;
-use function implode;
-use function in_array;
-use function preg_split;
-use function rtrim;
-use function str_pad;
-use function trim;
-use const STR_PAD_LEFT;
 
 class CodeNodeRenderer implements NodeRenderer
 {

diff --git a/src/Guides/RestructuredText/Directives/CodeBlock.php b/src/Guides/RestructuredText/Directives/CodeBlock.php
@@ -43,16 +43,7 @@ public function process(
 
         if ($node instanceof CodeNode) {
             $node->setLanguage(trim($data));
-
-            $startingLineNumber = null;
-            if (isset($options['linenos'])) {
-                $startingLineNumber = 1;
-            }
-            $startingLineNumber = $options['number-lines'] ?? $options['lineno-start'] ?? $startingLineNumber;
-
-            if ($startingLineNumber !== null) {
-                $node->setStartingLineNumber((int)$startingLineNumber);
-            }
+            $this->setStartingLineNumberBasedOnOptions($options, $node);
         }
 
         if ($variable !== '') {
@@ -68,4 +59,23 @@ public function wantCode() : bool
     {
         return true;
     }
+
+    /**
+     * @param string[] $options
+     */
+    private function setStartingLineNumberBasedOnOptions(array $options, CodeNode $node) : void
+    {
+        $startingLineNumber = null;
+        if (isset($options['linenos'])) {
+            $startingLineNumber = 1;
+        }
+
+        $startingLineNumber = $options['number-lines'] ?? $options['lineno-start'] ?? $startingLineNumber;
+
+        if ($startingLineNumber === null) {
+            return;
+        }
+
+        $node->setStartingLineNumber((int) $startingLineNumber);
+    }
 }
diff --git a/src/Guides/RestructuredText/HTML/Directives/CodeBlockDirective.php b/src/Guides/RestructuredText/HTML/Directives/CodeBlockDirective.php