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

Commit0df45a2

Browse files
committed
minor#28762 [FrameworkBundle] Fix 3.4 tests (ogizanagi)
This PR was merged into the 3.4 branch.Discussion----------[FrameworkBundle] Fix 3.4 tests| Q | A| ------------- | ---| Branch? | 3.4 <!-- see below -->| Bug fix? | no| New feature? | no <!-- don't forget to update src/**/CHANGELOG.md files -->| BC breaks? | no <!-- seehttps://symfony.com/bc -->| Deprecations? | no <!-- don't forget to update UPGRADE-*.md and src/**/CHANGELOG.md files -->| Tests pass? | yes (AppVeyor failure unrelated) <!-- please add some, will be required by reviewers -->| Fixed tickets | N/A <!-- #-prefixed issue number(s), if any -->| License | MIT| Doc PR | N/AShould fix tests on 3.4 branch after#28735 being merged.Also updates the check for consistency withhttps://github.com/symfony/symfony/pull/27429/files#diff-5e7347edce37c5886ec67b7ba02f3a9cR837 on master.Commits-------3b99a0d [FrameworkBundle] Fix 3.4 tests
2 parentsdd56372 +3b99a0d commit0df45a2

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
useSymfony\Component\Form\Form;
2222
useSymfony\Component\Lock\Lock;
2323
useSymfony\Component\Lock\Store\SemaphoreStore;
24-
useSymfony\Component\PropertyInfo\PropertyInfoExtractor;
24+
useSymfony\Component\PropertyInfo\PropertyInfoExtractorInterface;
2525
useSymfony\Component\Security\Csrf\CsrfTokenManagerInterface;
2626
useSymfony\Component\Serializer\Serializer;
2727
useSymfony\Component\Translation\Translator;
@@ -824,7 +824,7 @@ private function addPropertyInfoSection(ArrayNodeDefinition $rootNode)
824824
->children()
825825
->arrayNode('property_info')
826826
->info('Property info configuration')
827-
->{!class_exists(FullStack::class) &&class_exists(PropertyInfoExtractor::class) ?'canBeDisabled' :'canBeEnabled'}()
827+
->{!class_exists(FullStack::class) &&interface_exists(PropertyInfoExtractorInterface::class) ?'canBeDisabled' :'canBeEnabled'}()
828828
->end()
829829
->end()
830830
;

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ protected static function getBundleDefaultConfig()
335335
'throw_exception_on_invalid_index' =>false,
336336
),
337337
'property_info' =>array(
338-
'enabled' =>false,
338+
'enabled' =>!class_exists(FullStack::class),
339339
),
340340
'router' =>array(
341341
'enabled' =>false,

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -979,12 +979,6 @@ public function testSerializerServiceIsNotRegisteredWhenDisabled()
979979
$this->assertFalse($container->hasDefinition('serializer'));
980980
}
981981

982-
publicfunctiontestPropertyInfoDisabled()
983-
{
984-
$container =$this->createContainerFromFile('default_config');
985-
$this->assertFalse($container->has('property_info'));
986-
}
987-
988982
publicfunctiontestPropertyInfoEnabled()
989983
{
990984
$container =$this->createContainerFromFile('property_info');

0 commit comments

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