Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 7ee111760fb8 · 2018-01-03T18:12:09.000+01:00
* 2.7:
  PHP CS Fixer: clean up repo and adjust config
  Dumper shouldn't use html format for phpdbg
  [Validator] Fix access to root object when using composite constraint
diff --git a/Translation/Translator.php b/Translation/Translator.php
@@ -46,6 +46,8 @@ class Translator extends BaseTranslator implements WarmableInterface
     private $resources = array();
 
     /**
+     * Constructor.
+     *
      * Available options:
      *
      *   * cache_dir: The cache directory (or null to disable caching)

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@ class Translator extends BaseTranslator implements WarmableInterface`
`46`	`46`	`private $resources = array();`
`47`	`47`
`48`	`48`	`/**`
	`49`	`+ * Constructor.`
	`50`	`+ *`
`49`	`51`	`* Available options:`
`50`	`52`	`*`
`51`	`53`	`* * cache_dir: The cache directory (or null to disable caching)`