diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made method signatures compatible with their corresponding traits.

This commit is contained in:
Alexander M. Turek 2020-05-22 21:28:54 +02:00
parent 6d7c696742
commit 6fda276feb
11 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Cache/Adapter/Psr16Adapter.php
View File

@ -79,7 +79,7 @@ class Psr16Adapter extends AbstractAdapter implements PruneableInterface, Resett
/**
* {@inheritdoc}
*/
protected function doSave(array $values, $lifetime)
protected function doSave(array $values, ?int $lifetime)
{
return $this->pool->setMultiple($values, 0 === $lifetime ? null : $lifetime);
}

2
src/Symfony/Component/Cache/Traits/AbstractTrait.php
View File

@ -78,7 +78,7 @@ trait AbstractTrait
*
* @return array|bool The identifiers that failed to be cached or a boolean stating if caching succeeded or not
*/
abstract protected function doSave(array $values, $lifetime);
abstract protected function doSave(array $values, ?int $lifetime);
/**
* {@inheritdoc}

2
src/Symfony/Component/Cache/Traits/ApcuTrait.php
View File

@ -101,7 +101,7 @@ trait ApcuTrait
/**
* {@inheritdoc}
*/
protected function doSave(array $values, $lifetime)
protected function doSave(array $values, ?int $lifetime)
{
try {
if (false === $failures = apcu_store($values, null, $lifetime)) {

2
src/Symfony/Component/Cache/Traits/DoctrineTrait.php
View File

@ -91,7 +91,7 @@ trait DoctrineTrait
/**
* {@inheritdoc}
*/
protected function doSave(array $values, $lifetime)
protected function doSave(array $values, ?int $lifetime)
{
return $this->provider->saveMultiple($values, $lifetime);
}

2
src/Symfony/Component/Cache/Traits/FilesystemTrait.php
View File

@ -91,7 +91,7 @@ trait FilesystemTrait
/**
* {@inheritdoc}
*/
protected function doSave(array $values, $lifetime)
protected function doSave(array $values, ?int $lifetime)
{
$expiresAt = $lifetime ? (time() + $lifetime) : 0;
$values = $this->marshaller->marshall($values, $failed);

2
src/Symfony/Component/Cache/Traits/MemcachedTrait.php
View File

@ -223,7 +223,7 @@ trait MemcachedTrait
/**
* {@inheritdoc}
*/
protected function doSave(array $values, $lifetime)
protected function doSave(array $values, ?int $lifetime)
{
if (!$values = $this->marshaller->marshall($values, $failed)) {
return $failed;

2
src/Symfony/Component/Cache/Traits/PdoTrait.php
View File

@ -275,7 +275,7 @@ trait PdoTrait
/**
* {@inheritdoc}
*/
protected function doSave(array $values, $lifetime)
protected function doSave(array $values, ?int $lifetime)
{
if (!$values = $this->marshaller->marshall($values, $failed)) {
return $failed;

2
src/Symfony/Component/Cache/Traits/PhpFilesTrait.php
View File

@ -194,7 +194,7 @@ trait PhpFilesTrait
/**
* {@inheritdoc}
*/
protected function doSave(array $values, $lifetime)
protected function doSave(array $values, ?int $lifetime)
{
$ok = true;
$expiry = $lifetime ? time() + $lifetime : 'PHP_INT_MAX';

2
src/Symfony/Component/Cache/Traits/RedisTrait.php
View File

@ -404,7 +404,7 @@ trait RedisTrait
/**
* {@inheritdoc}
*/
protected function doSave(array $values, $lifetime)
protected function doSave(array $values, ?int $lifetime)
{
if (!$values = $this->marshaller->marshall($values, $failed)) {
return $failed;

9
src/Symfony/Component/HttpClient/Response/CurlResponse.php
View File

@ -15,6 +15,7 @@ use Psr\Log\LoggerInterface;
use Symfony\Component\HttpClient\Chunk\FirstChunk;
use Symfony\Component\HttpClient\Chunk\InformationalChunk;
use Symfony\Component\HttpClient\Exception\TransportException;
use Symfony\Component\HttpClient\Internal\ClientState;
use Symfony\Component\HttpClient\Internal\CurlClientState;
use Symfony\Contracts\HttpClient\Exception\HttpExceptionInterface;
use Symfony\Contracts\HttpClient\ResponseInterface;
@ -242,8 +243,10 @@ final class CurlResponse implements ResponseInterface
/**
* {@inheritdoc}
*
* @param CurlClientState $multi
*/
private static function perform(CurlClientState $multi, array &$responses = null): void
private static function perform(ClientState $multi, array &$responses = null): void
{
if (self::$performing) {
if ($responses) {
@ -289,8 +292,10 @@ final class CurlResponse implements ResponseInterface
/**
* {@inheritdoc}
*
* @param CurlClientState $multi
*/
private static function select(CurlClientState $multi, float $timeout): int
private static function select(ClientState $multi, float $timeout): int
{
if (\PHP_VERSION_ID < 70123 || (70200 <= \PHP_VERSION_ID && \PHP_VERSION_ID < 70211)) {
// workaround https://bugs.php.net/76480

9
src/Symfony/Component/HttpClient/Response/NativeResponse.php
View File

@ -14,6 +14,7 @@ namespace Symfony\Component\HttpClient\Response;
use Psr\Log\LoggerInterface;
use Symfony\Component\HttpClient\Chunk\FirstChunk;
use Symfony\Component\HttpClient\Exception\TransportException;
use Symfony\Component\HttpClient\Internal\ClientState;
use Symfony\Component\HttpClient\Internal\NativeClientState;
use Symfony\Contracts\HttpClient\Exception\HttpExceptionInterface;
use Symfony\Contracts\HttpClient\ResponseInterface;
@ -214,8 +215,10 @@ final class NativeResponse implements ResponseInterface
/**
* {@inheritdoc}
*
* @param NativeClientState $multi
*/
private static function perform(NativeClientState $multi, array &$responses = null): void
private static function perform(ClientState $multi, array &$responses = null): void
{
// List of native handles for stream_select()
if (null !== $responses) {
@ -326,8 +329,10 @@ final class NativeResponse implements ResponseInterface
/**
* {@inheritdoc}
*
* @param NativeClientState $multi
*/
private static function select(NativeClientState $multi, float $timeout): int
private static function select(ClientState $multi, float $timeout): int
{
$_ = [];