Merge branch '2.8' into 3.4

nicolas-grekas · nicolas-grekas · commit f31333bdff54 · 2018-10-02T14:28:39.000+02:00
* 2.8:
  [php_cs] disable fopen_flags
  [CS] Remove unused variables passed to closures
  [CS] Remove empty comment
  [CS] Enforces null type hint on last position in phpDocs
  [CS] Use combined assignment operators when possible
  Fix a typo in error messages
  [Console] Add missing null to input values allowed types
  [PHPUnitBridge] Fix microtime() format
  bumped Symfony version to 2.8.47
  update CONTRIBUTORS for 2.8.46
  updated VERSION for 2.8.46
  updated CHANGELOG for 2.8.46
diff --git a/ClassCollectionLoader.php b/ClassCollectionLoader.php
@@ -56,7 +56,7 @@ public static function load($classes, $cacheDir, $name, $autoReload, $adaptive =
             $classes = array_diff($classes, $declared);
 
             // the cache is different depending on which classes are already declared
-            $name = $name.'-'.substr(hash('sha256', implode('|', $classes)), 0, 5);
+            $name .= '-'.substr(hash('sha256', implode('|', $classes)), 0, 5);
         }
 
         $classes = array_unique($classes);

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public static function load($classes, $cacheDir, $name, $autoReload, $adaptive =`
`56`	`56`	`$classes = array_diff($classes, $declared);`
`57`	`57`
`58`	`58`	`// the cache is different depending on which classes are already declared`
`59`		`-$name = $name.'-'.substr(hash('sha256', implode('\|', $classes)), 0, 5);`
	`59`	`+$name .= '-'.substr(hash('sha256', implode('\|', $classes)), 0, 5);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`$classes = array_unique($classes);`