Skip to content

Commit 7c91d42

khoaofgod khoaofgod

authored

Merge pull request #927 from PHPSocialNetwork/fix/php84-deprecation-warnings

Fix PHP 8.4 deprecation warnings for implicitly nullable parameters

2 parents 588e8ff + 1ef9ac7 commit 7c91d42Copy full SHA for 7c91d42

File tree

6 files changed

+7

-7

lines changed

lib/Phpfastcache
- CacheContract.php
- Cluster
  - AggregatorInterface.php
  - ClusterAggregator.php
- Drivers/Redis
  - Config.php
- Exceptions
  - PhpfastcacheIOException.php
- Helper
  - Psr16Adapter.php

6 files changed

+7

-7

lines changed

`‎lib/Phpfastcache/CacheContract.php‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function __construct(CacheItemPoolInterface $cacheInstance)`
`32`	`32`	`/**`
`33`	`33`	`* @throws InvalidArgumentException`
`34`	`34`	`*/`
`35`		`- public function get(string\|\Stringable $cacheKey, callable $callback, DateInterval\|int $expiresAfter = null): mixed`
	`35`	`+ public function get(string\|\Stringable $cacheKey, callable $callback, DateInterval\|int\|null $expiresAfter = null): mixed`
`36`	`36`	`{`
`37`	`37`	`$cacheItem = $this->cacheInstance->getItem((string) $cacheKey);`
`38`	`38`
`@@ -54,7 +54,7 @@ public function get(string\|\Stringable $cacheKey, callable $callback, DateInterv`
`54`	`54`	`/**`
`55`	`55`	`* @throws InvalidArgumentException`
`56`	`56`	`*/`
`57`		`- public function __invoke(string $cacheKey, callable $callback, DateInterval\|int $expiresAfter = null): mixed`
	`57`	`+ public function __invoke(string $cacheKey, callable $callback, DateInterval\|int\|null $expiresAfter = null): mixed`
`58`	`58`	`{`
`59`	`59`	`return $this->get($cacheKey, $callback, $expiresAfter);`
`60`	`60`	`}`

`‎lib/Phpfastcache/Cluster/AggregatorInterface.php‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public function getCluster(int $strategy): ClusterPoolInterface;`
`86`	`86`	`*`
`87`	`87`	`* @return void`
`88`	`88`	`*/`
`89`		`- public function aggregateDriverByName(string $driverName, ConfigurationOption $driverConfig = null): void;`
	`89`	`+ public function aggregateDriverByName(string $driverName, ?ConfigurationOption $driverConfig = null): void;`
`90`	`90`
`91`	`91`	`/**`
`92`	`92`	`* @param AggregatablePoolInterface $driverPool`

`‎lib/Phpfastcache/Cluster/ClusterAggregator.php‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public function aggregateDriver(AggregatablePoolInterface $driverPool): void`
`94`	`94`	`* @throws PhpfastcacheDriverNotFoundException`
`95`	`95`	`* @throws PhpfastcacheLogicException`
`96`	`96`	`*/`
`97`		`- public function aggregateDriverByName(string $driverName, ConfigurationOption $driverConfig = null): void`
	`97`	`+ public function aggregateDriverByName(string $driverName, ?ConfigurationOption $driverConfig = null): void`
`98`	`98`	`{`
`99`	`99`	`if (isset($this->cluster)) {`
`100`	`100`	`throw new PhpfastcacheLogicException('The cluster has been already build, cannot aggregate more pools.');`

`‎lib/Phpfastcache/Drivers/Redis/Config.php‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public function getDatabase(): ?int`
`98`	`98`	`* @return static`
`99`	`99`	`* @throws PhpfastcacheLogicException`
`100`	`100`	`*/`
`101`		`- public function setDatabase(int $database = null): static`
	`101`	`+ public function setDatabase(?int $database = null): static`
`102`	`102`	`{`
`103`	`103`	`return $this->setProperty('database', $database);`
`104`	`104`	`}`

`‎lib/Phpfastcache/Exceptions/PhpfastcacheIOException.php‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class PhpfastcacheIOException extends PhpfastcacheCoreException`
`24`	`24`	`/**`
`25`	`25`	`* @inheritdoc`
`26`	`26`	`*/`
`27`		`- public function __construct(string $message = "", int $code = 0, \Throwable $previous = null)`
	`27`	`+ public function __construct(string $message = "", int $code = 0, ?\Throwable $previous = null)`
`28`	`28`	`{`
`29`	`29`	`$lastError = error_get_last();`
`30`	`30`	`if ($lastError) {`

`‎lib/Phpfastcache/Helper/Psr16Adapter.php‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class Psr16Adapter implements CacheInterface`
`49`	`49`	`* @throws PhpfastcacheDriverException`
`50`	`50`	`* @throws PhpfastcacheDriverNotFoundException`
`51`	`51`	`*/`
`52`		`- public function __construct(string\|ExtendedCacheItemPoolInterface $driver, ConfigurationOptionInterface $config = null)`
	`52`	`+ public function __construct(string\|ExtendedCacheItemPoolInterface $driver, ?ConfigurationOptionInterface $config = null)`
`53`	`53`	`{`
`54`	`54`	`if ($driver instanceof ExtendedCacheItemPoolInterface) {`
`55`	`55`	`if ($config !== null) {`

0 commit comments

Comments

(0)