diff options
Diffstat (limited to 'tests/app')
| -rw-r--r-- | tests/app/Models/CategoryTest.php | 16 | ||||
| -rw-r--r-- | tests/app/Models/SearchTest.php | 116 |
2 files changed, 66 insertions, 66 deletions
diff --git a/tests/app/Models/CategoryTest.php b/tests/app/Models/CategoryTest.php index 842ebe200..c9e88a32d 100644 --- a/tests/app/Models/CategoryTest.php +++ b/tests/app/Models/CategoryTest.php @@ -19,14 +19,14 @@ class CategoryTest extends PHPUnit\Framework\TestCase { /** @return array<array{string,string}> */ public function provideValidNames(): array { - return array( - array('', ''), - array('this string does not need trimming', 'this string does not need trimming'), - array(' this string needs trimming on left', 'this string needs trimming on left'), - array('this string needs trimming on right ', 'this string needs trimming on right'), - array(' this string needs trimming on both ends ', 'this string needs trimming on both ends'), - array(str_repeat('X', 512), str_repeat('X', FreshRSS_DatabaseDAO::LENGTH_INDEX_UNICODE)), // max length - ); + return [ + ['', ''], + ['this string does not need trimming', 'this string does not need trimming'], + [' this string needs trimming on left', 'this string needs trimming on left'], + ['this string needs trimming on right ', 'this string needs trimming on right'], + [' this string needs trimming on both ends ', 'this string needs trimming on both ends'], + [str_repeat('X', 512), str_repeat('X', FreshRSS_DatabaseDAO::LENGTH_INDEX_UNICODE)], // max length + ]; } public function test_feedOrdering(): void { diff --git a/tests/app/Models/SearchTest.php b/tests/app/Models/SearchTest.php index 12159caeb..e2dba31a1 100644 --- a/tests/app/Models/SearchTest.php +++ b/tests/app/Models/SearchTest.php @@ -47,26 +47,26 @@ class SearchTest extends PHPUnit\Framework\TestCase { * @return array<array<mixed>> */ public function provideIntitleSearch(): array { - return array( - array('intitle:word1', array('word1'), null), - array('intitle:word1-word2', array('word1-word2'), null), - array('intitle:word1 word2', array('word1'), array('word2')), - array('intitle:"word1 word2"', array('word1 word2'), null), - array("intitle:'word1 word2'", array('word1 word2'), null), - array('word1 intitle:word2', array('word2'), array('word1')), - array('word1 intitle:word2 word3', array('word2'), array('word1', 'word3')), - array('word1 intitle:"word2 word3"', array('word2 word3'), array('word1')), - array("word1 intitle:'word2 word3'", array('word2 word3'), array('word1')), - array('intitle:word1 intitle:word2', array('word1', 'word2'), null), - array('intitle: word1 word2', null, array('word1', 'word2')), - array('intitle:123', array('123'), null), - array('intitle:"word1 word2" word3"', array('word1 word2'), array('word3"')), - array("intitle:'word1 word2' word3'", array('word1 word2'), array("word3'")), - array('intitle:"word1 word2\' word3"', array("word1 word2' word3"), null), - array("intitle:'word1 word2\" word3'", array('word1 word2" word3'), null), - array("intitle:word1 'word2 word3' word4", array('word1'), array('word2 word3', 'word4')), + return [ + ['intitle:word1', ['word1'], null], + ['intitle:word1-word2', ['word1-word2'], null], + ['intitle:word1 word2', ['word1'], ['word2']], + ['intitle:"word1 word2"', ['word1 word2'], null], + ["intitle:'word1 word2'", ['word1 word2'], null], + ['word1 intitle:word2', ['word2'], ['word1']], + ['word1 intitle:word2 word3', ['word2'], ['word1', 'word3']], + ['word1 intitle:"word2 word3"', ['word2 word3'], ['word1']], + ["word1 intitle:'word2 word3'", ['word2 word3'], ['word1']], + ['intitle:word1 intitle:word2', ['word1', 'word2'], null], + ['intitle: word1 word2', null, ['word1', 'word2']], + ['intitle:123', ['123'], null], + ['intitle:"word1 word2" word3"', ['word1 word2'], ['word3"']], + ["intitle:'word1 word2' word3'", ['word1 word2'], ["word3'"]], + ['intitle:"word1 word2\' word3"', ["word1 word2' word3"], null], + ["intitle:'word1 word2\" word3'", ['word1 word2" word3'], null], + ["intitle:word1 'word2 word3' word4", ['word1'], ['word2 word3', 'word4']], ['intitle:word1+word2', ['word1+word2'], null], - ); + ]; } /** @@ -84,26 +84,26 @@ class SearchTest extends PHPUnit\Framework\TestCase { * @return array<array<mixed>> */ public function provideAuthorSearch(): array { - return array( - array('author:word1', array('word1'), null), - array('author:word1-word2', array('word1-word2'), null), - array('author:word1 word2', array('word1'), array('word2')), - array('author:"word1 word2"', array('word1 word2'), null), - array("author:'word1 word2'", array('word1 word2'), null), - array('word1 author:word2', array('word2'), array('word1')), - array('word1 author:word2 word3', array('word2'), array('word1', 'word3')), - array('word1 author:"word2 word3"', array('word2 word3'), array('word1')), - array("word1 author:'word2 word3'", array('word2 word3'), array('word1')), - array('author:word1 author:word2', array('word1', 'word2'), null), - array('author: word1 word2', null, array('word1', 'word2')), - array('author:123', array('123'), null), - array('author:"word1 word2" word3"', array('word1 word2'), array('word3"')), - array("author:'word1 word2' word3'", array('word1 word2'), array("word3'")), - array('author:"word1 word2\' word3"', array("word1 word2' word3"), null), - array("author:'word1 word2\" word3'", array('word1 word2" word3'), null), - array("author:word1 'word2 word3' word4", array('word1'), array('word2 word3', 'word4')), + return [ + ['author:word1', ['word1'], null], + ['author:word1-word2', ['word1-word2'], null], + ['author:word1 word2', ['word1'], ['word2']], + ['author:"word1 word2"', ['word1 word2'], null], + ["author:'word1 word2'", ['word1 word2'], null], + ['word1 author:word2', ['word2'], ['word1']], + ['word1 author:word2 word3', ['word2'], ['word1', 'word3']], + ['word1 author:"word2 word3"', ['word2 word3'], ['word1']], + ["word1 author:'word2 word3'", ['word2 word3'], ['word1']], + ['author:word1 author:word2', ['word1', 'word2'], null], + ['author: word1 word2', null, ['word1', 'word2']], + ['author:123', ['123'], null], + ['author:"word1 word2" word3"', ['word1 word2'], ['word3"']], + ["author:'word1 word2' word3'", ['word1 word2'], ["word3'"]], + ['author:"word1 word2\' word3"', ["word1 word2' word3"], null], + ["author:'word1 word2\" word3'", ['word1 word2" word3'], null], + ["author:word1 'word2 word3' word4", ['word1'], ['word2 word3', 'word4']], ['author:word1+word2', ['word1+word2'], null], - ); + ]; } /** @@ -121,16 +121,16 @@ class SearchTest extends PHPUnit\Framework\TestCase { * @return array<array<mixed>> */ public function provideInurlSearch(): array { - return array( - array('inurl:word1', array('word1'), null), - array('inurl: word1', array(), array('word1')), - array('inurl:123', array('123'), null), - array('inurl:word1 word2', array('word1'), array('word2')), - array('inurl:"word1 word2"', array('"word1'), array('word2"')), - array('inurl:word1 word2 inurl:word3', array('word1', 'word3'), array('word2')), - array("inurl:word1 'word2 word3' word4", array('word1'), array('word2 word3', 'word4')), + return [ + ['inurl:word1', ['word1'], null], + ['inurl: word1', [], ['word1']], + ['inurl:123', ['123'], null], + ['inurl:word1 word2', ['word1'], ['word2']], + ['inurl:"word1 word2"', ['"word1'], ['word2"']], + ['inurl:word1 word2 inurl:word3', ['word1', 'word3'], ['word2']], + ["inurl:word1 'word2 word3' word4", ['word1'], ['word2 word3', 'word4']], ['inurl:word1+word2', ['word1+word2'], null], - ); + ]; } /** @@ -194,16 +194,16 @@ class SearchTest extends PHPUnit\Framework\TestCase { * @return array<array<string|array<string>|null>> */ public function provideTagsSearch(): array { - return array( - array('#word1', array('word1'), null), - array('# word1', null, array('#', 'word1')), - array('#123', array('123'), null), - array('#word1 word2', array('word1'), array('word2')), - array('#"word1 word2"', array('"word1'), array('word2"')), - array('#word1 #word2', array('word1', 'word2'), null), - array("#word1 'word2 word3' word4", array('word1'), array('word2 word3', 'word4')), - ['#word1+word2', ['word1 word2'], null], - ); + return [ + ['#word1', ['word1'], null], + ['# word1', null, ['#', 'word1']], + ['#123', ['123'], null], + ['#word1 word2', ['word1'], ['word2']], + ['#"word1 word2"', ['"word1'], ['word2"'],], + ['#word1 #word2', ['word1', 'word2'], null], + ["#word1 'word2 word3' word4", ['word1'], ['word2 word3', 'word4']], + ['#word1+word2', ['word1 word2'], null] + ]; } /** @@ -289,7 +289,7 @@ class SearchTest extends PHPUnit\Framework\TestCase { * @param array<string> $values */ public function test__construct_parentheses(string $input, string $sql, array $values): void { - list($filterValues, $filterSearch) = FreshRSS_EntryDAOPGSQL::sqlBooleanSearch('e.', new FreshRSS_BooleanSearch($input)); + [$filterValues, $filterSearch] = FreshRSS_EntryDAOPGSQL::sqlBooleanSearch('e.', new FreshRSS_BooleanSearch($input)); self::assertEquals($sql, $filterSearch); self::assertEquals($values, $filterValues); } |
