c6da10674a
Merge branch '2.3' into 2.7
...
* 2.3:
[travis] Load memcache.so
[2.3] Cherry-pick @group time-sensitive annotations
[ci] load php_memcache.dll and apcu.so
Conflicts:
.travis.yml
src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
2015-10-12 14:42:24 +02:00
27040333cf
[ci] load php_memcache.dll and apcu.so
2015-10-12 13:42:34 +02:00
9d9c252c89
Merge branch '2.3' into 2.7
...
* 2.3:
[ci] Fix tests requirements
Conflicts:
src/Symfony/Component/Validator/Tests/Mapping/Cache/LegacyApcCacheTest.php
2015-10-12 11:20:33 +02:00
3c0b441371
[ci] Fix tests requirements
2015-10-12 11:06:32 +02:00
309ad43b71
Merge branch '2.3' into 2.7
...
* 2.3:
[tests] Use @requires annotation when possible
[ci] Enable collecting and replaying skipped tests
[Process] Workaround buggy PHP warning
[Console] Add additional ways to detect OS400 platform
[Yaml] Allow tabs before comments at the end of a line
Conflicts:
composer.json
src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
src/Symfony/Bridge/Monolog/composer.json
src/Symfony/Bridge/Twig/composer.json
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Bundle/SecurityBundle/composer.json
src/Symfony/Component/Asset/composer.json
src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php
src/Symfony/Component/Console/composer.json
src/Symfony/Component/Debug/composer.json
src/Symfony/Component/DomCrawler/composer.json
src/Symfony/Component/EventDispatcher/composer.json
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
src/Symfony/Component/HttpFoundation/composer.json
src/Symfony/Component/Intl/composer.json
src/Symfony/Component/Routing/composer.json
src/Symfony/Component/Security/composer.json
src/Symfony/Component/Serializer/composer.json
src/Symfony/Component/Templating/composer.json
src/Symfony/Component/Translation/composer.json
src/Symfony/Component/Validator/composer.json
2015-10-10 11:26:25 +02:00
4032c88a21
[ci] Enable collecting and replaying skipped tests
2015-10-10 10:46:02 +02:00
481f39d9e6
Merge branch '2.3' into 2.7
...
Conflicts:
src/Symfony/Component/Validator/Constraints/UrlValidator.php
2015-10-07 09:06:36 +02:00
25fbcc3746
[ci] fix phpunit wrapper
2015-10-07 08:18:38 +02:00
0a615f999f
Merge branch '2.3' into 2.7
...
* 2.3:
Fix appveyor.yml missing ANSICON env var
[appveyor] merge test matrix in a single job
[travis] Skip testing intermediate PHP versions on pull requests
Conflicts:
appveyor.yml
2015-10-01 14:02:24 +02:00
36306ab7c6
Fix appveyor.yml missing ANSICON env var
2015-10-01 14:01:27 +02:00
249942a31a
[appveyor] merge test matrix in a single job
2015-10-01 12:28:28 +02:00
0f2256e85a
[appveyor] PHP 5.3.11 for Symfony 2.7
2015-08-31 18:44:53 +02:00
a1d0f539ac
Merge branch '2.3' into 2.7
...
* 2.3:
Do not normalize the kernel root directory path (see symfony/symfony#15474 ).
[ci] Run minimal versions on appveyor only
Fix appveyor file
2015-08-31 14:32:30 +02:00
e564805b32
[ci] Run minimal versions on appveyor only
2015-08-29 12:34:03 +02:00
464a1b3152
Various fixes esp. on Windows
2015-08-27 08:45:45 +02:00
6dac13bc20
Fix appveyor file
2015-08-26 21:03:05 +02:00
8bbd8d90fe
Add appveyor.yml for C.I. on Windows
2015-08-25 23:41:37 +02:00
Nicolas Grekas
Fabien Potencier