Merge branch '4.4' into 5.3

fabpot · fabpot · commit b7f8b9165ece · 2022-01-22T07:52:49.000+01:00
* 4.4:
  Throw exception if incompatible version of psr/simple-cache is used
  [DependencyInjection] copy synthetic status when resolving child definitions
  [HttpClient] Fix Failed to open stream: Too many open files
  [Console] use STDOUT/ERR in ConsoleOutput to save opening too many file descriptors
  [Cache] Set mtime of cache files 1 year into future if they do not expire
  [DependencyInjection] remove arbitratry limitation to exclude inline services from bindings
diff --git a/Psr16Cache.php b/Psr16Cache.php
@@ -19,6 +19,10 @@
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\Traits\ProxyTrait;
 
+if (null !== (new \ReflectionMethod(CacheInterface::class, 'get'))->getReturnType()) {
+    throw new \LogicException('psr/simple-cache 3.0+ is not compatible with this version of symfony/cache. Please upgrade symfony/cache to 6.0+ or downgrade psr/simple-cache to 1.x or 2.x.');
+}
+
 /**
  * Turns a PSR-6 cache into a PSR-16 one.
  *
diff --git a/Traits/FilesystemCommonTrait.php b/Traits/FilesystemCommonTrait.php
@@ -109,7 +109,7 @@ private function write(string $file, string $data, int $expiresAt = null)
             fclose($h);
 
             if (null !== $expiresAt) {
-                touch($this->tmp, $expiresAt);
+                touch($this->tmp, $expiresAt ?: time() + 31556952); // 1 year in seconds
             }
 
             return rename($this->tmp, $file);

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ private function write(string $file, string $data, int $expiresAt = null)`
`109`	`109`	`fclose($h);`
`110`	`110`
`111`	`111`	`if (null !== $expiresAt) {`
`112`		`- touch($this->tmp, $expiresAt);`
	`112`	`+ touch($this->tmp, $expiresAt ?: time() + 31556952); // 1 year in seconds`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`return rename($this->tmp, $file);`