diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-05-15 15:33:16 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-05-15 15:33:16 +0200 |
| commit | 41cb2c25e9d0f2535ccb7f2b5ef4d74165c04df1 (patch) | |
| tree | 443aa261c131816e4d9895476a9405fcd468c63e /Acl/Tests/Domain | |
| parent | ad8373bcf455be18e2bdbcec1c37b6c032d5943c (diff) | |
| parent | f81b1cd7a05c28ce191bc5d4295bbea7367368d4 (diff) | |
| download | symfony-security-41cb2c25e9d0f2535ccb7f2b5ef4d74165c04df1.zip symfony-security-41cb2c25e9d0f2535ccb7f2b5ef4d74165c04df1.tar.gz symfony-security-41cb2c25e9d0f2535ccb7f2b5ef4d74165c04df1.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
[DebugBundle] Allow alternative destination for dumps
[DebugBundle] Use output mechanism of dumpers instead of echoing
[DebugBundle] Always collect dumps
Fix tests in HHVM
CS: Pre incrementation/decrementation should be used if possible
Conflicts:
src/Symfony/Component/Finder/Expression/Glob.php
Diffstat (limited to 'Acl/Tests/Domain')
| -rw-r--r-- | Acl/Tests/Domain/DoctrineAclCacheTest.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Acl/Tests/Domain/DoctrineAclCacheTest.php b/Acl/Tests/Domain/DoctrineAclCacheTest.php index 128f2c8..255f7f4 100644 --- a/Acl/Tests/Domain/DoctrineAclCacheTest.php +++ b/Acl/Tests/Domain/DoctrineAclCacheTest.php @@ -72,7 +72,7 @@ class DoctrineAclCacheTest extends \PHPUnit_Framework_TestCase $acl->insertClassFieldAce('foo', $sid, 1); $acl->insertObjectAce($sid, 1); $acl->insertObjectFieldAce('foo', $sid, 1); - $id++; + ++$id; if ($depth > 0) { $acl->setParentAcl($this->getAcl($depth - 1)); |