feat: support new attributes

Author: xepozz

src/main/kotlin/com/github/xepozz/testo/TestoClasses.kt

@@ -1,10 +1,17 @@
 package com.github.xepozz.testo
 
 object TestoClasses {
-    const val TEST = "\\Testo\\Attribute\\Test"
-    const val TEST_INLINE = "\\Testo\\Sample\\TestInline"
-    const val DATA_PROVIDER = "\\Testo\\Sample\\DataProvider"
-    const val DATA_SET = "\\Testo\\Sample\\DataSet"
+    const val TEST_OLD = "\\Testo\\Attribute\\Test"
+    const val TEST_NEW = "\\Testo\\Application\\Attribute\\Test"
+    const val TEST_INLINE_OLD = "\\Testo\\Sample\\TestInline"
+    const val DATA_PROVIDER_OLD = "\\Testo\\Sample\\DataProvider"
+    const val DATA_SET_OLD = "\\Testo\\Sample\\DataSet"
+    const val TEST_INLINE_NEW = "\\Testo\\Inline\\TestInline"
+    const val DATA_PROVIDER_NEW = "\\Testo\\Data\\DataProvider"
+    const val DATA_SET_NEW = "\\Testo\\Data\\DataSet"
+    const val DATA_UNION = "\\Testo\\Data\\DataUnion"
+    const val DATA_CROSS = "\\Testo\\Data\\DataCross"
+    const val DATA_ZIP = "\\Testo\\Data\\DataZip"
 
     const val ASSERT = "\\Testo\\Assert"
     const val ASSERTION_EXCEPTION = "\\Testo\\Assert\\State\\Assertion\\AssertionException"

src/main/kotlin/com/github/xepozz/testo/mixin.kt

@@ -13,12 +13,12 @@ import com.jetbrains.php.lang.psi.elements.PhpClass
 fun PsiElement.isTestoExecutable() = isTestoFunction() || isTestoMethod()
 
 fun PsiElement.isTestoFunction() = when(this) {
-    is Function -> hasAnyAttribute(TestoClasses.TEST, TestoClasses.TEST_INLINE)
+    is Function -> hasAnyAttribute(TestoClasses.TEST_OLD,TestoClasses.TEST_NEW, TestoClasses.TEST_INLINE_NEW, TestoClasses.TEST_INLINE_OLD)
     else -> false
 }
 
 fun PsiElement.isTestoMethod() = when(this) {
-    is Method -> (modifier.isPublic && name.startsWith("test")) || hasAnyAttribute(TestoClasses.TEST, TestoClasses.TEST_INLINE)
+    is Method -> (modifier.isPublic && name.startsWith("test")) || hasAnyAttribute(TestoClasses.TEST_OLD,TestoClasses.TEST_NEW, TestoClasses.TEST_INLINE_NEW, TestoClasses.TEST_INLINE_OLD)
     else -> false
 }
 

src/main/kotlin/com/github/xepozz/testo/tests/TestoTestRunLineMarkerProvider.kt

@@ -86,9 +86,15 @@ class TestoTestRunLineMarkerProvider : RunLineMarkerContributor() {
 
     companion object Companion {
         val RUNNABLE_ATTRIBUTES = arrayOf(
-            TestoClasses.DATA_PROVIDER,
-            TestoClasses.DATA_SET,
-            TestoClasses.TEST_INLINE,
+            TestoClasses.DATA_PROVIDER_OLD,
+            TestoClasses.DATA_PROVIDER_NEW,
+            TestoClasses.DATA_SET_OLD,
+            TestoClasses.DATA_SET_NEW,
+            TestoClasses.DATA_UNION,
+            TestoClasses.DATA_CROSS,
+            TestoClasses.DATA_ZIP,
+            TestoClasses.TEST_INLINE_OLD,
+            TestoClasses.TEST_INLINE_NEW,
         )
 
         fun getLocationHint(element: Function) = when (element) {

src/main/kotlin/com/github/xepozz/testo/util/PsiUtil.kt

@@ -7,15 +7,18 @@ import com.jetbrains.php.lang.psi.elements.PhpAttribute
 import com.jetbrains.php.lang.psi.elements.PhpAttributesOwner
 
 object PsiUtil {
-    val DATA_PROVIDER_ATTRIBUTES = arrayOf(
-        TestoClasses.DATA_PROVIDER,
-        TestoClasses.DATA_SET,
-    )
     val MEANINGFUL_ATTRIBUTES = arrayOf(
-        TestoClasses.TEST,
-        TestoClasses.TEST_INLINE,
-        TestoClasses.DATA_PROVIDER,
-        TestoClasses.DATA_SET,
+        TestoClasses.TEST_OLD,
+        TestoClasses.TEST_NEW,
+        TestoClasses.TEST_INLINE_OLD,
+        TestoClasses.TEST_INLINE_NEW,
+        TestoClasses.DATA_PROVIDER_OLD,
+        TestoClasses.DATA_PROVIDER_NEW,
+        TestoClasses.DATA_SET_OLD,
+        TestoClasses.DATA_SET_NEW,
+        TestoClasses.DATA_UNION,
+        TestoClasses.DATA_CROSS,
+        TestoClasses.DATA_ZIP,
     )
 
     fun getAttributeOrder(attribute: PhpAttribute, owner: PhpAttributesOwner): Int = owner