style: fix code style and redundant conditions

vimeo · Sep 15, 2023 · 63812ac · 63812ac
1 parent 52f3a27
commit 63812ac
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 23 deletions.
diff --git a/...Internal/Analyzer/Statements/Expression/Assignment/InstancePropertyAssignmentAnalyzer.php b/...Internal/Analyzer/Statements/Expression/Assignment/InstancePropertyAssignmentAnalyzer.php
@@ -628,7 +628,9 @@ public static function taintUnspecializedProperty(
         if ($statements_analyzer->data_flow_graph instanceof TaintFlowGraph) {
             $taint_source = TaintSource::fromNode($property_node);
             $statements_analyzer->data_flow_graph->addSource($taint_source);
-            $assignment_value_type = $assignment_value_type->addParentNodes([$taint_source->id => $taint_source]);
+            $assignment_value_type = $assignment_value_type->addParentNodes([
+                $taint_source->id => $taint_source
+            ]);
         }
 
         $declaring_property_class = $codebase->properties->getDeclaringClassForProperty(

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallAnalyzer.php
@@ -873,11 +873,9 @@ private static function getAnalyzeNamedExpression(
                     );
                 }
 
-                if ($statements_analyzer->data_flow_graph instanceof TaintFlowGraph) {
-                    $taint_source = TaintSource::fromNode($custom_call_sink);
-                    $statements_analyzer->data_flow_graph->addSource($taint_source);
-                    $stmt_name_type = $stmt_name_type->addParentNodes([$taint_source->id => $taint_source]);
-                }
+                $taint_source = TaintSource::fromNode($custom_call_sink);
+                $statements_analyzer->data_flow_graph->addSource($taint_source);
+                $stmt_name_type = $stmt_name_type->addParentNodes([$taint_source->id => $taint_source]);
             }
         }
 

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NewAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NewAnalyzer.php
@@ -688,11 +688,9 @@ private static function analyzeConstructorExpression(
                     );
                 }
 
-                if ($statements_analyzer->data_flow_graph instanceof TaintFlowGraph) {
-                    $taint_source = TaintSource::fromNode($custom_call_sink);
-                    $statements_analyzer->data_flow_graph->addSource($taint_source);
-                    $stmt_class_type = $stmt_class_type->addParentNodes([$taint_source->id => $taint_source]);
-                }
+                $taint_source = TaintSource::fromNode($custom_call_sink);
+                $statements_analyzer->data_flow_graph->addSource($taint_source);
+                $stmt_class_type = $stmt_class_type->addParentNodes([$taint_source->id => $taint_source]);
             }
 
             if (self::checkMethodArgs(

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/EvalAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/EvalAnalyzer.php
@@ -71,11 +71,9 @@ public static function analyze(
                     );
                 }
 
-                if ($statements_analyzer->data_flow_graph instanceof TaintFlowGraph) {
-                    $taint_source = TaintSource::fromNode($eval_param_sink);
-                    $statements_analyzer->data_flow_graph->addSource($taint_source);
-                    $expr_type = $expr_type->addParentNodes([$taint_source->id => $taint_source]);
-                }
+                $taint_source = TaintSource::fromNode($eval_param_sink);
+                $statements_analyzer->data_flow_graph->addSource($taint_source);
+                $expr_type = $expr_type->addParentNodes([$taint_source->id => $taint_source]);
             }
         }
 

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/IncludeAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/IncludeAnalyzer.php
@@ -148,11 +148,9 @@ public static function analyze(
                 );
             }
 
-            if ($statements_analyzer->data_flow_graph instanceof TaintFlowGraph) {
-                $taint_source = TaintSource::fromNode($include_param_sink);
-                $statements_analyzer->data_flow_graph->addSource($taint_source);
-                $stmt_expr_type = $stmt_expr_type->addParentNodes([$taint_source->id => $taint_source]);
-            }
+            $taint_source = TaintSource::fromNode($include_param_sink);
+            $statements_analyzer->data_flow_graph->addSource($taint_source);
+            $stmt_expr_type = $stmt_expr_type->addParentNodes([$taint_source->id => $taint_source]);
         }
 
         if ($path_to_file) {

diff --git a/src/Psalm/Internal/DataFlow/TaintSource.php b/src/Psalm/Internal/DataFlow/TaintSource.php
@@ -7,13 +7,14 @@
  */
 class TaintSource extends DataFlowNode
 {
-    public static function fromNode(DataFlowNode $node): self {
+    public static function fromNode(DataFlowNode $node): self
+    {
         return new self(
             $node->id,
             $node->label,
             $node->code_location,
             $node->specialization_key,
-            $node->taints
+            $node->taints,
         );
     }
 }