Commit Graph

3936 Commits

Author SHA1 Message Date
Nicolas Grekas
3ac90c172a Merge branch '3.4' into 4.1
* 3.4:
  [HttpKernel] fix forwarding trusted headers as server parameters
2018-08-24 16:41:24 +02:00
Nicolas Grekas
96e0833b93 Merge branch '2.8' into 3.4
* 2.8:
  [HttpKernel] fix forwarding trusted headers as server parameters
2018-08-24 16:37:40 +02:00
Nicolas Grekas
92953485a5 [HttpKernel] fix forwarding trusted headers as server parameters 2018-08-22 17:45:23 +02:00
Fabien Potencier
75ece97d37 bumped Symfony version to 4.1.4 2018-08-01 17:34:03 +02:00
Fabien Potencier
d8da36c6ed updated VERSION for 4.1.3 2018-08-01 17:30:34 +02:00
Fabien Potencier
9d7d3e7124 bumped Symfony version to 3.4.15 2018-08-01 16:55:31 +02:00
Fabien Potencier
2aa9ef0b48 updated VERSION for 3.4.14 2018-08-01 16:47:47 +02:00
Fabien Potencier
3ff6e333dd bumped Symfony version to 2.8.45 2018-08-01 16:46:30 +02:00
Fabien Potencier
4abd3a8eb0 updated VERSION for 2.8.44 2018-08-01 16:12:31 +02:00
Nicolas Grekas
96504fb8c9 Merge branch '4.0' into 4.1
* 4.0:
  [HttpKernel] fix trusted headers management in HttpCache and InlineFragmentRenderer
2018-08-01 16:07:44 +02:00
Nicolas Grekas
974240e178 Merge branch '3.4' into 4.0
* 3.4:
  [HttpKernel] fix trusted headers management in HttpCache and InlineFragmentRenderer
2018-08-01 16:06:38 +02:00
Nicolas Grekas
bcf5897bb1 Merge branch '2.8' into 3.4
* 2.8:
  [HttpKernel] fix trusted headers management in HttpCache and InlineFragmentRenderer
2018-08-01 16:04:26 +02:00
Nicolas Grekas
725dee4cd8 [HttpKernel] fix trusted headers management in HttpCache and InlineFragmentRenderer 2018-08-01 15:47:49 +02:00
Nicolas Grekas
1d3f835e05 Merge branch '4.0' into 4.1
* 4.0:
  [HttpKernel] Fixed invalid REMOTE_ADDR in inline subrequest when configuring trusted proxy with subnet
  [FrameworkBundle] fixed guard event names for transitions
  [DI] Improve class named servics error message
  [HttpFoundation] fixed using _method parameter with invalid type
  [Intl] Replace svn with git in the icu data update script
  [HttpFoundation] Fix Cookie::isCleared
2018-08-01 10:24:03 +02:00
Nicolas Grekas
e0ce427aef Merge branch '3.4' into 4.0
* 3.4:
  [HttpKernel] Fixed invalid REMOTE_ADDR in inline subrequest when configuring trusted proxy with subnet
  [FrameworkBundle] fixed guard event names for transitions
  [DI] Improve class named servics error message
  [HttpFoundation] fixed using _method parameter with invalid type
  [Intl] Replace svn with git in the icu data update script
  [HttpFoundation] Fix Cookie::isCleared
2018-08-01 10:23:45 +02:00
Nicolas Grekas
7e3603dc38 Merge branch '2.8' into 3.4
* 2.8:
  [HttpKernel] Fixed invalid REMOTE_ADDR in inline subrequest when configuring trusted proxy with subnet
  [HttpFoundation] fixed using _method parameter with invalid type
  [Intl] Replace svn with git in the icu data update script
  [HttpFoundation] Fix Cookie::isCleared
2018-07-31 11:47:14 +02:00
Zacharias Luiten
f657dd2444 [HttpKernel] Fixed invalid REMOTE_ADDR in inline subrequest when configuring trusted proxy with subnet 2018-07-31 11:18:51 +02:00
Ryan Weaver
b5ffb305a7 Renaming internal test class to help auto-completion 2018-07-27 10:58:22 -04:00
Nicolas Grekas
c4d10c4d4d Merge branch '4.0' into 4.1
* 4.0:
  Enable native_constant_invocation CS fixer
2018-07-26 13:24:31 +02:00
Nicolas Grekas
b5143233d2 Merge branch '3.4' into 4.0
* 3.4:
  Enable native_constant_invocation CS fixer
2018-07-26 13:22:46 +02:00
Nicolas Grekas
f569f58b66 Merge branch '2.8' into 3.4
* 2.8:
  Enable native_constant_invocation CS fixer
2018-07-26 13:19:56 +02:00
Nicolas Grekas
2ba0fa4a14 Enable native_constant_invocation CS fixer 2018-07-26 13:13:39 +02:00
Nicolas Grekas
bf7e25f759 Fix tests for legacy phpunit versions 2018-07-26 12:58:07 +02:00
Nicolas Grekas
a23a4a4398 Merge branch '4.0' into 4.1
* 4.0:
  Alpha-ordering for "use" statements
2018-07-26 11:10:45 +02:00
Nicolas Grekas
6b7e951fdc Merge branch '3.4' into 4.0
* 3.4:
  Alpha-ordering for "use" statements
2018-07-26 11:08:35 +02:00
Nicolas Grekas
7b80bc2c78 Merge branch '2.8' into 3.4
* 2.8:
  Alpha-ordering for "use" statements
2018-07-26 11:06:28 +02:00
Nicolas Grekas
528eef336b Alpha-ordering for "use" statements 2018-07-26 11:03:18 +02:00
Nicolas Grekas
933b774844 Merge branch '4.0' into 4.1
* 4.0:
  Fix Clidumper tests
  Enable the fixer enforcing fully-qualified calls for compiler-optimized functions
  Apply fixers
  Disable the native_constant_invocation fixer until it can be scoped
  Update the list of excluded files for the CS fixer
2018-07-26 10:55:25 +02:00
Nicolas Grekas
b9433001cb Merge branch '3.4' into 4.0
* 3.4:
  Fix Clidumper tests
  Enable the fixer enforcing fully-qualified calls for compiler-optimized functions
  Apply fixers
  Disable the native_constant_invocation fixer until it can be scoped
  Update the list of excluded files for the CS fixer
2018-07-26 10:51:09 +02:00
Nicolas Grekas
f5939a8336 Merge branch '2.8' into 3.4
* 2.8:
  Fix Clidumper tests
  Enable the fixer enforcing fully-qualified calls for compiler-optimized functions
  Apply fixers
  Disable the native_constant_invocation fixer until it can be scoped
  Update the list of excluded files for the CS fixer
2018-07-26 10:45:46 +02:00
Nicolas Grekas
8305d615ab fix merge 2018-07-26 10:28:23 +02:00
Nicolas Grekas
abe2a237a0 Merge branch '4.0' into 4.1
* 4.0:
  [HttpKernel] Fix merging bindings for controllers' locators
  bumped Symfony version to 4.0.14
  updated VERSION for 4.0.13
  updated CHANGELOG for 4.0.13
  bumped Symfony version to 3.4.14
  updated VERSION for 3.4.13
  updated CHANGELOG for 3.4.13
  bumped Symfony version to 2.8.44
2018-07-26 10:24:24 +02:00
Nicolas Grekas
cdc4f7ddd1 bumped Symfony version to 4.1.3 2018-07-26 10:23:27 +02:00
Nicolas Grekas
097ac83a50 Merge branch '3.4' into 4.0
* 3.4:
  [HttpKernel] Fix merging bindings for controllers' locators
  bumped Symfony version to 3.4.14
  updated VERSION for 3.4.13
  updated CHANGELOG for 3.4.13
  bumped Symfony version to 2.8.44
2018-07-26 10:19:20 +02:00
Nicolas Grekas
1b9baa48bd bug #28052 [HttpKernel] Fix merging bindings for controllers' locators (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[HttpKernel] Fix merging bindings for controllers' locators

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

Commits
-------

94b620ebc2 [HttpKernel] Fix merging bindings for controllers' locators
2018-07-25 10:23:09 +02:00
Christophe Coevoet
04654cfeb3 Enable the fixer enforcing fully-qualified calls for compiler-optimized functions 2018-07-24 12:05:38 +02:00
Nicolas Grekas
94b620ebc2 [HttpKernel] Fix merging bindings for controllers' locators 2018-07-24 09:03:36 +02:00
Fabien Potencier
971445977f updated VERSION for 4.1.2 2018-07-23 19:16:22 +02:00
Fabien Potencier
b067f31147 bumped Symfony version to 4.0.14 2018-07-23 19:15:26 +02:00
Fabien Potencier
89959a4ca1 updated VERSION for 4.0.13 2018-07-23 19:12:53 +02:00
Fabien Potencier
0ff03c9b3d bumped Symfony version to 3.4.14 2018-07-23 19:11:49 +02:00
Fabien Potencier
7446a290ad updated VERSION for 3.4.13 2018-07-23 18:37:31 +02:00
Fabien Potencier
a57549d0a1 bumped Symfony version to 2.8.44 2018-07-23 16:56:24 +02:00
Nicolas Grekas
53d64d7a99 Merge branch '4.0' into 4.1
* 4.0:
  updated VERSION for 2.8.43
  update CONTRIBUTORS for 2.8.43
  updated CHANGELOG for 2.8.43
  backported translations
  Fixed templateExists on parse error of the template name
2018-07-23 13:38:29 +02:00
Nicolas Grekas
dcf55f4f22 Merge branch '3.4' into 4.0
* 3.4:
  updated VERSION for 2.8.43
  update CONTRIBUTORS for 2.8.43
  updated CHANGELOG for 2.8.43
  backported translations
  Fixed templateExists on parse error of the template name
2018-07-23 13:38:04 +02:00
Nicolas Grekas
d61bedabd5 Merge branch '2.8' into 3.4
* 2.8:
  updated VERSION for 2.8.43
  update CONTRIBUTORS for 2.8.43
  updated CHANGELOG for 2.8.43
  backported translations
  Fixed templateExists on parse error of the template name
2018-07-23 13:36:14 +02:00
Fabien Potencier
78ef2a0740 updated VERSION for 2.8.43 2018-07-23 11:02:45 +02:00
Fabien Potencier
b2ec4aaf76 bug #28005 [HttpKernel] Fixed templateExists on parse error of the template name (yceruto)
This PR was merged into the 2.8 branch.

Discussion
----------

[HttpKernel] Fixed templateExists on parse error of the template name

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

9bfa971bc5/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php (L49-L51)

Commits
-------

53347c42fd Fixed templateExists on parse error of the template name
2018-07-23 10:31:26 +02:00
Fabien Potencier
47aba84899 Merge branch '4.0' into 4.1
* 4.0:
  fixed UUID error message id in translation files
  Add several missing translations of the UUID validation message.
  Serbo-Croatian has Serbian plural rule
  [Validator] Add missing UUID validator message translation (hu)
  [Validator] Add missing UUID validator message translation (en)
  add missing translation for uuid validator
  Fix false-positive deprecation notices for TranslationLoader and WriteCheckSessionHandler
  Fix PHPDoc return type
  [MonologBridge] Improve FirePHPHandler
  Fix SVGs not scaling in IE9, IE10, and IE11
2018-07-23 10:20:20 +02:00
Fabien Potencier
ffb28a360d Merge branch '3.4' into 4.0
* 3.4:
  fixed UUID error message id in translation files
  Add several missing translations of the UUID validation message.
  Serbo-Croatian has Serbian plural rule
  [Validator] Add missing UUID validator message translation (hu)
  [Validator] Add missing UUID validator message translation (en)
  add missing translation for uuid validator
  Fix false-positive deprecation notices for TranslationLoader and WriteCheckSessionHandler
  Fix PHPDoc return type
  [MonologBridge] Improve FirePHPHandler
  Fix SVGs not scaling in IE9, IE10, and IE11
2018-07-23 10:19:18 +02:00