HTML preview

-                                                            
-

+ {% set htmlBody = message.htmlBody() %} + {% if htmlBody is not null %} +

HTML Preview

+                                                                
+

HTML Content

-                                                            {%- if message.htmlCharset() %}
-                                                                {{- message.htmlBody()|convert_encoding('UTF-8', message.htmlCharset()) }}
-                                                            {%- else %}
-                                                                {{- message.htmlBody() }}
-                                                            {%- endif -%}
-

HTML Content

+                                                                {%- if message.htmlCharset() %}
+                                                                    {{- htmlBody|convert_encoding('UTF-8', message.htmlCharset()) }}
+                                                                {%- else %}
+                                                                    {{- htmlBody }}
+                                                                {%- endif -%}
+

Text Content

-                                                            {%- if message.textCharset() %}
-                                                                {{- message.textBody()|convert_encoding('UTF-8', message.textCharset()) }}
-                                                            {%- else %}
-                                                                {{- message.textBody() }}
-                                                            {%- endif -%}
-

+ {% endif %} + {% set textBody = message.textBody() %} + {% if textBody is not null %} +

Text Content

+                                                                {%- if message.textCharset() %}
+                                                                    {{- textBody|convert_encoding('UTF-8', message.textCharset()) }}
+                                                                {%- else %}
+                                                                    {{- textBody }}
+                                                                {%- endif -%}
+

+ {% endif %} {% for attachment in message.attachments %}

Attachment #{{ loop.index }}

From 04ddc126f3fdf33c2e6da02acf248b5093e6c495 Mon Sep 17 00:00:00 2001 From: ThomasLandauer Date: Mon, 20 Dec 2021 17:37:07 +0100 Subject: [PATCH 083/127] [Mime] Relaxing in-reply-to header validation --- src/Symfony/Component/Mime/Header/Headers.php | 4 ++-- .../Component/Mime/Tests/Header/HeadersTest.php | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Mime/Header/Headers.php b/src/Symfony/Component/Mime/Header/Headers.php index 1a7b4b276eee2..201a7a5f9744b 100644 --- a/src/Symfony/Component/Mime/Header/Headers.php +++ b/src/Symfony/Component/Mime/Header/Headers.php @@ -141,8 +141,8 @@ public function add(HeaderInterface $header): self 'cc' => MailboxListHeader::class, 'bcc' => MailboxListHeader::class, 'message-id' => IdentificationHeader::class, - 'in-reply-to' => IdentificationHeader::class, - 'references' => IdentificationHeader::class, + 'in-reply-to' => UnstructuredHeader::class, // `In-Reply-To` and `References` are less strict than RFC 2822 (3.6.4) to allow users entering the original email's ... + 'references' => UnstructuredHeader::class, // ... `Message-ID`, even if that is no valid `msg-id` 'return-path' => PathHeader::class, ]; diff --git a/src/Symfony/Component/Mime/Tests/Header/HeadersTest.php b/src/Symfony/Component/Mime/Tests/Header/HeadersTest.php index 89d8be01b0181..5da27293310e8 100644 --- a/src/Symfony/Component/Mime/Tests/Header/HeadersTest.php +++ b/src/Symfony/Component/Mime/Tests/Header/HeadersTest.php @@ -243,4 +243,18 @@ public function testToArray() "Foo: =?utf-8?Q?aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa?=\r\n =?utf-8?Q?aaaa?=", ], $headers->toArray()); } + + public function testInReplyToAcceptsNonIdentifierValues() + { + $headers = new Headers(); + $headers->addHeader('In-Reply-To', 'foobar'); + $this->assertEquals('foobar', $headers->get('In-Reply-To')->getBody()); + } + + public function testReferencesAcceptsNonIdentifierValues() + { + $headers = new Headers(); + $headers->addHeader('References' , 'foobar'); + $this->assertEquals('foobar', $headers->get('References')->getBody()); + } } From 78d51dec1334fa59f96d75875df46df3edce122a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rokas=20Mikalk=C4=97nas?= Date: Wed, 15 Dec 2021 12:34:35 +0200 Subject: [PATCH 084/127] [PropertyInfo] PhpStan extractor nested object fix --- .../PropertyInfo/PhpStan/NameScopeFactory.php | 26 ++++++++++++++----- .../Tests/Extractor/PhpStanExtractorTest.php | 3 +++ .../Extractor/ReflectionExtractorTest.php | 6 +++++ .../Tests/Fixtures/ParentDummy.php | 12 +++++++++ .../Fixtures/RootDummy/RootDummyItem.php | 16 ++++++++++++ 5 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 src/Symfony/Component/PropertyInfo/Tests/Fixtures/RootDummy/RootDummyItem.php diff --git a/src/Symfony/Component/PropertyInfo/PhpStan/NameScopeFactory.php b/src/Symfony/Component/PropertyInfo/PhpStan/NameScopeFactory.php index a5eb8b47fcfde..1243259607c22 100644 --- a/src/Symfony/Component/PropertyInfo/PhpStan/NameScopeFactory.php +++ b/src/Symfony/Component/PropertyInfo/PhpStan/NameScopeFactory.php @@ -22,21 +22,33 @@ final class NameScopeFactory { public function create(string $fullClassName): NameScope { + $reflection = new \ReflectionClass($fullClassName); $path = explode('\\', $fullClassName); $className = array_pop($path); - [$namespace, $uses] = $this->extractFromFullClassName($fullClassName); + [$namespace, $uses] = $this->extractFromFullClassName($reflection); - foreach (class_uses($fullClassName) as $traitFullClassName) { - [, $traitUses] = $this->extractFromFullClassName($traitFullClassName); - $uses = array_merge($uses, $traitUses); - } + $uses = array_merge($uses, $this->collectUses($reflection)); return new NameScope($className, $namespace, $uses); } - private function extractFromFullClassName(string $fullClassName): array + private function collectUses(\ReflectionClass $reflection): array + { + $uses = [$this->extractFromFullClassName($reflection)[1]]; + + foreach ($reflection->getTraits() as $traitReflection) { + $uses[] = $this->extractFromFullClassName($traitReflection)[1]; + } + + if (false !== $parentClass = $reflection->getParentClass()) { + $uses[] = $this->collectUses($parentClass); + } + + return $uses ? array_merge(...$uses) : []; + } + + private function extractFromFullClassName(\ReflectionClass $reflection): array { - $reflection = new \ReflectionClass($fullClassName); $namespace = trim($reflection->getNamespaceName(), '\\'); $fileName = $reflection->getFileName(); diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php index f3d7088dd3eca..41b9106dbc946 100644 --- a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php +++ b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php @@ -16,6 +16,7 @@ use Symfony\Component\PropertyInfo\Tests\Fixtures\DefaultValue; use Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy; use Symfony\Component\PropertyInfo\Tests\Fixtures\ParentDummy; +use Symfony\Component\PropertyInfo\Tests\Fixtures\RootDummy\RootDummyItem; use Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage\DummyUsedInTrait; use Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage\DummyUsingTrait; use Symfony\Component\PropertyInfo\Type; @@ -116,6 +117,8 @@ public function typesProvider() ['arrayOfMixed', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_STRING), null)]], ['listOfStrings', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING))]], ['self', [new Type(Type::BUILTIN_TYPE_OBJECT, false, Dummy::class)]], + ['rootDummyItems', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_OBJECT, false, RootDummyItem::class))]], + ['rootDummyItem', [new Type(Type::BUILTIN_TYPE_OBJECT, false, RootDummyItem::class)]], ]; } diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php index 18c4dd588d7f8..ec1e7eef35512 100644 --- a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php +++ b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php @@ -78,6 +78,8 @@ public function testGetProperties() 'files', 'propertyTypeStatic', 'parentAnnotationNoParent', + 'rootDummyItems', + 'rootDummyItem', 'a', 'DOB', 'Id', @@ -138,6 +140,8 @@ public function testGetPropertiesWithCustomPrefixes() 'files', 'propertyTypeStatic', 'parentAnnotationNoParent', + 'rootDummyItems', + 'rootDummyItem', 'date', 'c', 'ct', @@ -187,6 +191,8 @@ public function testGetPropertiesWithNoPrefixes() 'files', 'propertyTypeStatic', 'parentAnnotationNoParent', + 'rootDummyItems', + 'rootDummyItem', ], $noPrefixExtractor->getProperties('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy') ); diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ParentDummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ParentDummy.php index a7c1f513a78c7..4290e1b541a07 100644 --- a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ParentDummy.php +++ b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ParentDummy.php @@ -11,6 +11,8 @@ namespace Symfony\Component\PropertyInfo\Tests\Fixtures; +use Symfony\Component\PropertyInfo\Tests\Fixtures\RootDummy\RootDummyItem; + /** * @author Kévin Dunglas */ @@ -58,6 +60,16 @@ class ParentDummy */ public $parentAnnotationNoParent; + /** + * @var RootDummyItem[] + */ + public $rootDummyItems; + + /** + * @var \Symfony\Component\PropertyInfo\Tests\Fixtures\RootDummy\RootDummyItem + */ + public $rootDummyItem; + /** * @return bool|null */ diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/RootDummy/RootDummyItem.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/RootDummy/RootDummyItem.php new file mode 100644 index 0000000000000..ccbaf7cbf99a2 --- /dev/null +++ b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/RootDummy/RootDummyItem.php @@ -0,0 +1,16 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\PropertyInfo\Tests\Fixtures\RootDummy; + +class RootDummyItem +{ +} From af467fbf6e126f26fe3b28a5b2ccdc282c8acbd8 Mon Sep 17 00:00:00 2001 From: Artem Lopata Date: Wed, 22 Dec 2021 14:15:36 +0100 Subject: [PATCH 085/127] Expand FormView key to include int --- src/Symfony/Component/Form/FormView.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Symfony/Component/Form/FormView.php b/src/Symfony/Component/Form/FormView.php index f3f3ba63e1713..0162208e64784 100644 --- a/src/Symfony/Component/Form/FormView.php +++ b/src/Symfony/Component/Form/FormView.php @@ -16,8 +16,8 @@ /** * @author Bernhard Schussek * - * @implements \ArrayAccess - * @implements \IteratorAggregate + * @implements \ArrayAccess + * @implements \IteratorAggregate */ class FormView implements \ArrayAccess, \IteratorAggregate, \Countable { @@ -37,7 +37,7 @@ class FormView implements \ArrayAccess, \IteratorAggregate, \Countable /** * The child views. * - * @var array + * @var array */ public $children = []; @@ -107,7 +107,7 @@ public function setMethodRendered() /** * Returns a child by name (implements \ArrayAccess). * - * @param string $name The child name + * @param int|string $name The child name * * @return self */ @@ -120,7 +120,7 @@ public function offsetGet($name) /** * Returns whether the given child exists (implements \ArrayAccess). * - * @param string $name The child name + * @param int|string $name The child name * * @return bool */ @@ -146,7 +146,7 @@ public function offsetSet($name, $value) /** * Removes a child (implements \ArrayAccess). * - * @param string $name The child name + * @param int|string $name The child name * * @return void */ @@ -159,7 +159,7 @@ public function offsetUnset($name) /** * Returns an iterator to iterate over children (implements \IteratorAggregate). * - * @return \ArrayIterator + * @return \ArrayIterator */ #[\ReturnTypeWillChange] public function getIterator() From 6ca8e30a85e455bf348b18eeb735c897ccd00f9b Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Wed, 22 Dec 2021 14:28:19 +0100 Subject: [PATCH 086/127] Remove the unused dependency on composer/package-versions-deprecated The ProxyManagerBridge depends on friendsofphp/proxy-manager-lts which has an optional dependency on the PackageVersions class to implement the `ProxyManager\Version::getVersion` method on composer 1 (with a fallback to a less precise version number). However, the bridge has stopped using that API in favor of feature detection, so the dependency is unused. --- src/Symfony/Bridge/ProxyManager/composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json index 09692b8c89d74..577138489e690 100644 --- a/src/Symfony/Bridge/ProxyManager/composer.json +++ b/src/Symfony/Bridge/ProxyManager/composer.json @@ -17,7 +17,6 @@ ], "require": { "php": ">=7.1.3", - "composer/package-versions-deprecated": "^1.8", "friendsofphp/proxy-manager-lts": "^1.0.2", "symfony/dependency-injection": "^4.0|^5.0", "symfony/polyfill-php80": "^1.16" From c106a6b0d18bb2bbb0dd4877a3c024cf5f36589f Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Wed, 22 Dec 2021 19:38:25 +0100 Subject: [PATCH 087/127] Remove direct dependency on composer/package-versions-deprecated This dependency in the doctrine-bridge was added to enforce the replacement of the ocramius/package-versions package used by the ORM, to keep support for PHP versions we needed. But as of 2.7.4, the ORM switched its dependency, so this is not necessary anymore. --- composer.json | 3 +-- src/Symfony/Bridge/Doctrine/composer.json | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 07163ed3850ce..63a91bba9930e 100644 --- a/composer.json +++ b/composer.json @@ -123,13 +123,12 @@ "async-aws/ses": "^1.0", "async-aws/sqs": "^1.0", "cache/integration-tests": "dev-master", - "composer/package-versions-deprecated": "^1.8", "doctrine/annotations": "^1.12", "doctrine/cache": "^1.6|^2.0", "doctrine/collections": "~1.0", "doctrine/data-fixtures": "^1.1", "doctrine/dbal": "^2.10|^3.0", - "doctrine/orm": "^2.7.3", + "doctrine/orm": "^2.7.4", "guzzlehttp/promises": "^1.4", "masterminds/html5": "^2.6", "monolog/monolog": "^1.25.1|^2", diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 1ead9f0eb4b06..087ed34e7ad52 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -26,7 +26,6 @@ "symfony/service-contracts": "^1.1|^2" }, "require-dev": { - "composer/package-versions-deprecated": "^1.8", "symfony/stopwatch": "^4.4|^5.0", "symfony/cache": "^5.1", "symfony/config": "^4.4|^5.0", @@ -48,12 +47,12 @@ "doctrine/collections": "~1.0", "doctrine/data-fixtures": "^1.1", "doctrine/dbal": "^2.10|^3.0", - "doctrine/orm": "^2.7.3" + "doctrine/orm": "^2.7.4" }, "conflict": { "doctrine/dbal": "<2.10", "doctrine/lexer": "<1.1", - "doctrine/orm": "<2.7.3", + "doctrine/orm": "<2.7.4", "phpunit/phpunit": "<5.4.3", "symfony/dependency-injection": "<4.4", "symfony/form": "<5.1", From 7abddd097fd7398a9974dfd8056c15ffe50bb8e3 Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Tue, 14 Dec 2021 15:39:19 +0100 Subject: [PATCH 088/127] Fix SessionListener without session in request --- .../EventListener/AbstractSessionListener.php | 2 +- .../EventListener/SessionListenerTest.php | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php index eae5fb6bab225..91c2ebfbc1b3c 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php @@ -68,7 +68,7 @@ public function onKernelRequest(RequestEvent $event) public function onKernelResponse(ResponseEvent $event) { - if (!$event->isMainRequest()) { + if (!$event->isMainRequest() || (!$this->container->has('initialized_session') && !$event->getRequest()->hasSession())) { return; } diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php index 853f722031503..348f643c1fbcc 100644 --- a/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php @@ -142,6 +142,24 @@ public function testUninitializedSession() $this->assertFalse($response->headers->has(AbstractSessionListener::NO_AUTO_CACHE_CONTROL_HEADER)); } + public function testUninitializedSessionWithoutInitializedSession() + { + $kernel = $this->createMock(HttpKernelInterface::class); + $response = new Response(); + $response->setSharedMaxAge(60); + $response->headers->set(AbstractSessionListener::NO_AUTO_CACHE_CONTROL_HEADER, 'true'); + + $container = new ServiceLocator([]); + + $listener = new SessionListener($container); + $listener->onKernelResponse(new ResponseEvent($kernel, new Request(), HttpKernelInterface::MASTER_REQUEST, $response)); + $this->assertFalse($response->headers->has('Expires')); + $this->assertTrue($response->headers->hasCacheControlDirective('public')); + $this->assertFalse($response->headers->hasCacheControlDirective('private')); + $this->assertFalse($response->headers->hasCacheControlDirective('must-revalidate')); + $this->assertSame('60', $response->headers->getCacheControlDirective('s-maxage')); + } + public function testSurrogateMainRequestIsPublic() { $session = $this->createMock(Session::class); From 87edd237ee2ee9482bcd08556e1714256da9bdc2 Mon Sep 17 00:00:00 2001 From: Toon Verwerft Date: Thu, 23 Dec 2021 13:11:30 +0100 Subject: [PATCH 089/127] [Notifier] Use correct factory for the msteams transport --- src/Symfony/Component/Notifier/Transport.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Notifier/Transport.php b/src/Symfony/Component/Notifier/Transport.php index ead57b259393b..41386256d6f6f 100644 --- a/src/Symfony/Component/Notifier/Transport.php +++ b/src/Symfony/Component/Notifier/Transport.php @@ -24,7 +24,7 @@ use Symfony\Component\Notifier\Bridge\LightSms\LightSmsTransportFactory; use Symfony\Component\Notifier\Bridge\Mattermost\MattermostTransportFactory; use Symfony\Component\Notifier\Bridge\MessageBird\MessageBirdTransportFactory; -use Symfony\Component\Notifier\Bridge\MicrosoftTeams\MicrosoftTeamsTransport; +use Symfony\Component\Notifier\Bridge\MicrosoftTeams\MicrosoftTeamsTransportFactory; use Symfony\Component\Notifier\Bridge\Mobyt\MobytTransportFactory; use Symfony\Component\Notifier\Bridge\Nexmo\NexmoTransportFactory; use Symfony\Component\Notifier\Bridge\Octopush\OctopushTransportFactory; @@ -68,7 +68,7 @@ class Transport LightSmsTransportFactory::class, MattermostTransportFactory::class, MessageBirdTransportFactory::class, - MicrosoftTeamsTransport::class, + MicrosoftTeamsTransportFactory::class, MobytTransportFactory::class, NexmoTransportFactory::class, OctopushTransportFactory::class, From 10846fed96678d09aa7d4ccf1749510193ca5494 Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Thu, 23 Dec 2021 16:43:44 +0100 Subject: [PATCH 090/127] [Security] Add getting started example to README --- src/Symfony/Component/Security/Core/README.md | 36 +++++++++++++++++-- src/Symfony/Component/Security/Http/README.md | 14 +++++--- 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/src/Symfony/Component/Security/Core/README.md b/src/Symfony/Component/Security/Core/README.md index 6b3e5c990107c..cf9812d313e26 100644 --- a/src/Symfony/Component/Security/Core/README.md +++ b/src/Symfony/Component/Security/Core/README.md @@ -3,8 +3,40 @@ Security Component - Core Security provides an infrastructure for sophisticated authorization systems, which makes it possible to easily separate the actual authorization logic from -so called user providers that hold the users credentials. It is inspired by -the Java Spring framework. +so called user providers that hold the users credentials. + +Getting Started +--------------- + +``` +$ composer require symfony/security-core +``` + +```php +use Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolver; +use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken; +use Symfony\Component\Security\Core\Authorization\AccessDecisionManager; +use Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter; +use Symfony\Component\Security\Core\Authorization\Voter\RoleVoter; +use Symfony\Component\Security\Core\Authorization\Voter\RoleHierarchyVoter; +use Symfony\Component\Security\Core\Exception\AccessDeniedException; +use Symfony\Component\Security\Core\Role\RoleHierarchy; + +$accessDecisionManager = new AccessDecisionManager([ + new AuthenticatedVoter(new AuthenticationTrustResolver()), + new RoleVoter(), + new RoleHierarchyVoter(new RoleHierarchy([ + 'ROLE_ADMIN' => ['ROLE_USER'], + ])) +]); + +$user = new \App\Entity\User(...); +$token = new UsernamePasswordToken($user, 'main', $user->getRoles()); + +if (!$accessDecisionManager->decide($token, ['ROLE_ADMIN'])) { + throw new AccessDeniedException(); +} +``` Resources --------- diff --git a/src/Symfony/Component/Security/Http/README.md b/src/Symfony/Component/Security/Http/README.md index e12d19fbeb697..89e28ceb43dd3 100644 --- a/src/Symfony/Component/Security/Http/README.md +++ b/src/Symfony/Component/Security/Http/README.md @@ -1,10 +1,16 @@ Security Component - HTTP Integration ===================================== -Security provides an infrastructure for sophisticated authorization systems, -which makes it possible to easily separate the actual authorization logic from -so called user providers that hold the users credentials. It is inspired by -the Java Spring framework. +The Security HTTP component provides an HTTP integration of the Security Core +component. It allows securing (parts of) your application using firewalls and +provides authenticators to authenticate visitors. + +Getting Started +--------------- + +``` +$ composer require symfony/security-http +``` Resources --------- From c7f6b348351dde620fa24982f0b8efc49bde2355 Mon Sep 17 00:00:00 2001 From: Antoine Makdessi Date: Thu, 23 Dec 2021 17:49:24 +0100 Subject: [PATCH 091/127] Update security.lb.xlf --- .../Security/Core/Resources/translations/security.lb.xlf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.lb.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.lb.xlf index 5f707535fa723..36987bc99f37f 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.lb.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.lb.xlf @@ -1,6 +1,6 @@ - + An authentication exception occurred. From 042c60086aa0de9a785e85275a03e9e97e720762 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Fri, 24 Dec 2021 00:01:05 +0100 Subject: [PATCH 092/127] Allow package-versions-deprecated plugin --- composer.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/composer.json b/composer.json index 5388530c16c85..0b9c72332eec8 100644 --- a/composer.json +++ b/composer.json @@ -152,6 +152,11 @@ "ocramius/proxy-manager": "<2.1", "phpunit/phpunit": "<5.4.3" }, + "config": { + "allow-plugins": { + "composer/package-versions-deprecated": true + } + }, "autoload": { "psr-4": { "Symfony\\Bridge\\Doctrine\\": "src/Symfony/Bridge/Doctrine/", From 0302128646ac90d07c0bc20e1dee58b2811a1f28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Ostroluck=C3=BD?= Date: Sun, 12 Dec 2021 13:23:14 +0100 Subject: [PATCH 093/127] [PropertyInfo] Fix phpstan extractor issues --- .../Tests/Extractor/PhpStanExtractorTest.php | 4 +++- .../Tests/Fixtures/DummyUnionType.php | 13 +++++++++++++ .../PropertyInfo/Util/PhpStanTypeHelper.php | 8 ++++++++ .../Tests/Normalizer/ObjectNormalizerTest.php | 18 ++++++++++++++++++ 4 files changed, 42 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php index 8b52433a54fe2..5c1bdaad7e2a1 100644 --- a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php +++ b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php @@ -355,7 +355,7 @@ public function constructorTypesProvider() /** * @dataProvider unionTypesProvider */ - public function testExtractorUnionTypes(string $property, array $types) + public function testExtractorUnionTypes(string $property, ?array $types) { $this->assertEquals($types, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\DummyUnionType', $property)); } @@ -368,6 +368,8 @@ public function unionTypesProvider(): array ['c', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, [], [new Type(Type::BUILTIN_TYPE_STRING), new Type(Type::BUILTIN_TYPE_INT)])]], ['d', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, [new Type(Type::BUILTIN_TYPE_STRING), new Type(Type::BUILTIN_TYPE_INT)], [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, [], [new Type(Type::BUILTIN_TYPE_STRING)])])]], ['e', [new Type(Type::BUILTIN_TYPE_OBJECT, true, Dummy::class, true, [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, [], [new Type(Type::BUILTIN_TYPE_STRING)])], [new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, [new Type(Type::BUILTIN_TYPE_INT)], [new Type(Type::BUILTIN_TYPE_STRING, false, null, true, [], [new Type(Type::BUILTIN_TYPE_OBJECT, false, DefaultValue::class)])])]), new Type(Type::BUILTIN_TYPE_OBJECT, false, ParentDummy::class)]], + ['f', null], + ['g', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, [], [new Type(Type::BUILTIN_TYPE_STRING), new Type(Type::BUILTIN_TYPE_INT)])]], ]; } } diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/DummyUnionType.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/DummyUnionType.php index 60af596bad3b3..86ddb8a1650eb 100644 --- a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/DummyUnionType.php +++ b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/DummyUnionType.php @@ -16,6 +16,9 @@ */ class DummyUnionType { + private const TYPE_A = 'a'; + private const TYPE_B = 'b'; + /** * @var string|int */ @@ -40,4 +43,14 @@ class DummyUnionType * @var (Dummy, (int | (string)[])> | ParentDummy | null) */ public $e; + + /** + * @var self::TYPE_*|null + */ + public $f; + + /** + * @var non-empty-array + */ + public $g; } diff --git a/src/Symfony/Component/PropertyInfo/Util/PhpStanTypeHelper.php b/src/Symfony/Component/PropertyInfo/Util/PhpStanTypeHelper.php index b5ed7bb5732ee..f3812ea0f35f4 100644 --- a/src/Symfony/Component/PropertyInfo/Util/PhpStanTypeHelper.php +++ b/src/Symfony/Component/PropertyInfo/Util/PhpStanTypeHelper.php @@ -19,6 +19,7 @@ use PHPStan\PhpDocParser\Ast\Type\ArrayTypeNode; use PHPStan\PhpDocParser\Ast\Type\CallableTypeNode; use PHPStan\PhpDocParser\Ast\Type\CallableTypeParameterNode; +use PHPStan\PhpDocParser\Ast\Type\ConstTypeNode; use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode; use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode; use PHPStan\PhpDocParser\Ast\Type\NullableTypeNode; @@ -102,6 +103,10 @@ private function extractTypes(TypeNode $node, NameScope $nameScope): array if ($node instanceof UnionTypeNode) { $types = []; foreach ($node->types as $type) { + if ($type instanceof ConstTypeNode) { + // It's safer to fall back to other extractors here, as resolving const types correctly is not easy at the moment + return []; + } foreach ($this->extractTypes($type, $nameScope) as $subType) { $types[] = $subType; } @@ -160,7 +165,10 @@ private function extractTypes(TypeNode $node, NameScope $nameScope): array case 'integer': return [new Type(Type::BUILTIN_TYPE_INT)]; case 'list': + case 'non-empty-list': return [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT))]; + case 'non-empty-array': + return [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true)]; case 'mixed': return []; // mixed seems to be ignored in all other extractors case 'parent': diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php index 5870a657a5abb..fa9483ccf6397 100644 --- a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php +++ b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php @@ -12,8 +12,10 @@ namespace Symfony\Component\Serializer\Tests\Normalizer; use Doctrine\Common\Annotations\AnnotationReader; +use PHPStan\PhpDocParser\Parser\PhpDocParser; use PHPUnit\Framework\TestCase; use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor; +use Symfony\Component\PropertyInfo\Extractor\PhpStanExtractor; use Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor; use Symfony\Component\PropertyInfo\PropertyInfoExtractor; use Symfony\Component\Serializer\Exception\LogicException; @@ -721,6 +723,22 @@ public function testAcceptJsonNumber() $this->assertSame(10.0, $serializer->denormalize(['number' => 10], JsonNumber::class, 'jsonld')->number); } + public function testDoesntHaveIssuesWithUnionConstTypes() + { + if (!class_exists(PhpStanExtractor::class) || !class_exists(PhpDocParser::class)) { + $this->markTestSkipped('phpstan/phpdoc-parser required for this test'); + } + + $extractor = new PropertyInfoExtractor([], [new PhpStanExtractor(), new PhpDocExtractor(), new ReflectionExtractor()]); + $normalizer = new ObjectNormalizer(null, null, null, $extractor); + $serializer = new Serializer([new ArrayDenormalizer(), new DateTimeNormalizer(), $normalizer]); + + $this->assertSame('bar', $serializer->denormalize(['foo' => 'bar'], \get_class(new class() { + /** @var self::*|null */ + public $foo; + }))->foo); + } + public function testExtractAttributesRespectsFormat() { $normalizer = new FormatAndContextAwareNormalizer(); From 180248807e17afdddfbaac42537c78443406aac1 Mon Sep 17 00:00:00 2001 From: Hugo Alliaume Date: Tue, 16 Nov 2021 16:12:13 +0100 Subject: [PATCH 094/127] [Translation] Fix TranslationPullCommand with ICU translations --- .../Bridge/Loco/Tests/LocoProviderTest.php | 36 ++++++++++++-- .../Catalogue/AbstractOperation.php | 13 ++++- .../Tests/Catalogue/MergeOperationTest.php | 2 +- .../Tests/Catalogue/TargetOperationTest.php | 3 +- .../Command/TranslationPullCommandTest.php | 48 +++++++++++++++++-- 5 files changed, 93 insertions(+), 9 deletions(-) diff --git a/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php b/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php index 2a2183abf110f..5b224de8aa1be 100644 --- a/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php +++ b/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php @@ -426,12 +426,16 @@ public function getResponsesForManyLocalesAndManyDomains(): \Generator $expectedTranslatorBag = new TranslatorBag(); $expectedTranslatorBag->addCatalogue($arrayLoader->load([ 'index.hello' => 'Hello', - 'index.greetings' => 'Welcome, {firstname}!', ], 'en')); + $expectedTranslatorBag->addCatalogue($arrayLoader->load([ + 'index.greetings' => 'Welcome, {firstname}!', + ], 'en', 'messages+intl-icu')); $expectedTranslatorBag->addCatalogue($arrayLoader->load([ 'index.hello' => 'Bonjour', - 'index.greetings' => 'Bienvenue, {firstname} !', ], 'fr')); + $expectedTranslatorBag->addCatalogue($arrayLoader->load([ + 'index.greetings' => 'Bienvenue, {firstname} !', + ], 'fr', 'messages+intl-icu')); $expectedTranslatorBag->addCatalogue($arrayLoader->load([ 'firstname.error' => 'Firstname must contains only letters.', 'lastname.error' => 'Lastname must contains only letters.', @@ -443,7 +447,7 @@ public function getResponsesForManyLocalesAndManyDomains(): \Generator yield [ ['en', 'fr'], - ['messages', 'validators'], + ['messages', 'messages+intl-icu', 'validators'], [ 'en' => [ 'messages' => <<<'XLIFF' @@ -458,6 +462,19 @@ public function getResponsesForManyLocalesAndManyDomains(): \Generator index.hello Hello + + + +XLIFF + , + 'messages+intl-icu' => <<<'XLIFF' + + + +

+ +

+ index.greetings Welcome, {firstname}! @@ -502,6 +519,19 @@ public function getResponsesForManyLocalesAndManyDomains(): \Generator index.hello Bonjour + + + +XLIFF + , + 'messages+intl-icu' => <<<'XLIFF' + + + +

+ +

+ index.greetings Bienvenue, {firstname} ! diff --git a/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php b/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php index 9869fbb8bb34e..98d42e5b6e46c 100644 --- a/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php +++ b/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php @@ -83,7 +83,18 @@ public function __construct(MessageCatalogueInterface $source, MessageCatalogueI public function getDomains() { if (null === $this->domains) { - $this->domains = array_values(array_unique(array_merge($this->source->getDomains(), $this->target->getDomains()))); + $domains = []; + foreach ([$this->source, $this->target] as $catalogue) { + foreach ($catalogue->getDomains() as $domain) { + $domains[$domain] = $domain; + + if ($catalogue->all($domainIcu = $domain.MessageCatalogueInterface::INTL_DOMAIN_SUFFIX)) { + $domains[$domainIcu] = $domainIcu; + } + } + } + + $this->domains = array_values($domains); } return $this->domains; diff --git a/src/Symfony/Component/Translation/Tests/Catalogue/MergeOperationTest.php b/src/Symfony/Component/Translation/Tests/Catalogue/MergeOperationTest.php index 240c492800acc..3f21abac9dd52 100644 --- a/src/Symfony/Component/Translation/Tests/Catalogue/MergeOperationTest.php +++ b/src/Symfony/Component/Translation/Tests/Catalogue/MergeOperationTest.php @@ -58,7 +58,7 @@ public function testGetResultFromIntlDomain() $this->assertEquals( new MessageCatalogue('en', [ 'messages' => ['a' => 'old_a', 'b' => 'old_b'], - 'messages+intl-icu' => ['d' => 'old_d', 'c' => 'new_c'], + 'messages+intl-icu' => ['d' => 'old_d', 'c' => 'new_c', 'a' => 'new_a'], ]), $this->createOperation( new MessageCatalogue('en', ['messages' => ['a' => 'old_a', 'b' => 'old_b'], 'messages+intl-icu' => ['d' => 'old_d']]), diff --git a/src/Symfony/Component/Translation/Tests/Catalogue/TargetOperationTest.php b/src/Symfony/Component/Translation/Tests/Catalogue/TargetOperationTest.php index d5441f3bee4ef..2b63cd4166464 100644 --- a/src/Symfony/Component/Translation/Tests/Catalogue/TargetOperationTest.php +++ b/src/Symfony/Component/Translation/Tests/Catalogue/TargetOperationTest.php @@ -72,6 +72,7 @@ public function testGetResultWithMixedDomains() $this->assertEquals( new MessageCatalogue('en', [ 'messages' => ['a' => 'old_a'], + 'messages+intl-icu' => ['a' => 'new_a'], ]), $this->createOperation( new MessageCatalogue('en', ['messages' => ['a' => 'old_a']]), @@ -103,7 +104,7 @@ public function testGetResultWithMixedDomains() $this->assertEquals( new MessageCatalogue('en', [ 'messages' => ['a' => 'old_a'], - 'messages+intl-icu' => ['b' => 'new_b'], + 'messages+intl-icu' => ['b' => 'new_b', 'a' => 'new_a'], ]), $this->createOperation( new MessageCatalogue('en', ['messages' => ['a' => 'old_a']]), diff --git a/src/Symfony/Component/Translation/Tests/Command/TranslationPullCommandTest.php b/src/Symfony/Component/Translation/Tests/Command/TranslationPullCommandTest.php index 7494a1c84c8fc..ecb6e834104e4 100644 --- a/src/Symfony/Component/Translation/Tests/Command/TranslationPullCommandTest.php +++ b/src/Symfony/Component/Translation/Tests/Command/TranslationPullCommandTest.php @@ -46,19 +46,27 @@ public function testPullNewXlf12Messages() { $arrayLoader = new ArrayLoader(); $filenameEn = $this->createFile(); + $filenameEnIcu = $this->createFile(['say_hello' => 'Welcome, {firstname}!'], 'en', 'messages+intl-icu.%locale%.xlf'); $filenameFr = $this->createFile(['note' => 'NOTE'], 'fr'); + $filenameFrIcu = $this->createFile(['say_hello' => 'Bonjour, {firstname}!'], 'fr', 'messages+intl-icu.%locale%.xlf'); $locales = ['en', 'fr']; - $domains = ['messages']; + $domains = ['messages', 'messages+intl-icu']; $providerReadTranslatorBag = new TranslatorBag(); $providerReadTranslatorBag->addCatalogue($arrayLoader->load([ 'note' => 'NOTE', 'new.foo' => 'newFoo', ], 'en')); + $providerReadTranslatorBag->addCatalogue($arrayLoader->load([ + 'say_hello' => 'Welcome, {firstname}!', + ], 'en', 'messages+intl-icu')); $providerReadTranslatorBag->addCatalogue($arrayLoader->load([ 'note' => 'NOTE', 'new.foo' => 'nouveauFoo', ], 'fr')); + $providerReadTranslatorBag->addCatalogue($arrayLoader->load([ + 'say_hello' => 'Bonjour, {firstname}!', + ], 'fr', 'messages+intl-icu')); $provider = $this->createMock(ProviderInterface::class); $provider->expects($this->once()) @@ -71,9 +79,9 @@ public function testPullNewXlf12Messages() ->willReturn('null://default'); $tester = $this->createCommandTester($provider, $locales, $domains); - $tester->execute(['--locales' => ['en', 'fr'], '--domains' => ['messages']]); + $tester->execute(['--locales' => ['en', 'fr'], '--domains' => ['messages', 'messages+intl-icu']]); - $this->assertStringContainsString('[OK] New translations from "null" has been written locally (for "en, fr" locale(s), and "messages" domain(s)).', trim($tester->getDisplay())); + $this->assertStringContainsString('[OK] New translations from "null" has been written locally (for "en, fr" locale(s), and "messages, messages+intl-icu"', trim($tester->getDisplay())); $this->assertXmlStringEqualsXmlString(<< @@ -97,6 +105,23 @@ public function testPullNewXlf12Messages() , file_get_contents($filenameEn)); $this->assertXmlStringEqualsXmlString(<< + + +

+ +

+ + + say_hello + Welcome, {firstname}! + + + + +XLIFF + , file_get_contents($filenameEnIcu)); + $this->assertXmlStringEqualsXmlString(<<

@@ -116,6 +141,23 @@ public function testPullNewXlf12Messages() XLIFF , file_get_contents($filenameFr)); + $this->assertXmlStringEqualsXmlString(<< + + +

+ +

+ + + say_hello + Bonjour, {firstname}! + + + + +XLIFF + , file_get_contents($filenameFrIcu)); } public function testPullNewXlf20Messages() From 5f69e86af0ada3d1794109e2eea53c8b21c20425 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Sat, 25 Dec 2021 20:39:39 +0100 Subject: [PATCH 095/127] [Mime] Fix test --- src/Symfony/Component/Mime/Tests/Header/HeadersTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Mime/Tests/Header/HeadersTest.php b/src/Symfony/Component/Mime/Tests/Header/HeadersTest.php index 5da27293310e8..168d0bcbbe0d9 100644 --- a/src/Symfony/Component/Mime/Tests/Header/HeadersTest.php +++ b/src/Symfony/Component/Mime/Tests/Header/HeadersTest.php @@ -247,14 +247,14 @@ public function testToArray() public function testInReplyToAcceptsNonIdentifierValues() { $headers = new Headers(); - $headers->addHeader('In-Reply-To', 'foobar'); + $headers->addTextHeader('In-Reply-To', 'foobar'); $this->assertEquals('foobar', $headers->get('In-Reply-To')->getBody()); } public function testReferencesAcceptsNonIdentifierValues() { $headers = new Headers(); - $headers->addHeader('References' , 'foobar'); + $headers->addTextHeader('References' , 'foobar'); $this->assertEquals('foobar', $headers->get('References')->getBody()); } } From 4d95be0a2e76ed80684f1f82f2c8e6fc3fc9484c Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Sat, 25 Dec 2021 20:42:09 +0100 Subject: [PATCH 096/127] [HttpClient] mark test transient --- src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php index 36e76ee83b9a1..e5b86a3be96cc 100644 --- a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php +++ b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php @@ -19,6 +19,9 @@ abstract class HttpClientTestCase extends BaseHttpClientTestCase { + /** + * @group transient-on-macos + */ public function testTimeoutOnDestruct() { if (!method_exists(parent::class, 'testTimeoutOnDestruct')) { From 9c048ac4b0bd464b70f8b09b2c26a467862a4ad1 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Sat, 25 Dec 2021 20:46:58 +0100 Subject: [PATCH 097/127] fix merge --- src/Symfony/Bridge/Doctrine/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 7a4f5f0a18b7c..5d8e8485c73e9 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -47,7 +47,7 @@ "doctrine/collections": "~1.0", "doctrine/data-fixtures": "^1.1", "doctrine/dbal": "^2.13.1|^3.0", - "doctrine/orm": "^2.7.4" + "doctrine/orm": "^2.7.4", "psr/log": "^1|^2|^3" }, "conflict": { From 2d8eeabeaa3cfc97d3dab693b29c76dcfdd6c051 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Sun, 26 Dec 2021 20:04:24 +0100 Subject: [PATCH 098/127] [Cache] fix compat with apcu < 5.1.10 --- .../Component/Cache/Tests/Adapter/AdapterTestCase.php | 9 +++++++++ src/Symfony/Component/Cache/Traits/ApcuTrait.php | 9 ++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php b/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php index a72ae663f09d6..123cda89b8728 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php @@ -296,6 +296,15 @@ public function testWeirdDataMatchingMetadataWrappedValues() $this->assertTrue($cache->hasItem('foobar')); } + + public function testNullByteInKey() + { + $cache = $this->createCachePool(0, __FUNCTION__); + + $cache->save($cache->getItem("a\0b")->set(123)); + + $this->assertSame(123, $cache->getItem("a\0b")->get()); + } } class NotUnserializable diff --git a/src/Symfony/Component/Cache/Traits/ApcuTrait.php b/src/Symfony/Component/Cache/Traits/ApcuTrait.php index b56ae4f7c39ac..ace28c7d37bd8 100644 --- a/src/Symfony/Component/Cache/Traits/ApcuTrait.php +++ b/src/Symfony/Component/Cache/Traits/ApcuTrait.php @@ -54,7 +54,14 @@ protected function doFetch(array $ids) $unserializeCallbackHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback'); try { $values = []; - foreach (apcu_fetch($ids, $ok) ?: [] as $k => $v) { + $ids = array_flip($ids); + foreach (apcu_fetch(array_keys($ids), $ok) ?: [] as $k => $v) { + if (!isset($ids[$k])) { + // work around https://github.com/krakjoe/apcu/issues/247 + $k = key($ids); + } + unset($ids[$k]); + if (null !== $v || $ok) { $values[$k] = $v; } From 3b1764d8117c3ec40ff7558788bf8f1b9699e233 Mon Sep 17 00:00:00 2001 From: Shyim <6224096+shyim@users.noreply.github.com> Date: Mon, 27 Dec 2021 09:52:39 +0100 Subject: [PATCH 099/127] Fix param annotation in HttpKernelBrowser --- src/Symfony/Component/HttpKernel/HttpKernelBrowser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php b/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php index 501581809d735..0c29332cd490c 100644 --- a/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php +++ b/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php @@ -192,7 +192,7 @@ protected function filterFiles(array $files) /** * {@inheritdoc} * - * @param Request $request + * @param Response $response * * @return DomResponse A DomResponse instance */ From 859defc6732c45fea5c2929b9e38779910026551 Mon Sep 17 00:00:00 2001 From: helmi <43951764+helmis123@users.noreply.github.com> Date: Mon, 27 Dec 2021 16:20:20 +0100 Subject: [PATCH 100/127] A sprintf is missing A sprintf is missing when throw a LogicException in the constructor of AuthorizationChecker class. --- .../Security/Core/Authorization/AuthorizationChecker.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php b/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php index 23a015856e6ce..5946060fbfdf1 100644 --- a/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php +++ b/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php @@ -31,7 +31,7 @@ class AuthorizationChecker implements AuthorizationCheckerInterface public function __construct(TokenStorageInterface $tokenStorage, AccessDecisionManagerInterface $accessDecisionManager, bool $exceptionOnNoToken = false) { if ($exceptionOnNoToken) { - throw new \LogicException('Argument $exceptionOnNoToken of "%s()" must be set to "false".', __METHOD__); + throw new \LogicException(sprintf('Argument $exceptionOnNoToken of "%s()" must be set to "false".', __METHOD__)); } $this->tokenStorage = $tokenStorage; From 9ad5b60cdef8091a7fc0b4ad4bccfdb92f9a8be9 Mon Sep 17 00:00:00 2001 From: Antoine Makdessi Date: Mon, 27 Dec 2021 19:07:26 +0100 Subject: [PATCH 101/127] [Profiler] relax return type for memory data collector --- .../HttpKernel/DataCollector/MemoryDataCollector.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php index ed5b409db6277..4b64a57311d43 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php @@ -58,7 +58,10 @@ public function getMemory(): int return $this->data['memory']; } - public function getMemoryLimit(): int + /** + * @return int|float + */ + public function getMemoryLimit() { return $this->data['memory_limit']; } From a9c9912e9de22d325eb13e1d2262802df7b66ea4 Mon Sep 17 00:00:00 2001 From: Vitali Tsyrkin Date: Mon, 27 Dec 2021 21:37:25 +0300 Subject: [PATCH 102/127] [HttpFoundation] Fix notice when HTTP_PHP_AUTH_USER passed without pass --- src/Symfony/Component/HttpFoundation/ServerBag.php | 2 +- .../Component/HttpFoundation/Tests/ServerBagTest.php | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpFoundation/ServerBag.php b/src/Symfony/Component/HttpFoundation/ServerBag.php index 7af111c865154..25688d5230f4b 100644 --- a/src/Symfony/Component/HttpFoundation/ServerBag.php +++ b/src/Symfony/Component/HttpFoundation/ServerBag.php @@ -89,7 +89,7 @@ public function getHeaders() // PHP_AUTH_USER/PHP_AUTH_PW if (isset($headers['PHP_AUTH_USER'])) { - $headers['AUTHORIZATION'] = 'Basic '.base64_encode($headers['PHP_AUTH_USER'].':'.$headers['PHP_AUTH_PW']); + $headers['AUTHORIZATION'] = 'Basic '.base64_encode($headers['PHP_AUTH_USER'].':'.($headers['PHP_AUTH_PW'] ?? '')); } elseif (isset($headers['PHP_AUTH_DIGEST'])) { $headers['AUTHORIZATION'] = $headers['PHP_AUTH_DIGEST']; } diff --git a/src/Symfony/Component/HttpFoundation/Tests/ServerBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/ServerBagTest.php index 0663b118e675e..e26714bc4640a 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/ServerBagTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/ServerBagTest.php @@ -57,6 +57,16 @@ public function testHttpPasswordIsOptional() ], $bag->getHeaders()); } + public function testHttpPasswordIsOptionalWhenPassedWithHttpPrefix() + { + $bag = new ServerBag(['HTTP_PHP_AUTH_USER' => 'foo']); + + $this->assertEquals([ + 'AUTHORIZATION' => 'Basic '.base64_encode('foo:'), + 'PHP_AUTH_USER' => 'foo', + ], $bag->getHeaders()); + } + public function testHttpBasicAuthWithPhpCgi() { $bag = new ServerBag(['HTTP_AUTHORIZATION' => 'Basic '.base64_encode('foo:bar')]); From 742279caa93c52ab69cac79d4387c413385c6a9d Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 27 Dec 2021 14:24:52 +0100 Subject: [PATCH 103/127] [Messenger] fix Redis support on 32b arch --- .appveyor.yml | 4 + .github/workflows/integration-tests.yml | 4 - phpunit.xml.dist | 1 + .../Transport/RedisExt/ConnectionTest.php | 23 +++++- .../Transport/RedisExt/Connection.php | 82 ++++++++++++------- 5 files changed, 78 insertions(+), 36 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index cbb0098bcffbe..889aafe26929b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -21,6 +21,8 @@ install: - cd ext - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.18-7.1-ts-vc14-x86.zip - 7z x php_apcu-5.1.18-7.1-ts-vc14-x86.zip -y >nul + - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_redis-5.1.1-7.1-ts-vc14-x86.zip + - 7z x php_redis-5.1.1-7.1-ts-vc14-x86.zip -y >nul - cd .. - copy /Y php.ini-development php.ini-min - echo memory_limit=-1 >> php.ini-min @@ -36,6 +38,7 @@ install: - echo opcache.enable_cli=1 >> php.ini-max - echo extension=php_openssl.dll >> php.ini-max - echo extension=php_apcu.dll >> php.ini-max + - echo extension=php_redis.dll >> php.ini-max - echo apc.enable_cli=1 >> php.ini-max - echo extension=php_intl.dll >> php.ini-max - echo extension=php_mbstring.dll >> php.ini-max @@ -54,6 +57,7 @@ install: - SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev - php composer.phar update --no-progress --ansi - php phpunit install + - choco install memurai-developer test_script: - SET X=0 diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 9832c8a9d09a2..72002fa8998ef 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -99,15 +99,11 @@ jobs: - name: Run tests run: ./phpunit --group integration -v env: - REDIS_HOST: localhost REDIS_CLUSTER_HOSTS: 'localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005' REDIS_SENTINEL_HOSTS: 'localhost:26379' REDIS_SENTINEL_SERVICE: redis_sentinel MESSENGER_REDIS_DSN: redis://127.0.0.1:7006/messages MESSENGER_AMQP_DSN: amqp://localhost/%2f/messages - MEMCACHED_HOST: localhost - LDAP_HOST: localhost - LDAP_PORT: 3389 #- name: Run HTTP push tests # if: matrix.php == '8.0' diff --git a/phpunit.xml.dist b/phpunit.xml.dist index c4e152a05938f..0c4dd3ee87287 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -18,6 +18,7 @@ + diff --git a/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php index 5484664e2c4ec..70b260ad63f80 100644 --- a/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php +++ b/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php @@ -220,6 +220,7 @@ public function testGetAfterReject() { $redis = new \Redis(); $connection = Connection::fromDsn('redis://localhost/messenger-rejectthenget', [], $redis); + $connection->cleanup(); $connection->add('1', []); $connection->add('2', []); @@ -230,7 +231,7 @@ public function testGetAfterReject() $connection = Connection::fromDsn('redis://localhost/messenger-rejectthenget'); $this->assertNotNull($connection->get()); - $redis->del('messenger-rejectthenget'); + $connection->cleanup(); } public function testGetNonBlocking() @@ -238,12 +239,30 @@ public function testGetNonBlocking() $redis = new \Redis(); $connection = Connection::fromDsn('redis://localhost/messenger-getnonblocking', [], $redis); + $connection->cleanup(); $this->assertNull($connection->get()); // no message, should return null immediately $connection->add('1', []); $this->assertNotEmpty($message = $connection->get()); $connection->reject($message['id']); - $redis->del('messenger-getnonblocking'); + + $connection->cleanup(); + } + + public function testGetDelayed() + { + $redis = new \Redis(); + + $connection = Connection::fromDsn('redis://localhost/messenger-delayed', [], $redis); + $connection->cleanup(); + + $connection->add('1', [], 100); + $this->assertNull($connection->get()); + usleep(300000); + $this->assertNotEmpty($message = $connection->get()); + $connection->reject($message['id']); + + $connection->cleanup(); } public function testJsonError() diff --git a/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php b/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php index 4e372eecd72f8..29eb6cb12e0d9 100644 --- a/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php +++ b/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php @@ -141,33 +141,29 @@ public function get(): ?array if ($this->autoSetup) { $this->setup(); } + $now = microtime(); + $now = substr($now, 11).substr($now, 2, 3); - try { - $queuedMessageCount = $this->connection->zcount($this->queue, 0, $this->getCurrentTimeInMilliseconds()); - } catch (\RedisException $e) { - throw new TransportException($e->getMessage(), 0, $e); - } + $queuedMessageCount = $this->rawCommand('ZCOUNT', 0, $now); - if ($queuedMessageCount) { - for ($i = 0; $i < $queuedMessageCount; ++$i) { - try { - $queuedMessages = $this->connection->zpopmin($this->queue, 1); - } catch (\RedisException $e) { - throw new TransportException($e->getMessage(), 0, $e); - } + while ($queuedMessageCount--) { + if (![$queuedMessage, $expiry] = $this->rawCommand('ZPOPMIN', 1)) { + break; + } + + if (\strlen($expiry) === \strlen($now) ? $expiry > $now : \strlen($expiry) < \strlen($now)) { + // if a future-placed message is popped because of a race condition with + // another running consumer, the message is readded to the queue - foreach ($queuedMessages as $queuedMessage => $time) { - $queuedMessage = json_decode($queuedMessage, true); - // if a futured placed message is actually popped because of a race condition with - // another running message consumer, the message is readded to the queue by add function - // else its just added stream and will be available for all stream consumers - $this->add( - $queuedMessage['body'], - $queuedMessage['headers'], - $time - $this->getCurrentTimeInMilliseconds() - ); + if (!$this->rawCommand('ZADD', 'NX', $expiry, $queuedMessage)) { + throw new TransportException('Could not add a message to the redis stream.'); } + + break; } + + $queuedMessage = json_decode($queuedMessage, true); + $this->add($queuedMessage['body'], $queuedMessage['headers'], 0); } $messageId = '>'; // will receive new messages @@ -255,7 +251,7 @@ public function add(string $body, array $headers, int $delayInMs = 0): void } try { - if ($delayInMs > 0) { // the delay could be smaller 0 in a queued message + if ($delayInMs > 0) { // the delay is <= 0 for queued messages $message = json_encode([ 'body' => $body, 'headers' => $headers, @@ -267,8 +263,18 @@ public function add(string $body, array $headers, int $delayInMs = 0): void throw new TransportException(json_last_error_msg()); } - $score = $this->getCurrentTimeInMilliseconds() + $delayInMs; - $added = $this->connection->zadd($this->queue, ['NX'], $score, $message); + $now = explode(' ', microtime(), 2); + $now[0] = str_pad($delayInMs + substr($now[0], 2, 3), 3, '0', \STR_PAD_LEFT); + if (3 < \strlen($now[0])) { + $now[1] += substr($now[0], 0, -3); + $now[0] = substr($now[0], -3); + + if (\is_float($now[1])) { + throw new TransportException("Message delay is too big: {$delayInMs}ms."); + } + } + + $added = $this->rawCommand('ZADD', 'NX', $now[1].$now[0], $message); } else { $message = json_encode([ 'body' => $body, @@ -316,14 +322,30 @@ public function setup(): void $this->autoSetup = false; } - private function getCurrentTimeInMilliseconds(): int - { - return (int) (microtime(true) * 1000); - } - public function cleanup(): void { $this->connection->del($this->stream); $this->connection->del($this->queue); } + + /** + * @return mixed + */ + private function rawCommand(string $command, ...$arguments) + { + try { + $result = $this->connection->rawCommand($command, $this->queue, ...$arguments); + } catch (\RedisException $e) { + throw new TransportException($e->getMessage(), 0, $e); + } + + if (false === $result) { + if ($error = $this->connection->getLastError() ?: null) { + $this->connection->clearLastError(); + } + throw new TransportException($error ?? sprintf('Could not run "%s" on Redis queue.', $command)); + } + + return $result; + } } From be8cbd2aec5c99d901e611945ecfb33e569cb1c9 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 28 Dec 2021 11:59:47 +0100 Subject: [PATCH 104/127] [Cache] Don't lock when doing nested computations --- src/Symfony/Component/Cache/LockRegistry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Cache/LockRegistry.php b/src/Symfony/Component/Cache/LockRegistry.php index 70fcac9cc12af..20fba4d3d4da4 100644 --- a/src/Symfony/Component/Cache/LockRegistry.php +++ b/src/Symfony/Component/Cache/LockRegistry.php @@ -88,7 +88,7 @@ public static function compute(callable $callback, ItemInterface $item, bool &$s $key = self::$files ? abs(crc32($item->getKey())) % \count(self::$files) : -1; - if ($key < 0 || (self::$lockedFiles[$key] ?? false) || !$lock = self::open($key)) { + if ($key < 0 || self::$lockedFiles || !$lock = self::open($key)) { return $callback($item, $save); } From d9e1e82e8831536b955ede9bf98cac3949db4dbd Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 27 Dec 2021 11:29:45 +0100 Subject: [PATCH 105/127] [Security] fix unserializing session payloads from v4 --- .../Component/Security/Core/Role/Role.php | 31 +++++++++++++++++++ .../Security/Core/Role/SwitchUserRole.php | 23 ++++++++++++++ .../Core/Tests/Role/LegacyRoleTest.php | 28 +++++++++++++++++ 3 files changed, 82 insertions(+) create mode 100644 src/Symfony/Component/Security/Core/Role/Role.php create mode 100644 src/Symfony/Component/Security/Core/Role/SwitchUserRole.php create mode 100644 src/Symfony/Component/Security/Core/Tests/Role/LegacyRoleTest.php diff --git a/src/Symfony/Component/Security/Core/Role/Role.php b/src/Symfony/Component/Security/Core/Role/Role.php new file mode 100644 index 0000000000000..374eb59fe85ca --- /dev/null +++ b/src/Symfony/Component/Security/Core/Role/Role.php @@ -0,0 +1,31 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Security\Core\Role; + +/** + * Allows migrating session payloads from v4. + * + * @internal + */ +class Role +{ + private $role; + + private function __construct() + { + } + + public function __toString(): string + { + return $this->role; + } +} diff --git a/src/Symfony/Component/Security/Core/Role/SwitchUserRole.php b/src/Symfony/Component/Security/Core/Role/SwitchUserRole.php new file mode 100644 index 0000000000000..6a29fb4daa29b --- /dev/null +++ b/src/Symfony/Component/Security/Core/Role/SwitchUserRole.php @@ -0,0 +1,23 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Security\Core\Role; + +/** + * Allows migrating session payloads from v4. + * + * @internal + */ +class SwitchUserRole extends Role +{ + private $deprecationTriggered; + private $source; +} diff --git a/src/Symfony/Component/Security/Core/Tests/Role/LegacyRoleTest.php b/src/Symfony/Component/Security/Core/Tests/Role/LegacyRoleTest.php new file mode 100644 index 0000000000000..44c9566720b89 --- /dev/null +++ b/src/Symfony/Component/Security/Core/Tests/Role/LegacyRoleTest.php @@ -0,0 +1,28 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Security\Core\Tests\Role; + +use PHPUnit\Framework\TestCase; +use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken; + +class LegacyRoleTest extends TestCase +{ + public function testPayloadFromV4CanBeUnserialized() + { + $serialized = 'C:74:"Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken":236:{a:3:{i:0;N;i:1;s:4:"main";i:2;a:5:{i:0;s:2:"sf";i:1;b:1;i:2;a:1:{i:0;O:41:"Symfony\Component\Security\Core\Role\Role":1:{s:47:"Symfony\Component\Security\Core\Role\Role'."\0".'role'."\0".'";s:9:"ROLE_USER";}}i:3;a:0:{}i:4;a:1:{i:0;s:9:"ROLE_USER";}}}}'; + + $token = unserialize($serialized); + + $this->assertInstanceOf(UsernamePasswordToken::class, $token); + $this->assertSame(['ROLE_USER'], $token->getRoleNames()); + } +} From eed22578384a8629554989fcbbc7d79f587c9783 Mon Sep 17 00:00:00 2001 From: Thomas Calvet Date: Wed, 15 Dec 2021 12:22:22 +0100 Subject: [PATCH 106/127] Remove < PHP 8 dead code --- .../Cache/Tests/Marshaller/DefaultMarshallerTest.php | 6 +++--- .../Component/Config/Exception/LoaderLoadException.php | 7 +------ .../Config/Tests/Exception/LoaderLoadExceptionTest.php | 2 +- src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php | 3 +-- .../Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php | 3 +-- 5 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/Symfony/Component/Cache/Tests/Marshaller/DefaultMarshallerTest.php b/src/Symfony/Component/Cache/Tests/Marshaller/DefaultMarshallerTest.php index f945c4637edab..4bc238ed341bd 100644 --- a/src/Symfony/Component/Cache/Tests/Marshaller/DefaultMarshallerTest.php +++ b/src/Symfony/Component/Cache/Tests/Marshaller/DefaultMarshallerTest.php @@ -44,7 +44,7 @@ public function testNativeUnserialize() public function testIgbinaryUnserialize() { if (version_compare('3.1.6', phpversion('igbinary'), '>')) { - $this->markTestSkipped('igbinary is not compatible with PHP 7.4.'); + $this->markTestSkipped('igbinary needs to be v3.1.6 or higher.'); } $marshaller = new DefaultMarshaller(); @@ -68,7 +68,7 @@ public function testNativeUnserializeNotFoundClass() public function testIgbinaryUnserializeNotFoundClass() { if (version_compare('3.1.6', phpversion('igbinary'), '>')) { - $this->markTestSkipped('igbinary is not compatible with PHP 7.4.'); + $this->markTestSkipped('igbinary needs to be v3.1.6 or higher.'); } $this->expectException(\DomainException::class); @@ -96,7 +96,7 @@ public function testNativeUnserializeInvalid() public function testIgbinaryUnserializeInvalid() { if (version_compare('3.1.6', phpversion('igbinary'), '>')) { - $this->markTestSkipped('igbinary is not compatible with PHP 7.4.'); + $this->markTestSkipped('igbinary needs to be v3.1.6 or higher.'); } $this->expectException(\DomainException::class); diff --git a/src/Symfony/Component/Config/Exception/LoaderLoadException.php b/src/Symfony/Component/Config/Exception/LoaderLoadException.php index cfd5bfe55ed15..97e804e1268cd 100644 --- a/src/Symfony/Component/Config/Exception/LoaderLoadException.php +++ b/src/Symfony/Component/Config/Exception/LoaderLoadException.php @@ -62,12 +62,7 @@ public function __construct(string $resource, string $sourceResource = null, int $message .= sprintf(' Make sure the "%s" bundle is correctly registered and loaded in the application kernel class.', $bundle); $message .= sprintf(' If the bundle is registered, make sure the bundle path "%s" is not empty.', $resource); } elseif (null !== $type) { - // maybe there is no loader for this specific type - if ('annotation' === $type) { - $message .= ' Make sure to use PHP 8+ or that annotations are installed and enabled.'; - } else { - $message .= sprintf(' Make sure there is a loader supporting the "%s" type.', $type); - } + $message .= sprintf(' Make sure there is a loader supporting the "%s" type.', $type); } parent::__construct($message, $code, $previous); diff --git a/src/Symfony/Component/Config/Tests/Exception/LoaderLoadExceptionTest.php b/src/Symfony/Component/Config/Tests/Exception/LoaderLoadExceptionTest.php index 3150c5a83c31c..995a72963c84b 100644 --- a/src/Symfony/Component/Config/Tests/Exception/LoaderLoadExceptionTest.php +++ b/src/Symfony/Component/Config/Tests/Exception/LoaderLoadExceptionTest.php @@ -31,7 +31,7 @@ public function testMessageCannotLoadResourceWithType() public function testMessageCannotLoadResourceWithAnnotationType() { $exception = new LoaderLoadException('resource', null, 0, null, 'annotation'); - $this->assertEquals('Cannot load resource "resource". Make sure to use PHP 8+ or that annotations are installed and enabled.', $exception->getMessage()); + $this->assertEquals('Cannot load resource "resource". Make sure there is a loader supporting the "annotation" type.', $exception->getMessage()); } public function testMessageCannotImportResourceFromSource() diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php index 997b21be1c055..a48bf1022ec3b 100644 --- a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php +++ b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php @@ -24,8 +24,7 @@ */ class Query extends AbstractQuery { - // As of PHP 7.2, we can use LDAP_CONTROL_PAGEDRESULTS instead of this - public const PAGINATION_OID = '1.2.840.113556.1.4.319'; + public const PAGINATION_OID = \LDAP_CONTROL_PAGEDRESULTS; /** @var Connection */ protected $connection; diff --git a/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php b/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php index 280b11f293d74..4ded705f93299 100644 --- a/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php +++ b/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php @@ -149,8 +149,7 @@ public function testLdapPagination() $this->assertEquals(\count($paged_query->getResources()), 5); // This last query is to ensure that we haven't botched the state of our connection - // by not resetting pagination properly. extldap <= PHP 7.1 do not implement the necessary - // bits to work around an implementation flaw, so we simply can't guarantee this to work there. + // by not resetting pagination properly. $final_query = $ldap->createQuery('dc=symfony,dc=com', '(&(objectClass=applicationProcess)(cn=user*))', [ 'scope' => Query::SCOPE_ONE, ]); From b69485887ca4388e1f5c2fb08cb895909cb693bd Mon Sep 17 00:00:00 2001 From: Daniel Gorgan Date: Tue, 28 Dec 2021 11:26:55 +0200 Subject: [PATCH 107/127] [Translation] [LocoProvider] Use rawurlencode and separate tag setting --- .../Translation/Bridge/Loco/LocoProvider.php | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php b/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php index 3ef725be123ca..763cc68b74a06 100644 --- a/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php +++ b/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php @@ -140,7 +140,7 @@ public function delete(TranslatorBagInterface $translatorBag): void foreach (array_keys($catalogue->all()) as $domain) { foreach ($this->getAssetsIds($domain) as $id) { - $responses[$id] = $this->client->request('DELETE', sprintf('assets/%s.json', $id)); + $responses[$id] = $this->client->request('DELETE', sprintf('assets/%s.json', rawurlencode($id))); } } @@ -202,7 +202,7 @@ private function translateAssets(array $translations, string $locale): void $responses = []; foreach ($translations as $id => $message) { - $responses[$id] = $this->client->request('POST', sprintf('translations/%s/%s', $id, $locale), [ + $responses[$id] = $this->client->request('POST', sprintf('translations/%s/%s', rawurlencode($id), rawurlencode($locale)), [ 'body' => $message, ]); } @@ -220,13 +220,35 @@ private function tagsAssets(array $ids, string $tag): void $this->createTag($tag); } - $response = $this->client->request('POST', sprintf('tags/%s.json', $tag), [ - 'body' => implode(',', $ids), + // Separate ids with and without comma. + $idsWithComma = $idsWithoutComma = []; + foreach ($ids as $id) { + if (false !== strpos($id, ',')) { + $idsWithComma[] = $id; + } else { + $idsWithoutComma[] = $id; + } + } + + // Set tags for all ids without comma. + $response = $this->client->request('POST', sprintf('tags/%s.json', rawurlencode($tag)), [ + 'body' => implode(',', $idsWithoutComma), ]); if (200 !== $response->getStatusCode()) { $this->logger->error(sprintf('Unable to tag assets with "%s" on Loco: "%s".', $tag, $response->getContent(false))); } + + // Set tags for each id with comma one by one. + foreach ($idsWithComma as $id) { + $response = $this->client->request('POST', sprintf('assets/%s/tags', rawurlencode($id)), [ + 'body' => ['name' => $tag], + ]); + + if (200 !== $response->getStatusCode()) { + $this->logger->error(sprintf('Unable to tag asset "%s" with "%s" on Loco: "%s".', $id, $tag, $response->getContent(false))); + } + } } private function createTag(string $tag): void From 52ceda78e48d4018a4a29099b0006f3584e2882c Mon Sep 17 00:00:00 2001 From: Antoine Lamirault Date: Tue, 28 Dec 2021 14:57:09 +0100 Subject: [PATCH 108/127] [Mime] Fix missing sprintf in DkimSigner --- src/Symfony/Component/Mime/Crypto/DkimSigner.php | 4 ++-- .../Mime/Tests/Crypto/DkimSignerTest.php | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Mime/Crypto/DkimSigner.php b/src/Symfony/Component/Mime/Crypto/DkimSigner.php index dfb6f226b5e51..f0f7091ed4168 100644 --- a/src/Symfony/Component/Mime/Crypto/DkimSigner.php +++ b/src/Symfony/Component/Mime/Crypto/DkimSigner.php @@ -65,7 +65,7 @@ public function sign(Message $message, array $options = []): Message { $options += $this->defaultOptions; if (!\in_array($options['algorithm'], [self::ALGO_SHA256, self::ALGO_ED25519], true)) { - throw new InvalidArgumentException('Invalid DKIM signing algorithm "%s".', $options['algorithm']); + throw new InvalidArgumentException(sprintf('Invalid DKIM signing algorithm "%s".', $options['algorithm'])); } $headersToIgnore['return-path'] = true; $headersToIgnore['x-transport'] = true; @@ -205,7 +205,7 @@ private function hashBody(AbstractPart $body, string $bodyCanon, int $maxLength) } // Add trailing Line return if last line is non empty - if (\strlen($currentLine) > 0) { + if ('' !== $currentLine) { hash_update($hash, "\r\n"); $length += \strlen("\r\n"); } diff --git a/src/Symfony/Component/Mime/Tests/Crypto/DkimSignerTest.php b/src/Symfony/Component/Mime/Tests/Crypto/DkimSignerTest.php index e48b0c8e4e3c0..e0eaa54f18757 100644 --- a/src/Symfony/Component/Mime/Tests/Crypto/DkimSignerTest.php +++ b/src/Symfony/Component/Mime/Tests/Crypto/DkimSignerTest.php @@ -16,6 +16,7 @@ use Symfony\Component\Mime\Address; use Symfony\Component\Mime\Crypto\DkimSigner; use Symfony\Component\Mime\Email; +use Symfony\Component\Mime\Message; /** * @group time-sensitive @@ -90,6 +91,21 @@ public function getSignData() ]; } + public function testSignWithUnsupportedAlgorithm() + { + $message = $this->createMock(Message::class); + + $signer = new DkimSigner(self::$pk, 'testdkim.symfony.net', 'sf', [ + 'algorithm' => 'unsupported-value', + ]); + + $this->expectExceptionObject( + new \LogicException('Invalid DKIM signing algorithm "unsupported-value".') + ); + + $signer->sign($message, []); + } + /** * @dataProvider getCanonicalizeHeaderData */ From c1954f835a4fd3e4e9c1caf017c4d48179abe3a9 Mon Sep 17 00:00:00 2001 From: Antoine Lamirault Date: Tue, 28 Dec 2021 13:34:07 +0100 Subject: [PATCH 109/127] [Mime][Security] Fix missing sprintf and add tests --- .../Security/Http/Firewall/AccessListener.php | 2 +- .../Http/Tests/Firewall/AccessListenerTest.php | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Security/Http/Firewall/AccessListener.php b/src/Symfony/Component/Security/Http/Firewall/AccessListener.php index 180222958b0ac..5cca9589066c9 100644 --- a/src/Symfony/Component/Security/Http/Firewall/AccessListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/AccessListener.php @@ -37,7 +37,7 @@ class AccessListener extends AbstractListener public function __construct(TokenStorageInterface $tokenStorage, AccessDecisionManagerInterface $accessDecisionManager, AccessMapInterface $map, bool $exceptionOnNoToken = false) { if (false !== $exceptionOnNoToken) { - throw new \LogicException('Argument $exceptionOnNoToken of "%s()" must be set to "false".', __METHOD__); + throw new \LogicException(sprintf('Argument $exceptionOnNoToken of "%s()" must be set to "false".', __METHOD__)); } $this->tokenStorage = $tokenStorage; diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php index 1126edade0915..181454e43ec33 100644 --- a/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php +++ b/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php @@ -266,4 +266,18 @@ public function testLazyPublicPagesShouldNotAccessTokenStorage() $listener = new AccessListener($tokenStorage, $this->createMock(AccessDecisionManagerInterface::class), $accessMap, false); $listener(new LazyResponseEvent(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST))); } + + public function testConstructWithTrueExceptionOnNoToken() + { + $tokenStorage = $this->createMock(TokenStorageInterface::class); + $tokenStorage->expects($this->never())->method(self::anything()); + + $accessMap = $this->createMock(AccessMapInterface::class); + + $this->expectExceptionObject( + new \LogicException('Argument $exceptionOnNoToken of "Symfony\Component\Security\Http\Firewall\AccessListener::__construct()" must be set to "false".') + ); + + new AccessListener($tokenStorage, $this->createMock(AccessDecisionManagerInterface::class), $accessMap, true); + } } From 72b1b439bac58c1625f5cb89e6d79303c97ac6bd Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Tue, 28 Dec 2021 15:24:07 +0100 Subject: [PATCH 110/127] restore missing use statement --- .../HttpKernel/Tests/EventListener/SessionListenerTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php index a921610b84dbf..5a0a4938c3c4b 100644 --- a/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php @@ -14,6 +14,7 @@ use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; use Symfony\Component\DependencyInjection\Container; +use Symfony\Component\DependencyInjection\ServiceLocator; use Symfony\Component\HttpFoundation\Cookie; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RequestStack; From 89232ee5ea7bf86b97503d8ed58b83cd1612b67b Mon Sep 17 00:00:00 2001 From: Maxime Steinhausser Date: Tue, 28 Dec 2021 14:37:08 +0100 Subject: [PATCH 111/127] [HttpKernel] Do not attempt to register enum arguments in controller service locator --- ...RegisterControllerArgumentLocatorsPass.php | 5 ++++ ...sterControllerArgumentLocatorsPassTest.php | 27 +++++++++++++++++++ .../HttpKernel/Tests/Fixtures/Suit.php | 20 ++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 src/Symfony/Component/HttpKernel/Tests/Fixtures/Suit.php diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php index cf4ab60284408..eef09fa82298e 100644 --- a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php +++ b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php @@ -127,6 +127,11 @@ public function process(ContainerBuilder $container) $type = ltrim($target = (string) ProxyHelper::getTypeHint($r, $p), '\\'); $invalidBehavior = ContainerInterface::IGNORE_ON_INVALID_REFERENCE; + if (is_subclass_of($type, \UnitEnum::class, true)) { + // do not attempt to register enum typed arguments + continue; + } + if (isset($arguments[$r->name][$p->name])) { $target = $arguments[$r->name][$p->name]; if ('?' !== $target[0]) { diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php index 5a0964f6c21ca..0207703d94c88 100644 --- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php @@ -23,6 +23,7 @@ use Symfony\Component\DependencyInjection\ServiceLocator; use Symfony\Component\DependencyInjection\TypedReference; use Symfony\Component\HttpKernel\DependencyInjection\RegisterControllerArgumentLocatorsPass; +use Symfony\Component\HttpKernel\Tests\Fixtures\Suit; class RegisterControllerArgumentLocatorsPassTest extends TestCase { @@ -369,6 +370,25 @@ public function testNotTaggedControllerServiceReceivesLocatorArgument() $this->assertInstanceOf(Reference::class, $locatorArgument); } + + /** + * @requires PHP 8.1 + */ + public function testEnumArgumentIsIgnored() + { + $container = new ContainerBuilder(); + $resolver = $container->register('argument_resolver.service')->addArgument([]); + + $container->register('foo', NonNullableEnumArgumentWithDefaultController::class) + ->addTag('controller.service_arguments') + ; + + $pass = new RegisterControllerArgumentLocatorsPass(); + $pass->process($container); + + $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0); + $this->assertEmpty(array_keys($locator), 'enum typed argument is ignored'); + } } class RegisterTestController @@ -430,3 +450,10 @@ public function fooAction(string $someArg) { } } + +class NonNullableEnumArgumentWithDefaultController +{ + public function fooAction(Suit $suit = Suit::Spades) + { + } +} diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/Suit.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/Suit.php new file mode 100644 index 0000000000000..5d9623b22598d --- /dev/null +++ b/src/Symfony/Component/HttpKernel/Tests/Fixtures/Suit.php @@ -0,0 +1,20 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\HttpKernel\Tests\Fixtures; + +enum Suit: string +{ + case Hearts = 'H'; + case Diamonds = 'D'; + case Clubs = 'C'; + case Spades = 'S'; +} From a1d33da66df573ac87d836b76a8e256a777992c3 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 28 Dec 2021 15:43:46 +0100 Subject: [PATCH 112/127] cs fix --- .../RegisterControllerArgumentLocatorsPass.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php index eef09fa82298e..daba47315164b 100644 --- a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php +++ b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php @@ -127,7 +127,7 @@ public function process(ContainerBuilder $container) $type = ltrim($target = (string) ProxyHelper::getTypeHint($r, $p), '\\'); $invalidBehavior = ContainerInterface::IGNORE_ON_INVALID_REFERENCE; - if (is_subclass_of($type, \UnitEnum::class, true)) { + if (is_subclass_of($type, \UnitEnum::class)) { // do not attempt to register enum typed arguments continue; } From 53b3e40ab51d946c93b390a0b1ddc940dd8900d8 Mon Sep 17 00:00:00 2001 From: Titouan Galopin Date: Sun, 21 Nov 2021 14:26:08 +0100 Subject: [PATCH 113/127] [DomCrawler] Fix HTML5 parser charset option --- src/Symfony/Component/DomCrawler/Crawler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php index 70a4b607dcdca..d1c7a9690a07e 100644 --- a/src/Symfony/Component/DomCrawler/Crawler.php +++ b/src/Symfony/Component/DomCrawler/Crawler.php @@ -1107,7 +1107,7 @@ protected function sibling($node, $siblingDir = 'nextSibling') private function parseHtml5(string $htmlContent, string $charset = 'UTF-8'): \DOMDocument { - return $this->html5Parser->parse($this->convertToHtmlEntities($htmlContent, $charset), [], $charset); + return $this->html5Parser->parse($this->convertToHtmlEntities($htmlContent, $charset)); } private function parseXhtml(string $htmlContent, string $charset = 'UTF-8'): \DOMDocument From e5b2f9efba595b07fcc12e71995ddf38539a9e4a Mon Sep 17 00:00:00 2001 From: Simon Watiau Date: Mon, 27 Dec 2021 10:23:03 +0100 Subject: [PATCH 114/127] [Lock] Release PostgreSqlStore connection lock on failure --- .../Component/Lock/Store/PostgreSqlStore.php | 60 ++++++++++++------- .../Lock/Tests/Store/PostgreSqlStoreTest.php | 28 +++++++++ 2 files changed, 68 insertions(+), 20 deletions(-) diff --git a/src/Symfony/Component/Lock/Store/PostgreSqlStore.php b/src/Symfony/Component/Lock/Store/PostgreSqlStore.php index 0e472d2c82717..67ed4ca05a03d 100644 --- a/src/Symfony/Component/Lock/Store/PostgreSqlStore.php +++ b/src/Symfony/Component/Lock/Store/PostgreSqlStore.php @@ -80,18 +80,28 @@ public function save(Key $key) // prevent concurrency within the same connection $this->getInternalStore()->save($key); - $sql = 'SELECT pg_try_advisory_lock(:key)'; - $stmt = $this->getConnection()->prepare($sql); - $stmt->bindValue(':key', $this->getHashedKey($key)); - $result = $stmt->execute(); + $lockAcquired = false; - // Check if lock is acquired - if (true === (\is_object($result) ? $result->fetchOne() : $stmt->fetchColumn())) { - $key->markUnserializable(); - // release sharedLock in case of promotion - $this->unlockShared($key); + try { + $sql = 'SELECT pg_try_advisory_lock(:key)'; + $stmt = $this->getConnection()->prepare($sql); + $stmt->bindValue(':key', $this->getHashedKey($key)); + $result = $stmt->execute(); - return; + // Check if lock is acquired + if (true === (\is_object($result) ? $result->fetchOne() : $stmt->fetchColumn())) { + $key->markUnserializable(); + // release sharedLock in case of promotion + $this->unlockShared($key); + + $lockAcquired = true; + + return; + } + } finally { + if (!$lockAcquired) { + $this->getInternalStore()->delete($key); + } } throw new LockConflictedException(); @@ -102,19 +112,29 @@ public function saveRead(Key $key) // prevent concurrency within the same connection $this->getInternalStore()->saveRead($key); - $sql = 'SELECT pg_try_advisory_lock_shared(:key)'; - $stmt = $this->getConnection()->prepare($sql); + $lockAcquired = false; - $stmt->bindValue(':key', $this->getHashedKey($key)); - $result = $stmt->execute(); + try { + $sql = 'SELECT pg_try_advisory_lock_shared(:key)'; + $stmt = $this->getConnection()->prepare($sql); + + $stmt->bindValue(':key', $this->getHashedKey($key)); + $result = $stmt->execute(); - // Check if lock is acquired - if (true === (\is_object($result) ? $result->fetchOne() : $stmt->fetchColumn())) { - $key->markUnserializable(); - // release lock in case of demotion - $this->unlock($key); + // Check if lock is acquired + if (true === (\is_object($result) ? $result->fetchOne() : $stmt->fetchColumn())) { + $key->markUnserializable(); + // release lock in case of demotion + $this->unlock($key); - return; + $lockAcquired = true; + + return; + } + } finally { + if (!$lockAcquired) { + $this->getInternalStore()->delete($key); + } } throw new LockConflictedException(); diff --git a/src/Symfony/Component/Lock/Tests/Store/PostgreSqlStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/PostgreSqlStoreTest.php index d0358a8ef054a..aef6ee7b86782 100644 --- a/src/Symfony/Component/Lock/Tests/Store/PostgreSqlStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/PostgreSqlStoreTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Lock\Tests\Store; use Symfony\Component\Lock\Exception\InvalidArgumentException; +use Symfony\Component\Lock\Exception\LockConflictedException; use Symfony\Component\Lock\Key; use Symfony\Component\Lock\PersistingStoreInterface; use Symfony\Component\Lock\Store\PostgreSqlStore; @@ -50,4 +51,31 @@ public function testInvalidDriver() $this->expectExceptionMessage('The adapter "Symfony\Component\Lock\Store\PostgreSqlStore" does not support'); $store->exists(new Key('foo')); } + + public function testSaveAfterConflict() + { + $store1 = $this->getStore(); + $store2 = $this->getStore(); + + $key = new Key(uniqid(__METHOD__, true)); + + $store1->save($key); + $this->assertTrue($store1->exists($key)); + + $lockConflicted = false; + + try { + $store2->save($key); + } catch (LockConflictedException $lockConflictedException) { + $lockConflicted = true; + } + + $this->assertTrue($lockConflicted); + $this->assertFalse($store2->exists($key)); + + $store1->delete($key); + + $store2->save($key); + $this->assertTrue($store2->exists($key)); + } } From 3d2fd7073eb33c25e6ee29bbe8447fd6f3915e97 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Tue, 28 Dec 2021 16:14:13 +0100 Subject: [PATCH 115/127] expand uninitialized session tests --- .../EventListener/SessionListenerTest.php | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php index 348f643c1fbcc..c6513214dd8ba 100644 --- a/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php @@ -121,7 +121,7 @@ public function testResponseIsStillPublicIfSessionStartedAndHeaderPresent() $this->assertFalse($response->headers->has(AbstractSessionListener::NO_AUTO_CACHE_CONTROL_HEADER)); } - public function testUninitializedSession() + public function testUninitializedSessionUsingInitializedSessionService() { $kernel = $this->createMock(HttpKernelInterface::class); $response = new Response(); @@ -142,6 +142,26 @@ public function testUninitializedSession() $this->assertFalse($response->headers->has(AbstractSessionListener::NO_AUTO_CACHE_CONTROL_HEADER)); } + public function testUninitializedSessionUsingSessionFromRequest() + { + $kernel = $this->createMock(HttpKernelInterface::class); + $response = new Response(); + $response->setSharedMaxAge(60); + $response->headers->set(AbstractSessionListener::NO_AUTO_CACHE_CONTROL_HEADER, 'true'); + + $request = new Request(); + $request->setSession(new Session()); + + $listener = new SessionListener(new Container()); + $listener->onKernelResponse(new ResponseEvent($kernel, $request, HttpKernelInterface::MAIN_REQUEST, $response)); + $this->assertFalse($response->headers->has('Expires')); + $this->assertTrue($response->headers->hasCacheControlDirective('public')); + $this->assertFalse($response->headers->hasCacheControlDirective('private')); + $this->assertFalse($response->headers->hasCacheControlDirective('must-revalidate')); + $this->assertSame('60', $response->headers->getCacheControlDirective('s-maxage')); + $this->assertFalse($response->headers->has(AbstractSessionListener::NO_AUTO_CACHE_CONTROL_HEADER)); + } + public function testUninitializedSessionWithoutInitializedSession() { $kernel = $this->createMock(HttpKernelInterface::class); From 80c5811e8933bcc49b49abfb3bc51a160fdf5900 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 29 Dec 2021 09:42:49 +0100 Subject: [PATCH 116/127] Fix transient test --- .../Component/HttpClient/Tests/AsyncDecoratorTraitTest.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php b/src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php index 0dfca6d4a2f97..a9266beb593a7 100644 --- a/src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php +++ b/src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php @@ -54,6 +54,9 @@ public function request(string $method, string $url, array $options = []): Respo }; } + /** + * @group transient-on-macos + */ public function testTimeoutOnDestruct() { if (HttpClient::create() instanceof NativeHttpClient) { From 0f96dd0775c9ecb785c14ef9b3dcbff89960a3a3 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 29 Dec 2021 09:46:54 +0100 Subject: [PATCH 117/127] Fix transient test --- .../Tests/Transport/Doctrine/DoctrineIntegrationTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineIntegrationTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineIntegrationTest.php index 2bc70871baf5c..45ca47af4882a 100644 --- a/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineIntegrationTest.php +++ b/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineIntegrationTest.php @@ -21,6 +21,7 @@ /** * @requires extension pdo_sqlite + * @group transient-on-macos */ class DoctrineIntegrationTest extends TestCase { From dbc3eea99b04dc685088f37b6ae4e0700f5f4558 Mon Sep 17 00:00:00 2001 From: Maxime Steinhausser Date: Wed, 29 Dec 2021 09:18:46 +0100 Subject: [PATCH 118/127] Suppress psalm error for UndefinedDocblockClass for PHP 8.1 classes --- psalm.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/psalm.xml b/psalm.xml index 015c0ed18b21b..3fb94145699cf 100644 --- a/psalm.xml +++ b/psalm.xml @@ -27,5 +27,13 @@ + + + + + + + + From bcec5333e9f62cf9fb2cf6f39d859cc43d94c976 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 29 Dec 2021 10:11:47 +0100 Subject: [PATCH 119/127] [Security] fix compat with older session payloads --- .../Security/Core/Authentication/Token/AbstractToken.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php index 4bd4ffdeb2a14..2d6139c8f9761 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Security\Core\Authentication\Token; use Symfony\Component\Security\Core\User\UserInterface; +use Symfony\Component\Security\Core\User\InMemoryUser; /** * Base class for Token instances. @@ -114,7 +115,8 @@ public function __serialize(): array */ public function __unserialize(array $data): void { - [$this->user, , , $this->attributes, $this->roleNames] = $data; + [$user, , , $this->attributes, $this->roleNames] = $data; + $this->user = \is_string($user) ? new InMemoryUser($user, '', $this->roleNames) : $user; } /** From 39064fe631568901f04bb4fa43cbeb66f87890f6 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 29 Dec 2021 10:28:53 +0100 Subject: [PATCH 120/127] [CI] Remove macOS jobs --- .github/workflows/unit-tests.yml | 20 ++++--------------- .../HttpClient/Tests/HttpClientTestCase.php | 3 --- .../Doctrine/DoctrineIntegrationTest.php | 1 - .../Tests/Dumper/ServerDumperTest.php | 3 --- .../VarDumper/Tests/Server/ConnectionTest.php | 3 --- .../HttpClient/Test/HttpClientTestCase.php | 6 ------ 6 files changed, 4 insertions(+), 32 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index ee8ffee658f5b..712657bd3d3c7 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -20,23 +20,16 @@ jobs: matrix: include: - php: '7.2' - os: ubuntu-20.04 - php: '7.4' - os: ubuntu-20.04 - - php: '8.0' - os: macos-11 - php: '8.0' mode: high-deps - os: ubuntu-20.04 - php: '8.1' mode: low-deps - os: ubuntu-20.04 - php: '8.2' mode: experimental - os: ubuntu-20.04 fail-fast: false - runs-on: "${{ matrix.os }}" + runs-on: ubuntu-20.04 steps: - name: Checkout @@ -58,11 +51,6 @@ jobs: extensions: "${{ env.extensions }}" tools: flex - - name: Install Homebrew packages - if: "matrix.os == 'macos-11'" - run: | - brew install parallel - - name: Configure environment run: | git config --global user.email "" @@ -74,7 +62,7 @@ jobs: ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json" echo COLUMNS=120 >> $GITHUB_ENV - echo PHPUNIT="$(pwd)/phpunit --exclude-group tty,benchmark,intl-data$([[ ${{ matrix.os }} = macos* ]] && echo ',transient-on-macos')" >> $GITHUB_ENV + echo PHPUNIT="$(pwd)/phpunit --exclude-group tty,benchmark,intl-data" >> $GITHUB_ENV echo COMPOSER_UP='composer update --no-progress --ansi' >> $GITHUB_ENV SYMFONY_VERSIONS=$(git ls-remote -q --heads | cut -f2 | grep -o '/[1-9][0-9]*\.[0-9].*' | sort -V) @@ -148,7 +136,7 @@ jobs: echo "::endgroup::" - name: Patch return types - if: "matrix.php == '8.1' && ! matrix.mode && matrix.os != 'macos-11'" + if: "matrix.php == '8.1' && ! matrix.mode" run: | sed -i 's/"\*\*\/Tests\/"//' composer.json composer install -q --optimize-autoloader @@ -222,7 +210,7 @@ jobs: [[ ! $X ]] || (exit 1) - name: Run tests with SIGCHLD enabled PHP - if: "matrix.php == '7.2' && ! matrix.mode && matrix.os != 'macos-11'" + if: "matrix.php == '7.2' && ! matrix.mode" run: | mkdir build cd build diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php index e5b86a3be96cc..36e76ee83b9a1 100644 --- a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php +++ b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php @@ -19,9 +19,6 @@ abstract class HttpClientTestCase extends BaseHttpClientTestCase { - /** - * @group transient-on-macos - */ public function testTimeoutOnDestruct() { if (!method_exists(parent::class, 'testTimeoutOnDestruct')) { diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineIntegrationTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineIntegrationTest.php index 45ca47af4882a..2bc70871baf5c 100644 --- a/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineIntegrationTest.php +++ b/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineIntegrationTest.php @@ -21,7 +21,6 @@ /** * @requires extension pdo_sqlite - * @group transient-on-macos */ class DoctrineIntegrationTest extends TestCase { diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/ServerDumperTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/ServerDumperTest.php index ff4727538399c..447d4856f7329 100644 --- a/src/Symfony/Component/VarDumper/Tests/Dumper/ServerDumperTest.php +++ b/src/Symfony/Component/VarDumper/Tests/Dumper/ServerDumperTest.php @@ -37,9 +37,6 @@ public function testDumpForwardsToWrappedDumperWhenServerIsUnavailable() $dumper->dump($data); } - /** - * @group transient-on-macos - */ public function testDump() { $wrappedDumper = $this->createMock(DataDumperInterface::class); diff --git a/src/Symfony/Component/VarDumper/Tests/Server/ConnectionTest.php b/src/Symfony/Component/VarDumper/Tests/Server/ConnectionTest.php index ee89d74d0af3d..70629a221569a 100644 --- a/src/Symfony/Component/VarDumper/Tests/Server/ConnectionTest.php +++ b/src/Symfony/Component/VarDumper/Tests/Server/ConnectionTest.php @@ -22,9 +22,6 @@ class ConnectionTest extends TestCase { private const VAR_DUMPER_SERVER = 'tcp://127.0.0.1:9913'; - /** - * @group transient-on-macos - */ public function testDump() { $cloner = new VarCloner(); diff --git a/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php b/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php index 648c9174e21a5..7ebf055d75701 100644 --- a/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php +++ b/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php @@ -810,9 +810,6 @@ public function testTimeoutWithActiveConcurrentStream() } } - /** - * @group transient-on-macos - */ public function testTimeoutOnInitialize() { $p1 = TestHttpServer::start(8067); @@ -846,9 +843,6 @@ public function testTimeoutOnInitialize() } } - /** - * @group transient-on-macos - */ public function testTimeoutOnDestruct() { $p1 = TestHttpServer::start(8067); From 40f2f4d89b6d0c542369fe839b311de10919003f Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Wed, 29 Dec 2021 10:31:39 +0100 Subject: [PATCH 121/127] make login link handler tests time sensitive --- .../Component/Security/Http/LoginLink/LoginLinkHandler.php | 4 ++-- .../Security/Http/Tests/LoginLink/LoginLinkHandlerTest.php | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php b/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php index b49fd8b1ea31b..b55e8aa6becf9 100644 --- a/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php +++ b/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php @@ -46,9 +46,9 @@ public function __construct(UrlGeneratorInterface $urlGenerator, UserProviderInt public function createLoginLink(UserInterface $user, Request $request = null): LoginLinkDetails { - $expiresAt = new \DateTimeImmutable(sprintf('+%d seconds', $this->options['lifetime'])); + $expires = time() + $this->options['lifetime']; + $expiresAt = new \DateTimeImmutable('@'.$expires); - $expires = $expiresAt->format('U'); $parameters = [ // @deprecated since Symfony 5.3, change to $user->getUserIdentifier() in 6.0 'user' => method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername(), diff --git a/src/Symfony/Component/Security/Http/Tests/LoginLink/LoginLinkHandlerTest.php b/src/Symfony/Component/Security/Http/Tests/LoginLink/LoginLinkHandlerTest.php index 767f553bf4d55..c454f65164ba4 100644 --- a/src/Symfony/Component/Security/Http/Tests/LoginLink/LoginLinkHandlerTest.php +++ b/src/Symfony/Component/Security/Http/Tests/LoginLink/LoginLinkHandlerTest.php @@ -52,6 +52,7 @@ protected function setUp(): void } /** + * @group time-sensitive * @dataProvider provideCreateLoginLinkData */ public function testCreateLoginLink($user, array $extraProperties, Request $request = null) From c32d749a558b93d4b730c5e06824170e84d2559f Mon Sep 17 00:00:00 2001 From: Maxime Steinhausser Date: Wed, 29 Dec 2021 10:49:04 +0100 Subject: [PATCH 122/127] [DependencyInjection][HttpKernel] Fix enum typed bindings --- .../Compiler/ResolveBindingsPass.php | 5 ++++ .../Compiler/ResolveBindingsPassTest.php | 23 +++++++++++++++++++ .../Tests/Fixtures/NamedEnumArgumentDummy.php | 19 +++++++++++++++ ...RegisterControllerArgumentLocatorsPass.php | 8 +++---- 4 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/NamedEnumArgumentDummy.php diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php index 59c15cf2382c1..88355eb7f04c7 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php @@ -133,6 +133,11 @@ protected function processValue($value, $isRoot = false) continue; } + if (is_subclass_of($m[1], \UnitEnum::class)) { + $bindingNames[substr($key, \strlen($m[0]))] = $binding; + continue; + } + if (null !== $bindingValue && !$bindingValue instanceof Reference && !$bindingValue instanceof Definition && !$bindingValue instanceof TaggedIteratorArgument && !$bindingValue instanceof ServiceLocatorArgument) { throw new InvalidArgumentException(sprintf('Invalid value for binding key "%s" for service "%s": expected "%s", "%s", "%s", "%s" or null, "%s" given.', $key, $this->currentId, Reference::class, Definition::class, TaggedIteratorArgument::class, ServiceLocatorArgument::class, \gettype($bindingValue))); } diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php index 199961a10d6fb..5d4f5ef9bb5f4 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php @@ -24,7 +24,9 @@ use Symfony\Component\DependencyInjection\Exception\RuntimeException; use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass; +use Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum; use Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy; +use Symfony\Component\DependencyInjection\Tests\Fixtures\NamedEnumArgumentDummy; use Symfony\Component\DependencyInjection\Tests\Fixtures\ParentNotExists; use Symfony\Component\DependencyInjection\TypedReference; @@ -63,6 +65,27 @@ public function testProcess() $this->assertEquals([['setSensitiveClass', [new Reference('foo')]]], $definition->getMethodCalls()); } + /** + * @requires PHP 8.1 + */ + public function testProcessEnum() + { + $container = new ContainerBuilder(); + + $bindings = [ + FooUnitEnum::class.' $bar' => new BoundArgument(FooUnitEnum::BAR), + ]; + + $definition = $container->register(NamedEnumArgumentDummy::class, NamedEnumArgumentDummy::class); + $definition->setBindings($bindings); + + $pass = new ResolveBindingsPass(); + $pass->process($container); + + $expected = [FooUnitEnum::BAR]; + $this->assertEquals($expected, $definition->getArguments()); + } + public function testUnusedBinding() { $this->expectException(InvalidArgumentException::class); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/NamedEnumArgumentDummy.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/NamedEnumArgumentDummy.php new file mode 100644 index 0000000000000..c172c996a7fb7 --- /dev/null +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/NamedEnumArgumentDummy.php @@ -0,0 +1,19 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\DependencyInjection\Tests\Fixtures; + +class NamedEnumArgumentDummy +{ + public function __construct(FooUnitEnum $bar) + { + } +} diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php index daba47315164b..871e3807c6b3e 100644 --- a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php +++ b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php @@ -127,11 +127,6 @@ public function process(ContainerBuilder $container) $type = ltrim($target = (string) ProxyHelper::getTypeHint($r, $p), '\\'); $invalidBehavior = ContainerInterface::IGNORE_ON_INVALID_REFERENCE; - if (is_subclass_of($type, \UnitEnum::class)) { - // do not attempt to register enum typed arguments - continue; - } - if (isset($arguments[$r->name][$p->name])) { $target = $arguments[$r->name][$p->name]; if ('?' !== $target[0]) { @@ -156,6 +151,9 @@ public function process(ContainerBuilder $container) $args[$p->name] = $bindingValue; } + continue; + } elseif (is_subclass_of($type, \UnitEnum::class)) { + // do not attempt to register enum typed arguments if not already present in bindings continue; } elseif (!$type || !$autowire || '\\' !== $target[0]) { continue; From fab59916869c7ab33e6a2b71f299b403f4f431d8 Mon Sep 17 00:00:00 2001 From: Simon Watiau Date: Tue, 28 Dec 2021 15:31:02 +0100 Subject: [PATCH 123/127] [Lock] Release DoctrineDbalPostgreSqlStore connection lock on failure --- .../Store/DoctrineDbalPostgreSqlStore.php | 60 ++++++++++++------- .../Store/DoctrineDbalPostgreSqlStoreTest.php | 27 +++++++++ 2 files changed, 67 insertions(+), 20 deletions(-) diff --git a/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php b/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php index b8ac259ef5ae8..efff1948a88b1 100644 --- a/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php +++ b/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php @@ -62,18 +62,28 @@ public function save(Key $key) // prevent concurrency within the same connection $this->getInternalStore()->save($key); - $sql = 'SELECT pg_try_advisory_lock(:key)'; - $result = $this->conn->executeQuery($sql, [ - 'key' => $this->getHashedKey($key), - ]); + $lockAcquired = false; - // Check if lock is acquired - if (true === $result->fetchOne()) { - $key->markUnserializable(); - // release sharedLock in case of promotion - $this->unlockShared($key); + try { + $sql = 'SELECT pg_try_advisory_lock(:key)'; + $result = $this->conn->executeQuery($sql, [ + 'key' => $this->getHashedKey($key), + ]); - return; + // Check if lock is acquired + if (true === $result->fetchOne()) { + $key->markUnserializable(); + // release sharedLock in case of promotion + $this->unlockShared($key); + + $lockAcquired = true; + + return; + } + } finally { + if (!$lockAcquired) { + $this->getInternalStore()->delete($key); + } } throw new LockConflictedException(); @@ -84,18 +94,28 @@ public function saveRead(Key $key) // prevent concurrency within the same connection $this->getInternalStore()->saveRead($key); - $sql = 'SELECT pg_try_advisory_lock_shared(:key)'; - $result = $this->conn->executeQuery($sql, [ - 'key' => $this->getHashedKey($key), - ]); + $lockAcquired = false; + + try { + $sql = 'SELECT pg_try_advisory_lock_shared(:key)'; + $result = $this->conn->executeQuery($sql, [ + 'key' => $this->getHashedKey($key), + ]); - // Check if lock is acquired - if (true === $result->fetchOne()) { - $key->markUnserializable(); - // release lock in case of demotion - $this->unlock($key); + // Check if lock is acquired + if (true === $result->fetchOne()) { + $key->markUnserializable(); + // release lock in case of demotion + $this->unlock($key); - return; + $lockAcquired = true; + + return; + } + } finally { + if (!$lockAcquired) { + $this->getInternalStore()->delete($key); + } } throw new LockConflictedException(); diff --git a/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalPostgreSqlStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalPostgreSqlStoreTest.php index 9133280ddc133..30a5d0a1f503b 100644 --- a/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalPostgreSqlStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalPostgreSqlStoreTest.php @@ -13,6 +13,7 @@ use Doctrine\DBAL\DriverManager; use Symfony\Component\Lock\Exception\InvalidArgumentException; +use Symfony\Component\Lock\Exception\LockConflictedException; use Symfony\Component\Lock\Key; use Symfony\Component\Lock\PersistingStoreInterface; use Symfony\Component\Lock\Store\DoctrineDbalPostgreSqlStore; @@ -59,4 +60,30 @@ public function getInvalidDrivers() yield ['sqlite:///tmp/foo.db']; yield [DriverManager::getConnection(['url' => 'sqlite:///tmp/foo.db'])]; } + + public function testSaveAfterConflict() + { + $store1 = $this->getStore(); + $store2 = $this->getStore(); + + $key = new Key(uniqid(__METHOD__, true)); + + $store1->save($key); + $this->assertTrue($store1->exists($key)); + + $lockConflicted = false; + try { + $store2->save($key); + } catch (LockConflictedException $lockConflictedException) { + $lockConflicted = true; + } + + $this->assertTrue($lockConflicted); + $this->assertFalse($store2->exists($key)); + + $store1->delete($key); + + $store2->save($key); + $this->assertTrue($store2->exists($key)); + } } From 95720eed6f55b36d2679ac81eb2df4172ca3ce9e Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 29 Dec 2021 11:31:56 +0100 Subject: [PATCH 124/127] [Security] consider old session payloads as unauthenticated --- .../Security/Core/Authentication/Token/AbstractToken.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php index 2d6139c8f9761..5eff2eff12b9b 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php @@ -116,7 +116,7 @@ public function __serialize(): array public function __unserialize(array $data): void { [$user, , , $this->attributes, $this->roleNames] = $data; - $this->user = \is_string($user) ? new InMemoryUser($user, '', $this->roleNames) : $user; + $this->user = \is_string($user) ? new InMemoryUser($user, '', $this->roleNames, false) : $user; } /** From cbe61f2a126fa093de43bd28f32ab4b62f50f2c9 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 29 Dec 2021 14:00:11 +0100 Subject: [PATCH 125/127] [Cache] fix merge --- src/Symfony/Component/Cache/Adapter/ApcuAdapter.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php b/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php index 021d4af2d59e3..f5f04641fdf28 100644 --- a/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php @@ -60,14 +60,7 @@ protected function doFetch(array $ids): iterable $unserializeCallbackHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback'); try { $values = []; - $ids = array_flip($ids); - foreach (apcu_fetch(array_keys($ids), $ok) ?: [] as $k => $v) { - if (!isset($ids[$k])) { - // work around https://github.com/krakjoe/apcu/issues/247 - $k = key($ids); - } - unset($ids[$k]); - + foreach (apcu_fetch($ids, $ok) ?: [] as $k => $v) { if (null !== $v || $ok) { $values[$k] = null !== $this->marshaller ? $this->marshaller->unmarshall($v) : $v; } From 542819ff1763c9f75f0678e7a9ce63a9edaf9a51 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 29 Dec 2021 15:07:11 +0100 Subject: [PATCH 126/127] Update CHANGELOG for 6.0.2 --- CHANGELOG-6.0.md | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/CHANGELOG-6.0.md b/CHANGELOG-6.0.md index da7b96d9d2c06..964b98e9923c4 100644 --- a/CHANGELOG-6.0.md +++ b/CHANGELOG-6.0.md @@ -7,6 +7,72 @@ in 6.0 minor versions. To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v6.0.0...v6.0.1 +* 6.0.2 (2021-12-29) + + * bug #44828 [Lock] Release DoctrineDbalPostgreSqlStore connection lock on failure (simon-watiau) + * bug #44838 [DependencyInjection][HttpKernel] Fix enum typed bindings (ogizanagi) + * bug #44723 [Lock] Release PostgreSqlStore connection lock on failure (simon-watiau) * commit 'e5b2f9efba': [Lock] Release PostgreSqlStore connection lock on failure + * bug #44826 [HttpKernel] Do not attempt to register enum arguments in controller service locator (ogizanagi) + * bug #44822 [Mime][Security] Fix missing sprintf and add tests (alamirault) + * bug #44824 [Mime] Fix missing sprintf in DkimSigner (alamirault) + * bug #44816 [Translation] [LocoProvider] Use rawurlencode and separate tag setting (danut007ro) + * bug #44805 [Security] fix unserializing session payloads from v4 (nicolas-grekas) + * bug #44820 [Cache] Don't lock when doing nested computations (nicolas-grekas) + * bug #44807 [Messenger] fix Redis support on 32b arch (nicolas-grekas) + * bug #44759 [HttpFoundation] Fix notice when HTTP_PHP_AUTH_USER passed without pass (Vitali Tsyrkin) + * bug #44809 [WebProfilerBundle] relax return type for memory data collector (94noni) + * bug #44799 [Cache] fix compat with apcu < 5.1.10 (nicolas-grekas) + * bug #44764 [Form] Expand FormView key to include int (biozshock) + * bug #44730 [Console] Fix autocompletion of argument with default value (GromNaN) + * bug #44637 [PropertyInfo] PhpStan extractor nested object fix (rmikalkenas) + * bug #44085 [Translation] Fix TranslationPullCommand with ICU translations (Kocal) + * bug #44578 [PropertyInfo] Fix phpstan extractor issues (ostrolucky) + * bug #44771 [Notifier] Use correct factory for the msteams transport (veewee) + * bug #44618 [HttpKernel] Fix SessionListener without session in request (shyim) + * bug #44743 [HttpClient] fix checking for recent curl consts (nicolas-grekas) + * bug #44752 [Security/Http] Fix cookie clearing on logout (maxhelias) + * bug #44745 [EventDispatcher][HttpFoundation] Restore return type to covariant IteratorAggregate implementations (derrabus) + * bug #44732 [Mime] Relaxing in-reply-to header validation (ThomasLandauer) + * bug #44714 [WebProfilerBundle] fix Email HTML preview (94noni) + * bug #44737 Fix Psr16Cache not being compatible with non-Symfony cache pools (colinodell) + * bug #44728 [Mime] Fix encoding filenames in multipart/form-data (nicolas-grekas) + * bug #44602 [Serializer] Improve UidNormalizer denormalize error message (fancyweb) + * bug #44383 [Lock] Create tables in transaction only if supported by driver (martinssipenko) + * bug #44518 [HttpFoundation] Take php session.cookie settings into account (simonchrz) + * bug #44719 [ErrorHandler] fix on patching return types on Windows (nicolas-grekas) + * bug #44710 [DependencyInjection] fix linting callable classes (nicolas-grekas) + * bug #44639 [DependencyInjection] Cast tag attribute value to string (ruudk) + * bug #44473 [Validator] Restore default locale in ConstraintValidatorTestCase (rodnaph) + * bug #44682 [FrameworkBundle] alias `cache.app.taggable` to `cache.app` if using `cache.adapter.redis_tag_aware` (kbond) + * bug #44649 [HttpKernel] fix how configuring log-level and status-code by exception works (nicolas-grekas) + * bug #44667 [Cache] Revert "feature #41989 make `LockRegistry` use semaphores when possible" (nicolas-grekas) + * bug #44671 [HttpClient] Fix tracing requests made after calling withOptions() (nicolas-grekas) + * bug #44577 [Cache] Fix proxy no expiration to the Redis (Sergey Belyshkin) + * bug #44669 [Cache] disable lock on CLI (nicolas-grekas) + * bug #44598 [Translation] Handle the blank-translation in Loco Adapter (kgonella) + * bug #44448 [Validator] Allow Sequence constraint to be applied onto class as an attribute (sidz) + * bug #44354 [RateLimiter] Make RateLimiter resilient to timeShifting (jderusse) + * bug #44600 [Serializer] Fix denormalizing custom class in UidNormalizer (fancyweb) + * bug #44537 [Config] In XmlUtils, avoid converting from octal every string starting with a 0 (alexandre-daubois) + * bug #44510 [Workflow] Fix eventsToDispatch parameter setup for StateMachine (Olexandr Kalaidzhy) + * bug #44625 [HttpClient] fix monitoring responses issued before reset() (nicolas-grekas) + * bug #44623 [HttpClient] Fix dealing with "HTTP/1.1 000 " responses (nicolas-grekas) + * bug #44430 [PropertyInfo] Fix aliased namespace matching (Korbeil) + * bug #44601 [HttpClient] Fix closing curl-multi handle too early on destruct (nicolas-grekas) + * bug #44554 Make enable_authenticator_manager true as there is no other way in Symfony 6 (alexander-schranz) + * bug #44571 [HttpClient] Don't reset timeout counter when initializing requests (nicolas-grekas) + * bug #44479 [HttpClient] Double check if handle is complete (Nyholm) + * bug #44418 [DependencyInjection] Resolve ChildDefinition in AbstractRecursivePass (fancyweb) + * bug #44474 [Translation] [Bridge] [Lokalise] Fix push keys to lokalise. Closes #… (olegmifle) + * bug #43164 [FrameworkBundle] Fix cache pool configuration with one adapter and one provider (fancyweb) + * bug #44419 [PropertyAccess] Fix accessing public property on Object (kevcomparadise) + * bug #44565 [FrameworkBundle] Use correct cookie domain in loginUser() (wouterj) + * bug #44538 [Process] fixed uppercase ARGC and ARGV should also be skipped (rbaarsma) + * bug #44438 [HttpClient] Fix handling thrown \Exception in \Generator in MockResponse (fancyweb) + * bug #44469 [String] Fix requiring wcswitch table several times (fancyweb) + * bug #44428 [HttpClient] Fix response id property check in MockResponse (fancyweb) + * bug #44539 [Lock] Fix missing argument in PostgreSqlStore::putOffExpiration with DBAL connection (GromNaN) + * 6.0.1 (2021-12-09) * bug #44494 Remove FQCN type hints on properties (fabpot) From 873fe348bfffd3b5d2d27333da5f4716d9c0cee2 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 29 Dec 2021 15:07:16 +0100 Subject: [PATCH 127/127] Update VERSION for 6.0.2 --- src/Symfony/Component/HttpKernel/Kernel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index b8afba3336162..3bae81558ce0e 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -78,12 +78,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl */ private static array $freshCache = []; - public const VERSION = '6.0.2-DEV'; + public const VERSION = '6.0.2'; public const VERSION_ID = 60002; public const MAJOR_VERSION = 6; public const MINOR_VERSION = 0; public const RELEASE_VERSION = 2; - public const EXTRA_VERSION = 'DEV'; + public const EXTRA_VERSION = ''; public const END_OF_MAINTENANCE = '07/2022'; public const END_OF_LIFE = '07/2022';