fixed duplicate bug in trait inspection apply

added new test from kphp
moved

src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt

@@ -15,6 +15,7 @@ import com.jetbrains.php.lang.psi.visitors.PhpElementVisitor
 import com.vk.modulite.SymbolName
 import com.vk.modulite.composer.ComposerPackage
 import com.vk.modulite.modulite.Modulite
+import com.vk.modulite.modulite.ModuliteRequires
 import com.vk.modulite.modulite.ModuliteRestrictionChecker
 import com.vk.modulite.psi.extensions.files.containingComposerPackage
 import com.vk.modulite.psi.extensions.files.containingModulite
@@ -240,7 +241,7 @@ class InternalSymbolUsageInspection : LocalInspectionTool() {
                         restricted to $readableName, $refModulite is not required by ${context.modulite}
                     """.trimIndent()
                 } else if(symbolElement is PhpClass && symbolElement.isTrait){
-                    val (classes,methods) = collectTraitReferenceUsage(reference)
+                    val (classes,methods) = collectTraitReferenceUsage(reference,context.modulite?.requires )
                     quickFixes.add(AddSymbolToRequiresQuickFix(context.modulite!!, classes+methods))
 
                     """
@@ -265,7 +266,7 @@ class InternalSymbolUsageInspection : LocalInspectionTool() {
                 """.trimIndent()
             }
         }
-
+context.modulite?.requires
         registerModuliteProblem(
             problemElement,
             text,
@@ -314,7 +315,7 @@ class InternalSymbolUsageInspection : LocalInspectionTool() {
         return Pair(classesToRequire, methodsToRequire)
     }
 
-    private fun collectTraitReferenceUsage(reference: PhpReference)
+    private fun collectTraitReferenceUsage(reference: PhpReference, moduliteRequires : ModuliteRequires? = null)
             : Pair<List<SymbolName>, List<SymbolName>> {
         val traitsClasses: MutableList<PhpClass> = arrayListOf()
         val methodsNames: MutableCollection<Method> = arrayListOf()
@@ -361,9 +362,15 @@ class InternalSymbolUsageInspection : LocalInspectionTool() {
             requireMethods.addAll(methods)
         }
 
-        val traitsSymbolsName = traitsClasses.distinct().mapNotNull { processElement(it, reference) }
-        val traitsSymbolName = requireMethods.distinct().mapNotNull { processElement(it, reference) }
+        val traitsClassName = traitsClasses.distinct().mapNotNull { processElement(it, reference) }
+        val traitsMethodsName = requireMethods.distinct().mapNotNull { processElement(it, reference) }
+
+        moduliteRequires?.symbols?.let { currentModuleSymbols ->
+            val filteredMethods = traitsMethodsName.filterNot { it in currentModuleSymbols }
+            val filteredClasses = traitsClassName.filterNot { it in currentModuleSymbols }
+            return Pair(filteredClasses, filteredMethods)
+        }
 
-        return Pair(traitsSymbolsName, traitsSymbolName)
+        return Pair(traitsClassName, traitsMethodsName)
     }
 }

src/test/fixtures/golden/TraitsNesting/Photos/.modulite.yaml

@@ -16,17 +16,8 @@ require:
   - "\\Engines\\LikesEngineTrait"
   - "\\Engines\\MusicEngineTrait"
   - "\\Engines\\VideosEngineTrait"
-  - "\\Engines\\FriendsEngineTrait::friendList()"
-  - "\\Engines\\FriendsEngineTrait::printFriendList()"
-  - "\\Engines\\LikesEngineTrait::print()"
-  - "\\Engines\\LikesEngineTrait::printTweetsLikes()"
-  - "\\Engines\\MusicEngineTrait::musicList()"
-  - "\\Engines\\MusicEngineTrait::musicListPrint()"
+  - "\\ExternalEngines\\Tweets::printTweetsLikesCountByUser()"
   - "\\Engines\\TestEngine::tester()"
-  - "\\Engines\\VideosEngineTrait::printVideosList()"
-  - "\\Engines\\VideosEngineTrait::videosList()"
-
-
 
 # Granting partial access to internal symbols, "as an exception".
 allow-internal-access:

src/test/fixtures/kphp_golden/101_trait_in_module_internal/101_known_bugs.php → src/test/fixtures/kphp_golden/006_known_bugs/006_known_bugs.php

@@ -5,16 +5,14 @@
 require_once 'kphp_tester_include.php';
 #endif
 
-class MMM101 {
-    use Feed101\PrivTrait;
-//      ^^^^^^^^^^^^^^^^^
-//      error: restricted to use Feed101\PrivTrait, it's internal in @feed
+class MMM006 {
+    use Feed006\PrivTrait;
 }
-(new MMM101)->showThisClass();
+(new MMM006)->showThisClass();
 
 // here $impl is auto-deduced as PrivClass because of typed callable
 // so, we can call its instance methods, since we don't analyze instance methods
 // but we can't write a type hint or extract this callback into another var, as we can't use that internal class in phpdoc
-Feed101\PubFeed::accessToPrivClass(function($impl) {        // function(PrivClass $impl) is erroneous
+Feed006\PubFeed::accessToPrivClass(function($impl) {        // function(PrivClass $impl) is erroneous
     $impl->myMethod();
 });

src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/.modulite.yaml → src/test/fixtures/kphp_golden/006_known_bugs/Feed006/.modulite.yaml

@@ -1,8 +1,9 @@
 name: "@feed"
-namespace: "\\Feed101"
+namespace: "\\Feed006"
 
 export:
   - "PubFeed"
+  - "PrivTrait"
 
 force-internal:
 

src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/PrivClass.php → src/test/fixtures/kphp_golden/006_known_bugs/Feed006/PrivClass.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Feed101;
+namespace Feed006;
 
 class PrivClass {
     public function myMethod() {

src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/PrivTrait.php → src/test/fixtures/kphp_golden/006_known_bugs/Feed006/PrivTrait.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Feed101;
+namespace Feed006;
 
 trait PrivTrait {
     function showThisClass() {

src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/PubFeed.php → src/test/fixtures/kphp_golden/006_known_bugs/Feed006/PubFeed.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Feed101;
+namespace Feed006;
 
 class PubFeed {
     /**

src/test/fixtures/kphp_golden/101_trait_not_required/101_trait_not_required.php

@@ -0,0 +1,7 @@
+@ok
+<?php
+#ifndef KPHP
+require_once 'kphp_tester_include.php';
+#endif
+
+\Photos101\Photo101::printPhotoLikes();

src/test/fixtures/kphp_golden/101_trait_not_required/Engines101/LikesEngineTrait101.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Engines101;
+
+trait LikesEngineTrait101 {
+  public static function print(): void {
+    echo "like";
+  }
+
+  public static function printTweetsLikes(): void {
+    \ExternalEngines101\Tweets101::printTweetsLikesCountByUser();
+    $_ = new \ExternalEngines101\Tweets101();
+  }
+}

src/test/fixtures/kphp_golden/101_trait_not_required/ExternalEngines101/Tweets101.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace ExternalEngines101;
+
+class Tweets101 {
+  public static function printTweetsLikesCountByUser() {
+    echo "ExternalEngines: tweets like for this user";
+  }
+}

src/test/fixtures/kphp_golden/101_trait_not_required/Photos101/.modulite.yaml

@@ -0,0 +1,17 @@
+name: "@photos"
+description: ""
+namespace: "Photos101\\"
+
+# "Public API" of the modulite: classes, functions, constants, etc.
+# Symbols not listed here will be internal.
+export:
+  - "Photo101"
+
+# Class members to exclude, they override "export".
+force-internal:
+
+# Dependencies: other modulites, global classes, defines, etc.
+require:
+
+# Granting partial access to internal symbols, "as an exception".
+allow-internal-access:

src/test/fixtures/kphp_golden/101_trait_not_required/Photos101/Photo101.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Photos101;
+
+class Photo101 {
+  use \Engines101\LikesEngineTrait101;
+//    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+//error: restricted to use Engines101\LikesEngineTrait101, it's not required by @photos
+  public static function printPhotoLikes() {
+    self::print();
+  }
+}

src/test/kotlin/com/vk/modulite/tests/KphpGoldenTests.kt

@@ -8,6 +8,7 @@ class KphpGoldenTests : ModuliteInspectionTestBase() {
     fun `test 003_allow_internal`()         = runFixture("kphp_golden/003_allow_internal")
     fun `test 004_instance_methods`()       = runFixture("kphp_golden/004_instance_methods")
     fun `test 005_inheritance`()            = runFixture("kphp_golden/005_inheritance")
+    fun `test 006_known_bugs`()             = runFixture("kphp_golden/006_known_bugs")
     fun `test 008_mod_generics`()           = runFixture("kphp_golden/008_mod_generics")
     fun `test 009_mod_magic_m`()            = runFixture("kphp_golden/009_mod_magic_m")
     fun `test 010_mod_unreachable`()        = runFixture("kphp_golden/010_mod_unreachable")
@@ -20,5 +21,6 @@ class KphpGoldenTests : ModuliteInspectionTestBase() {
     //fun `test 007_composer_ok`()          = runFixture("kphp_golden/007_composer_ok")
 
     fun `test 100_wrong_static_bindings`()      = runFixture("kphp_golden/100_wrong_static_bindings")
-    fun `test 101_trait_in_module_internal`()   = runFixture("kphp_golden/101_trait_in_module_internal")
+    fun `test 101_trait_not_required`()      = runFixture("kphp_golden/101_trait_not_required")
+
 }