Skip to content

Commit 761958b

Browse files
committed
Add more types to test classes
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent 3ed9cdd commit 761958b

32 files changed

+279
-792
lines changed

phpstan-baseline.neon

Lines changed: 1 addition & 406 deletions
Large diffs are not rendered by default.

psalm-baseline.xml

Lines changed: 4 additions & 257 deletions
Original file line numberDiff line numberDiff line change
@@ -1816,15 +1816,9 @@
18161816
</UndefinedMethod>
18171817
</file>
18181818
<file src="tests/Components/ExpressionTest.php">
1819-
<MixedArgument occurrences="1">
1820-
<code>$expr</code>
1821-
</MixedArgument>
18221819
<MixedArrayAccess occurrences="1">
18231820
<code>$errors[0][0]</code>
18241821
</MixedArrayAccess>
1825-
<MixedInferredReturnType occurrences="1">
1826-
<code>array</code>
1827-
</MixedInferredReturnType>
18281822
<PossiblyNullPropertyFetch occurrences="2">
18291823
<code>$component-&gt;expr</code>
18301824
<code>$component-&gt;expr</code>
@@ -1843,24 +1837,10 @@
18431837
<code>assertNull</code>
18441838
</DocblockTypeContradiction>
18451839
</file>
1846-
<file src="tests/Components/LimitTest.php">
1847-
<MixedArgument occurrences="1">
1848-
<code>$test</code>
1849-
</MixedArgument>
1850-
<MixedInferredReturnType occurrences="1">
1851-
<code>array</code>
1852-
</MixedInferredReturnType>
1853-
</file>
18541840
<file src="tests/Components/LockExpressionTest.php">
1855-
<MixedArgument occurrences="1">
1856-
<code>$expr</code>
1857-
</MixedArgument>
18581841
<MixedArrayAccess occurrences="1">
18591842
<code>$errors[0][0]</code>
18601843
</MixedArrayAccess>
1861-
<MixedInferredReturnType occurrences="1">
1862-
<code>array</code>
1863-
</MixedInferredReturnType>
18641844
<RedundantConditionGivenDocblockType occurrences="2">
18651845
<code>assertNotNull</code>
18661846
<code>assertNotNull</code>
@@ -1888,22 +1868,6 @@
18881868
<code>array</code>
18891869
</MixedInferredReturnType>
18901870
</file>
1891-
<file src="tests/Misc/BugsTest.php">
1892-
<MixedArgument occurrences="1">
1893-
<code>$test</code>
1894-
</MixedArgument>
1895-
<MixedInferredReturnType occurrences="1">
1896-
<code>array</code>
1897-
</MixedInferredReturnType>
1898-
</file>
1899-
<file src="tests/Misc/ParameterTest.php">
1900-
<MixedArgument occurrences="1">
1901-
<code>$test</code>
1902-
</MixedArgument>
1903-
<MixedInferredReturnType occurrences="1">
1904-
<code>array</code>
1905-
</MixedInferredReturnType>
1906-
</file>
19071871
<file src="tests/Misc/UtfStringTest.php">
19081872
<MixedArgument occurrences="1">
19091873
<code>$text</code>
@@ -1912,152 +1876,6 @@
19121876
<code>array</code>
19131877
</MixedInferredReturnType>
19141878
</file>
1915-
<file src="tests/Parser/AlterStatementTest.php">
1916-
<MixedArgument occurrences="1">
1917-
<code>$test</code>
1918-
</MixedArgument>
1919-
<MixedInferredReturnType occurrences="1">
1920-
<code>array</code>
1921-
</MixedInferredReturnType>
1922-
</file>
1923-
<file src="tests/Parser/CallStatementTest.php">
1924-
<MixedArgument occurrences="1">
1925-
<code>$test</code>
1926-
</MixedArgument>
1927-
<MixedInferredReturnType occurrences="1">
1928-
<code>array</code>
1929-
</MixedInferredReturnType>
1930-
</file>
1931-
<file src="tests/Parser/CreateStatementTest.php">
1932-
<MixedArgument occurrences="1">
1933-
<code>$test</code>
1934-
</MixedArgument>
1935-
<MixedInferredReturnType occurrences="1">
1936-
<code>array</code>
1937-
</MixedInferredReturnType>
1938-
</file>
1939-
<file src="tests/Parser/DeleteStatementTest.php">
1940-
<MixedArgument occurrences="1">
1941-
<code>$test</code>
1942-
</MixedArgument>
1943-
<MixedInferredReturnType occurrences="1">
1944-
<code>array</code>
1945-
</MixedInferredReturnType>
1946-
</file>
1947-
<file src="tests/Parser/DropStatementTest.php">
1948-
<MixedArgument occurrences="1">
1949-
<code>$test</code>
1950-
</MixedArgument>
1951-
<MixedInferredReturnType occurrences="1">
1952-
<code>array</code>
1953-
</MixedInferredReturnType>
1954-
</file>
1955-
<file src="tests/Parser/ExplainStatementTest.php">
1956-
<MixedArgument occurrences="1">
1957-
<code>$test</code>
1958-
</MixedArgument>
1959-
<MixedInferredReturnType occurrences="1">
1960-
<code>array</code>
1961-
</MixedInferredReturnType>
1962-
</file>
1963-
<file src="tests/Parser/InsertStatementTest.php">
1964-
<MixedArgument occurrences="1">
1965-
<code>$test</code>
1966-
</MixedArgument>
1967-
<MixedInferredReturnType occurrences="1">
1968-
<code>array</code>
1969-
</MixedInferredReturnType>
1970-
</file>
1971-
<file src="tests/Parser/LoadStatementTest.php">
1972-
<MixedArgument occurrences="2">
1973-
<code>$data['query']</code>
1974-
<code>$test</code>
1975-
</MixedArgument>
1976-
<MixedInferredReturnType occurrences="1">
1977-
<code>array</code>
1978-
</MixedInferredReturnType>
1979-
</file>
1980-
<file src="tests/Parser/LockStatementTest.php">
1981-
<MixedArgument occurrences="1">
1982-
<code>$test</code>
1983-
</MixedArgument>
1984-
<MixedInferredReturnType occurrences="1">
1985-
<code>array</code>
1986-
</MixedInferredReturnType>
1987-
</file>
1988-
<file src="tests/Parser/ParserTest.php">
1989-
<MixedArgument occurrences="1">
1990-
<code>$test</code>
1991-
</MixedArgument>
1992-
<MixedInferredReturnType occurrences="1">
1993-
<code>array</code>
1994-
</MixedInferredReturnType>
1995-
</file>
1996-
<file src="tests/Parser/PurgeStatementTest.php">
1997-
<MixedArgument occurrences="1">
1998-
<code>$test</code>
1999-
</MixedArgument>
2000-
<MixedInferredReturnType occurrences="1">
2001-
<code>array</code>
2002-
</MixedInferredReturnType>
2003-
</file>
2004-
<file src="tests/Parser/RenameStatementTest.php">
2005-
<MixedArgument occurrences="1">
2006-
<code>$test</code>
2007-
</MixedArgument>
2008-
<MixedInferredReturnType occurrences="1">
2009-
<code>array</code>
2010-
</MixedInferredReturnType>
2011-
</file>
2012-
<file src="tests/Parser/ReplaceStatementTest.php">
2013-
<MixedArgument occurrences="1">
2014-
<code>$test</code>
2015-
</MixedArgument>
2016-
<MixedInferredReturnType occurrences="1">
2017-
<code>array</code>
2018-
</MixedInferredReturnType>
2019-
</file>
2020-
<file src="tests/Parser/RestoreStatementTest.php">
2021-
<MixedArgument occurrences="1">
2022-
<code>$test</code>
2023-
</MixedArgument>
2024-
<MixedInferredReturnType occurrences="1">
2025-
<code>array</code>
2026-
</MixedInferredReturnType>
2027-
</file>
2028-
<file src="tests/Parser/SelectStatementTest.php">
2029-
<MixedArgument occurrences="2">
2030-
<code>$data['query']</code>
2031-
<code>$test</code>
2032-
</MixedArgument>
2033-
<MixedInferredReturnType occurrences="1">
2034-
<code>array</code>
2035-
</MixedInferredReturnType>
2036-
</file>
2037-
<file src="tests/Parser/SetStatementTest.php">
2038-
<MixedArgument occurrences="1">
2039-
<code>$test</code>
2040-
</MixedArgument>
2041-
<MixedInferredReturnType occurrences="1">
2042-
<code>array</code>
2043-
</MixedInferredReturnType>
2044-
</file>
2045-
<file src="tests/Parser/TransactionStatementTest.php">
2046-
<MixedArgument occurrences="1">
2047-
<code>$test</code>
2048-
</MixedArgument>
2049-
<MixedInferredReturnType occurrences="1">
2050-
<code>array</code>
2051-
</MixedInferredReturnType>
2052-
</file>
2053-
<file src="tests/Parser/UpdateStatementTest.php">
2054-
<MixedArgument occurrences="1">
2055-
<code>$test</code>
2056-
</MixedArgument>
2057-
<MixedInferredReturnType occurrences="1">
2058-
<code>array</code>
2059-
</MixedInferredReturnType>
2060-
</file>
20611879
<file src="tests/Parser/WithStatementTest.php">
20621880
<InvalidArgument occurrences="1">
20631881
<code>new stdClass()</code>
@@ -2067,25 +1885,10 @@
20671885
</MixedArrayAccess>
20681886
</file>
20691887
<file src="tests/TestCase.php">
2070-
<MixedArgument occurrences="1">
2071-
<code>$data['query']</code>
2072-
</MixedArgument>
2073-
<MixedArrayAccess occurrences="2">
2074-
<code>$data['errors']['lexer']</code>
2075-
<code>$data['errors']['parser']</code>
2076-
</MixedArrayAccess>
2077-
<MixedArrayAssignment occurrences="1">
2078-
<code>$data['query']</code>
2079-
</MixedArrayAssignment>
2080-
<MixedAssignment occurrences="1">
1888+
<LessSpecificReturnStatement occurrences="1">
20811889
<code>$data</code>
2082-
</MixedAssignment>
2083-
<MixedInferredReturnType occurrences="1">
2084-
<code>array</code>
2085-
</MixedInferredReturnType>
2086-
<MixedReturnStatement occurrences="1">
2087-
<code>$data</code>
2088-
</MixedReturnStatement>
1890+
</LessSpecificReturnStatement>
1891+
<MoreSpecificReturnType occurrences="1"/>
20891892
<UndefinedPropertyFetch occurrences="3">
20901893
<code>$err-&gt;ch</code>
20911894
<code>$err-&gt;pos</code>
@@ -2107,25 +1910,6 @@
21071910
<code>$chunks[$i++]</code>
21081911
</PossiblyInvalidArrayAccess>
21091912
</file>
2110-
<file src="tests/Utils/CLITest.php">
2111-
<MixedArgument occurrences="6">
2112-
<code>$output</code>
2113-
<code>$output</code>
2114-
<code>$output</code>
2115-
<code>$output</code>
2116-
<code>$output</code>
2117-
<code>$output</code>
2118-
</MixedArgument>
2119-
<MixedInferredReturnType occurrences="7">
2120-
<code>array</code>
2121-
<code>array</code>
2122-
<code>array</code>
2123-
<code>array</code>
2124-
<code>array</code>
2125-
<code>array</code>
2126-
<code>array</code>
2127-
</MixedInferredReturnType>
2128-
</file>
21291913
<file src="tests/Utils/FormatterTest.php">
21301914
<MixedArgument occurrences="3">
21311915
<code>$query</code>
@@ -2141,14 +1925,8 @@
21411925
<ArgumentTypeCoercion occurrences="1">
21421926
<code>$statement</code>
21431927
</ArgumentTypeCoercion>
2144-
<MixedArgument occurrences="2">
1928+
<PossiblyNullArgument occurrences="2">
21451929
<code>$db</code>
2146-
<code>$query</code>
2147-
</MixedArgument>
2148-
<MixedInferredReturnType occurrences="1">
2149-
<code>array</code>
2150-
</MixedInferredReturnType>
2151-
<PossiblyNullArgument occurrences="1">
21521930
<code>$statement</code>
21531931
</PossiblyNullArgument>
21541932
</file>
@@ -2177,42 +1955,11 @@
21771955
<ArgumentTypeCoercion occurrences="1">
21781956
<code>$parser-&gt;statements[0]</code>
21791957
</ArgumentTypeCoercion>
2180-
<MixedArgument occurrences="3">
2181-
<code>$def</code>
2182-
<code>$def</code>
2183-
<code>$query</code>
2184-
</MixedArgument>
2185-
<MixedInferredReturnType occurrences="3">
2186-
<code>array</code>
2187-
<code>array</code>
2188-
<code>array</code>
2189-
</MixedInferredReturnType>
21901958
</file>
21911959
<file src="tests/Utils/TableTest.php">
21921960
<ArgumentTypeCoercion occurrences="2">
21931961
<code>$parser-&gt;statements[0]</code>
21941962
<code>$parser-&gt;statements[0]</code>
21951963
</ArgumentTypeCoercion>
2196-
<MixedArgument occurrences="2">
2197-
<code>$query</code>
2198-
<code>$query</code>
2199-
</MixedArgument>
2200-
<MixedInferredReturnType occurrences="2">
2201-
<code>array</code>
2202-
<code>array</code>
2203-
</MixedInferredReturnType>
2204-
</file>
2205-
<file src="tests/Utils/TokensTest.php">
2206-
<MixedArgument occurrences="5">
2207-
<code>$find</code>
2208-
<code>$list</code>
2209-
<code>$pattern</code>
2210-
<code>$replace</code>
2211-
<code>$token</code>
2212-
</MixedArgument>
2213-
<MixedInferredReturnType occurrences="2">
2214-
<code>array</code>
2215-
<code>array</code>
2216-
</MixedInferredReturnType>
22171964
</file>
22181965
</files>

tests/Components/ExpressionTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ public function testParse2(): void
2323
}
2424

2525
/**
26-
* @param mixed $expr
27-
* @param mixed $error
28-
*
2926
* @dataProvider parseErrProvider
3027
*/
31-
public function testParseErr($expr, $error): void
28+
public function testParseErr(string $expr, string $error): void
3229
{
3330
$parser = new Parser();
3431
Expression::parse($parser, $this->getTokensList($expr));
3532
$errors = $this->getErrorsAsArray($parser);
3633
$this->assertEquals($errors[0][0], $error);
3734
}
3835

36+
/**
37+
* @return string[][]
38+
*/
3939
public function parseErrProvider(): array
4040
{
4141
return [

tests/Components/LimitTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,16 @@ public function testBuildWithOffset(): void
2222
}
2323

2424
/**
25-
* @param mixed $test
26-
*
2725
* @dataProvider parseProvider
2826
*/
29-
public function testParse($test): void
27+
public function testParse(string $test): void
3028
{
3129
$this->runParserTest($test);
3230
}
3331

32+
/**
33+
* @return string[][]
34+
*/
3435
public function parseProvider(): array
3536
{
3637
return [

tests/Components/LockExpressionTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@ public function testParse2(): void
2828
}
2929

3030
/**
31-
* @param mixed $expr
32-
* @param mixed $error
33-
*
3431
* @dataProvider parseErrProvider
3532
*/
36-
public function testParseErr($expr, $error): void
33+
public function testParseErr(string $expr, string $error): void
3734
{
3835
$parser = new Parser();
3936
LockExpression::parse($parser, $this->getTokensList($expr));
4037
$errors = $this->getErrorsAsArray($parser);
4138
$this->assertEquals($errors[0][0], $error);
4239
}
4340

41+
/**
42+
* @return string[][]
43+
*/
4444
public function parseErrProvider(): array
4545
{
4646
return [

0 commit comments

Comments
 (0)