Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 8af2a2242c9d · 2019-08-19T13:14:47.000+02:00
* 3.4:
  [Routing] Add a param annotation for $annot.
  [DI] fix docblock
  Add missing translations for Armenian locale
  [Process] Doc block backport.
  Fix some docblocks.
diff --git a/Filesystem.php b/Filesystem.php
@@ -742,6 +742,11 @@ private function getSchemeAndHierarchy(string $filename): array
         return 2 === \count($components) ? [$components[0], $components[1]] : [null, $components[0]];
     }
 
+    /**
+     * @param callable $func
+     *
+     * @return mixed
+     */
     private static function box($func)
     {
         self::$lastError = null;

Original file line number	Diff line number	Diff line change
`@@ -742,6 +742,11 @@ private function getSchemeAndHierarchy(string $filename): array`
`742`	`742`	`return 2 === \count($components) ? [$components[0], $components[1]] : [null, $components[0]];`
`743`	`743`	`}`
`744`	`744`
	`745`	`+ /**`
	`746`	`+ * @param callable $func`
	`747`	`+ *`
	`748`	`+ * @return mixed`
	`749`	`+ */`
`745`	`750`	`private static function box($func)`
`746`	`751`	`{`
`747`	`752`	`self::$lastError = null;`