Merge branch '4.4' into 5.2

derrabus · derrabus · commit d72c3766526d · 2021-06-06T11:50:27.000+02:00
* 4.4:
  Fix incompatible implicit float-to-int conversions
  [Translation] Don't pass null to strtoupper()
  cs fix
  [DependencyInjection] Don't pass null to trim()
  Add return types to JsonSerializable implementations
  Fix Serializable deprecations triggered by token mocks
  Add missing security translations
diff --git a/Tests/Store/PdoStoreTest.php b/Tests/Store/PdoStoreTest.php
@@ -72,7 +72,7 @@ public function testInvalidTtlConstruct()
     {
         $this->expectException(InvalidTtlException::class);
 
-        return new PdoStore('sqlite:'.self::$dbFile, [], 0.1, 0.1);
+        return new PdoStore('sqlite:'.self::$dbFile, [], 0.1, 0);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function testInvalidTtlConstruct()`
`72`	`72`	`{`
`73`	`73`	`$this->expectException(InvalidTtlException::class);`
`74`	`74`
`75`		`- return new PdoStore('sqlite:'.self::$dbFile, [], 0.1, 0.1);`
	`75`	`+ return new PdoStore('sqlite:'.self::$dbFile, [], 0.1, 0);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`/**`