test: change functional application psr-4 namespace

FriendsOfOpenTelemetry · Jan 17, 2025 · 851252a · 851252a
1 parent 376df6b
commit 851252a
Show file tree

Hide file tree

Showing 34 changed files with 64 additions and 65 deletions.
diff --git a/composer.json b/composer.json
@@ -104,9 +104,9 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "FriendsOfOpenTelemetry\\OpenTelemetryBundle\\Tests\\": "tests/",
-            "FriendsOfOpenTelemetry\\OpenTelemetryBundle\\Tests\\Functional\\Application\\": "tests/Functional/Application/src",
-            "FriendsOfOpenTelemetry\\OpenTelemetryBundle\\Tests\\Functional\\Application\\Migrations\\": "tests/Functional/Application/migrations"
+            "App\\": "tests/Functional/Application/src",
+            "App\\Migrations\\": "tests/Functional/Application/migrations",
+            "FriendsOfOpenTelemetry\\OpenTelemetryBundle\\Tests\\": "tests/"
         }
     },
     "config": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -5,7 +5,6 @@
     executionOrder="depends,defects"
     beStrictAboutOutputDuringTests="true"
     failOnRisky="true"
-    failOnWarning="false"
     cacheDirectory=".phpunit.cache"
 >
 

diff --git a/tests/Functional/Application/bin/console b/tests/Functional/Application/bin/console
@@ -2,7 +2,7 @@
 
 <?php
 
-use FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Kernel;
+use App\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 
 

diff --git a/tests/Functional/Application/config/packages/doctrine.yaml b/tests/Functional/Application/config/packages/doctrine.yaml
@@ -18,9 +18,9 @@ doctrine:
     controller_resolver:
       auto_mapping: false
     mappings:
-      FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Application:
+      App:
         type: attribute
         is_bundle: false
         dir: '%kernel.project_dir%/src/Entity'
-        prefix: 'FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Entity'
-        alias: FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application
+        prefix: 'App\Entity'
+        alias: App
diff --git a/tests/Functional/Application/config/packages/doctrine_migrations.yaml b/tests/Functional/Application/config/packages/doctrine_migrations.yaml
@@ -1,4 +1,4 @@
 doctrine_migrations:
   migrations_paths:
-    'FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Migrations': '%kernel.project_dir%/migrations'
+    'App\Migrations': '%kernel.project_dir%/migrations'
   enable_profiler: false
diff --git a/tests/Functional/Application/config/packages/framework.yaml b/tests/Functional/Application/config/packages/framework.yaml
@@ -13,7 +13,7 @@ framework:
     transports:
       main: 'trace(in-memory://default)'
     routing:
-      'FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Message\*': main
+      'App\Message\*': main
     buses:
       messenger.bus.default:
         middleware:

diff --git a/tests/Functional/Application/config/packages/open_telemetry.yaml b/tests/Functional/Application/config/packages/open_telemetry.yaml
@@ -1,7 +1,7 @@
 open_telemetry:
   service:
     namespace: 'FriendsOfOpenTelemetry/OpenTelemetry'
-    name: 'Test'
+    name: 'App'
     version: '0.0.0'
     environment: test
   instrumentation:

diff --git a/tests/Functional/Application/config/routes.yaml b/tests/Functional/Application/config/routes.yaml
@@ -1,5 +1,5 @@
 controllers:
   resource:
     path: '../src/Controller/'
-    namespace: FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Controller
+    namespace: App\Controller
   type: attribute
diff --git a/tests/Functional/Application/config/services.yaml b/tests/Functional/Application/config/services.yaml
@@ -2,7 +2,7 @@ services:
   _defaults:
     autowire: true
     autoconfigure: true
-  FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\:
+  App\:
     resource: '../src/'
     exclude:
       - '../src/Entity/'

diff --git a/tests/Functional/Application/migrations/Version20240229075814.php b/tests/Functional/Application/migrations/Version20240229075814.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\migrations;
+namespace App\migrations;
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;

diff --git a/tests/Functional/Application/src/Command/FallbackCommand.php b/tests/Functional/Application/src/Command/FallbackCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Command;
+namespace App\Command;
 
 use FriendsOfOpenTelemetry\OpenTelemetryBundle\Instrumentation\Attribute\Traceable;
 use Symfony\Component\Console\Attribute\AsCommand;

diff --git a/tests/Functional/Application/src/Command/TraceableCommand.php b/tests/Functional/Application/src/Command/TraceableCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Command;
+namespace App\Command;
 
 use FriendsOfOpenTelemetry\OpenTelemetryBundle\Instrumentation\Attribute\Traceable;
 use Symfony\Component\Console\Attribute\AsCommand;

diff --git a/tests/Functional/Application/src/Controller/ActionTraceableController.php b/tests/Functional/Application/src/Controller/ActionTraceableController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Controller;
+namespace App\Controller;
 
+use App\Entity\Dummy;
 use Doctrine\ORM\EntityManagerInterface;
 use FriendsOfOpenTelemetry\OpenTelemetryBundle\Instrumentation\Attribute\Traceable;
-use FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Entity\Dummy;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;

diff --git a/tests/Functional/Application/src/Controller/ClassInvokeTraceableController.php b/tests/Functional/Application/src/Controller/ClassInvokeTraceableController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Controller;
+namespace App\Controller;
 
 use FriendsOfOpenTelemetry\OpenTelemetryBundle\Instrumentation\Attribute\Traceable;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;

diff --git a/tests/Functional/Application/src/Controller/ClassTraceableController.php b/tests/Functional/Application/src/Controller/ClassTraceableController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Controller;
+namespace App\Controller;
 
 use FriendsOfOpenTelemetry\OpenTelemetryBundle\Instrumentation\Attribute\Traceable;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;

diff --git a/tests/Functional/Application/src/Controller/FallbackTraceableController.php b/tests/Functional/Application/src/Controller/FallbackTraceableController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Controller;
+namespace App\Controller;
 
 use FriendsOfOpenTelemetry\OpenTelemetryBundle\Instrumentation\Attribute\Traceable;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;

diff --git a/tests/Functional/Application/src/Controller/NotTraceableClassController.php b/tests/Functional/Application/src/Controller/NotTraceableClassController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Controller;
+namespace App\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;

diff --git a/tests/Functional/Application/src/Entity/Dummy.php b/tests/Functional/Application/src/Entity/Dummy.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Entity;
+namespace App\Entity;
 
+use App\Repository\DummyRepository;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\Mapping\GeneratedValue;
 use Doctrine\ORM\Mapping\Id;
 use Doctrine\ORM\Mapping\Table;
-use FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Repository\DummyRepository;
 
 #[Entity(repositoryClass: DummyRepository::class)]
 #[Table]

diff --git a/tests/Functional/Application/Kernel.php → tests/Functional/Application/src/Kernel.php b/tests/Functional/Application/Kernel.php → tests/Functional/Application/src/Kernel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application;
+namespace App;
 
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
 use Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle;
@@ -29,6 +29,6 @@ public function registerBundles(): iterable
 
     public function getProjectDir(): string
     {
-        return __DIR__;
+        return __DIR__.'/..';
     }
 }
diff --git a/tests/Functional/Application/src/Message/DummyMessage.php b/tests/Functional/Application/src/Message/DummyMessage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Message;
+namespace App\Message;
 
 final readonly class DummyMessage
 {

diff --git a/tests/Functional/Application/src/Message/ExceptionMessage.php b/tests/Functional/Application/src/Message/ExceptionMessage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Message;
+namespace App\Message;
 
 final readonly class ExceptionMessage
 {

diff --git a/tests/Functional/Application/src/MessageHandler/DummyMessageHandler.php b/tests/Functional/Application/src/MessageHandler/DummyMessageHandler.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\MessageHandler;
+namespace App\MessageHandler;
 
-use FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Message\DummyMessage;
+use App\Message\DummyMessage;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
 #[AsMessageHandler]

diff --git a/tests/Functional/Application/src/MessageHandler/ExceptionMessageHandler.php b/tests/Functional/Application/src/MessageHandler/ExceptionMessageHandler.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\MessageHandler;
+namespace App\MessageHandler;
 
-use FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Message\ExceptionMessage;
+use App\Message\ExceptionMessage;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
 #[AsMessageHandler]

diff --git a/tests/Functional/Application/src/Repository/DummyRepository.php b/tests/Functional/Application/src/Repository/DummyRepository.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Repository;
+namespace App\Repository;
 
+use App\Entity\Dummy;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
-use FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Entity\Dummy;
 
 /**
  * @extends ServiceEntityRepository<Dummy>

diff --git a/tests/Functional/Application/templates/fragment.html.twig b/tests/Functional/Application/templates/fragment.html.twig
@@ -1,4 +1,4 @@
 <h1>fragment</h1>
 <p>
-    {{ render(controller('FriendsOfOpenTelemetry\\OpenTelemetryBundle\\Tests\\Functional\\Application\\Controller\\ActionTraceableController::view')) }}
+    {{ render(controller('App\\Controller\\ActionTraceableController::view')) }}
 </p>
diff --git a/tests/Functional/Instrumentation/Cache/CacheTracingTest.php b/tests/Functional/Instrumentation/Cache/CacheTracingTest.php
@@ -2,7 +2,7 @@
 
 namespace FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Instrumentation\Cache;
 
-use FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Kernel;
+use App\Kernel;
 use FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\TracingTestCaseTrait;
 use OpenTelemetry\SDK\Trace\StatusData;
 use Psr\Cache\CacheItemInterface;

diff --git a/tests/Functional/Instrumentation/Cache/TagAwareCacheTracingTest.php b/tests/Functional/Instrumentation/Cache/TagAwareCacheTracingTest.php
@@ -2,7 +2,7 @@
 
 namespace FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Instrumentation\Cache;
 
-use FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Kernel;
+use App\Kernel;
 use FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\TracingTestCaseTrait;
 use OpenTelemetry\SDK\Trace\StatusData;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;

diff --git a/tests/Functional/Instrumentation/ConsoleTracingTest.php b/tests/Functional/Instrumentation/ConsoleTracingTest.php
@@ -2,7 +2,7 @@
 
 namespace FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Instrumentation;
 
-use FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Kernel;
+use App\Kernel;
 use FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\TracingTestCaseTrait;
 use OpenTelemetry\SDK\Trace\SpanExporter\InMemoryExporter;
 use OpenTelemetry\SDK\Trace\StatusData;
@@ -36,7 +36,7 @@ public function testSuccess(): void
         self::assertSpanStatus($mainSpan, StatusData::ok());
         self::assertSpanAttributes($mainSpan, [
             'code.function' => 'execute',
-            'code.namespace' => 'FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Command\TraceableCommand',
+            'code.namespace' => 'App\Command\TraceableCommand',
             'symfony.console.exit_code' => 0,
         ]);
         self::assertSpanEventsCount($mainSpan, 0);
@@ -64,7 +64,7 @@ public function testFailure(): void
         self::assertSpanStatus($mainSpan, StatusData::error());
         self::assertSpanAttributes($mainSpan, [
             'code.function' => 'execute',
-            'code.namespace' => 'FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Command\TraceableCommand',
+            'code.namespace' => 'App\Command\TraceableCommand',
             'symfony.console.exit_code' => 1,
         ]);
         self::assertSpanEventsCount($mainSpan, 0);
@@ -97,7 +97,7 @@ public function testException(): void
         self::assertSpanStatus($mainSpan, StatusData::error());
         self::assertSpanAttributes($mainSpan, [
             'code.function' => 'execute',
-            'code.namespace' => 'FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Command\TraceableCommand',
+            'code.namespace' => 'App\Command\TraceableCommand',
             'symfony.console.exit_code' => 1,
         ]);
 
@@ -133,7 +133,7 @@ public function testFallback(): void
         self::assertSpanStatus($mainSpan, StatusData::ok());
         self::assertSpanAttributes($mainSpan, [
             'code.function' => 'execute',
-            'code.namespace' => 'FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Command\FallbackCommand',
+            'code.namespace' => 'App\Command\FallbackCommand',
             'symfony.console.exit_code' => 0,
         ]);
         self::assertSpanEventsCount($mainSpan, 0);

diff --git a/tests/Functional/Instrumentation/Doctrine/DoctrineV4TracingTest.php b/tests/Functional/Instrumentation/Doctrine/DoctrineV4TracingTest.php
@@ -2,10 +2,10 @@
 
 namespace FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Instrumentation\Doctrine;
 
+use App\Kernel;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Exception\ConnectionException;
 use Doctrine\DBAL\Exception\TableNotFoundException;
-use FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Kernel;
 use FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\TracingTestCaseTrait;
 use OpenTelemetry\API\Trace\StatusCode;
 use OpenTelemetry\SDK\Trace\StatusData;

diff --git a/tests/Functional/Instrumentation/HttpClientTracingTest.php b/tests/Functional/Instrumentation/HttpClientTracingTest.php
@@ -2,8 +2,8 @@
 
 namespace FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Instrumentation;
 
+use App\Kernel;
 use FriendsOfOpenTelemetry\OpenTelemetryBundle\Instrumentation\Symfony\HttpClient\TraceableHttpClient;
-use FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Kernel;
 use FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\TracingTestCaseTrait;
 use OpenTelemetry\SDK\Trace\StatusData;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     <?php
-    use FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Functional\Application\Kernel;
+    use App\Kernel;
     use Symfony\Bundle\FrameworkBundle\Console\Application;
@@ Expand Down @@