Commit Graph

40 Commits

Author SHA1 Message Date
Nicolas Grekas
e6250eabcf Merge branch '3.4' into 4.4
* 3.4:
  Fix CI
2020-11-02 15:31:22 +01:00
Nicolas Grekas
427e314212 Fix CI 2020-11-02 15:30:42 +01:00
Nicolas Grekas
1d09b49076 Disable platform checks 2020-10-26 11:17:41 +01:00
Nicolas Grekas
138f611f75 Merge branch '3.4' into 4.4
* 3.4:
  Put branch-version in the source for CI
2020-10-24 17:45:11 +02:00
Nicolas Grekas
008f2da031 Put branch-version in the source for CI 2020-10-24 17:39:57 +02:00
Nicolas Grekas
77aa17401d Merge branch '3.4' into 4.4
* 3.4:
  Remove branch-version (keep them for contracts only)
  [Serializer] fix decoding float XML attributes starting with 0
  add missing dutch translations
  [Validator] Add missing romanian translations
  do not translate null placeholders or titles
2020-10-24 13:50:19 +02:00
Nicolas Grekas
f8fe4bf9f5 Remove branch-version (keep them for contracts only) 2020-10-24 12:57:07 +02:00
Nicolas Grekas
1db73dfe02 Fix merge 2020-10-13 14:45:49 +02:00
Nicolas Grekas
e953dd3e0d Merge branch '3.4' into 4.4
* 3.4:
  Remove "version" from composer.json files, use "branch-version" instead
2020-10-13 14:30:56 +02:00
Nicolas Grekas
f9ed6940fd Remove "version" from composer.json files, use "branch-version" instead 2020-10-13 14:21:16 +02:00
Nicolas Grekas
0c3447f94c Merge branch '3.4' into 4.4
* 3.4:
  [appveyor] fix checking for the .x branch
2020-10-06 13:43:00 +02:00
Nicolas Grekas
f4a1885b8d [appveyor] fix checking for the .x branch 2020-10-06 13:42:19 +02:00
Nicolas Grekas
e553f424d0 Merge branch '3.4' into 4.4
* 3.4:
  Remove "branch-alias", populate "version"
2020-10-06 13:41:17 +02:00
Nicolas Grekas
9d40c796c4 Remove "branch-alias", populate "version" 2020-10-06 13:22:52 +02:00
Nicolas Grekas
44212f96d8 Merge branch '3.4' into 4.4
* 3.4:
  Revert "[travis][appveyor] don't cache .phpunit"
  silence E_NOTICE triggered since PHP 7.4
  [Form] Removed legacy check in `ValidationListener`
  do not merge constraints within interfaces
  [Validator] Fixed default group for nested composite constraints
2020-04-12 11:41:03 +02:00
Nicolas Grekas
966989a2b9 Revert "[travis][appveyor] don't cache .phpunit"
This reverts commit 5182253aa2.
2020-04-12 11:36:17 +02:00
Nicolas Grekas
0745ea4b1b Merge branch '3.4' into 4.4
* 3.4:
  [travis][appveyor] don't cache .phpunit
2020-04-12 00:30:01 +02:00
Nicolas Grekas
5182253aa2 [travis][appveyor] don't cache .phpunit 2020-04-12 00:02:45 +02:00
Nicolas Grekas
0dea24fa8c Merge branch '4.3' into 4.4
* 4.3:
  Skip deprecations from doctrine/orm
  Ignore deprecations about doctrine/persistence coming from doctrine/orm
  skip not applicable tests
2019-12-16 14:34:43 +01:00
Nicolas Grekas
b729b5c814 Skip deprecations from doctrine/orm 2019-12-16 14:25:15 +01:00
Nicolas Grekas
3723d03663 Merge branch '4.3' into 4.4
* 4.3:
  [HttpClient] workaround curl_multi_select() issue
  [CI] fix building local packages
  Increase limits for flakey appveyor tests
2019-10-15 14:38:35 +02:00
Nicolas Grekas
e635491c96 [HttpClient] workaround curl_multi_select() issue 2019-10-15 14:30:03 +02:00
Nicolas Grekas
927ae8ad7f Merge branch '3.4' into 4.3
* 3.4:
  [CI] fix building local packages
2019-10-15 14:28:42 +02:00
Nicolas Grekas
b7b6942251 [CI] fix building local packages 2019-10-15 14:09:56 +02:00
Nicolas Grekas
d5e13956da Merge branch '3.4' into 4.3
* 3.4:
  [travis] install from dist except for selected components
2019-09-20 23:36:54 +02:00
Nicolas Grekas
1de84836cf [travis] install from dist except for selected components 2019-09-20 23:28:55 +02:00
Nicolas Grekas
526915a55d [travis] checkout previous major and test with patched components on deps=high 2019-09-20 22:45:17 +02:00
Fabien Potencier
f6c6cf7dc9 [Twig] Add NotificationEmail 2019-09-18 17:08:12 +02:00
Nicolas Grekas
beb7ed36d8 [appveyor] exclude tty group 2019-09-08 22:24:24 +02:00
Nicolas Grekas
28f4c09e2d Merge branch '3.4' into 4.3
* 3.4:
  Sort components on CI
  fix parameter type declaration and make fabbot happy
  Upgraded CI Composer
  bumped Symfony version to 3.4.32
  updated VERSION for 3.4.31
  update CONTRIBUTORS for 3.4.31
  updated CHANGELOG for 3.4.31
2019-08-27 09:25:30 +02:00
Graham Campbell
a790eeefa0
Upgraded CI Composer 2019-08-26 19:51:50 +01:00
Nicolas Grekas
9d9f5582b2 Merge branch '3.4' into 4.3
* 3.4:
  cleanups
  Disable PHPUnit result cache on the CI
  [Translation] Highlight invalid translation status
2019-08-10 22:47:15 +02:00
Nicolas Grekas
912d7db7dd Disable PHPUnit result cache on the CI 2019-08-10 20:59:22 +02:00
Nicolas Grekas
dc2edaffe2 Merge branch '3.4' into 4.2
* 3.4:
  Skip testing the phpunit-bridge on not-master branches when $deps is empty
  more tests
  [DI] Fixes: #28326 - Overriding services autowired by name under _defaults bind not working
2019-04-12 17:32:33 +02:00
Nicolas Grekas
b0ee192aaa Skip testing the phpunit-bridge on not-master branches when $deps is empty 2019-04-12 17:12:49 +02:00
Nicolas Grekas
e4d7c74845 Merge branch '4.1'
* 4.1:
  [appveyor] fix
  [DI] Fix dumping some complex service graphs
  Revert "minor #28321 [Routing] Fixed the interface description of the url generator interface (Toflar)"
  Fixed caching of templates in default path on cache warmup
  added missing LICENSE file
  remove cache warmers when Twig cache is disabled
  [Workflow] Make sure we do not run the next transition on an updated state
  change baseUrl to basePath to fix wrong profiler url
  [HttpKernel][FrameworkBundle] Fix escaping of serialized payloads passed to test clients
  chore: rename Appveyor filename
  Fixed the interface description of the url generator interface
  Format file size in validation message according to binaryFormat option
2018-09-05 14:00:05 +02:00
Nicolas Grekas
432487f577 Merge branch '3.4' into 4.1
* 3.4:
  [appveyor] fix
  Revert "minor #28321 [Routing] Fixed the interface description of the url generator interface (Toflar)"
  Fixed caching of templates in default path on cache warmup
  remove cache warmers when Twig cache is disabled
  [HttpKernel][FrameworkBundle] Fix escaping of serialized payloads passed to test clients
  chore: rename Appveyor filename
  Fixed the interface description of the url generator interface
  Format file size in validation message according to binaryFormat option
2018-09-05 13:58:22 +02:00
Nicolas Grekas
5632dc7c7a Merge branch '2.8' into 3.4
* 2.8:
  [appveyor] fix
  Revert "minor #28321 [Routing] Fixed the interface description of the url generator interface (Toflar)"
  remove cache warmers when Twig cache is disabled
  [HttpKernel][FrameworkBundle] Fix escaping of serialized payloads passed to test clients
  chore: rename Appveyor filename
  Fixed the interface description of the url generator interface
  Format file size in validation message according to binaryFormat option
2018-09-05 13:56:21 +02:00
Nicolas Grekas
992a174470 [appveyor] fix 2018-09-05 13:43:17 +02:00
Hugo Alliaume
b133bd6bd3 chore: rename Appveyor filename 2018-09-03 20:51:33 +02:00