oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-06-27 16:36:00 +00:00
Code Wiki Activity

Modernize to PHP 8.1

Browse source
This commit is contained in:
Yassine Guedidi 2025-04-05 14:01:48 +02:00
parent ca018c77e3
commit 9e2720cddc
26 changed files with 48 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rector.php
View file

@ -4,7 +4,6 @@ declare(strict_types=1);
use Rector\Config\RectorConfig;
use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
return RectorConfig::configure()
->withPaths([
@ -19,13 +18,10 @@ return RectorConfig::configure()
->withConfiguredRule(ClassPropertyAssignToConstructorPromotionRector::class, [
'inline_public' => true,
])
->withRules([
ReadOnlyPropertyRector::class,
])
->withSkip([
ClassPropertyAssignToConstructorPromotionRector::class => [
__DIR__ . '/src/Entity/*',
],
])
->withPhpSets(php80: true)
->withPhpSets(php81: true)
->withTypeCoverageLevel(0);

4
src/Command/CleanDuplicatesCommand.php
View file

@ -100,8 +100,8 @@ class CleanDuplicatesCommand extends Command
private function similarUrl($url)
{
if (\in_array(substr($url, -1), ['/', '#'], true)) { // get rid of "/" and "#" and the end of urls
return substr($url, 0, \strlen($url));
if (\in_array(substr((string) $url, -1), ['/', '#'], true)) { // get rid of "/" and "#" and the end of urls
return substr((string) $url, 0, \strlen((string) $url));
}
return $url;

2
src/Command/InstallCommand.php
View file

@ -144,7 +144,7 @@ class InstallCommand extends Command
// return version should be like "PostgreSQL 9.5.4 on x86_64-apple-darwin15.6.0, compiled by Apple LLVM version 8.0.0 (clang-800.0.38), 64-bit"
$version = $conn->executeQuery('SELECT version();')->fetchOne();
preg_match('/PostgreSQL ([0-9\.]+)/i', $version, $matches);
preg_match('/PostgreSQL ([0-9\.]+)/i', (string) $version, $matches);
if (isset($matches[1]) & version_compare($matches[1], '9.2.0', '<')) {
$fulfilled = false;

2
src/Controller/ConfigController.php
View file

@ -350,7 +350,7 @@ class ConfigController extends AbstractController
$backupCodes = (new BackupCodes())->toArray();
$backupCodesHashed = array_map(
fn ($backupCode) => password_hash($backupCode, \PASSWORD_DEFAULT),
fn ($backupCode) => password_hash((string) $backupCode, \PASSWORD_DEFAULT),
$backupCodes
);

4
src/Controller/EntryController.php
View file

@ -67,7 +67,7 @@ class EntryController extends AbstractController
$action = 'tag';
if (isset($values['tags'])) {
$labels = array_filter(explode(',', $values['tags']),
$labels = array_filter(explode(',', (string) $values['tags']),
function ($v) {
$v = trim($v);
@ -616,7 +616,7 @@ class EntryController extends AbstractController
*/
private function showEntries($type, Request $request, $page)
{
$searchTerm = (isset($request->query->all('search_entry')['term']) ? trim($request->query->all('search_entry')['term']) : '');
$searchTerm = (isset($request->query->all('search_entry')['term']) ? trim((string) $request->query->all('search_entry')['term']) : '');
$currentRoute = $request->query->get('currentRoute') ?? '';
$currentEntryId = $request->attributes->getInt('id');

6
src/Controller/TagController.php
View file

@ -45,10 +45,10 @@ class TagController extends AbstractController
$form->handleRequest($request);
$tags = $form->get('label')->getData() ?? '';
$tagsExploded = explode(',', $tags);
$tagsExploded = explode(',', (string) $tags);
// avoid too much tag to be added
if (\count($tagsExploded) >= NewTagType::MAX_TAGS || \strlen($tags) >= NewTagType::MAX_LENGTH) {
if (\count($tagsExploded) >= NewTagType::MAX_TAGS || \strlen((string) $tags) >= NewTagType::MAX_LENGTH) {
$message = $translator->trans('flashes.tag.notice.too_much_tags', [
'%tags%' => NewTagType::MAX_TAGS,
'%characters%' => NewTagType::MAX_LENGTH,
@ -250,7 +250,7 @@ class TagController extends AbstractController
// check to avoid duplicate tags creation
foreach ($this->entityManager->getUnitOfWork()->getScheduledEntityInsertions() as $entity) {
if ($entity instanceof Tag && strtolower($entity->getLabel()) === strtolower($filter)) {
if ($entity instanceof Tag && strtolower($entity->getLabel()) === strtolower((string) $filter)) {
continue 2;
}
$this->entityManager->persist($entry);

2
src/Doctrine/JsonArrayType.php
View file

@ -22,7 +22,7 @@ class JsonArrayType extends JsonType
$value = \is_resource($value) ? stream_get_contents($value) : $value;
return json_decode($value, true);
return json_decode((string) $value, true);
}
public function getName(): string

2
src/Entity/User.php
View file

@ -383,7 +383,7 @@ class User extends BaseUser implements EmailTwoFactorInterface, GoogleTwoFactorI
foreach ($this->backupCodes as $key => $backupCode) {
// backup code are hashed using `password_hash`
// see ConfigController->otpAppAction
if (password_verify($code, $backupCode)) {
if (password_verify($code, (string) $backupCode)) {
return $key;
}
}

4
src/Helper/DownloadImages.php
View file

@ -25,7 +25,7 @@ class DownloadImages
$wallabagUrl,
private readonly LoggerInterface $logger,
) {
$this->wallabagUrl = rtrim($wallabagUrl, '/');
$this->wallabagUrl = rtrim((string) $wallabagUrl, '/');
$this->mimeTypes = new MimeTypes();
$this->setFolder();
@ -291,7 +291,7 @@ class DownloadImages
preg_match_all($pattern, $srcsetAttribute, $matches);
$srcset = \call_user_func_array('array_merge', $matches);
$srcsetUrls = array_map(fn ($src) => trim(explode(' ', $src, 2)[0]), $srcset);
$srcsetUrls = array_map(fn ($src) => trim(explode(' ', (string) $src, 2)[0]), $srcset);
$urls = array_merge($srcsetUrls, $urls);
}

2
src/Helper/TagsAssigner.php
View file

@ -39,7 +39,7 @@ class TagsAssigner
}
foreach ($tags as $label) {
$label = trim(mb_convert_case($label, \MB_CASE_LOWER));
$label = trim(mb_convert_case((string) $label, \MB_CASE_LOWER));
// avoid empty tag
if ('' === $label) {

2
src/Import/ChromeImport.php
View file

@ -39,7 +39,7 @@ class ChromeImport extends BrowserImport
'is_archived' => (int) $this->markAsRead,
'is_starred' => false,
'tags' => '',
'created_at' => substr($entry['date_added'], 0, 10),
'created_at' => substr((string) $entry['date_added'], 0, 10),
];
if (\array_key_exists('tags', $entry) && '' !== $entry['tags']) {

2
src/Import/FirefoxImport.php
View file

@ -39,7 +39,7 @@ class FirefoxImport extends BrowserImport
'is_archived' => (int) $this->markAsRead,
'is_starred' => false,
'tags' => '',
'created_at' => substr($entry['dateAdded'], 0, 10),
'created_at' => substr((string) $entry['dateAdded'], 0, 10),
];
if (\array_key_exists('tags', $entry) && '' !== $entry['tags']) {

2
src/Import/PinboardImport.php
View file

@ -95,7 +95,7 @@ class PinboardImport extends AbstractImport
'is_archived' => ('no' === $importedEntry['toread']) || $this->markAsRead,
'is_starred' => false,
'created_at' => $importedEntry['time'],
'tags' => explode(' ', $importedEntry['tags']),
'tags' => explode(' ', (string) $importedEntry['tags']),
];
$entry = new Entry($this->user);

2
src/Operator/PHP/Matches.php
View file

@ -20,6 +20,6 @@ class Matches
return false;
}
return false !== stripos($subject, (string) $pattern);
return false !== stripos((string) $subject, (string) $pattern);
}
}

2
src/Operator/PHP/NotMatches.php
View file

@ -20,6 +20,6 @@ class NotMatches
return true;
}
return false === stripos($subject, (string) $pattern);
return false === stripos((string) $subject, (string) $pattern);
}
}

2
src/Operator/PHP/PatternMatches.php
View file

@ -16,7 +16,7 @@ class PatternMatches
{
public function __invoke($subject, $pattern)
{
$count = preg_match("`$pattern`i", $subject);
$count = preg_match("`$pattern`i", (string) $subject);
return \is_int($count) && $count > 0;
}

4
src/SiteConfig/GrabySiteConfigBuilder.php
View file

@ -95,11 +95,11 @@ class GrabySiteConfigBuilder implements SiteConfigBuilder
$extraFields = [];
foreach ($extraFieldsStrings as $extraField) {
if (!str_contains($extraField, '=')) {
if (!str_contains((string) $extraField, '=')) {
continue;
}
[$fieldName, $fieldValue] = explode('=', $extraField, 2);
[$fieldName, $fieldValue] = explode('=', (string) $extraField, 2);
$extraFields[$fieldName] = $fieldValue;
}

4
src/SiteConfig/LoginFormAuthenticator.php
View file

@ -98,9 +98,9 @@ class LoginFormAuthenticator
$extraFields = [];
foreach ($siteConfig->getExtraFields() as $fieldName => $fieldValue) {
if (str_starts_with($fieldValue, '@=')) {
if (str_starts_with((string) $fieldValue, '@=')) {
$fieldValue = $this->expressionLanguage->evaluate(
substr($fieldValue, 2),
substr((string) $fieldValue, 2),
[
'config' => $siteConfig,
]

16
src/Twig/WallabagExtension.php
View file

@ -34,20 +34,20 @@ class WallabagExtension extends AbstractExtension implements GlobalsInterface
public function getFilters(): array
{
return [
new TwigFilter('removeWww', [$this, 'removeWww']),
new TwigFilter('removeScheme', [$this, 'removeScheme']),
new TwigFilter('removeSchemeAndWww', [$this, 'removeSchemeAndWww']),
new TwigFilter('removeWww', $this->removeWww(...)),
new TwigFilter('removeScheme', $this->removeScheme(...)),
new TwigFilter('removeSchemeAndWww', $this->removeSchemeAndWww(...)),
];
}
public function getFunctions(): array
{
return [
new TwigFunction('count_entries', [$this, 'countEntries']),
new TwigFunction('count_tags', [$this, 'countTags']),
new TwigFunction('display_stats', [$this, 'displayStats']),
new TwigFunction('asset_file_exists', [$this, 'assetFileExists']),
new TwigFunction('theme_class', [$this, 'themeClass']),
new TwigFunction('count_entries', $this->countEntries(...)),
new TwigFunction('count_tags', $this->countTags(...)),
new TwigFunction('display_stats', $this->displayStats(...)),
new TwigFunction('asset_file_exists', $this->assetFileExists(...)),
new TwigFunction('theme_class', $this->themeClass(...)),
];
}

2
tests/Controller/Api/DeveloperControllerTest.php
View file

@ -50,7 +50,7 @@ class DeveloperControllerTest extends WallabagTestCase
$this->assertSame(200, $client->getResponse()->getStatusCode());
$data = json_decode($client->getResponse()->getContent(), true);
$data = json_decode((string) $client->getResponse()->getContent(), true);
$this->assertArrayHasKey('access_token', $data);
$this->assertArrayHasKey('expires_in', $data);
$this->assertArrayHasKey('token_type', $data);

4
tests/Controller/ConfigControllerTest.php
View file

@ -351,7 +351,7 @@ class ConfigControllerTest extends WallabagTestCase
);
$this->assertSame(200, $client->getResponse()->getStatusCode());
$content = json_decode($client->getResponse()->getContent(), true);
$content = json_decode((string) $client->getResponse()->getContent(), true);
$this->assertArrayHasKey('token', $content);
}
@ -1296,7 +1296,7 @@ class ConfigControllerTest extends WallabagTestCase
$this->assertSame('attachment; filename="tagging_rules_admin.json"', $headers->get('content-disposition'));
$this->assertSame('UTF-8', $headers->get('content-transfer-encoding'));
$content = json_decode($client->getResponse()->getContent(), true);
$content = json_decode((string) $client->getResponse()->getContent(), true);
$this->assertCount(4, $content);
$this->assertSame('content matches "spurs"', $content[0]['rule']);

2
tests/Controller/EntryControllerTest.php
View file

@ -1283,7 +1283,7 @@ class EntryControllerTest extends WallabagTestCase
$this->assertSame($url, $entry->getUrl());
$this->assertStringContainsString('Comment Hidalgo', $entry->getTitle());
// instead of checking for the filename (which might change) check that the image is now local
$this->assertStringContainsString(rtrim($client->getContainer()->getParameter('domain_name'), '/') . '/assets/images/', $entry->getContent());
$this->assertStringContainsString(rtrim((string) $client->getContainer()->getParameter('domain_name'), '/') . '/assets/images/', $entry->getContent());
$client->getContainer()->get(Config::class)->set('download_images_enabled', 0);
}

8
tests/Controller/ExportControllerTest.php
View file

@ -177,7 +177,7 @@ class ExportControllerTest extends WallabagTestCase
$this->assertSame('attachment; filename="Archive articles.csv"', $headers->get('content-disposition'));
$this->assertSame('UTF-8', $headers->get('content-transfer-encoding'));
$csv = str_getcsv($client->getResponse()->getContent(), "\n");
$csv = str_getcsv((string) $client->getResponse()->getContent(), "\n");
$this->assertGreaterThan(1, $csv);
// +1 for title line
@ -216,7 +216,7 @@ class ExportControllerTest extends WallabagTestCase
$this->assertSame('attachment; filename="' . $this->getSanitizedFilename($contentInDB->getTitle()) . '.json"', $headers->get('content-disposition'));
$this->assertSame('UTF-8', $headers->get('content-transfer-encoding'));
$content = json_decode($client->getResponse()->getContent(), true);
$content = json_decode((string) $client->getResponse()->getContent(), true);
$this->assertArrayHasKey('id', $content[0]);
$this->assertArrayHasKey('title', $content[0]);
$this->assertArrayHasKey('url', $content[0]);
@ -262,7 +262,7 @@ class ExportControllerTest extends WallabagTestCase
$this->assertSame('attachment; filename="Search entry search articles.json"', $headers->get('content-disposition'));
$this->assertSame('UTF-8', $headers->get('content-transfer-encoding'));
$content = json_decode($client->getResponse()->getContent(), true);
$content = json_decode((string) $client->getResponse()->getContent(), true);
$this->assertCount(1, $content);
$this->tearDownForJsonExportFromSearch();
@ -339,7 +339,7 @@ class ExportControllerTest extends WallabagTestCase
$this->assertSame('attachment; filename="Same domain articles.json"', $headers->get('content-disposition'));
$this->assertSame('UTF-8', $headers->get('content-transfer-encoding'));
$content = json_decode($client->getResponse()->getContent(), true);
$content = json_decode((string) $client->getResponse()->getContent(), true);
$this->assertCount(4, $content);
}

2
tests/Controller/FeedControllerTest.php
View file

@ -36,7 +36,7 @@ class FeedControllerTest extends WallabagTestCase
$this->assertSame('admin', $xpath->query('/a:feed/a:author/a:name')->item(0)->nodeValue);
$this->assertSame(1, $xpath->query('/a:feed/a:subtitle')->length);
if (null !== $tagValue && str_starts_with($type, 'tag')) {
if (null !== $tagValue && str_starts_with((string) $type, 'tag')) {
$this->assertSame('wallabag — ' . $type . ' ' . $tagValue . ' feed', $xpath->query('/a:feed/a:title')->item(0)->nodeValue);
$this->assertSame('Atom feed for entries tagged with ' . $tagValue, $xpath->query('/a:feed/a:subtitle')->item(0)->nodeValue);
} else {

4
tests/Helper/ContentProxyTest.php
View file

@ -1074,7 +1074,7 @@ class ContentProxyTest extends TestCase
private function strToHex($string)
{
$hex = '';
for ($i = 0; $i < \strlen($string); ++$i) {
for ($i = 0; $i < \strlen((string) $string); ++$i) {
$ord = \ord($string[$i]);
$hexCode = dechex($ord);
$hex .= substr('0' . $hexCode, -2);
@ -1093,7 +1093,7 @@ class ContentProxyTest extends TestCase
private function hexToStr($hex)
{
$string = '';
for ($i = 0; $i < \strlen($hex) - 1; $i += 2) {
for ($i = 0; $i < \strlen((string) $hex) - 1; $i += 2) {
$string .= \chr(hexdec($hex[$i] . $hex[$i + 1]));
}

8
tests/functions.php
View file

@ -11,19 +11,19 @@
function isPartialRun(): bool
{
foreach ($_SERVER['argv'] as $arg) {
if (str_starts_with($arg, '--filter')) {
if (str_starts_with((string) $arg, '--filter')) {
return true;
}
if (str_starts_with($arg, '--testsuite')) {
if (str_starts_with((string) $arg, '--testsuite')) {
return true;
}
if (str_starts_with($arg, '--group')) {
if (str_starts_with((string) $arg, '--group')) {
return true;
}
if (str_starts_with($arg, '--exclude-group')) {
if (str_starts_with((string) $arg, '--exclude-group')) {
return true;
}
}