8000 Merge branch '5.4' into 6.0 · symfony/symfony@6cac6ba · GitHub < 8000 link rel="manifest" href="/manifest.json" crossOrigin="use-credentials">
[go: up one dir, main page]
Skip to content

Commit 6cac6ba

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.4' into 6.0
* 5.4: (21 commits) Add missing license header [Workflow] Catch error when trying to get an uninitialized marking Add missing license header Allow usage of Provider domains if possible Use reference date in reverse transform Fixes #40997 Fix env resolution in lock configuration Fix Symfony not working on SMB share #45990 [Messenger] DoctrineTransportFactory works with notify and decorated PostgreSQL driver [Cache] make LockRegistry use static properties instead of static variables fix: return-path has higher priority for envelope address than from address (fixes #41322) [HttpClient] Fix sending content-length when streaming the body [Console] Header with column max width is now well wrap with separator Fix use_cookies framework session configuration [FrameworkBundle] [Command] Fix `debug:router --no-interaction` error … [Intl] Update the ICU data to 71.1 - 5.4 [Intl] Update the ICU data to 71.1 - 4.4 Add tests to messenger connection get for OraclePlatform [RateLimiter] Adding default empty value [DependencyInjection] Add TaggedIteratorArgument unit tests [Process] Fix Process::getEnv() when setEnv() hasn't been called before ...
2 parents 7e13694 + 067154c commit 6cac6ba

File tree

443 files changed

+6424
-2142
lines changed

Some content is hidden

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

443 files changed

+6424
-2142
lines changed

‎.php-cs-fixer.dist.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,27 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.< 10000 /span>
10+
*/
11+
312
if (!file_exists(__DIR__.'/src')) {
413
exit(0);
514
}
615

16+
$fileHeaderComment = <<<'EOF'
17+
This file is part of the Symfony package.
18+
19+
(c) Fabien Potencier <fabien@symfony.com>
20+
21+
For the full copyright and license information, please view the LICENSE
22+
file that was distributed with this source code.
23+
EOF;
24+
725
return (new PhpCsFixer\Config())
826
->setRules([
927
'@PHP71Migration' => true,
@@ -13,6 +31,7 @@
1331
'protected_to_private' => false,
1432
'native_constant_invocation' => ['strict' => false],
1533
'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => false],
34+
'header_comment' => ['header' => $fileHeaderComment],
1635
])
1736
->setRiskyAllowed(true)
1837
->setFinder(

‎src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTestTrait.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Bridge\Doctrine\Tests\DataCollector;
413

514
use Symfony\Component\HttpFoundation\Request;

‎src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterMappingsPassTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Bridge\Doctrine\Tests\DependencyInjection\CompilerPass;
413

514
use PHPUnit\Framework\TestCase;

‎src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterUidTypePassTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Bridge\Doctrine\Tests\DependencyInjection\CompilerPass;
413

514
use PHPUnit\Framework\TestCase;

‎src/Symfony/Bridge/Doctrine/Tests/Middleware/Debug/MiddlewareTest.php

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Bridge\Doctrine\Tests\Middleware\Debug;
413

514
use Doctrine\DBAL\Configuration;
@@ -62,12 +71,12 @@ public function provideExecuteMethod(): array
6271
{
6372
return [
6473
'executeStatement' => [
65-
static function(object $target, ...$args) {
74+
static function (object $target, ...$args) {
6675
return $target->executeStatement(...$args);
6776
},
6877
],
6978
'executeQuery' => [
70-
static function(object $target, ...$args): Result {
79+
static function (object $target, ...$args): Result {
7180
return $target->executeQuery(...$args);
7281
},
7382
],
@@ -148,13 +157,13 @@ public function provideEndTransactionMethod(): array
148157
{
149158
return [
150159
'commit' => [
151-
static function(Connection $conn): bool {
160+
static function (Connection $conn): bool {
152161
return $conn->commit();
153162
},
154163
'"COMMIT"',
155164
],
156165
'rollback' => [
157-
static function(Connection $conn): bool {
166+
static function (Connection $conn): bool {
158167
return $conn->rollBack();
159168
},
160169
'"ROLLBACK"',
@@ -198,18 +207,18 @@ public function provideExecuteAndEndTransactionMethods(): array
198207
{
199208
return [
200209
'commit and exec' => [
201-
static function(Connection $conn, string $sql) {
210+
static function (Connection $conn, string $sql) {
202211
return $conn->executeStatement($sql);
203212
},
204-
static function(Connection $conn): bool {
213+
static function (Connection $conn): bool {
205214
return $conn->commit();
206215
},
207216
],
208217
'rollback and query' => [
209-
static function(Connection $conn, string $sql): Result {
218+
static function (Connection $conn, string $sql): Result {
210219
return $conn->executeQuery($sql);
211220
},
212-
static function(Connection $conn): bool {
221+
static function (Connection $conn): bool {
213222
return $conn->rollBack();
214223
},
215224
],

‎src/Symfony/Bridge/Doctrine/Tests/Security/RememberMe/DoctrineTokenProviderTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Security\RememberMe;
413

514
use Doctrine\DBAL\DriverManager;

‎src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
< F438 div class="diff-text-inner color-fg-muted">@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Bridge\PhpUnit\Tests;
413

514
use PHPUnit\Framework\TestCase;

‎src/Symfony/Bridge/PhpUnit/Tests/ProcessIsolationTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Bridge\PhpUnit\Tests;
413

514
use PHPUnit\Framework\TestCase;

‎src/Symfony/Bridge/Twig/Tests/AppVariableTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Bridge\Twig\Tests;
413

514
use PHPUnit\Framework\TestCase;

‎src/Symfony/Bridge/Twig/Tests/Mime/NotificationEmailTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Bridge\Twig\Tests\Mime;
413

514
use PHPUnit\Framework\TestCase;

0 commit comments

Comments
 (0)
0