fix handling of a default 'template' as a string
Comment fixed: RedrawFrequency is measured in steps.
ProgressHelper shows percentage complete.

In the past the value was rounded, the progressbar ended up being 100% for 0.5%
of the total execution time. That means 18 seconds on a 1 hour process.
merged branch lsmith77/fix_include_default_text (PR #8445)

This PR was merged into the 2.2 branch.

Discussion
----------

Fix include default text

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: [![Build Status](https://travis-ci.org/lsmith77/symfony.png?branch=fix_include_default_text)](https://travis-ci.org/lsmith77/symfony)
Fixes the following tickets: -
License of the code: MIT

Commits
-------

9d1004b fix handling of a default 'template' as a string
merged branch reenl/fix-round-issues (PR #8447)

This PR was merged into the 2.2 branch.

Discussion
----------

[Console] Show completed percentage, not a rounded value.

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

This pull request has 2 minor changes:
- 199/200 => 99% instead of 100% (there was no test case and I added one, everything else passes) In the past the value was rounded, the progress bar ended up being 100% for 0.5% of the total execution time. That means 18 seconds on a 1 hour process.
- Fixed the comments to match the inner workings of RedrawFrequency.

First Symfony PR and second overall so hope I just did this the right way.

PR #8419 Rebased for 2.2

Commits
-------

91bb757 ProgressHelper shows percentage complete.
40591b9 Comment fixed: RedrawFrequency is measured in steps.
fixed inline fragment renderer
merged branch jfsimon/issue-8450 (PR #8462)

This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8462).

Discussion
----------

[HttpKernel] fixed inline fragment renderer

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

Commits
-------

1554f1f [HttpKernel] fixed inline fragment renderer
[HttpKernel] changed the fragment handler to explicitely disallow non-scalar in generated URIs (refs #8263)
[HtppKernel] fixed inline fragment renderer
Fixing configuration validation error messages.

The min and max validation functions lead to incorrect error messages.
merged branch seiffert/master (PR #8465)

This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8465).

Discussion
----------

[Config] Fixed error messages of min/max validation methods

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

This PR fixes the error messages of the configuration validation methods `min` and `max`. The error message was "Should be greater/less than: <value>" but should be "Should be greater/less than or equal to <value>".

Commits
-------

3395837 Fixing configuration validation error messages.
[Yaml] removed wrong comment removal inside a string block
merged branch jfsimon/issue-8450 (PR #8468)

This PR was merged into the 2.2 branch.

Discussion
----------

[HtppKernel] fixed inline fragment renderer

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

Commits
-------

2dc1ee0 [HtppKernel] fixed inline fragment renderer
merged branch jfsimon/issue-8145 (PR #8472)

This PR was merged into the 2.2 branch.

Discussion
----------

[Yaml] removed wrong comment removal inside a string block

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

Commits
-------

9c5f8c6 [Yaml] removed wrong comment removal inside a string block
Just a Typo
merged branch mborgmann/patch-2 (PR #8476)

This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8476).

Discussion
----------

Just a typo

Just a typo in the doc

Commits
-------

fdaf59f Just a Typo
Reverts JSON_NUMERIC_CHECK

We shouldn't be coercing types.
merged branch genexp/master (PR #8477)

This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8477).

Discussion
----------

Reverts recent change that added type coercion for JSON responses

We shouldn't be coercing primitive in the array provided to setData.

Commits
-------

02e6aef Reverts JSON_NUMERIC_CHECK
Merge branch '2.2' into 2.3

* 2.2:
  Reverts JSON_NUMERIC_CHECK
  Just a Typo
  [Yaml] removed wrong comment removal inside a string block
  Fixing configuration validation error messages.
  [HtppKernel] fixed inline fragment renderer
  fixed inline fragment renderer
  ProgressHelper shows percentage complete.
  Comment fixed: RedrawFrequency is measured in steps.
  fix handling of a default 'template' as a string

Conflicts:
	src/Symfony/Component/Console/Helper/ProgressHelper.php
	src/Symfony/Component/Console/Tests/Helper/ProgressHelperTest.php
	src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php
	src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
Merge branch '2.3'

* 2.3:
  Reverts JSON_NUMERIC_CHECK
  Just a Typo
  [Yaml] removed wrong comment removal inside a string block
  Fixing configuration validation error messages.
  [HtppKernel] fixed inline fragment renderer
  fixed inline fragment renderer
  ProgressHelper shows percentage complete.
  Comment fixed: RedrawFrequency is measured in steps.
  fix handling of a default 'template' as a string

Conflicts:
	src/Symfony/Component/Console/Tests/Helper/ProgressHelperTest.php