Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commite947c0b

Browse files
Merge branch '7.4' into 8.0
* 7.4: Use phpunit attribute Remove some implicit bool type juggling [Scheduler] Fix `scheduler.task` tag arguments optionality use false instead of null to hide the currency symbol [FrameworkBundle] Fix block type from `OK` to `ERROR` when local vault is disabled in `SecretsRemoveCommand` run tests with PHPUnit 12.1 on PHP >= 8.3 Fix wrong boolean values minor#61328 [FrameworkBundle] Decouple ControllerResolverTest from HttpKernel (nicolas-grekas) [Messenger] Fix NoAutoAckStamp handling in Worker::flush() [DependencyInjection] Dump XML using plain PHP, no DOM needed
2 parents263d04d +883a1b4 commite947c0b

File tree

46 files changed

+472
-330
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

+472
-330
lines changed

‎phpunit‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
77
}
88
if (!getenv('SYMFONY_PHPUNIT_VERSION')) {
99
if (\PHP_VERSION_ID >=80300) {
10-
putenv('SYMFONY_PHPUNIT_VERSION=12.0');
10+
putenv('SYMFONY_PHPUNIT_VERSION=12.1');
1111
}else {
1212
putenv('SYMFONY_PHPUNIT_VERSION=11.5');
1313
}

‎src/Symfony/Bridge/Twig/Tests/Extension/SecurityExtensionTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ public static function provideObjectFieldAclCases()
9191
return [
9292
[null,null,null],
9393
['object',null,'object'],
94-
['object',false,newFieldVote('object',false)],
95-
['object',0,newFieldVote('object',0)],
94+
['object','',newFieldVote('object',false)],
95+
['object','0',newFieldVote('object',0)],
9696
['object','',newFieldVote('object','')],
9797
['object','field',newFieldVote('object','field')],
9898
];

‎src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ private function getFileLink(string $class): string
184184
return'';
185185
}
186186

187-
return(string)$this->fileLinkFormatter->format($r->getFileName(),$r->getStartLine());
187+
return$r->getFileName() ? ($this->fileLinkFormatter->format($r->getFileName(),$r->getStartLine()) ?:'') :'';
188188
}
189189

190190
publicfunctioncomplete(CompletionInput$input,CompletionSuggestions$suggestions):void

‎src/Symfony/Bundle/FrameworkBundle/Command/SecretsRemoveCommand.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
5959
$vault =$input->getOption('local') ?$this->localVault :$this->vault;
6060

6161
if (null ===$vault) {
62-
$io->success('The local vault is disabled.');
62+
$io->error('The local vault is disabled.');
6363

6464
return1;
6565
}

‎src/Symfony/Bundle/TwigBundle/Tests/Functional/AttributeExtensionTest.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,9 @@ public static function fooTest(bool $value): bool
130130

131131
class RuntimeExtensionWithAttributes
132132
{
133-
publicfunction__construct(privatebool$prefix)
134-
{
133+
publicfunction__construct(
134+
privatestring$prefix,
135+
) {
135136
}
136137

137138
#[AsTwigFilter('prefix_foo')]

‎src/Symfony/Bundle/WebProfilerBundle/Profiler/CodeExtension.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public function formatArgs(array $args): string
9494
$formattedValue ='<em>'.strtolower(htmlspecialchars(var_export($item[1],true), \ENT_COMPAT | \ENT_SUBSTITUTE,$this->charset)).'</em>';
9595
}elseif ('resource' ===$item[0]) {
9696
$formattedValue ='<em>resource</em>';
97-
}elseif (preg_match('/[^\x07-\x0D\x1B\x20-\xFF]/',$item[1])) {
97+
}elseif (\is_string($item[1]) &&preg_match('/[^\x07-\x0D\x1B\x20-\xFF]/',$item[1])) {
9898
$formattedValue ='<em>binary string</em>';
9999
}else {
100100
$formattedValue =str_replace("\n",'',htmlspecialchars(var_export($item[1],true), \ENT_COMPAT | \ENT_SUBSTITUTE,$this->charset));

‎src/Symfony/Component/AssetMapper/AssetMapperDevServerSubscriber.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public function onKernelRequest(RequestEvent $event): void
146146
if ($mediaType =$this->getMediaType($asset->publicPath)) {
147147
$response->headers->set('Content-Type',$mediaType);
148148
}
149-
$response->headers->set('X-Assets-Dev',true);
149+
$response->headers->set('X-Assets-Dev','1');
150150

151151
$event->setResponse($response);
152152
$event->stopPropagation();

‎src/Symfony/Component/Cache/Tests/Traits/RedisTraitTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function testUrlDecodeParameters()
5656

5757
publicstaticfunctionprovideCreateConnection():array
5858
{
59-
$hosts =array_map(fn ($host) =>\sprintf('host[%s]',$host),explode('',getenv('REDIS_CLUSTER_HOSTS')));
59+
$hosts =array_map(fn ($host) =>\sprintf('host[%s]',$host),explode('',getenv('REDIS_CLUSTER_HOSTS') ?:''));
6060

6161
return [
6262
[
@@ -79,7 +79,7 @@ public static function provideCreateConnection(): array
7979
}
8080

8181
/**
82-
* Due to a bug in phpredis, the persistent connection will keep its last selected database. So whenre-using
82+
* Due to a bug in phpredis, the persistent connection will keep its last selected database. So whenreusing
8383
* a persistent connection, the database has to be re-selected, too.
8484
*
8585
* @see https://github.com/phpredis/phpredis/issues/1920

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp