Fixes #1767 - add a passthru attribute so PHPStan can print errors

phingofficial · Feb 21, 2024 · b882493 · b882493
1 parent 52866d6
commit b882493
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/etc/phing-grammar.rng b/etc/phing-grammar.rng
@@ -5644,6 +5644,11 @@
                 <optional>
                     <attribute name="executable"/>
                 </optional>
+                <optional>
+                    <attribute name="passthru" a:defaultValue="false">
+                        <data type="boolean"/>
+                    </attribute>
+                </optional>
                 <optional>
                     <attribute name="checkReturn">
                         <data type="boolean"/>

diff --git a/src/Phing/Task/Ext/Analyzer/Phpstan/PHPStanTask.php b/src/Phing/Task/Ext/Analyzer/Phpstan/PHPStanTask.php
@@ -97,6 +97,11 @@ class PHPStanTask extends Task
      */
     private $checkreturn;
 
+    /**
+     * @var bool
+     */
+    private $passthru = false;
+
     /**
      * @var bool
      */
@@ -223,6 +228,11 @@ public function isCheckreturn(): ?bool
         return $this->checkreturn;
     }
 
+    public function isPassthru(): ?bool
+    {
+        return $this->passthru;
+    }
+
     public function isDebug(): ?bool
     {
         return $this->debug;
@@ -333,6 +343,11 @@ public function setCheckreturn(bool $checkreturn)
         $this->checkreturn = $checkreturn;
     }
 
+    public function setPassthru(bool $passthru)
+    {
+        $this->passthru = $passthru;
+    }
+
     public function setDebug(bool $debug): void
     {
         $this->debug = $debug;
@@ -391,6 +406,7 @@ public function main()
         $exe->setExecutable($toExecute->getExecutable());
         $exe->createArg()->setLine(implode(' ', $toExecute->getArguments()));
         $exe->setCheckreturn($this->checkreturn);
+        $exe->setPassthru($this->passthru);
         $exe->setLocation($this->getLocation());
         $exe->setProject($this->getProject());
         $exe->setLevel('info');

diff --git a/src/Phing/Task/System/ExecTask.php b/src/Phing/Task/System/ExecTask.php
@@ -311,7 +311,7 @@ public function setError(File $f): void
      *
      * @param bool $passthru If passthru shall be used
      */
-    public function setPassthru($passthru): void
+    public function setPassthru(bool $passthru): void
     {
         $this->passthru = $passthru;
     }

diff --git a/tests/Phing/Test/Task/Ext/Analyzer/PHPStan/PHPStanTaskAssert.php b/tests/Phing/Test/Task/Ext/Analyzer/PHPStan/PHPStanTaskAssert.php
@@ -48,6 +48,7 @@ private function assertCommonDefaults(PHPStanTask $task): void
         $this->assertNull($task->isNoInteraction());
         $this->assertNull($task->isVerbose());
         $this->assertNull($task->isCheckreturn());
+        $this->assertFalse($task->isPassthru());
     }
 
     private function assertAnalyseDefaults(PHPStanTask $task): void