chore: upgrade phpunit to 10.5

project-satisfy · Mar 23, 2024 · eea1a68 · eea1a68
1 parent 01b47d3
commit eea1a68
Show file tree

Hide file tree

Showing 11 changed files with 327 additions and 377 deletions.
diff --git a/composer.json b/composer.json
@@ -59,7 +59,7 @@
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-symfony": "^1.0",
         "phpspec/prophecy-phpunit": "^2.0",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^10.5",
         "symfony/browser-kit": "^5.4"
     },
     "autoload": {

diff --git a/composer.lock b/composer.lock
diff --git a/config/config.yml b/config/config.yml
@@ -33,6 +33,6 @@ monolog:
       type: rotating_file
       path: "%kernel.logs_dir%/%kernel.environment%.log"
       max_files: 30
-    docker:
+    stderr:
       type: stream
       path: "php://stderr"
diff --git a/config/parameters.test.yml b/config/parameters.test.yml
@@ -1,4 +1,6 @@
 parameters:
+    log.handler: 'stderr'
+    log.level: 'error'
     satis_filename: "vfs://root/satis.json"
     satis_log_path: "vfs://root/satis/"
     admin.auth: false
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" bootstrap="tests/bootstrap.php" cacheResultFile="var/.phpunit.result.cache">
-  <coverage processUncoveredFiles="false">
-    <include>
-      <directory suffix=".php">src/</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" bootstrap="tests/bootstrap.php" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <php>
     <env name="KERNEL_CLASS" value="TestKernel"/>
     <env name="APP_ENV" value="test" force="true"/>
@@ -16,4 +11,9 @@
       <directory>./tests</directory>
     </testsuite>
   </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/src/Playbloom/Satisfy/Webhook/GithubWebhook.php b/src/Playbloom/Satisfy/Webhook/GithubWebhook.php
@@ -78,10 +78,6 @@ public function getResponse(Request $request): Response
 
         $callback = function () use ($repository) {
             echo 'OK';
-            if (!isset($GLOBALS['__PHPUNIT_BOOTSTRAP'])) {
-                ignore_user_abort(true);
-                Response::closeOutputBuffers(0, true);
-            }
             $this->handle($repository);
         };
 

diff --git a/tests/Playbloom/Satisfy/Manager/ManagerConfigValidatorTest.php b/tests/Playbloom/Satisfy/Manager/ManagerConfigValidatorTest.php
@@ -58,7 +58,7 @@ public function testConfigIsMatchingSatisSchema($configFilename): void
         $this->assertJsonFileEqualsJsonFile($configFilename, $this->config->url());
     }
 
-    public function configFileProvider(): array
+    public static function configFileProvider(): array
     {
         return [
             [__DIR__ . '/../../../fixtures/satis-minimal.json'],

diff --git a/tests/Playbloom/Satisfy/Webhook/BitbucketWebhookTest.php b/tests/Playbloom/Satisfy/Webhook/BitbucketWebhookTest.php
@@ -39,21 +39,21 @@ public function testInvalidRequestMustThrowException($request): void
         $controller->bitbucketAction($request);
     }
 
-    public function invalidRequestProvider(): \Generator
+    public static function invalidRequestProvider(): \Generator
     {
         // invalid IP
-        yield [$this->createRequest('', '1.1.1.1')];
+        yield [self::createRequest('', '1.1.1.1')];
 
         // valid IP, missing content
         yield [Request::create('')];
 
         // valid IP, missing required param
         $content = ['repository' => ['full_name' => '']];
-        yield [$this->createRequest($content)];
+        yield [self::createRequest($content)];
 
         // valid content, unknown repository url
         $content = ['repository' => ['full_name' => 'test/test']];
-        yield [$this->createRequest($content)];
+        yield [self::createRequest($content)];
     }
 
     public function testValidRequestMustTriggerBuild(): void
@@ -87,15 +87,15 @@ public function testValidRequestMustTriggerBuild(): void
             ->getRootPath()
             ->willReturn($rootPath);
 
-        $request = $this->createRequest(['repository' => ['full_name' => 'test/test']]);
+        $request = self::createRequest(['repository' => ['full_name' => 'test/test']]);
         /** @var BitbucketWebhook $webhook */
         $webhook = $container->get(BitbucketWebhook::class);
         $response = $webhook->getResponse($request);
 
         $this->assertEquals(0, $response->getContent());
     }
 
-    protected function createRequest($content, string $ipAddress = '127.0.0.1'): Request
+    protected static function createRequest($content, string $ipAddress = '127.0.0.1'): Request
     {
         return Request::create('', 'GET', [], [], [], ['REMOTE_ADDR' => $ipAddress], json_encode($content));
     }

diff --git a/tests/Playbloom/Satisfy/Webhook/DevOpsWebhookTest.php b/tests/Playbloom/Satisfy/Webhook/DevOpsWebhookTest.php
@@ -5,7 +5,6 @@
 
 namespace Tests\Playbloom\Satisfy\Webhook;
 
-use Generator;
 use PHPUnit\Framework\TestCase;
 use Playbloom\Satisfy\Event\BuildEvent;
 use Playbloom\Satisfy\Model\Repository;
@@ -66,7 +65,7 @@ function ($args) {
         self::assertEquals(0, $response->getContent());
     }
 
-    public function testInvalidTokenRequest()
+    public function testInvalidTokenRequest(): void
     {
         $manager = $this->getManagerMock();
         $manager
@@ -89,7 +88,7 @@ public function testInvalidTokenRequest()
         self::assertEquals(Response::HTTP_BAD_REQUEST, $response->getStatusCode());
     }
 
-    public function invalidRequestProvider(): \Generator
+    public static function invalidRequestProvider(): \Generator
     {
         yield [self::createRequest([], '')];
 

diff --git a/tests/Playbloom/Satisfy/Webhook/GithubWebhookTest.php b/tests/Playbloom/Satisfy/Webhook/GithubWebhookTest.php
@@ -30,13 +30,13 @@ public function testInvalidRequest($request): void
         $handler->getResponse($request);
     }
 
-    public function invalidRequestProvider(): \Generator
+    public static function invalidRequestProvider(): \Generator
     {
-        yield [$this->createRequest([], '')];
+        yield [self::createRequest([], '')];
 
-        yield [$this->createRequest([])];
+        yield [self::createRequest([])];
 
-        yield [$this->createRequest(['repository' => []])];
+        yield [self::createRequest(['repository' => []])];
     }
 
     public function testValidRequest(): void
@@ -59,7 +59,7 @@ function ($args) {
             )
             ->shouldBeCalledTimes(1);
 
-        $request = $this->createRequest(file_get_contents(__DIR__ . '/../../../fixtures/github-push.json'));
+        $request = self::createRequest(file_get_contents(__DIR__ . '/../../../fixtures/github-push.json'));
         $handler = new GithubWebhook($manager->reveal(), $dispatcher->reveal());
         $response = $handler->getResponse($request);
 
@@ -71,7 +71,7 @@ function ($args) {
         $this->assertEquals('OK', $result);
     }
 
-    public function testValidRequestWithRepoAutoAdd()
+    public function testValidRequestWithRepoAutoAdd(): void
     {
         $manager = $this->getManagerMock();
         $manager
@@ -95,7 +95,7 @@ function ($args) {
             )
             ->shouldBeCalledTimes(1);
 
-        $request = $this->createRequest(file_get_contents(__DIR__ . '/../../../fixtures/github-push.json'));
+        $request = self::createRequest(file_get_contents(__DIR__ . '/../../../fixtures/github-push.json'));
         $handler = new GithubWebhook($manager->reveal(), $dispatcher->reveal());
         $handler->setAutoAdd(true);
         $handler->setAutoAddType('github');
@@ -109,7 +109,7 @@ function ($args) {
         $this->assertEquals('OK', $result);
     }
 
-    protected function createRequest($content, string $event = 'push'): Request
+    protected static function createRequest($content, string $event = 'push'): Request
     {
         if (!is_string($content)) {
             $content = json_encode($content);

diff --git a/tests/Playbloom/Satisfy/Webhook/GitlabWebhookTest.php b/tests/Playbloom/Satisfy/Webhook/GitlabWebhookTest.php
@@ -31,13 +31,13 @@ public function testInvalidRequest($request): void
         $handler->getResponse($request);
     }
 
-    public function invalidRequestProvider(): \Generator
+    public static function invalidRequestProvider(): \Generator
     {
-        yield [$this->createRequest([], '')];
+        yield [self::createRequest([], '')];
 
-        yield [$this->createRequest([])];
+        yield [self::createRequest([])];
 
-        yield [$this->createRequest(['repository' => []])];
+        yield [self::createRequest(['repository' => []])];
     }
 
     public function testValidRequest(): void
@@ -60,7 +60,7 @@ function ($args) {
             )
             ->shouldBeCalledTimes(1);
 
-        $request = $this->createRequest(file_get_contents(__DIR__ . '/../../../fixtures/gitlab-push.json'));
+        $request = self::createRequest(file_get_contents(__DIR__ . '/../../../fixtures/gitlab-push.json'));
         $handler = new GitlabWebhook($manager->reveal(), $dispatcher->reveal());
         $response = $handler->getResponse($request);
 
@@ -92,7 +92,7 @@ function ($args) {
             )
             ->shouldBeCalledTimes(1);
 
-        $request = $this->createRequest(file_get_contents(__DIR__ . '/../../../fixtures/gitlab-push-nonexistant.json'));
+        $request = self::createRequest(file_get_contents(__DIR__ . '/../../../fixtures/gitlab-push-nonexistant.json'));
         $handler = new GitlabWebhook($manager->reveal(), $dispatcher->reveal(), null, true);
         $response = $handler->getResponse($request);
 
@@ -120,7 +120,7 @@ function ($args) {
             )
             ->shouldBeCalledTimes(1);
 
-        $request = $this->createRequest(file_get_contents(__DIR__ . '/../../../fixtures/gitlab-push-deprecated.json'));
+        $request = self::createRequest(file_get_contents(__DIR__ . '/../../../fixtures/gitlab-push-deprecated.json'));
         $handler = new GitlabWebhook($manager->reveal(), $dispatcher->reveal());
         $response = $handler->getResponse($request);
 
@@ -142,7 +142,7 @@ public function testInvalidTokenRequest(): void
 
         $this->expectException(BadRequestHttpException::class);
         $this->expectExceptionMessage('Invalid Token');
-        $request = $this->createRequest(file_get_contents(__DIR__ . '/../../../fixtures/gitlab-push.json'), 'push', 'invalid-token');
+        $request = self::createRequest(file_get_contents(__DIR__ . '/../../../fixtures/gitlab-push.json'), 'push', 'invalid-token');
         $handler = new GitlabWebhook($manager->reveal(), $dispatcher->reveal());
         $response = $handler->getResponse($request);
 
@@ -152,7 +152,7 @@ public function testInvalidTokenRequest(): void
     public function testAutoAddOnlyHttp(): void
     {
         $url = 'https://gitlab.com/example/nonexistant.git';
-        $request = $this->createRequest([
+        $request = self::createRequest([
             'project' => [
                 'git_http_url' => $url,
             ],
@@ -184,7 +184,7 @@ public function testAutoAddPreferSsh(): void
     {
         $httpUrl = 'https://gitlab.com/example/nonexistant.git';
         $sshUrl = '[email protected]:example/nonexistant.git';
-        $request = $this->createRequest([
+        $request = self::createRequest([
             'project' => [
                 'git_http_url' => $httpUrl,
                 'git_ssh_url' => $sshUrl,
@@ -215,7 +215,7 @@ public function testAutoAddPreferSsh(): void
     public function testAutoAddPreferSshFallback(): void
     {
         $httpUrl = 'https://gitlab.com/example/nonexistant.git';
-        $request = $this->createRequest([
+        $request = self::createRequest([
             'project' => [
                 'git_http_url' => $httpUrl,
             ],
@@ -243,7 +243,7 @@ public function testAutoAddPreferHttps(): void
     {
         $httpUrl = 'https://gitlab.com/example/nonexistant.git';
         $sshUrl = '[email protected]:example/nonexistant.git';
-        $request = $this->createRequest([
+        $request = self::createRequest([
             'project' => [
                 'git_http_url' => $httpUrl,
                 'git_ssh_url' => $sshUrl,
@@ -274,7 +274,7 @@ public function testAutoAddPreferHttps(): void
     public function testAutoAddPreferHttpsFallback(): void
     {
         $sshUrl = '[email protected]:example/nonexistant.git';
-        $request = $this->createRequest([
+        $request = self::createRequest([
             'project' => [
                 'git_ssh_url' => $sshUrl,
             ],
@@ -299,7 +299,7 @@ public function testAutoAddPreferHttpsFallback(): void
         $response = $handler->getResponse($request);
     }
 
-    protected function createRequest($content, string $event = 'push', ?string $token = null): Request
+    protected static function createRequest($content, string $event = 'push', ?string $token = null): Request
     {
         if (!is_string($content)) {
             $content = json_encode($content);