danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-30 04:39:00 +01:00
Code Issues Projects Releases Wiki Activity

fix merge issues

Browse Source
This commit is contained in:
orklah 2022-02-14 00:12:31 +01:00
parent 1142c818c2
commit 5aa06ae64e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/TaintTest.php
View File

@ -2286,7 +2286,7 @@ class TaintTest extends TestCase
'error_message' => 'TaintedHtml',
],
'taintEscapedInTryMightNotWork' => [
'<?php
'code' => '<?php
/** @psalm-taint-escape html */
function escapeHtml(string $arg): string
{

12
tests/UnusedVariableTest.php
View File

@ -2463,7 +2463,7 @@ class UnusedVariableTest extends TestCase
}'
],
'usedInCatchIsAlwaysUsedInTry' => [
'<?php
'code' => '<?php
$step = 0;
try {
$step = 1;
@ -2474,7 +2474,7 @@ class UnusedVariableTest extends TestCase
',
],
'usedInFinallyIsAlwaysUsedInTry' => [
'<?php
'code' => '<?php
$step = 0;
try {
$step = 1;
@ -2485,7 +2485,7 @@ class UnusedVariableTest extends TestCase
',
],
'usedInFinallyIsAlwaysUsedInTryWithNestedTry' => [
'<?php
'code' => '<?php
$step = 0;
try {
try {
@ -3568,7 +3568,7 @@ class UnusedVariableTest extends TestCase
'error_message' => 'MixedArgumentTypeCoercion - src' . DIRECTORY_SEPARATOR . 'somefile.php:12:44 - Argument 1 of takesArrayOfString expects array<array-key, string>, parent type array{mixed} provided. Consider improving the type at src' . DIRECTORY_SEPARATOR . 'somefile.php:10:41'
],
'warnAboutUnusedVariableInTryReassignedInCatch' => [
'<?php
'code' => '<?php
$step = 0;
try {
$step = 1;
@ -3581,7 +3581,7 @@ class UnusedVariableTest extends TestCase
'error_message' => 'UnusedVariable',
],
'warnAboutUnusedVariableInTryReassignedInFinally' => [
'<?php
'code' => '<?php
$step = 0;
try {
$step = 1;
@ -3594,7 +3594,7 @@ class UnusedVariableTest extends TestCase
'error_message' => 'UnusedVariable',
],
'SKIPPED-warnAboutVariableUsedInNestedTryNotUsedInOuterTry' => [
'<?php
'code' => '<?php
$step = 0;
try {
$step = 1; // Unused