Merge branch '4.0' into 4.1

nicolas-grekas · nicolas-grekas · commit b6d8164085ee · 2018-06-22T10:59:39.000+02:00
* 4.0:
  [minor] SCA
  [Serializer] Minor tweaks for a67b650f12e5252a5d30c4c94576d73e15f19aef
  allow_extra_attributes does not throw an exception as documented
  [Cache] fix visibility of RedisTrait::init()
  [Serializer] Updates DocBlock to a mixed param type
diff --git a/Extractor/AbstractFileExtractor.php b/Extractor/AbstractFileExtractor.php
@@ -45,7 +45,7 @@ protected function extractFiles($resource)
 
     private function toSplFileInfo(string $file): \SplFileInfo
     {
-        return ($file instanceof \SplFileInfo) ? $file : new \SplFileInfo($file);
+        return new \SplFileInfo($file);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ protected function extractFiles($resource)`
`45`	`45`
`46`	`46`	`private function toSplFileInfo(string $file): \SplFileInfo`
`47`	`47`	`{`
`48`		`- return ($file instanceof \SplFileInfo) ? $file : new \SplFileInfo($file);`
	`48`	`+ return new \SplFileInfo($file);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/**`