Nicolas Grekas
d94c322272
Merge branch '2.7' into 2.8
...
* 2.7:
[ci] Force update of ./phpunit deps
[Form] Fixed: Duplicate choice labels are remembered when using "choices_as_values" = false
[Process] Don't catch RuntimeException when it complicates tests debugging
[appveyor] Workaround transient segfault when APCu is enabled
2015-11-28 10:05:52 +01:00
Nicolas Grekas
60b02fcc97
Merge branch '2.3' into 2.7
...
* 2.3:
[ci] Force update of ./phpunit deps
[Process] Don't catch RuntimeException when it complicates tests debugging
[appveyor] Workaround transient segfault when APCu is enabled
2015-11-28 10:05:32 +01:00
Nicolas Grekas
12a152b666
[appveyor] Workaround transient segfault when APCu is enabled
2015-11-26 16:12:01 +01:00
Nicolas Grekas
cfb15ffc56
Merge branch '2.8'
...
* 2.8:
[appveyor] fix ini matrix race conditions
[Http*] Mock time() to fix transient tests
[ci] Cache phpunit install
[WebProfiler] [toolbar] Changed profiler toolbar color to comply with WCAG 2.0AA contrast standards
Conflicts:
appveyor.yml
2015-10-13 18:13:27 +02:00
Nicolas Grekas
8a76fd9dbc
Merge branch '2.7' into 2.8
...
* 2.7:
[appveyor] fix ini matrix race conditions
[Http*] Mock time() to fix transient tests
[ci] Cache phpunit install
[WebProfiler] [toolbar] Changed profiler toolbar color to comply with WCAG 2.0AA contrast standards
Conflicts:
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
src/Symfony/Component/HttpFoundation/Response.php
2015-10-13 18:11:28 +02:00
Nicolas Grekas
7e848fba84
Merge branch '2.3' into 2.7
...
* 2.3:
[appveyor] fix ini matrix race conditions
[Http*] Mock time() to fix transient tests
[ci] Cache phpunit install
[WebProfiler] [toolbar] Changed profiler toolbar color to comply with WCAG 2.0AA contrast standards
Conflicts:
appveyor.yml
src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
2015-10-13 18:05:47 +02:00
Nicolas Grekas
8e59d4ae17
[appveyor] fix ini matrix race conditions
2015-10-13 17:38:14 +02:00
Nicolas Grekas
e6d343a126
[ci] Cache phpunit install
2015-10-13 10:50:50 +02:00
Nicolas Grekas
4c223c9d06
Merge branch '2.7' into 2.8
...
* 2.7:
[travis] Load memcache.so
[2.3] Cherry-pick @group time-sensitive annotations
[ci] load php_memcache.dll and apcu.so
[ClassLoader] Split LegacyApcUniversalClassLoaderTest fixtures
2015-10-12 14:43:41 +02:00
Nicolas Grekas
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
Nicolas Grekas
c401e2af48
[3.0][appveyor] load apcu and memcache
2015-10-12 13:42:52 +02:00
Nicolas Grekas
27040333cf
[ci] load php_memcache.dll and apcu.so
2015-10-12 13:42:34 +02:00
Nicolas Grekas
5b678192af
Merge branch '2.8'
...
* 2.8:
Fix merge
[ci] Fix tests requirements
[ci] SymfonyTestsListener is now auto-registered
adds validation messages missing italian translations
[Console] fixed progress bar format on edge cases
fix bug with set max count, by start method in progress bar
Rename CollectionType options for entries
Conflicts:
appveyor.yml
src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php
src/Symfony/Component/Console/Helper/ProgressBar.php
src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
src/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php
src/Symfony/Component/HttpKernel/Tests/Profiler/SqliteProfilerStorageTest.php
src/Symfony/Component/Validator/Tests/Mapping/Cache/LegacyApcCacheTest.php
2015-10-12 11:38:36 +02:00
Nicolas Grekas
38ee8b34c4
Merge branch '2.7' into 2.8
...
* 2.7:
[ci] Fix tests requirements
[ci] SymfonyTestsListener is now auto-registered
adds validation messages missing italian translations
[Console] fixed progress bar format on edge cases
fix bug with set max count, by start method in progress bar
Conflicts:
src/Symfony/Component/Form/Tests/Extension/Core/EventListener/TrimListenerTest.php
src/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php
src/Symfony/Component/HttpKernel/Tests/Profiler/SqliteProfilerStorageTest.php
src/Symfony/Component/Security/Acl/Tests/Dbal/AclProviderTest.php
src/Symfony/Component/Security/Acl/Tests/Dbal/MutableAclProviderTest.php
2015-10-12 11:25:14 +02:00
Nicolas Grekas
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
Nicolas Grekas
3c0b441371
[ci] Fix tests requirements
2015-10-12 11:06:32 +02:00
Nicolas Grekas
2e11b8b2cb
Merge branch '2.8'
...
* 2.8:
Fix merge
[tests] Use @requires annotation when possible
[tests] Use @requires annotation when possible
[PhpUnitBridge] Add SkippedTestsListener to collect and replay skipped tests
[ci] Enable collecting and replaying skipped tests
[tests] Use @requires annotation when possible
[Process] Workaround buggy PHP warning
[FrameworkBundle] Replace PhpFileCache by FilesystemCache
[FrameworkBundle] composer suggest fix
[Console] Add additional ways to detect OS400 platform
[Yaml] Allow tabs before comments at the end of a line
Added more tests for PropertyAccess
Conflicts:
.travis.yml
src/Symfony/Bridge/Doctrine/composer.json
src/Symfony/Bridge/Monolog/composer.json
src/Symfony/Bridge/ProxyManager/composer.json
src/Symfony/Bridge/Swiftmailer/composer.json
src/Symfony/Bridge/Twig/composer.json
src/Symfony/Bundle/DebugBundle/composer.json
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Bundle/SecurityBundle/composer.json
src/Symfony/Bundle/TwigBundle/composer.json
src/Symfony/Bundle/WebProfilerBundle/composer.json
src/Symfony/Component/Asset/composer.json
src/Symfony/Component/BrowserKit/composer.json
src/Symfony/Component/ClassLoader/Tests/ApcClassLoaderTest.php
src/Symfony/Component/ClassLoader/composer.json
src/Symfony/Component/Config/composer.json
src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
src/Symfony/Component/Console/composer.json
src/Symfony/Component/CssSelector/composer.json
src/Symfony/Component/Debug/composer.json
src/Symfony/Component/DependencyInjection/composer.json
src/Symfony/Component/DomCrawler/composer.json
src/Symfony/Component/EventDispatcher/composer.json
src/Symfony/Component/ExpressionLanguage/composer.json
src/Symfony/Component/Filesystem/composer.json
src/Symfony/Component/Finder/composer.json
src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php
src/Symfony/Component/Form/composer.json
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
src/Symfony/Component/HttpFoundation/composer.json
src/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php
src/Symfony/Component/HttpKernel/Tests/Profiler/SqliteProfilerStorageTest.php
src/Symfony/Component/HttpKernel/composer.json
src/Symfony/Component/Intl/Tests/Data/Bundle/Writer/PhpBundleWriterTest.php
src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
src/Symfony/Component/Intl/composer.json
src/Symfony/Component/Ldap/composer.json
src/Symfony/Component/Locale/composer.json
src/Symfony/Component/Locale/phpunit.xml.dist
src/Symfony/Component/OptionsResolver/composer.json
src/Symfony/Component/Process/composer.json
src/Symfony/Component/PropertyAccess/composer.json
src/Symfony/Component/PropertyInfo/composer.json
src/Symfony/Component/Routing/composer.json
src/Symfony/Component/Security/Core/composer.json
src/Symfony/Component/Security/Csrf/composer.json
src/Symfony/Component/Security/Guard/composer.json
src/Symfony/Component/Security/Http/composer.json
src/Symfony/Component/Security/composer.json
src/Symfony/Component/Serializer/composer.json
src/Symfony/Component/Stopwatch/composer.json
src/Symfony/Component/Templating/composer.json
src/Symfony/Component/Translation/composer.json
src/Symfony/Component/Validator/Tests/Mapping/Cache/LegacyApcCacheTest.php
src/Symfony/Component/Validator/composer.json
src/Symfony/Component/VarDumper/composer.json
src/Symfony/Component/Yaml/composer.json
2015-10-10 12:22:50 +02:00
Nicolas Grekas
3ecf2062b8
Merge branch '2.7' into 2.8
...
* 2.7:
[tests] Use @requires annotation when possible
[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
Added more tests for PropertyAccess
Conflicts:
.travis.yml
src/Symfony/Bridge/Doctrine/composer.json
src/Symfony/Bridge/Monolog/composer.json
src/Symfony/Bridge/ProxyManager/composer.json
src/Symfony/Bridge/Swiftmailer/composer.json
src/Symfony/Bridge/Twig/composer.json
src/Symfony/Bundle/DebugBundle/composer.json
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Bundle/SecurityBundle/composer.json
src/Symfony/Bundle/TwigBundle/composer.json
src/Symfony/Bundle/WebProfilerBundle/composer.json
src/Symfony/Component/Asset/composer.json
src/Symfony/Component/BrowserKit/composer.json
src/Symfony/Component/ClassLoader/composer.json
src/Symfony/Component/Config/composer.json
src/Symfony/Component/Console/composer.json
src/Symfony/Component/CssSelector/composer.json
src/Symfony/Component/Debug/composer.json
src/Symfony/Component/DependencyInjection/composer.json
src/Symfony/Component/DomCrawler/composer.json
src/Symfony/Component/EventDispatcher/composer.json
src/Symfony/Component/ExpressionLanguage/composer.json
src/Symfony/Component/Filesystem/composer.json
src/Symfony/Component/Finder/composer.json
src/Symfony/Component/Form/composer.json
src/Symfony/Component/HttpFoundation/composer.json
src/Symfony/Component/HttpKernel/composer.json
src/Symfony/Component/Intl/composer.json
src/Symfony/Component/Locale/composer.json
src/Symfony/Component/OptionsResolver/composer.json
src/Symfony/Component/Process/composer.json
src/Symfony/Component/PropertyAccess/composer.json
src/Symfony/Component/Routing/composer.json
src/Symfony/Component/Security/Acl/composer.json
src/Symfony/Component/Security/Core/composer.json
src/Symfony/Component/Security/Csrf/composer.json
src/Symfony/Component/Security/Http/composer.json
src/Symfony/Component/Security/composer.json
src/Symfony/Component/Serializer/composer.json
src/Symfony/Component/Stopwatch/composer.json
src/Symfony/Component/Templating/composer.json
src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php
src/Symfony/Component/Translation/composer.json
src/Symfony/Component/Validator/composer.json
src/Symfony/Component/VarDumper/composer.json
src/Symfony/Component/Yaml/composer.json
2015-10-10 11:36:22 +02:00
Nicolas Grekas
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
Nicolas Grekas
4032c88a21
[ci] Enable collecting and replaying skipped tests
2015-10-10 10:46:02 +02:00
Nicolas Grekas
6005fe53f7
Merge branch '2.8'
...
Conflicts:
composer.json
src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
src/Symfony/Bundle/FrameworkBundle/Resources/config/security_csrf.xml
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Component/DependencyInjection/ContainerBuilder.php
src/Symfony/Component/Security/Core/composer.json
src/Symfony/Component/Security/Csrf/composer.json
src/Symfony/Component/Security/Http/composer.json
src/Symfony/Component/Security/composer.json
src/Symfony/Component/Translation/PluralizationRules.php
src/Symfony/Component/VarDumper/Exception/ThrowingCasterException.php
2015-10-07 09:44:07 +02:00
Nicolas Grekas
f35a0d202f
Merge branch '2.7' into 2.8
...
Conflicts:
appveyor.yml
2015-10-07 09:09:15 +02:00
Nicolas Grekas
481f39d9e6
Merge branch '2.3' into 2.7
...
Conflicts:
src/Symfony/Component/Validator/Constraints/UrlValidator.php
2015-10-07 09:06:36 +02:00
Nicolas Grekas
25fbcc3746
[ci] fix phpunit wrapper
2015-10-07 08:18:38 +02:00
Nicolas Grekas
372be7eeb5
Fix merge
2015-10-02 09:42:39 +02:00
Nicolas Grekas
b02d3ab168
Merge branch '2.8'
...
* 2.8:
Fix merge
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:
.travis.yml
appveyor.yml
2015-10-01 14:14:43 +02:00
Nicolas Grekas
591cd0879c
Fix merge
2015-10-01 14:12:45 +02:00
Nicolas Grekas
5bc3581a4e
Merge branch '2.7' into 2.8
...
* 2.7:
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:
.travis.yml
appveyor.yml
2015-10-01 14:06:27 +02:00
Nicolas Grekas
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
Nicolas Grekas
36306ab7c6
Fix appveyor.yml missing ANSICON env var
2015-10-01 14:01:27 +02:00
Nicolas Grekas
249942a31a
[appveyor] merge test matrix in a single job
2015-10-01 12:28:28 +02:00
Tobias Schultze
63c77aae53
Merge branch '2.8'
...
Conflicts:
composer.json
src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php
src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
src/Symfony/Component/ClassLoader/DebugClassLoader.php
src/Symfony/Component/ClassLoader/UniversalClassLoader.php
src/Symfony/Component/Console/Input/StringInput.php
src/Symfony/Component/Debug/DebugClassLoader.php
src/Symfony/Component/DependencyInjection/Container.php
src/Symfony/Component/DependencyInjection/ContainerBuilder.php
src/Symfony/Component/DependencyInjection/ContainerInterface.php
src/Symfony/Component/DependencyInjection/Definition.php
src/Symfony/Component/DependencyInjection/DefinitionDecorator.php
src/Symfony/Component/DependencyInjection/Scope.php
src/Symfony/Component/DependencyInjection/ScopeInterface.php
src/Symfony/Component/DomCrawler/composer.json
src/Symfony/Component/EventDispatcher/Event.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/HttpKernel/KernelInterface.php
src/Symfony/Component/HttpKernel/Log/LoggerInterface.php
src/Symfony/Component/HttpKernel/Log/NullLogger.php
src/Symfony/Component/Security/Core/composer.json
src/Symfony/Component/Security/Resources/translations/security.tr.xlf
src/Symfony/Component/Security/composer.json
src/Symfony/Component/Translation/Translator.php
2015-09-29 16:08:28 +02:00
Charles Sarrazin
1c964b993f
Introducing the LDAP component
2015-09-28 13:11:59 +02:00
Nicolas Grekas
0f2256e85a
[appveyor] PHP 5.3.11 for Symfony 2.7
2015-08-31 18:44:53 +02:00
Fabien Potencier
98b714b30d
Merge branch '2.8'
...
* 2.8:
bumped minimal version in appveyor to 5.3.9
[VarDumper] Fix missing support for dumping PHP7 return type
Require security-acl 2.7 for BC
[travis] disable symfony_debug ext when deps!=no
Require actual version of ACL component until ACL/2.8 branch released
Do not normalize the kernel root directory path (see symfony/symfony#15474 ).
Don't trigger deprecation on interfaces
[Debug] Ignore silencing for deprecations
[ci] Run minimal versions on appveyor only
Deprecated Security ClassUtils in favor of Acl ClassUtils
Fix appveyor file
consistently use str_replace to unify directory separators (remaining)
2015-08-31 14:39:32 +02:00
Fabien Potencier
c6e5830a96
bumped minimal version in appveyor to 5.3.9
2015-08-31 14:36:41 +02:00
Fabien Potencier
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
Nicolas Grekas
e564805b32
[ci] Run minimal versions on appveyor only
2015-08-29 12:34:03 +02:00
Nicolas Grekas
ab14739845
Merge branch '2.8'
...
* 2.8: (21 commits)
Fix merge
Fix typo
Various fixes esp. on Windows
Fix the validation of form resources to register the default theme
Fix the retrieval of the value with property path when using a loader
[appveyor] minor enhancements
[Process] Disable failing tests on Windows
[Translation] Fix the string casting in the XliffFileLoader
Windows and Intl fixes
Add appveyor.yml for C.I. on Windows
[VarDumper] fixed HtmlDumper to target specific the head tag
[travis] merge php: nightly and deps=high test-matrix lines
consistently use str_replace to unify directory separators
Support omitting the <target> node in an .xlf file.
Fix the handling of values for multiple choice types
moved PHP nightly to PHP 7.0
fixed tests using deprecation features
[Form] made deprecation notice more precise
fixed CS
Fix BC break after split of ACL from core
...
Conflicts:
.travis.yml
composer.json
src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
src/Symfony/Component/Locale/Tests/LocaleTest.php
2015-08-27 09:55:57 +02:00
Nicolas Grekas
464a1b3152
Various fixes esp. on Windows
2015-08-27 08:45:45 +02:00
Nicolas Grekas
6dac13bc20
Fix appveyor file
2015-08-26 21:03:05 +02:00
Nicolas Grekas
8bbd8d90fe
Add appveyor.yml for C.I. on Windows
2015-08-25 23:41:37 +02:00