8000 Merge branch '4.2' into 4.3 · symfony/symfony@2bc88ee · GitHub
[go: up one dir, main page]

Skip to content

Commit 2bc88ee

Browse files
committed
Merge branch '4.2' into 4.3
2 parents 5203393 + 44fa220 commit 2bc88ee

File tree

5 files changed

+3
-17
lines changed

5 files changed

+3
-17
lines changed

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
100100
use Symfony\Component\Serializer\Encoder\EncoderInterface;
101101
use Symfony\Component\Serializer\Mapping\ClassDiscriminatorFromClassMetadata;
102102
use Symfony\Component\Serializer\Normalizer\ConstraintViolationListNormalizer;
103-
use Symfony\Component\Serializer\Normalizer\DateIntervalNormalizer;
104103
use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
105104
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
106105
use Symfony\Component\Stopwatch\Stopwatch;
@@ -226,7 +225,7 @@ public function load(array $configs, ContainerBuilder $container)
226225

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

232231
$this->sessionConfigEnabled = true;
@@ -1433,10 +1432,6 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
14331432
{
14341433
$loader->load('serializer.xml');
14351434

1436-
if (!class_exists(DateIntervalNormalizer::class)) {
1437-
$container->removeDefinition('serializer.normalizer.dateinterval');
1438-
}
1439-
14401435
if (!class_exists(ConstraintViolationListNormalizer::class)) {
14411436
$container->removeDefinition('serializer.normalizer.constraint_violation_list');
14421437
}

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,10 +1194,6 @@ public function testDataUriNormalizerRegistered()
11941194

11951195
public function testDateIntervalNormalizerRegistered()
11961196
{
1197-
if (!class_exists(DateIntervalNormalizer::class)) {
1198-
$this->markTestSkipped('The DateIntervalNormalizer has been introduced in the Serializer Component version 3.4.');
1199-
}
1200-
12011197
$container = $this->createContainerFromFile('full');
12021198

12031199
$definition = $container->getDefinition('serializer.normalizer.dateinterval');

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

Lines 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

Lines 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

Lines 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