Fix Integration tests skipped with Redis cluster #49449

maxbeckers · 2023-02-20T07:45:20Z

Q	A
Branch?	6.3
Bug fix?	yes
New feature?	no
Deprecations?	no
Tickets	Fix #49285
License	MIT
Doc PR	n/a

It seems to me, that the getenv('MESSENGER_REDIS_SENTINEL_MASTER') in the setUp() might return false because it's unset. To ignore the sentinel, it must be null:

symfony/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php

Lines 95 to 100 in 0900333

    
           if (null !== $sentinelMaster) { 
        
               $sentinelClass = \extension_loaded('redis') ? \RedisSentinel::class : Sentinel::class; 
        
               $sentinelClient = new $sentinelClass($host, $port, $options['timeout'], $options['persistent_id'], $options['retry_interval'], $options['read_timeout']); 
        
               if (!$address = $sentinelClient->getMasterAddrByName($sentinelMaster)) { 
        
                   throw new InvalidArgumentException(sprintf('Failed to retrieve master information from master name "%s" and address "%s:%d".', $sentinelMaster, $host, $port));

…n handler

src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php

.github/workflows/integration-tests.yml

maxbeckers · 2023-02-20T10:39:03Z

For now there are failing 5 tests with Invalid HELLO reply, Redis Server version may be too old (RELAY_ERR_COMPAT; commands.c:6660). I'll need to investigate a bit more of time to that or maybe someone else has an idea.

maxbeckers · 2023-02-20T15:19:45Z

src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RelayExtIntegrationTest.php

+
+    public function testConnectionSendAndGetDelayed()
+    {
+        self::markTestSkipped(self::SKIP_TEST_NOT_RUNNING_WITH_RELAY);


For now I added a skip to the tests not working with relay. Could be another issue to fix this tests working with relay. In this PR i focussed on the topic of the ticket, that cluster tests were not running. This problems came up after enabling this.

…r in ServiceSubscriberTrait

…arent::setContainer in ServiceSubscriberTrait (edsrzf) This PR was squashed before being merged into the 5.4 branch. Discussion ---------- [Contracts] Fix setting $container before calling parent::setContainer in ServiceSubscriberTrait | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix symfony#49382 | License | MIT This changes the `setContainer` method of `ServiceSubscriberTrait` so that it calls `parent::setContainer` first, before updating `$this->container`. This is so that the parent method can work correctly if it relies on the old container value. This is particularly relevant for `AbstractController`, since it returns the old container value. When used with `ServiceSubscriberTrait`, it returned the _new_ container rather than the old one. This, in turn, caused incorrect behavior in framework bundle's `ControllerResolver`, as described in symfony#49382. Commits ------- bccb074 [Contracts] Fix setting $container before calling parent::setContainer in ServiceSubscriberTrait

src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RelayExtIntegrationTest.php

nicolas-grekas · 2023-02-21T11:17:11Z

I suppose we should merge this on 5.4?

maxbeckers · 2023-02-21T11:56:19Z

@nicolas-grekas yes, i didn't check this, in the issue was mentioned the 6.3 branch. Is it possible to handle this during the merge or should I rebase it?

src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php

nicolas-grekas · 2023-02-21T11:57:33Z

Please submit another PR for 5.4, I'll use this one when merging up.

…in async expiration handler (AdamKatzDev) This PR was merged into the 5.4 branch. Discussion ---------- [Cache][Messenger] fixed CallbackInterface support in async expiration handler | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | Adds support for CallbackInterface in EarlyExpirationHandler and thus fixes async cache recomputing for callables that implement CallbackInterface. Earlier similar errors were fixed in symfony#31879. Commits ------- a8dea95 [Messenger][Cache] fixed CallbackInterface support in async expiration handler

…33300) This PR was squashed before being merged into the 6.2 branch. Discussion ---------- [Form] Skip password hashing on empty password | Q | A | ------------- | --- | Branch? | 6.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | N/A | License | MIT | Doc PR | N/A When using the new `hash_property_path` option to hash password submitted by forms, we should skip hashing if the submitted password is empty. - Because empty passwords are not allowed and saving an empty password hash will prevent the user to login his account: https://github.com/symfony/symfony/blob/8c19af2346ed6ed4021d3efc024e0af138e69794/src/Symfony/Component/Security/Http/EventListener/CheckCredentialsListener.php#L59-L62 - Because a common use case when creating a user profile form is to ignore the "new password" input if it's left blank. Commits ------- b4aa3ea [Form] Skip password hashing on empty password

This PR was merged into the 5.4 branch. Discussion ---------- [TwigBridge] do not drop embed label classes | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix symfony#45727 | License | MIT | Doc PR | Commits ------- cd50683 do not drop embed label classes

…cation when no user agent is set

…rows PHP 8.1 deprecation when no user agent is set (juagarc4) This PR was squashed before being merged into the 5.4 branch. Discussion ---------- [MonologBridge] FirePHPHandler::onKernelResponse throws PHP 8.1 deprecation when no user agent is set | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes/no | New feature? no | Deprecations? no | Tickets | Fix symfony#49392 | License | MIT - Add casting to the second parameter to pass always the right type. **PHPstan before:** ------ -------------------------------------------------------------------------------------------------------- Line FirePHPHandler.php ------ -------------------------------------------------------------------------------------------------------- 27 Property Symfony\Bridge\Monolog\Handler\FirePHPHandler::$headers has no type specified. 37 Method Symfony\Bridge\Monolog\Handler\FirePHPHandler::onKernelResponse() has no return type specified. **44 Parameter symfony#2 $subject of function preg_match expects string, string|null given.** 68 If condition is always true. ------ -------------------------------------------------------------------------------------------------------- **PHPstan after:** ------ -------------------------------------------------------------------------------------------------------- Line FirePHPHandler.php ------ -------------------------------------------------------------------------------------------------------- 27 Property Symfony\Bridge\Monolog\Handler\FirePHPHandler::$headers has no type specified. 37 Method Symfony\Bridge\Monolog\Handler\FirePHPHandler::onKernelResponse() has no return type specified. 68 If condition is always true. ------ -------------------------------------------------------------------------------------------------------- Commits ------- 4d84c46 [MonologBridge] FirePHPHandler::onKernelResponse throws PHP 8.1 deprecation when no user agent is set

…c firewall (chalasr) This PR was merged into the 6.2 branch. Discussion ---------- [SecurityBundle] Fix `Security::login()` on specific firewall | Q | A | ------------- | --- | Branch? | 6.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | symfony#49444 | License | MIT | Doc PR | - Commits ------- f7043db [SecurityBundle] Fix `Security::login()` on specific firewall

…s (maxbeckers) This PR was merged into the 5.4 branch. Discussion ---------- Update Redis version to 6.2.8 for integrationtests | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix symfony#49285 | License | MIT | Doc PR | n/a Related to symfony#49449 to bring the redis versions all to the same version 6.2.8 /cc `@nicolas`-grekas Commits ------- a1696bf Update Redis version to 6.2.8

* 5.4: [Translation] Fix merge [MonologBridge] FirePHPHandler::onKernelResponse throws PHP 8.1 deprecation when no user agent is set Update Redis version to 6.2.8 [Contracts] Fix setting $container before calling parent::setContainer in ServiceSubscriberTrait [Messenger][Cache] fixed CallbackInterface support in async expiration handler do not drop embed label classes

* 6.2: [Translation] Fix merge [SecurityBundle] Fix `Security::login()` on specific firewall [MonologBridge] FirePHPHandler::onKernelResponse throws PHP 8.1 deprecation when no user agent is set [Form] Skip password hashing on empty password Update Redis version to 6.2.8 [Contracts] Fix setting $container before calling parent::setContainer in ServiceSubscriberTrait [Messenger][Cache] fixed CallbackInterface support in async expiration handler do not drop embed label classes

nicolas-grekas · 2023-02-21T16:06:13Z

Thank you @maxbeckers.

xabbuh and others added 2 commits February 17, 2023 14:54

do not drop embed label classes

cd50683

[Messenger][Cache] fixed CallbackInterface support in async expiratio…

a8dea95

…n handler

carsonbot added Status: Needs Review Bug labels Feb 20, 2023

carsonbot added this to the 6.3 milestone Feb 20, 2023

maxbeckers force-pushed the patch_49285_redis_tests branch 4 times, most recently from d5de72c to ae9637a Compare February 20, 2023 09:37

maxbeckers commented Feb 20, 2023

View reviewed changes

src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php Outdated Show resolved Hide resolved

maxbeckers force-pushed the patch_49285_redis_tests branch 2 times, most recently from 5c4f20c to fcacb7f Compare February 20, 2023 10:26

maxbeckers commented Feb 20, 2023

View reviewed changes

.github/workflows/integration-tests.yml Outdated Show resolved Hide resolved

maxbeckers force-pushed the patch_49285_redis_tests branch 3 times, most recently from 5c545e6 to 93b94c0 Compare February 20, 2023 15:17

maxbeckers commented Feb 20, 2023

View reviewed changes

maxbeckers force-pushed the patch_49285_redis_tests branch 2 times, most recently from 6e33711 to f8e07cb Compare February 21, 2023 06:16

Evan Shaw and others added 2 commits February 21, 2023 12:06

[Contracts] Fix setting $container before calling parent::setContaine…

bccb074

…r in ServiceSubscriberTrait

nicolas-grekas reviewed Feb 21, 2023

View reviewed changes

src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RelayExtIntegrationTest.php Outdated Show resolved Hide resolved

nicolas-grekas added the Messenger label Feb 21, 2023

carsonbot changed the title ~~Fix Integration tests skipped with Redis cluster~~ [Messenger] Fix Integration tests skipped with Redis cluster Feb 21, 2023

nicolas-grekas removed the Messenger label Feb 21, 2023

carsonbot changed the title ~~[Messenger] Fix Integration tests skipped with Redis cluster~~ Fix Integration tests skipped with Redis cluster Feb 21, 2023

maxbeckers force-pushed the patch_49285_redis_tests branch from f8e07cb to 1ede8db Compare February 21, 2023 11:53

nicolas-grekas reviewed Feb 21, 2023

View reviewed changes

src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php Outdated Show resolved Hide resolved

maxbeckers force-pushed the patch_49285_redis_tests branch from 1ede8db to 4ead381 Compare February 21, 2023 11:57

nicolas-grekas and others added 5 commits February 21, 2023 13:11

Update Redis version to 6.2.8

a1696bf

[Form] Skip password hashing on empty password

b4aa3ea

maxbeckers mentioned this pull request Feb 21, 2023

Update Redis version to 6.2.8 for integrationtests #49467

Merged

juagarc4 and others added 4 commits February 21, 2023 13:28

[MonologBridge] FirePHPHandler::onKernelResponse throws PHP 8.1 depre…

4d84c46

…cation when no user agent is set

[SecurityBundle] Fix Security::login() on specific firewall

f7043db

maxbeckers mentioned this pull request Feb 21, 2023

Fix Integration tests skipped with Redis cluster (symfony 6.2) #49469

Closed

nicolas-grekas and others added 5 commits February 21, 2023 13:35

[Translation] Fix merge

04bc1ab

Fix Integration tests skipped with Redis cluster

e263666

nicolas-grekas force-pushed the patch_49285_redis_tests branch from 4ead381 to e263666 Compare February 21, 2023 16:05

nicolas-grekas requested review from wouterj, chalasr, xabbuh and yceruto as code owners February 21, 2023 16:05

nicolas-grekas merged commit 1851e89 into symfony:6.3 Feb 21, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Fix Integration tests skipped with Redis cluster #49449

Fix Integration tests skipped with Redis cluster #49449

Uh oh!

maxbeckers commented Feb 20, 2023

Uh oh!

Uh oh!

Uh oh!

maxbeckers commented Feb 20, 2023

Uh oh!

maxbeckers Feb 20, 2023

Uh oh!

Uh oh!

nicolas-grekas commented Feb 21, 2023

Uh oh!

maxbeckers commented Feb 21, 2023

Uh oh!

Uh oh!

nicolas-grekas commented Feb 21, 2023

Uh oh!

nicolas-grekas commented Feb 21, 2023

Uh oh!

Uh oh!

	if (null !== $sentinelMaster) {
	$sentinelClass = \extension_loaded('redis') ? \RedisSentinel::class : Sentinel::class;
	$sentinelClient = new $sentinelClass($host, $port, $options['timeout'], $options['persistent_id'], $options['retry_interval'], $options['read_timeout']);

	if (!$address = $sentinelClient->getMasterAddrByName($sentinelMaster)) {
	throw new InvalidArgumentException(sprintf('Failed to retrieve master information from master name "%s" and address "%s:%d".', $sentinelMaster, $host, $port));

Uh oh!

Fix Integration tests skipped with Redis cluster #49449

Fix Integration tests skipped with Redis cluster #49449

Uh oh!

Conversation

maxbeckers commented Feb 20, 2023

Uh oh!

Uh oh!

Uh oh!

maxbeckers commented Feb 20, 2023

Uh oh!

maxbeckers Feb 20, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

nicolas-grekas commented Feb 21, 2023

Uh oh!

maxbeckers commented Feb 21, 2023

Uh oh!

Uh oh!

nicolas-grekas commented Feb 21, 2023

Uh oh!

nicolas-grekas commented Feb 21, 2023

Uh oh!

Uh oh!