Merge branch '5.2' into 5.x
* 5.2: added missing gitattributes and gitignore allow CurlHttpClient on Windows [Security] Mark ExpiredLoginLinkStorage as experimental remove references to "Silex"
This commit is contained in:
commit
51c0c5a1bf
@ -50,7 +50,7 @@ final class HttpClient
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
|
@ -113,9 +113,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;
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
---------
|
||||
|
4
src/Symfony/Component/Mailer/Bridge/Mailjet/.gitattributes
vendored
Normal file
4
src/Symfony/Component/Mailer/Bridge/Mailjet/.gitattributes
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
/Tests export-ignore
|
||||
/phpunit.xml.dist export-ignore
|
||||
/.gitattributes export-ignore
|
||||
/.gitignore export-ignore
|
3
src/Symfony/Component/Mailer/Bridge/Mailjet/.gitignore
vendored
Normal file
3
src/Symfony/Component/Mailer/Bridge/Mailjet/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
vendor/
|
||||
composer.lock
|
||||
phpunit.xml
|
3
src/Symfony/Component/Notifier/Bridge/Discord/.gitignore
vendored
Normal file
3
src/Symfony/Component/Notifier/Bridge/Discord/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
vendor/
|
||||
composer.lock
|
||||
phpunit.xml
|
4
src/Symfony/Component/Notifier/Bridge/Esendex/.gitattributes
vendored
Normal file
4
src/Symfony/Component/Notifier/Bridge/Esendex/.gitattributes
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
/Tests export-ignore
|
||||
/phpunit.xml.dist export-ignore
|
||||
/.gitattributes export-ignore
|
||||
/.gitignore export-ignore
|
3
src/Symfony/Component/Notifier/Bridge/Esendex/.gitignore
vendored
Normal file
3
src/Symfony/Component/Notifier/Bridge/Esendex/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
vendor/
|
||||
composer.lock
|
||||
phpunit.xml
|
3
src/Symfony/Component/Notifier/Bridge/Firebase/.gitignore
vendored
Normal file
3
src/Symfony/Component/Notifier/Bridge/Firebase/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
vendor/
|
||||
composer.lock
|
||||
phpunit.xml
|
3
src/Symfony/Component/Notifier/Bridge/FreeMobile/.gitignore
vendored
Normal file
3
src/Symfony/Component/Notifier/Bridge/FreeMobile/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
vendor/
|
||||
composer.lock
|
||||
phpunit.xml
|
3
src/Symfony/Component/Notifier/Bridge/GoogleChat/.gitignore
vendored
Normal file
3
src/Symfony/Component/Notifier/Bridge/GoogleChat/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
vendor/
|
||||
composer.lock
|
||||
phpunit.xml
|
3
src/Symfony/Component/Notifier/Bridge/Infobip/.gitignore
vendored
Normal file
3
src/Symfony/Component/Notifier/Bridge/Infobip/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
vendor/
|
||||
composer.lock
|
||||
phpunit.xml
|
4
src/Symfony/Component/Notifier/Bridge/LinkedIn/.gitattributes
vendored
Normal file
4
src/Symfony/Component/Notifier/Bridge/LinkedIn/.gitattributes
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
/Tests export-ignore
|
||||
/phpunit.xml.dist export-ignore
|
||||
/.gitattributes export-ignore
|
||||
/.gitignore export-ignore
|
3
src/Symfony/Component/Notifier/Bridge/LinkedIn/.gitignore
vendored
Normal file
3
src/Symfony/Component/Notifier/Bridge/LinkedIn/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
vendor/
|
||||
composer.lock
|
||||
phpunit.xml
|
3
src/Symfony/Component/Notifier/Bridge/Mattermost/.gitignore
vendored
Normal file
3
src/Symfony/Component/Notifier/Bridge/Mattermost/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
vendor/
|
||||
composer.lock
|
||||
phpunit.xml
|
3
src/Symfony/Component/Notifier/Bridge/Mobyt/.gitignore
vendored
Normal file
3
src/Symfony/Component/Notifier/Bridge/Mobyt/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
vendor/
|
||||
composer.lock
|
||||
phpunit.xml
|
3
src/Symfony/Component/Notifier/Bridge/Nexmo/.gitignore
vendored
Normal file
3
src/Symfony/Component/Notifier/Bridge/Nexmo/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
vendor/
|
||||
composer.lock
|
||||
phpunit.xml
|
3
src/Symfony/Component/Notifier/Bridge/OvhCloud/.gitignore
vendored
Normal file
3
src/Symfony/Component/Notifier/Bridge/OvhCloud/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
vendor/
|
||||
composer.lock
|
||||
phpunit.xml
|
3
src/Symfony/Component/Notifier/Bridge/RocketChat/.gitignore
vendored
Normal file
3
src/Symfony/Component/Notifier/Bridge/RocketChat/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
vendor/
|
||||
composer.lock
|
||||
phpunit.xml
|
3
src/Symfony/Component/Notifier/Bridge/Sendinblue/.gitignore
vendored
Normal file
3
src/Symfony/Component/Notifier/Bridge/Sendinblue/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
vendor/
|
||||
composer.lock
|
||||
phpunit.xml
|
3
src/Symfony/Component/Notifier/Bridge/Sinch/.gitignore
vendored
Normal file
3
src/Symfony/Component/Notifier/Bridge/Sinch/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
vendor/
|
||||
composer.lock
|
||||
phpunit.xml
|
3
src/Symfony/Component/Notifier/Bridge/Slack/.gitignore
vendored
Normal file
3
src/Symfony/Component/Notifier/Bridge/Slack/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
vendor/
|
||||
composer.lock
|
||||
phpunit.xml
|
3
src/Symfony/Component/Notifier/Bridge/Smsapi/.gitignore
vendored
Normal file
3
src/Symfony/Component/Notifier/Bridge/Smsapi/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
vendor/
|
||||
composer.lock
|
||||
phpunit.xml
|
3
src/Symfony/Component/Notifier/Bridge/Telegram/.gitignore
vendored
Normal file
3
src/Symfony/Component/Notifier/Bridge/Telegram/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
vendor/
|
||||
composer.lock
|
||||
phpunit.xml
|
3
src/Symfony/Component/Notifier/Bridge/Twilio/.gitignore
vendored
Normal file
3
src/Symfony/Component/Notifier/Bridge/Twilio/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
vendor/
|
||||
composer.lock
|
||||
phpunit.xml
|
3
src/Symfony/Component/Notifier/Bridge/Zulip/.gitignore
vendored
Normal file
3
src/Symfony/Component/Notifier/Bridge/Zulip/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
vendor/
|
||||
composer.lock
|
||||
phpunit.xml
|
@ -14,6 +14,8 @@ namespace Symfony\Component\Security\Http\LoginLink;
|
||||
use Psr\Cache\CacheItemPoolInterface;
|
||||
|
||||
/**
|
||||
* @experimental in 5.2
|
||||
*
|
||||
* @final
|
||||
*/
|
||||
class ExpiredLoginLinkStorage
|
||||
|
Reference in New Issue
Block a user