Merge branch '4.4' into 5.1

nicolas-grekas · nicolas-grekas · commit db34b056fc11 · 2020-09-10T18:39:50.000+02:00
* 4.4:
  fix tests
diff --git a/Tests/Command/CacheClearCommand/CacheClearCommandTest.php b/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
@@ -84,6 +84,6 @@ public function testCacheIsFreshAfterCacheClearedWithWarmup()
         $containerFile = str_replace('tes_'.\DIRECTORY_SEPARATOR, 'test'.\DIRECTORY_SEPARATOR, $containerRef->getFileName());
         $this->assertMatchesRegularExpression(sprintf('/\'kernel.container_class\'\s*=>\s*\'%s\'/', $containerClass), file_get_contents($containerFile), 'kernel.container_class is properly set on the dumped container');
 
-        $this->assertFileEquals(__DIR__.'/Fixture/preload.php.expected', __DIR__.'/Fixture/preload.php');
+        $this->assertFileEquals(__DIR__.'/Fixture/preload.php.expected', __DIR__.'/Fixture/.preload.php');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,6 @@ public function testCacheIsFreshAfterCacheClearedWithWarmup()`
`84`	`84`	`$containerFile = str_replace('tes_'.\DIRECTORY_SEPARATOR, 'test'.\DIRECTORY_SEPARATOR, $containerRef->getFileName());`
`85`	`85`	`$this->assertMatchesRegularExpression(sprintf('/\'kernel.container_class\'\s=>\s\'%s\'/', $containerClass), file_get_contents($containerFile), 'kernel.container_class is properly set on the dumped container');`
`86`	`86`
`87`		`- $this->assertFileEquals(__DIR__.'/Fixture/preload.php.expected', __DIR__.'/Fixture/preload.php');`
	`87`	`+ $this->assertFileEquals(__DIR__.'/Fixture/preload.php.expected', __DIR__.'/Fixture/.preload.php');`
`88`	`88`	`}`
`89`	`89`	`}`