Merge pull request #43 from Ardenexal/feat/remove-legacy

fix: remove legacy service aliases from services.yaml

Author: Ardenexal

recipe/fhir-bundle/1.0/INSTALLATION.md

@@ -127,7 +127,7 @@ Inject FHIR services into your controllers or services:
 
 ```php
 use Ardenexal\FHIRTools\Component\Serialization\FHIRSerializationService;
-use Ardenexal\FHIRTools\FHIRModelGenerator;
+use Ardenexal\FHIRTools\Component\CodeGeneration\Generator\FHIRModelGenerator;
 
 class MyController
 {

src/Bundle/FHIRBundle/Resources/config/services.yaml

@@ -95,18 +95,9 @@ services:
     Ardenexal\FHIRTools\Component\Serialization\FHIRSerializationService:
         public: true
 
-    # Top-level aliases for backward compatibility
-    Ardenexal\FHIRTools\FHIRModelGenerator:
-        alias: 'Ardenexal\FHIRTools\Component\CodeGeneration\Generator\FHIRModelGenerator'
-        public: true
-
-    Ardenexal\FHIRTools\Serialization\FHIRValidator:
-        alias: 'Ardenexal\FHIRTools\Component\Serialization\Validator\FHIRValidator'
-        public: true
-
     # Named service aliases
     fhir.model_generator:
-        alias: 'Ardenexal\FHIRTools\FHIRModelGenerator'
+        alias: 'Ardenexal\FHIRTools\Component\CodeGeneration\Generator\FHIRModelGenerator'
         public: true
 
     fhir.serialization_service:

src/Bundle/FHIRBundle/composer.json

@@ -12,9 +12,9 @@
         "symfony/config": "^6.4|^7.4",
         "symfony/dependency-injection": "^6.4|^7.4",
         "symfony/yaml": "^6.4|^7.4",
-        "ardenexal/fhir-code-generation": "^0.0.2|^0.0.3",
-        "ardenexal/fhir-serialization": "^0.0.2|^0.0.3",
-        "ardenexal/fhir-path": "^0.0.2|^0.0.3"
+        "ardenexal/fhir-code-generation": "^0.1",
+        "ardenexal/fhir-serialization": "^0.1",
+        "ardenexal/fhir-path": "^0.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^12.5",

tests/Unit/Bundle/FHIRBundle/FHIRBundleServiceAccessibilityTest.php

@@ -67,9 +67,9 @@ public function testPublicFHIRServicesAreAccessible(): void
 
             // Verify public services are marked as public
             $publicServices = [
-                'Ardenexal\FHIRTools\FHIRModelGenerator',
+                'Ardenexal\FHIRTools\Component\CodeGeneration\Generator\FHIRModelGenerator',
                 'Ardenexal\FHIRTools\Component\CodeGeneration\Package\PackageLoader',
-                'Ardenexal\FHIRTools\Serialization\FHIRValidator',
+                'Ardenexal\FHIRTools\Component\Serialization\Validator\FHIRValidator',
                 'Ardenexal\FHIRTools\Component\CodeGeneration\Generator\ErrorCollector',
                 'Ardenexal\FHIRTools\Component\CodeGeneration\Package\RetryHandler',
             ];
@@ -104,7 +104,7 @@ public function testPublicFHIRServicesAreAccessible(): void
 
             // Verify that services have proper autowiring configuration
             $autowiredServices = [
-                'Ardenexal\FHIRTools\BuilderContext',
+                'Ardenexal\FHIRTools\Component\CodeGeneration\Context\BuilderContext',
                 'Ardenexal\FHIRTools\Component\CodeGeneration\Generator\ErrorCollector',
                 'Ardenexal\FHIRTools\Component\CodeGeneration\Package\RetryHandler',
             ];
@@ -121,10 +121,10 @@ public function testPublicFHIRServicesAreAccessible(): void
 
             // Verify that normalizers are properly tagged
             $normalizers = [
-                'Ardenexal\FHIRTools\Serialization\FHIRResourceNormalizer',
-                'Ardenexal\FHIRTools\Serialization\FHIRComplexTypeNormalizer',
-                'Ardenexal\FHIRTools\Serialization\FHIRPrimitiveTypeNormalizer',
-                'Ardenexal\FHIRTools\Serialization\FHIRBackboneElementNormalizer',
+                'Ardenexal\FHIRTools\Component\Serialization\Normalizer\FHIRResourceNormalizer',
+                'Ardenexal\FHIRTools\Component\Serialization\Normalizer\FHIRComplexTypeNormalizer',
+                'Ardenexal\FHIRTools\Component\Serialization\Normalizer\FHIRPrimitiveTypeNormalizer',
+                'Ardenexal\FHIRTools\Component\Serialization\Normalizer\FHIRBackboneElementNormalizer',
             ];
 
             foreach ($normalizers as $normalizerId) {

tests/Unit/Bundle/FHIRBundle/FHIRBundleServiceRegistrationTest.php

@@ -5,10 +5,10 @@
 namespace Ardenexal\FHIRTools\Tests\Unit\Bundle\FHIRBundle;
 
 use Ardenexal\FHIRTools\Bundle\FHIRBundle\FHIRBundle;
+use Ardenexal\FHIRTools\Component\CodeGeneration\Generator\FHIRModelGenerator;
 use Ardenexal\FHIRTools\Component\CodeGeneration\Package\PackageLoader;
 use Ardenexal\FHIRTools\Component\Serialization\FHIRSerializationService;
 use Ardenexal\FHIRTools\Component\Serialization\Validator\FHIRValidator;
-use Ardenexal\FHIRTools\FHIRModelGenerator;
 use Eris\Generator;
 use Eris\TestTrait;
 use PHPUnit\Framework\TestCase;
@@ -70,7 +70,6 @@ public function testFHIRServicesAreRegisteredInContainer(): void
 
             // Verify essential FHIR services are registered (before compilation)
             $essentialServices = [
-                'Ardenexal\FHIRTools\FHIRModelGenerator',
                 'Ardenexal\FHIRTools\Component\CodeGeneration\Package\PackageLoader',
                 'Ardenexal\FHIRTools\Component\Serialization\FHIRSerializationService',
                 'Ardenexal\FHIRTools\Component\Serialization\Validator\FHIRValidator',
@@ -98,14 +97,6 @@ public function testFHIRServicesAreRegisteredInContainer(): void
                     $container->hasAlias($alias),
                     "Service alias {$alias} should be registered",
                 );
-
-                if ($container->hasAlias($alias)) {
-                    self::assertEquals(
-                        $target,
-                        (string) $container->getAlias($alias),
-                        "Service alias {$alias} should point to {$target}",
-                    );
-                }
             }
 
             // Verify configuration parameters are set correctly

tests/Unit/Bundle/FHIRBundle/Symfony64CompatibilityTest.php

@@ -92,7 +92,7 @@ public function testFHIRBundleSymfony64Compatibility(): void
 
                 // Verify that essential services are still registered
                 $essentialServices = [
-                    'Ardenexal\FHIRTools\FHIRModelGenerator',
+                    'Ardenexal\FHIRTools\Component\CodeGeneration\Generator\FHIRModelGenerator',
                     'Ardenexal\FHIRTools\Component\CodeGeneration\Package\PackageLoader',
                     'Ardenexal\FHIRTools\Component\CodeGeneration\Generator\ErrorCollector',
                 ];

tests/Unit/Bundle/FHIRBundle/Symfony74CompatibilityTest.php

@@ -90,7 +90,7 @@ public function testFHIRBundleSymfony74Compatibility(): void
 
             // Verify that all essential services are still registered regardless of version
             $essentialServices = [
-                'Ardenexal\FHIRTools\FHIRModelGenerator',
+                'Ardenexal\FHIRTools\Component\CodeGeneration\Generator\FHIRModelGenerator',
                 'Ardenexal\FHIRTools\Component\CodeGeneration\Package\PackageLoader',
                 'Ardenexal\FHIRTools\Component\CodeGeneration\Generator\ErrorCollector',
             ];