Merge branch '4.4' into 5.0

nicolas-grekas · nicolas-grekas · commit 7ccaee23cc5b · 2019-12-03T17:35:18.000+01:00
* 4.4:
  [Security/Core] Fix checking for SHA256/SHA512 passwords
  [Cache][Lock] fix tests
  bumped Symfony version to 4.4.2
  updated VERSION for 4.4.1
  updated CHANGELOG for 4.4.1
diff --git a/Tests/Store/PdoStoreTest.php b/Tests/Store/PdoStoreTest.php
@@ -97,9 +97,9 @@ public function testDsn(string $dsn, string $file = null)
     public function provideDsn()
     {
         $dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
-        yield ['sqlite://localhost/'.$dbFile, ''.$dbFile];
-        yield ['sqlite:'.$dbFile, ''.$dbFile];
-        yield ['sqlite3:///'.$dbFile, ''.$dbFile];
+        yield ['sqlite://localhost/'.$dbFile.'1', $dbFile.'1'];
+        yield ['sqlite:'.$dbFile.'2', $dbFile.'2'];
+        yield ['sqlite3:///'.$dbFile.'3', $dbFile.'3'];
         yield ['sqlite://localhost/:memory:'];
         yield ['sqlite::memory:'];
     }

Original file line number	Diff line number	Diff line change
`@@ -97,9 +97,9 @@ public function testDsn(string $dsn, string $file = null)`
`97`	`97`	`public function provideDsn()`
`98`	`98`	`{`
`99`	`99`	`$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');`
`100`		`- yield ['sqlite://localhost/'.$dbFile, ''.$dbFile];`
`101`		`- yield ['sqlite:'.$dbFile, ''.$dbFile];`
`102`		`- yield ['sqlite3:///'.$dbFile, ''.$dbFile];`
	`100`	`+ yield ['sqlite://localhost/'.$dbFile.'1', $dbFile.'1'];`
	`101`	`+ yield ['sqlite:'.$dbFile.'2', $dbFile.'2'];`
	`102`	`+ yield ['sqlite3:///'.$dbFile.'3', $dbFile.'3'];`
`103`	`103`	`yield ['sqlite://localhost/:memory:'];`
`104`	`104`	`yield ['sqlite::memory:'];`
`105`	`105`	`}`