Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 89f8e4535d03 · 2019-08-15T10:50:12.000+02:00
* 3.4:
  [ProxyManager] fix closure binding
  [VarDumper] fix annotations
  [Console] fixed a PHP notice when there is no function
diff --git a/Translation/Translator.php b/Translation/Translator.php
@@ -123,6 +123,9 @@ protected function initializeCatalogue($locale)
         parent::initializeCatalogue($locale);
     }
 
+    /**
+     * @internal
+     */
     protected function doLoadCatalogue($locale): void
     {
         parent::doLoadCatalogue($locale);

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,9 @@ protected function initializeCatalogue($locale)`
`123`	`123`	`parent::initializeCatalogue($locale);`
`124`	`124`	`}`
`125`	`125`
	`126`	`+ /**`
	`127`	`+ * @internal`
	`128`	`+ */`
`126`	`129`	`protected function doLoadCatalogue($locale): void`
`127`	`130`	`{`
`128`	`131`	`parent::doLoadCatalogue($locale);`