Skip to content

Commit fa37b99

Browse files
Merge branch '3.4' into 4.1
* 3.4: (21 commits) Added the Code of Conduct file do not override custom access decision configs [Security] Do not deauthenticate user when the first refreshed user has changed invalidate stale commits for PRs too add missing cache prefix seed attribute to XSD fix command description Fix class documentation [Validator] Add a missing translation [FrameworkBundle] Fix 3.4 tests [DI] fix dumping inline services again Fix phpdocs [EventDispatcher] Remove template method in test case Added LB translation for #27993 (UUID validator message translation) Replace deprecated validateValue with validate [FWBundle] Automatically enable PropertyInfo when using Flex [Process] fix locking of pipe files on Windows Correct PHPDoc type for float ttl bumped Symfony version to 3.4.18 updated VERSION for 3.4.17 updated CHANGELOG for 3.4.17 ...
2 parents 6c44091 + f14d218 commit fa37b99

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

DependencyInjection/Configuration.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
use Symfony\Component\Lock\Lock;
2323
use Symfony\Component\Lock\Store\SemaphoreStore;
2424
use Symfony\Component\Messenger\MessageBusInterface;
25+
use Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface;
2526
use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
2627
use Symfony\Component\Serializer\Serializer;
2728
use Symfony\Component\Translation\Translator;
@@ -833,7 +834,7 @@ private function addPropertyInfoSection(ArrayNodeDefinition $rootNode)
833834
->children()
834835
->arrayNode('property_info')
835836
->info('Property info configuration')
836-
->canBeEnabled()
837+
->{!class_exists(FullStack::class) && interface_exists(PropertyInfoExtractorInterface::class) ? 'canBeDisabled' : 'canBeEnabled'}()
837838
->end()
838839
->end()
839840
;

Resources/config/schema/symfony-1.0.xsd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,8 @@
260260
<xsd:element name="default-memcached-provider" type="xsd:string" minOccurs="0" maxOccurs="1" />
261261
<xsd:element name="pool" type="cache_pool" minOccurs="0" maxOccurs="unbounded" />
262262
</xsd:sequence>
263+
264+
<xsd:attribute name="prefix-seed" type="xsd:string" />
263265
</xsd:complexType>
264266

265267
<xsd:complexType name="cache_pool">

Tests/DependencyInjection/ConfigurationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ protected static function getBundleDefaultConfig()
218218
'throw_exception_on_invalid_index' => false,
219219
),
220220
'property_info' => array(
221-
'enabled' => false,
221+
'enabled' => !class_exists(FullStack::class),
222222
),
223223
'router' => array(
224224
'enabled' => false,

Tests/DependencyInjection/FrameworkExtensionTest.php

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

1158-
public function testPropertyInfoDisabled()
1159-
{
1160-
$container = $this->createContainerFromFile('default_config');
1161-
$this->assertFalse($container->has('property_info'));
1162-
}
1163-
11641158
public function testPropertyInfoEnabled()
11651159
{
11661160
$container = $this->createContainerFromFile('property_info');

0 commit comments

Comments
 (0)