Skip to content

Commit 399383b

Browse files
committed
Fix
1 parent e26e62d commit 399383b

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

src/Psalm/Internal/DataFlow/DataFlowNode.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public static function make(
4848
$unspecialized_id = null;
4949
} else {
5050
$unspecialized_id = $id;
51-
$id .= '-' . $specialization_key;
51+
$id .= ' specialized in ' . $specialization_key;
5252
}
5353
return new self(
5454
$id,
@@ -93,7 +93,7 @@ public static function getForAssignment(
9393
?string $specialization_key = null,
9494
): self {
9595
$label = $var_id;
96-
$var_id .= ':' . $assignment_location->file_name
96+
$var_id .= ' from ' . strtolower($assignment_location->file_name)
9797
. ':' . $assignment_location->raw_file_start
9898
. '-' . $assignment_location->raw_file_end;
9999

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
digraph Taints {
2-
"$_GET:src/FileWithErrors.php:414" -> "$_GET['abc']-src/FileWithErrors.php:414-418"
3-
"$_GET:src/FileWithErrors.php:441" -> "$_GET['abc']-src/FileWithErrors.php:441-445"
4-
"$_GET:src/FileWithErrors.php:457" -> "$_GET['abc']-src/FileWithErrors.php:457-461"
5-
"$_GET['abc']-src/FileWithErrors.php:441-445" -> "call to is_string-src/FileWithErrors.php:441-452"
6-
"$_GET['abc']-src/FileWithErrors.php:457-461" -> "call to echo-src/FileWithErrors.php:408-474"
7-
"$s-src/FileWithErrors.php:110-111" -> "variable-use" -> "acme\sampleproject\bar"
8-
"$s-src/FileWithErrors.php:163-164" -> "variable-use" -> "acme\sampleproject\baz"
9-
"$s-src/FileWithErrors.php:216-217" -> "variable-use" -> "acme\sampleproject\bat"
10-
"$s-src/FileWithErrors.php:270-271" -> "variable-use" -> "acme\sampleproject\bang"
11-
"acme\sampleproject\bang#1" -> "$s-src/FileWithErrors.php:270-271"
12-
"acme\sampleproject\bar#1" -> "$s-src/FileWithErrors.php:110-111"
13-
"acme\sampleproject\bat#1" -> "$s-src/FileWithErrors.php:216-217"
14-
"acme\sampleproject\baz#1" -> "$s-src/FileWithErrors.php:163-164"
15-
"acme\sampleproject\foo#1" -> "$_s-src/FileWithErrors.php:57-59"
16-
"call to echo-src/FileWithErrors.php:336-368" -> "echo#1-src/filewitherrors.php:331"
17-
"call to echo-src/FileWithErrors.php:408-474" -> "echo#1-src/filewitherrors.php:403"
18-
"call to is_string-src/FileWithErrors.php:441-452" -> "is_string#1-src/filewitherrors.php:431"
19-
"coalesce-src/FileWithErrors.php:346-367" -> "call to echo-src/FileWithErrors.php:336-368"
2+
"$_GET specialized in src/FileWithErrors.php:414" -> "$_GET['abc'] from src/filewitherrors.php:414-418"
3+
"$_GET specialized in src/FileWithErrors.php:441" -> "$_GET['abc'] from src/filewitherrors.php:441-445"
4+
"$_GET specialized in src/FileWithErrors.php:457" -> "$_GET['abc'] from src/filewitherrors.php:457-461"
5+
"$_GET['abc'] from src/filewitherrors.php:441-445" -> "call to is_string from src/filewitherrors.php:441-452"
6+
"$_GET['abc'] from src/filewitherrors.php:457-461" -> "call to echo from src/filewitherrors.php:408-474"
7+
"$s from src/filewitherrors.php:110-111" -> "variable-use" -> "acme\sampleproject\bar"
8+
"$s from src/filewitherrors.php:163-164" -> "variable-use" -> "acme\sampleproject\baz"
9+
"$s from src/filewitherrors.php:216-217" -> "variable-use" -> "acme\sampleproject\bat"
10+
"$s from src/filewitherrors.php:270-271" -> "variable-use" -> "acme\sampleproject\bang"
11+
"acme\sampleproject\bang#1" -> "$s from src/filewitherrors.php:270-271"
12+
"acme\sampleproject\bar#1" -> "$s from src/filewitherrors.php:110-111"
13+
"acme\sampleproject\bat#1" -> "$s from src/filewitherrors.php:216-217"
14+
"acme\sampleproject\baz#1" -> "$s from src/filewitherrors.php:163-164"
15+
"acme\sampleproject\foo#1" -> "$_s from src/filewitherrors.php:57-59"
16+
"call to echo from src/filewitherrors.php:336-368" -> "echo#1 specialized in src/filewitherrors.php:331"
17+
"call to echo from src/filewitherrors.php:408-474" -> "echo#1 specialized in src/filewitherrors.php:403"
18+
"call to is_string from src/filewitherrors.php:441-452" -> "is_string#1 specialized in src/filewitherrors.php:431"
19+
"coalesce from src/filewitherrors.php:346-367" -> "call to echo from src/filewitherrors.php:336-368"
2020
}

0 commit comments

Comments
 (0)