Merge branch '3.2'

fabpot · fabpot · commit 7a2e419ba26d · 2017-02-16T14:50:29.000-08:00
* 3.2:
  Revert "bug #21436 [DependencyInjection] check for circular refs caused by method calls (xabbuh)"
  Static code analysis with Php Inspections (EA Extended)
  [VarDumper] Added missing persistent stream cast
  remove unused translation file
  reverted usage of isNan
diff --git a/Tests/DataCollectorTranslatorTest.php b/Tests/DataCollectorTranslatorTest.php
@@ -86,8 +86,6 @@ private function createCollector()
         $translator->addResource('array', array('bar' => 'bar (fr)'), 'fr');
         $translator->addResource('array', array('bar_ru' => 'bar (ru)'), 'ru');
 
-        $collector = new DataCollectorTranslator($translator);
-
-        return $collector;
+        return new DataCollectorTranslator($translator);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -86,8 +86,6 @@ private function createCollector()`
`86`	`86`	`$translator->addResource('array', array('bar' => 'bar (fr)'), 'fr');`
`87`	`87`	`$translator->addResource('array', array('bar_ru' => 'bar (ru)'), 'ru');`
`88`	`88`
`89`		`- $collector = new DataCollectorTranslator($translator);`
`90`		`-`
`91`		`- return $collector;`
	`89`	`+ return new DataCollectorTranslator($translator);`
`92`	`90`	`}`
`93`	`91`	`}`