From 1a2d4dbfb857e8a5fc3b135b04cc8657fb72a3eb Mon Sep 17 00:00:00 2001
From: Richardas Kuchinskas <r.kuchinskas@vk.team>
Date: Tue, 19 Sep 2023 19:54:01 +0300
Subject: [PATCH 01/17] Added new cases for tests

---
 .../011_late_static_bindings.php              |  9 +++++++
 .../Logs011/BaseLog011.php                    | 12 +++++++++
 .../Messages011/.modulite.yaml                | 15 +++++++++++
 .../Messages011/MessagesLogger011.php         | 16 +++++++++++
 ..._package_not_required_in_derived_class.php |  9 +++++++
 .../BasePrinter012/BasePrinter012.php         | 12 +++++++++
 .../Printer012/.modulite.yaml                 | 18 +++++++++++++
 .../Printer012/Printer012.php                 | 13 +++++++++
 .../composer.json                             | 18 +++++++++++++
 .../packages/vk-strings/composer.json         | 10 +++++++
 .../packages/vk-strings/src/SomeStr.php       |  9 +++++++
 ...nheritance_calling_class_inside_parent.php |  8 ++++++
 .../BasePrinter013/AppendStr013.php           |  9 +++++++
 .../BasePrinter013/BasePrinter013.php         | 10 +++++++
 .../Printer013/.modulite.yaml                 | 18 +++++++++++++
 .../Printer013/Printer013.php                 | 13 +++++++++
 .../100_wrong_static_bindings.php             | 12 +++++++++
 .../Logs100/BaseLog100.php                    | 12 +++++++++
 .../Messages100/.modulite.yaml                | 13 +++++++++
 .../Messages100/MessagesLogger100.php         | 20 ++++++++++++++
 .../com/vk/modulite/tests/KphpGoldenTests.kt  | 27 ++++++++++++-------
 21 files changed, 273 insertions(+), 10 deletions(-)
 create mode 100644 src/test/fixtures/kphp_golden/011_late_static_bindings/011_late_static_bindings.php
 create mode 100644 src/test/fixtures/kphp_golden/011_late_static_bindings/Logs011/BaseLog011.php
 create mode 100644 src/test/fixtures/kphp_golden/011_late_static_bindings/Messages011/.modulite.yaml
 create mode 100644 src/test/fixtures/kphp_golden/011_late_static_bindings/Messages011/MessagesLogger011.php
 create mode 100644 src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/012_package_not_required_in_derived_class.php
 create mode 100644 src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/BasePrinter012/BasePrinter012.php
 create mode 100644 src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/Printer012/.modulite.yaml
 create mode 100644 src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/Printer012/Printer012.php
 create mode 100644 src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/composer.json
 create mode 100644 src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/packages/vk-strings/composer.json
 create mode 100644 src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/packages/vk-strings/src/SomeStr.php
 create mode 100644 src/test/fixtures/kphp_golden/013_inheritance_calling_class_inside_parent/013_inheritance_calling_class_inside_parent.php
 create mode 100644 src/test/fixtures/kphp_golden/013_inheritance_calling_class_inside_parent/BasePrinter013/AppendStr013.php
 create mode 100644 src/test/fixtures/kphp_golden/013_inheritance_calling_class_inside_parent/BasePrinter013/BasePrinter013.php
 create mode 100644 src/test/fixtures/kphp_golden/013_inheritance_calling_class_inside_parent/Printer013/.modulite.yaml
 create mode 100644 src/test/fixtures/kphp_golden/013_inheritance_calling_class_inside_parent/Printer013/Printer013.php
 create mode 100644 src/test/fixtures/kphp_golden/100_wrong_static_bindings/100_wrong_static_bindings.php
 create mode 100644 src/test/fixtures/kphp_golden/100_wrong_static_bindings/Logs100/BaseLog100.php
 create mode 100644 src/test/fixtures/kphp_golden/100_wrong_static_bindings/Messages100/.modulite.yaml
 create mode 100644 src/test/fixtures/kphp_golden/100_wrong_static_bindings/Messages100/MessagesLogger100.php

diff --git a/src/test/fixtures/kphp_golden/011_late_static_bindings/011_late_static_bindings.php b/src/test/fixtures/kphp_golden/011_late_static_bindings/011_late_static_bindings.php
new file mode 100644
index 0000000..5e9e1f9
--- /dev/null
+++ b/src/test/fixtures/kphp_golden/011_late_static_bindings/011_late_static_bindings.php
@@ -0,0 +1,9 @@
+@ok
+KPHP_ENABLE_MODULITE=1
+<?php
+#ifndef KPHP
+require_once 'kphp_tester_include.php';
+#endif
+
+$_ = \Messages011\MessagesLogger011::log();
+\Messages011\MessagesLogger011::create();
diff --git a/src/test/fixtures/kphp_golden/011_late_static_bindings/Logs011/BaseLog011.php b/src/test/fixtures/kphp_golden/011_late_static_bindings/Logs011/BaseLog011.php
new file mode 100644
index 0000000..c0a22bb
--- /dev/null
+++ b/src/test/fixtures/kphp_golden/011_late_static_bindings/Logs011/BaseLog011.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Logs011;
+
+abstract class BaseLog011 {
+  protected static function logAction(): bool {
+    return true;
+  }
+
+  protected static function createLog(): void {
+  }
+}
diff --git a/src/test/fixtures/kphp_golden/011_late_static_bindings/Messages011/.modulite.yaml b/src/test/fixtures/kphp_golden/011_late_static_bindings/Messages011/.modulite.yaml
new file mode 100644
index 0000000..e641b50
--- /dev/null
+++ b/src/test/fixtures/kphp_golden/011_late_static_bindings/Messages011/.modulite.yaml
@@ -0,0 +1,15 @@
+name: "@messages011"
+description: ""
+namespace: "Messages011\\"
+
+export:
+  - "MessagesLogger011"
+
+force-internal:
+
+require:
+  - "\\Logs011\\BaseLog011"
+  - "\\Logs011\\BaseLog011::createLog()"
+  - "\\Logs011\\BaseLog011::logAction()"
+
+allow-internal-access:
diff --git a/src/test/fixtures/kphp_golden/011_late_static_bindings/Messages011/MessagesLogger011.php b/src/test/fixtures/kphp_golden/011_late_static_bindings/Messages011/MessagesLogger011.php
new file mode 100644
index 0000000..3bf2462
--- /dev/null
+++ b/src/test/fixtures/kphp_golden/011_late_static_bindings/Messages011/MessagesLogger011.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Messages011;
+
+use Logs011\BaseLog011;
+
+class MessagesLogger011 extends BaseLog011 {
+
+  public static function create(): void {
+    parent::createLog();
+  }
+
+  public static function log(): bool {
+    return parent::logAction();
+  }
+}
diff --git a/src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/012_package_not_required_in_derived_class.php b/src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/012_package_not_required_in_derived_class.php
new file mode 100644
index 0000000..0ea0f64
--- /dev/null
+++ b/src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/012_package_not_required_in_derived_class.php
@@ -0,0 +1,9 @@
+@ok
+KPHP_ENABLE_MODULITE=1
+KPHP_COMPOSER_ROOT={dir}
+<?php
+#ifndef KPHP
+require_once 'kphp_tester_include.php';
+#endif
+
+\Printer012\Printer012::print();
diff --git a/src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/BasePrinter012/BasePrinter012.php b/src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/BasePrinter012/BasePrinter012.php
new file mode 100644
index 0000000..d15550f
--- /dev/null
+++ b/src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/BasePrinter012/BasePrinter012.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace BasePrinter012;
+
+use Vk\TestSrt\SomeStr;
+
+class BasePrinter012 {
+  final public static function basePrint(): void {
+    $r1 = new SomeStr();
+    echo "BasePrint\n";
+  }
+}
diff --git a/src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/Printer012/.modulite.yaml b/src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/Printer012/.modulite.yaml
new file mode 100644
index 0000000..6069728
--- /dev/null
+++ b/src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/Printer012/.modulite.yaml
@@ -0,0 +1,18 @@
+name: "@printer012"
+description: ""
+namespace: "Printer012\\"
+
+# "Public API" of the modulite: classes, functions, constants, etc.
+# Symbols not listed here will be internal.
+export:
+  - "Printer012"
+
+# Class members to exclude, they override "export".
+force-internal:
+
+# Dependencies: other modulites, global classes, defines, etc.
+require:
+  - "\\BasePrinter012\\BasePrinter012"
+
+# Granting partial access to internal symbols, "as an exception".
+allow-internal-access:
diff --git a/src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/Printer012/Printer012.php b/src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/Printer012/Printer012.php
new file mode 100644
index 0000000..6e13a9f
--- /dev/null
+++ b/src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/Printer012/Printer012.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Printer012;
+
+use BasePrinter012\BasePrinter012;
+
+class Printer012 extends BasePrinter012 {
+
+  public static function print(): void {
+    self::basePrint();
+    echo "print\n";
+  }
+}
diff --git a/src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/composer.json b/src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/composer.json
new file mode 100644
index 0000000..653ce7a
--- /dev/null
+++ b/src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/composer.json
@@ -0,0 +1,18 @@
+{
+  "name": "phpt/012",
+  "autoload": {
+    "psr-4": {
+      "BasePrinter012\\": "./BasePrinter012",
+      "Printer012\\": "./Printer012"
+    }
+  },
+  "require": {
+    "vk/strings": "*"
+  },
+  "repositories": [
+    {
+      "type": "path",
+      "url": "./packages/vk-strings"
+    }
+  ]
+}
diff --git a/src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/packages/vk-strings/composer.json b/src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/packages/vk-strings/composer.json
new file mode 100644
index 0000000..58f233c
--- /dev/null
+++ b/src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/packages/vk-strings/composer.json
@@ -0,0 +1,10 @@
+{
+  "name": "vk/strings",
+  "version": "0.0.1",
+  "type": "library",
+  "autoload": {
+    "psr-4": {
+      "Vk\\TestSrt\\": "src/"
+    }
+  }
+}
diff --git a/src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/packages/vk-strings/src/SomeStr.php b/src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/packages/vk-strings/src/SomeStr.php
new file mode 100644
index 0000000..622da47
--- /dev/null
+++ b/src/test/fixtures/kphp_golden/012_package_not_required_in_derived_class/packages/vk-strings/src/SomeStr.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Vk\TestSrt;
+
+class SomeStr {
+public static  function concatStr(string $s1, string $s2): string {
+    return $s1 . $s2;
+  }
+}
diff --git a/src/test/fixtures/kphp_golden/013_inheritance_calling_class_inside_parent/013_inheritance_calling_class_inside_parent.php b/src/test/fixtures/kphp_golden/013_inheritance_calling_class_inside_parent/013_inheritance_calling_class_inside_parent.php
new file mode 100644
index 0000000..5c2be00
--- /dev/null
+++ b/src/test/fixtures/kphp_golden/013_inheritance_calling_class_inside_parent/013_inheritance_calling_class_inside_parent.php
@@ -0,0 +1,8 @@
+@ok
+KPHP_ENABLE_MODULITE=1
+<?php
+#ifndef KPHP
+require_once 'kphp_tester_include.php';
+#endif
+
+\Printer013\Printer013::print();
diff --git a/src/test/fixtures/kphp_golden/013_inheritance_calling_class_inside_parent/BasePrinter013/AppendStr013.php b/src/test/fixtures/kphp_golden/013_inheritance_calling_class_inside_parent/BasePrinter013/AppendStr013.php
new file mode 100644
index 0000000..b3f8ed7
--- /dev/null
+++ b/src/test/fixtures/kphp_golden/013_inheritance_calling_class_inside_parent/BasePrinter013/AppendStr013.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace BasePrinter013;
+
+class AppendStr013 {
+    static public function concatStr(string $s1, string $s2): string {
+        return $s1 . $s2;
+    }
+}
diff --git a/src/test/fixtures/kphp_golden/013_inheritance_calling_class_inside_parent/BasePrinter013/BasePrinter013.php b/src/test/fixtures/kphp_golden/013_inheritance_calling_class_inside_parent/BasePrinter013/BasePrinter013.php
new file mode 100644
index 0000000..4c25dac
--- /dev/null
+++ b/src/test/fixtures/kphp_golden/013_inheritance_calling_class_inside_parent/BasePrinter013/BasePrinter013.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace BasePrinter013;
+
+class BasePrinter013 {
+  final public static function printAppend(): void {
+    $someClass = new AppendStr013();
+    echo "printAppend";
+  }
+}
diff --git a/src/test/fixtures/kphp_golden/013_inheritance_calling_class_inside_parent/Printer013/.modulite.yaml b/src/test/fixtures/kphp_golden/013_inheritance_calling_class_inside_parent/Printer013/.modulite.yaml
new file mode 100644
index 0000000..bc1d857
--- /dev/null
+++ b/src/test/fixtures/kphp_golden/013_inheritance_calling_class_inside_parent/Printer013/.modulite.yaml
@@ -0,0 +1,18 @@
+name: "@printer013"
+description: ""
+namespace: "Printer013\\"
+
+# "Public API" of the modulite: classes, functions, constants, etc.
+# Symbols not listed here will be internal.
+export:
+  - "Printer013"
+
+# Class members to exclude, they override "export".
+force-internal:
+
+# Dependencies: other modulites, global classes, defines, etc.
+require:
+  - "\\BasePrinter013\\BasePrinter013"
+
+# Granting partial access to internal symbols, "as an exception".
+allow-internal-access:
diff --git a/src/test/fixtures/kphp_golden/013_inheritance_calling_class_inside_parent/Printer013/Printer013.php b/src/test/fixtures/kphp_golden/013_inheritance_calling_class_inside_parent/Printer013/Printer013.php
new file mode 100644
index 0000000..204a2e0
--- /dev/null
+++ b/src/test/fixtures/kphp_golden/013_inheritance_calling_class_inside_parent/Printer013/Printer013.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Printer013;
+
+use BasePrinter013\BasePrinter013;
+
+class Printer013 extends BasePrinter013 {
+
+  public static function print(): void {
+    self::printAppend();
+    echo "print-printAppend";
+  }
+}
diff --git a/src/test/fixtures/kphp_golden/100_wrong_static_bindings/100_wrong_static_bindings.php b/src/test/fixtures/kphp_golden/100_wrong_static_bindings/100_wrong_static_bindings.php
new file mode 100644
index 0000000..69167d0
--- /dev/null
+++ b/src/test/fixtures/kphp_golden/100_wrong_static_bindings/100_wrong_static_bindings.php
@@ -0,0 +1,12 @@
+@kphp_should_fail
+KPHP_ENABLE_MODULITE=1
+/restricted to call Logs100\\BaseLog100:createLog\(\), it's not required by @messages100/
+/restricted to call Logs100\\BaseLog100::logAction\(\), it's not required by @messages100/
+<?php
+#ifndef KPHP
+require_once 'kphp_tester_include.php';
+#endif
+
+$_ = \Messages100\MessagesLogger100::log();
+
+\Messages100\MessagesLogger100::create();
diff --git a/src/test/fixtures/kphp_golden/100_wrong_static_bindings/Logs100/BaseLog100.php b/src/test/fixtures/kphp_golden/100_wrong_static_bindings/Logs100/BaseLog100.php
new file mode 100644
index 0000000..99e0309
--- /dev/null
+++ b/src/test/fixtures/kphp_golden/100_wrong_static_bindings/Logs100/BaseLog100.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Logs100;
+
+abstract class BaseLog100 {
+  protected static function logAction(): bool {
+    return true;
+  }
+
+  protected static function createLog(): void {
+  }
+}
diff --git a/src/test/fixtures/kphp_golden/100_wrong_static_bindings/Messages100/.modulite.yaml b/src/test/fixtures/kphp_golden/100_wrong_static_bindings/Messages100/.modulite.yaml
new file mode 100644
index 0000000..4dcbf9f
--- /dev/null
+++ b/src/test/fixtures/kphp_golden/100_wrong_static_bindings/Messages100/.modulite.yaml
@@ -0,0 +1,13 @@
+name: "@messages100"
+description: ""
+namespace: "Messages100\\"
+
+export:
+  - "MessagesLogger100"
+
+force-internal:
+
+require:
+  - "\\Logs100\\BaseLog100"
+
+allow-internal-access:
diff --git a/src/test/fixtures/kphp_golden/100_wrong_static_bindings/Messages100/MessagesLogger100.php b/src/test/fixtures/kphp_golden/100_wrong_static_bindings/Messages100/MessagesLogger100.php
new file mode 100644
index 0000000..9da7142
--- /dev/null
+++ b/src/test/fixtures/kphp_golden/100_wrong_static_bindings/Messages100/MessagesLogger100.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Messages100;
+
+use Logs100\BaseLog100;
+
+class MessagesLogger100 extends BaseLog100 {
+
+  public static function create(): void {
+    parent::createLog();
+//          ^^^^^^^^^
+//          error: restricted to call Logs100\BaseLog100::createLog(), it's not required by @messages100
+  }
+
+  public static function log(): bool {
+    return parent::logAction();
+//                 ^^^^^^^^^
+//                 error: restricted to call Logs100\BaseLog100::logAction(), it's not required by @messages100
+  }
+}
diff --git a/src/test/kotlin/com/vk/modulite/tests/KphpGoldenTests.kt b/src/test/kotlin/com/vk/modulite/tests/KphpGoldenTests.kt
index 28c7f42..d46eb0a 100644
--- a/src/test/kotlin/com/vk/modulite/tests/KphpGoldenTests.kt
+++ b/src/test/kotlin/com/vk/modulite/tests/KphpGoldenTests.kt
@@ -3,15 +3,22 @@ package com.vk.modulite.tests
 import com.vk.modulite.infrastructure.ModuliteInspectionTestBase
 
 class KphpGoldenTests : ModuliteInspectionTestBase() {
-    fun `test 001_simple_yaml_project`() = runFixture("kphp_golden/001_simple_yaml_project")
-    fun `test 002_ok_require_submod`()   = runFixture("kphp_golden/002_ok_require_submod")
-    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 001_simple_yaml_project`()    = runFixture("kphp_golden/001_simple_yaml_project")
+    fun `test 002_ok_require_submod`()      = runFixture("kphp_golden/002_ok_require_submod")
+    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")
+    fun `test 011_late_static_bindings`()   = runFixture("kphp_golden/011_late_static_bindings")
+    fun `test 012_package_not_required_in_derived_class`()
+        = runFixture("kphp_golden/012_package_not_required_in_derived_class")
+    fun `test 013_inheritance_calling_class_inside_parent`()
+        = runFixture("kphp_golden/013_inheritance_calling_class_inside_parent")
     // На потом
-    // fun `test 007_composer_ok`()         = runFixture("kphp_golden/007_composer_ok")
-    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 007_composer_ok`()          = runFixture("kphp_golden/007_composer_ok")
+
+    fun `test 100_wrong_static_bindings`()  = runFixture("kphp_golden/100_wrong_static_bindings")
 }

From 67c4249ac94b63640420d2be5b17b04e81a8c2e8 Mon Sep 17 00:00:00 2001
From: Richardas Kuchinskas <r.kuchinskas@vk.team>
Date: Tue, 3 Oct 2023 19:49:47 +0300
Subject: [PATCH 02/17] added traits nesting handler

---
 .../services/ModuliteDependenciesCollector.kt | 86 ++++++++++++++-----
 1 file changed, 65 insertions(+), 21 deletions(-)

diff --git a/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt b/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
index 210fd63..0446781 100644
--- a/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
+++ b/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
@@ -11,20 +11,7 @@ import com.intellij.util.containers.TreeNodeProcessingResult
 import com.jetbrains.php.lang.PhpLangUtil
 import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocType
 import com.jetbrains.php.lang.psi.PhpFile
-import com.jetbrains.php.lang.psi.elements.ClassConstantReference
-import com.jetbrains.php.lang.psi.elements.ClassReference
-import com.jetbrains.php.lang.psi.elements.ConstantReference
-import com.jetbrains.php.lang.psi.elements.FieldReference
-import com.jetbrains.php.lang.psi.elements.FunctionReference
-import com.jetbrains.php.lang.psi.elements.Global
-import com.jetbrains.php.lang.psi.elements.MethodReference
-import com.jetbrains.php.lang.psi.elements.NewExpression
-import com.jetbrains.php.lang.psi.elements.PhpNamedElement
-import com.jetbrains.php.lang.psi.elements.PhpNamespace
-import com.jetbrains.php.lang.psi.elements.PhpNamespaceReference
-import com.jetbrains.php.lang.psi.elements.PhpReference
-import com.jetbrains.php.lang.psi.elements.PhpUse
-import com.jetbrains.php.lang.psi.elements.Variable
+import com.jetbrains.php.lang.psi.elements.*
 import com.jetbrains.php.lang.psi.elements.impl.FieldImpl
 import com.jetbrains.php.lang.psi.elements.impl.FunctionImpl
 import com.jetbrains.php.lang.psi.elements.impl.MethodImpl
@@ -40,6 +27,7 @@ import com.vk.modulite.psi.extensions.php.symbolName
 import com.vk.modulite.utils.fromKphpPolyfills
 import com.vk.modulite.utils.fromStubs
 import com.vk.modulite.utils.fromTests
+import java.util.*
 
 class ModuliteDepsDiff(
     private val project: Project,
@@ -200,6 +188,7 @@ class ModuliteDependenciesCollector(val project: Project) {
         )
     }
 
+    //  тут запускается наш сборщик
     fun collect(
         dir: VirtualFile,
         ownSymbols: List<SymbolName>? = null,
@@ -227,12 +216,16 @@ class ModuliteDependenciesCollector(val project: Project) {
             psiFile.accept(object : PhpRecursiveElementVisitor() {
                 override fun visitPhpClassReference(reference: ClassReference) {
                     when (reference.context) {
-                        is PhpUse, is MethodReference, is ClassConstantReference -> {
+                        is PhpUse -> {
+                            handleTraitReference(reference)
+                        }
+
+                        is MethodReference, is ClassConstantReference -> {
                             return
                         }
                     }
 
-                    handleReference(reference)
+                     handleReference(reference)
                 }
 
                 override fun visitPhpFunctionCall(reference: FunctionReference) {
@@ -292,15 +285,63 @@ class ModuliteDependenciesCollector(val project: Project) {
                     }
                 }
 
-                private fun handleReference(reference: PhpReference?, traverseFurther: Boolean = true) {
-                    if (reference == null) return
+                private fun referenceValidator(reference: PhpReference?): MutableCollection<out PhpNamedElement>? {
+                    if (reference == null) return null
 
                     val references = reference.resolveGlobal(false)
                     if (references.isEmpty()) {
-                        LOG.warn("Unknown reference '${reference.safeFqn()}'")
-                        return
+                        LOG.warn("Неизвестная ссылка '${reference.safeFqn()}'")
+                        return null
                     }
 
+                    return references
+                }
+
+                private fun handleTraitReference(reference: PhpReference?, traverseFurther: Boolean = true) {
+                    val references = referenceValidator(reference) ?: return
+
+                    val stack = LinkedList<PhpClass>() // Создаем стек для хранения вложенных instance
+                    var traitsClasses: Array<PhpClass> = arrayOf()
+
+                    references.forEach { elem ->
+                        val instance = elem as PhpClass
+                        stack.push(instance) // Добавляем текущий instance в стек
+                        while (stack.isNotEmpty()) {
+                            val currentInstance = stack.pop() // Получаем текущий instance из стека
+
+                            if (currentInstance.hasTraitUses()) {
+                                val traitsUses = currentInstance.traits
+                                traitsClasses += traitsUses
+
+                                traitsUses.forEach { it ->
+                                    val instanceNesting: Array<PhpClass>? = it.traits
+
+                                    instanceNesting?.forEach { nestedInstance ->
+                                        stack.push(nestedInstance) // Добавляем вложенный instance в стек
+                                    }
+
+                                    if (instanceNesting != null) {
+                                        traitsClasses += instanceNesting
+                                    }
+                                }
+                            }
+                        }
+                        val traitsNames = traitsClasses.mapNotNull { processElement(it, reference) }
+                        addSymbols(traitsNames)
+                        val methodsNames = instance.methods.mapNotNull { processElement(it, reference) }
+                        addSymbols(methodsNames)
+                    }
+
+                    val names = references.mapNotNull { processElement(it, reference) }
+                    addSymbols(names)
+                    if (traverseFurther) {
+                        super.visitPhpElement(reference)
+                    }
+                }
+
+                private fun handleReference(reference: PhpReference?, traverseFurther: Boolean = true) {
+                    val references = referenceValidator(reference)?:return
+
                     val names = references.mapNotNull { processElement(it, reference) }
                     addSymbols(names)
 
@@ -349,7 +390,10 @@ class ModuliteDependenciesCollector(val project: Project) {
 
                 private fun addSymbol(name: SymbolName) {
                     // TODO: simplify?
-                    if (name.kind != SymbolName.Kind.Modulite && (ownSymbolsSet.contains(name) || ownSymbolsSet.contains(name.className()))) {
+                    if (name.kind != SymbolName.Kind.Modulite && (ownSymbolsSet.contains(name) || ownSymbolsSet.contains(
+                            name.className()
+                        ))
+                    ) {
                         return
                     }
 

From 9190dc7d09e5819e756fcd19b57b36daca087b8d Mon Sep 17 00:00:00 2001
From: Richardas Kuchinskas <r.kuchinskas@vk.team>
Date: Wed, 4 Oct 2023 19:08:11 +0300
Subject: [PATCH 03/17] added condition for situation where PhpUse is use as
 import (not trait) added support for trait import/required inspection

---
 .../inspections/InternalSymbolUsageInspection.kt       |  8 ++++++++
 .../modulite/services/ModuliteDependenciesCollector.kt | 10 +++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt b/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
index acafea4..23ed73f 100644
--- a/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
+++ b/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
@@ -7,6 +7,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiElementVisitor
 import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocType
 import com.jetbrains.php.lang.psi.elements.*
+import com.jetbrains.php.lang.psi.elements.impl.PhpUseImpl
 import com.jetbrains.php.lang.psi.visitors.PhpElementVisitor
 import com.vk.modulite.SymbolName
 import com.vk.modulite.composer.ComposerPackage
@@ -122,6 +123,13 @@ class InternalSymbolUsageInspection : LocalInspectionTool() {
                 checkReferenceUsage(type)
             }
 
+            override fun visitPhpUse(expression: PhpUse?) {
+                val instance = expression as PhpUseImpl
+                if (instance.isTraitImport) {
+                    instance.targetReference?.let { checkReferenceUsage(it) }
+                }
+            }
+
             private fun checkReferenceUsage(reference: PhpReference, problemElement: PsiElement? = reference) {
                 val references = reference.resolveGlobal(false)
                 if (references.isEmpty()) {
diff --git a/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt b/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
index 0446781..dde1186 100644
--- a/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
+++ b/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
@@ -15,6 +15,7 @@ import com.jetbrains.php.lang.psi.elements.*
 import com.jetbrains.php.lang.psi.elements.impl.FieldImpl
 import com.jetbrains.php.lang.psi.elements.impl.FunctionImpl
 import com.jetbrains.php.lang.psi.elements.impl.MethodImpl
+import com.jetbrains.php.lang.psi.elements.impl.PhpUseImpl
 import com.vk.modulite.Namespace
 import com.vk.modulite.SymbolName
 import com.vk.modulite.actions.dialogs.DepsRegenerationResultDialog
@@ -217,7 +218,14 @@ class ModuliteDependenciesCollector(val project: Project) {
                 override fun visitPhpClassReference(reference: ClassReference) {
                     when (reference.context) {
                         is PhpUse -> {
-                            handleTraitReference(reference)
+                            val useInstance = reference.context as PhpUseImpl
+                            if(useInstance.isTraitImport){
+                                handleTraitReference(reference)
+                            }else{
+                                return
+                            }
+
+
                         }
 
                         is MethodReference, is ClassConstantReference -> {

From 8dd121c2f78468f5a40235278d210f90a5cd7a73 Mon Sep 17 00:00:00 2001
From: Richardas Kuchinskas <r.kuchinskas@vk.team>
Date: Fri, 6 Oct 2023 19:42:04 +0300
Subject: [PATCH 04/17] added more logic for 'required' traits added new tests
 for inspections

---
 .run/Run Plugin.run.xml                       |  5 +-
 .../InternalSymbolUsageInspection.kt          | 84 ++++++++++++++++++-
 .../Engines/FriendsEngineTrait.php            | 14 ++++
 .../Engines/LikesEngineTrait.php              | 15 ++++
 .../Engines/MusicEngineTrait.php              | 13 +++
 .../TraitsNesting/Engines/TestEngine.php      | 10 +++
 .../Engines/VideosEngineTrait.php             | 13 +++
 .../ExternalEngines/.modulite.yaml            | 17 ++++
 .../TraitsNesting/ExternalEngines/Tweets.php  | 10 +++
 .../TraitsNesting/Photos/.modulite.yaml       | 32 +++++++
 .../golden/TraitsNesting/Photos/Photo.php     | 12 +++
 .../Engines/FriendsEngineTrait.php            | 14 ++++
 .../Engines/LikesEngineTrait.php              | 15 ++++
 .../Engines/MusicEngineTrait.php              | 13 +++
 .../Engines/TestEngine.php                    | 10 +++
 .../Engines/VideosEngineTrait.php             | 13 +++
 .../ExternalEngines/.modulite.yaml            | 17 ++++
 .../ExternalEngines/Tweets.php                | 10 +++
 .../Photos/.modulite.yaml                     | 21 +++++
 .../RestrictedTraitRequire/Photos/Photo.php   | 13 +++
 .../ExternalEngines/.modulite.yaml            | 17 ++++
 .../UnknownPackage/ExternalEngines/Tweets.php | 10 +++
 .../UnknownPackage/Photos/.modulite.yaml      | 22 +++++
 .../UnknownPackage/Photos/Photo.php           | 10 +++
 .../com/vk/modulite/tests/GoldenTests.kt      |  1 +
 .../vk/modulite/tests/PhpInspectionsTest.kt   |  6 ++
 .../vk/modulite/tests/YamlInspectionsTest.kt  |  5 ++
 27 files changed, 417 insertions(+), 5 deletions(-)
 create mode 100644 src/test/fixtures/golden/TraitsNesting/Engines/FriendsEngineTrait.php
 create mode 100644 src/test/fixtures/golden/TraitsNesting/Engines/LikesEngineTrait.php
 create mode 100644 src/test/fixtures/golden/TraitsNesting/Engines/MusicEngineTrait.php
 create mode 100644 src/test/fixtures/golden/TraitsNesting/Engines/TestEngine.php
 create mode 100644 src/test/fixtures/golden/TraitsNesting/Engines/VideosEngineTrait.php
 create mode 100644 src/test/fixtures/golden/TraitsNesting/ExternalEngines/.modulite.yaml
 create mode 100644 src/test/fixtures/golden/TraitsNesting/ExternalEngines/Tweets.php
 create mode 100644 src/test/fixtures/golden/TraitsNesting/Photos/.modulite.yaml
 create mode 100644 src/test/fixtures/golden/TraitsNesting/Photos/Photo.php
 create mode 100644 src/test/fixtures/inspections/RestrictedTraitRequire/Engines/FriendsEngineTrait.php
 create mode 100644 src/test/fixtures/inspections/RestrictedTraitRequire/Engines/LikesEngineTrait.php
 create mode 100644 src/test/fixtures/inspections/RestrictedTraitRequire/Engines/MusicEngineTrait.php
 create mode 100644 src/test/fixtures/inspections/RestrictedTraitRequire/Engines/TestEngine.php
 create mode 100644 src/test/fixtures/inspections/RestrictedTraitRequire/Engines/VideosEngineTrait.php
 create mode 100644 src/test/fixtures/inspections/RestrictedTraitRequire/ExternalEngines/.modulite.yaml
 create mode 100644 src/test/fixtures/inspections/RestrictedTraitRequire/ExternalEngines/Tweets.php
 create mode 100644 src/test/fixtures/inspections/RestrictedTraitRequire/Photos/.modulite.yaml
 create mode 100644 src/test/fixtures/inspections/RestrictedTraitRequire/Photos/Photo.php
 create mode 100644 src/test/fixtures/inspections/UnknownPackage/ExternalEngines/.modulite.yaml
 create mode 100644 src/test/fixtures/inspections/UnknownPackage/ExternalEngines/Tweets.php
 create mode 100644 src/test/fixtures/inspections/UnknownPackage/Photos/.modulite.yaml
 create mode 100644 src/test/fixtures/inspections/UnknownPackage/Photos/Photo.php

diff --git a/.run/Run Plugin.run.xml b/.run/Run Plugin.run.xml
index 20a70af..cc416fa 100644
--- a/.run/Run Plugin.run.xml	
+++ b/.run/Run Plugin.run.xml	
@@ -11,7 +11,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="runIde" />
+          <option value=":runIde" />
         </list>
       </option>
       <option name="vmOptions" value="" />
@@ -19,6 +19,7 @@
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt b/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
index 23ed73f..79dbf85 100644
--- a/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
+++ b/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
@@ -19,6 +19,7 @@ import com.vk.modulite.psi.extensions.php.symbolName
 import com.vk.modulite.utils.fromStubs
 import com.vk.modulite.utils.fromTests
 import com.vk.modulite.utils.registerModuliteProblem
+import java.util.*
 
 class InternalSymbolUsageInspection : LocalInspectionTool() {
     companion object {
@@ -126,16 +127,92 @@ class InternalSymbolUsageInspection : LocalInspectionTool() {
             override fun visitPhpUse(expression: PhpUse?) {
                 val instance = expression as PhpUseImpl
                 if (instance.isTraitImport) {
-                    instance.targetReference?.let { checkReferenceUsage(it) }
+                    instance.targetReference?.let { checkTraitReferenceUsage(it) }
                 }
             }
 
-            private fun checkReferenceUsage(reference: PhpReference, problemElement: PsiElement? = reference) {
+
+            private fun referenceValidator(reference: PhpReference?): MutableCollection<out PhpNamedElement>? {
+                if (reference == null) return null
+
                 val references = reference.resolveGlobal(false)
                 if (references.isEmpty()) {
 //                    LOG.warn("Unknown reference for symbol '${reference.safeFqn()}'")
-                    return
+                    return null
+                }
+
+                return references
+            }
+
+            private fun checkTraitReferenceUsage(reference: PhpReference, problemElement: PsiElement? = reference){
+                val references = referenceValidator(reference) ?: return
+
+                val filteredReferences = references.filter {
+                    val file = it.containingFile.virtualFile
+                    !file.fromTests() && !file.fromStubs() && it !is PhpNamespace
+                }
+
+                val problemPsiElement = problemElement ?: reference
+                val context = ModuliteRestrictionChecker.createContext(reference)
+
+                val stack = LinkedList<PhpClass>() // Создаем стек для хранения вложенных instance
+                var traitsClasses: Array<PhpClass> = arrayOf()
+
+                filteredReferences.forEach { elem ->
+                    val instance = elem as PhpClass
+                    stack.push(instance) // Добавляем текущий instance в стек
+                    while (stack.isNotEmpty()) {
+                        val currentInstance = stack.pop() // Получаем текущий instance из стека
+
+                        if (currentInstance.hasTraitUses()) {
+                            val traitsUses = currentInstance.traits
+                            traitsClasses += traitsUses
+
+                            traitsUses.forEach { it ->
+                                val instanceNesting: Array<PhpClass>? = it.traits
+
+                                instanceNesting?.forEach { nestedInstance ->
+                                    stack.push(nestedInstance) // Добавляем вложенный instance в стек
+                                }
+
+                                if (instanceNesting != null) {
+                                    traitsClasses += instanceNesting
+                                }
+                            }
+                        }
+                    }
+                    val traitsNames = traitsClasses
+                    val methodsNames: MutableCollection<Method> = instance.methods
+                    traitsNames.forEach { element->
+                        val (can, reason) = ModuliteRestrictionChecker.canUse(context, element, reference)
+                        if (!can) {
+                            holder.addProblem(
+                                reason,
+                                element,
+                                reference,
+                                context,
+                                problemPsiElement
+                            )
+                        }
+                    }
+                    methodsNames.forEach {element->
+                        val (can, reason) = ModuliteRestrictionChecker.canUse(context, element, reference)
+                        if (!can) {
+                            holder.addProblem(
+                                reason,
+                                element,
+                                reference,
+                                context,
+                                problemPsiElement
+                            )
+                        }
+
+                    }
                 }
+            }
+
+            private fun checkReferenceUsage(reference: PhpReference, problemElement: PsiElement? = reference) {
+                val references = referenceValidator(reference) ?: return
 
                 val filteredReferences = references.filter {
                     val file = it.containingFile.virtualFile
@@ -157,6 +234,7 @@ class InternalSymbolUsageInspection : LocalInspectionTool() {
                         )
                     }
                 }
+
             }
         }
     }
diff --git a/src/test/fixtures/golden/TraitsNesting/Engines/FriendsEngineTrait.php b/src/test/fixtures/golden/TraitsNesting/Engines/FriendsEngineTrait.php
new file mode 100644
index 0000000..726826c
--- /dev/null
+++ b/src/test/fixtures/golden/TraitsNesting/Engines/FriendsEngineTrait.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Engines;
+
+trait FriendsEngineTrait {
+    use VideosEngineTrait;
+  public static function friendList(): void {
+    echo "Your friends";
+  }
+
+  public static function printFriendList(): void {
+   echo "friends";
+  }
+}
diff --git a/src/test/fixtures/golden/TraitsNesting/Engines/LikesEngineTrait.php b/src/test/fixtures/golden/TraitsNesting/Engines/LikesEngineTrait.php
new file mode 100644
index 0000000..62019b5
--- /dev/null
+++ b/src/test/fixtures/golden/TraitsNesting/Engines/LikesEngineTrait.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Engines;
+
+trait LikesEngineTrait {
+    use FriendsEngineTrait;
+    use MusicEngineTrait;
+  public static function print(): void {
+    echo "like";
+  }
+
+  public static function printTweetsLikes(): void {
+    \ExternalEngines\Tweets::printTweetsLikesCountByUser();
+  }
+}
diff --git a/src/test/fixtures/golden/TraitsNesting/Engines/MusicEngineTrait.php b/src/test/fixtures/golden/TraitsNesting/Engines/MusicEngineTrait.php
new file mode 100644
index 0000000..c5824e8
--- /dev/null
+++ b/src/test/fixtures/golden/TraitsNesting/Engines/MusicEngineTrait.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Engines;
+
+trait MusicEngineTrait {
+    public static function musicList(): void {
+        echo "Your music";
+    }
+
+    public static function musicListPrint(): void {
+        echo "Your music list";
+    }
+}
diff --git a/src/test/fixtures/golden/TraitsNesting/Engines/TestEngine.php b/src/test/fixtures/golden/TraitsNesting/Engines/TestEngine.php
new file mode 100644
index 0000000..0cccba4
--- /dev/null
+++ b/src/test/fixtures/golden/TraitsNesting/Engines/TestEngine.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Engines;
+
+class TestEngine
+{
+   public static function tester(){
+        echo "test";
+    }
+}
\ No newline at end of file
diff --git a/src/test/fixtures/golden/TraitsNesting/Engines/VideosEngineTrait.php b/src/test/fixtures/golden/TraitsNesting/Engines/VideosEngineTrait.php
new file mode 100644
index 0000000..e11e5e5
--- /dev/null
+++ b/src/test/fixtures/golden/TraitsNesting/Engines/VideosEngineTrait.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Engines;
+
+trait VideosEngineTrait {
+    public static function videosList(): void {
+        echo "Your videos";
+    }
+
+    public static function printVideosList(): void {
+        echo "videos";
+    }
+}
diff --git a/src/test/fixtures/golden/TraitsNesting/ExternalEngines/.modulite.yaml b/src/test/fixtures/golden/TraitsNesting/ExternalEngines/.modulite.yaml
new file mode 100644
index 0000000..7c14ef6
--- /dev/null
+++ b/src/test/fixtures/golden/TraitsNesting/ExternalEngines/.modulite.yaml
@@ -0,0 +1,17 @@
+name: "@externalEngines"
+description: ""
+namespace: "ExternalEngines\\"
+
+# "Public API" of the modulite: classes, functions, constants, etc.
+# Symbols not listed here will be internal.
+export:
+  - "Tweets"
+
+# 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:
diff --git a/src/test/fixtures/golden/TraitsNesting/ExternalEngines/Tweets.php b/src/test/fixtures/golden/TraitsNesting/ExternalEngines/Tweets.php
new file mode 100644
index 0000000..e801b5d
--- /dev/null
+++ b/src/test/fixtures/golden/TraitsNesting/ExternalEngines/Tweets.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace ExternalEngines;
+
+class Tweets {
+  public static function printTweetsLikesCountByUser() {
+    echo "ExternalEngines: tweets like for this user";
+  }
+
+}
diff --git a/src/test/fixtures/golden/TraitsNesting/Photos/.modulite.yaml b/src/test/fixtures/golden/TraitsNesting/Photos/.modulite.yaml
new file mode 100644
index 0000000..beaf5ad
--- /dev/null
+++ b/src/test/fixtures/golden/TraitsNesting/Photos/.modulite.yaml
@@ -0,0 +1,32 @@
+name: "@photos"
+description: ""
+namespace: "Photos\\"
+
+# "Public API" of the modulite: classes, functions, constants, etc.
+# Symbols not listed here will be internal.
+export:
+  - "Photo"
+
+# Class members to exclude, they override "export".
+force-internal:
+
+# Dependencies: other modulites, global classes, defines, etc.
+require:
+  - "\\Engines\\FriendsEngineTrait"
+  - "\\Engines\\LikesEngineTrait"
+  - "\\Engines\\MusicEngineTrait"
+  - "\\Engines\\VideosEngineTrait"
+  - "\\Engines\\FriendsEngineTrait::friendList()"
+  - "\\Engines\\FriendsEngineTrait::printFriendList()"
+  - "\\Engines\\LikesEngineTrait::print()"
+  - "\\Engines\\LikesEngineTrait::printTweetsLikes()"
+  - "\\Engines\\MusicEngineTrait::musicList()"
+  - "\\Engines\\MusicEngineTrait::musicListPrint()"
+  - "\\Engines\\TestEngine::tester()"
+  - "\\Engines\\VideosEngineTrait::printVideosList()"
+  - "\\Engines\\VideosEngineTrait::videosList()"
+
+
+
+# Granting partial access to internal symbols, "as an exception".
+allow-internal-access:
diff --git a/src/test/fixtures/golden/TraitsNesting/Photos/Photo.php b/src/test/fixtures/golden/TraitsNesting/Photos/Photo.php
new file mode 100644
index 0000000..824d40b
--- /dev/null
+++ b/src/test/fixtures/golden/TraitsNesting/Photos/Photo.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Photos;
+use Engines\TestEngine;
+class Photo {
+  use \Engines\LikesEngineTrait;
+
+  public static function printPhotoLikes() {
+    self::print();
+      TestEngine::tester();
+  }
+}
diff --git a/src/test/fixtures/inspections/RestrictedTraitRequire/Engines/FriendsEngineTrait.php b/src/test/fixtures/inspections/RestrictedTraitRequire/Engines/FriendsEngineTrait.php
new file mode 100644
index 0000000..726826c
--- /dev/null
+++ b/src/test/fixtures/inspections/RestrictedTraitRequire/Engines/FriendsEngineTrait.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Engines;
+
+trait FriendsEngineTrait {
+    use VideosEngineTrait;
+  public static function friendList(): void {
+    echo "Your friends";
+  }
+
+  public static function printFriendList(): void {
+   echo "friends";
+  }
+}
diff --git a/src/test/fixtures/inspections/RestrictedTraitRequire/Engines/LikesEngineTrait.php b/src/test/fixtures/inspections/RestrictedTraitRequire/Engines/LikesEngineTrait.php
new file mode 100644
index 0000000..62019b5
--- /dev/null
+++ b/src/test/fixtures/inspections/RestrictedTraitRequire/Engines/LikesEngineTrait.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Engines;
+
+trait LikesEngineTrait {
+    use FriendsEngineTrait;
+    use MusicEngineTrait;
+  public static function print(): void {
+    echo "like";
+  }
+
+  public static function printTweetsLikes(): void {
+    \ExternalEngines\Tweets::printTweetsLikesCountByUser();
+  }
+}
diff --git a/src/test/fixtures/inspections/RestrictedTraitRequire/Engines/MusicEngineTrait.php b/src/test/fixtures/inspections/RestrictedTraitRequire/Engines/MusicEngineTrait.php
new file mode 100644
index 0000000..c5824e8
--- /dev/null
+++ b/src/test/fixtures/inspections/RestrictedTraitRequire/Engines/MusicEngineTrait.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Engines;
+
+trait MusicEngineTrait {
+    public static function musicList(): void {
+        echo "Your music";
+    }
+
+    public static function musicListPrint(): void {
+        echo "Your music list";
+    }
+}
diff --git a/src/test/fixtures/inspections/RestrictedTraitRequire/Engines/TestEngine.php b/src/test/fixtures/inspections/RestrictedTraitRequire/Engines/TestEngine.php
new file mode 100644
index 0000000..0cccba4
--- /dev/null
+++ b/src/test/fixtures/inspections/RestrictedTraitRequire/Engines/TestEngine.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Engines;
+
+class TestEngine
+{
+   public static function tester(){
+        echo "test";
+    }
+}
\ No newline at end of file
diff --git a/src/test/fixtures/inspections/RestrictedTraitRequire/Engines/VideosEngineTrait.php b/src/test/fixtures/inspections/RestrictedTraitRequire/Engines/VideosEngineTrait.php
new file mode 100644
index 0000000..e11e5e5
--- /dev/null
+++ b/src/test/fixtures/inspections/RestrictedTraitRequire/Engines/VideosEngineTrait.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Engines;
+
+trait VideosEngineTrait {
+    public static function videosList(): void {
+        echo "Your videos";
+    }
+
+    public static function printVideosList(): void {
+        echo "videos";
+    }
+}
diff --git a/src/test/fixtures/inspections/RestrictedTraitRequire/ExternalEngines/.modulite.yaml b/src/test/fixtures/inspections/RestrictedTraitRequire/ExternalEngines/.modulite.yaml
new file mode 100644
index 0000000..7c14ef6
--- /dev/null
+++ b/src/test/fixtures/inspections/RestrictedTraitRequire/ExternalEngines/.modulite.yaml
@@ -0,0 +1,17 @@
+name: "@externalEngines"
+description: ""
+namespace: "ExternalEngines\\"
+
+# "Public API" of the modulite: classes, functions, constants, etc.
+# Symbols not listed here will be internal.
+export:
+  - "Tweets"
+
+# 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:
diff --git a/src/test/fixtures/inspections/RestrictedTraitRequire/ExternalEngines/Tweets.php b/src/test/fixtures/inspections/RestrictedTraitRequire/ExternalEngines/Tweets.php
new file mode 100644
index 0000000..e801b5d
--- /dev/null
+++ b/src/test/fixtures/inspections/RestrictedTraitRequire/ExternalEngines/Tweets.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace ExternalEngines;
+
+class Tweets {
+  public static function printTweetsLikesCountByUser() {
+    echo "ExternalEngines: tweets like for this user";
+  }
+
+}
diff --git a/src/test/fixtures/inspections/RestrictedTraitRequire/Photos/.modulite.yaml b/src/test/fixtures/inspections/RestrictedTraitRequire/Photos/.modulite.yaml
new file mode 100644
index 0000000..ab37790
--- /dev/null
+++ b/src/test/fixtures/inspections/RestrictedTraitRequire/Photos/.modulite.yaml
@@ -0,0 +1,21 @@
+name: "@photos"
+description: ""
+namespace: "Photos\\"
+
+# "Public API" of the modulite: classes, functions, constants, etc.
+# Symbols not listed here will be internal.
+export:
+  - "Photo"
+
+# Class members to exclude, they override "export".
+force-internal:
+
+# Dependencies: other modulites, global classes, defines, etc.
+require:
+  - "\\Engines\\TestEngine::tester()"
+
+
+
+
+# Granting partial access to internal symbols, "as an exception".
+allow-internal-access:
diff --git a/src/test/fixtures/inspections/RestrictedTraitRequire/Photos/Photo.php b/src/test/fixtures/inspections/RestrictedTraitRequire/Photos/Photo.php
new file mode 100644
index 0000000..7ae03d5
--- /dev/null
+++ b/src/test/fixtures/inspections/RestrictedTraitRequire/Photos/Photo.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Photos;
+use Engines\TestEngine;
+class Photo {
+    use \Engines\LikesEngineTrait;
+//      ^^^^^^^^^^^^^^^^^^^^^^^^^
+//      error: restricted to use Engines\LikesEngineTrait, it's not required by @photos
+  public static function printPhotoLikes() {
+    self::print();
+      TestEngine::tester();
+  }
+}
diff --git a/src/test/fixtures/inspections/UnknownPackage/ExternalEngines/.modulite.yaml b/src/test/fixtures/inspections/UnknownPackage/ExternalEngines/.modulite.yaml
new file mode 100644
index 0000000..7c14ef6
--- /dev/null
+++ b/src/test/fixtures/inspections/UnknownPackage/ExternalEngines/.modulite.yaml
@@ -0,0 +1,17 @@
+name: "@externalEngines"
+description: ""
+namespace: "ExternalEngines\\"
+
+# "Public API" of the modulite: classes, functions, constants, etc.
+# Symbols not listed here will be internal.
+export:
+  - "Tweets"
+
+# 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:
diff --git a/src/test/fixtures/inspections/UnknownPackage/ExternalEngines/Tweets.php b/src/test/fixtures/inspections/UnknownPackage/ExternalEngines/Tweets.php
new file mode 100644
index 0000000..e801b5d
--- /dev/null
+++ b/src/test/fixtures/inspections/UnknownPackage/ExternalEngines/Tweets.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace ExternalEngines;
+
+class Tweets {
+  public static function printTweetsLikesCountByUser() {
+    echo "ExternalEngines: tweets like for this user";
+  }
+
+}
diff --git a/src/test/fixtures/inspections/UnknownPackage/Photos/.modulite.yaml b/src/test/fixtures/inspections/UnknownPackage/Photos/.modulite.yaml
new file mode 100644
index 0000000..8e7979f
--- /dev/null
+++ b/src/test/fixtures/inspections/UnknownPackage/Photos/.modulite.yaml
@@ -0,0 +1,22 @@
+name: "@photos"
+description: ""
+namespace: "Photos\\"
+
+# "Public API" of the modulite: classes, functions, constants, etc.
+# Symbols not listed here will be internal.
+export:
+  - "Photo"
+
+# Class members to exclude, they override "export".
+force-internal:
+
+# Dependencies: other modulites, global classes, defines, etc.
+require:
+  - "#vk/uncommon"
+#   ^^^^^^^^^^^^^^
+#   error: Unknown composer package '#vk/uncommon'
+  - "\\Engines\\TestEngine::tester()"
+
+
+# Granting partial access to internal symbols, "as an exception".
+allow-internal-access:
diff --git a/src/test/fixtures/inspections/UnknownPackage/Photos/Photo.php b/src/test/fixtures/inspections/UnknownPackage/Photos/Photo.php
new file mode 100644
index 0000000..7f1f7d2
--- /dev/null
+++ b/src/test/fixtures/inspections/UnknownPackage/Photos/Photo.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Photos;
+use Engines\TestEngine;
+class Photo {
+  public static function printPhotoLikes() {
+    self::print();
+      TestEngine::tester();
+  }
+}
diff --git a/src/test/kotlin/com/vk/modulite/tests/GoldenTests.kt b/src/test/kotlin/com/vk/modulite/tests/GoldenTests.kt
index c9a710f..dce309d 100644
--- a/src/test/kotlin/com/vk/modulite/tests/GoldenTests.kt
+++ b/src/test/kotlin/com/vk/modulite/tests/GoldenTests.kt
@@ -17,6 +17,7 @@ class GoldenTests : ModuliteInspectionTestBase() {
     fun `test allow internal nested modulite for global`() = runFixture("golden/AllowInternalModuliteForGlobal")
     fun `test inherit classes and traits`()                = runFixture("golden/InheritAndTraits")
     fun `test inherit static field and class const`()      = runFixture("golden/InheritFieldAndConst")
+    fun `test traits nesting`()                            = runFixture("golden/TraitsNesting")
 
     // packages
     fun `test simple packages`()        = runFixture("golden/Packages/SimplePackages")
diff --git a/src/test/kotlin/com/vk/modulite/tests/PhpInspectionsTest.kt b/src/test/kotlin/com/vk/modulite/tests/PhpInspectionsTest.kt
index 9eee01f..70587f8 100644
--- a/src/test/kotlin/com/vk/modulite/tests/PhpInspectionsTest.kt
+++ b/src/test/kotlin/com/vk/modulite/tests/PhpInspectionsTest.kt
@@ -2,6 +2,7 @@ package com.vk.modulite.tests
 
 import com.vk.modulite.infrastructure.ModuliteInspectionTestBase
 import com.vk.modulite.inspections.ComposerPackageAnnotationUsageInspection
+import com.vk.modulite.inspections.InternalSymbolUsageInspection
 import com.vk.modulite.inspections.WrongNamespaceInspection
 
 class PhpInspectionsTest : ModuliteInspectionTestBase() {
@@ -14,4 +15,9 @@ class PhpInspectionsTest : ModuliteInspectionTestBase() {
         myFixture.enableInspections(WrongNamespaceInspection())
         runFixture("inspections/WrongNamespace")
     }
+
+    fun `test trait use`() {
+        myFixture.enableInspections(InternalSymbolUsageInspection())
+        runFixture("inspections/RestrictedTraitRequire")
+    }
 }
diff --git a/src/test/kotlin/com/vk/modulite/tests/YamlInspectionsTest.kt b/src/test/kotlin/com/vk/modulite/tests/YamlInspectionsTest.kt
index d1f7b26..3a7630e 100644
--- a/src/test/kotlin/com/vk/modulite/tests/YamlInspectionsTest.kt
+++ b/src/test/kotlin/com/vk/modulite/tests/YamlInspectionsTest.kt
@@ -72,6 +72,11 @@ class YamlInspectionsTest : ModuliteInspectionTestBase() {
         runFixture("inspections/WrongForceInternal")
     }
 
+    fun `test unknown composer package`() {
+        myFixture.enableInspections(UnknownComposerPackageInspection())
+        runFixture("inspections/UnknownPackage")
+    }
+
     fun `test other yaml file with no inspections`() {
         myFixture.enableInspections(UnknownSymbolInspection())
         myFixture.enableInspections(UnknownModuliteInspection())

From e9d517822233ff348cb180c911295c8dfa6673ac Mon Sep 17 00:00:00 2001
From: Richardas Kuchinskas <r.kuchinskas@vk.team>
Date: Mon, 9 Oct 2023 18:47:53 +0300
Subject: [PATCH 05/17] added integration test

---
 .run/Run Plugin.run.xml                       |  3 +-
 .../Engines/FriendsEngineTrait.php            | 14 +++++++++
 .../Engines/LikesEngineTrait.php              | 15 ++++++++++
 .../Engines/MusicEngineTrait.php              | 13 ++++++++
 .../traitsNesting/Engines/TestEngine.php      | 10 +++++++
 .../Engines/VideosEngineTrait.php             | 13 ++++++++
 .../traitsNesting/ExternalEngines/Tweets.php  | 10 +++++++
 .../Photos/.modulite.yaml.expected            | 30 +++++++++++++++++++
 .../traitsNesting/Photos/Photo.php            | 12 ++++++++
 .../CreateModulite/traitsNesting/index.php    |  3 ++
 .../tests/integration/CreateModuliteTest.kt   | 19 ++++++++++++
 11 files changed, 140 insertions(+), 2 deletions(-)
 create mode 100644 src/test/fixtures/integration/CreateModulite/traitsNesting/Engines/FriendsEngineTrait.php
 create mode 100644 src/test/fixtures/integration/CreateModulite/traitsNesting/Engines/LikesEngineTrait.php
 create mode 100644 src/test/fixtures/integration/CreateModulite/traitsNesting/Engines/MusicEngineTrait.php
 create mode 100644 src/test/fixtures/integration/CreateModulite/traitsNesting/Engines/TestEngine.php
 create mode 100644 src/test/fixtures/integration/CreateModulite/traitsNesting/Engines/VideosEngineTrait.php
 create mode 100644 src/test/fixtures/integration/CreateModulite/traitsNesting/ExternalEngines/Tweets.php
 create mode 100644 src/test/fixtures/integration/CreateModulite/traitsNesting/Photos/.modulite.yaml.expected
 create mode 100644 src/test/fixtures/integration/CreateModulite/traitsNesting/Photos/Photo.php
 create mode 100644 src/test/fixtures/integration/CreateModulite/traitsNesting/index.php

diff --git a/.run/Run Plugin.run.xml b/.run/Run Plugin.run.xml
index cc416fa..d15ff68 100644
--- a/.run/Run Plugin.run.xml	
+++ b/.run/Run Plugin.run.xml	
@@ -11,7 +11,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value=":runIde" />
+          <option value="runIde" />
         </list>
       </option>
       <option name="vmOptions" value="" />
@@ -19,7 +19,6 @@
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
-    <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/src/test/fixtures/integration/CreateModulite/traitsNesting/Engines/FriendsEngineTrait.php b/src/test/fixtures/integration/CreateModulite/traitsNesting/Engines/FriendsEngineTrait.php
new file mode 100644
index 0000000..726826c
--- /dev/null
+++ b/src/test/fixtures/integration/CreateModulite/traitsNesting/Engines/FriendsEngineTrait.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Engines;
+
+trait FriendsEngineTrait {
+    use VideosEngineTrait;
+  public static function friendList(): void {
+    echo "Your friends";
+  }
+
+  public static function printFriendList(): void {
+   echo "friends";
+  }
+}
diff --git a/src/test/fixtures/integration/CreateModulite/traitsNesting/Engines/LikesEngineTrait.php b/src/test/fixtures/integration/CreateModulite/traitsNesting/Engines/LikesEngineTrait.php
new file mode 100644
index 0000000..62019b5
--- /dev/null
+++ b/src/test/fixtures/integration/CreateModulite/traitsNesting/Engines/LikesEngineTrait.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Engines;
+
+trait LikesEngineTrait {
+    use FriendsEngineTrait;
+    use MusicEngineTrait;
+  public static function print(): void {
+    echo "like";
+  }
+
+  public static function printTweetsLikes(): void {
+    \ExternalEngines\Tweets::printTweetsLikesCountByUser();
+  }
+}
diff --git a/src/test/fixtures/integration/CreateModulite/traitsNesting/Engines/MusicEngineTrait.php b/src/test/fixtures/integration/CreateModulite/traitsNesting/Engines/MusicEngineTrait.php
new file mode 100644
index 0000000..c5824e8
--- /dev/null
+++ b/src/test/fixtures/integration/CreateModulite/traitsNesting/Engines/MusicEngineTrait.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Engines;
+
+trait MusicEngineTrait {
+    public static function musicList(): void {
+        echo "Your music";
+    }
+
+    public static function musicListPrint(): void {
+        echo "Your music list";
+    }
+}
diff --git a/src/test/fixtures/integration/CreateModulite/traitsNesting/Engines/TestEngine.php b/src/test/fixtures/integration/CreateModulite/traitsNesting/Engines/TestEngine.php
new file mode 100644
index 0000000..0cccba4
--- /dev/null
+++ b/src/test/fixtures/integration/CreateModulite/traitsNesting/Engines/TestEngine.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Engines;
+
+class TestEngine
+{
+   public static function tester(){
+        echo "test";
+    }
+}
\ No newline at end of file
diff --git a/src/test/fixtures/integration/CreateModulite/traitsNesting/Engines/VideosEngineTrait.php b/src/test/fixtures/integration/CreateModulite/traitsNesting/Engines/VideosEngineTrait.php
new file mode 100644
index 0000000..e11e5e5
--- /dev/null
+++ b/src/test/fixtures/integration/CreateModulite/traitsNesting/Engines/VideosEngineTrait.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Engines;
+
+trait VideosEngineTrait {
+    public static function videosList(): void {
+        echo "Your videos";
+    }
+
+    public static function printVideosList(): void {
+        echo "videos";
+    }
+}
diff --git a/src/test/fixtures/integration/CreateModulite/traitsNesting/ExternalEngines/Tweets.php b/src/test/fixtures/integration/CreateModulite/traitsNesting/ExternalEngines/Tweets.php
new file mode 100644
index 0000000..e801b5d
--- /dev/null
+++ b/src/test/fixtures/integration/CreateModulite/traitsNesting/ExternalEngines/Tweets.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace ExternalEngines;
+
+class Tweets {
+  public static function printTweetsLikesCountByUser() {
+    echo "ExternalEngines: tweets like for this user";
+  }
+
+}
diff --git a/src/test/fixtures/integration/CreateModulite/traitsNesting/Photos/.modulite.yaml.expected b/src/test/fixtures/integration/CreateModulite/traitsNesting/Photos/.modulite.yaml.expected
new file mode 100644
index 0000000..d67cc81
--- /dev/null
+++ b/src/test/fixtures/integration/CreateModulite/traitsNesting/Photos/.modulite.yaml.expected
@@ -0,0 +1,30 @@
+name: "@photos"
+description: ""
+namespace: "Photos\\"
+
+# "Public API" of the modulite: classes, functions, constants, etc.
+# Symbols not listed here will be internal.
+export:
+  - "Photo"
+
+# Class members to exclude, they override "export".
+force-internal:
+
+# Dependencies: other modulites, global classes, defines, etc.
+require:
+  - "\\Engines\\FriendsEngineTrait"
+  - "\\Engines\\LikesEngineTrait"
+  - "\\Engines\\MusicEngineTrait"
+  - "\\Engines\\VideosEngineTrait"
+  - "\\Engines\\FriendsEngineTrait::friendList()"
+  - "\\Engines\\FriendsEngineTrait::printFriendList()"
+  - "\\Engines\\LikesEngineTrait::print()"
+  - "\\Engines\\LikesEngineTrait::printTweetsLikes()"
+  - "\\Engines\\MusicEngineTrait::musicList()"
+  - "\\Engines\\MusicEngineTrait::musicListPrint()"
+  - "\\Engines\\TestEngine::tester()"
+  - "\\Engines\\VideosEngineTrait::printVideosList()"
+  - "\\Engines\\VideosEngineTrait::videosList()"
+
+# Granting partial access to internal symbols, "as an exception".
+allow-internal-access:
diff --git a/src/test/fixtures/integration/CreateModulite/traitsNesting/Photos/Photo.php b/src/test/fixtures/integration/CreateModulite/traitsNesting/Photos/Photo.php
new file mode 100644
index 0000000..824d40b
--- /dev/null
+++ b/src/test/fixtures/integration/CreateModulite/traitsNesting/Photos/Photo.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Photos;
+use Engines\TestEngine;
+class Photo {
+  use \Engines\LikesEngineTrait;
+
+  public static function printPhotoLikes() {
+    self::print();
+      TestEngine::tester();
+  }
+}
diff --git a/src/test/fixtures/integration/CreateModulite/traitsNesting/index.php b/src/test/fixtures/integration/CreateModulite/traitsNesting/index.php
new file mode 100644
index 0000000..8d1421b
--- /dev/null
+++ b/src/test/fixtures/integration/CreateModulite/traitsNesting/index.php
@@ -0,0 +1,3 @@
+<?php
+
+\Photos\Photo::printPhotoLikes();
diff --git a/src/test/kotlin/com/vk/modulite/tests/integration/CreateModuliteTest.kt b/src/test/kotlin/com/vk/modulite/tests/integration/CreateModuliteTest.kt
index e8e5ba1..be35018 100644
--- a/src/test/kotlin/com/vk/modulite/tests/integration/CreateModuliteTest.kt
+++ b/src/test/kotlin/com/vk/modulite/tests/integration/CreateModuliteTest.kt
@@ -134,5 +134,24 @@ class CreateModuliteTest : IntegrationTestBase() {
         }
     }
 
+    fun `test traits nesting required `  () = integrationTest("traitsNesting"){
+        step("create modulite") {
+            createModuliteFromSource( "Photos") {
+                makeAllExported()
+            }
+        }
+
+        step("check modulite config") {
+            yaml("Photos/.modulite.yaml") {
+                check(".expected")
+            }
+        }
+
+        step("check highlights") {
+            enableInspections(InternalSymbolUsageInspection())
+            checkHighlights()
+        }
+    }
+
     override fun getTestDataPath() = "src/test/fixtures/integration/CreateModulite"
 }

From cf339a1f05b3f9a294726360ab717a7d45073374 Mon Sep 17 00:00:00 2001
From: Richardas Kuchinskas <r.kuchinskas@vk.team>
Date: Wed, 11 Oct 2023 20:23:54 +0300
Subject: [PATCH 06/17] refactored logic for traits in
 InternalSymbolUsageInspection

---
 .../InternalSymbolUsageInspection.kt          | 175 +++++++++++-------
 .../services/ModuliteDependenciesCollector.kt |   4 +-
 2 files changed, 110 insertions(+), 69 deletions(-)

diff --git a/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt b/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
index 79dbf85..e8c20dd 100644
--- a/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
+++ b/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
@@ -5,8 +5,11 @@ import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiElementVisitor
+import com.jetbrains.php.lang.PhpLangUtil
 import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocType
 import com.jetbrains.php.lang.psi.elements.*
+import com.jetbrains.php.lang.psi.elements.impl.FunctionImpl
+import com.jetbrains.php.lang.psi.elements.impl.MethodImpl
 import com.jetbrains.php.lang.psi.elements.impl.PhpUseImpl
 import com.jetbrains.php.lang.psi.visitors.PhpElementVisitor
 import com.vk.modulite.SymbolName
@@ -28,12 +31,13 @@ class InternalSymbolUsageInspection : LocalInspectionTool() {
 
     class AddSymbolToRequiresQuickFix(
         private val contextModulite: Modulite,
-        private val symbol: SymbolName,
+        private val symbols: List<SymbolName>
     ) : LocalQuickFix {
+
         override fun getFamilyName() = "Add symbol to requires"
 
         override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
-            contextModulite.addDependencies(symbol)
+            contextModulite.addDependencies(symbols)
         }
     }
 
@@ -49,7 +53,17 @@ class InternalSymbolUsageInspection : LocalInspectionTool() {
             return
         }
     }
+    private fun referenceValidator(reference: PhpReference?): MutableCollection<out PhpNamedElement>? {
+        if (reference == null) return null
 
+        val references = reference.resolveGlobal(false)
+        if (references.isEmpty()) {
+//                    LOG.warn("Unknown reference for symbol '${reference.safeFqn()}'")
+            return null
+        }
+
+        return references
+    }
     class AddComposerPackageToRequiresQuickFix(
         private val contextModulite: Modulite,
         private val referencePackage: ComposerPackage,
@@ -131,19 +145,6 @@ class InternalSymbolUsageInspection : LocalInspectionTool() {
                 }
             }
 
-
-            private fun referenceValidator(reference: PhpReference?): MutableCollection<out PhpNamedElement>? {
-                if (reference == null) return null
-
-                val references = reference.resolveGlobal(false)
-                if (references.isEmpty()) {
-//                    LOG.warn("Unknown reference for symbol '${reference.safeFqn()}'")
-                    return null
-                }
-
-                return references
-            }
-
             private fun checkTraitReferenceUsage(reference: PhpReference, problemElement: PsiElement? = reference){
                 val references = referenceValidator(reference) ?: return
 
@@ -155,58 +156,18 @@ class InternalSymbolUsageInspection : LocalInspectionTool() {
                 val problemPsiElement = problemElement ?: reference
                 val context = ModuliteRestrictionChecker.createContext(reference)
 
-                val stack = LinkedList<PhpClass>() // Создаем стек для хранения вложенных instance
-                var traitsClasses: Array<PhpClass> = arrayOf()
-
                 filteredReferences.forEach { elem ->
                     val instance = elem as PhpClass
-                    stack.push(instance) // Добавляем текущий instance в стек
-                    while (stack.isNotEmpty()) {
-                        val currentInstance = stack.pop() // Получаем текущий instance из стека
-
-                        if (currentInstance.hasTraitUses()) {
-                            val traitsUses = currentInstance.traits
-                            traitsClasses += traitsUses
-
-                            traitsUses.forEach { it ->
-                                val instanceNesting: Array<PhpClass>? = it.traits
-
-                                instanceNesting?.forEach { nestedInstance ->
-                                    stack.push(nestedInstance) // Добавляем вложенный instance в стек
-                                }
-
-                                if (instanceNesting != null) {
-                                    traitsClasses += instanceNesting
-                                }
-                            }
-                        }
-                    }
-                    val traitsNames = traitsClasses
-                    val methodsNames: MutableCollection<Method> = instance.methods
-                    traitsNames.forEach { element->
-                        val (can, reason) = ModuliteRestrictionChecker.canUse(context, element, reference)
-                        if (!can) {
-                            holder.addProblem(
-                                reason,
-                                element,
-                                reference,
-                                context,
-                                problemPsiElement
-                            )
-                        }
-                    }
-                    methodsNames.forEach {element->
-                        val (can, reason) = ModuliteRestrictionChecker.canUse(context, element, reference)
-                        if (!can) {
-                            holder.addProblem(
-                                reason,
-                                element,
-                                reference,
-                                context,
-                                problemPsiElement
-                            )
-                        }
 
+                    val (can, reason) = ModuliteRestrictionChecker.canUse(context, instance, reference)
+                    if (!can) {
+                        holder.addProblem(
+                            reason,
+                            instance,
+                            reference,
+                            context,
+                            problemPsiElement
+                        )
                     }
                 }
             }
@@ -239,6 +200,33 @@ class InternalSymbolUsageInspection : LocalInspectionTool() {
         }
     }
 
+    private fun processElement(element: PhpNamedElement, reference: PhpReference? = null): SymbolName? {
+
+        if (element is MethodImpl) {
+            // У магических методов символ - его класс
+            if (PhpLangUtil.isMagicMethod(element.name)) {
+                val containingClass = element.containingClass
+                if (containingClass != null) {
+                    return containingClass.symbolName(reference)
+                }
+            }
+
+            // Не статические методы добавлять не надо
+            if (!element.isStatic) {
+                return null
+            }
+        }
+
+        // Если у функции нет имени, то это лямбда. Значит мы её пропускаем
+        if (element is FunctionImpl) {
+            if (element.name.isEmpty()) {
+                return null
+            }
+        }
+
+        return element.symbolName(reference, forNotRequired = true)
+    }
+
     private fun ProblemsHolder.addProblem(
         reason: ModuliteRestrictionChecker.ViolationTypes,
         symbolElement: PhpNamedElement,
@@ -277,8 +265,17 @@ class InternalSymbolUsageInspection : LocalInspectionTool() {
                     """
                         restricted to $readableName, $refModulite is not required by ${context.modulite}
                     """.trimIndent()
-                } else {
-                    quickFixes.add(AddSymbolToRequiresQuickFix(context.modulite!!, symbol))
+                } else if(symbolElement is PhpClass && symbolElement.isTrait){
+                    val (traits,methods) = checkTraitReferenceUsage(reference)
+
+                    quickFixes.add(AddSymbolToRequiresQuickFix(context.modulite!!, traits+methods))
+
+                    """
+                        restricted to $readableName, it's not required by ${context.modulite}
+                    """.trimIndent()
+                }
+                    else {
+                    quickFixes.add(AddSymbolToRequiresQuickFix(context.modulite!!, listOf(symbol)))
 
                     """
                         restricted to $readableName, it's not required by ${context.modulite}
@@ -303,4 +300,50 @@ class InternalSymbolUsageInspection : LocalInspectionTool() {
             *quickFixes.toTypedArray()
         )
     }
+
+    private fun checkTraitReferenceUsage(reference: PhpReference)
+            :Pair<List<SymbolName>, List<SymbolName>>{
+        val traitsClasses: MutableList<PhpClass> = arrayListOf()
+        val methodsNames: MutableCollection<Method> = arrayListOf()
+
+        val references = referenceValidator(reference) ?: return Pair(listOf<SymbolName>(),listOf<SymbolName>())
+
+        val filteredReferences = references.filter {
+            val file = it.containingFile.virtualFile
+            !file.fromTests() && !file.fromStubs() && it !is PhpNamespace
+        }
+
+        val stack = LinkedList<PhpClass>() // Создаем стек для хранения вложенных instance
+
+        filteredReferences.forEach { elem ->
+            val instance = elem as PhpClass
+            stack.push(instance) // Добавляем текущий instance в стек
+            while (stack.isNotEmpty()) {
+                val currentInstance = stack.pop() // Получаем текущий instance из стека
+                traitsClasses+=currentInstance
+                if (currentInstance.hasTraitUses()) {
+                    val traitsUses = currentInstance.traits
+                    traitsClasses += traitsUses
+
+                    traitsUses.forEach { it ->
+                        val instanceNesting: Array<PhpClass>? = it.traits
+
+                        instanceNesting?.forEach { nestedInstance ->
+                            stack.push(nestedInstance) // Добавляем вложенный instance в стек
+                        }
+
+                        if (instanceNesting != null) {
+                            traitsClasses += instanceNesting
+                        }
+                    }
+                }
+            }
+            methodsNames += instance.methods
+        }
+
+        val traitsSymbolsName = traitsClasses.distinct().mapNotNull { processElement(it, reference) }
+        val traitsSymbolName = methodsNames.mapNotNull { processElement(it, reference) }
+
+        return Pair(traitsSymbolsName,traitsSymbolName)
+    }
 }
diff --git a/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt b/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
index dde1186..fcab01d 100644
--- a/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
+++ b/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
@@ -224,8 +224,6 @@ class ModuliteDependenciesCollector(val project: Project) {
                             }else{
                                 return
                             }
-
-
                         }
 
                         is MethodReference, is ClassConstantReference -> {
@@ -316,7 +314,7 @@ class ModuliteDependenciesCollector(val project: Project) {
                         stack.push(instance) // Добавляем текущий instance в стек
                         while (stack.isNotEmpty()) {
                             val currentInstance = stack.pop() // Получаем текущий instance из стека
-
+                            traitsClasses+= currentInstance
                             if (currentInstance.hasTraitUses()) {
                                 val traitsUses = currentInstance.traits
                                 traitsClasses += traitsUses

From cbe0a2bddd7862c6420d9eb9982333357e5e9c1a Mon Sep 17 00:00:00 2001
From: Richardas Kuchinskas <r.kuchinskas@vk.team>
Date: Thu, 12 Oct 2023 18:02:29 +0300
Subject: [PATCH 07/17] added integration test for alone trait (not nesting)

---
 .../InternalSymbolUsageInspection.kt          |  4 ++--
 .../traitsNesting/Photos/Photo.php            |  2 +-
 .../Engines/LikesEngineTrait.php              | 13 ++++++++++++
 .../ExternalEngines/Tweets.php                |  9 +++++++++
 .../Photos/.modulite.yaml.expected            | 20 +++++++++++++++++++
 .../traitsOneNesting/Photos/Photo.php         | 11 ++++++++++
 .../CreateModulite/traitsOneNesting/index.php |  3 +++
 .../tests/integration/CreateModuliteTest.kt   | 19 ++++++++++++++++++
 8 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 src/test/fixtures/integration/CreateModulite/traitsOneNesting/Engines/LikesEngineTrait.php
 create mode 100644 src/test/fixtures/integration/CreateModulite/traitsOneNesting/ExternalEngines/Tweets.php
 create mode 100644 src/test/fixtures/integration/CreateModulite/traitsOneNesting/Photos/.modulite.yaml.expected
 create mode 100644 src/test/fixtures/integration/CreateModulite/traitsOneNesting/Photos/Photo.php
 create mode 100644 src/test/fixtures/integration/CreateModulite/traitsOneNesting/index.php

diff --git a/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt b/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
index e8c20dd..ca19dff 100644
--- a/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
+++ b/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
@@ -266,7 +266,7 @@ class InternalSymbolUsageInspection : LocalInspectionTool() {
                         restricted to $readableName, $refModulite is not required by ${context.modulite}
                     """.trimIndent()
                 } else if(symbolElement is PhpClass && symbolElement.isTrait){
-                    val (traits,methods) = checkTraitReferenceUsage(reference)
+                    val (traits,methods) = collectTraitReferenceUsage(reference)
 
                     quickFixes.add(AddSymbolToRequiresQuickFix(context.modulite!!, traits+methods))
 
@@ -301,7 +301,7 @@ class InternalSymbolUsageInspection : LocalInspectionTool() {
         )
     }
 
-    private fun checkTraitReferenceUsage(reference: PhpReference)
+    private fun collectTraitReferenceUsage(reference: PhpReference)
             :Pair<List<SymbolName>, List<SymbolName>>{
         val traitsClasses: MutableList<PhpClass> = arrayListOf()
         val methodsNames: MutableCollection<Method> = arrayListOf()
diff --git a/src/test/fixtures/integration/CreateModulite/traitsNesting/Photos/Photo.php b/src/test/fixtures/integration/CreateModulite/traitsNesting/Photos/Photo.php
index 824d40b..5d8ef88 100644
--- a/src/test/fixtures/integration/CreateModulite/traitsNesting/Photos/Photo.php
+++ b/src/test/fixtures/integration/CreateModulite/traitsNesting/Photos/Photo.php
@@ -7,6 +7,6 @@ class Photo {
 
   public static function printPhotoLikes() {
     self::print();
-      TestEngine::tester();
+    TestEngine::tester();
   }
 }
diff --git a/src/test/fixtures/integration/CreateModulite/traitsOneNesting/Engines/LikesEngineTrait.php b/src/test/fixtures/integration/CreateModulite/traitsOneNesting/Engines/LikesEngineTrait.php
new file mode 100644
index 0000000..8888aee
--- /dev/null
+++ b/src/test/fixtures/integration/CreateModulite/traitsOneNesting/Engines/LikesEngineTrait.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Engines;
+
+trait LikesEngineTrait {
+  public static function print(): void {
+    echo "like";
+  }
+
+  public static function printTweetsLikes(): void {
+    \ExternalEngines\Tweets::printTweetsLikesCountByUser();
+  }
+}
diff --git a/src/test/fixtures/integration/CreateModulite/traitsOneNesting/ExternalEngines/Tweets.php b/src/test/fixtures/integration/CreateModulite/traitsOneNesting/ExternalEngines/Tweets.php
new file mode 100644
index 0000000..2a20ed1
--- /dev/null
+++ b/src/test/fixtures/integration/CreateModulite/traitsOneNesting/ExternalEngines/Tweets.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace ExternalEngines;
+
+class Tweets {
+  public static function printTweetsLikesCountByUser() {
+    echo "ExternalEngines: tweets like for this user";
+  }
+}
diff --git a/src/test/fixtures/integration/CreateModulite/traitsOneNesting/Photos/.modulite.yaml.expected b/src/test/fixtures/integration/CreateModulite/traitsOneNesting/Photos/.modulite.yaml.expected
new file mode 100644
index 0000000..5bcd7e7
--- /dev/null
+++ b/src/test/fixtures/integration/CreateModulite/traitsOneNesting/Photos/.modulite.yaml.expected
@@ -0,0 +1,20 @@
+name: "@photos"
+description: ""
+namespace: "Photos\\"
+
+# "Public API" of the modulite: classes, functions, constants, etc.
+# Symbols not listed here will be internal.
+export:
+  - "Photo"
+
+# Class members to exclude, they override "export".
+force-internal:
+
+# Dependencies: other modulites, global classes, defines, etc.
+require:
+  - "\\Engines\\LikesEngineTrait"
+  - "\\Engines\\LikesEngineTrait::print()"
+  - "\\Engines\\LikesEngineTrait::printTweetsLikes()"
+
+# Granting partial access to internal symbols, "as an exception".
+allow-internal-access:
diff --git a/src/test/fixtures/integration/CreateModulite/traitsOneNesting/Photos/Photo.php b/src/test/fixtures/integration/CreateModulite/traitsOneNesting/Photos/Photo.php
new file mode 100644
index 0000000..297b101
--- /dev/null
+++ b/src/test/fixtures/integration/CreateModulite/traitsOneNesting/Photos/Photo.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Photos;
+
+class Photo {
+  use \Engines\LikesEngineTrait;
+
+  public static function printPhotoLikes() {
+    self::print();
+  }
+}
diff --git a/src/test/fixtures/integration/CreateModulite/traitsOneNesting/index.php b/src/test/fixtures/integration/CreateModulite/traitsOneNesting/index.php
new file mode 100644
index 0000000..8d1421b
--- /dev/null
+++ b/src/test/fixtures/integration/CreateModulite/traitsOneNesting/index.php
@@ -0,0 +1,3 @@
+<?php
+
+\Photos\Photo::printPhotoLikes();
diff --git a/src/test/kotlin/com/vk/modulite/tests/integration/CreateModuliteTest.kt b/src/test/kotlin/com/vk/modulite/tests/integration/CreateModuliteTest.kt
index be35018..46e8dae 100644
--- a/src/test/kotlin/com/vk/modulite/tests/integration/CreateModuliteTest.kt
+++ b/src/test/kotlin/com/vk/modulite/tests/integration/CreateModuliteTest.kt
@@ -153,5 +153,24 @@ class CreateModuliteTest : IntegrationTestBase() {
         }
     }
 
+    fun `test traits one nesting required `  () = integrationTest("traitsOneNesting"){
+        step("create modulite") {
+            createModuliteFromSource( "Photos") {
+                makeAllExported()
+            }
+        }
+
+        step("check modulite config") {
+            yaml("Photos/.modulite.yaml") {
+                check(".expected")
+            }
+        }
+
+        step("check highlights") {
+            enableInspections(InternalSymbolUsageInspection())
+            checkHighlights()
+        }
+    }
+
     override fun getTestDataPath() = "src/test/fixtures/integration/CreateModulite"
 }

From ecb2097cfde4705e123bafc878d66a677079dd02 Mon Sep 17 00:00:00 2001
From: Richardas Kuchinskas <r.kuchinskas@vk.team>
Date: Thu, 12 Oct 2023 19:24:08 +0300
Subject: [PATCH 08/17] moved test 006 to 101 because the bug is fixed and this
 is expected behavior

---
 .../101_known_bugs.php}                               | 11 ++++++-----
 .../Feed101}/.modulite.yaml                           |  2 +-
 .../Feed101}/PrivClass.php                            |  2 +-
 .../Feed101}/PrivTrait.php                            |  2 +-
 .../Feed101}/PubFeed.php                              |  2 +-
 .../kotlin/com/vk/modulite/tests/KphpGoldenTests.kt   |  4 ++--
 6 files changed, 12 insertions(+), 11 deletions(-)
 rename src/test/fixtures/kphp_golden/{006_known_bugs/006_known_bugs.php => 101_trait_in_module_internal/101_known_bugs.php} (64%)
 rename src/test/fixtures/kphp_golden/{006_known_bugs/Feed006 => 101_trait_in_module_internal/Feed101}/.modulite.yaml (73%)
 rename src/test/fixtures/kphp_golden/{006_known_bugs/Feed006 => 101_trait_in_module_internal/Feed101}/PrivClass.php (84%)
 rename src/test/fixtures/kphp_golden/{006_known_bugs/Feed006 => 101_trait_in_module_internal/Feed101}/PrivTrait.php (84%)
 rename src/test/fixtures/kphp_golden/{006_known_bugs/Feed006 => 101_trait_in_module_internal/Feed101}/PubFeed.php (91%)

diff --git a/src/test/fixtures/kphp_golden/006_known_bugs/006_known_bugs.php b/src/test/fixtures/kphp_golden/101_trait_in_module_internal/101_known_bugs.php
similarity index 64%
rename from src/test/fixtures/kphp_golden/006_known_bugs/006_known_bugs.php
rename to src/test/fixtures/kphp_golden/101_trait_in_module_internal/101_known_bugs.php
index ed1a591..481dcdd 100644
--- a/src/test/fixtures/kphp_golden/006_known_bugs/006_known_bugs.php
+++ b/src/test/fixtures/kphp_golden/101_trait_in_module_internal/101_known_bugs.php
@@ -5,15 +5,16 @@
 require_once 'kphp_tester_include.php';
 #endif
 
-// using internal trait works, because cloning trait methods works long before initing modulites in KPHP
-class MMM006 {
-    use Feed006\PrivTrait;
+class MMM101 {
+    use Feed101\PrivTrait;
+//      ^^^^^^^^^^^^^^^^^
+//      error: restricted to use Feed101\PrivTrait, it's internal in @feed
 }
-(new MMM006)->showThisClass();
+(new MMM101)->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
-Feed006\PubFeed::accessToPrivClass(function($impl) {        // function(PrivClass $impl) is erroneous
+Feed101\PubFeed::accessToPrivClass(function($impl) {        // function(PrivClass $impl) is erroneous
     $impl->myMethod();
 });
diff --git a/src/test/fixtures/kphp_golden/006_known_bugs/Feed006/.modulite.yaml b/src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/.modulite.yaml
similarity index 73%
rename from src/test/fixtures/kphp_golden/006_known_bugs/Feed006/.modulite.yaml
rename to src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/.modulite.yaml
index 8084ee3..1185b57 100644
--- a/src/test/fixtures/kphp_golden/006_known_bugs/Feed006/.modulite.yaml
+++ b/src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/.modulite.yaml
@@ -1,5 +1,5 @@
 name: "@feed"
-namespace: "\\Feed006"
+namespace: "\\Feed101"
 
 export:
   - "PubFeed"
diff --git a/src/test/fixtures/kphp_golden/006_known_bugs/Feed006/PrivClass.php b/src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/PrivClass.php
similarity index 84%
rename from src/test/fixtures/kphp_golden/006_known_bugs/Feed006/PrivClass.php
rename to src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/PrivClass.php
index cf5f4a9..015e603 100644
--- a/src/test/fixtures/kphp_golden/006_known_bugs/Feed006/PrivClass.php
+++ b/src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/PrivClass.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Feed006;
+namespace Feed101;
 
 class PrivClass {
     public function myMethod() {
diff --git a/src/test/fixtures/kphp_golden/006_known_bugs/Feed006/PrivTrait.php b/src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/PrivTrait.php
similarity index 84%
rename from src/test/fixtures/kphp_golden/006_known_bugs/Feed006/PrivTrait.php
rename to src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/PrivTrait.php
index b653eb3..22983b1 100644
--- a/src/test/fixtures/kphp_golden/006_known_bugs/Feed006/PrivTrait.php
+++ b/src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/PrivTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Feed006;
+namespace Feed101;
 
 trait PrivTrait {
     function showThisClass() {
diff --git a/src/test/fixtures/kphp_golden/006_known_bugs/Feed006/PubFeed.php b/src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/PubFeed.php
similarity index 91%
rename from src/test/fixtures/kphp_golden/006_known_bugs/Feed006/PubFeed.php
rename to src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/PubFeed.php
index 1eae8d7..534c8fc 100644
--- a/src/test/fixtures/kphp_golden/006_known_bugs/Feed006/PubFeed.php
+++ b/src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/PubFeed.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Feed006;
+namespace Feed101;
 
 class PubFeed {
     /**
diff --git a/src/test/kotlin/com/vk/modulite/tests/KphpGoldenTests.kt b/src/test/kotlin/com/vk/modulite/tests/KphpGoldenTests.kt
index d46eb0a..5d2b890 100644
--- a/src/test/kotlin/com/vk/modulite/tests/KphpGoldenTests.kt
+++ b/src/test/kotlin/com/vk/modulite/tests/KphpGoldenTests.kt
@@ -8,7 +8,6 @@ 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 +19,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 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")
 }

From 405e3ae96d9b9b9e0d5555da431710ad41e2ddd6 Mon Sep 17 00:00:00 2001
From: Richardas Kuchinskas <r.kuchinskas@vk.team>
Date: Fri, 20 Oct 2023 05:53:17 +0300
Subject: [PATCH 09/17] Rewrote logic for traits collecting and inspection

---
 .../InternalSymbolUsageInspection.kt          | 92 +++++++++++--------
 .../services/ModuliteDependenciesCollector.kt | 32 +------
 .../Photos/.modulite.yaml.expected            |  9 +-
 .../Photos/.modulite.yaml.expected            |  3 +-
 4 files changed, 59 insertions(+), 77 deletions(-)

diff --git a/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt b/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
index ca19dff..7778d1b 100644
--- a/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
+++ b/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
@@ -140,35 +140,9 @@ class InternalSymbolUsageInspection : LocalInspectionTool() {
 
             override fun visitPhpUse(expression: PhpUse?) {
                 val instance = expression as PhpUseImpl
-                if (instance.isTraitImport) {
-                    instance.targetReference?.let { checkTraitReferenceUsage(it) }
-                }
-            }
-
-            private fun checkTraitReferenceUsage(reference: PhpReference, problemElement: PsiElement? = reference){
-                val references = referenceValidator(reference) ?: return
-
-                val filteredReferences = references.filter {
-                    val file = it.containingFile.virtualFile
-                    !file.fromTests() && !file.fromStubs() && it !is PhpNamespace
-                }
 
-                val problemPsiElement = problemElement ?: reference
-                val context = ModuliteRestrictionChecker.createContext(reference)
-
-                filteredReferences.forEach { elem ->
-                    val instance = elem as PhpClass
-
-                    val (can, reason) = ModuliteRestrictionChecker.canUse(context, instance, reference)
-                    if (!can) {
-                        holder.addProblem(
-                            reason,
-                            instance,
-                            reference,
-                            context,
-                            problemPsiElement
-                        )
-                    }
+                if (instance.isTraitImport) {
+                   instance.targetReference?.let { checkReferenceUsage(it) }
                 }
             }
 
@@ -266,9 +240,8 @@ class InternalSymbolUsageInspection : LocalInspectionTool() {
                         restricted to $readableName, $refModulite is not required by ${context.modulite}
                     """.trimIndent()
                 } else if(symbolElement is PhpClass && symbolElement.isTrait){
-                    val (traits,methods) = collectTraitReferenceUsage(reference)
-
-                    quickFixes.add(AddSymbolToRequiresQuickFix(context.modulite!!, traits+methods))
+                    val (classes,methods) = collectTraitReferenceUsage(reference)
+                    quickFixes.add(AddSymbolToRequiresQuickFix(context.modulite!!, classes+methods))
 
                     """
                         restricted to $readableName, it's not required by ${context.modulite}
@@ -301,12 +274,52 @@ class InternalSymbolUsageInspection : LocalInspectionTool() {
         )
     }
 
+    private fun collectElements(element: PsiElement): Pair<MutableList<PhpClass>, MutableList<MethodImpl>> {
+        val classesToRequire: MutableList<PhpClass> = mutableListOf()
+        val methodsToRequire: MutableList<MethodImpl> = mutableListOf()
+
+        var child = element.firstChild
+
+        while (child != null) {
+            when (child) {
+                is Method -> methodsToRequire.add(child as MethodImpl)
+                is PhpClass -> classesToRequire.add(child)
+                is MethodReference -> {
+// Извлечь информацию о вызываемом методе
+                    val resolvedMethod = child.resolve()
+                    if (resolvedMethod is Method) {
+                        methodsToRequire.add(resolvedMethod as MethodImpl)
+                    }
+                }
+
+                is NewExpression -> {
+                    val classReference = child.classReference
+                    val resolvedClass = classReference?.resolve()
+                    if (resolvedClass is PhpClass) {
+                        classesToRequire.add(resolvedClass)
+                    }
+                }
+
+                else -> {
+// Рекурсивный вызов для дочерних элементов
+                    val (nestedClasses, nestedMethods) = collectElements(child)
+                    classesToRequire.addAll(nestedClasses)
+                    methodsToRequire.addAll(nestedMethods)
+                }
+            }
+
+            child = child.nextSibling
+        }
+
+        return Pair(classesToRequire, methodsToRequire)
+    }
+
     private fun collectTraitReferenceUsage(reference: PhpReference)
-            :Pair<List<SymbolName>, List<SymbolName>>{
+            : Pair<List<SymbolName>, List<SymbolName>> {
         val traitsClasses: MutableList<PhpClass> = arrayListOf()
         val methodsNames: MutableCollection<Method> = arrayListOf()
 
-        val references = referenceValidator(reference) ?: return Pair(listOf<SymbolName>(),listOf<SymbolName>())
+        val references = referenceValidator(reference) ?: return Pair(listOf<SymbolName>(), listOf<SymbolName>())
 
         val filteredReferences = references.filter {
             val file = it.containingFile.virtualFile
@@ -320,7 +333,7 @@ class InternalSymbolUsageInspection : LocalInspectionTool() {
             stack.push(instance) // Добавляем текущий instance в стек
             while (stack.isNotEmpty()) {
                 val currentInstance = stack.pop() // Получаем текущий instance из стека
-                traitsClasses+=currentInstance
+                traitsClasses += currentInstance
                 if (currentInstance.hasTraitUses()) {
                     val traitsUses = currentInstance.traits
                     traitsClasses += traitsUses
@@ -341,9 +354,16 @@ class InternalSymbolUsageInspection : LocalInspectionTool() {
             methodsNames += instance.methods
         }
 
+        val requireMethods: MutableList<MethodImpl> = mutableListOf()
+        methodsNames.forEach { it ->
+            val (classes, methods) = collectElements(it)
+            traitsClasses.addAll(classes)
+            requireMethods.addAll(methods)
+        }
+
         val traitsSymbolsName = traitsClasses.distinct().mapNotNull { processElement(it, reference) }
-        val traitsSymbolName = methodsNames.mapNotNull { processElement(it, reference) }
+        val traitsSymbolName = requireMethods.distinct().mapNotNull { processElement(it, reference) }
 
-        return Pair(traitsSymbolsName,traitsSymbolName)
+        return Pair(traitsSymbolsName, traitsSymbolName)
     }
 }
diff --git a/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt b/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
index fcab01d..35bfc3f 100644
--- a/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
+++ b/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
@@ -28,7 +28,6 @@ import com.vk.modulite.psi.extensions.php.symbolName
 import com.vk.modulite.utils.fromKphpPolyfills
 import com.vk.modulite.utils.fromStubs
 import com.vk.modulite.utils.fromTests
-import java.util.*
 
 class ModuliteDepsDiff(
     private val project: Project,
@@ -306,40 +305,11 @@ class ModuliteDependenciesCollector(val project: Project) {
                 private fun handleTraitReference(reference: PhpReference?, traverseFurther: Boolean = true) {
                     val references = referenceValidator(reference) ?: return
 
-                    val stack = LinkedList<PhpClass>() // Создаем стек для хранения вложенных instance
-                    var traitsClasses: Array<PhpClass> = arrayOf()
-
                     references.forEach { elem ->
                         val instance = elem as PhpClass
-                        stack.push(instance) // Добавляем текущий instance в стек
-                        while (stack.isNotEmpty()) {
-                            val currentInstance = stack.pop() // Получаем текущий instance из стека
-                            traitsClasses+= currentInstance
-                            if (currentInstance.hasTraitUses()) {
-                                val traitsUses = currentInstance.traits
-                                traitsClasses += traitsUses
-
-                                traitsUses.forEach { it ->
-                                    val instanceNesting: Array<PhpClass>? = it.traits
-
-                                    instanceNesting?.forEach { nestedInstance ->
-                                        stack.push(nestedInstance) // Добавляем вложенный instance в стек
-                                    }
-
-                                    if (instanceNesting != null) {
-                                        traitsClasses += instanceNesting
-                                    }
-                                }
-                            }
-                        }
-                        val traitsNames = traitsClasses.mapNotNull { processElement(it, reference) }
-                        addSymbols(traitsNames)
-                        val methodsNames = instance.methods.mapNotNull { processElement(it, reference) }
-                        addSymbols(methodsNames)
+                        visitPhpClass(instance)
                     }
 
-                    val names = references.mapNotNull { processElement(it, reference) }
-                    addSymbols(names)
                     if (traverseFurther) {
                         super.visitPhpElement(reference)
                     }
diff --git a/src/test/fixtures/integration/CreateModulite/traitsNesting/Photos/.modulite.yaml.expected b/src/test/fixtures/integration/CreateModulite/traitsNesting/Photos/.modulite.yaml.expected
index d67cc81..2028e66 100644
--- a/src/test/fixtures/integration/CreateModulite/traitsNesting/Photos/.modulite.yaml.expected
+++ b/src/test/fixtures/integration/CreateModulite/traitsNesting/Photos/.modulite.yaml.expected
@@ -16,15 +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()"
   - "\\Engines\\TestEngine::tester()"
-  - "\\Engines\\VideosEngineTrait::printVideosList()"
-  - "\\Engines\\VideosEngineTrait::videosList()"
+  - "\\ExternalEngines\\Tweets::printTweetsLikesCountByUser()"
 
 # Granting partial access to internal symbols, "as an exception".
 allow-internal-access:
diff --git a/src/test/fixtures/integration/CreateModulite/traitsOneNesting/Photos/.modulite.yaml.expected b/src/test/fixtures/integration/CreateModulite/traitsOneNesting/Photos/.modulite.yaml.expected
index 5bcd7e7..fdc8e91 100644
--- a/src/test/fixtures/integration/CreateModulite/traitsOneNesting/Photos/.modulite.yaml.expected
+++ b/src/test/fixtures/integration/CreateModulite/traitsOneNesting/Photos/.modulite.yaml.expected
@@ -13,8 +13,7 @@ force-internal:
 # Dependencies: other modulites, global classes, defines, etc.
 require:
   - "\\Engines\\LikesEngineTrait"
-  - "\\Engines\\LikesEngineTrait::print()"
-  - "\\Engines\\LikesEngineTrait::printTweetsLikes()"
+  - "\\ExternalEngines\\Tweets::printTweetsLikesCountByUser()"
 
 # Granting partial access to internal symbols, "as an exception".
 allow-internal-access:

From e89a3242ab37021630853b799565d3fe11e2bd80 Mon Sep 17 00:00:00 2001
From: Richardas Kuchinskas <r.kuchinskas@vk.team>
Date: Tue, 24 Oct 2023 17:52:46 +0300
Subject: [PATCH 10/17] fixed duplicate bug in trait inspection apply added new
 test from kphp moved

---
 .../InternalSymbolUsageInspection.kt          | 19 +++++++++++++------
 .../TraitsNesting/Photos/.modulite.yaml       | 11 +----------
 .../006_known_bugs.php}                       | 10 ++++------
 .../Feed006}/.modulite.yaml                   |  3 ++-
 .../Feed006}/PrivClass.php                    |  2 +-
 .../Feed006}/PrivTrait.php                    |  2 +-
 .../Feed006}/PubFeed.php                      |  2 +-
 .../101_trait_not_required.php                |  7 +++++++
 .../Engines101/LikesEngineTrait101.php        | 14 ++++++++++++++
 .../ExternalEngines101/Tweets101.php          |  9 +++++++++
 .../Photos101/.modulite.yaml                  | 17 +++++++++++++++++
 .../Photos101/Photo101.php                    | 12 ++++++++++++
 .../com/vk/modulite/tests/KphpGoldenTests.kt  |  4 +++-
 13 files changed, 85 insertions(+), 27 deletions(-)
 rename src/test/fixtures/kphp_golden/{101_trait_in_module_internal/101_known_bugs.php => 006_known_bugs/006_known_bugs.php} (64%)
 rename src/test/fixtures/kphp_golden/{101_trait_in_module_internal/Feed101 => 006_known_bugs/Feed006}/.modulite.yaml (62%)
 rename src/test/fixtures/kphp_golden/{101_trait_in_module_internal/Feed101 => 006_known_bugs/Feed006}/PrivClass.php (84%)
 rename src/test/fixtures/kphp_golden/{101_trait_in_module_internal/Feed101 => 006_known_bugs/Feed006}/PrivTrait.php (84%)
 rename src/test/fixtures/kphp_golden/{101_trait_in_module_internal/Feed101 => 006_known_bugs/Feed006}/PubFeed.php (91%)
 create mode 100644 src/test/fixtures/kphp_golden/101_trait_not_required/101_trait_not_required.php
 create mode 100644 src/test/fixtures/kphp_golden/101_trait_not_required/Engines101/LikesEngineTrait101.php
 create mode 100644 src/test/fixtures/kphp_golden/101_trait_not_required/ExternalEngines101/Tweets101.php
 create mode 100644 src/test/fixtures/kphp_golden/101_trait_not_required/Photos101/.modulite.yaml
 create mode 100644 src/test/fixtures/kphp_golden/101_trait_not_required/Photos101/Photo101.php

diff --git a/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt b/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
index 7778d1b..e700dc2 100644
--- a/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
+++ b/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)
     }
 }
diff --git a/src/test/fixtures/golden/TraitsNesting/Photos/.modulite.yaml b/src/test/fixtures/golden/TraitsNesting/Photos/.modulite.yaml
index beaf5ad..859bbe6 100644
--- a/src/test/fixtures/golden/TraitsNesting/Photos/.modulite.yaml
+++ b/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:
diff --git a/src/test/fixtures/kphp_golden/101_trait_in_module_internal/101_known_bugs.php b/src/test/fixtures/kphp_golden/006_known_bugs/006_known_bugs.php
similarity index 64%
rename from src/test/fixtures/kphp_golden/101_trait_in_module_internal/101_known_bugs.php
rename to src/test/fixtures/kphp_golden/006_known_bugs/006_known_bugs.php
index 481dcdd..15f6c07 100644
--- a/src/test/fixtures/kphp_golden/101_trait_in_module_internal/101_known_bugs.php
+++ b/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();
 });
diff --git a/src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/.modulite.yaml b/src/test/fixtures/kphp_golden/006_known_bugs/Feed006/.modulite.yaml
similarity index 62%
rename from src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/.modulite.yaml
rename to src/test/fixtures/kphp_golden/006_known_bugs/Feed006/.modulite.yaml
index 1185b57..9301cba 100644
--- a/src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/.modulite.yaml
+++ b/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:
 
diff --git a/src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/PrivClass.php b/src/test/fixtures/kphp_golden/006_known_bugs/Feed006/PrivClass.php
similarity index 84%
rename from src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/PrivClass.php
rename to src/test/fixtures/kphp_golden/006_known_bugs/Feed006/PrivClass.php
index 015e603..cf5f4a9 100644
--- a/src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/PrivClass.php
+++ b/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() {
diff --git a/src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/PrivTrait.php b/src/test/fixtures/kphp_golden/006_known_bugs/Feed006/PrivTrait.php
similarity index 84%
rename from src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/PrivTrait.php
rename to src/test/fixtures/kphp_golden/006_known_bugs/Feed006/PrivTrait.php
index 22983b1..b653eb3 100644
--- a/src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/PrivTrait.php
+++ b/src/test/fixtures/kphp_golden/006_known_bugs/Feed006/PrivTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Feed101;
+namespace Feed006;
 
 trait PrivTrait {
     function showThisClass() {
diff --git a/src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/PubFeed.php b/src/test/fixtures/kphp_golden/006_known_bugs/Feed006/PubFeed.php
similarity index 91%
rename from src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/PubFeed.php
rename to src/test/fixtures/kphp_golden/006_known_bugs/Feed006/PubFeed.php
index 534c8fc..1eae8d7 100644
--- a/src/test/fixtures/kphp_golden/101_trait_in_module_internal/Feed101/PubFeed.php
+++ b/src/test/fixtures/kphp_golden/006_known_bugs/Feed006/PubFeed.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Feed101;
+namespace Feed006;
 
 class PubFeed {
     /**
diff --git a/src/test/fixtures/kphp_golden/101_trait_not_required/101_trait_not_required.php b/src/test/fixtures/kphp_golden/101_trait_not_required/101_trait_not_required.php
new file mode 100644
index 0000000..6c5b429
--- /dev/null
+++ b/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();
diff --git a/src/test/fixtures/kphp_golden/101_trait_not_required/Engines101/LikesEngineTrait101.php b/src/test/fixtures/kphp_golden/101_trait_not_required/Engines101/LikesEngineTrait101.php
new file mode 100644
index 0000000..13b5005
--- /dev/null
+++ b/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();
+  }
+}
diff --git a/src/test/fixtures/kphp_golden/101_trait_not_required/ExternalEngines101/Tweets101.php b/src/test/fixtures/kphp_golden/101_trait_not_required/ExternalEngines101/Tweets101.php
new file mode 100644
index 0000000..34fd95f
--- /dev/null
+++ b/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";
+  }
+}
diff --git a/src/test/fixtures/kphp_golden/101_trait_not_required/Photos101/.modulite.yaml b/src/test/fixtures/kphp_golden/101_trait_not_required/Photos101/.modulite.yaml
new file mode 100644
index 0000000..306240e
--- /dev/null
+++ b/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:
diff --git a/src/test/fixtures/kphp_golden/101_trait_not_required/Photos101/Photo101.php b/src/test/fixtures/kphp_golden/101_trait_not_required/Photos101/Photo101.php
new file mode 100644
index 0000000..4dc9434
--- /dev/null
+++ b/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();
+  }
+}
diff --git a/src/test/kotlin/com/vk/modulite/tests/KphpGoldenTests.kt b/src/test/kotlin/com/vk/modulite/tests/KphpGoldenTests.kt
index 5d2b890..f79ae15 100644
--- a/src/test/kotlin/com/vk/modulite/tests/KphpGoldenTests.kt
+++ b/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")
+
 }

From 3d1cc3dc7ca75e5d0bedaf519ee546ffaee7fd97 Mon Sep 17 00:00:00 2001
From: Richardas Kuchinskas <r.kuchinskas@vk.team>
Date: Thu, 2 Nov 2023 15:39:33 +0300
Subject: [PATCH 11/17] rewrote collecting modulite dependencies logic for
 traits

---
 .../InternalSymbolUsageInspection.kt          |  6 +-
 .../services/ModuliteDependenciesCollector.kt | 90 +++++++++++++++++--
 2 files changed, 87 insertions(+), 9 deletions(-)

diff --git a/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt b/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
index e700dc2..d31baf1 100644
--- a/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
+++ b/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
@@ -275,7 +275,7 @@ context.modulite?.requires
         )
     }
 
-    private fun collectElements(element: PsiElement): Pair<MutableList<PhpClass>, MutableList<MethodImpl>> {
+    private fun collectTraitElements(element: PsiElement): Pair<MutableList<PhpClass>, MutableList<MethodImpl>> {
         val classesToRequire: MutableList<PhpClass> = mutableListOf()
         val methodsToRequire: MutableList<MethodImpl> = mutableListOf()
 
@@ -303,7 +303,7 @@ context.modulite?.requires
 
                 else -> {
 // Рекурсивный вызов для дочерних элементов
-                    val (nestedClasses, nestedMethods) = collectElements(child)
+                    val (nestedClasses, nestedMethods) = collectTraitElements(child)
                     classesToRequire.addAll(nestedClasses)
                     methodsToRequire.addAll(nestedMethods)
                 }
@@ -357,7 +357,7 @@ context.modulite?.requires
 
         val requireMethods: MutableList<MethodImpl> = mutableListOf()
         methodsNames.forEach { it ->
-            val (classes, methods) = collectElements(it)
+            val (classes, methods) = collectTraitElements(it)
             traitsClasses.addAll(classes)
             requireMethods.addAll(methods)
         }
diff --git a/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt b/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
index 35bfc3f..01350fa 100644
--- a/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
+++ b/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
@@ -28,6 +28,7 @@ import com.vk.modulite.psi.extensions.php.symbolName
 import com.vk.modulite.utils.fromKphpPolyfills
 import com.vk.modulite.utils.fromStubs
 import com.vk.modulite.utils.fromTests
+import java.util.*
 
 class ModuliteDepsDiff(
     private val project: Project,
@@ -291,7 +292,8 @@ class ModuliteDependenciesCollector(val project: Project) {
                 }
 
                 private fun referenceValidator(reference: PhpReference?): MutableCollection<out PhpNamedElement>? {
-                    if (reference == null) return null
+                    if (reference == null)
+                        return null
 
                     val references = reference.resolveGlobal(false)
                     if (references.isEmpty()) {
@@ -302,14 +304,93 @@ class ModuliteDependenciesCollector(val project: Project) {
                     return references
                 }
 
+                private fun collectTraitElements(element: PsiElement): Pair<MutableList<PhpClass>, MutableList<MethodImpl>> {
+                    val classesToRequire: MutableList<PhpClass> = mutableListOf()
+                    val methodsToRequire: MutableList<MethodImpl> = mutableListOf()
+
+                    var child = element.firstChild
+
+                    while (child != null) {
+                        when (child) {
+                            is Method -> methodsToRequire.add(child as MethodImpl)
+                            is PhpClass -> classesToRequire.add(child)
+                            is MethodReference -> {
+// Извлечь информацию о вызываемом методе
+                                val resolvedMethod = child.resolve()
+                                if (resolvedMethod is Method) {
+                                    methodsToRequire.add(resolvedMethod as MethodImpl)
+                                }
+                            }
+
+                            is NewExpression -> {
+                                val classReference = child.classReference
+                                val resolvedClass = classReference?.resolve()
+                                if (resolvedClass is PhpClass) {
+                                    classesToRequire.add(resolvedClass)
+                                }
+                            }
+
+                            else -> {
+// Рекурсивный вызов для дочерних элементов
+                                val (nestedClasses, nestedMethods) = collectTraitElements(child)
+                                classesToRequire.addAll(nestedClasses)
+                                methodsToRequire.addAll(nestedMethods)
+                            }
+                        }
+
+                        child = child.nextSibling
+                    }
+
+                    return Pair(classesToRequire, methodsToRequire)
+                }
+
                 private fun handleTraitReference(reference: PhpReference?, traverseFurther: Boolean = true) {
                     val references = referenceValidator(reference) ?: return
 
+                    val traitsClasses: MutableList<PhpClass> = arrayListOf()
+                    val methodsNames: MutableCollection<Method> = arrayListOf()
+
+                    val stack = LinkedList<PhpClass>() // Создаем стек для хранения вложенных instance
+
                     references.forEach { elem ->
                         val instance = elem as PhpClass
-                        visitPhpClass(instance)
+                        stack.push(instance) // Добавляем текущий instance в стек
+                        while (stack.isNotEmpty()) {
+                            val currentInstance = stack.pop() // Получаем текущий instance из стека
+                            traitsClasses += currentInstance
+                            if (currentInstance.hasTraitUses()) {
+                                val traitsUses = currentInstance.traits
+                                traitsClasses += traitsUses
+
+                                traitsUses.forEach { it ->
+                                    val instanceNesting: Array<PhpClass>? = it.traits
+
+                                    instanceNesting?.forEach { nestedInstance ->
+                                        stack.push(nestedInstance) // Добавляем вложенный instance в стек
+                                    }
+
+                                    if (instanceNesting != null) {
+                                        traitsClasses += instanceNesting
+                                    }
+                                }
+                            }
+                        }
+                        methodsNames += instance.methods
+                    }
+
+                    val requireMethods: MutableList<MethodImpl> = mutableListOf()
+                    methodsNames.forEach { it ->
+                        val (classes, methods) = collectTraitElements(it)
+                        traitsClasses.addAll(classes)
+                        requireMethods.addAll(methods)
                     }
 
+                    val traitsClassName = traitsClasses.distinct().mapNotNull { processElement(it, reference) }
+                    val traitsMethodsName = requireMethods.distinct().mapNotNull { processElement(it, reference) }
+
+                    addSymbols(traitsClassName)
+                    addSymbols(traitsMethodsName)
+
                     if (traverseFurther) {
                         super.visitPhpElement(reference)
                     }
@@ -366,10 +447,7 @@ class ModuliteDependenciesCollector(val project: Project) {
 
                 private fun addSymbol(name: SymbolName) {
                     // TODO: simplify?
-                    if (name.kind != SymbolName.Kind.Modulite && (ownSymbolsSet.contains(name) || ownSymbolsSet.contains(
-                            name.className()
-                        ))
-                    ) {
+                    if (name.kind != SymbolName.Kind.Modulite && (ownSymbolsSet.contains(name) || ownSymbolsSet.contains(name.className()))) {
                         return
                     }
 

From 0d67831ce03de163a14b37525d10198baad5449d Mon Sep 17 00:00:00 2001
From: Richardas Kuchinskas <r.kuchinskas@vk.team>
Date: Thu, 25 Jul 2024 02:45:38 +0300
Subject: [PATCH 12/17] fixed types from params, return

---
 .../services/ModuliteDependenciesCollector.kt | 75 ++++++++++++++++---
 1 file changed, 66 insertions(+), 9 deletions(-)

diff --git a/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt b/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
index 01350fa..889c0ac 100644
--- a/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
+++ b/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
@@ -8,6 +8,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiElement
 import com.intellij.util.containers.TreeNodeProcessingResult
+import com.jetbrains.php.PhpIndex
 import com.jetbrains.php.lang.PhpLangUtil
 import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocType
 import com.jetbrains.php.lang.psi.PhpFile
@@ -15,7 +16,9 @@ import com.jetbrains.php.lang.psi.elements.*
 import com.jetbrains.php.lang.psi.elements.impl.FieldImpl
 import com.jetbrains.php.lang.psi.elements.impl.FunctionImpl
 import com.jetbrains.php.lang.psi.elements.impl.MethodImpl
+import com.jetbrains.php.lang.psi.elements.impl.PhpDefineImpl
 import com.jetbrains.php.lang.psi.elements.impl.PhpUseImpl
+import com.jetbrains.php.lang.psi.resolve.types.PhpType
 import com.vk.modulite.Namespace
 import com.vk.modulite.SymbolName
 import com.vk.modulite.actions.dialogs.DepsRegenerationResultDialog
@@ -30,6 +33,7 @@ import com.vk.modulite.utils.fromStubs
 import com.vk.modulite.utils.fromTests
 import java.util.*
 
+
 class ModuliteDepsDiff(
     private val project: Project,
     private val firstModulite: Modulite?,
@@ -205,7 +209,7 @@ class ModuliteDependenciesCollector(val project: Project) {
         val moduliteConfig = dir.findChild(".modulite.yaml")
 
         dir.forEachFilesEx(project) { file ->
-            // Проверяем не отменил ои пользователь операцию.
+            // Проверяем не отменил ли пользователь операцию.
             ProgressManager.checkCanceled()
 
             if (isInnerModulite(file, moduliteConfig)) {
@@ -219,9 +223,9 @@ class ModuliteDependenciesCollector(val project: Project) {
                     when (reference.context) {
                         is PhpUse -> {
                             val useInstance = reference.context as PhpUseImpl
-                            if(useInstance.isTraitImport){
+                            if (useInstance.isTraitImport) {
                                 handleTraitReference(reference)
-                            }else{
+                            } else {
                                 return
                             }
                         }
@@ -304,9 +308,11 @@ class ModuliteDependenciesCollector(val project: Project) {
                     return references
                 }
 
-                private fun collectTraitElements(element: PsiElement): Pair<MutableList<PhpClass>, MutableList<MethodImpl>> {
-                    val classesToRequire: MutableList<PhpClass> = mutableListOf()
-                    val methodsToRequire: MutableList<MethodImpl> = mutableListOf()
+                private fun collectTraitElements(element: PsiElement): Triple<MutableSet<PhpClass>, MutableSet<MethodImpl>, MutableSet<PhpDefineImpl>> {
+                    val classesToRequire: MutableSet<PhpClass> = mutableSetOf()
+                    val methodsToRequire: MutableSet<MethodImpl> = mutableSetOf()
+                    val constantsToRequire: MutableSet<PhpDefineImpl> = mutableSetOf()
+                    val functionsToRequire: MutableSet<FunctionImpl> = mutableSetOf()
 
                     var child = element.firstChild
 
@@ -319,6 +325,38 @@ class ModuliteDependenciesCollector(val project: Project) {
                                 val resolvedMethod = child.resolve()
                                 if (resolvedMethod is Method) {
                                     methodsToRequire.add(resolvedMethod as MethodImpl)
+                                    if (!PhpType.isScalar(resolvedMethod.type, project)) {
+                                        val type = resolvedMethod.type.toString().substringAfterLast('\\')
+                                        val klass = PhpIndex.getInstance(project).getClassByName(type)
+                                        if (klass != null) {
+                                            classesToRequire.add(klass)
+                                        }
+                                    }
+
+                                    resolvedMethod.parameters.forEach { it ->
+                                        if (!PhpType.isScalar(it.type, project)) {
+                                            val type = it.type.toString().substringAfterLast('\\')
+                                            if (type.last() == ']') {
+                                                val t = type.dropLast(2)
+                                                val klass = PhpIndex.getInstance(project).getClassByName(t)
+                                                if (klass != null) {
+                                                    classesToRequire.add(klass)
+                                                }
+                                            } else {
+                                                val klass = PhpIndex.getInstance(project).getClassByName(type)
+                                                if (klass != null) {
+                                                    classesToRequire.add(klass)
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+
+                            is ConstantReference -> {
+                                val resolvedConstant = child.resolve()
+                                if (resolvedConstant is PhpDefineImpl) {
+                                    constantsToRequire.add(resolvedConstant)
                                 }
                             }
 
@@ -330,21 +368,36 @@ class ModuliteDependenciesCollector(val project: Project) {
                                 }
                             }
 
+                            is FunctionReference -> {
+                                val resolvedFunction = child.resolve()
+                                if(resolvedFunction is FunctionImpl){
+                                    functionsToRequire.add(resolvedFunction)
+                                }
+                            }
+
                             else -> {
 // Рекурсивный вызов для дочерних элементов
-                                val (nestedClasses, nestedMethods) = collectTraitElements(child)
+                                val (nestedClasses, nestedMethods, nestedConstants) = collectTraitElements(child)
                                 classesToRequire.addAll(nestedClasses)
                                 methodsToRequire.addAll(nestedMethods)
+                                constantsToRequire.addAll(nestedConstants)
                             }
                         }
 
                         child = child.nextSibling
                     }
 
-                    return Pair(classesToRequire, methodsToRequire)
+                    return Triple(classesToRequire, methodsToRequire, constantsToRequire)
                 }
 
                 private fun handleTraitReference(reference: PhpReference?, traverseFurther: Boolean = true) {
+                    data class TraitData(
+                        val traitsClasses: MutableList<PhpClass>,
+                        val requireMethods: MutableList<MethodImpl>,
+                        val requireConstants: MutableList<PhpDefineImpl>,
+                        val functionsToRequire: MutableSet<FunctionImpl>,
+                    )
+
                     val references = referenceValidator(reference) ?: return
 
                     val traitsClasses: MutableList<PhpClass> = arrayListOf()
@@ -379,17 +432,21 @@ class ModuliteDependenciesCollector(val project: Project) {
                     }
 
                     val requireMethods: MutableList<MethodImpl> = mutableListOf()
+                    val requireConstants: MutableList<PhpDefineImpl> = mutableListOf()
                     methodsNames.forEach { it ->
-                        val (classes, methods) = collectTraitElements(it)
+                        val (classes, methods, constants) = collectTraitElements(it)
                         traitsClasses.addAll(classes)
                         requireMethods.addAll(methods)
+                        requireConstants.addAll(constants)
                     }
 
                     val traitsClassName = traitsClasses.distinct().mapNotNull { processElement(it, reference) }
                     val traitsMethodsName = requireMethods.distinct().mapNotNull { processElement(it, reference) }
+                    val traitsConstantsName = requireConstants.distinct().mapNotNull { processElement(it, reference) }
 
                     addSymbols(traitsClassName)
                     addSymbols(traitsMethodsName)
+                    addSymbols(traitsConstantsName)
 
                     if (traverseFurther) {
                         super.visitPhpElement(reference)

From 3e81ffb8b05e0e3dc74a70f655b3b05dbcc0cce0 Mon Sep 17 00:00:00 2001
From: Richardas Kuchinskas <r.kuchinskas@vk.team>
Date: Thu, 25 Jul 2024 03:49:43 +0300
Subject: [PATCH 13/17] fixed type inference from parameters, added deep
 recursion

---
 .../services/ModuliteDependenciesCollector.kt | 134 +++++++++++++-----
 1 file changed, 95 insertions(+), 39 deletions(-)

diff --git a/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt b/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
index 889c0ac..bf22b24 100644
--- a/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
+++ b/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
@@ -192,6 +192,12 @@ class ModuliteDependenciesCollector(val project: Project) {
             .joinToString("\\")
         )
     }
+    data class TraitData(
+        val traitsClasses: MutableSet<PhpClass>,
+        val requireMethods: MutableSet<MethodImpl>,
+        val requireConstants: MutableSet<PhpDefineImpl>,
+        val functionsToRequire: MutableSet<FunctionImpl>,
+    )
 
     //  тут запускается наш сборщик
     fun collect(
@@ -308,7 +314,7 @@ class ModuliteDependenciesCollector(val project: Project) {
                     return references
                 }
 
-                private fun collectTraitElements(element: PsiElement): Triple<MutableSet<PhpClass>, MutableSet<MethodImpl>, MutableSet<PhpDefineImpl>> {
+                private fun collectTraitElements(element: PsiElement): TraitData {
                     val classesToRequire: MutableSet<PhpClass> = mutableSetOf()
                     val methodsToRequire: MutableSet<MethodImpl> = mutableSetOf()
                     val constantsToRequire: MutableSet<PhpDefineImpl> = mutableSetOf()
@@ -320,36 +326,12 @@ class ModuliteDependenciesCollector(val project: Project) {
                         when (child) {
                             is Method -> methodsToRequire.add(child as MethodImpl)
                             is PhpClass -> classesToRequire.add(child)
+
                             is MethodReference -> {
-// Извлечь информацию о вызываемом методе
                                 val resolvedMethod = child.resolve()
                                 if (resolvedMethod is Method) {
                                     methodsToRequire.add(resolvedMethod as MethodImpl)
-                                    if (!PhpType.isScalar(resolvedMethod.type, project)) {
-                                        val type = resolvedMethod.type.toString().substringAfterLast('\\')
-                                        val klass = PhpIndex.getInstance(project).getClassByName(type)
-                                        if (klass != null) {
-                                            classesToRequire.add(klass)
-                                        }
-                                    }
-
-                                    resolvedMethod.parameters.forEach { it ->
-                                        if (!PhpType.isScalar(it.type, project)) {
-                                            val type = it.type.toString().substringAfterLast('\\')
-                                            if (type.last() == ']') {
-                                                val t = type.dropLast(2)
-                                                val klass = PhpIndex.getInstance(project).getClassByName(t)
-                                                if (klass != null) {
-                                                    classesToRequire.add(klass)
-                                                }
-                                            } else {
-                                                val klass = PhpIndex.getInstance(project).getClassByName(type)
-                                                if (klass != null) {
-                                                    classesToRequire.add(klass)
-                                                }
-                                            }
-                                        }
-                                    }
+                                    processParameters(resolvedMethod.parameters, classesToRequire)
                                 }
                             }
 
@@ -366,38 +348,108 @@ class ModuliteDependenciesCollector(val project: Project) {
                                 if (resolvedClass is PhpClass) {
                                     classesToRequire.add(resolvedClass)
                                 }
+                                processArguments(
+                                    child.parameters,
+                                    classesToRequire,
+                                    methodsToRequire,
+                                    constantsToRequire,
+                                    functionsToRequire
+                                )
                             }
 
                             is FunctionReference -> {
                                 val resolvedFunction = child.resolve()
-                                if(resolvedFunction is FunctionImpl){
+                                if (resolvedFunction is FunctionImpl) {
                                     functionsToRequire.add(resolvedFunction)
+                                    processParameters(resolvedFunction.parameters, classesToRequire)
                                 }
                             }
 
+                            is ParameterList -> {
+                                processArguments(
+                                    child.parameters,
+                                    classesToRequire,
+                                    methodsToRequire,
+                                    constantsToRequire,
+                                    functionsToRequire
+                                )
+                            }
+
                             else -> {
-// Рекурсивный вызов для дочерних элементов
-                                val (nestedClasses, nestedMethods, nestedConstants) = collectTraitElements(child)
+                                val (nestedClasses, nestedMethods, nestedConstants, nestedFunctions) = collectTraitElements(
+                                    child
+                                )
                                 classesToRequire.addAll(nestedClasses)
                                 methodsToRequire.addAll(nestedMethods)
                                 constantsToRequire.addAll(nestedConstants)
+                                functionsToRequire.addAll(nestedFunctions)
                             }
                         }
 
                         child = child.nextSibling
                     }
 
-                    return Triple(classesToRequire, methodsToRequire, constantsToRequire)
+                    return TraitData(classesToRequire, methodsToRequire, constantsToRequire, functionsToRequire)
                 }
 
-                private fun handleTraitReference(reference: PhpReference?, traverseFurther: Boolean = true) {
-                    data class TraitData(
-                        val traitsClasses: MutableList<PhpClass>,
-                        val requireMethods: MutableList<MethodImpl>,
-                        val requireConstants: MutableList<PhpDefineImpl>,
-                        val functionsToRequire: MutableSet<FunctionImpl>,
-                    )
+                private fun processParameters(parameters: Array<Parameter>, classesToRequire: MutableSet<PhpClass>) {
+                    parameters.forEach { parameter ->
+                        if (!PhpType.isScalar(parameter.type, project)) {
+                            val type = parameter.type.toString().substringAfterLast('\\')
+                            if (type.last() == ']') {
+                                val klass = PhpIndex.getInstance(project).getClassByName(type.dropLast(2))
+                                if (klass != null) {
+                                    classesToRequire.add(klass)
+                                }
+                            } else {
+                                val klass = PhpIndex.getInstance(project).getClassByName(type)
+                                if (klass != null) {
+                                    classesToRequire.add(klass)
+                                }
+                            }
+                        }
+                    }
+                }
+
+                private fun processArguments(
+                    arguments: Array<PsiElement>,
+                    classesToRequire: MutableSet<PhpClass>,
+                    methodsToRequire: MutableSet<MethodImpl>,
+                    constantsToRequire: MutableSet<PhpDefineImpl>,
+                    functionsToRequire: MutableSet<FunctionImpl>
+                ) {
+                    arguments.forEach { argument ->
+                        if (argument is FunctionReference) {
+                            val resolvedFunction = argument.resolve()
+                            if (resolvedFunction is FunctionImpl) {
+                                functionsToRequire.add(resolvedFunction)
+                            }
+                        } else if (argument is NewExpression) {
+                            val classReference = argument.classReference
+                            val resolvedClass = classReference?.resolve()
+                            if (resolvedClass is PhpClass) {
+                                classesToRequire.add(resolvedClass)
+                            }
+                            processArguments(
+                                argument.parameters,
+                                classesToRequire,
+                                methodsToRequire,
+                                constantsToRequire,
+                                functionsToRequire
+                            )
+                        } else {
+                            val (nestedClasses, nestedMethods, nestedConstants, nestedFunctions) = collectTraitElements(
+                                argument
+                            )
+                            classesToRequire.addAll(nestedClasses)
+                            methodsToRequire.addAll(nestedMethods)
+                            constantsToRequire.addAll(nestedConstants)
+                            functionsToRequire.addAll(nestedFunctions)
+                        }
+                    }
+                }
 
+                private fun handleTraitReference(reference: PhpReference?, traverseFurther: Boolean = true) {
                     val references = referenceValidator(reference) ?: return
 
                     val traitsClasses: MutableList<PhpClass> = arrayListOf()
@@ -433,20 +485,24 @@ class ModuliteDependenciesCollector(val project: Project) {
 
                     val requireMethods: MutableList<MethodImpl> = mutableListOf()
                     val requireConstants: MutableList<PhpDefineImpl> = mutableListOf()
+                    val requireFunctions: MutableList<FunctionImpl> = mutableListOf()
                     methodsNames.forEach { it ->
-                        val (classes, methods, constants) = collectTraitElements(it)
+                        val (classes, methods, constants, functions) = collectTraitElements(it)
                         traitsClasses.addAll(classes)
                         requireMethods.addAll(methods)
                         requireConstants.addAll(constants)
+                        requireFunctions.addAll(functions)
                     }
 
                     val traitsClassName = traitsClasses.distinct().mapNotNull { processElement(it, reference) }
                     val traitsMethodsName = requireMethods.distinct().mapNotNull { processElement(it, reference) }
                     val traitsConstantsName = requireConstants.distinct().mapNotNull { processElement(it, reference) }
+                    val traitsFunctionsName = requireFunctions.distinct().mapNotNull { processElement(it, reference) }
 
                     addSymbols(traitsClassName)
                     addSymbols(traitsMethodsName)
                     addSymbols(traitsConstantsName)
+                    addSymbols(traitsFunctionsName)
 
                     if (traverseFurther) {
                         super.visitPhpElement(reference)

From e345caadc4d96f6f733d1d86abcc06e25d9fcc52 Mon Sep 17 00:00:00 2001
From: Richardas Kuchinskas <r.kuchinskas@vk.team>
Date: Fri, 26 Jul 2024 03:01:29 +0300
Subject: [PATCH 14/17] refactoring

---
 .../services/ModuliteDependenciesCollector.kt | 67 +++++++++----------
 1 file changed, 32 insertions(+), 35 deletions(-)

diff --git a/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt b/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
index bf22b24..a6de7f4 100644
--- a/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
+++ b/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
@@ -395,17 +395,12 @@ class ModuliteDependenciesCollector(val project: Project) {
                 private fun processParameters(parameters: Array<Parameter>, classesToRequire: MutableSet<PhpClass>) {
                     parameters.forEach { parameter ->
                         if (!PhpType.isScalar(parameter.type, project)) {
-                            val type = parameter.type.toString().substringAfterLast('\\')
-                            if (type.last() == ']') {
-                                val klass = PhpIndex.getInstance(project).getClassByName(type.dropLast(2))
-                                if (klass != null) {
-                                    classesToRequire.add(klass)
-                                }
-                            } else {
-                                val klass = PhpIndex.getInstance(project).getClassByName(type)
-                                if (klass != null) {
-                                    classesToRequire.add(klass)
-                                }
+                            var type = parameter.type.toString().substringAfterLast('\\')
+                            if (type.endsWith("[]")) {
+                                type = type.dropLast(2)
+                            }
+                            PhpIndex.getInstance(project).getClassByName(type)?.let { klass ->
+                                classesToRequire.add(klass)
                             }
                         }
                     }
@@ -419,32 +414,34 @@ class ModuliteDependenciesCollector(val project: Project) {
                     functionsToRequire: MutableSet<FunctionImpl>
                 ) {
                     arguments.forEach { argument ->
-                        if (argument is FunctionReference) {
-                            val resolvedFunction = argument.resolve()
-                            if (resolvedFunction is FunctionImpl) {
-                                functionsToRequire.add(resolvedFunction)
+                        when (argument) {
+                            is FunctionReference -> {
+                                val resolvedFunction = argument.resolve()
+                                if (resolvedFunction is FunctionImpl) {
+                                    functionsToRequire.add(resolvedFunction)
+                                }
                             }
-                        } else if (argument is NewExpression) {
-                            val classReference = argument.classReference
-                            val resolvedClass = classReference?.resolve()
-                            if (resolvedClass is PhpClass) {
-                                classesToRequire.add(resolvedClass)
+                            is NewExpression -> {
+                                argument.classReference?.resolve()?.let { resolvedClass ->
+                                    if (resolvedClass is PhpClass) {
+                                        classesToRequire.add(resolvedClass)
+                                    }
+                                }
+                                processArguments(
+                                    argument.parameters,
+                                    classesToRequire,
+                                    methodsToRequire,
+                                    constantsToRequire,
+                                    functionsToRequire
+                                )
+                            }
+                            else -> {
+                                val (nestedClasses, nestedMethods, nestedConstants, nestedFunctions) = collectTraitElements(argument)
+                                classesToRequire.addAll(nestedClasses)
+                                methodsToRequire.addAll(nestedMethods)
+                                constantsToRequire.addAll(nestedConstants)
+                                functionsToRequire.addAll(nestedFunctions)
                             }
-                            processArguments(
-                                argument.parameters,
-                                classesToRequire,
-                                methodsToRequire,
-                                constantsToRequire,
-                                functionsToRequire
-                            )
-                        } else {
-                            val (nestedClasses, nestedMethods, nestedConstants, nestedFunctions) = collectTraitElements(
-                                argument
-                            )
-                            classesToRequire.addAll(nestedClasses)
-                            methodsToRequire.addAll(nestedMethods)
-                            constantsToRequire.addAll(nestedConstants)
-                            functionsToRequire.addAll(nestedFunctions)
                         }
                     }
                 }

From d933bdf6bd94ca3105868b4621e33d10b7ff859b Mon Sep 17 00:00:00 2001
From: Richardas Kuchinskas <r.kuchinskas@vk.team>
Date: Fri, 26 Jul 2024 03:27:09 +0300
Subject: [PATCH 15/17] merged logic about trait in collector

---
 .../services/ModuliteDependenciesCollector.kt | 241 +++++++++---------
 1 file changed, 123 insertions(+), 118 deletions(-)

diff --git a/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt b/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
index a6de7f4..b98d5b7 100644
--- a/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
+++ b/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
@@ -192,12 +192,6 @@ class ModuliteDependenciesCollector(val project: Project) {
             .joinToString("\\")
         )
     }
-    data class TraitData(
-        val traitsClasses: MutableSet<PhpClass>,
-        val requireMethods: MutableSet<MethodImpl>,
-        val requireConstants: MutableSet<PhpDefineImpl>,
-        val functionsToRequire: MutableSet<FunctionImpl>,
-    )
 
     //  тут запускается наш сборщик
     fun collect(
@@ -314,139 +308,150 @@ class ModuliteDependenciesCollector(val project: Project) {
                     return references
                 }
 
-                private fun collectTraitElements(element: PsiElement): TraitData {
-                    val classesToRequire: MutableSet<PhpClass> = mutableSetOf()
-                    val methodsToRequire: MutableSet<MethodImpl> = mutableSetOf()
-                    val constantsToRequire: MutableSet<PhpDefineImpl> = mutableSetOf()
-                    val functionsToRequire: MutableSet<FunctionImpl> = mutableSetOf()
-
-                    var child = element.firstChild
-
-                    while (child != null) {
-                        when (child) {
-                            is Method -> methodsToRequire.add(child as MethodImpl)
-                            is PhpClass -> classesToRequire.add(child)
-
-                            is MethodReference -> {
-                                val resolvedMethod = child.resolve()
-                                if (resolvedMethod is Method) {
-                                    methodsToRequire.add(resolvedMethod as MethodImpl)
-                                    processParameters(resolvedMethod.parameters, classesToRequire)
+                private fun handleTraitReference(reference: PhpReference?, traverseFurther: Boolean = true) {
+                    data class TraitData(
+                        val traitsClasses: MutableSet<PhpClass>,
+                        val requireMethods: MutableSet<MethodImpl>,
+                        val requireConstants: MutableSet<PhpDefineImpl>,
+                        val functionsToRequire: MutableSet<FunctionImpl>,
+                    )
+
+                    fun collectTraitElements(element: PsiElement): TraitData {
+                        fun processParameters(parameters: Array<Parameter>, classesToRequire: MutableSet<PhpClass>) {
+                            parameters.forEach { parameter ->
+                                if (!PhpType.isScalar(parameter.type, project)) {
+                                    var type = parameter.type.toString().substringAfterLast('\\')
+                                    if (type.endsWith("[]")) {
+                                        type = type.dropLast(2)
+                                    }
+                                    PhpIndex.getInstance(project).getClassByName(type)?.let { klass ->
+                                        classesToRequire.add(klass)
+                                    }
                                 }
                             }
+                        }
 
-                            is ConstantReference -> {
-                                val resolvedConstant = child.resolve()
-                                if (resolvedConstant is PhpDefineImpl) {
-                                    constantsToRequire.add(resolvedConstant)
-                                }
-                            }
+                        fun processArguments(
+                            arguments: Array<PsiElement>,
+                            classesToRequire: MutableSet<PhpClass>,
+                            methodsToRequire: MutableSet<MethodImpl>,
+                            constantsToRequire: MutableSet<PhpDefineImpl>,
+                            functionsToRequire: MutableSet<FunctionImpl>
+                        ) {
+                            arguments.forEach { argument ->
+                                when (argument) {
+                                    is FunctionReference -> {
+                                        val resolvedFunction = argument.resolve()
+                                        if (resolvedFunction is FunctionImpl) {
+                                            functionsToRequire.add(resolvedFunction)
+                                        }
+                                    }
 
-                            is NewExpression -> {
-                                val classReference = child.classReference
-                                val resolvedClass = classReference?.resolve()
-                                if (resolvedClass is PhpClass) {
-                                    classesToRequire.add(resolvedClass)
-                                }
-                                processArguments(
-                                    child.parameters,
-                                    classesToRequire,
-                                    methodsToRequire,
-                                    constantsToRequire,
-                                    functionsToRequire
-                                )
-                            }
+                                    is NewExpression -> {
+                                        argument.classReference?.resolve()?.let { resolvedClass ->
+                                            if (resolvedClass is PhpClass) {
+                                                classesToRequire.add(resolvedClass)
+                                            }
+                                        }
+                                        processArguments(
+                                            argument.parameters,
+                                            classesToRequire,
+                                            methodsToRequire,
+                                            constantsToRequire,
+                                            functionsToRequire
+                                        )
+                                    }
 
-                            is FunctionReference -> {
-                                val resolvedFunction = child.resolve()
-                                if (resolvedFunction is FunctionImpl) {
-                                    functionsToRequire.add(resolvedFunction)
-                                    processParameters(resolvedFunction.parameters, classesToRequire)
+                                    else -> {
+                                        val (nestedClasses, nestedMethods, nestedConstants, nestedFunctions) = collectTraitElements(
+                                            argument
+                                        )
+                                        classesToRequire.addAll(nestedClasses)
+                                        methodsToRequire.addAll(nestedMethods)
+                                        constantsToRequire.addAll(nestedConstants)
+                                        functionsToRequire.addAll(nestedFunctions)
+                                    }
                                 }
                             }
-
-                            is ParameterList -> {
-                                processArguments(
-                                    child.parameters,
-                                    classesToRequire,
-                                    methodsToRequire,
-                                    constantsToRequire,
-                                    functionsToRequire
-                                )
-                            }
-
-                            else -> {
-                                val (nestedClasses, nestedMethods, nestedConstants, nestedFunctions) = collectTraitElements(
-                                    child
-                                )
-                                classesToRequire.addAll(nestedClasses)
-                                methodsToRequire.addAll(nestedMethods)
-                                constantsToRequire.addAll(nestedConstants)
-                                functionsToRequire.addAll(nestedFunctions)
-                            }
                         }
 
-                        child = child.nextSibling
-                    }
+                        val classesToRequire: MutableSet<PhpClass> = mutableSetOf()
+                        val methodsToRequire: MutableSet<MethodImpl> = mutableSetOf()
+                        val constantsToRequire: MutableSet<PhpDefineImpl> = mutableSetOf()
+                        val functionsToRequire: MutableSet<FunctionImpl> = mutableSetOf()
 
-                    return TraitData(classesToRequire, methodsToRequire, constantsToRequire, functionsToRequire)
-                }
+                        var child = element.firstChild
 
-                private fun processParameters(parameters: Array<Parameter>, classesToRequire: MutableSet<PhpClass>) {
-                    parameters.forEach { parameter ->
-                        if (!PhpType.isScalar(parameter.type, project)) {
-                            var type = parameter.type.toString().substringAfterLast('\\')
-                            if (type.endsWith("[]")) {
-                                type = type.dropLast(2)
-                            }
-                            PhpIndex.getInstance(project).getClassByName(type)?.let { klass ->
-                                classesToRequire.add(klass)
-                            }
-                        }
-                    }
-                }
+                        while (child != null) {
+                            when (child) {
+                                is Method -> methodsToRequire.add(child as MethodImpl)
+                                is PhpClass -> classesToRequire.add(child)
 
-                private fun processArguments(
-                    arguments: Array<PsiElement>,
-                    classesToRequire: MutableSet<PhpClass>,
-                    methodsToRequire: MutableSet<MethodImpl>,
-                    constantsToRequire: MutableSet<PhpDefineImpl>,
-                    functionsToRequire: MutableSet<FunctionImpl>
-                ) {
-                    arguments.forEach { argument ->
-                        when (argument) {
-                            is FunctionReference -> {
-                                val resolvedFunction = argument.resolve()
-                                if (resolvedFunction is FunctionImpl) {
-                                    functionsToRequire.add(resolvedFunction)
+                                is MethodReference -> {
+                                    val resolvedMethod = child.resolve()
+                                    if (resolvedMethod is Method) {
+                                        methodsToRequire.add(resolvedMethod as MethodImpl)
+                                        processParameters(resolvedMethod.parameters, classesToRequire)
+                                    }
                                 }
-                            }
-                            is NewExpression -> {
-                                argument.classReference?.resolve()?.let { resolvedClass ->
+
+                                is ConstantReference -> {
+                                    val resolvedConstant = child.resolve()
+                                    if (resolvedConstant is PhpDefineImpl) {
+                                        constantsToRequire.add(resolvedConstant)
+                                    }
+                                }
+
+                                is NewExpression -> {
+                                    val classReference = child.classReference
+                                    val resolvedClass = classReference?.resolve()
                                     if (resolvedClass is PhpClass) {
                                         classesToRequire.add(resolvedClass)
                                     }
+                                    processArguments(
+                                        child.parameters,
+                                        classesToRequire,
+                                        methodsToRequire,
+                                        constantsToRequire,
+                                        functionsToRequire
+                                    )
+                                }
+
+                                is FunctionReference -> {
+                                    val resolvedFunction = child.resolve()
+                                    if (resolvedFunction is FunctionImpl) {
+                                        functionsToRequire.add(resolvedFunction)
+                                        processParameters(resolvedFunction.parameters, classesToRequire)
+                                    }
+                                }
+
+                                is ParameterList -> {
+                                    processArguments(
+                                        child.parameters,
+                                        classesToRequire,
+                                        methodsToRequire,
+                                        constantsToRequire,
+                                        functionsToRequire
+                                    )
+                                }
+
+                                else -> {
+                                    val (nestedClasses, nestedMethods, nestedConstants, nestedFunctions) = collectTraitElements(
+                                        child
+                                    )
+                                    classesToRequire.addAll(nestedClasses)
+                                    methodsToRequire.addAll(nestedMethods)
+                                    constantsToRequire.addAll(nestedConstants)
+                                    functionsToRequire.addAll(nestedFunctions)
                                 }
-                                processArguments(
-                                    argument.parameters,
-                                    classesToRequire,
-                                    methodsToRequire,
-                                    constantsToRequire,
-                                    functionsToRequire
-                                )
-                            }
-                            else -> {
-                                val (nestedClasses, nestedMethods, nestedConstants, nestedFunctions) = collectTraitElements(argument)
-                                classesToRequire.addAll(nestedClasses)
-                                methodsToRequire.addAll(nestedMethods)
-                                constantsToRequire.addAll(nestedConstants)
-                                functionsToRequire.addAll(nestedFunctions)
                             }
+
+                            child = child.nextSibling
                         }
+
+                        return TraitData(classesToRequire, methodsToRequire, constantsToRequire, functionsToRequire)
                     }
-                }
 
-                private fun handleTraitReference(reference: PhpReference?, traverseFurther: Boolean = true) {
                     val references = referenceValidator(reference) ?: return
 
                     val traitsClasses: MutableList<PhpClass> = arrayListOf()

From c0c17c13407a80c6ddec3466d6abf1c42ea2b36f Mon Sep 17 00:00:00 2001
From: Richardas Kuchinskas <r.kuchinskas@vk.team>
Date: Fri, 26 Jul 2024 03:31:44 +0300
Subject: [PATCH 16/17] Expanded inspection logic

---
 .../InternalSymbolUsageInspection.kt          | 114 +++++++++++++-----
 1 file changed, 82 insertions(+), 32 deletions(-)

diff --git a/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt b/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
index d31baf1..a8e8100 100644
--- a/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
+++ b/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
@@ -275,48 +275,98 @@ context.modulite?.requires
         )
     }
 
-    private fun collectTraitElements(element: PsiElement): Pair<MutableList<PhpClass>, MutableList<MethodImpl>> {
-        val classesToRequire: MutableList<PhpClass> = mutableListOf()
-        val methodsToRequire: MutableList<MethodImpl> = mutableListOf()
-
-        var child = element.firstChild
-
-        while (child != null) {
-            when (child) {
-                is Method -> methodsToRequire.add(child as MethodImpl)
-                is PhpClass -> classesToRequire.add(child)
-                is MethodReference -> {
-// Извлечь информацию о вызываемом методе
-                    val resolvedMethod = child.resolve()
-                    if (resolvedMethod is Method) {
-                        methodsToRequire.add(resolvedMethod as MethodImpl)
+    private fun collectTraitReferenceUsage(reference: PhpReference, moduliteRequires: ModuliteRequires? = null)
+            : Pair<List<SymbolName>, List<SymbolName>> {
+        data class TraitData(
+            val traitsClasses: MutableSet<PhpClass>,
+            val requireMethods: MutableSet<MethodImpl>,
+        )
+
+        fun collectTraitElements(element: PsiElement): TraitData {
+            fun processArguments(
+                arguments: Array<PsiElement>,
+                classesToRequire: MutableSet<PhpClass>,
+                methodsToRequire: MutableSet<MethodImpl>,
+            ) {
+                arguments.forEach { argument ->
+                    when (argument) {
+                        is NewExpression -> {
+                            argument.classReference?.resolve()?.let { resolvedClass ->
+                                if (resolvedClass is PhpClass) {
+                                    classesToRequire.add(resolvedClass)
+                                }
+                            }
+                            processArguments(
+                                argument.parameters,
+                                classesToRequire,
+                                methodsToRequire,
+                            )
+                        }
+
+                        else -> {
+                            val (nestedClasses, nestedMethods) = collectTraitElements(
+                                argument
+                            )
+                            classesToRequire.addAll(nestedClasses)
+                            methodsToRequire.addAll(nestedMethods)
+                        }
                     }
                 }
+            }
 
-                is NewExpression -> {
-                    val classReference = child.classReference
-                    val resolvedClass = classReference?.resolve()
-                    if (resolvedClass is PhpClass) {
-                        classesToRequire.add(resolvedClass)
+            val classesToRequire: MutableSet<PhpClass> = mutableSetOf()
+            val methodsToRequire: MutableSet<MethodImpl> = mutableSetOf()
+
+            var child = element.firstChild
+
+            while (child != null) {
+                when (child) {
+                    is Method -> methodsToRequire.add(child as MethodImpl)
+                    is PhpClass -> classesToRequire.add(child)
+
+                    is MethodReference -> {
+                        val resolvedMethod = child.resolve()
+                        if (resolvedMethod is Method) {
+                            methodsToRequire.add(resolvedMethod as MethodImpl)
+                        }
                     }
-                }
 
-                else -> {
-// Рекурсивный вызов для дочерних элементов
-                    val (nestedClasses, nestedMethods) = collectTraitElements(child)
-                    classesToRequire.addAll(nestedClasses)
-                    methodsToRequire.addAll(nestedMethods)
+                    is NewExpression -> {
+                        val classReference = child.classReference
+                        val resolvedClass = classReference?.resolve()
+                        if (resolvedClass is PhpClass) {
+                            classesToRequire.add(resolvedClass)
+                        }
+                        processArguments(
+                            child.parameters,
+                            classesToRequire,
+                            methodsToRequire,
+                        )
+                    }
+
+                    is ParameterList -> {
+                        processArguments(
+                            child.parameters,
+                            classesToRequire,
+                            methodsToRequire,
+                        )
+                    }
+
+                    else -> {
+                        val (nestedClasses, nestedMethods) = collectTraitElements(
+                            child
+                        )
+                        classesToRequire.addAll(nestedClasses)
+                        methodsToRequire.addAll(nestedMethods)
+                    }
                 }
+
+                child = child.nextSibling
             }
 
-            child = child.nextSibling
+            return TraitData(classesToRequire, methodsToRequire)
         }
 
-        return Pair(classesToRequire, methodsToRequire)
-    }
-
-    private fun collectTraitReferenceUsage(reference: PhpReference, moduliteRequires : ModuliteRequires? = null)
-            : Pair<List<SymbolName>, List<SymbolName>> {
         val traitsClasses: MutableList<PhpClass> = arrayListOf()
         val methodsNames: MutableCollection<Method> = arrayListOf()
 

From e28dea1e09b65ab8655e73249100201f4f3dbee9 Mon Sep 17 00:00:00 2001
From: Richardas Kuchinskas <r.kuchinskas@vk.team>
Date: Sat, 24 Aug 2024 03:43:55 +0300
Subject: [PATCH 17/17] rewrote logic for using FileBaseIndexes

---
 .../com/vk/modulite/index/TraitsIndex.kt      |  48 +++++++++
 .../services/ModuliteDependenciesCollector.kt | 100 +++++++++++++-----
 .../com/vk/modulite/services/TraitIndex.kt    |  86 +++++++++++++++
 src/main/resources/META-INF/plugin.xml        |   1 +
 4 files changed, 206 insertions(+), 29 deletions(-)
 create mode 100644 src/main/kotlin/com/vk/modulite/index/TraitsIndex.kt
 create mode 100644 src/main/kotlin/com/vk/modulite/services/TraitIndex.kt

diff --git a/src/main/kotlin/com/vk/modulite/index/TraitsIndex.kt b/src/main/kotlin/com/vk/modulite/index/TraitsIndex.kt
new file mode 100644
index 0000000..61406e4
--- /dev/null
+++ b/src/main/kotlin/com/vk/modulite/index/TraitsIndex.kt
@@ -0,0 +1,48 @@
+package com.vk.modulite.index
+
+import com.intellij.openapi.components.Service
+import com.intellij.util.indexing.*
+import com.intellij.util.io.EnumeratorStringDescriptor
+import com.intellij.util.io.KeyDescriptor
+import com.jetbrains.php.lang.PhpFileType
+import com.jetbrains.php.lang.psi.PhpFile
+import com.jetbrains.php.lang.psi.elements.PhpClass
+import com.intellij.psi.util.PsiTreeUtil
+
+@Service(Service.Level.PROJECT)
+class TraitsIndex : FileBasedIndexExtension<String, String>() {
+    companion object {
+        val KEY = ID.create<String, String>("traits.index")
+    }
+
+    override fun getIndexer(): DataIndexer<String, String, FileContent> {
+        return DataIndexer { inputData ->
+            val map = mutableMapOf<String, String>()
+            val psiFile = inputData.psiFile
+
+            if (psiFile is PhpFile) {
+                val classes = PsiTreeUtil.findChildrenOfType(psiFile, PhpClass::class.java)
+                for (klass in classes) {
+                    if (klass.isTrait) {
+                        map[klass.fqn] = psiFile.virtualFile.path
+                    }
+                }
+            }
+            map
+        }
+    }
+
+    override fun getName(): ID<String, String> = KEY
+
+    override fun getKeyDescriptor(): KeyDescriptor<String> = EnumeratorStringDescriptor.INSTANCE
+
+    override fun getValueExternalizer(): EnumeratorStringDescriptor = EnumeratorStringDescriptor.INSTANCE
+
+    override fun getInputFilter(): FileBasedIndex.InputFilter {
+        return DefaultFileTypeSpecificInputFilter(PhpFileType.INSTANCE)
+    }
+
+    override fun dependsOnFileContent() = true
+
+    override fun getVersion(): Int = 1
+}
diff --git a/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt b/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
index f1938a0..5796387 100644
--- a/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
+++ b/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
@@ -13,11 +13,7 @@ import com.jetbrains.php.lang.PhpLangUtil
 import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocType
 import com.jetbrains.php.lang.psi.PhpFile
 import com.jetbrains.php.lang.psi.elements.*
-import com.jetbrains.php.lang.psi.elements.impl.FieldImpl
-import com.jetbrains.php.lang.psi.elements.impl.FunctionImpl
-import com.jetbrains.php.lang.psi.elements.impl.MethodImpl
-import com.jetbrains.php.lang.psi.elements.impl.PhpDefineImpl
-import com.jetbrains.php.lang.psi.elements.impl.PhpUseImpl
+import com.jetbrains.php.lang.psi.elements.impl.*
 import com.jetbrains.php.lang.psi.resolve.types.PhpType
 import com.vk.modulite.Namespace
 import com.vk.modulite.SymbolName
@@ -34,7 +30,6 @@ import com.vk.modulite.utils.fromStubs
 import com.vk.modulite.utils.fromTests
 import java.util.*
 
-
 class ModuliteDepsDiff(
     private val project: Project,
     private val firstModulite: Modulite?,
@@ -223,6 +218,10 @@ class ModuliteDependenciesCollector(val project: Project) {
                 override fun visitPhpClassReference(reference: ClassReference) {
                     when (reference.context) {
                         is PhpUse -> {
+                       /*     if (reference is ClassReferenceImpl) {
+                                handleReference(reference)
+                            }*/
+
                             val useInstance = reference.context as PhpUseImpl
                             if (useInstance.isTraitImport) {
                                 handleTraitReference(reference)
@@ -315,6 +314,7 @@ class ModuliteDependenciesCollector(val project: Project) {
                         val requireMethods: MutableSet<MethodImpl>,
                         val requireConstants: MutableSet<PhpDefineImpl>,
                         val functionsToRequire: MutableSet<FunctionImpl>,
+                    //    val classesToRequire: MutableSet<PhpClass>,
                     )
 
                     fun collectTraitElements(element: PsiElement): TraitData {
@@ -454,47 +454,88 @@ class ModuliteDependenciesCollector(val project: Project) {
                     }
 
                     val references = referenceValidator(reference) ?: return
-
-                    val traitsClasses: MutableList<PhpClass> = arrayListOf()
                     val methodsNames: MutableCollection<Method> = arrayListOf()
 
-                    val stack = LinkedList<PhpClass>() // Создаем стек для хранения вложенных instance
+
+                    val traitsClasses = mutableListOf<PhpClass>()
+                    val requireMethods: MutableList<MethodImpl> = mutableListOf()
+                    val requireConstants: MutableList<PhpDefineImpl> = mutableListOf()
+                    val requireFunctions: MutableList<FunctionImpl> = mutableListOf()
+                    val classesToRequire: MutableList<PhpClass> = mutableListOf()
 
                     references.forEach { elem ->
-                        val instance = elem as PhpClass
+                        val instance = elem as? PhpClass ?: return@forEach
+                        val stack = LinkedList<PhpClass>()
                         stack.push(instance) // Добавляем текущий instance в стек
+
+                        val traitService = TraitIndexService.getInstance(project)
+                        val seenMethods = mutableSetOf<String>() // Для отслеживания методов, которые уже были обработаны
+
                         while (stack.isNotEmpty()) {
                             val currentInstance = stack.pop() // Получаем текущий instance из стека
-                            traitsClasses += currentInstance
-                            if (currentInstance.hasTraitUses()) {
-                                val traitsUses = currentInstance.traits
-                                traitsClasses += traitsUses
+                            if (!traitsClasses.contains(currentInstance)) {
+                                traitsClasses.add(currentInstance)
 
-                                traitsUses.forEach { it ->
-                                    val instanceNesting: Array<PhpClass>? = it.traits
+                                // Получаем файл, содержащий этот класс
+                                val virtualFile = currentInstance.containingFile?.virtualFile ?: continue
 
-                                    instanceNesting?.forEach { nestedInstance ->
-                                        stack.push(nestedInstance) // Добавляем вложенный instance в стек
-                                    }
+                                // Получаем трейты, связанные с этим файлом в порядке их использования
+                                val traitsInOrder = traitService.getTraitsInFileOrder(virtualFile)
+
+                                traitsInOrder.forEach { trait ->
+                                    if (!traitsClasses.contains(trait)) {
+                                        traitsClasses.add(trait)
 
-                                    if (instanceNesting != null) {
-                                        traitsClasses += instanceNesting
+                                        // Рекурсивно обрабатываем вложенные трейты
+                                        val nestingTraits = traitService.getTraitsInFileOrder(trait.containingFile?.virtualFile ?: return@forEach)
+                                        nestingTraits.forEach { nestedTrait ->
+                                            if (!traitsClasses.contains(nestedTrait)) {
+                                                stack.push(nestedTrait)
+                                            }
+                                        }
                                     }
                                 }
                             }
                         }
-                        methodsNames += instance.methods
+
+                        // Обрабатываем методы в порядке их использования, учитывая приоритет
+                        val prioritizedMethods = mutableListOf<MethodImpl>()
+                        traitsClasses.forEach { trait ->
+                            //TODO: something wrong maybe here with priority  (standard method on [0])
+                            trait.methods.forEach { method ->
+                                if (method.name !in seenMethods) {
+                                    seenMethods.add(method.name)
+                                    prioritizedMethods.add(method as MethodImpl)
+                                }
+                            }
+                        }
+
+                        // Используем только приоритетные методы
+                        //TODO: recheck this one
+                        prioritizedMethods.forEach { method ->
+                            val (classes, methods, constants, functions) = collectTraitElements(method)
+
+                            // Добавляем только те трейты и методы, которые используются
+                            traitsClasses.addAll(classes)
+                            requireMethods.addAll(methods)
+                            requireConstants.addAll(constants)
+                            requireFunctions.addAll(functions)
+                        }
                     }
 
-                    val requireMethods: MutableList<MethodImpl> = mutableListOf()
-                    val requireConstants: MutableList<PhpDefineImpl> = mutableListOf()
-                    val requireFunctions: MutableList<FunctionImpl> = mutableListOf()
-                    methodsNames.forEach { it ->
-                        val (classes, methods, constants, functions) = collectTraitElements(it)
-                        traitsClasses.addAll(classes)
-                        requireMethods.addAll(methods)
+                    methodsNames.forEach { trait ->
+                        val (classes, methods, constants, functions) = collectTraitElements(trait)
+
+                        // Добавляем методы с учетом приоритета: если метод уже добавлен, новый игнорируется
+                        methods.forEach { method ->
+                            if (requireMethods.none { it.name == method.name }) {
+                                requireMethods.add(method)
+                            }
+                        }
+
                         requireConstants.addAll(constants)
                         requireFunctions.addAll(functions)
+                        classesToRequire.addAll(classes)
                     }
 
                     val traitsClassName = traitsClasses.distinct().mapNotNull { processElement(it, reference) }
@@ -512,6 +553,7 @@ class ModuliteDependenciesCollector(val project: Project) {
                     }
                 }
 
+
                 private fun handleReference(reference: PhpReference?, traverseFurther: Boolean = true) {
                     val references = referenceValidator(reference)?:return
 
diff --git a/src/main/kotlin/com/vk/modulite/services/TraitIndex.kt b/src/main/kotlin/com/vk/modulite/services/TraitIndex.kt
new file mode 100644
index 0000000..527394b
--- /dev/null
+++ b/src/main/kotlin/com/vk/modulite/services/TraitIndex.kt
@@ -0,0 +1,86 @@
+package com.vk.modulite.services
+
+import com.intellij.openapi.components.Service
+import com.intellij.openapi.components.service
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.psi.PsiManager
+import com.intellij.psi.search.GlobalSearchScope
+import com.intellij.psi.util.PsiTreeUtil
+import com.intellij.util.indexing.FileBasedIndex
+import com.vk.modulite.index.TraitsIndex
+import com.jetbrains.php.lang.psi.PhpFile
+import com.jetbrains.php.lang.psi.elements.PhpClass
+import com.jetbrains.php.lang.psi.elements.PhpNamespace
+import com.jetbrains.php.lang.psi.elements.PhpReference
+import com.jetbrains.php.lang.psi.elements.PhpUse
+import com.jetbrains.php.lang.psi.elements.impl.PhpUseImpl
+
+@Service(Service.Level.PROJECT)
+class TraitIndexService(private val project: Project) {
+
+    companion object {
+        fun getInstance(project: Project): TraitIndexService {
+            return project.service()
+        }
+    }
+
+    fun findTraitsByName(name: String): List<PhpClass> {
+        val allScope = GlobalSearchScope.allScope(project)
+        val traitFiles = FileBasedIndex.getInstance().getContainingFiles(TraitsIndex.KEY, name, allScope)
+        val traits = mutableListOf<PhpClass>()
+
+        traitFiles.forEach { file ->
+            val psiFile = PsiManager.getInstance(project).findFile(file) as? PhpFile
+            psiFile?.let {
+                val classes = PsiTreeUtil.findChildrenOfType(it, PhpClass::class.java)
+                classes.filter { klass -> klass.isTrait && klass.fqn == name }
+                    .forEach { trait -> traits.add(trait) }
+            }
+        }
+
+        return traits
+    }
+
+    fun getAllTraits(): List<PhpClass> {
+        val allScope = GlobalSearchScope.allScope(project)
+        val allKeys = FileBasedIndex.getInstance().getAllKeys(TraitsIndex.KEY, project)
+        val traits = mutableListOf<PhpClass>()
+
+        allKeys.forEach { key ->
+            traits.addAll(findTraitsByName(key))
+        }
+
+        return traits
+    }
+
+    fun findTraitByFile(file: VirtualFile): PhpClass? {
+        val psiFile = PsiManager.getInstance(project).findFile(file) as? PhpFile
+        psiFile?.let {
+            val classes = PsiTreeUtil.findChildrenOfType(it, PhpClass::class.java)
+            return classes.firstOrNull { klass -> klass.isTrait }
+        }
+        return null
+    }
+
+    fun getTraitsInFileOrder(file: VirtualFile): List<PhpClass> {
+        val psiFile = PsiManager.getInstance(project).findFile(file) as? PhpFile ?: return emptyList()
+        val traits = mutableListOf<PhpClass>()
+
+        // Находим все use-операторы в файле
+        val useStatements = PsiTreeUtil.findChildrenOfType(psiFile, PhpUse::class.java)
+
+        useStatements.forEach { useStatement ->
+            useStatement.children.forEach { child ->
+                if (child is PhpReference) {
+                    val resolvedTrait = child.resolve() as? PhpClass
+                    if (resolvedTrait != null && resolvedTrait.isTrait) {
+                        traits.add(resolvedTrait)
+                    }
+                }
+            }
+        }
+
+        return traits
+    }
+}
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 67e73dd..1765fef 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -149,6 +149,7 @@
 
     <fileBasedIndex implementation="com.vk.modulite.index.ModuliteFilesIndex"/>
     <fileBasedIndex implementation="com.vk.modulite.index.ComposerFilesIndex"/>
+    <fileBasedIndex implementation="com.vk.modulite.index.TraitsIndex"/>
 
     <iconProvider implementation="com.vk.modulite.view.ModuliteIconProvider"/>