mirror/php-rss-bridge
1
0
Fork 0
mirror of https://github.com/RSS-Bridge/rss-bridge.git synced 2025-08-04 23:57:29 +02:00
Code Issues Releases Wiki Activity

Fix deprecations (#4636)

Browse Source 
* Fix PHP 8.4 deprecation

Implicitly marking parameter as nullable is deprecated, the explicit nullable type must be used instead

* [github workflow] Add additional php versions
This commit is contained in:
Marcin Morawski
2025-08-04 00:55:50 +02:00
committed by GitHub
parent c65fbd5543
commit a2334838a6
10 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/tests.yml vendored
View File

@@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
strategy: strategy:
matrix: matrix:
php-versions: ['7.4', '8.0', '8.1'] php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2 - uses: shivammathur/setup-php@v2

4
bridges/ItakuBridge.php
View File

@@ -443,7 +443,7 @@ class ItakuBridge extends BridgeAbstract
return $data['owner']; return $data['owner'];
} }
private function getPost($id, array $metadata = null) private function getPost($id, ?array $metadata = null)
{ {
if (isset($metadata) && count($metadata['gallery_images']) < $metadata['num_images']) { if (isset($metadata) && count($metadata['gallery_images']) < $metadata['num_images']) {
$metadata = null; //force re-fetch of metadata $metadata = null; //force re-fetch of metadata
@@ -515,7 +515,7 @@ class ItakuBridge extends BridgeAbstract
]; ];
} }
private function getCommission($id, array $metadata = null) private function getCommission($id, ?array $metadata = null)
{ {
$url = self::URI . '/api/commissions/' . $id . '/?format=json'; $url = self::URI . '/api/commissions/' . $id . '/?format=json';
$uri = self::URI . '/commissions/' . $id; $uri = self::URI . '/commissions/' . $id;

2
caches/ArrayCache.php
View File

@@ -23,7 +23,7 @@ class ArrayCache implements CacheInterface
return $default; return $default;
} }
public function set(string $key, $value, int $ttl = null): void public function set(string $key, $value, ?int $ttl = null): void
{ {
$this->data[$key] = [ $this->data[$key] = [
'key' => $key, 'key' => $key,

2
caches/FileCache.php
View File

@@ -45,7 +45,7 @@ class FileCache implements CacheInterface
return $default; return $default;
} }
public function set($key, $value, int $ttl = null): void public function set($key, $value, ?int $ttl = null): void
{ {
$item = [ $item = [
'key' => $key, 'key' => $key,

2
caches/NullCache.php
View File

@@ -9,7 +9,7 @@ class NullCache implements CacheInterface
return $default; return $default;
} }
public function set(string $key, $value, int $ttl = null): void public function set(string $key, $value, ?int $ttl = null): void
{ {
} }

2
caches/SQLiteCache.php
View File

@@ -77,7 +77,7 @@ class SQLiteCache implements CacheInterface
return $default; return $default;
} }
public function set(string $key, $value, int $ttl = null): void public function set(string $key, $value, ?int $ttl = null): void
{ {
$cacheKey = $this->createCacheKey($key); $cacheKey = $this->createCacheKey($key);
$blob = serialize($value); $blob = serialize($value);

2
lib/CacheFactory.php
View File

@@ -12,7 +12,7 @@ class CacheFactory
$this->logger = $logger; $this->logger = $logger;
} }
public function create(string $name = null): CacheInterface public function create(?string $name = null): CacheInterface
{ {
$cacheNames = []; $cacheNames = [];
foreach (scandir(PATH_LIB_CACHES) as $file) { foreach (scandir(PATH_LIB_CACHES) as $file) {

2
lib/CacheInterface.php
View File

@@ -4,7 +4,7 @@ interface CacheInterface
{ {
public function get(string $key, $default = null); public function get(string $key, $default = null);
public function set(string $key, $value, int $ttl = null): void; public function set(string $key, $value, ?int $ttl = null): void;
public function delete(string $key): void; public function delete(string $key): void;

2
lib/http.php
View File

@@ -227,7 +227,7 @@ final class Request
return $this->get[$key] ?? $default; return $this->get[$key] ?? $default;
} }
public function server(string $key, string $default = null): ?string public function server(string $key, ?string $default = null): ?string
{ {
return $this->server[$key] ?? $default; return $this->server[$key] ?? $default;
} }

4
lib/parsedown/Parsedown.php
View File

@@ -712,7 +712,7 @@ class Parsedown
# #
# Setext # Setext
protected function blockSetextHeader($Line, array $Block = null) protected function blockSetextHeader($Line, ?array $Block = null)
{ {
if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted'])) if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
{ {
@@ -850,7 +850,7 @@ class Parsedown
# #
# Table # Table
protected function blockTable($Line, array $Block = null) protected function blockTable($Line, ?array $Block = null)
{ {
if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted'])) if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
{ {