summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2015-10-30 13:10:21 -0700
committerFabien Potencier <fabien.potencier@gmail.com>2015-10-30 13:10:21 -0700
commit1c8483382c1b50acbb9c0e2e3f80a26da32f14b1 (patch)
treeca0381872d307681cb51552c483a8e20adc4534c
parent8cfc54a7e51b07ef335012065881a65e437304f0 (diff)
parent5656f5276179e7a3f10f830843b7fe07fc91b344 (diff)
downloadsymfony-security-1c8483382c1b50acbb9c0e2e3f80a26da32f14b1.zip
symfony-security-1c8483382c1b50acbb9c0e2e3f80a26da32f14b1.tar.gz
symfony-security-1c8483382c1b50acbb9c0e2e3f80a26da32f14b1.tar.bz2
Merge branch '2.3' into 2.7
* 2.3: added the new Composer exclude-from-classmap option fix expected argument type docblock Set back libxml settings after testings. fixed Twig deprecation notices
-rw-r--r--composer.json5
1 files changed, 4 insertions, 1 deletions
diff --git a/composer.json b/composer.json
index 3796529..0a90f98 100644
--- a/composer.json
+++ b/composer.json
@@ -56,7 +56,10 @@
"paragonie/random_compat": ""
},
"autoload": {
- "psr-4": { "Symfony\\Component\\Security\\": "" }
+ "psr-4": { "Symfony\\Component\\Security\\": "" },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"minimum-stability": "dev",
"extra": {