diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.3' into 4.4 

* 4.3:
  [Finder] Fixed docs
  Fix PR template
  Adjust pull request template for 5.0 branchout
  Update HttpKernel.php
This commit is contained in:
Nicolas Grekas 2019-11-17 22:56:56 +01:00
parent 7ed6d35f2c 90431e78e2
commit 80e4ed1a32
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@ -1,6 +1,6 @@
| Q | A | Q | A
| ------------- | --- | ------------- | ---
| Branch? | 4.4 for features / 3.4 or 4.3 for bug fixes <!-- see below --> | Branch? | master for features / 3.4, 4.3, 4.4 or 5.0 for bug fixes <!-- see below -->
| Bug fix? | yes/no | Bug fix? | yes/no
| New feature? | yes/no <!-- please update src/**/CHANGELOG.md files --> | New feature? | yes/no <!-- please update src/**/CHANGELOG.md files -->
| Deprecations? | yes/no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Deprecations? | yes/no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
@ -16,6 +16,5 @@ Additionally (see https://symfony.com/roadmap):
- Never break backward compatibility (see https://symfony.com/bc). - Never break backward compatibility (see https://symfony.com/bc).
- Bug fixes must be submitted against the lowest maintained branch where they apply - Bug fixes must be submitted against the lowest maintained branch where they apply
(lowest branches are regularly merged to upper ones so they get the fixes too.) (lowest branches are regularly merged to upper ones so they get the fixes too.)
- Features and deprecations must be submitted against branch 4.4. - Features and deprecations must be submitted against branch master.
- Legacy code removals go to the master branch.
--> -->

2
src/Symfony/Component/Finder/Finder.php
View File

@ -793,7 +793,7 @@ class Finder implements \IteratorAggregate, \Countable
/** /**
* Normalizes given directory names by removing trailing slashes. * Normalizes given directory names by removing trailing slashes.
* *
* Excluding: (s)ftp:// wrapper * Excluding: (s)ftp:// or ssh2.(s)ftp:// wrapper
*/ */
private function normalizeDir(string $dir): string private function normalizeDir(string $dir): string
{ {

2
src/Symfony/Component/HttpKernel/HttpKernel.php
View File

@ -62,7 +62,7 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
*/ */
public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true) public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
{ {
$request->headers->set('X-Php-Ob-Level', ob_get_level()); $request->headers->set('X-Php-Ob-Level', (string) ob_get_level());
try { try {
return $this->handleRaw($request, $type); return $this->handleRaw($request, $type);