Skip to content

Commit 757b8f7

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.1'
* 5.1: (33 commits) [Cache] $lifetime cannot be null [Serializer] minor cleanup fix merge Run PHP 8 as 7.4.99 Remove calls to deprecated ReflectionParameter::getClass(). [VarDumper] fix PHP 8 support Removed "services" prototype node from "custom_authenticator" Add php 8 to travis. [Cache] Accessing undefined constants raises an Error in php8 [Cache] allow DBAL v3 Skip Doctrine DBAL on php 8 until we have a compatible version. [DomCrawler] Catch expected ValueError. Made method signatures compatible with their corresponding traits. [ErrorHandler] Apply php8 fixes from Debug component. [DomCrawler] Catch expected ValueError. [Validator] Catch expected ValueError. [VarDumper] ReflectionFunction::isDisabled() is deprecated. [BrowserKit] Raw body with custom Content-Type header Revert #34986 Make ExpressionLanguageSyntax validator usable with annotation ...
2 parents 0af5c68 + 56faca9 commit 757b8f7

File tree

46 files changed

+310
-235
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+310
-235
lines changed

‎.travis.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ matrix:
2828
env: deps=high
2929
- php: 7.4
3030
env: deps=low
31+
- php: nightly
32+
services: [memcached]
3133
fast_finish: true
34+
allow_failures:
35+
- php: nightly
3236

3337
cache:
3438
directories:
@@ -135,7 +139,9 @@ before_install:
135139
echo session.gc_probability = 0 >> $INI
136140
echo opcache.enable_cli = 1 >> $INI
137141
echo apc.enable_cli = 1 >> $INI
138-
echo extension = memcached.so >> $INI
142+
if [[ $PHP != nightly ]]; then
143+
echo extension = memcached.so >> $INI
144+
fi
139145
done
140146
141147
- |
@@ -147,6 +153,9 @@ before_install:
147153
if ! php --ri sodium > /dev/null; then
148154
tfold ext.libsodium tpecl libsodium sodium.so $INI
149155
fi
156+
if [[ $PHP = nightly ]]; then
157+
tfold ext.memcached tpecl memcached-3.1.5 memcached.so $INI
158+
fi
150159
151160
tfold ext.apcu tpecl apcu-5.1.17 apcu.so $INI
152161
tfold ext.mongodb tpecl mongodb-1.6.0 mongodb.so $INI
@@ -222,6 +231,12 @@ install:
222231
export COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' -printf '%h\n' | sort)
223232
fi
224233
234+
- |
235+
# Set composer's platform to php 7.4 if we're on php 8.
236+
if [[ $PHP = nightly ]]; then
237+
composer config platform.php 7.4.99
238+
fi
239+
225240
- |
226241
# Install symfony/flex
227242
if [[ $deps = low ]]; then

‎src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,13 @@ class EntityTypeTest extends BaseTypeTest
6060

6161
protected static $supportedFeatureSetVersion = 404;
6262

63+
public static function setUpBeforeClass(): void
64+
{
65+
if (\PHP_VERSION_ID >= 80000) {
66+
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
67+
}
68+
}
69+
6370
protected function setUp(): void
6471
{
6572
$this->em = DoctrineTestHelper::createTestEntityManager();

‎src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@
2424

2525
class EntityUserProviderTest extends TestCase
2626
{
27+
public static function setUpBeforeClass(): void
28+
{
29+
if (\PHP_VERSION_ID >= 80000) {
30+
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
31+
}
32+
}
33+
2734
public function testRefreshUserGetsUserByPrimaryKey()
2835
{
2936
$em = DoctrineTestHelper::createTestEntityManager();

‎src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ class UniqueEntityValidatorTest extends ConstraintValidatorTestCase
5959

6060
protected $repositoryFactory;
6161

62+
public static function setUpBeforeClass(): void
63+
{
64+
if (\PHP_VERSION_ID >= 80000) {
65+
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
66+
}
67+
}
68+
6269
protected function setUp(): void
6370
{
6471
$this->repositoryFactory = new TestRepositoryFactory();

‎src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
$passthruOrFail("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
198198
}
199199

200-
if (preg_match('{\^(\d++\.\d++)[\d\.]*$}', $info['requires']['php'], $phpVersion) && version_compare($phpVersion[1], PHP_VERSION, '<')) {
200+
if (preg_match('{\^((\d++\.)\d++)[\d\.]*$}', $info['requires']['php'], $phpVersion) && version_compare($phpVersion[2].'99', PHP_VERSION, '<')) {
201201
$passthruOrFail("$COMPOSER config platform.php \"$phpVersion[1].99\"");
202202
} else {
203203
$passthruOrFail("$COMPOSER config --unset platform.php");

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/CustomAuthenticatorFactory.php

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function getPosition(): string
3535

3636
public function getKey(): string
3737
{
38-
return 'custom_authenticator';
38+
return 'custom_authenticators';
3939
}
4040

4141
/**
@@ -44,19 +44,27 @@ public function getKey(): string
4444
public function addConfiguration(NodeDefinition $builder)
4545
{
4646
$builder
47-
->fixXmlConfig('service')
48-
->children()
49-
->arrayNode('services')
50-
->info('An array of service ids for all of your "authenticators"')
51-
->requiresAtLeastOneElement()
52-
->prototype('scalar')->end()
53-
->end()
47+
->info('An array of service ids for all of your "authenticators"')
48+
->requiresAtLeastOneElement()
49+
->prototype('scalar')->end();
50+
51+
// get the parent array node builder ("firewalls") from inside the children builder
52+
$factoryRootNode = $builder->end()->end();
53+
$factoryRootNode
54+
->fixXmlConfig('custom_authenticator')
55+
->validate()
56+
->ifTrue(function ($v) { return isset($v['custom_authenticators']) && empty($v['custom_authenticators']); })
57+
->then(function ($v) {
58+
unset($v['custom_authenticators']);
59+
60+
return $v;
61+
})
5462
->end()
5563
;
5664
}
5765

5866
public function createAuthenticator(ContainerBuilder $container, string $firewallName, array $config, string $userProviderId): array
5967
{
60-
return $config['services'];
68+
return $config;
6169
}
6270
}

‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php

Lines changed: 64 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,15 @@
2424
use Symfony\Component\DependencyInjection\Reference;
2525
use Symfony\Component\ExpressionLanguage\Expression;
2626
use Symfony\Component\HttpFoundation\Request;
27+
use Symfony\Component\HttpFoundation\Response;
2728
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
2829
use Symfony\Component\Security\Core\Exception\AuthenticationException;
2930
use Symfony\Component\Security\Core\User\UserInterface;
3031
use Symfony\Component\Security\Core\User\UserProviderInterface;
31-
use Symfony\Component\Security\Guard\AuthenticatorInterface;
32+
use Symfony\Component\Security\Guard\AuthenticatorInterface as GuardAuthenticatorInterface;
33+
use Symfony\Component\Security\Http\Authenticator\AuthenticatorInterface;
34+
use Symfony\Component\Security\Http\Authenticator\HttpBasicAuthenticator;
35+
use Symfony\Component\Security\Http\Authenticator\Passport\PassportInterface;
3236

3337
class SecurityExtensionTest extends TestCase
3438
{
@@ -520,6 +524,41 @@ public function testAlwaysAuthenticateBeforeGrantingCannotBeTrueWithAuthenticati
520524
$container->compile();
521525
}
522526

527+
/**
528+
* @dataProvider provideConfigureCustomAuthenticatorData
529+
*/
530+
public function testConfigureCustomAuthenticator(array $firewall, array $expectedAuthenticators)
531+
{
532+
$container = $this->getRawContainer();
533+
$container->loadFromExtension('security', [
534+
'enable_authenticator_manager' => true,
535+
'providers' => [
536+
'first' => ['id' => 'users'],
537+
],
538+
539+
'firewalls' => [
540+
'main' => $firewall,
541+
],
542+
]);
543+
544+
$container->compile();
545+
546+
$this->assertEquals($expectedAuthenticators, array_map('strval', $container->getDefinition('security.authenticator.manager.main')->getArgument(0)));
547+
}
548+
549+
public function provideConfigureCustomAuthenticatorData()
550+
{
551+
yield [
552+
['custom_authenticator' => TestAuthenticator::class],
553+
[TestAuthenticator::class],
554+
];
555+
556+
yield [
557+
['custom_authenticators' => [TestAuthenticator::class, HttpBasicAuthenticator::class]],
558+
[TestAuthenticator::class, HttpBasicAuthenticator::class],
559+
];
560+
}
561+
523562
protected function getRawContainer()
524563
{
525564
$container = new ContainerBuilder();
@@ -547,7 +586,30 @@ protected function getContainer()
547586
}
548587
}
549588

550-
class NullAuthenticator implements AuthenticatorInterface
589+
class TestAuthenticator implements AuthenticatorInterface
590+
{
591+
public function supports(Request $request): ?bool
592+
{
593+
}
594+
595+
public function authenticate(Request $request): PassportInterface
596+
{
597+
}
598+
599+
public function createAuthenticatedToken(PassportInterface $passport, string $firewallName): TokenInterface
600+
{
601+
}
602+
603+
public function onAuthenticationSuccess(Request $request, TokenInterface $token, string $firewallName): ?Response
604+
{
605+
}
606+
607+
public function onAuthenticationFailure(Request $request, AuthenticationException $exception): ?Response
608+
{
609+
}
610+
}
611+
612+
class NullAuthenticator implements GuardAuthenticatorInterface
551613
{
552614
public function start(Request $request, AuthenticationException $authException = null)
553615
{

‎src/Symfony/Component/BrowserKit/HttpBrowser.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ public function __construct(HttpClientInterface $client = null, History $history
3939
parent::__construct([], $history, $cookieJar);
4040
}
4141

42-
protected function doRequest($request): Response
42+
protected function doRequest(Request $request): Response
4343
{
4444
$headers = $this->getHeaders($request);
45-
[$body, $extraHeaders] = $this->getBodyAndExtraHeaders($request);
45+
[$body, $extraHeaders] = $this->getBodyAndExtraHeaders($request, $headers);
4646

4747
$response = $this->client->request($request->getMethod(), $request->getUri(), [
4848
'headers' => array_merge($headers, $extraHeaders),
@@ -56,7 +56,7 @@ protected function doRequest($request): Response
5656
/**
5757
* @return array [$body, $headers]
5858
*/
59-
private function getBodyAndExtraHeaders(Request $request): array
59+
private function getBodyAndExtraHeaders(Request $request, array $headers): array
6060
{
6161
if (\in_array($request->getMethod(), ['GET', 'HEAD'])) {
6262
return ['', []];
@@ -67,6 +67,10 @@ private function getBodyAndExtraHeaders(Request $request): array
6767
}
6868

6969
if (null !== $content = $request->getContent()) {
70+
if (isset($headers['content-type'])) {
71+
return [$content, []];
72+
}
73+
7074
$part = new TextPart($content, 'utf-8', 'plain', '8bit');
7175

7276
return [$part->bodyToString(), $part->getPreparedHeaders()->toArray()];

‎src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ public function validContentTypes()
5959
['POST', 'http://example.com/', [], [], [], 'content'],
6060
['POST', 'http://example.com/', ['headers' => $defaultHeaders + ['Content-Type: text/plain; charset=utf-8', 'Content-Transfer-Encoding: 8bit'], 'body' => 'content', 'max_redirects' => 0]],
6161
];
62+
yield 'POST JSON' => [
63+
['POST', 'http://example.com/', [], [], ['CONTENT_TYPE' => 'application/json'], '["content"]'],
64+
['POST', 'http://example.com/', ['headers' => $defaultHeaders + ['content-type' => 'application/json'], 'body' => '["content"]', 'max_redirects' => 0]],
65+
];
6266
}
6367

6468
public function testMultiPartRequestWithSingleFile()

‎src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,14 @@ public function testOptions()
7171
*/
7272
public function testBadOptions($name, $value)
7373
{
74-
$this->expectException('ErrorException');
75-
$this->expectExceptionMessage('constant(): Couldn\'t find constant Memcached::');
74+
if (\PHP_VERSION_ID < 80000) {
75+
$this->expectException('ErrorException');
76+
$this->expectExceptionMessage('constant(): Couldn\'t find constant Memcached::');
77+
} else {
78+
$this->expectException('Error');
79+
$this->expectExceptionMessage('Undefined class constant \'Memcached::');
80+
}
81+
7682
MemcachedAdapter::createConnection([], [$name => $value]);
7783
}
7884

0 commit comments

Comments
 (0)