fix imports

DataDog · Jan 22, 2025 · 4ba0a8f · 4ba0a8f
1 parent 93065f1
commit 4ba0a8f
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 21 deletions.
diff --git a/tests/Frameworks/Nette/Version_3_1/composer.json b/tests/Frameworks/Nette/Version_3_1/composer.json
@@ -25,7 +25,7 @@
         "nette/robot-loader": "^3.1",
         "nette/security": "^3.1",
         "nette/utils": "^3.1",
-        "latte/latte": "^3.0",
+        "latte/latte": "^2.9",
         "tracy/tracy": "^2.8"
     },
     "require-dev": {

diff --git a/tests/Integrations/Memcache/MemcacheTest.php b/tests/Integrations/Memcache/MemcacheTest.php
@@ -2,7 +2,6 @@
 
 namespace DDTrace\Tests\Integrations\Memcache;
 
-use DDTrace\Integrations\SpanTaxonomy;
 use DDTrace\Tag;
 use DDTrace\Tests\Common\IntegrationTestCase;
 use DDTrace\Tests\Common\SpanAssertion;

diff --git a/tests/Integrations/Memcached/MemcachedTest.php b/tests/Integrations/Memcached/MemcachedTest.php
@@ -2,7 +2,6 @@
 
 namespace DDTrace\Tests\Integrations\Memcached;
 
-use DDTrace\Integrations\SpanTaxonomy;
 use DDTrace\Tag;
 use DDTrace\Tests\Common\IntegrationTestCase;
 use DDTrace\Tests\Common\SpanAssertion;

diff --git a/tests/Integrations/MongoDB/Latest/MongoDBTest.php b/tests/Integrations/MongoDB/Latest/MongoDBTest.php
@@ -2,27 +2,15 @@
 
 namespace DDTrace\Tests\Integrations\Mongo\Latest;
 
-use DDTrace\Integrations\SpanTaxonomy;
 use DDTrace\Tag;
 use DDTrace\Tests\Common\IntegrationTestCase;
 use DDTrace\Tests\Common\SpanAssertion;
+use DDTrace\Tests\Integrations\Mongo\Utils\AnObject;
+use DDTrace\Tests\Integrations\Mongo\Utils\AQuery;
 use Exception;
 use MongoDB\Client;
 use stdClass;
 
-class AQuery
-{
-    public $brand;
-
-    public function __construct($brand = 'ferrari')
-    {
-        $this->brand = $brand;
-    }
-}
-
-class AnObject
-{
-}
 
 class MongoDBTest extends IntegrationTestCase
 {

diff --git a/tests/Integrations/MongoDB/Utils.php b/tests/Integrations/MongoDB/Utils.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace DDTrace\Tests\Integrations\Mongo\Utils;
+
+class AQuery
+{
+    public $brand;
+
+    public function __construct($brand = 'ferrari')
+    {
+        $this->brand = $brand;
+    }
+}
+
+class AnObject
+{
+}
diff --git a/tests/Integrations/MongoDB/V1_x/MongoDBTest.php b/tests/Integrations/MongoDB/V1_x/MongoDBTest.php
@@ -2,8 +2,6 @@
 
 namespace DDTrace\Tests\Integrations\Mongo\V1_x;
 
-include __DIR__ . '/../Latest/MongoDBTest.php';
-
 class MongoDBTest extends \DDTrace\Tests\Integrations\Mongo\Latest\MongoDBTest
 {
     //

diff --git a/...ntegrations/Yii/Latest/YiiDetailsTest.php → ...st/LazyLoadingIntegrationsFromYiiTest.php b/...ntegrations/Yii/Latest/YiiDetailsTest.php → ...st/LazyLoadingIntegrationsFromYiiTest.php
diff --git a/...tegrations/Yii/V2_0_49/YiiDetailsTest.php → ...49/LazyLoadingIntegrationsFromYiiTest.php b/...tegrations/Yii/V2_0_49/YiiDetailsTest.php → ...49/LazyLoadingIntegrationsFromYiiTest.php
@@ -2,8 +2,6 @@
 
 namespace DDTrace\Tests\Integrations\Yii\V2_0_49;
 
-include __DIR__ . '/../Latest/YiiDetailsTest.php';
-
 class LazyLoadingIntegrationsFromYiiTest extends \DDTrace\Tests\Integrations\Yii\Latest\LazyLoadingIntegrationsFromYiiTest
 {
     public static function getAppIndexScript()
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,8 +2,6 @@ @@
     namespace DDTrace\Tests\Integrations\Mongo\V1_x;
-    include __DIR__ . '/../Latest/MongoDBTest.php';
     class MongoDBTest extends \DDTrace\Tests\Integrations\Mongo\Latest\MongoDBTest
     {
         //
@@ Expand Down @@