diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-05-15 15:32:45 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-05-15 15:32:45 +0200 |
| commit | f81b1cd7a05c28ce191bc5d4295bbea7367368d4 (patch) | |
| tree | 162878fcf036372b2b7afeccc92b689c3c292cdd /Acl/Tests/Domain/DoctrineAclCacheTest.php | |
| parent | db95dbe483b2f8ce7bae38ea37ae1f42fe141a6c (diff) | |
| parent | c29b2f6d4618d6366d6e5fb3770169c7e1773bf3 (diff) | |
| download | symfony-security-f81b1cd7a05c28ce191bc5d4295bbea7367368d4.zip symfony-security-f81b1cd7a05c28ce191bc5d4295bbea7367368d4.tar.gz symfony-security-f81b1cd7a05c28ce191bc5d4295bbea7367368d4.tar.bz2 | |
Merge branch '2.3' into 2.6
* 2.3:
Fix tests in HHVM
CS: Pre incrementation/decrementation should be used if possible
Conflicts:
src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
src/Symfony/Component/Console/Helper/TableHelper.php
src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php
src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
Diffstat (limited to 'Acl/Tests/Domain/DoctrineAclCacheTest.php')
| -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)); |