mirror of
https://github.com/FreshRSS/FreshRSS.git
synced 2026-04-26 17:27:42 -04:00
Upgrade code to php 8.1 (#6748)
* revert Fix code indentation Fix code Upgrade code to php 8.1 * fix remarques * code review * code review * code review * Apply suggestions from code review * code review * Fixes * Many remainging updates of array syntax * Lost case 'reading-list' * Uneeded PHPDoc --------- Co-authored-by: Luc Sanchez <l.sanchez-prestataire@alptis.fr> Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
This commit is contained in:
@@ -1,19 +1,20 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
use PHPUnit\Framework\TestCase;
|
||||
/**
|
||||
* Description of UserQueryTest
|
||||
*/
|
||||
class UserQueryTest extends PHPUnit\Framework\TestCase {
|
||||
class UserQueryTest extends TestCase {
|
||||
|
||||
public static function test__construct_whenAllQuery_storesAllParameters(): void {
|
||||
$query = array('get' => 'a');
|
||||
$query = ['get' => 'a'];
|
||||
$user_query = new FreshRSS_UserQuery($query, [], []);
|
||||
self::assertEquals('all', $user_query->getGetType());
|
||||
}
|
||||
|
||||
public static function test__construct_whenFavoriteQuery_storesFavoriteParameters(): void {
|
||||
$query = array('get' => 's');
|
||||
$query = ['get' => 's'];
|
||||
$user_query = new FreshRSS_UserQuery($query, [], []);
|
||||
self::assertEquals('favorite', $user_query->getGetType());
|
||||
}
|
||||
@@ -26,7 +27,7 @@ class UserQueryTest extends PHPUnit\Framework\TestCase {
|
||||
->method('name')
|
||||
->withAnyParameters()
|
||||
->willReturn($category_name);
|
||||
$query = array('get' => 'c_1');
|
||||
$query = ['get' => 'c_1'];
|
||||
$user_query = new FreshRSS_UserQuery($query, [1 => $cat], []);
|
||||
self::assertEquals($category_name, $user_query->getGetName());
|
||||
self::assertEquals('category', $user_query->getGetType());
|
||||
@@ -50,14 +51,14 @@ class UserQueryTest extends PHPUnit\Framework\TestCase {
|
||||
->method('feeds')
|
||||
->withAnyParameters()
|
||||
->willReturn([1 => $feed]);
|
||||
$query = array('get' => 'f_1');
|
||||
$query = ['get' => 'f_1'];
|
||||
$user_query = new FreshRSS_UserQuery($query, [1 => $cat], []);
|
||||
self::assertEquals($feed_name, $user_query->getGetName());
|
||||
self::assertEquals('feed', $user_query->getGetType());
|
||||
}
|
||||
|
||||
public static function test__construct_whenUnknownQuery_doesStoreParameters(): void {
|
||||
$query = array('get' => 'q');
|
||||
$query = ['get' => 'q'];
|
||||
$user_query = new FreshRSS_UserQuery($query, [], []);
|
||||
self::assertEmpty($user_query->getGetName());
|
||||
self::assertEmpty($user_query->getGetType());
|
||||
@@ -65,28 +66,28 @@ class UserQueryTest extends PHPUnit\Framework\TestCase {
|
||||
|
||||
public static function test__construct_whenName_storesName(): void {
|
||||
$name = 'some name';
|
||||
$query = array('name' => $name);
|
||||
$query = ['name' => $name];
|
||||
$user_query = new FreshRSS_UserQuery($query, [], []);
|
||||
self::assertEquals($name, $user_query->getName());
|
||||
}
|
||||
|
||||
public static function test__construct_whenOrder_storesOrder(): void {
|
||||
$order = 'some order';
|
||||
$query = array('order' => $order);
|
||||
$query = ['order' => $order];
|
||||
$user_query = new FreshRSS_UserQuery($query, [], []);
|
||||
self::assertEquals($order, $user_query->getOrder());
|
||||
}
|
||||
|
||||
public static function test__construct_whenState_storesState(): void {
|
||||
$state = FreshRSS_Entry::STATE_NOT_READ | FreshRSS_Entry::STATE_FAVORITE;
|
||||
$query = array('state' => $state);
|
||||
$query = ['state' => $state];
|
||||
$user_query = new FreshRSS_UserQuery($query, [], []);
|
||||
self::assertEquals($state, $user_query->getState());
|
||||
}
|
||||
|
||||
public static function test__construct_whenUrl_storesUrl(): void {
|
||||
$url = 'some url';
|
||||
$query = array('url' => $url);
|
||||
$query = ['url' => $url];
|
||||
$user_query = new FreshRSS_UserQuery($query, [], []);
|
||||
self::assertEquals($url, $user_query->getUrl());
|
||||
}
|
||||
@@ -97,23 +98,21 @@ class UserQueryTest extends PHPUnit\Framework\TestCase {
|
||||
}
|
||||
|
||||
public static function testToArray_whenData_returnsArray(): void {
|
||||
$query = array(
|
||||
$query = [
|
||||
'get' => 's',
|
||||
'name' => 'some name',
|
||||
'order' => 'some order',
|
||||
'search' => 'some search',
|
||||
'state' => FreshRSS_Entry::STATE_ALL,
|
||||
'url' => 'some url',
|
||||
);
|
||||
];
|
||||
$user_query = new FreshRSS_UserQuery($query, [], []);
|
||||
self::assertCount(6, $user_query->toArray());
|
||||
self::assertEquals($query, $user_query->toArray());
|
||||
}
|
||||
|
||||
public static function testHasSearch_whenSearch_returnsTrue(): void {
|
||||
$query = array(
|
||||
'search' => 'some search',
|
||||
);
|
||||
$query = ['search' => 'some search'];
|
||||
$user_query = new FreshRSS_UserQuery($query, [], []);
|
||||
self::assertTrue($user_query->hasSearch());
|
||||
}
|
||||
@@ -124,19 +123,19 @@ class UserQueryTest extends PHPUnit\Framework\TestCase {
|
||||
}
|
||||
|
||||
public static function testHasParameters_whenAllQuery_returnsFalse(): void {
|
||||
$query = array('get' => 'a');
|
||||
$query = ['get' => 'a'];
|
||||
$user_query = new FreshRSS_UserQuery($query, [], []);
|
||||
self::assertFalse($user_query->hasParameters());
|
||||
}
|
||||
|
||||
public static function testHasParameters_whenNoParameter_returnsFalse(): void {
|
||||
$query = array();
|
||||
$query = [];
|
||||
$user_query = new FreshRSS_UserQuery($query, [], []);
|
||||
self::assertFalse($user_query->hasParameters());
|
||||
}
|
||||
|
||||
public static function testHasParameters_whenParameter_returnTrue(): void {
|
||||
$query = array('get' => 's');
|
||||
$query = ['get' => 's'];
|
||||
$user_query = new FreshRSS_UserQuery($query, [], []);
|
||||
self::assertTrue($user_query->hasParameters());
|
||||
}
|
||||
@@ -148,13 +147,13 @@ class UserQueryTest extends PHPUnit\Framework\TestCase {
|
||||
->method('name')
|
||||
->withAnyParameters()
|
||||
->willReturn('cat 1');
|
||||
$query = array('get' => 'c_1');
|
||||
$query = ['get' => 'c_1'];
|
||||
$user_query = new FreshRSS_UserQuery($query, [1 => $cat], []);
|
||||
self::assertFalse($user_query->isDeprecated());
|
||||
}
|
||||
|
||||
public static function testIsDeprecated_whenCategoryDoesNotExist_returnTrue(): void {
|
||||
$query = array('get' => 'c_1');
|
||||
$query = ['get' => 'c_1'];
|
||||
$user_query = new FreshRSS_UserQuery($query, [], []);
|
||||
self::assertTrue($user_query->isDeprecated());
|
||||
}
|
||||
@@ -176,7 +175,7 @@ class UserQueryTest extends PHPUnit\Framework\TestCase {
|
||||
->method('feeds')
|
||||
->withAnyParameters()
|
||||
->willReturn([1 => $feed]);
|
||||
$query = array('get' => 'f_1');
|
||||
$query = ['get' => 'f_1'];
|
||||
$user_query = new FreshRSS_UserQuery($query, [1 => $cat], []);
|
||||
self::assertFalse($user_query->isDeprecated());
|
||||
}
|
||||
@@ -188,25 +187,25 @@ class UserQueryTest extends PHPUnit\Framework\TestCase {
|
||||
->method('feeds')
|
||||
->withAnyParameters()
|
||||
->willReturn([]);
|
||||
$query = array('get' => 'f_1');
|
||||
$query = ['get' => 'f_1'];
|
||||
$user_query = new FreshRSS_UserQuery($query, [1 => $cat], []);
|
||||
self::assertTrue($user_query->isDeprecated());
|
||||
}
|
||||
|
||||
public static function testIsDeprecated_whenAllQuery_returnFalse(): void {
|
||||
$query = array('get' => 'a');
|
||||
$query = ['get' => 'a'];
|
||||
$user_query = new FreshRSS_UserQuery($query, [], []);
|
||||
self::assertFalse($user_query->isDeprecated());
|
||||
}
|
||||
|
||||
public static function testIsDeprecated_whenFavoriteQuery_returnFalse(): void {
|
||||
$query = array('get' => 's');
|
||||
$query = ['get' => 's'];
|
||||
$user_query = new FreshRSS_UserQuery($query, [], []);
|
||||
self::assertFalse($user_query->isDeprecated());
|
||||
}
|
||||
|
||||
public static function testIsDeprecated_whenUnknownQuery_returnFalse(): void {
|
||||
$query = array('get' => 'q');
|
||||
$query = ['get' => 'q'];
|
||||
$user_query = new FreshRSS_UserQuery($query, [], []);
|
||||
self::assertFalse($user_query->isDeprecated());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user