Merge branch '4.0' into 4.1

* 4.0:
  [SecurityBundle] update conflict rule
  fix class existence
  fix tests
  fixed constraints
  fixed constraints
  bumped dep
  bumped dep
This commit is contained in:
Nicolas Grekas 2018-05-25 11:05:54 +02:00
commit bdf2ecb3f3
2 changed files with 8 additions and 1 deletions

View File

@ -88,3 +88,10 @@ class AddSecurityVotersPassTest extends TestCase
$compilerPass->process($container);
}
}
class VoterWithoutInterface
{
public function vote()
{
}
}

View File

@ -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",