Skip to content

Commit aa6fa9d

Browse files
committed
Merge branch '2.8' into 3.0
* 2.8: [2.7] Fix tests pass triggerDeprecationError arg to parent class remove default null value for asset version remove duplicated value [Ldap] Remove unused private property Update UPGRADE-3.0 with correct Voter details Change few occurences of a public setUp() method to protected [DependencyInjection] simplify the BC layer Change couple of occurences of a public setUp() method to protected
2 parents f8dd30e + 380a0f1 commit aa6fa9d

File tree

2 files changed

+0
-1
lines changed

2 files changed

+0
-1
lines changed

DependencyInjection/Configuration.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,6 @@ private function addAssetsSection(ArrayNodeDefinition $rootNode)
396396
->fixXmlConfig('base_url')
397397
->children()
398398
->scalarNode('version')
399-
->defaultNull()
400399
->beforeNormalization()
401400
->ifTrue(function ($v) { return '' === $v; })
402401
->then(function ($v) { return; })

0 commit comments

Comments
 (0)