Merge branch '4.4' into 5.2

nicolas-grekas · nicolas-grekas · commit e8fbbab7c4a7 · 2021-05-07T15:41:16.000+02:00
* 4.4:
  [Config][DependencyInjection] Uniformize trailing slash handling
  [PropertyInfo] Make ReflectionExtractor correctly extract nullability
  [PropertyInfo] fix attribute namespace with recursive traits
  Check redis extension version
  [Security] Update Russian translations
  [VarExporter] Add support of PHP enumerations
  [Security] Added missing Japanese translations
  [Security] Added missing Polish translations
  [Security] Add missing Italian translations #41051
  [Security] Missing translations pt_BR
  getProtocolVersion may return null
  [Translation] Set default locale for IdentityTranslatorTest
diff --git a/Request.php b/Request.php
@@ -1503,7 +1503,7 @@ public function isMethodCacheable()
      * if the proxy is trusted (see "setTrustedProxies()"), otherwise it returns
      * the latter (from the "SERVER_PROTOCOL" server parameter).
      *
-     * @return string
+     * @return string|null
      */
     public function getProtocolVersion()
     {

Original file line number	Diff line number	Diff line change
`@@ -1503,7 +1503,7 @@ public function isMethodCacheable()`
`1503`	`1503`	`* if the proxy is trusted (see "setTrustedProxies()"), otherwise it returns`
`1504`	`1504`	`* the latter (from the "SERVER_PROTOCOL" server parameter).`
`1505`	`1505`	`*`
`1506`		`- * @return string`
	`1506`	`+ * @return string\|null`
`1507`	`1507`	`*/`
`1508`	`1508`	`public function getProtocolVersion()`
`1509`	`1509`	`{`