Merge branch '4.1'
* 4.1: [SecurityBundle] update conflict rule fix class existence fix tests fixed constraints fixed constraints bumped dep bumped dep
This commit is contained in:
commit
553786edc7
@ -88,3 +88,10 @@ class AddSecurityVotersPassTest extends TestCase
|
||||
$compilerPass->process($container);
|
||||
}
|
||||
}
|
||||
|
||||
class VoterWithoutInterface
|
||||
{
|
||||
public function vote()
|
||||
{
|
||||
}
|
||||
}
|
||||
|
@ -44,7 +44,7 @@
|
||||
"twig/twig": "~1.34|~2.4"
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/security": "4.1.0-beta1",
|
||||
"symfony/security": "4.1.0-beta1,4.1.0-beta2",
|
||||
"symfony/var-dumper": "<3.4",
|
||||
"symfony/event-dispatcher": "<3.4",
|
||||
"symfony/framework-bundle": "<4.1",
|
||||
|
Reference in New Issue
Block a user