Skip to content

Commit 2d723f1

Browse files
committed
Merge branch '2.6' into 2.7
* 2.6: (46 commits) fixxed order of usage [2.7] [Form] Replaced calls to array_search() by in_array() where is no need to get the index [Process] Make test AbstractProcessTest::testStartAfterATimeout useful again removed non-sense example Fixes small typo. [Validator] Remove unnecessary include in tests [HttpFoundation] minor: clarify Request::getUrlencodedPrefix() regex fixed typo [Validator] fix DOS-style line endings Drop useless execution bit bumped Symfony version to 2.6.5 [Serializer] update changelog updated VERSION for 2.6.4 updated CHANGELOG for 2.6.4 bumped Symfony version to 2.5.11 [HttpKernel] Added use of provided by #12022 method to instantiate controller class in bundle's controller resolver updated VERSION for 2.5.10 updated CHANGELOG for 2.5.10 [Validator] Add a Russian translation for invalid charset message [2.3] [Validator] spanish translation for invalid charset message ... Conflicts: src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php src/Symfony/Component/HttpKernel/Exception/FatalErrorException.php src/Symfony/Component/HttpKernel/Exception/FlattenException.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php src/Symfony/Component/Validator/Resources/translations/validators.de.xlf src/Symfony/Component/Validator/Resources/translations/validators.en.xlf src/Symfony/Component/Validator/Resources/translations/validators.es.xlf src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf src/Symfony/Component/Validator/Resources/translations/validators.sl.xlf
2 parents 2b3459f + b47bae8 commit 2d723f1

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

Tests/Functional/SetAclCommandTest.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,20 @@ public function testSetAclClassScope()
151151
$this->assertTrue($acl2->isGranted($permissionMap->getMasks($grantedPermission, null), array($roleSecurityIdentity)));
152152
}
153153

154+
protected function setUp()
155+
{
156+
parent::setUp();
157+
158+
$this->deleteTmpDir('Acl');
159+
}
160+
161+
protected function tearDown()
162+
{
163+
parent::tearDown();
164+
165+
$this->deleteTmpDir('Acl');
166+
}
167+
154168
private function getApplication()
155169
{
156170
$kernel = $this->createKernel(array('test_case' => 'Acl'));

0 commit comments

Comments
 (0)