diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 07092b5688..f5b0036fa0 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -8770,11 +8770,6 @@ parameters: count: 1 path: libraries/classes/Utils/HttpRequest.php - - - message: "#^Parameter \\#2 \\$httpStatus of method PhpMyAdmin\\\\Utils\\\\HttpRequest\\:\\:response\\(\\) expects int, mixed given\\.$#" - count: 1 - path: libraries/classes/Utils/HttpRequest.php - - message: "#^Variable \\$http_response_header in isset\\(\\) always exists and is not nullable\\.$#" count: 1 diff --git a/test/classes/GitTest.php b/test/classes/GitTest.php index 2789dad1aa..3b59841295 100644 --- a/test/classes/GitTest.php +++ b/test/classes/GitTest.php @@ -200,6 +200,13 @@ class GitTest extends AbstractTestCase $commit = $this->object->checkGitRevision(); + if ( + $commit === null + && ! isset($_SESSION['PMA_VERSION_REMOTECOMMIT_17bf8b7309919f8ac593d7c563b31472780ee83b']) + ) { + $this->markTestSkipped('Unable to get remote commit information.'); + } + $this->assertIsArray($commit); $this->assertArrayHasKey('hash', $commit); $this->assertEquals('17bf8b7309919f8ac593d7c563b31472780ee83b', $commit['hash']); @@ -317,6 +324,13 @@ class GitTest extends AbstractTestCase $commit = $this->object->checkGitRevision(); + if ( + $commit === null + && ! isset($_SESSION['PMA_VERSION_REMOTECOMMIT_17bf8b7309919f8ac593d7c563b31472780ee83b']) + ) { + $this->markTestSkipped('Unable to get remote commit information.'); + } + $this->assertIsArray($commit); $this->assertArrayHasKey('hash', $commit); $this->assertEquals('17bf8b7309919f8ac593d7c563b31472780ee83b', $commit['hash']); diff --git a/test/classes/OpenDocumentTest.php b/test/classes/OpenDocumentTest.php index 7ec98d73b9..e87af1503c 100644 --- a/test/classes/OpenDocumentTest.php +++ b/test/classes/OpenDocumentTest.php @@ -14,6 +14,7 @@ use function tempnam; use function unlink; /** + * @covers \PhpMyAdmin\OpenDocument * @requires extension zip */ class OpenDocumentTest extends AbstractTestCase