Make tests green again

vtsykun · vtsykun · commit 1cfd7f9f991d · 2023-09-11T02:23:24.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -29,7 +29,7 @@
         "symfony/password-hasher": "^5.4|^6.0|^7.0",
         "symfony/security-core": "^6.2|^7.0",
         "symfony/security-csrf": "^5.4|^6.0|^7.0",
-        "symfony/security-http": "^6.3|^7.0"
+        "symfony/security-http": "^6.3.4|^7.0"
     },
     "require-dev": {
         "symfony/asset": "^5.4|^6.0|^7.0",
diff --git a/src/Symfony/Component/Cache/Traits/RelayProxy.php b/src/Symfony/Component/Cache/Traits/RelayProxy.php
@@ -456,6 +456,11 @@ public function bitcount($key, $start = 0, $end = -1, $by_bit = false): \Relay\R
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bitcount(...\func_get_args());
     }
 
+    public function bitfield($key, ...$args): \Relay\Relay|array|false
+    {
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bitfield(...\func_get_args());
+    }
+
     public function config($operation, $key = null, $value = null): \Relay\Relay|array|bool
     {
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->config(...\func_get_args());
diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Tests/Webhook/SendgridSignedRequestParserTest.php b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Tests/Webhook/SendgridSignedRequestParserTest.php
@@ -43,4 +43,9 @@ protected function getSecret(): string
     {
         return 'MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE83T4O/n84iotIvIW4mdBgQ/7dAfSmpqIM8kF9mN1flpVKS3GRqe62gw+2fNNRaINXvVpiglSI8eNEc6wEA3F+g==';
     }
+
+    protected function mustBeSkipped(): bool
+    {
+        return !extension_loaded('openssl');
+    }
 }
diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Tests/Webhook/SendgridWrongSecretRequestParserTest.php b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Tests/Webhook/SendgridWrongSecretRequestParserTest.php
@@ -47,4 +47,9 @@ protected function getSecret(): string
     {
         return 'incorrect';
     }
+
+    protected function mustBeSkipped(): bool
+    {
+        return !extension_loaded('openssl');
+    }
 }
diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Tests/Webhook/SendgridWrongSignatureRequestParserTest.php b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Tests/Webhook/SendgridWrongSignatureRequestParserTest.php
@@ -47,4 +47,9 @@ protected function getSecret(): string
     {
         return 'MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE83T4O/n84iotIvIW4mdBgQ/7dAfSmpqIM8kF9mN1flpVKS3GRqe62gw+2fNNRaINXvVpiglSI8eNEc6wEA3F+g==';
     }
+
+    protected function mustBeSkipped(): bool
+    {
+        return !extension_loaded('openssl');
+    }
 }
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/composer.json b/src/Symfony/Component/Messenger/Bridge/Doctrine/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=8.1",
-        "doctrine/dbal": "^2.13|^3.0",
+        "doctrine/dbal": "^3.2",
         "symfony/messenger": "^5.4|^6.0|^7.0",
         "symfony/service-contracts": "^2.5|^3"
     },
diff --git a/src/Symfony/Component/Process/Tests/Messenger/RunProcessMessageHandlerTest.php b/src/Symfony/Component/Process/Tests/Messenger/RunProcessMessageHandlerTest.php
@@ -33,7 +33,7 @@ public function testRunFailedProcess()
             (new RunProcessMessageHandler())(new RunProcessMessage(['invalid']));
         } catch (RunProcessFailedException $e) {
             $this->assertSame(['invalid'], $e->context->command);
-            $this->assertSame(127, $e->context->exitCode);
+            $this->assertSame('\\' === \DIRECTORY_SEPARATOR ? 1 : 127, $e->context->exitCode);
 
             return;
         }
diff --git a/src/Symfony/Component/Webhook/Test/AbstractRequestParserTestCase.php b/src/Symfony/Component/Webhook/Test/AbstractRequestParserTestCase.php
@@ -26,6 +26,10 @@ abstract class AbstractRequestParserTestCase extends TestCase
      */
     public function testParse(string $payload, RemoteEvent $expected)
     {
+        if ($this->mustBeSkipped()) {
+            $this->markTestSkipped('This test cannot be run.');
+        }
+
         $request = $this->createRequest($payload);
         $parser = $this->createRequestParser();
         $wh = $parser->parse($request, $this->getSecret());
@@ -66,4 +70,9 @@ protected static function getFixtureExtension(): string
     {
         return 'json';
     }
+
+    protected function mustBeSkipped(): bool
+    {
+        return false;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -456,6 +456,11 @@ public function bitcount($key, $start = 0, $end = -1, $by_bit = false): \Relay\R`
`456`	`456`	`return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bitcount(...\func_get_args());`
`457`	`457`	`}`
`458`	`458`
	`459`	`+ public function bitfield($key, ...$args): \Relay\Relay\|array\|false`
	`460`	`+ {`
	`461`	`+ return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bitfield(...\func_get_args());`
	`462`	`+ }`
	`463`	`+`
`459`	`464`	`public function config($operation, $key = null, $value = null): \Relay\Relay\|array\|bool`
`460`	`465`	`{`
`461`	`466`	`return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->config(...\func_get_args());`
Original file line number	Diff line number	Diff line change
`@@ -43,4 +43,9 @@ protected function getSecret(): string`
`43`	`43`	`{`
`44`	`44`	`return 'MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE83T4O/n84iotIvIW4mdBgQ/7dAfSmpqIM8kF9mN1flpVKS3GRqe62gw+2fNNRaINXvVpiglSI8eNEc6wEA3F+g==';`
`45`	`45`	`}`
	`46`	`+`
	`47`	`+ protected function mustBeSkipped(): bool`
	`48`	`+ {`
	`49`	`+ return !extension_loaded('openssl');`
	`50`	`+ }`
`46`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,4 +47,9 @@ protected function getSecret(): string`
`47`	`47`	`{`
`48`	`48`	`return 'incorrect';`
`49`	`49`	`}`
	`50`	`+`
	`51`	`+ protected function mustBeSkipped(): bool`
	`52`	`+ {`
	`53`	`+ return !extension_loaded('openssl');`
	`54`	`+ }`
`50`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function testRunFailedProcess()`
`33`	`33`	`(new RunProcessMessageHandler())(new RunProcessMessage(['invalid']));`
`34`	`34`	`} catch (RunProcessFailedException $e) {`
`35`	`35`	`$this->assertSame(['invalid'], $e->context->command);`
`36`		`- $this->assertSame(127, $e->context->exitCode);`
	`36`	`+ $this->assertSame('\\' === \DIRECTORY_SEPARATOR ? 1 : 127, $e->context->exitCode);`
`37`	`37`
`38`	`38`	`return;`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,10 @@ abstract class AbstractRequestParserTestCase extends TestCase`
`26`	`26`	`*/`
`27`	`27`	`public function testParse(string $payload, RemoteEvent $expected)`
`28`	`28`	`{`
	`29`	`+ if ($this->mustBeSkipped()) {`
	`30`	`+ $this->markTestSkipped('This test cannot be run.');`
	`31`	`+ }`
	`32`	`+`
`29`	`33`	`$request = $this->createRequest($payload);`
`30`	`34`	`$parser = $this->createRequestParser();`
`31`	`35`	`$wh = $parser->parse($request, $this->getSecret());`
`@@ -66,4 +70,9 @@ protected static function getFixtureExtension(): string`
`66`	`70`	`{`
`67`	`71`	`return 'json';`
`68`	`72`	`}`
	`73`	`+`
	`74`	`+ protected function mustBeSkipped(): bool`
	`75`	`+ {`
	`76`	`+ return false;`
	`77`	`+ }`
`69`	`78`	`}`