diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-09-19 11:45:20 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-09-19 11:45:20 +0200 |
| commit | fad88962af2ecb3e54e13c1f9e8045fd589e693f (patch) | |
| tree | 9e24da773d04ada4b25b778c25392512e10d91e6 /Tests/Acl/Dbal | |
| parent | 249d6e8f35504cb9bfcc3fb1895f41393e8c9e96 (diff) | |
| parent | c30af3532143759579e27c90c01e7c38e830cc80 (diff) | |
| download | symfony-security-fad88962af2ecb3e54e13c1f9e8045fd589e693f.zip symfony-security-fad88962af2ecb3e54e13c1f9e8045fd589e693f.tar.gz symfony-security-fad88962af2ecb3e54e13c1f9e8045fd589e693f.tar.bz2 | |
Merge branch '2.2' into 2.3
* 2.2:
Fix some annotates
[FrameworkBundle] made sure that the debug event dispatcher is used everywhere
[HttpKernel] remove unneeded strtoupper
updated the composer install command to reflect changes in Composer
Conflicts:
src/Symfony/Component/Console/Application.php
src/Symfony/Component/Console/Command/Command.php
src/Symfony/Component/Console/Input/InputDefinition.php
src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php
src/Symfony/Component/Form/Form.php
src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php
src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php
src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterListenersPassTest.php
src/Symfony/Component/Locale/Locale.php
src/Symfony/Component/Locale/README.md
src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php
Diffstat (limited to 'Tests/Acl/Dbal')
| -rw-r--r-- | Tests/Acl/Dbal/MutableAclProviderTest.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/Acl/Dbal/MutableAclProviderTest.php b/Tests/Acl/Dbal/MutableAclProviderTest.php index 3e8d65f..edcdd4d 100644 --- a/Tests/Acl/Dbal/MutableAclProviderTest.php +++ b/Tests/Acl/Dbal/MutableAclProviderTest.php @@ -372,7 +372,7 @@ class MutableAclProviderTest extends \PHPUnit_Framework_TestCase * @param AclProvider $provider * @param array $data * @throws \InvalidArgumentException - * @throws Exception + * @throws \Exception */ protected function importAcls(AclProvider $provider, array $data) { |