Merge pull request #34 from olivernybroe/fix-type-checking

Rework type checking so it works for extended classes also

CHANGELOG.md

@@ -3,17 +3,9 @@
 # collections-intellij Changelog
 
 ## [Unreleased]
-### Added
-
 ### Changed
+- Redefine how we determine if a call is a collection call
 
-### Deprecated
-
-### Removed
-
-### Fixed
-
-### Security
 ## [0.0.1-EAP.10]
 ### Added
 - Added `where(...)->first()` to `firstWhere` refactoring ([#31](https://github.com/olivernybroe/collector-intellij/pull/31))

gradle.properties

@@ -3,7 +3,7 @@
 
 pluginGroup = dev.nybroe.collector
 pluginName_ = Collector
-pluginVersion = 0.0.1-EAP.10
+pluginVersion = 0.0.1-EAP.11
 pluginSinceBuild = 202
 pluginUntilBuild =
 

src/main/kotlin/dev/nybroe/collector/Util.kt

@@ -1,10 +1,11 @@
 package dev.nybroe.collector
 
+import com.intellij.openapi.project.Project
+import com.jetbrains.php.PhpIndex
 import com.jetbrains.php.lang.psi.elements.Function
 import com.jetbrains.php.lang.psi.elements.FunctionReference
 import com.jetbrains.php.lang.psi.elements.Method
 import com.jetbrains.php.lang.psi.elements.MethodReference
-import com.jetbrains.php.lang.psi.elements.PhpClass
 import com.jetbrains.php.lang.psi.elements.PhpReference
 import com.jetbrains.php.lang.psi.elements.impl.FunctionImpl
 import com.jetbrains.php.lang.psi.resolve.types.PhpType
@@ -18,26 +19,28 @@ private val collectionClasses = listOf(
     "\\Illuminate\\Support\\Traits\\EnumeratesValues",
 )
 
-val PhpClass.isCollectionClass: Boolean
-    get() = collectionClasses.contains(this.fqn)
+private val collectionType = PhpType().apply {
+    collectionClasses.forEach { this.add(it) }
+}
 
 val Method.isCollectionMethod: Boolean
-    get() = this.containingClass?.isCollectionClass ?: false
+    get() = this.containingClass?.type?.isCollection(this.project) ?: false
 
 val MethodReference.isCollectionMethod: Boolean
     get() = (this.resolve() as? Method)?.isCollectionMethod ?: false
 
 val Function.returnsCollection: Boolean
-    get() = this.type.global(this.project).isCollection
+    get() = this.type.global(this.project).isCollection(this.project)
 
 val FunctionReference.returnsCollection: Boolean
     get() = (this.resolve() as? Function)?.returnsCollection ?: false
 
 val PhpReference.isCollectionType: Boolean
-    get() = this.type.global(this.project).isCollection
+    get() = this.type.global(this.project).isCollection(this.project)
 
 val Function.isShortArrowFunction: Boolean
     get() = FunctionImpl.isShortArrowFunction(this)
 
-val PhpType.isCollection: Boolean
-    get() = this.types.contains("\\Illuminate\\Support\\Collection")
+fun PhpType.isCollection(project: Project): Boolean {
+    return collectionType.isConvertibleFrom(this, PhpIndex.getInstance(project))
+}

src/test/kotlin/dev/nybroe/collector/inspections/CollectFunctionOnCollectionInspectionTest.kt

@@ -13,4 +13,8 @@ internal class CollectFunctionOnCollectionInspectionTest : InspectionTest() {
     fun testCollectInCollect() {
         doTest("collect_in_collect")
     }
+
+    fun testCollectOnEloquentCollectVariable() {
+        doTest("collect_on_eloquent_collect_variable")
+    }
 }

src/test/resources/inspections/CollectFunctionInCollectionInspection/collect_on_eloquent_collect_variable.after.php

@@ -0,0 +1,5 @@
+<?php
+
+$variable = new \Illuminate\Database\Eloquent\Collection([]);
+
+$sum = $variable->sum();

src/test/resources/inspections/CollectFunctionInCollectionInspection/collect_on_eloquent_collect_variable.php

@@ -0,0 +1,5 @@
+<?php
+
+$variable = new \Illuminate\Database\Eloquent\Collection([]);
+
+$sum = <warning descr="Recursive call on collection">collect($variable)</warning>->sum();

src/test/resources/stubs.php

@@ -2,6 +2,15 @@
 
 namespace Illuminate\Support {
     class Collection {
+        /**
+         * Create a new collection.
+         *
+         * @param  mixed  $items
+         */
+        public function __construct($items = [])
+        {
+        }
+
         /**
          * @return Collection
          */
@@ -85,6 +94,13 @@ public function where($key, $operator, $value = null)
     }
 }
 
+namespace Illuminate\Database\Eloquent {
+    class Collection extends \Illuminate\Support\Collection {
+
+    }
+}
+
+
 /**
  * @param $array
  * @return \Illuminate\Support\Collection