From 33d2561c1c6e3b47d4e38574a2d94e4a61eb7e9d Mon Sep 17 00:00:00 2001
From: Matt Brown <github@muglug.com>
Date: Wed, 25 Nov 2020 21:36:37 -0500
Subject: [PATCH] Fix style issues

---
 .../Analyzer/Statements/Expression/BinaryOp/CoalesceAnalyzer.php | 1 +
 src/Psalm/Type/Reconciler.php                                    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/CoalesceAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/CoalesceAnalyzer.php
index 00c528245..f90c25c56 100644
--- a/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/CoalesceAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/CoalesceAnalyzer.php
@@ -19,6 +19,7 @@ use function array_map;
 use function array_keys;
 use function preg_match;
 use function preg_quote;
+use function substr;
 
 /**
  * @internal
diff --git a/src/Psalm/Type/Reconciler.php b/src/Psalm/Type/Reconciler.php
index 45ce6d156..8ae3d4e8e 100644
--- a/src/Psalm/Type/Reconciler.php
+++ b/src/Psalm/Type/Reconciler.php
@@ -33,6 +33,7 @@ use function strtolower;
 use function substr;
 use function preg_match;
 use function preg_quote;
+use function array_merge;
 
 class Reconciler
 {