summaryrefslogtreecommitdiffstats
path: root/phpunit.xml.dist
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2012-05-01 17:59:34 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2012-05-01 17:59:34 +0200
commit95a080053f8dce4f883ad91225e1bef9259fd6ac (patch)
tree51401b56d549627c744deef9f8a466142aeb46ac /phpunit.xml.dist
parent9ed448495929292bda245fdd74753c98a35d0577 (diff)
parentffef59ac47cfb80696c545b01eeb92b12c043420 (diff)
downloadsymfony-security-95a080053f8dce4f883ad91225e1bef9259fd6ac.zip
symfony-security-95a080053f8dce4f883ad91225e1bef9259fd6ac.tar.gz
symfony-security-95a080053f8dce4f883ad91225e1bef9259fd6ac.tar.bz2
merged branch willdurand/fix-components (PR #4155)
Commits ------- c195957 [Components] Tests/Autoloading fixes Discussion ---------- Fix components See #4141 ---- This PR: * configures each component to use composer to manage "dev" dependencies instead of env variables; * adds phpunit configuration file on Filesystem component; * fixes READMEs. It's mergeable without any problems, but I would recommend to wait a fix in Composer in order to use `self.version` in `require`/`require-dev` sections. Note: I kept `suggest` sections because it makes sense but this PR doesn't aim to provide useful explanations for each entry. It could be another PR, not that one. --------------------------------------------------------------------------- by willdurand at 2012-04-30T20:43:13Z @fabpot I reviewed each component, one by one. Now `phpunit` always works, even if tests are skipped. A simple `composer install --dev` allows to run the complete test suite. Each commit is well separated from the others. I guess, everything is ok now. --------------------------------------------------------------------------- by Tobion at 2012-04-30T20:47:00Z Please squash, as it makes no sense to have the same commit for each component. --------------------------------------------------------------------------- by fabpot at 2012-05-01T14:26:11Z Can you squash your commits before I merge? Thanks. --------------------------------------------------------------------------- by willdurand at 2012-05-01T14:29:38Z done --------------------------------------------------------------------------- by fabpot at 2012-05-01T15:48:25Z It does not seem that the commits are squashed. --------------------------------------------------------------------------- by willdurand at 2012-05-01T15:54:08Z done
Diffstat (limited to 'phpunit.xml.dist')
-rw-r--r--phpunit.xml.dist2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 7c9b67d..0560cf5 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -21,7 +21,7 @@
<whitelist>
<directory>./</directory>
<exclude>
- <directory>./Resources</directory>
+ <directory>./vendor</directory>
<directory>./Tests</directory>
</exclude>
</whitelist>