diff --git a/packages/generation/composer.json b/packages/generation/composer.json index ac4da40e6..d7e402984 100644 --- a/packages/generation/composer.json +++ b/packages/generation/composer.json @@ -8,7 +8,6 @@ "nette/php-generator": "4.2.1", "nette/schema": "^1.3.4", "nikic/php-parser": "^5.3", - "tempest/container": "3.x-dev", "tempest/support": "3.x-dev", "psr/container": "^2.0" }, diff --git a/packages/generation/src/TypeScript/GenerateTypesCommand.php b/packages/generation/src/TypeScript/GenerateTypesCommand.php index 6685e3ef4..47d92d716 100644 --- a/packages/generation/src/TypeScript/GenerateTypesCommand.php +++ b/packages/generation/src/TypeScript/GenerateTypesCommand.php @@ -4,9 +4,9 @@ namespace Tempest\Generation\TypeScript; +use Psr\Container\ContainerInterface; use Tempest\Console\ConsoleCommand; use Tempest\Console\HasConsole; -use Tempest\Container\Container; final readonly class GenerateTypesCommand { @@ -15,7 +15,7 @@ public function __construct( private TypeScriptGenerationConfig $config, private TypeScriptGenerator $generator, - private Container $container, + private ContainerInterface $container, ) {} #[ConsoleCommand( diff --git a/packages/generation/src/TypeScript/StructureResolvers/ClassStructureResolver.php b/packages/generation/src/TypeScript/StructureResolvers/ClassStructureResolver.php index c13ec3a42..3e79def58 100644 --- a/packages/generation/src/TypeScript/StructureResolvers/ClassStructureResolver.php +++ b/packages/generation/src/TypeScript/StructureResolvers/ClassStructureResolver.php @@ -4,7 +4,7 @@ namespace Tempest\Generation\TypeScript\StructureResolvers; -use Tempest\Container\Container; +use Psr\Container\ContainerInterface; use Tempest\Generation\TypeScript\InterfaceDefinition; use Tempest\Generation\TypeScript\PropertyDefinition; use Tempest\Generation\TypeScript\StructureResolver; @@ -25,7 +25,7 @@ { public function __construct( private TypeScriptGenerationConfig $config, - private Container $container, + private ContainerInterface $container, ) {} public function resolve(TypeReflector $type, TypeScriptGenerator $generator): InterfaceDefinition diff --git a/packages/generation/src/TypeScript/StructureResolvers/EnumStructureResolver.php b/packages/generation/src/TypeScript/StructureResolvers/EnumStructureResolver.php index b20434395..629968ca0 100644 --- a/packages/generation/src/TypeScript/StructureResolvers/EnumStructureResolver.php +++ b/packages/generation/src/TypeScript/StructureResolvers/EnumStructureResolver.php @@ -4,10 +4,10 @@ namespace Tempest\Generation\TypeScript\StructureResolvers; +use Psr\Container\ContainerInterface; use ReflectionEnumBackedCase; use ReflectionEnumUnitCase; use RuntimeException; -use Tempest\Container\Container; use Tempest\Generation\TypeScript\StructureResolver; use Tempest\Generation\TypeScript\TypeDefinition; use Tempest\Generation\TypeScript\TypeNodes\TypeNode; @@ -23,7 +23,7 @@ { public function __construct( private TypeScriptGenerationConfig $config, - private Container $container, + private ContainerInterface $container, ) {} public function resolve(TypeReflector $type, TypeScriptGenerator $generator): TypeDefinition diff --git a/packages/generation/src/TypeScript/TypeResolverDiscovery.php b/packages/generation/src/TypeScript/TypeResolverDiscovery.php index 1761028c4..cdf203200 100644 --- a/packages/generation/src/TypeScript/TypeResolverDiscovery.php +++ b/packages/generation/src/TypeScript/TypeResolverDiscovery.php @@ -4,11 +4,11 @@ namespace Tempest\Generation\TypeScript; -use Tempest\Core\Priority; use Tempest\Discovery\Discovery; use Tempest\Discovery\DiscoveryLocation; use Tempest\Discovery\IsDiscovery; use Tempest\Reflection\ClassReflector; +use Tempest\Support\Priority; use function Tempest\Support\arr;