PHP 5.3 compatibility

Maks3w · May 4, 2015 · d2155fb · d2155fb
1 parent 56ca316
commit d2155fb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Common/PlaceholderMethods.php b/src/Common/PlaceholderMethods.php
@@ -37,7 +37,7 @@ public static function findInvalidPlaceholdersNames(array $placeholders, array $
         $invalidPlaceholderNames = array_intersect($placeholders, $contextKeys);
 
         $invalidPlaceholderNames = array_filter($invalidPlaceholderNames, function ($placeholder) {
-            return !self::isValidPlaceholderName($placeholder);
+            return !PlaceholderMethods::isValidPlaceholderName($placeholder);
         });
 
         return $invalidPlaceholderNames;

diff --git a/src/PhpUnit/MessageTypeConstraint.php b/src/PhpUnit/MessageTypeConstraint.php
@@ -13,6 +13,10 @@ class MessageTypeConstraint extends Constraint
 {
     protected function matches($other)
     {
+        if (is_array($other)) {
+            return false;
+        }
+
         $canCastToString = true;
 
         set_error_handler(function () use (&$canCastToString) {