Add support for Collection::whereInstanceof()

analogueorm · Mar 7, 2018 · 673c045 · 673c045
1 parent e3cb69d
commit 673c045
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/AnalogueServiceProvider.php b/src/AnalogueServiceProvider.php
@@ -56,6 +56,7 @@ public function register()
 
             // If the cache is pre laravel 5.5, it doesn't implements PSR-16, so we'll skip it.
             $cache = $app->make(CacheRepository::class);
+
             if ($cache instanceof CacheInterface) {
                 $manager->setCache($cache);
             }

diff --git a/src/System/Proxies/CollectionProxy.php b/src/System/Proxies/CollectionProxy.php
@@ -334,6 +334,16 @@ public function where($key, $operator, $value = null)
 
         return $parent->where($key, $operator, $value);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function whereInstanceOf($type)
+    {
+        $this->initializeProxy();
+
+        return parent::whereInstanceOf($type);
+    }
 
     /**
      * {@inheritdoc}

diff --git a/src/System/Wrappers/ObjectWrapper.php b/src/System/Wrappers/ObjectWrapper.php
@@ -423,11 +423,7 @@ protected function relationNeedsProxy($relation, $attributes)
             $localKey = $localKey['id'];
         }
 
-        if (!isset($attributes[$localKey])) {
-            return false;
-        }
-
-        if (is_null($attributes[$localKey])) {
+        if (!isset($attributes[$localKey]) || is_null($attributes[$localKey]) ) {
             return false;
         }