Merge branch '4.4' into 5.0

* 4.4: [Finder] Fixed docs Fix PR template Adjust pull request template for 5.0 branchout Update HttpKernel.php bumped Symfony version to 4.4.0 updated VERSION for 4.4.0-RC1 updated CHANGELOG for 4.4.0-RC1
symfony · Nov 17, 2019 · eb4f5a8 · eb4f5a8
2 parents 10aac86 + 80e4ed1
commit eb4f5a8
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
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.
+ - Features and deprecations must be submitted against branch master.
- - Legacy code removals go to the master branch.
 -->
diff --git a/CHANGELOG-4.4.md b/CHANGELOG-4.4.md
@@ -7,6 +7,30 @@ in 4.4 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v4.4.0...v4.4.1
 
+* 4.4.0-RC1 (2019-11-17)
+
+ * bug #34419 [Cache] Disable igbinary on PHP >= 7.4 (nicolas-grekas)
+ * bug #34347 [Messenger] Perform no deep merging of bus middleware (vudaltsov)
+ * bug #34366 [HttpFoundation] Allow redirecting to URLs that contain a semicolon (JayBizzle)
+ * feature #34405 [HttpFoundation] Added possibility to configure expiration time in redis session handler (mantulo)
+ * bug #34397 [FrameworkBundle] Remove project dir from Translator cache vary scanned directories (fancyweb)
+ * bug #34384 [DoctrineBridge] Improve queries parameters display in Profiler (fancyweb)
+ * bug #34408 [Cache] catch exceptions when using PDO directly (xabbuh)
+ * bug #34411 [HttpKernel] Flatten "exception" controller argument if not typed (chalasr)
+ * bug #34410 [HttpFoundation] Fix MySQL column type definition. (jbroutier)
+ * bug #34403 [Cache] Redis Tag Aware warn on wrong eviction policy (andrerom)
+ * bug #34400 [HttpKernel] collect bundle classes, not paths (nicolas-grekas)
+ * bug #34398 [Config] fix id-generation for GlobResource (nicolas-grekas)
+ * bug #34404 [HttpClient] fix HttpClientDataCollector (nicolas-grekas)
+ * bug #34396 [Finder] Allow ssh2 stream wrapper for sftp (damienalexandre)
+ * bug #34383 [DI] Use reproducible entropy to generate env placeholders (nicolas-grekas)
+ * bug #34389 [WebProfilerBundle] add FrameworkBundle requirement (xabbuh)
+ * bug #34381 [WebProfilerBundle] Require symfony/twig-bundle (fancyweb)
+ * bug #34358  [Security] always check the token on non-lazy firewalls  (nicolas-grekas, lyrixx)
+ * bug #34390 [FrameworkBundle] fix wiring of httplug client (nicolas-grekas)
+ * bug #34369 [FrameworkBundle] Disallow WebProfilerBundle < 4.4 (derrabus)
+ * bug #34370 [DI] fix detecting singly implemented interfaces (nicolas-grekas)
+
 * 4.4.0-BETA2 (2019-11-13)
 
  * bug #34344 [Console] Constant STDOUT might be undefined (nicolas-grekas)

diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
@@ -778,7 +778,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
      */
     private function normalizeDir(string $dir): string
     {

diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -61,7 +61,7 @@ public function __construct(EventDispatcherInterface $dispatcher, ControllerReso
      */
     public function handle(Request $request, int $type = HttpKernelInterface::MASTER_REQUEST, bool $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);