run psalm only against master as the app is shipped

Signed-off-by: Robin Appelman <[email protected]>
nextcloud · Sep 18, 2023 · 22192c2 · 22192c2
1 parent d30339d
commit 22192c2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/.github/workflows/psalm-matrix.yml b/.github/workflows/psalm-matrix.yml
@@ -24,7 +24,7 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        ocp-version: [ 'dev-master', 'dev-stable27', 'dev-stable26', 'dev-stable25']
+        ocp-version: [ 'dev-master' ]
 
     name: Nextcloud ${{ matrix.ocp-version }}
     steps:

diff --git a/lib/Listener/LogListener.php b/lib/Listener/LogListener.php
@@ -35,7 +35,7 @@ class LogListener implements IEventListener {
 	private ?Console $console;
 
 	public function __construct(Formatter $formatter, SystemConfig $config) {
-		if (\OC_CONSOLE) {
+		if (defined('OC_CONSOLE') && \OC_CONSOLE) {
 			$level = getenv('OCC_LOG');
 			if ($level) {
 				$terminal = new Terminal();

diff --git a/lib/Log/Console.php b/lib/Log/Console.php
@@ -42,7 +42,7 @@ public function __construct(Formatter $formatter, SystemConfig $config, string $
 		$this->terminalWidth = $terminalWidth;
 	}
 
-	public function log(int $level, string $app, $entry) {
+	public function log(int $level, string $app, array $entry) {
 		if ($level >= $this->level) {
 			$messageWidth = $this->terminalWidth - 8 - 18 - 6;
 

diff --git a/tests/stubs/stub.phpstub b/tests/stubs/stub.phpstub
@@ -32,3 +32,18 @@ namespace OC\Core\Command {
 	class InterruptedException extends \Exception {
 	}
 }
+
+namespace OC {
+	class SystemConfig {
+	}
+}
+
+namespace OC\Log {
+	use OC\SystemConfig;
+	class LogDetails {
+		public function __construct(SystemConfig $config) {
+		}
+		public function logDetails(string $app, $message, int $level): array {
+		}
+	}
+}