From 72c50be4b039448b81325940785dbf997d187f4a Mon Sep 17 00:00:00 2001
From: Brown <github@muglug.com>
Date: Wed, 19 Dec 2018 20:01:27 -0500
Subject: [PATCH] Fix build

---
 psalm.xml.dist                | 13 ++++++++++++-
 tests/ArrayAssignmentTest.php |  1 +
 tests/TypeCombinationTest.php |  7 +++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/psalm.xml.dist b/psalm.xml.dist
index 6b2ce178d..ab7f28f94 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -1,5 +1,16 @@
 <?xml version="1.0"?>
-<psalm xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://getpsalm.org/schema/config" name="Psalm for Psalm" useDocblockTypes="true" totallyTyped="true" strictBinaryOperands="false" rememberPropertyAssignmentsAfterCall="true" checkForThrowsDocblock="false" throwExceptionOnError="0" xsi:schemaLocation="https://getpsalm.org/schema/config config.xsd">
+<psalm
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    name="Psalm for Psalm"
+    useDocblockTypes="true"
+    totallyTyped="true"
+    strictBinaryOperands="false"
+    rememberPropertyAssignmentsAfterCall="true"
+    checkForThrowsDocblock="false"
+    throwExceptionOnError="0"
+    xsi:schemaLocation="https://getpsalm.org/schema/config config.xsd"
+>
     <projectFiles>
         <directory name="src"/>
         <directory name="tests"/>
diff --git a/tests/ArrayAssignmentTest.php b/tests/ArrayAssignmentTest.php
index 0c7f2dd10..e189f0c60 100644
--- a/tests/ArrayAssignmentTest.php
+++ b/tests/ArrayAssignmentTest.php
@@ -932,6 +932,7 @@ class ArrayAssignmentTest extends TestCase
                       /**
                        * @psalm-suppress EmptyArrayAccess
                        * @psalm-suppress InvalidOperand
+                       * @psalm-suppress MixedOperand
                        */
                       $a[$key] += 5;
                     }
diff --git a/tests/TypeCombinationTest.php b/tests/TypeCombinationTest.php
index e45717450..24d6e56c7 100644
--- a/tests/TypeCombinationTest.php
+++ b/tests/TypeCombinationTest.php
@@ -66,6 +66,13 @@ class TypeCombinationTest extends TestCase
                     'null',
                 ],
             ],
+            'mixedOrEmpty' => [
+                'mixed',
+                [
+                    'empty',
+                    'mixed',
+                ],
+            ],
             'mixedOrObject' => [
                 'mixed|object',
                 [