Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 44fa220

Browse filesBrowse files
committed
Merge branch '3.4' into 4.2
2 parents 26048bc + b5cd483 commit 44fa220
Copy full SHA for 44fa220

File tree

Expand file treeCollapse file tree

4 files changed

+3
-8
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+3
-8
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public function load(array $configs, ContainerBuilder $container)
210210

211211
if ($this->isConfigEnabled($container, $config['session'])) {
212212
if (!\extension_loaded('session')) {
213-
throw new \LogicException('PHP extension "session" is required.');
213+
throw new LogicException('Session support cannot be enabled as the session extension is not installed. See https://www.php.net/session.installation for instructions.');
214214
}
215215

216216
$this->sessionConfigEnabled = true;

‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/merge.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/merge.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
$this->load('merge_import.php', $container);
3+
$this->load('merge_import.php');
44

55
$container->loadFromExtension('security', [
66
'providers' => [

‎src/Symfony/Component/Security/Guard/AbstractGuardAuthenticator.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Guard/AbstractGuardAuthenticator.php
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ abstract class AbstractGuardAuthenticator implements AuthenticatorInterface
2525
* Shortcut to create a PostAuthenticationGuardToken for you, if you don't really
2626
* care about which authenticated token you're using.
2727
*
28-
* @param UserInterface $user
29-
* @param string $providerKey
28+
* @param string $providerKey
3029
*
3130
* @return PostAuthenticationGuardToken
3231
*/

‎src/Symfony/Component/Security/Guard/AuthenticatorInterface.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Guard/AuthenticatorInterface.php
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ interface AuthenticatorInterface extends AuthenticationEntryPointInterface
3737
*
3838
* If this returns false, the authenticator will be skipped.
3939
*
40-
* @param Request $request
41-
*
4240
* @return bool
4341
*/
4442
public function supports(Request $request);
@@ -60,8 +58,6 @@ public function supports(Request $request);
6058
*
6159
* return ['api_key' => $request->headers->get('X-API-TOKEN')];
6260
*
63-
* @param Request $request
64-
*
6561
* @return mixed Any non-null value
6662
*
6763
* @throws \UnexpectedValueException If null is returned

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.