Commit Graph

435 Commits

Author SHA1 Message Date
Nicolas Grekas
51525e63f8 Merge branch '3.4' into 4.1
* 3.4:
  [DoctrineBridge] support __toString as documented for UniqueEntityValidator
  [travis] enable Redis cluster
  [Cache] enable Memcached::OPT_TCP_NODELAY to fix perf of misses
  fix data mapper return type in docblock
  fix type error handling when writing values
2018-08-24 12:22:26 +02:00
Nicolas Grekas
f245df404f [travis] enable Redis cluster 2018-08-24 11:22:31 +02:00
Nicolas Grekas
80bfead57f Merge branch '3.4' into 4.1
* 3.4:
  minor fix for travis
2018-08-19 10:49:19 +02:00
Nicolas Grekas
b08dcfc88d Merge branch '2.8' into 3.4
* 2.8:
  minor fix for travis
2018-08-19 10:49:14 +02:00
Nicolas Grekas
13a5101502 minor fix for travis 2018-08-19 10:49:05 +02:00
Nicolas Grekas
2dedacbc04 Merge branch '3.4' into 4.1
* 3.4:
  [travis][appveyor] use symfony/flex to accelerate builds
  Add missing stderr redirection
  clean up unused code
  [Filesystem] Add test to prevent regression when using array|resource with dumpFile
  [Security] Call AccessListener after LogoutListener
2018-08-18 18:52:46 +02:00
Nicolas Grekas
d351daab04 Merge branch '2.8' into 3.4
* 2.8:
  [travis][appveyor] use symfony/flex to accelerate builds
  [Security] Call AccessListener after LogoutListener
2018-08-18 18:47:20 +02:00
Nicolas Grekas
940ec8f2d5 [travis][appveyor] use symfony/flex to accelerate builds 2018-08-18 18:09:18 +02:00
Nicolas Grekas
9654de3527 Merge branch '3.4' into 4.1
* 3.4:
  [travis] cache composer.lock files for deps=low
  [Security] Remove wrong sentence about ACL
  Update validators.nl.xlf
2018-08-07 11:35:05 +02:00
Nicolas Grekas
87fff65cd0 Merge branch '2.8' into 3.4
* 2.8:
  [travis] cache composer.lock files for deps=low
  [Security] Remove wrong sentence about ACL
  Update validators.nl.xlf
2018-08-07 11:33:53 +02:00
Nicolas Grekas
fc7fb5cb4a minor #28146 [travis] cache composer.lock files for deps=low (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[travis] cache composer.lock files for deps=low

| Q             | A
| ------------- | ---
| Branch?       | 2.8
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

I just realized that the resolved package versions for lowest deps depends only on the root composer.json, and not on transitive deps.
This means we can cache the lock files and save ~10 minutes required to resolve the lowest deps of the SecurityBundle.

Commits
-------

caaa74cd9b [travis] cache composer.lock files for deps=low
2018-08-07 11:32:16 +02:00
Nicolas Grekas
caaa74cd9b [travis] cache composer.lock files for deps=low 2018-08-07 09:58:32 +02:00
Nicolas Grekas
b2c2381166 Merge branch '2.8' into 3.4
* 2.8:
  fix ci
2018-08-03 15:17:05 +02:00
Nicolas Grekas
6cb792c9d6 fix ci 2018-08-03 15:16:31 +02:00
Nicolas Grekas
89bf201e55 Merge branch '3.4' into 4.1
* 3.4:
  [travis] fix requiring mongodb/mongodb before composer up
2018-08-03 14:54:53 +02:00
Nicolas Grekas
f082f41a3c Merge branch '2.8' into 3.4
* 2.8:
  [travis] fix requiring mongodb/mongodb before composer up
2018-08-03 14:54:11 +02:00
Nicolas Grekas
f50ee9b3dc [travis] fix requiring mongodb/mongodb before composer up 2018-08-03 14:53:54 +02:00
Nicolas Grekas
613ca3c19c [travis] test with latest PHP 7.1 to hopefully get rid of segfaults 2018-08-03 14:33:38 +02:00
Nicolas Grekas
ed36e64bd4 fix merge 2018-08-03 13:22:40 +02:00
Nicolas Grekas
694178e279 Merge branch '3.4' into 4.1
* 3.4:
  [travis] fix CI for sigchild+Process
  fix merge
  [travis] merge "same Symfony version" jobs in one
  fix merge
  Remove the Expires header when calling Response::expire()
  Allow multidimensional collection in property info
  Allow multidimensional collection in property info
2018-08-03 13:13:38 +02:00
Nicolas Grekas
ff33771af3 Merge branch '2.8' into 3.4
* 2.8:
  [travis] fix CI for sigchild+Process
2018-08-03 13:10:44 +02:00
Nicolas Grekas
0a450d72c5 [travis] fix CI for sigchild+Process 2018-08-03 13:10:36 +02:00
Nicolas Grekas
8818124468 fix merge 2018-08-03 12:58:53 +02:00
Nicolas Grekas
c5e91ddeb0 Merge branch '2.8' into 3.4
* 2.8:
  [travis] merge "same Symfony version" jobs in one
2018-08-03 12:42:44 +02:00
Nicolas Grekas
9857ca07aa [travis] merge "same Symfony version" jobs in one 2018-08-03 11:45:57 +02:00
Nicolas Grekas
cd94ef22bf Merge branch '4.0' into 4.1
* 4.0:
  Bump ext-mongodb to 1.5 on Travis
  Redesign the Debug error page in prod
  [DI] fix dumping deprecated service in yaml
  bumped Symfony version to 4.0.13
  updated VERSION for 4.0.12
  updated CHANGELOG for 4.0.12
  bumped Symfony version to 3.4.13
  updated VERSION for 3.4.12
  updated CHANGELOG for 3.4.12
  bumped Symfony version to 2.8.43
  updated VERSION for 2.8.42
  update CONTRIBUTORS for 2.8.42
  updated CHANGELOG for 2.8.42
2018-06-27 23:05:46 +02:00
Nicolas Grekas
cbfb7a7495 Merge branch '3.4' into 4.0
* 3.4:
  Bump ext-mongodb to 1.5 on Travis
  Redesign the Debug error page in prod
  [DI] fix dumping deprecated service in yaml
  bumped Symfony version to 3.4.13
  updated VERSION for 3.4.12
  updated CHANGELOG for 3.4.12
  bumped Symfony version to 2.8.43
  updated VERSION for 2.8.42
  update CONTRIBUTORS for 2.8.42
  updated CHANGELOG for 2.8.42
2018-06-27 23:04:32 +02:00
Nicolas Grekas
af00528ff3 Merge branch '2.8' into 3.4
* 2.8:
  Bump ext-mongodb to 1.5 on Travis
2018-06-27 23:02:57 +02:00
Nicolas Grekas
476ef19b41 Bump ext-mongodb to 1.5 on Travis 2018-06-27 23:01:14 +02:00
Samuel ROZE
798c230ad5 [Messenger] Add AMQP adapter 2018-04-12 09:15:52 +01:00
Nicolas Grekas
c3afab9245 Merge branch '3.4' into 4.0
* 3.4:
  [travis] fix libsodium install
2018-02-22 15:57:28 +01:00
Nicolas Grekas
952786af26 [travis] fix libsodium install 2018-02-22 15:57:11 +01:00
Nicolas Grekas
73c2ea8d19 Merge branch '3.4' into 4.0
* 3.4:
  fix merge
  [travis] cache in ~/php-ext/
2018-02-22 14:01:32 +01:00
Nicolas Grekas
8f1ca2b3e4 fix merge 2018-02-22 14:01:17 +01:00
Nicolas Grekas
084a5bcc3b Merge branch '2.8' into 3.4
* 2.8:
  [travis] cache in ~/php-ext/
2018-02-22 14:00:34 +01:00
Nicolas Grekas
0f1cae864b [travis] cache in ~/php-ext/ 2018-02-22 13:59:51 +01:00
Nicolas Grekas
a1fa96dbac Merge branch '3.4' into 4.0
* 3.4:
  [travis] fix passing $INI to tpecl()
  Sync UPGRADE-3.0.md with 3.4
2018-02-22 13:53:36 +01:00
Nicolas Grekas
952da1694c Merge branch '2.8' into 3.4
* 2.8:
  [travis] fix passing $INI to tpecl()
  Sync UPGRADE-3.0.md with 3.4
2018-02-22 13:52:41 +01:00
Nicolas Grekas
30b691c57d [travis] fix passing $INI to tpecl() 2018-02-22 13:51:03 +01:00
Nicolas Grekas
cffa7be92f Merge branch '3.4' into 4.0
* 3.4:
  [travis] fix php-ext/ location
  throw exception if docblock factory does not exist
2018-02-22 13:30:04 +01:00
Nicolas Grekas
638bb70353 Merge branch '2.8' into 3.4
* 2.8:
  [travis] fix php-ext/ location
2018-02-22 13:28:57 +01:00
Nicolas Grekas
ef8222c1e5 [travis] fix php-ext/ location 2018-02-22 13:24:14 +01:00
Christian Flothmann
99c5b77319 fix merge 2018-02-09 16:04:34 +01:00
Christian Flothmann
064acb6ac3 Merge branch '3.4' into 4.0
* 3.4:
  Env var maps to undefined constant.
  [SecurityBundle] Backport test
  [Security] fix merge of 2.7 into 2.8 + add test case
  backport regression test from 3.4
  do not mock the container builder or definitions
  fixed CS
  [TwigBundle] Register TwigBridge extensions first
  [WebProfilerBundle] Fix sub request link
  PhpDocExtractor::getTypes() throws fatal error when type omitted
  Fix misspelling variable
  use libsodium to run Argon2i related tests
  [DI] minor: use a strict comparision in setDecoratedService
  [HttpKernel] fix FC
  Follow-on to #25825: Fix edge case in getParameterOption.
  keep the context when validating forms
2018-02-09 15:25:12 +01:00
Christian Flothmann
5f9471ef47 use libsodium to run Argon2i related tests 2018-02-06 09:09:00 +01:00
Nicolas Grekas
752c7cbbbe Merge branch '3.4' into 4.0
* 3.4:
  Fix lock strategy tests
  [travis] cache compiled php extensions
  fix merge
  Allow remember-me factory creation when multiple user providers are configured.
  Add tests for glob loaders
  Improve assertions
  [DI][Routing] Fix tracking of globbed resources
  [Config] Handle Service/EventSubscriberInterface in ReflectionClassResource
  always call the parent class' constructor
2018-02-04 14:08:26 +01:00
Nicolas Grekas
f5060c122b Merge branch '2.8' into 3.4
* 2.8:
  [travis] cache compiled php extensions
  fix merge
2018-02-04 14:00:45 +01:00
Nicolas Grekas
b9def8ab50 [travis] cache compiled php extensions 2018-02-04 10:47:47 +01:00
Nicolas Grekas
e1e523bf5d Merge branch '3.4' into 4.0
* 3.4:
  [CssSelector] For AND operator, the left operand should have parentheses, not only right operand
  Removed unused parameter from flattenDataProvider().
  Update MongoDB extension on travis to make the builds green again.
2018-02-03 15:58:37 +01:00
Nicolas Grekas
18510f8352 Merge branch '2.8' into 3.4
* 2.8:
  [CssSelector] For AND operator, the left operand should have parentheses, not only right operand
  Removed unused parameter from flattenDataProvider().
  Update MongoDB extension on travis to make the builds green again.
2018-02-03 15:55:07 +01:00