Skip to content

Commit de4523a

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.0'
* 5.0: [travis] fix CI (ter) Revert "[travis][appveyor] don't cache .phpunit" silence E_NOTICE triggered since PHP 7.4 [Form] Removed legacy check in `ValidationListener` [HttpClient] fix HTTP/2 support on non-SSL connections - CurlHttpClient only Force ping after transport Exception do not merge constraints within interfaces [Validator] Fixed default group for nested composite constraints
2 parents d69b8bb + 7e739ee commit de4523a

File tree

18 files changed

+197
-37
lines changed

18 files changed

+197
-37
lines changed

‎.appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ clone_folder: c:\projects\symfony
44

55
cache:
66
- composer.phar
7+
- .phpunit -> phpunit
78

89
init:
910
- SET PATH=c:\php;%PATH%

‎.travis.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ matrix:
3636

3737
cache:
3838
directories:
39+
- .phpunit
3940
- php-$MIN_PHP
4041
- ~/php-ext
4142

@@ -304,8 +305,10 @@ install:
304305
if [[ !$deps && $PHP = 7.2 ]]; then
305306
phpenv global $PHP
306307
tfold 'composer update' $COMPOSER_UP
307-
tfold 'phpunit install' ./phpunit install
308-
tfold src/Symfony/Component/HttpClient.h2push "docker run -it --rm -v $(pwd):/app -v /usr/local/bin/vulcain:/usr/local/bin/vulcain -w /app php:7.3-alpine ./phpunit src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php --filter testHttp2Push"
308+
[ -d .phpunit ] && mv .phpunit .phpunit.bak
309+
tfold src/Symfony/Component/HttpClient.h2push "docker run -it --rm -v $(pwd):/app -v $(phpenv which composer):/usr/local/bin/composer -v /usr/local/bin/vulcain:/usr/local/bin/vulcain -w /app php:7.3-alpine ./phpunit src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php --filter testHttp2Push"
310+
sudo rm .phpunit -rf
311+
[ -d .phpunit.bak ] && mv .phpunit.bak .phpunit
309312
fi
310313
311314
if [[ $PHP != 7.4* && $PHP != $TRAVIS_PHP_VERSION && $TRAVIS_PULL_REQUEST != false ]]; then
@@ -314,12 +317,10 @@ install:
314317
fi
315318
316319
([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; cp composer.json composer.bak; composer config platform.ext-mongodb 1.6.0; composer require --dev --no-update mongodb/mongodb ~1.5.0)
317-
318320
if [[ $deps || $PHP != 7.2 ]]; then
319321
tfold 'composer update' $COMPOSER_UP
320-
tfold 'phpunit install' ./phpunit install
321322
fi
322-
323+
tfold 'phpunit install' ./phpunit install
323324
if [[ $deps = high ]]; then
324325
echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'" || X=1
325326
(cd src/Symfony/Component/HttpFoundation; mv composer.bak composer.json)

‎phpunit

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/usr/bin/env php
22
<?php
33

4+
// Cache-Id: 2020-04-10 20:30 UTC
5+
46
if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
57
echo "Unable to find the `simple-phpunit` script in `vendor/symfony/phpunit-bridge/bin/`.\nPlease run `composer update` before running this command.\n";
68
exit(1);

‎src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ public function validateForm(FormEvent $event)
5050
foreach ($this->validator->validate($form) as $violation) {
5151
// Allow the "invalid" constraint to be put onto
5252
// non-synchronized forms
53-
// ConstraintViolation::getConstraint() must not expect to provide a constraint as long as Symfony\Component\Validator\ExecutionContext exists (before 3.0)
54-
$allowNonSynchronized = (null === $violation->getConstraint() || $violation->getConstraint() instanceof Form) && Form::NOT_SYNCHRONIZED_ERROR === $violation->getCode();
53+
$allowNonSynchronized = $violation->getConstraint() instanceof Form && Form::NOT_SYNCHRONIZED_ERROR === $violation->getCode();
5554

5655
$this->violationMapper->mapViolation($violation, $form, $allowNonSynchronized);
5756
}

‎src/Symfony/Component/HttpClient/CurlHttpClient.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,12 @@ public function request(string $method, string $url, array $options = []): Respo
141141
CURLOPT_CERTINFO => $options['capture_peer_cert_chain'],
142142
];
143143

144-
if (1.0 === (float) $options['http_version']) {
144+
if (\defined('CURL_VERSION_HTTP2') && (CURL_VERSION_HTTP2 & self::$curlVersion['features']) && ('https:' === $scheme || 2.0 === (float) $options['http_version'])) {
145+
$curlopts[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_2_0;
146+
} elseif (1.0 === (float) $options['http_version']) {
145147
$curlopts[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_0;
146-
} elseif (1.1 === (float) $options['http_version'] || 'https:' !== $scheme) {
148+
} elseif (1.1 === (float) $options['http_version']) {
147149
$curlopts[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_1;
148-
} elseif (\defined('CURL_VERSION_HTTP2') && CURL_VERSION_HTTP2 & self::$curlVersion['features']) {
149-
$curlopts[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_2_0;
150150
}
151151

152152
if (isset($options['auth_ntlm'])) {

‎src/Symfony/Component/HttpKernel/Log/Logger.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public function log($level, $message, array $context = [])
7979
}
8080

8181
$formatter = $this->formatter;
82-
fwrite($this->handle, $formatter($level, $message, $context));
82+
@fwrite($this->handle, $formatter($level, $message, $context));
8383
}
8484

8585
private function format(string $level, string $message, array $context): string

‎src/Symfony/Component/Mailer/Tests/Transport/Smtp/SmtpTransportTest.php

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

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\Mailer\Envelope;
16+
use Symfony\Component\Mailer\Exception\TransportException;
1617
use Symfony\Component\Mailer\Transport\Smtp\SmtpTransport;
1718
use Symfony\Component\Mailer\Transport\Smtp\Stream\AbstractStream;
1819
use Symfony\Component\Mailer\Transport\Smtp\Stream\SocketStream;
@@ -43,6 +44,29 @@ public function testSendDoesNotPingBelowThreshold(): void
4344
$this->assertNotContains("NOOP\r\n", $stream->getCommands());
4445
}
4546

47+
public function testSendPingAfterTransportException(): void
48+
{
49+
$stream = new DummyStream();
50+
$envelope = new Envelope(new Address('[email protected]'), [new Address('[email protected]')]);
51+
52+
$transport = new SmtpTransport($stream);
53+
$transport->send(new RawMessage('Message 1'), $envelope);
54+
$stream->close();
55+
$catch = false;
56+
57+
try {
58+
$transport->send(new RawMessage('Message 2'), $envelope);
59+
} catch (TransportException $exception) {
60+
$catch = true;
61+
}
62+
$this->assertTrue($catch);
63+
$this->assertTrue($stream->isClosed());
64+
65+
$transport->send(new RawMessage('Message 3'), $envelope);
66+
67+
$this->assertFalse($stream->isClosed());
68+
}
69+
4670
public function testSendDoesPingAboveThreshold(): void
4771
{
4872
$stream = new DummyStream();
@@ -76,13 +100,23 @@ class DummyStream extends AbstractStream
76100
*/
77101
private $commands;
78102

103+
/**
104+
* @var bool
105+
*/
106+
private $closed = true;
107+
79108
public function initialize(): void
80109
{
110+
$this->closed = false;
81111
$this->nextResponse = '220 localhost';
82112
}
83113

84114
public function write(string $bytes, $debug = true): void
85115
{
116+
if ($this->closed) {
117+
throw new TransportException('Unable to write bytes on the wire.');
118+
}
119+
86120
$this->commands[] = $bytes;
87121

88122
if (0 === strpos($bytes, 'DATA')) {
@@ -120,4 +154,14 @@ protected function getReadConnectionDescription(): string
120154
{
121155
return 'null';
122156
}
157+
158+
public function close(): void
159+
{
160+
$this->closed = true;
161+
}
162+
163+
public function isClosed(): bool
164+
{
165+
return $this->closed;
166+
}
123167
}

‎src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,12 +206,11 @@ protected function doSend(SentMessage $message): void
206206
$this->stream->flush();
207207
$this->executeCommand("\r\n.\r\n", [250]);
208208
$message->appendDebug($this->stream->getDebug());
209+
$this->lastMessageTime = microtime(true);
209210
} catch (TransportExceptionInterface $e) {
210211
$e->appendDebug($this->stream->getDebug());
211-
212+
$this->lastMessageTime = 0;
212213
throw $e;
213-
} finally {
214-
$this->lastMessageTime = microtime(true);
215214
}
216215
}
217216

‎src/Symfony/Component/Validator/Constraints/Composite.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ public function __construct($options = null)
9090
}
9191
}
9292

93-
$this->groups = array_keys($mergedGroups);
93+
// prevent empty composite constraint to have empty groups
94+
$this->groups = array_keys($mergedGroups) ?: [self::DEFAULT_GROUP];
9495
$this->$compositeOption = $nestedConstraints;
9596

9697
return;

‎src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -113,34 +113,25 @@ public function getMetadataFor($value)
113113

114114
private function mergeConstraints(ClassMetadata $metadata)
115115
{
116+
if ($metadata->getReflectionClass()->isInterface()) {
117+
return;
118+
}
119+
116120
// Include constraints from the parent class
117121
if ($parent = $metadata->getReflectionClass()->getParentClass()) {
118122
$metadata->mergeConstraints($this->getMetadataFor($parent->name));
119123
}
120124

121-
$interfaces = $metadata->getReflectionClass()->getInterfaces();
122-
123-
$interfaces = array_filter($interfaces, function (\ReflectionClass $interface) use ($parent, $interfaces) {
124-
$interfaceName = $interface->getName();
125-
126-
if ($parent && $parent->implementsInterface($interfaceName)) {
127-
return false;
128-
}
129-
130-
foreach ($interfaces as $i) {
131-
if ($i !== $interface && $i->implementsInterface($interfaceName)) {
132-
return false;
133-
}
134-
}
135-
136-
return true;
137-
});
138-
139125
// Include constraints from all directly implemented interfaces
140-
foreach ($interfaces as $interface) {
126+
foreach ($metadata->getReflectionClass()->getInterfaces() as $interface) {
141127
if ('Symfony\Component\Validator\GroupSequenceProviderInterface' === $interface->name) {
142128
continue;
143129
}
130+
131+
if ($parent && \in_array($interface->getName(), $parent->getInterfaceNames(), true)) {
132+
continue;
133+
}
134+
144135
$metadata->mergeConstraints($this->getMetadataFor($interface->name));
145136
}
146137
}

0 commit comments

Comments
 (0)