Commit Graph

417 Commits

Author SHA1 Message Date
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
Alexander M. Turek e0132cc5d7 Update MongoDB extension on travis to make the builds green again. 2018-02-02 12:44:37 +01:00
Nicolas Grekas 5d9996457b Merge branch '2.8' into 3.3
* 2.8:
  [HttpKernel] DebugHandlersListener should always replace the existing exception handler
2018-01-18 23:16:35 +01:00
Nicolas Grekas a4ddcc298d [HttpKernel] DebugHandlersListener should always replace the existing exception handler 2018-01-18 23:01:50 +01:00
Samuel ROZE b410a3662c [Process] Fix broken tests for PHP 7.2 2017-11-06 15:55:48 +01:00
Nicolas Grekas a3b136a938 dont use 7.2, it breaks for now 2017-10-10 22:06:02 +02:00
Nicolas Grekas 2ab092034b Merge branch '3.4'
* 3.4:
  fix merge
  fix merge
  [FORM] Prevent forms from extending itself as a parent
  fix merge
  Fix 7.2 compat layer
  [DI] Prefixed env vars and load time inlining are incompatible
  bug #24499 [Bridge\PhpUnit] Fix infinite loop when running isolated method (bis) (nicolas-grekas)
  Fix PHP 7.2 support
  [HttpFoundation] Add missing session.lazy_write config option
  [DI] Exclude inline services declared in XML from autowiring candidates
  [HttpFoundation] Combine Cache-Control headers
  [Form] fix parsing invalid floating point numbers
  Escape command usage when displaying it in the text descriptor
  [DI] Throw accurate failures when accessing removed services
  [DI] Turn private defs to non-public ones before removing passes
  Use for=ID on radio/checkbox label.
2017-10-10 16:32:10 +02:00
Nicolas Grekas 01c50eb070 Merge branch '2.8' into 3.3
* 2.8:
  fix merge
  Fix 7.2 compat layer
  Fix PHP 7.2 support
  [HttpFoundation] Add missing session.lazy_write config option
  [HttpFoundation] Combine Cache-Control headers
  [Form] fix parsing invalid floating point numbers
  Escape command usage when displaying it in the text descriptor
  Use for=ID on radio/checkbox label.
2017-10-10 12:12:32 +02:00
Nicolas Grekas fdf285b5c9 Fix 7.2 compat layer 2017-10-09 20:05:34 +02:00
Amrouche Hamza e229dd0302 Fix PHP 7.2 support 2017-10-09 12:03:31 +02:00
Nicolas Grekas 19e5ed1bcf Merge branch '2.8' into 3.3
* 2.8:
  Fix travis php7.0
2017-09-13 13:42:46 +02:00
Nicolas Grekas 86eb10c413 Fix travis php7.0 2017-09-13 13:41:56 +02:00
Nicolas Grekas 80dbe74b22 Merge branch '3.4'
* 3.4:
  [travis] fix minor php7.0 version
  [travis] add ldap.so for php70
  [HttpFoundation] Fix logic when JsonSerializable is missing
  [travis] update to trusty
  Add help description to debug:form command
  Don't use return on Assert::markTestSkipped.
  [TwigBridge] Show Twig's loader paths on debug:twig command
  [FrameworkBundle] Fix Di config to allow for more private services
  Create directories recursively in the PHPUnit bridge
  [Dotenv] Add a BC break note
  [Cache] Use options from Memcached DSN
  Fix ArrayInput::toString() for VALUE_IS_ARRAY options/args
  be able to enable workflow support explicitly
  [Yaml] add inline parser context initializer
  [ExpressionLanguage] throws an exception on calling uncallable method
2017-09-06 21:16:37 +02:00
Nicolas Grekas e565c6de00 Merge branch '3.3' into 3.4
* 3.3:
  [travis] fix minor php7.0 version
  [travis] add ldap.so for php70
  [HttpFoundation] Fix logic when JsonSerializable is missing
  [travis] update to trusty
  Don't use return on Assert::markTestSkipped.
  Create directories recursively in the PHPUnit bridge
  [Dotenv] Add a BC break note
  Fix ArrayInput::toString() for VALUE_IS_ARRAY options/args
  [ExpressionLanguage] throws an exception on calling uncallable method
2017-09-06 21:03:12 +02:00
Nicolas Grekas 07933655e8 [travis] fix minor php7.0 version 2017-09-06 20:49:53 +02:00
Nicolas Grekas 9431a38cfc Merge branch '2.8' into 3.3
* 2.8:
  [travis] add ldap.so for php70
  [HttpFoundation] Fix logic when JsonSerializable is missing
2017-09-06 19:07:39 +02:00
Nicolas Grekas e4ce14d073 [travis] add ldap.so for php70 2017-09-06 19:03:33 +02:00
Nicolas Grekas 87b3b1a685 Merge branch '2.8' into 3.3
* 2.8:
  [travis] update to trusty
  Fix ArrayInput::toString() for VALUE_IS_ARRAY options/args
  [ExpressionLanguage] throws an exception on calling uncallable method
2017-09-06 18:40:18 +02:00
Nicolas Grekas cfc9346f66 [travis] update to trusty 2017-09-06 17:42:52 +02:00