From f6581f7b78b0c585b9c886239e7d4e6ee8dd465b Mon Sep 17 00:00:00 2001 From: Thomas Calvet Date: Fri, 28 Jul 2023 16:44:35 +0200 Subject: [PATCH 1/8] Fix symfony/deprecation-contracts require --- src/Symfony/Bundle/TwigBundle/composer.json | 1 + src/Symfony/Component/Ldap/composer.json | 1 + src/Symfony/Component/PasswordHasher/composer.json | 1 + src/Symfony/Component/Security/Csrf/composer.json | 1 + src/Symfony/Component/Security/Guard/composer.json | 1 + src/Symfony/Component/Workflow/composer.json | 1 + 6 files changed, 6 insertions(+) diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json index a92b08930a111..bad5b2c877f9c 100644 --- a/src/Symfony/Bundle/TwigBundle/composer.json +++ b/src/Symfony/Bundle/TwigBundle/composer.json @@ -18,6 +18,7 @@ "require": { "php": ">=7.2.5", "symfony/config": "^4.4|^5.0|^6.0", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/twig-bridge": "^5.3|^6.0", "symfony/http-foundation": "^4.4|^5.0|^6.0", "symfony/http-kernel": "^5.0|^6.0", diff --git a/src/Symfony/Component/Ldap/composer.json b/src/Symfony/Component/Ldap/composer.json index 4a884d74ef528..79689ace49714 100644 --- a/src/Symfony/Component/Ldap/composer.json +++ b/src/Symfony/Component/Ldap/composer.json @@ -17,6 +17,7 @@ ], "require": { "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/options-resolver": "^4.4|^5.0|^6.0", "symfony/polyfill-php80": "^1.15", "ext-ldap": "*" diff --git a/src/Symfony/Component/PasswordHasher/composer.json b/src/Symfony/Component/PasswordHasher/composer.json index ccea8122a21c0..0594dd9b522c0 100644 --- a/src/Symfony/Component/PasswordHasher/composer.json +++ b/src/Symfony/Component/PasswordHasher/composer.json @@ -17,6 +17,7 @@ ], "require": { "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/polyfill-php80": "^1.15" }, "require-dev": { diff --git a/src/Symfony/Component/Security/Csrf/composer.json b/src/Symfony/Component/Security/Csrf/composer.json index ce55876a3564e..0ba322da416e3 100644 --- a/src/Symfony/Component/Security/Csrf/composer.json +++ b/src/Symfony/Component/Security/Csrf/composer.json @@ -17,6 +17,7 @@ ], "require": { "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/polyfill-php80": "^1.16", "symfony/security-core": "^4.4|^5.0|^6.0" }, diff --git a/src/Symfony/Component/Security/Guard/composer.json b/src/Symfony/Component/Security/Guard/composer.json index 4852ce9e0e34d..05cd60319bac1 100644 --- a/src/Symfony/Component/Security/Guard/composer.json +++ b/src/Symfony/Component/Security/Guard/composer.json @@ -17,6 +17,7 @@ ], "require": { "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/security-core": "^5.0", "symfony/security-http": "^5.3", "symfony/polyfill-php80": "^1.15" diff --git a/src/Symfony/Component/Workflow/composer.json b/src/Symfony/Component/Workflow/composer.json index 412c4e64f692e..32e07afee8607 100644 --- a/src/Symfony/Component/Workflow/composer.json +++ b/src/Symfony/Component/Workflow/composer.json @@ -21,6 +21,7 @@ ], "require": { "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/polyfill-php80": "^1.15" }, "require-dev": { From 266f2f57e791f0c2605b720f4d9c7a90317a742f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 29 Jul 2023 19:11:56 +0200 Subject: [PATCH 2/8] Bump Symfony version to 5.4.27 --- src/Symfony/Component/HttpKernel/Kernel.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 44d8f4b99e128..dedab809780a1 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 $freshCache = []; - public const VERSION = '5.4.26'; - public const VERSION_ID = 50426; + public const VERSION = '5.4.27-DEV'; + public const VERSION_ID = 50427; public const MAJOR_VERSION = 5; public const MINOR_VERSION = 4; - public const RELEASE_VERSION = 26; - public const EXTRA_VERSION = ''; + public const RELEASE_VERSION = 27; + public const EXTRA_VERSION = 'DEV'; public const END_OF_MAINTENANCE = '11/2024'; public const END_OF_LIFE = '11/2025'; From 640d65d781bbd4721bb217eb9cb74524178d9735 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 30 Jul 2023 11:13:09 +0200 Subject: [PATCH 3/8] Remove 6.2 from the list of potential branch targets --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f7b87a1ce8cd4..0dfc06eb7c16b 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,6 @@ | Q | A | ------------- | --- -| Branch? | 6.4 for features / 5.4, 6.2, or 6.3 for bug fixes +| Branch? | 6.4 for features / 5.4, or 6.3 for bug fixes | Bug fix? | yes/no | New feature? | yes/no | Deprecations? | yes/no From 9ffbb53a63f8130fe130494571f4523679dfd77a Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Mon, 31 Jul 2023 09:06:52 +0200 Subject: [PATCH 4/8] CI: Disable Psalm's findUnusedBaselineEntry feature --- psalm.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/psalm.xml b/psalm.xml index 3fb94145699cf..c74733de4e714 100644 --- a/psalm.xml +++ b/psalm.xml @@ -7,6 +7,7 @@ xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd" cacheDirectory="./.github/psalm/cache/" errorBaseline=".github/psalm/psalm.baseline.xml" + findUnusedBaselineEntry="false" > From 2fd44538e8ec7ce7cce02e72627ffcc65bf4c0c5 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Mon, 31 Jul 2023 10:02:31 +0200 Subject: [PATCH 5/8] Revert "minor #50885 [Finder] Fix children condition in ExcludeDirectoryFilterIterator (mvorisek)" This reverts commit 9c1dedbc1ce884618e806112c1d9ef8324d77dc9, reversing changes made to 9cbdfc64e0c4edd520511e1c16c5de2ef151aefa. --- .../Finder/Iterator/ExcludeDirectoryFilterIterator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php b/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php index def0ed28a2809..39797c82cab28 100644 --- a/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php +++ b/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php @@ -59,7 +59,7 @@ public function __construct(\Iterator $iterator, array $directories) #[\ReturnTypeWillChange] public function accept() { - if (isset($this->excludedDirs[$this->getFilename()]) && $this->hasChildren()) { + if ($this->isRecursive && isset($this->excludedDirs[$this->getFilename()]) && $this->isDir()) { return false; } From 4f5a550eeffe871035340abfc53f81f5df1ccc21 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 31 Jul 2023 12:18:17 +0200 Subject: [PATCH 6/8] Update CHANGELOG for 5.4.27 --- CHANGELOG-5.4.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG-5.4.md b/CHANGELOG-5.4.md index 74a11a2fd933e..128c3402928c3 100644 --- a/CHANGELOG-5.4.md +++ b/CHANGELOG-5.4.md @@ -7,6 +7,10 @@ in 5.4 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/v5.4.0...v5.4.1 +* 5.4.27 (2023-07-31) + + * bug #51178 [Finder] Revert "Fix children condition in ExcludeDirectoryFilterIterator" (derrabus) + * 5.4.26 (2023-07-29) * bug #50933 [Serializer] Fix deserializing nested arrays of objects with mixed keys (HypeMC) From df69d243eb81dd72d6ad902cfc8fc3f4de69d3a4 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 31 Jul 2023 12:18:37 +0200 Subject: [PATCH 7/8] Update CONTRIBUTORS for 5.4.27 --- CONTRIBUTORS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 19baafa1bdafb..4b2f33954ad21 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -163,6 +163,7 @@ The Symfony Connect username in parenthesis allows to get more information - marc.weistroff - lenar - Jesse Rushlow (geeshoe) + - Jacob Dreesen (jdreesen) - Théo FIDRY - Jeroen Spee (jeroens) - Michael Babker (mbabker) @@ -170,7 +171,6 @@ The Symfony Connect username in parenthesis allows to get more information - Hugo Alliaume (kocal) - Christian Scheb - Guillaume (guill) - - Jacob Dreesen (jdreesen) - Olivier Dolbeau (odolbeau) - Florian Voutzinos (florianv) - zairig imad (zairigimad) From a6f8539a028751c6f843479c9c7d4f66e11d7c46 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 31 Jul 2023 12:18:38 +0200 Subject: [PATCH 8/8] Update VERSION for 5.4.27 --- 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 dedab809780a1..5decdd57ada05 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 $freshCache = []; - public const VERSION = '5.4.27-DEV'; + public const VERSION = '5.4.27'; public const VERSION_ID = 50427; public const MAJOR_VERSION = 5; public const MINOR_VERSION = 4; public const RELEASE_VERSION = 27; - public const EXTRA_VERSION = 'DEV'; + public const EXTRA_VERSION = ''; public const END_OF_MAINTENANCE = '11/2024'; public const END_OF_LIFE = '11/2025'; pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy