Improve messages

vimeo · Apr 25, 2021 · cd53e04 · cd53e04
1 parent 4f5c205
commit cd53e04
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/Psalm/Internal/Type/NegatedAssertionReconciler.php b/src/Psalm/Internal/Type/NegatedAssertionReconciler.php
@@ -93,8 +93,9 @@ public static function reconcile(
                                 if ($existing_var_type->from_static_property) {
                                     if (IssueBuffer::accepts(
                                         new RedundantPropertyInitializationCheck(
-                                            'Static property type ' . $key . ' with type '
-                                                . $existing_var_type . ' has unexpected isset check — should it be nullable?',
+                                            'Static property ' . $key . ' with type '
+                                                . $existing_var_type
+                                                . ' has unexpected isset check — should it be nullable?',
                                             $code_location
                                         ),
                                         $suppressed_issues
@@ -104,7 +105,7 @@ public static function reconcile(
                                 } elseif ($existing_var_type->from_property) {
                                     if (IssueBuffer::accepts(
                                         new RedundantPropertyInitializationCheck(
-                                            'Property type ' . $key . ' with type '
+                                            'Property ' . $key . ' with type '
                                                 . $existing_var_type . ' should already be set in the constructor',
                                             $code_location
                                         ),

diff --git a/src/Psalm/Type/Reconciler.php b/src/Psalm/Type/Reconciler.php
@@ -894,8 +894,9 @@ protected static function triggerIssueForImpossible(
                 if ($existing_var_type->from_static_property) {
                     if (IssueBuffer::accepts(
                         new RedundantPropertyInitializationCheck(
-                            'Static property type ' . $key . ' with type '
-                                . $old_var_type_string . ' has unexpected isset check — should it be nullable?',
+                            'Static property ' . $key . ' with type '
+                                . $old_var_type_string
+                                . ' has unexpected isset check — should it be nullable?',
                             $code_location
                         ),
                         $suppressed_issues
@@ -905,7 +906,7 @@ protected static function triggerIssueForImpossible(
                 } else {
                     if (IssueBuffer::accepts(
                         new RedundantPropertyInitializationCheck(
-                            'Property type ' . $key . ' with type '
+                            'Property ' . $key . ' with type '
                                 . $old_var_type_string . ' should already be set in the constructor',
                             $code_location
                         ),