From 99e742991b54e23f78b400dd403d2c94b3345d27 Mon Sep 17 00:00:00 2001 From: Roman Martinuk Date: Fri, 2 Apr 2021 16:17:10 +0300 Subject: [PATCH 1/4] remove references to "Silex" --- .../Session/Storage/MockFileSessionStorage.php | 5 ++--- src/Symfony/Component/HttpKernel/README.md | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php index 380f656b08..00e997b068 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php @@ -114,9 +114,8 @@ class MockFileSessionStorage extends MockArraySessionStorage $this->data = $data; } - // this is needed for Silex, where the session object is re-used across requests - // in functional tests. In Symfony, the container is rebooted, so we don't have - // this issue + // this is needed when the session object is re-used across multiple requests + // in functional tests. $this->started = false; } diff --git a/src/Symfony/Component/HttpKernel/README.md b/src/Symfony/Component/HttpKernel/README.md index abdaf513f9..0136784a72 100644 --- a/src/Symfony/Component/HttpKernel/README.md +++ b/src/Symfony/Component/HttpKernel/README.md @@ -3,8 +3,7 @@ HttpKernel Component The HttpKernel component provides a structured process for converting a Request into a Response by making use of the EventDispatcher component. It's flexible -enough to create a full-stack framework (Symfony), a micro-framework (Silex) or -an advanced CMS system (Drupal). +enough to create full-stack frameworks, micro-frameworks or advanced CMS systems like Drupal. Resources --------- From 76a88f2211890d4ddce27981f5139fc0950ce28a Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 3 Apr 2021 11:49:32 +0200 Subject: [PATCH 2/4] [Security] Mark ExpiredLoginLinkStorage as experimental --- .../Security/Http/LoginLink/ExpiredLoginLinkStorage.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Symfony/Component/Security/Http/LoginLink/ExpiredLoginLinkStorage.php b/src/Symfony/Component/Security/Http/LoginLink/ExpiredLoginLinkStorage.php index 8e3b4ba7db..1a7dbd68fb 100644 --- a/src/Symfony/Component/Security/Http/LoginLink/ExpiredLoginLinkStorage.php +++ b/src/Symfony/Component/Security/Http/LoginLink/ExpiredLoginLinkStorage.php @@ -14,6 +14,8 @@ namespace Symfony\Component\Security\Http\LoginLink; use Psr\Cache\CacheItemPoolInterface; /** + * @experimental in 5.2 + * * @final */ class ExpiredLoginLinkStorage From 6609a175f2a70c0cff8b76ab8c4e88f693ccc8a0 Mon Sep 17 00:00:00 2001 From: Enrico Date: Sat, 3 Apr 2021 19:46:18 +0200 Subject: [PATCH 3/4] allow CurlHttpClient on Windows --- src/Symfony/Component/HttpClient/HttpClient.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpClient/HttpClient.php b/src/Symfony/Component/HttpClient/HttpClient.php index 1291b38ec7..1828413294 100644 --- a/src/Symfony/Component/HttpClient/HttpClient.php +++ b/src/Symfony/Component/HttpClient/HttpClient.php @@ -30,7 +30,7 @@ final class HttpClient public static function create(array $defaultOptions = [], int $maxHostConnections = 6, int $maxPendingPushes = 50): HttpClientInterface { if (\extension_loaded('curl')) { - if ('\\' !== \DIRECTORY_SEPARATOR || ini_get('curl.cainfo') || ini_get('openssl.cafile') || ini_get('openssl.capath')) { + if ('\\' !== \DIRECTORY_SEPARATOR || isset($defaultOptions['cafile']) || isset($defaultOptions['capath']) || ini_get('curl.cainfo') || ini_get('openssl.cafile') || ini_get('openssl.capath')) { return new CurlHttpClient($defaultOptions, $maxHostConnections, $maxPendingPushes); } From b455de0cbfcde3d76d4513438130dde998872e6b Mon Sep 17 00:00:00 2001 From: iamvar Date: Sat, 3 Apr 2021 22:22:42 +0300 Subject: [PATCH 4/4] added missing gitattributes and gitignore --- src/Symfony/Component/Mailer/Bridge/Mailjet/.gitattributes | 4 ++++ src/Symfony/Component/Mailer/Bridge/Mailjet/.gitignore | 3 +++ src/Symfony/Component/Notifier/Bridge/Discord/.gitignore | 3 +++ src/Symfony/Component/Notifier/Bridge/Esendex/.gitattributes | 4 ++++ src/Symfony/Component/Notifier/Bridge/Esendex/.gitignore | 3 +++ src/Symfony/Component/Notifier/Bridge/Firebase/.gitignore | 3 +++ src/Symfony/Component/Notifier/Bridge/FreeMobile/.gitignore | 3 +++ src/Symfony/Component/Notifier/Bridge/GoogleChat/.gitignore | 3 +++ src/Symfony/Component/Notifier/Bridge/Infobip/.gitignore | 3 +++ src/Symfony/Component/Notifier/Bridge/LinkedIn/.gitattributes | 4 ++++ src/Symfony/Component/Notifier/Bridge/LinkedIn/.gitignore | 3 +++ src/Symfony/Component/Notifier/Bridge/Mattermost/.gitignore | 3 +++ src/Symfony/Component/Notifier/Bridge/Mobyt/.gitignore | 3 +++ src/Symfony/Component/Notifier/Bridge/Nexmo/.gitignore | 3 +++ src/Symfony/Component/Notifier/Bridge/OvhCloud/.gitignore | 3 +++ src/Symfony/Component/Notifier/Bridge/RocketChat/.gitignore | 3 +++ src/Symfony/Component/Notifier/Bridge/Sendinblue/.gitignore | 3 +++ src/Symfony/Component/Notifier/Bridge/Sinch/.gitignore | 3 +++ src/Symfony/Component/Notifier/Bridge/Slack/.gitignore | 3 +++ src/Symfony/Component/Notifier/Bridge/Smsapi/.gitignore | 3 +++ src/Symfony/Component/Notifier/Bridge/Telegram/.gitignore | 3 +++ src/Symfony/Component/Notifier/Bridge/Twilio/.gitignore | 3 +++ src/Symfony/Component/Notifier/Bridge/Zulip/.gitignore | 3 +++ 23 files changed, 72 insertions(+) create mode 100644 src/Symfony/Component/Mailer/Bridge/Mailjet/.gitattributes create mode 100644 src/Symfony/Component/Mailer/Bridge/Mailjet/.gitignore create mode 100644 src/Symfony/Component/Notifier/Bridge/Discord/.gitignore create mode 100644 src/Symfony/Component/Notifier/Bridge/Esendex/.gitattributes create mode 100644 src/Symfony/Component/Notifier/Bridge/Esendex/.gitignore create mode 100644 src/Symfony/Component/Notifier/Bridge/Firebase/.gitignore create mode 100644 src/Symfony/Component/Notifier/Bridge/FreeMobile/.gitignore create mode 100644 src/Symfony/Component/Notifier/Bridge/GoogleChat/.gitignore create mode 100644 src/Symfony/Component/Notifier/Bridge/Infobip/.gitignore create mode 100644 src/Symfony/Component/Notifier/Bridge/LinkedIn/.gitattributes create mode 100644 src/Symfony/Component/Notifier/Bridge/LinkedIn/.gitignore create mode 100644 src/Symfony/Component/Notifier/Bridge/Mattermost/.gitignore create mode 100644 src/Symfony/Component/Notifier/Bridge/Mobyt/.gitignore create mode 100644 src/Symfony/Component/Notifier/Bridge/Nexmo/.gitignore create mode 100644 src/Symfony/Component/Notifier/Bridge/OvhCloud/.gitignore create mode 100644 src/Symfony/Component/Notifier/Bridge/RocketChat/.gitignore create mode 100644 src/Symfony/Component/Notifier/Bridge/Sendinblue/.gitignore create mode 100644 src/Symfony/Component/Notifier/Bridge/Sinch/.gitignore create mode 100644 src/Symfony/Component/Notifier/Bridge/Slack/.gitignore create mode 100644 src/Symfony/Component/Notifier/Bridge/Smsapi/.gitignore create mode 100644 src/Symfony/Component/Notifier/Bridge/Telegram/.gitignore create mode 100644 src/Symfony/Component/Notifier/Bridge/Twilio/.gitignore create mode 100644 src/Symfony/Component/Notifier/Bridge/Zulip/.gitignore diff --git a/src/Symfony/Component/Mailer/Bridge/Mailjet/.gitattributes b/src/Symfony/Component/Mailer/Bridge/Mailjet/.gitattributes new file mode 100644 index 0000000000..84c7add058 --- /dev/null +++ b/src/Symfony/Component/Mailer/Bridge/Mailjet/.gitattributes @@ -0,0 +1,4 @@ +/Tests export-ignore +/phpunit.xml.dist export-ignore +/.gitattributes export-ignore +/.gitignore export-ignore diff --git a/src/Symfony/Component/Mailer/Bridge/Mailjet/.gitignore b/src/Symfony/Component/Mailer/Bridge/Mailjet/.gitignore new file mode 100644 index 0000000000..c49a5d8df5 --- /dev/null +++ b/src/Symfony/Component/Mailer/Bridge/Mailjet/.gitignore @@ -0,0 +1,3 @@ +vendor/ +composer.lock +phpunit.xml diff --git a/src/Symfony/Component/Notifier/Bridge/Discord/.gitignore b/src/Symfony/Component/Notifier/Bridge/Discord/.gitignore new file mode 100644 index 0000000000..c49a5d8df5 --- /dev/null +++ b/src/Symfony/Component/Notifier/Bridge/Discord/.gitignore @@ -0,0 +1,3 @@ +vendor/ +composer.lock +phpunit.xml diff --git a/src/Symfony/Component/Notifier/Bridge/Esendex/.gitattributes b/src/Symfony/Component/Notifier/Bridge/Esendex/.gitattributes new file mode 100644 index 0000000000..84c7add058 --- /dev/null +++ b/src/Symfony/Component/Notifier/Bridge/Esendex/.gitattributes @@ -0,0 +1,4 @@ +/Tests export-ignore +/phpunit.xml.dist export-ignore +/.gitattributes export-ignore +/.gitignore export-ignore diff --git a/src/Symfony/Component/Notifier/Bridge/Esendex/.gitignore b/src/Symfony/Component/Notifier/Bridge/Esendex/.gitignore new file mode 100644 index 0000000000..c49a5d8df5 --- /dev/null +++ b/src/Symfony/Component/Notifier/Bridge/Esendex/.gitignore @@ -0,0 +1,3 @@ +vendor/ +composer.lock +phpunit.xml diff --git a/src/Symfony/Component/Notifier/Bridge/Firebase/.gitignore b/src/Symfony/Component/Notifier/Bridge/Firebase/.gitignore new file mode 100644 index 0000000000..c49a5d8df5 --- /dev/null +++ b/src/Symfony/Component/Notifier/Bridge/Firebase/.gitignore @@ -0,0 +1,3 @@ +vendor/ +composer.lock +phpunit.xml diff --git a/src/Symfony/Component/Notifier/Bridge/FreeMobile/.gitignore b/src/Symfony/Component/Notifier/Bridge/FreeMobile/.gitignore new file mode 100644 index 0000000000..c49a5d8df5 --- /dev/null +++ b/src/Symfony/Component/Notifier/Bridge/FreeMobile/.gitignore @@ -0,0 +1,3 @@ +vendor/ +composer.lock +phpunit.xml diff --git a/src/Symfony/Component/Notifier/Bridge/GoogleChat/.gitignore b/src/Symfony/Component/Notifier/Bridge/GoogleChat/.gitignore new file mode 100644 index 0000000000..c49a5d8df5 --- /dev/null +++ b/src/Symfony/Component/Notifier/Bridge/GoogleChat/.gitignore @@ -0,0 +1,3 @@ +vendor/ +composer.lock +phpunit.xml diff --git a/src/Symfony/Component/Notifier/Bridge/Infobip/.gitignore b/src/Symfony/Component/Notifier/Bridge/Infobip/.gitignore new file mode 100644 index 0000000000..c49a5d8df5 --- /dev/null +++ b/src/Symfony/Component/Notifier/Bridge/Infobip/.gitignore @@ -0,0 +1,3 @@ +vendor/ +composer.lock +phpunit.xml diff --git a/src/Symfony/Component/Notifier/Bridge/LinkedIn/.gitattributes b/src/Symfony/Component/Notifier/Bridge/LinkedIn/.gitattributes new file mode 100644 index 0000000000..84c7add058 --- /dev/null +++ b/src/Symfony/Component/Notifier/Bridge/LinkedIn/.gitattributes @@ -0,0 +1,4 @@ +/Tests export-ignore +/phpunit.xml.dist export-ignore +/.gitattributes export-ignore +/.gitignore export-ignore diff --git a/src/Symfony/Component/Notifier/Bridge/LinkedIn/.gitignore b/src/Symfony/Component/Notifier/Bridge/LinkedIn/.gitignore new file mode 100644 index 0000000000..c49a5d8df5 --- /dev/null +++ b/src/Symfony/Component/Notifier/Bridge/LinkedIn/.gitignore @@ -0,0 +1,3 @@ +vendor/ +composer.lock +phpunit.xml diff --git a/src/Symfony/Component/Notifier/Bridge/Mattermost/.gitignore b/src/Symfony/Component/Notifier/Bridge/Mattermost/.gitignore new file mode 100644 index 0000000000..c49a5d8df5 --- /dev/null +++ b/src/Symfony/Component/Notifier/Bridge/Mattermost/.gitignore @@ -0,0 +1,3 @@ +vendor/ +composer.lock +phpunit.xml diff --git a/src/Symfony/Component/Notifier/Bridge/Mobyt/.gitignore b/src/Symfony/Component/Notifier/Bridge/Mobyt/.gitignore new file mode 100644 index 0000000000..c49a5d8df5 --- /dev/null +++ b/src/Symfony/Component/Notifier/Bridge/Mobyt/.gitignore @@ -0,0 +1,3 @@ +vendor/ +composer.lock +phpunit.xml diff --git a/src/Symfony/Component/Notifier/Bridge/Nexmo/.gitignore b/src/Symfony/Component/Notifier/Bridge/Nexmo/.gitignore new file mode 100644 index 0000000000..c49a5d8df5 --- /dev/null +++ b/src/Symfony/Component/Notifier/Bridge/Nexmo/.gitignore @@ -0,0 +1,3 @@ +vendor/ +composer.lock +phpunit.xml diff --git a/src/Symfony/Component/Notifier/Bridge/OvhCloud/.gitignore b/src/Symfony/Component/Notifier/Bridge/OvhCloud/.gitignore new file mode 100644 index 0000000000..c49a5d8df5 --- /dev/null +++ b/src/Symfony/Component/Notifier/Bridge/OvhCloud/.gitignore @@ -0,0 +1,3 @@ +vendor/ +composer.lock +phpunit.xml diff --git a/src/Symfony/Component/Notifier/Bridge/RocketChat/.gitignore b/src/Symfony/Component/Notifier/Bridge/RocketChat/.gitignore new file mode 100644 index 0000000000..c49a5d8df5 --- /dev/null +++ b/src/Symfony/Component/Notifier/Bridge/RocketChat/.gitignore @@ -0,0 +1,3 @@ +vendor/ +composer.lock +phpunit.xml diff --git a/src/Symfony/Component/Notifier/Bridge/Sendinblue/.gitignore b/src/Symfony/Component/Notifier/Bridge/Sendinblue/.gitignore new file mode 100644 index 0000000000..c49a5d8df5 --- /dev/null +++ b/src/Symfony/Component/Notifier/Bridge/Sendinblue/.gitignore @@ -0,0 +1,3 @@ +vendor/ +composer.lock +phpunit.xml diff --git a/src/Symfony/Component/Notifier/Bridge/Sinch/.gitignore b/src/Symfony/Component/Notifier/Bridge/Sinch/.gitignore new file mode 100644 index 0000000000..c49a5d8df5 --- /dev/null +++ b/src/Symfony/Component/Notifier/Bridge/Sinch/.gitignore @@ -0,0 +1,3 @@ +vendor/ +composer.lock +phpunit.xml diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/.gitignore b/src/Symfony/Component/Notifier/Bridge/Slack/.gitignore new file mode 100644 index 0000000000..c49a5d8df5 --- /dev/null +++ b/src/Symfony/Component/Notifier/Bridge/Slack/.gitignore @@ -0,0 +1,3 @@ +vendor/ +composer.lock +phpunit.xml diff --git a/src/Symfony/Component/Notifier/Bridge/Smsapi/.gitignore b/src/Symfony/Component/Notifier/Bridge/Smsapi/.gitignore new file mode 100644 index 0000000000..c49a5d8df5 --- /dev/null +++ b/src/Symfony/Component/Notifier/Bridge/Smsapi/.gitignore @@ -0,0 +1,3 @@ +vendor/ +composer.lock +phpunit.xml diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/.gitignore b/src/Symfony/Component/Notifier/Bridge/Telegram/.gitignore new file mode 100644 index 0000000000..c49a5d8df5 --- /dev/null +++ b/src/Symfony/Component/Notifier/Bridge/Telegram/.gitignore @@ -0,0 +1,3 @@ +vendor/ +composer.lock +phpunit.xml diff --git a/src/Symfony/Component/Notifier/Bridge/Twilio/.gitignore b/src/Symfony/Component/Notifier/Bridge/Twilio/.gitignore new file mode 100644 index 0000000000..c49a5d8df5 --- /dev/null +++ b/src/Symfony/Component/Notifier/Bridge/Twilio/.gitignore @@ -0,0 +1,3 @@ +vendor/ +composer.lock +phpunit.xml diff --git a/src/Symfony/Component/Notifier/Bridge/Zulip/.gitignore b/src/Symfony/Component/Notifier/Bridge/Zulip/.gitignore new file mode 100644 index 0000000000..c49a5d8df5 --- /dev/null +++ b/src/Symfony/Component/Notifier/Bridge/Zulip/.gitignore @@ -0,0 +1,3 @@ +vendor/ +composer.lock +phpunit.xml