Commit Graph

420 Commits

Author SHA1 Message Date
Nicolas Grekas ffe49fd160 Merge branch '2.8' into 3.4
* 2.8:
  fix CI
2018-12-06 11:51:10 +00:00
Nicolas Grekas 9b10db2207 fix CI 2018-12-06 11:49:24 +00:00
Nicolas Grekas cb8302cb76 Fix CI 2018-11-29 16:06:32 +01:00
Nicolas Grekas 11053c5e86 Merge branch '2.8' into 3.4
* 2.8:
  fixed CS
  Changes for upcoming Travis' infra migration
  Doc fix: clarify isMethodCacheable() returns true only for GET & HEAD
  [DomCrawler] exclude fields inside "template" tags
  Use XLIFF source rather than resname when there's no target
  [DoctrineBridge] catch errors while converting to db values in data collector
  [DoctrineBridge] fix case sensitivity issue in RememberMe\DoctrineTokenProvider
  Indentation error
  [HttpFoundation] Fix trailing space for mime-type with parameters
  Use intersection type when referring to ParentNodeDefinitionInterface
  [BrowserKit] fixed BC Break for HTTP_HOST header; implemented same behaviour for HTTPS server parameter
2018-11-26 11:17:44 +01:00
Serghei Iakovlev b3742694d9
Changes for upcoming Travis' infra migration
Travis is deprecating the sudo keyword and moves everything to the same
infrastructure (sudo really selects between two infrastructures).

See:
https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration
2018-11-25 15:56:12 +02:00
Nicolas Grekas 85df96a41d Merge branch '2.8' into 3.4
* 2.8:
  Add framework asset changes to upgrade 3.0 guide
  [Travis] Bump ext-mongodb to 1.5.2 on Travis
  bumped Symfony version to 2.8.48
  updated VERSION for 2.8.47
  update CONTRIBUTORS for 2.8.47
  updated CHANGELOG for 2.8.47
2018-11-06 17:04:36 +01:00
Maxime Steinhausser 6e4af32284 [Travis] Bump ext-mongodb to 1.5.2 on Travis 2018-11-06 16:30:18 +01:00
Nicolas Grekas 24a00d84b0 [travis] build libsodium only if it's not already enabled 2018-10-14 11:14:46 -07:00
Nicolas Grekas e170d940d8 Merge branch '2.8' into 3.4
* 2.8:
  [travis][appveyor] fix ter
2018-09-03 14:31:00 +02:00
Nicolas Grekas 74b6689838 [travis][appveyor] fix ter 2018-09-03 14:29:28 +02:00
Nicolas Grekas cbe9822ce8 Merge branch '2.8' into 3.4
* 2.8:
  [travis] disable symfony/flex during phpunit install
2018-08-27 21:14:37 +02:00
Nicolas Grekas 4623fe74ca [travis] disable symfony/flex during phpunit install 2018-08-27 21:11:57 +02:00
Nicolas Grekas f245df404f [travis] enable Redis cluster 2018-08-24 11:22:31 +02:00
Nicolas Grekas caf69aa3c4 [travis] fix composer.lock invalidation for deps=low 2018-08-19 11:09:49 +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
Fabien Potencier e61cb8e14a minor #28199 [travis][appveyor] use symfony/flex to accelerate builds (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[travis][appveyor] use symfony/flex to accelerate builds

| 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        | -

Playing with https://github.com/symfony/flex/pull/409

The optimization is required because appveyor is transiently failing with OOM errors, see e.g.
https://ci.appveyor.com/project/fabpot/symfony/build/1.0.39377

Commits
-------

940ec8f2d5 [travis][appveyor] use symfony/flex to accelerate builds
2018-08-18 18:48:18 +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 4b13fc5d9e 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:35:46 +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 79ce6eae8f fix ci 2018-08-03 15:16:18 +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 fa4d95a3ba [travis] fix requiring mongodb/mongodb before composer up 2018-08-03 14:54:05 +02:00
Nicolas Grekas f50ee9b3dc [travis] fix requiring mongodb/mongodb before composer up 2018-08-03 14:53:54 +02:00
Nicolas Grekas 548e9f71b7 minor #28114 [travis] merge "same Symfony version" jobs in one (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[travis] merge "same Symfony version" jobs in one

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

Allowing to consume fewer jobs and save the 1 to 2 minutes bootstrap time of workers.

Commits
-------

9857ca07aa [travis] merge "same Symfony version" jobs in one
2018-08-03 13:24:48 +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 ced4201b43 [2.7] Make CI green 2018-08-02 08:59:56 +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
Nicolas Grekas 952786af26 [travis] fix libsodium install 2018-02-22 15:57:11 +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 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 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 5f9471ef47 use libsodium to run Argon2i related tests 2018-02-06 09:09:00 +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 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