diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-10-30 13:15:42 -0700 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-10-30 13:15:42 -0700 |
| commit | a5072cd08357bc74a1188e3e14a929d2302735f6 (patch) | |
| tree | e038cb19543402a5cd0e897f3f2ffc697a25cb56 /Core | |
| parent | 7c51b1c6f08ea0bfd4a44e8d0f202c6423a39587 (diff) | |
| parent | d40f1a8a8c20a285e90ba448d9b28e15ac2a6ec8 (diff) | |
| download | symfony-security-a5072cd08357bc74a1188e3e14a929d2302735f6.zip symfony-security-a5072cd08357bc74a1188e3e14a929d2302735f6.tar.gz symfony-security-a5072cd08357bc74a1188e3e14a929d2302735f6.tar.bz2 | |
Merge branch '2.7' into 2.8
* 2.7:
added the new Composer exclude-from-classmap option
added the new Composer exclude-from-classmap option
fix expected argument type docblock
Set back libxml settings after testings.
fixed Twig deprecation notices
Diffstat (limited to 'Core')
| -rw-r--r-- | Core/composer.json | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Core/composer.json b/Core/composer.json index beaae50..e89fb8d 100644 --- a/Core/composer.json +++ b/Core/composer.json @@ -39,7 +39,10 @@ "symfony/ldap": "For using LDAP integration" }, "autoload": { - "psr-4": { "Symfony\\Component\\Security\\Core\\": "" } + "psr-4": { "Symfony\\Component\\Security\\Core\\": "" }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "minimum-stability": "dev", "extra": { |