Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 90431e78e2db · 2019-11-17T22:56:13.000+01:00
* 3.4:
  [Finder] Fixed docs
  Fix PR template
  Adjust pull request template for 5.0 branchout
  Update HttpKernel.php
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
 | 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
 | New feature?  | yes/no <!-- please update 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).
  - 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.)
- - Features and deprecations must be submitted against branch 4.4.
- - Legacy code removals go to the master branch.
+ - Features and deprecations must be submitted against branch master.
 -->
diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
@@ -793,7 +793,7 @@ private function searchInDirectory(string $dir): \Iterator
     /**
      * Normalizes given directory names by removing trailing slashes.
      *
-     * Excluding: (s)ftp:// wrapper
+     * Excluding: (s)ftp:// or ssh2.(s)ftp:// wrapper
      *
      * @param string $dir
      *
diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -62,7 +62,7 @@ public function __construct(EventDispatcherInterface $dispatcher, ControllerReso
      */
     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 {
             return $this->handleRaw($request, $type);

Original file line number	Diff line number	Diff line change
`@@ -793,7 +793,7 @@ private function searchInDirectory(string $dir): \Iterator`
`793`	`793`	`/**`
`794`	`794`	`* Normalizes given directory names by removing trailing slashes.`
`795`	`795`	`*`
`796`		`- * Excluding: (s)ftp:// wrapper`
	`796`	`+ * Excluding: (s)ftp:// or ssh2.(s)ftp:// wrapper`
`797`	`797`	`*`
`798`	`798`	`* @param string $dir`
`799`	`799`	`*`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function __construct(EventDispatcherInterface $dispatcher, ControllerReso`
`62`	`62`	`*/`
`63`	`63`	`public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)`
`64`	`64`	`{`
`65`		`- $request->headers->set('X-Php-Ob-Level', ob_get_level());`
	`65`	`+ $request->headers->set('X-Php-Ob-Level', (string) ob_get_level());`
`66`	`66`
`67`	`67`	`try {`
`68`	`68`	`return $this->handleRaw($request, $type);`