ENH Tidy-up code

silverstripe · Nov 1, 2023 · 1e5c514 · 1e5c514
1 parent b1233bb
commit 1e5c514
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/src/CodeBlock.php b/src/CodeBlock.php
@@ -2,7 +2,9 @@
 
 namespace SilverStripe\MD_PHP_CodeSniffer;
 
+use PHP_CodeSniffer\Config;
 use PHP_CodeSniffer\Files\DummyFile;
+use PHP_CodeSniffer\Ruleset;
 
 class CodeBlock extends DummyFile
 {
@@ -12,6 +14,21 @@ class CodeBlock extends DummyFile
 
     private string $finalContent = '';
 
+    public function __construct(
+        Ruleset $ruleset,
+        Config $config,
+        string $content,
+        string $path,
+        string $realPath,
+        int $num
+    ) {
+        parent::__construct($content, $ruleset, $config);
+
+        $this->path = $path;
+        $this->realPath = $realPath;
+        $this->num = $num;
+    }
+
     public function cleanUp()
     {
         $this->finalContent = $this->content ?? '';

diff --git a/src/Sniffer.php b/src/Sniffer.php
@@ -65,10 +65,14 @@ public function run(string $lintLanguage, bool $fixing, bool $usingExplicitStand
         // Add code blocks to the file list for linting
         $todo = [];
         foreach ($codeBlocks as $block) {
-            $dummy = new CodeBlock($block['content'], $sniffer->ruleset, $sniffer->config);
-            $dummy->num = $block['num'];
-            $dummy->path = $block['path'];
-            $dummy->realPath = $block['realpath'];
+            $dummy = new CodeBlock(
+                $sniffer->ruleset,
+                $sniffer->config,
+                $block['content'],
+                $block['path'],
+                $block['realpath'],
+                $block['num']
+            );
             $todo[] = $dummy;
         }
 
@@ -107,6 +111,7 @@ public function run(string $lintLanguage, bool $fixing, bool $usingExplicitStand
 
         $sniffer->reporter->printReports();
 
+        // These return values are directly from Runner::runPHPCS()
         if ($numErrors === 0) {
             // No errors found.
             return 0;
@@ -148,6 +153,7 @@ private function prepareConfig(bool $usingExplicitStandard, string $lintLanguage
             $config->standards = [__DIR__ . '/../phpcs.default.xml'];
         }
 
+        // Most of these overrides are directly from Runner::runPHPCBF()
         if ($fixing) {
             // Override some of the command line settings that might break the fixes.
             $config->generator = null;
@@ -228,7 +234,7 @@ private function sniff(Runner $sniffer, array $todo): int
         // Turn all sniff errors into exceptions.
         set_error_handler([$sniffer, 'handleErrors']);
 
-        $lastDir  = '';
+        $lastDir = '';
         $numBlocks = count($todo);
 
         // Process each block sequentially - running sniff in parallel isn't supported