Merge branch '3.4' into 4.0

nicolas-grekas · nicolas-grekas · commit 010924d3eda8 · 2018-06-19T22:54:48.000+02:00
* 3.4:
  [HttpKernel] fix PHP 5.4 compat
  Fix surrogate not using original request
  [Finder] Update RealIteratorTestCase
  [Routing] remove unneeded dev dep on doctrine/common
  [minor] SCA
  [Validator] Remove BOM in some xlf files
  Fix #27378: Error when rendering a DateIntervalType form with exactly 0 weeks
  [HttpKernel] fix session tracking in surrogate master requests
diff --git a/Console/Descriptor/TextDescriptor.php b/Console/Descriptor/TextDescriptor.php
@@ -311,7 +311,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
         $tableRows[] = array('Autoconfigured', $definition->isAutoconfigured() ? 'yes' : 'no');
 
         if ($definition->getFile()) {
-            $tableRows[] = array('Required File', $definition->getFile() ? $definition->getFile() : '-');
+            $tableRows[] = array('Required File', $definition->getFile() ?: '-');
         }
 
         if ($factory = $definition->getFactory()) {

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ protected function describeContainerDefinition(Definition $definition, array $op`
`311`	`311`	`$tableRows[] = array('Autoconfigured', $definition->isAutoconfigured() ? 'yes' : 'no');`
`312`	`312`
`313`	`313`	`if ($definition->getFile()) {`
`314`		`- $tableRows[] = array('Required File', $definition->getFile() ? $definition->getFile() : '-');`
	`314`	`+ $tableRows[] = array('Required File', $definition->getFile() ?: '-');`
`315`	`315`	`}`
`316`	`316`
`317`	`317`	`if ($factory = $definition->getFactory()) {`