X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=vendor%2Fpsy%2Fpsysh%2Fsrc%2FPsy%2FTabCompletion%2FMatcher%2FObjectAttributesMatcher.php;fp=vendor%2Fpsy%2Fpsysh%2Fsrc%2FPsy%2FTabCompletion%2FMatcher%2FObjectAttributesMatcher.php;h=668f3685d6d37b09383ed22881e820ce4ca95f77;hp=5d1894e0371e4198d761243a388a42adbed97014;hb=9917807b03b64faf00f6a1f29dcb6eafc454efa5;hpb=aea91e65e895364e460983b890e295aa5d5540a5

diff --git a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ObjectAttributesMatcher.php b/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ObjectAttributesMatcher.php
index 5d1894e03..668f3685d 100644
--- a/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ObjectAttributesMatcher.php
+++ b/vendor/psy/psysh/src/Psy/TabCompletion/Matcher/ObjectAttributesMatcher.php
@@ -47,6 +47,10 @@ class ObjectAttributesMatcher extends AbstractContextAwareMatcher
             return array();
         }
 
+        if (!is_object($object)) {
+            return array();
+        }
+
         return array_filter(
             array_keys(get_class_vars(get_class($object))),
             function ($var) use ($input) {
@@ -60,7 +64,7 @@ class ObjectAttributesMatcher extends AbstractContextAwareMatcher
      */
     public function hasMatched(array $tokens)
     {
-        $token = array_pop($tokens);
+        $token     = array_pop($tokens);
         $prevToken = array_pop($tokens);
 
         switch (true) {