diff --git a/docs/1-essentials/01-routing.md b/docs/1-essentials/01-routing.md index e2484b9820..c2297b0ae0 100644 --- a/docs/1-essentials/01-routing.md +++ b/docs/1-essentials/01-routing.md @@ -498,7 +498,7 @@ use Tempest\Router\HttpMiddlewareCallable; use Tempest\Http\Request; use Tempest\Http\Response; use Tempest\Discovery\SkipDiscovery; -use Tempest\Core\Priority; +use Tempest\Support\Priority; #[SkipDiscovery] #[Priority(Priority::LOW)] @@ -518,17 +518,17 @@ final readonly class ValidateWebhook implements HttpMiddleware ### Middleware priority -All middleware classes are sorted based on their priority. By default, each middleware has the "normal" priority, which can be overridden using the {b`#[Tempest\Core\Priority]`} attribute: +All middleware classes are sorted based on their priority. By default, each middleware has the "normal" priority, which can be overridden using the {b`#[Tempest\Support\Priority]`} attribute: ```php -use Tempest\Core\Priority; +use Tempest\Support\Priority; #[Priority(Priority::HIGH)] final readonly class ValidateWebhook implements HttpMiddleware { /* … */ } ``` -Priority is defined using an integer. However, for consistency reasons, it is recommended to use of the built-in {b`Tempest\Core\Priority`} constants. +Priority is defined using an integer. However, for consistency reasons, it is recommended to use of the built-in {b`Tempest\Support\Priority`} constants. ### Middleware discovery diff --git a/docs/1-essentials/03-database.md b/docs/1-essentials/03-database.md index 64eb3f1681..beda527285 100644 --- a/docs/1-essentials/03-database.md +++ b/docs/1-essentials/03-database.md @@ -1144,7 +1144,7 @@ Dynamic database connections should be registered within the application's entry ```php use Tempest\Container\Container; use Tempest\Router\HttpMiddleware; -use Tempest\Core\Priority; +use Tempest\Support\Priority; #[Priority(Priority::HIGHEST)] final class ConnectTenantMiddleware implements HttpMiddleware diff --git a/docs/1-essentials/04-console-commands.md b/docs/1-essentials/04-console-commands.md index fb2bafb2ba..90deefec32 100644 --- a/docs/1-essentials/04-console-commands.md +++ b/docs/1-essentials/04-console-commands.md @@ -282,7 +282,7 @@ After adding or removing commands, regenerate the metadata: ### Available commands | Command | Description | -|------------------------|--------------------------------------------------------------------------| +| ---------------------- | ------------------------------------------------------------------------ | | `completion:install` | Install the completion script and generate metadata. | | `completion:generate` | Regenerate the completion metadata JSON. | | `completion:show` | Output the completion script to stdout (useful for custom installation). | @@ -325,17 +325,17 @@ Middleware classes will be autowired by the container, so you can use the constr #### Middleware priority -All console middleware classes get sorted based on their priority. By default, each middleware gets the normal priority, but you can override it using the {b`#[Tempest\Core\Priority]`} attribute: +All console middleware classes get sorted based on their priority. By default, each middleware gets the normal priority, but you can override it using the {b`#[Tempest\Support\Priority]`} attribute: ```php app/InspireMiddleware.php -use Tempest\Core\Priority; +use Tempest\Support\Priority; #[Priority(Priority::HIGH)] final readonly class InspireMiddleware implements ConsoleMiddleware { /* … */ } ``` -Note that priority is defined using an integer. However, the {b`Tempest\Core\Priority`} class provides a few constants with predefined priorities: `Priority::FRAMEWORK`, `Priority::HIGHEST`, `Priority::HIGH`, `Priority::NORMAL`, `Priority::LOW`, `Priority::LOWEST`. +Note that priority is defined using an integer. However, the {b`Tempest\Support\Priority`} class provides a few constants with predefined priorities: `Priority::FRAMEWORK`, `Priority::HIGHEST`, `Priority::HIGH`, `Priority::NORMAL`, `Priority::LOW`, `Priority::LOWEST`. #### Middleware discovery diff --git a/docs/2-features/08-events.md b/docs/2-features/08-events.md index 6eee2be419..ebdfef5dff 100644 --- a/docs/2-features/08-events.md +++ b/docs/2-features/08-events.md @@ -138,7 +138,7 @@ final readonly class EventLoggerMiddleware implements EventBusMiddleware All event bus middleware classes get sorted based on their priority. By default, each middleware gets the "normal" priority, but you can override it using the `#[Priority]` attribute: ```php -use Tempest\Core\Priority; +use Tempest\Support\Priority; #[Priority(Priority::HIGH)] final readonly class EventLoggerMiddleware implements EventBusMiddleware diff --git a/docs/2-features/10-command-bus.md b/docs/2-features/10-command-bus.md index 800eed1365..d3e4ed6ce1 100644 --- a/docs/2-features/10-command-bus.md +++ b/docs/2-features/10-command-bus.md @@ -211,7 +211,7 @@ class MyCommandBusMiddleware implements CommandBusMiddleware All command bus middleware classes get sorted based on their priority. By default, each middleware gets the "normal" priority, but you can override it using the `#[Priority]` attribute: ```php -use Tempest\Core\Priority; +use Tempest\Support\Priority; #[Priority(Priority::HIGH)] final readonly class MyCommandBusMiddleware implements CommandBusMiddleware diff --git a/docs/2-features/14-exception-handling.md b/docs/2-features/14-exception-handling.md index 8567aebd7e..b340025a1b 100644 --- a/docs/2-features/14-exception-handling.md +++ b/docs/2-features/14-exception-handling.md @@ -196,7 +196,7 @@ final class NotFoundExceptionRenderer implements ExceptionRenderer ``` :::info -Exception renderers are automatically [discovered](../4-internals/02-discovery.md) and checked in {b`#[Tempest\Core\Priority]`} order. +Exception renderers are automatically [discovered](../4-internals/02-discovery.md) and checked in {b`#[Tempest\Support\Priority]`} order. ::: ## Testing diff --git a/packages/command-bus/src/AsyncCommandMiddleware.php b/packages/command-bus/src/AsyncCommandMiddleware.php index ddefd2607f..18366a0eaf 100644 --- a/packages/command-bus/src/AsyncCommandMiddleware.php +++ b/packages/command-bus/src/AsyncCommandMiddleware.php @@ -4,8 +4,8 @@ namespace Tempest\CommandBus; -use Tempest\Core\Priority; use Tempest\Reflection\ClassReflector; +use Tempest\Support\Priority; use Tempest\Support\Random; #[Priority(Priority::FRAMEWORK)] diff --git a/packages/console/src/Middleware/ConsoleExceptionMiddleware.php b/packages/console/src/Middleware/ConsoleExceptionMiddleware.php index aafe38a169..2e9eebb204 100644 --- a/packages/console/src/Middleware/ConsoleExceptionMiddleware.php +++ b/packages/console/src/Middleware/ConsoleExceptionMiddleware.php @@ -10,7 +10,7 @@ use Tempest\Console\Exceptions\ConsoleException; use Tempest\Console\ExitCode; use Tempest\Console\Initializers\Invocation; -use Tempest\Core\Priority; +use Tempest\Support\Priority; #[Priority(Priority::FRAMEWORK - 9)] final readonly class ConsoleExceptionMiddleware implements ConsoleMiddleware diff --git a/packages/console/src/Middleware/HelpMiddleware.php b/packages/console/src/Middleware/HelpMiddleware.php index fdc1731eae..f58ce97c85 100644 --- a/packages/console/src/Middleware/HelpMiddleware.php +++ b/packages/console/src/Middleware/HelpMiddleware.php @@ -12,7 +12,7 @@ use Tempest\Console\ExitCode; use Tempest\Console\GlobalFlags; use Tempest\Console\Initializers\Invocation; -use Tempest\Core\Priority; +use Tempest\Support\Priority; #[Priority(Priority::FRAMEWORK)] final readonly class HelpMiddleware implements ConsoleMiddleware diff --git a/packages/console/src/Middleware/InvalidCommandMiddleware.php b/packages/console/src/Middleware/InvalidCommandMiddleware.php index d3540bbb94..500f03f174 100644 --- a/packages/console/src/Middleware/InvalidCommandMiddleware.php +++ b/packages/console/src/Middleware/InvalidCommandMiddleware.php @@ -12,7 +12,7 @@ use Tempest\Console\Exceptions\InvalidCommandException; use Tempest\Console\ExitCode; use Tempest\Console\Initializers\Invocation; -use Tempest\Core\Priority; +use Tempest\Support\Priority; #[Priority(Priority::FRAMEWORK - 7)] final readonly class InvalidCommandMiddleware implements ConsoleMiddleware diff --git a/packages/console/src/Middleware/OverviewMiddleware.php b/packages/console/src/Middleware/OverviewMiddleware.php index 40c593d00c..ff63724233 100644 --- a/packages/console/src/Middleware/OverviewMiddleware.php +++ b/packages/console/src/Middleware/OverviewMiddleware.php @@ -13,8 +13,8 @@ use Tempest\Console\ExitCode; use Tempest\Console\Initializers\Invocation; use Tempest\Core\AppConfig; -use Tempest\Core\Priority; use Tempest\Discovery\DiscoveryCache; +use Tempest\Support\Priority; use function Tempest\Support\arr; use function Tempest\Support\str; diff --git a/packages/console/src/Middleware/ResolveOrRescueMiddleware.php b/packages/console/src/Middleware/ResolveOrRescueMiddleware.php index 97771ee3f3..fb54cca4f8 100644 --- a/packages/console/src/Middleware/ResolveOrRescueMiddleware.php +++ b/packages/console/src/Middleware/ResolveOrRescueMiddleware.php @@ -13,8 +13,8 @@ use Tempest\Console\ConsoleMiddlewareCallable; use Tempest\Console\ExitCode; use Tempest\Console\Initializers\Invocation; -use Tempest\Core\Priority; use Tempest\Support\Arr\ImmutableArray; +use Tempest\Support\Priority; use Tempest\Support\Str\ImmutableString; use Throwable; diff --git a/packages/console/src/Middleware/ValidateNamedArgumentsMiddleware.php b/packages/console/src/Middleware/ValidateNamedArgumentsMiddleware.php index 375102a9e0..0758315a48 100644 --- a/packages/console/src/Middleware/ValidateNamedArgumentsMiddleware.php +++ b/packages/console/src/Middleware/ValidateNamedArgumentsMiddleware.php @@ -10,7 +10,7 @@ use Tempest\Console\Initializers\Invocation; use Tempest\Console\Input\ConsoleArgumentDefinition; use Tempest\Console\Input\ConsoleInputArgument; -use Tempest\Core\Priority; +use Tempest\Support\Priority; use function Tempest\Support\arr; diff --git a/packages/console/src/Stubs/CommandBusMiddlewareStub.php b/packages/console/src/Stubs/CommandBusMiddlewareStub.php index 60afdbbe23..b25ec54b70 100644 --- a/packages/console/src/Stubs/CommandBusMiddlewareStub.php +++ b/packages/console/src/Stubs/CommandBusMiddlewareStub.php @@ -6,8 +6,8 @@ use Tempest\CommandBus\CommandBusMiddleware; use Tempest\CommandBus\CommandBusMiddlewareCallable; -use Tempest\Core\Priority; use Tempest\Discovery\SkipDiscovery; +use Tempest\Support\Priority; #[SkipDiscovery] #[Priority(Priority::NORMAL)] diff --git a/packages/console/src/Stubs/ConsoleMiddlewareStub.php b/packages/console/src/Stubs/ConsoleMiddlewareStub.php index 677450454a..b1fb25af46 100644 --- a/packages/console/src/Stubs/ConsoleMiddlewareStub.php +++ b/packages/console/src/Stubs/ConsoleMiddlewareStub.php @@ -9,8 +9,8 @@ use Tempest\Console\ExitCode; use Tempest\Console\HasConsole; use Tempest\Console\Initializers\Invocation; -use Tempest\Core\Priority; use Tempest\Discovery\SkipDiscovery; +use Tempest\Support\Priority; #[SkipDiscovery] #[Priority(Priority::NORMAL)] diff --git a/packages/console/src/Stubs/EventBusMiddlewareStub.php b/packages/console/src/Stubs/EventBusMiddlewareStub.php index c96c809329..f567a6a513 100644 --- a/packages/console/src/Stubs/EventBusMiddlewareStub.php +++ b/packages/console/src/Stubs/EventBusMiddlewareStub.php @@ -4,10 +4,10 @@ namespace Tempest\Console\Stubs; -use Tempest\Core\Priority; use Tempest\Discovery\SkipDiscovery; use Tempest\EventBus\EventBusMiddleware; use Tempest\EventBus\EventBusMiddlewareCallable; +use Tempest\Support\Priority; #[SkipDiscovery] #[Priority(Priority::NORMAL)] diff --git a/packages/console/src/Stubs/HttpMiddlewareStub.php b/packages/console/src/Stubs/HttpMiddlewareStub.php index 3c914a7426..e8d0d26623 100644 --- a/packages/console/src/Stubs/HttpMiddlewareStub.php +++ b/packages/console/src/Stubs/HttpMiddlewareStub.php @@ -4,12 +4,12 @@ namespace Tempest\Console\Stubs; -use Tempest\Core\Priority; use Tempest\Discovery\SkipDiscovery; use Tempest\Http\Request; use Tempest\Http\Response; use Tempest\Router\HttpMiddleware; use Tempest\Router\HttpMiddlewareCallable; +use Tempest\Support\Priority; #[SkipDiscovery] #[Priority(Priority::NORMAL)] diff --git a/packages/core/src/Middleware.php b/packages/core/src/Middleware.php index 1ff506df61..d805b36119 100644 --- a/packages/core/src/Middleware.php +++ b/packages/core/src/Middleware.php @@ -6,6 +6,7 @@ use Generator; use IteratorAggregate; use Tempest\Reflection\ClassReflector; +use Tempest\Support\Priority; use Traversable; use function Tempest\Support\arr; diff --git a/packages/database/src/Casters/DataTransferObjectCaster.php b/packages/database/src/Casters/DataTransferObjectCaster.php index 3716f30dd2..10da12c8eb 100644 --- a/packages/database/src/Casters/DataTransferObjectCaster.php +++ b/packages/database/src/Casters/DataTransferObjectCaster.php @@ -2,7 +2,6 @@ namespace Tempest\Database\Casters; -use Tempest\Core\Priority; use Tempest\Database\DatabaseContext; use Tempest\Mapper\Attributes\Context; use Tempest\Mapper\Caster; @@ -15,6 +14,7 @@ use Tempest\Reflection\TypeReflector; use Tempest\Support\Arr; use Tempest\Support\Json; +use Tempest\Support\Priority; use function Tempest\Mapper\map; diff --git a/packages/database/src/Casters/PrimaryKeyCaster.php b/packages/database/src/Casters/PrimaryKeyCaster.php index fa43779143..738439cf84 100644 --- a/packages/database/src/Casters/PrimaryKeyCaster.php +++ b/packages/database/src/Casters/PrimaryKeyCaster.php @@ -4,12 +4,12 @@ namespace Tempest\Database\Casters; -use Tempest\Core\Priority; use Tempest\Database\PrimaryKey; use Tempest\Mapper\Caster; use Tempest\Mapper\DynamicCaster; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; #[Priority(Priority::HIGHEST)] final readonly class PrimaryKeyCaster implements Caster, DynamicCaster diff --git a/packages/database/src/Serializers/DataTransferObjectSerializer.php b/packages/database/src/Serializers/DataTransferObjectSerializer.php index ab80866e3f..d03cb10ff9 100644 --- a/packages/database/src/Serializers/DataTransferObjectSerializer.php +++ b/packages/database/src/Serializers/DataTransferObjectSerializer.php @@ -4,7 +4,6 @@ use BackedEnum; use JsonSerializable; -use Tempest\Core\Priority; use Tempest\Database\DatabaseContext; use Tempest\Mapper\Attributes\Context; use Tempest\Mapper\DynamicSerializer; @@ -17,6 +16,7 @@ use Tempest\Reflection\TypeReflector; use Tempest\Support\Arr; use Tempest\Support\Json; +use Tempest\Support\Priority; use UnitEnum; #[Priority(Priority::HIGHEST)] diff --git a/packages/database/src/Serializers/DateTimeSerializer.php b/packages/database/src/Serializers/DateTimeSerializer.php index ddc9cd774e..53c3b1c7e8 100644 --- a/packages/database/src/Serializers/DateTimeSerializer.php +++ b/packages/database/src/Serializers/DateTimeSerializer.php @@ -5,7 +5,6 @@ namespace Tempest\Database\Serializers; use DateTimeInterface as NativeDateTimeInterface; -use Tempest\Core\Priority; use Tempest\Database\DatabaseContext; use Tempest\DateTime\DateTime; use Tempest\DateTime\DateTimeInterface; @@ -16,6 +15,7 @@ use Tempest\Mapper\Serializer; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; #[Priority(Priority::HIGH)] #[Context(DatabaseContext::class)] diff --git a/packages/database/src/Serializers/RawSqlDateTimeSerializer.php b/packages/database/src/Serializers/RawSqlDateTimeSerializer.php index 094351268f..a32f9f0742 100644 --- a/packages/database/src/Serializers/RawSqlDateTimeSerializer.php +++ b/packages/database/src/Serializers/RawSqlDateTimeSerializer.php @@ -5,7 +5,6 @@ namespace Tempest\Database\Serializers; use DateTimeInterface as NativeDateTimeInterface; -use Tempest\Core\Priority; use Tempest\Database\RawSqlDatabaseContext; use Tempest\DateTime\DateTime; use Tempest\DateTime\DateTimeInterface; @@ -16,6 +15,7 @@ use Tempest\Mapper\Serializer; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; #[Priority(Priority::HIGH)] #[Context(RawSqlDatabaseContext::class)] diff --git a/packages/database/src/Serializers/RawSqlEnumSerializer.php b/packages/database/src/Serializers/RawSqlEnumSerializer.php index 9c5ed9677c..af32af7db6 100644 --- a/packages/database/src/Serializers/RawSqlEnumSerializer.php +++ b/packages/database/src/Serializers/RawSqlEnumSerializer.php @@ -5,7 +5,6 @@ namespace Tempest\Database\Serializers; use BackedEnum; -use Tempest\Core\Priority; use Tempest\Database\RawSqlDatabaseContext; use Tempest\Mapper\Attributes\Context; use Tempest\Mapper\DynamicSerializer; @@ -13,6 +12,7 @@ use Tempest\Mapper\Serializer; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; use UnitEnum; #[Priority(Priority::NORMAL)] diff --git a/packages/database/src/Serializers/RawSqlNumberSerializer.php b/packages/database/src/Serializers/RawSqlNumberSerializer.php index 523d3756d1..5995455b03 100644 --- a/packages/database/src/Serializers/RawSqlNumberSerializer.php +++ b/packages/database/src/Serializers/RawSqlNumberSerializer.php @@ -4,7 +4,6 @@ namespace Tempest\Database\Serializers; -use Tempest\Core\Priority; use Tempest\Database\RawSqlDatabaseContext; use Tempest\Mapper\Attributes\Context; use Tempest\Mapper\DynamicSerializer; @@ -12,6 +11,7 @@ use Tempest\Mapper\Serializer; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; #[Priority(Priority::NORMAL)] #[Context(RawSqlDatabaseContext::class)] diff --git a/packages/database/src/Serializers/RawSqlStringSerializer.php b/packages/database/src/Serializers/RawSqlStringSerializer.php index 42d2c44c95..b23f7bb7db 100644 --- a/packages/database/src/Serializers/RawSqlStringSerializer.php +++ b/packages/database/src/Serializers/RawSqlStringSerializer.php @@ -5,7 +5,6 @@ namespace Tempest\Database\Serializers; use Stringable; -use Tempest\Core\Priority; use Tempest\Database\RawSqlDatabaseContext; use Tempest\Mapper\Attributes\Context; use Tempest\Mapper\DynamicSerializer; @@ -13,6 +12,7 @@ use Tempest\Mapper\Serializer; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; #[Priority(Priority::NORMAL)] #[Context(RawSqlDatabaseContext::class)] diff --git a/packages/generation/src/TypeScript/TypeResolverDiscovery.php b/packages/generation/src/TypeScript/TypeResolverDiscovery.php index 1761028c49..cdf2032006 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; diff --git a/packages/generation/src/TypeScript/TypeResolvers/ClassReferenceTypeResolver.php b/packages/generation/src/TypeScript/TypeResolvers/ClassReferenceTypeResolver.php index ab2074ecf0..f6f47a1df0 100644 --- a/packages/generation/src/TypeScript/TypeResolvers/ClassReferenceTypeResolver.php +++ b/packages/generation/src/TypeScript/TypeResolvers/ClassReferenceTypeResolver.php @@ -4,12 +4,12 @@ namespace Tempest\Generation\TypeScript\TypeResolvers; -use Tempest\Core\Priority; use Tempest\Generation\TypeScript\TypeNodes\SymbolTypeNode; use Tempest\Generation\TypeScript\TypeNodes\TypeNode; use Tempest\Generation\TypeScript\TypeResolver; use Tempest\Generation\TypeScript\TypeScriptGenerator; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; /** * Resolves references to PHP classes and interfaces into TypeScript type references. diff --git a/packages/generation/src/TypeScript/TypeResolvers/DateTimeTypeResolver.php b/packages/generation/src/TypeScript/TypeResolvers/DateTimeTypeResolver.php index 6cb5f772be..96ef02fdca 100644 --- a/packages/generation/src/TypeScript/TypeResolvers/DateTimeTypeResolver.php +++ b/packages/generation/src/TypeScript/TypeResolvers/DateTimeTypeResolver.php @@ -5,13 +5,13 @@ namespace Tempest\Generation\TypeScript\TypeResolvers; use DateTimeInterface as NativeDateTimeInterface; -use Tempest\Core\Priority; use Tempest\DateTime\DateTimeInterface; use Tempest\Generation\TypeScript\TypeNodes\PrimitiveTypeNode; use Tempest\Generation\TypeScript\TypeNodes\TypeNode; use Tempest\Generation\TypeScript\TypeResolver; use Tempest\Generation\TypeScript\TypeScriptGenerator; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; #[Priority(Priority::HIGH)] final class DateTimeTypeResolver implements TypeResolver diff --git a/packages/generation/src/TypeScript/TypeResolvers/EnumCaseTypeResolver.php b/packages/generation/src/TypeScript/TypeResolvers/EnumCaseTypeResolver.php index 965516bfa7..f42ffda9aa 100644 --- a/packages/generation/src/TypeScript/TypeResolvers/EnumCaseTypeResolver.php +++ b/packages/generation/src/TypeScript/TypeResolvers/EnumCaseTypeResolver.php @@ -5,12 +5,12 @@ namespace Tempest\Generation\TypeScript\TypeResolvers; use BackedEnum; -use Tempest\Core\Priority; use Tempest\Generation\TypeScript\TypeNodes\LiteralTypeNode; use Tempest\Generation\TypeScript\TypeNodes\TypeNode; use Tempest\Generation\TypeScript\TypeResolver; use Tempest\Generation\TypeScript\TypeScriptGenerator; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; #[Priority(Priority::LOW)] final class EnumCaseTypeResolver implements TypeResolver diff --git a/packages/generation/src/TypeScript/TypeResolvers/EnumReferenceTypeResolver.php b/packages/generation/src/TypeScript/TypeResolvers/EnumReferenceTypeResolver.php index 4d04eca307..198e43d7b7 100644 --- a/packages/generation/src/TypeScript/TypeResolvers/EnumReferenceTypeResolver.php +++ b/packages/generation/src/TypeScript/TypeResolvers/EnumReferenceTypeResolver.php @@ -4,12 +4,12 @@ namespace Tempest\Generation\TypeScript\TypeResolvers; -use Tempest\Core\Priority; use Tempest\Generation\TypeScript\TypeNodes\SymbolTypeNode; use Tempest\Generation\TypeScript\TypeNodes\TypeNode; use Tempest\Generation\TypeScript\TypeResolver; use Tempest\Generation\TypeScript\TypeScriptGenerator; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; /** * Resolves references to PHP enums into TypeScript type references. diff --git a/packages/generation/src/TypeScript/TypeResolvers/MixedTypeResolver.php b/packages/generation/src/TypeScript/TypeResolvers/MixedTypeResolver.php index bd01c71930..e5b8644737 100644 --- a/packages/generation/src/TypeScript/TypeResolvers/MixedTypeResolver.php +++ b/packages/generation/src/TypeScript/TypeResolvers/MixedTypeResolver.php @@ -4,12 +4,12 @@ namespace Tempest\Generation\TypeScript\TypeResolvers; -use Tempest\Core\Priority; use Tempest\Generation\TypeScript\TypeNodes\PrimitiveTypeNode; use Tempest\Generation\TypeScript\TypeNodes\TypeNode; use Tempest\Generation\TypeScript\TypeResolver; use Tempest\Generation\TypeScript\TypeScriptGenerator; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; /** * Fallback resolver for unhandled types. diff --git a/packages/generation/src/TypeScript/TypeResolvers/ScalarTypeResolver.php b/packages/generation/src/TypeScript/TypeResolvers/ScalarTypeResolver.php index ce4fac3148..746b2adb31 100644 --- a/packages/generation/src/TypeScript/TypeResolvers/ScalarTypeResolver.php +++ b/packages/generation/src/TypeScript/TypeResolvers/ScalarTypeResolver.php @@ -5,12 +5,12 @@ namespace Tempest\Generation\TypeScript\TypeResolvers; use LogicException; -use Tempest\Core\Priority; use Tempest\Generation\TypeScript\TypeNodes\PrimitiveTypeNode; use Tempest\Generation\TypeScript\TypeNodes\TypeNode; use Tempest\Generation\TypeScript\TypeResolver; use Tempest\Generation\TypeScript\TypeScriptGenerator; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; #[Priority(Priority::LOW)] final class ScalarTypeResolver implements TypeResolver diff --git a/packages/http/src/Session/ManageSessionMiddleware.php b/packages/http/src/Session/ManageSessionMiddleware.php index 4367fbb4f4..bb4876c556 100644 --- a/packages/http/src/Session/ManageSessionMiddleware.php +++ b/packages/http/src/Session/ManageSessionMiddleware.php @@ -3,11 +3,11 @@ namespace Tempest\Http\Session; use Tempest\Core\DeferredTasks; -use Tempest\Core\Priority; use Tempest\Http\Request; use Tempest\Http\Response; use Tempest\Router\HttpMiddleware; use Tempest\Router\HttpMiddlewareCallable; +use Tempest\Support\Priority; /** * This middleware is responsible for creating the session and saving it on response. diff --git a/packages/idempotency/src/Middleware/IdempotentCommandMiddleware.php b/packages/idempotency/src/Middleware/IdempotentCommandMiddleware.php index a227cb4b56..689382acf3 100644 --- a/packages/idempotency/src/Middleware/IdempotentCommandMiddleware.php +++ b/packages/idempotency/src/Middleware/IdempotentCommandMiddleware.php @@ -8,7 +8,6 @@ use Tempest\CommandBus\CommandBusConfig; use Tempest\CommandBus\CommandBusMiddleware; use Tempest\CommandBus\CommandBusMiddlewareCallable; -use Tempest\Core\Priority; use Tempest\DateTime\Duration; use Tempest\Idempotency\Attributes\Idempotent; use Tempest\Idempotency\Config\IdempotencyConfig; @@ -24,6 +23,7 @@ use Tempest\Idempotency\Support\ProcessingOwner; use Tempest\Idempotency\Support\ProcessingOwnerLiveness; use Tempest\Reflection\ClassReflector; +use Tempest\Support\Priority; use Throwable; #[Priority(Priority::FRAMEWORK - 1)] diff --git a/packages/mapper/src/CasterDiscovery.php b/packages/mapper/src/CasterDiscovery.php index d298b492ca..ef499bf9c9 100644 --- a/packages/mapper/src/CasterDiscovery.php +++ b/packages/mapper/src/CasterDiscovery.php @@ -4,12 +4,12 @@ namespace Tempest\Mapper; -use Tempest\Core\Priority; use Tempest\Discovery\Discovery; use Tempest\Discovery\DiscoveryLocation; use Tempest\Discovery\IsDiscovery; use Tempest\Mapper\Attributes\Context; use Tempest\Reflection\ClassReflector; +use Tempest\Support\Priority; final class CasterDiscovery implements Discovery { diff --git a/packages/mapper/src/Casters/ArrayToObjectCollectionCaster.php b/packages/mapper/src/Casters/ArrayToObjectCollectionCaster.php index 67cdb2a755..263658bebb 100644 --- a/packages/mapper/src/Casters/ArrayToObjectCollectionCaster.php +++ b/packages/mapper/src/Casters/ArrayToObjectCollectionCaster.php @@ -4,7 +4,6 @@ namespace Tempest\Mapper\Casters; -use Tempest\Core\Priority; use Tempest\Mapper\Caster; use Tempest\Mapper\ConfigurableCaster; use Tempest\Mapper\Context; @@ -12,6 +11,7 @@ use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; use Tempest\Support\Json; +use Tempest\Support\Priority; #[Priority(Priority::HIGHEST)] final readonly class ArrayToObjectCollectionCaster implements Caster, DynamicCaster, ConfigurableCaster diff --git a/packages/mapper/src/Casters/BooleanCaster.php b/packages/mapper/src/Casters/BooleanCaster.php index 903fad2254..14facfc11d 100644 --- a/packages/mapper/src/Casters/BooleanCaster.php +++ b/packages/mapper/src/Casters/BooleanCaster.php @@ -4,13 +4,13 @@ namespace Tempest\Mapper\Casters; -use Tempest\Core\Priority; use Tempest\Mapper\Caster; use Tempest\Mapper\ConfigurableCaster; use Tempest\Mapper\Context; use Tempest\Mapper\DynamicCaster; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; #[Priority(Priority::NORMAL)] final readonly class BooleanCaster implements Caster, DynamicCaster, ConfigurableCaster diff --git a/packages/mapper/src/Casters/DateTimeCaster.php b/packages/mapper/src/Casters/DateTimeCaster.php index c3a11ae841..421f681e29 100644 --- a/packages/mapper/src/Casters/DateTimeCaster.php +++ b/packages/mapper/src/Casters/DateTimeCaster.php @@ -4,7 +4,6 @@ namespace Tempest\Mapper\Casters; -use Tempest\Core\Priority; use Tempest\DateTime\DateTime; use Tempest\DateTime\DateTimeInterface; use Tempest\DateTime\FormatPattern; @@ -14,6 +13,7 @@ use Tempest\Mapper\DynamicCaster; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; use Tempest\Validation\Rules\HasDateTimeFormat; use Throwable; diff --git a/packages/mapper/src/Casters/EnumCaster.php b/packages/mapper/src/Casters/EnumCaster.php index 8480feee73..120286c2b2 100644 --- a/packages/mapper/src/Casters/EnumCaster.php +++ b/packages/mapper/src/Casters/EnumCaster.php @@ -5,13 +5,13 @@ namespace Tempest\Mapper\Casters; use BackedEnum; -use Tempest\Core\Priority; use Tempest\Mapper\Caster; use Tempest\Mapper\ConfigurableCaster; use Tempest\Mapper\Context; use Tempest\Mapper\DynamicCaster; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; use UnitEnum; #[Priority(Priority::HIGHEST)] diff --git a/packages/mapper/src/Casters/FloatCaster.php b/packages/mapper/src/Casters/FloatCaster.php index 40aeda53c8..97063002dd 100644 --- a/packages/mapper/src/Casters/FloatCaster.php +++ b/packages/mapper/src/Casters/FloatCaster.php @@ -4,13 +4,13 @@ namespace Tempest\Mapper\Casters; -use Tempest\Core\Priority; use Tempest\Mapper\Caster; use Tempest\Mapper\ConfigurableCaster; use Tempest\Mapper\Context; use Tempest\Mapper\DynamicCaster; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; #[Priority(Priority::NORMAL)] final readonly class FloatCaster implements Caster, DynamicCaster, ConfigurableCaster diff --git a/packages/mapper/src/Casters/IntegerCaster.php b/packages/mapper/src/Casters/IntegerCaster.php index 1f9478850e..bd8f41af3f 100644 --- a/packages/mapper/src/Casters/IntegerCaster.php +++ b/packages/mapper/src/Casters/IntegerCaster.php @@ -4,13 +4,13 @@ namespace Tempest\Mapper\Casters; -use Tempest\Core\Priority; use Tempest\Mapper\Caster; use Tempest\Mapper\ConfigurableCaster; use Tempest\Mapper\Context; use Tempest\Mapper\DynamicCaster; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; #[Priority(Priority::NORMAL)] final readonly class IntegerCaster implements Caster, DynamicCaster, ConfigurableCaster diff --git a/packages/mapper/src/Casters/JsonToArrayCaster.php b/packages/mapper/src/Casters/JsonToArrayCaster.php index d948c244fd..55f077a380 100644 --- a/packages/mapper/src/Casters/JsonToArrayCaster.php +++ b/packages/mapper/src/Casters/JsonToArrayCaster.php @@ -4,12 +4,12 @@ namespace Tempest\Mapper\Casters; -use Tempest\Core\Priority; use Tempest\Mapper\Caster; use Tempest\Mapper\DynamicCaster; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; use Tempest\Support\Json; +use Tempest\Support\Priority; #[Priority(Priority::NORMAL)] final class JsonToArrayCaster implements Caster, DynamicCaster diff --git a/packages/mapper/src/Casters/NativeDateTimeCaster.php b/packages/mapper/src/Casters/NativeDateTimeCaster.php index 6505cbc413..c096402133 100644 --- a/packages/mapper/src/Casters/NativeDateTimeCaster.php +++ b/packages/mapper/src/Casters/NativeDateTimeCaster.php @@ -8,13 +8,13 @@ use DateTimeImmutable; use DateTimeInterface; use InvalidArgumentException; -use Tempest\Core\Priority; use Tempest\Mapper\Caster; use Tempest\Mapper\ConfigurableCaster; use Tempest\Mapper\Context; use Tempest\Mapper\DynamicCaster; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; use Tempest\Validation\Rules\HasDateTimeFormat; #[Priority(Priority::HIGHEST)] diff --git a/packages/mapper/src/Casters/ObjectCaster.php b/packages/mapper/src/Casters/ObjectCaster.php index 91622086ab..73650e79f2 100644 --- a/packages/mapper/src/Casters/ObjectCaster.php +++ b/packages/mapper/src/Casters/ObjectCaster.php @@ -4,7 +4,6 @@ namespace Tempest\Mapper\Casters; -use Tempest\Core\Priority; use Tempest\Mapper\Caster; use Tempest\Mapper\ConfigurableCaster; use Tempest\Mapper\Context; @@ -12,6 +11,7 @@ use Tempest\Mapper\Mappers\ArrayToObjectMapper; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; use function Tempest\Mapper\map; diff --git a/packages/mapper/src/SerializerDiscovery.php b/packages/mapper/src/SerializerDiscovery.php index a7f6bb6f36..49855344f8 100644 --- a/packages/mapper/src/SerializerDiscovery.php +++ b/packages/mapper/src/SerializerDiscovery.php @@ -4,12 +4,12 @@ namespace Tempest\Mapper; -use Tempest\Core\Priority; use Tempest\Discovery\Discovery; use Tempest\Discovery\DiscoveryLocation; use Tempest\Discovery\IsDiscovery; use Tempest\Mapper\Attributes\Context; use Tempest\Reflection\ClassReflector; +use Tempest\Support\Priority; final class SerializerDiscovery implements Discovery { diff --git a/packages/mapper/src/Serializers/ArrayOfObjectsSerializer.php b/packages/mapper/src/Serializers/ArrayOfObjectsSerializer.php index 0a8af6346c..1f5c249f1d 100644 --- a/packages/mapper/src/Serializers/ArrayOfObjectsSerializer.php +++ b/packages/mapper/src/Serializers/ArrayOfObjectsSerializer.php @@ -4,13 +4,13 @@ namespace Tempest\Mapper\Serializers; -use Tempest\Core\Priority; use Tempest\Mapper\DynamicSerializer; use Tempest\Mapper\Exceptions\ValueCouldNotBeSerialized; use Tempest\Mapper\Mappers\ObjectToArrayMapper; use Tempest\Mapper\Serializer; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; use function Tempest\Mapper\map; diff --git a/packages/mapper/src/Serializers/ArrayToJsonSerializer.php b/packages/mapper/src/Serializers/ArrayToJsonSerializer.php index 9fc20a17f7..62b9e667e0 100644 --- a/packages/mapper/src/Serializers/ArrayToJsonSerializer.php +++ b/packages/mapper/src/Serializers/ArrayToJsonSerializer.php @@ -4,7 +4,6 @@ namespace Tempest\Mapper\Serializers; -use Tempest\Core\Priority; use Tempest\Mapper\DynamicSerializer; use Tempest\Mapper\Exceptions\ValueCouldNotBeSerialized; use Tempest\Mapper\Serializer; @@ -12,6 +11,7 @@ use Tempest\Reflection\TypeReflector; use Tempest\Support\Arr\ArrayInterface; use Tempest\Support\Json; +use Tempest\Support\Priority; #[Priority(Priority::NORMAL)] final class ArrayToJsonSerializer implements Serializer, DynamicSerializer diff --git a/packages/mapper/src/Serializers/BooleanSerializer.php b/packages/mapper/src/Serializers/BooleanSerializer.php index 580a1bed2a..06611cc160 100644 --- a/packages/mapper/src/Serializers/BooleanSerializer.php +++ b/packages/mapper/src/Serializers/BooleanSerializer.php @@ -4,12 +4,12 @@ namespace Tempest\Mapper\Serializers; -use Tempest\Core\Priority; use Tempest\Mapper\DynamicSerializer; use Tempest\Mapper\Exceptions\ValueCouldNotBeSerialized; use Tempest\Mapper\Serializer; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; #[Priority(Priority::NORMAL)] final class BooleanSerializer implements Serializer, DynamicSerializer diff --git a/packages/mapper/src/Serializers/DateTimeSerializer.php b/packages/mapper/src/Serializers/DateTimeSerializer.php index 85dd2b01d1..12072efd63 100644 --- a/packages/mapper/src/Serializers/DateTimeSerializer.php +++ b/packages/mapper/src/Serializers/DateTimeSerializer.php @@ -5,7 +5,6 @@ namespace Tempest\Mapper\Serializers; use DateTimeInterface as NativeDateTimeInterface; -use Tempest\Core\Priority; use Tempest\DateTime\DateTime; use Tempest\DateTime\DateTimeInterface; use Tempest\DateTime\FormatPattern; @@ -16,6 +15,7 @@ use Tempest\Mapper\Serializer; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; use Tempest\Validation\Rules\HasDateTimeFormat; #[Priority(Priority::HIGHEST)] diff --git a/packages/mapper/src/Serializers/EnumSerializer.php b/packages/mapper/src/Serializers/EnumSerializer.php index bbae4d4dea..e0fdfa2250 100644 --- a/packages/mapper/src/Serializers/EnumSerializer.php +++ b/packages/mapper/src/Serializers/EnumSerializer.php @@ -5,12 +5,12 @@ namespace Tempest\Mapper\Serializers; use BackedEnum; -use Tempest\Core\Priority; use Tempest\Mapper\DynamicSerializer; use Tempest\Mapper\Exceptions\ValueCouldNotBeSerialized; use Tempest\Mapper\Serializer; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; use UnitEnum; #[Priority(Priority::NORMAL)] diff --git a/packages/mapper/src/Serializers/FloatSerializer.php b/packages/mapper/src/Serializers/FloatSerializer.php index 491185bf25..bb547f90fe 100644 --- a/packages/mapper/src/Serializers/FloatSerializer.php +++ b/packages/mapper/src/Serializers/FloatSerializer.php @@ -4,12 +4,12 @@ namespace Tempest\Mapper\Serializers; -use Tempest\Core\Priority; use Tempest\Mapper\DynamicSerializer; use Tempest\Mapper\Exceptions\ValueCouldNotBeSerialized; use Tempest\Mapper\Serializer; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; #[Priority(Priority::NORMAL)] final class FloatSerializer implements Serializer, DynamicSerializer diff --git a/packages/mapper/src/Serializers/IntegerSerializer.php b/packages/mapper/src/Serializers/IntegerSerializer.php index 4bd516c400..ecac29641f 100644 --- a/packages/mapper/src/Serializers/IntegerSerializer.php +++ b/packages/mapper/src/Serializers/IntegerSerializer.php @@ -4,12 +4,12 @@ namespace Tempest\Mapper\Serializers; -use Tempest\Core\Priority; use Tempest\Mapper\DynamicSerializer; use Tempest\Mapper\Exceptions\ValueCouldNotBeSerialized; use Tempest\Mapper\Serializer; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; #[Priority(Priority::NORMAL)] final class IntegerSerializer implements Serializer, DynamicSerializer diff --git a/packages/mapper/src/Serializers/NativeDateTimeSerializer.php b/packages/mapper/src/Serializers/NativeDateTimeSerializer.php index 9acffdd2ba..c2d9b631da 100644 --- a/packages/mapper/src/Serializers/NativeDateTimeSerializer.php +++ b/packages/mapper/src/Serializers/NativeDateTimeSerializer.php @@ -8,7 +8,6 @@ use DateTimeImmutable as NativeDateTimeImmutable; use DateTimeInterface; use DateTimeInterface as NativeDateTimeInterface; -use Tempest\Core\Priority; use Tempest\Mapper\ConfigurableSerializer; use Tempest\Mapper\Context; use Tempest\Mapper\DynamicSerializer; @@ -16,6 +15,7 @@ use Tempest\Mapper\Serializer; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; use Tempest\Validation\Rules\HasDateTimeFormat; #[Priority(Priority::HIGHEST)] diff --git a/packages/mapper/src/Serializers/SerializableSerializer.php b/packages/mapper/src/Serializers/SerializableSerializer.php index f1aa3bf8b1..ec5b3c7736 100644 --- a/packages/mapper/src/Serializers/SerializableSerializer.php +++ b/packages/mapper/src/Serializers/SerializableSerializer.php @@ -6,12 +6,12 @@ use JsonSerializable; use Serializable; -use Tempest\Core\Priority; use Tempest\Mapper\DynamicSerializer; use Tempest\Mapper\Exceptions\ValueCouldNotBeSerialized; use Tempest\Mapper\Serializer; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; #[Priority(Priority::LOW)] final class SerializableSerializer implements Serializer, DynamicSerializer diff --git a/packages/mapper/src/Serializers/StringSerializer.php b/packages/mapper/src/Serializers/StringSerializer.php index 8479467d15..c861ff9bcc 100644 --- a/packages/mapper/src/Serializers/StringSerializer.php +++ b/packages/mapper/src/Serializers/StringSerializer.php @@ -5,12 +5,12 @@ namespace Tempest\Mapper\Serializers; use Stringable; -use Tempest\Core\Priority; use Tempest\Mapper\DynamicSerializer; use Tempest\Mapper\Exceptions\ValueCouldNotBeSerialized; use Tempest\Mapper\Serializer; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; #[Priority(Priority::NORMAL)] final class StringSerializer implements Serializer, DynamicSerializer diff --git a/packages/router/src/ExceptionRendererDiscovery.php b/packages/router/src/ExceptionRendererDiscovery.php index c63f3fc58a..e41c2b8909 100644 --- a/packages/router/src/ExceptionRendererDiscovery.php +++ b/packages/router/src/ExceptionRendererDiscovery.php @@ -4,12 +4,12 @@ namespace Tempest\Router; -use Tempest\Core\Priority; use Tempest\Discovery\Discovery; use Tempest\Discovery\DiscoveryLocation; use Tempest\Discovery\IsDiscovery; use Tempest\Reflection\ClassReflector; use Tempest\Router\Exceptions\ExceptionRenderer; +use Tempest\Support\Priority; final class ExceptionRendererDiscovery implements Discovery { diff --git a/packages/router/src/Exceptions/HtmlExceptionRenderer.php b/packages/router/src/Exceptions/HtmlExceptionRenderer.php index ed5b1f0be5..76bbcf44df 100644 --- a/packages/router/src/Exceptions/HtmlExceptionRenderer.php +++ b/packages/router/src/Exceptions/HtmlExceptionRenderer.php @@ -5,7 +5,6 @@ use Tempest\Auth\Exceptions\AccessWasDenied; use Tempest\Container\Container; use Tempest\Core\Environment; -use Tempest\Core\Priority; use Tempest\Http\ContentType; use Tempest\Http\GenericResponse; use Tempest\Http\HttpRequestFailed; @@ -21,6 +20,7 @@ use Tempest\Support\Arr; use Tempest\Support\Filesystem; use Tempest\Support\Json; +use Tempest\Support\Priority; use Tempest\Validation\Exceptions\ValidationFailed; use Tempest\Validation\FailingRule; use Tempest\Validation\Validator; diff --git a/packages/router/src/Exceptions/JsonExceptionRenderer.php b/packages/router/src/Exceptions/JsonExceptionRenderer.php index f86ef7fbe5..3afe725da9 100644 --- a/packages/router/src/Exceptions/JsonExceptionRenderer.php +++ b/packages/router/src/Exceptions/JsonExceptionRenderer.php @@ -4,7 +4,6 @@ use Tempest\Auth\Exceptions\AccessWasDenied; use Tempest\Core\Environment; -use Tempest\Core\Priority; use Tempest\Http\ContentType; use Tempest\Http\HttpRequestFailed; use Tempest\Http\Request; @@ -13,6 +12,7 @@ use Tempest\Http\Responses\NotFound; use Tempest\Http\Status; use Tempest\Support\Arr; +use Tempest\Support\Priority; use Tempest\Validation\Exceptions\ValidationFailed; use Tempest\Validation\FailingRule; use Tempest\Validation\Validator; diff --git a/packages/router/src/HandleRouteExceptionMiddleware.php b/packages/router/src/HandleRouteExceptionMiddleware.php index 750b422b5c..634682f649 100644 --- a/packages/router/src/HandleRouteExceptionMiddleware.php +++ b/packages/router/src/HandleRouteExceptionMiddleware.php @@ -2,12 +2,12 @@ namespace Tempest\Router; -use Tempest\Core\Priority; use Tempest\Http\HttpRequestFailed; use Tempest\Http\Request; use Tempest\Http\Response; use Tempest\Http\Responses\NotFound; use Tempest\Router\Exceptions\RouteBindingFailed; +use Tempest\Support\Priority; #[Priority(Priority::FRAMEWORK - 10)] final readonly class HandleRouteExceptionMiddleware implements HttpMiddleware diff --git a/packages/router/src/HandleRouteSpecificMiddleware.php b/packages/router/src/HandleRouteSpecificMiddleware.php index 9e27c96da5..1498b77fc7 100644 --- a/packages/router/src/HandleRouteSpecificMiddleware.php +++ b/packages/router/src/HandleRouteSpecificMiddleware.php @@ -4,9 +4,9 @@ use Tempest\Container\Container; use Tempest\Core\Middleware; -use Tempest\Core\Priority; use Tempest\Http\Request; use Tempest\Http\Response; +use Tempest\Support\Priority; #[Priority(Priority::LOWEST)] final readonly class HandleRouteSpecificMiddleware implements HttpMiddleware diff --git a/packages/router/src/MatchRouteMiddleware.php b/packages/router/src/MatchRouteMiddleware.php index efef027acf..acbfc45864 100644 --- a/packages/router/src/MatchRouteMiddleware.php +++ b/packages/router/src/MatchRouteMiddleware.php @@ -3,7 +3,6 @@ namespace Tempest\Router; use Tempest\Container\Container; -use Tempest\Core\Priority; use Tempest\Http\GenericRequest; use Tempest\Http\Mappers\RequestToObjectMapper; use Tempest\Http\Method; @@ -11,6 +10,7 @@ use Tempest\Http\Response; use Tempest\Http\Responses\NotFound; use Tempest\Router\Routing\Matching\RouteMatcher; +use Tempest\Support\Priority; use function Tempest\Mapper\map; diff --git a/packages/router/src/PreventCrossSiteRequestsMiddleware.php b/packages/router/src/PreventCrossSiteRequestsMiddleware.php index 645a884aa8..8307d00bc5 100644 --- a/packages/router/src/PreventCrossSiteRequestsMiddleware.php +++ b/packages/router/src/PreventCrossSiteRequestsMiddleware.php @@ -4,11 +4,11 @@ namespace Tempest\Router; -use Tempest\Core\Priority; use Tempest\Http\Method; use Tempest\Http\Request; use Tempest\Http\Response; use Tempest\Http\Responses\Forbidden; +use Tempest\Support\Priority; /** * Protects against cross-site requests using `Sec-Fetch-*` headers. This is a modern equivalent of session token-based cross-site forgery protection. diff --git a/packages/router/src/SetCookieHeadersMiddleware.php b/packages/router/src/SetCookieHeadersMiddleware.php index e8f9bfe830..f9b9779d3c 100644 --- a/packages/router/src/SetCookieHeadersMiddleware.php +++ b/packages/router/src/SetCookieHeadersMiddleware.php @@ -4,11 +4,11 @@ namespace Tempest\Router; -use Tempest\Core\Priority; use Tempest\Cryptography\Encryption\Encrypter; use Tempest\Http\Cookie\CookieManager; use Tempest\Http\Request; use Tempest\Http\Response; +use Tempest\Support\Priority; /** * Adds the `Set-Cookie` headers to the response based on the cookie manager. diff --git a/packages/core/src/Priority.php b/packages/support/src/Priority.php similarity index 94% rename from packages/core/src/Priority.php rename to packages/support/src/Priority.php index 87d13a60b0..9c80b82708 100644 --- a/packages/core/src/Priority.php +++ b/packages/support/src/Priority.php @@ -1,6 +1,6 @@ rule(UpdateDiscoveryImportsRector::class); $config->rule(UpdateKernelDiscoveryPropertiesRector::class); + $config->rule(UpdatePriorityImportsRector::class); }; diff --git a/packages/upgrade/src/Tempest34/UpdatePriorityImportsRector.php b/packages/upgrade/src/Tempest34/UpdatePriorityImportsRector.php new file mode 100644 index 0000000000..6964d94d42 --- /dev/null +++ b/packages/upgrade/src/Tempest34/UpdatePriorityImportsRector.php @@ -0,0 +1,42 @@ +name->toString() !== self::OLD_CLASS) { + return null; + } + + $node->name = new Name(self::NEW_CLASS); + + return $node; + } + + if ($node instanceof FullyQualified && $node->toString() === self::OLD_CLASS) { + return new FullyQualified(self::NEW_CLASS); + } + + return null; + } +} diff --git a/packages/upgrade/tests/Tempest34/Fixtures/FullyQualifiedPriority.input.php b/packages/upgrade/tests/Tempest34/Fixtures/FullyQualifiedPriority.input.php new file mode 100644 index 0000000000..942feb5ae4 --- /dev/null +++ b/packages/upgrade/tests/Tempest34/Fixtures/FullyQualifiedPriority.input.php @@ -0,0 +1,8 @@ +assertNotContains('Tempest\Core\DiscoveryCache'); } + public function test_priority_namespace_change(): void + { + $this->rector + ->runFixture(__DIR__ . '/Fixtures/PriorityNamespaceChange.input.php') + ->assertContains('use Tempest\Support\Priority;') + ->assertNotContains('use Tempest\Core\Priority;'); + } + + public function test_fully_qualified_priority(): void + { + $this->rector + ->runFixture(__DIR__ . '/Fixtures/FullyQualifiedPriority.input.php') + ->assertContains('Tempest\Support\Priority') + ->assertNotContains('Tempest\Core\Priority'); + } + public function test_kernel_discovery_locations_refactored(): void { $this->rector diff --git a/tests/Integration/Core/Fixtures/MiddlewareFramework.php b/tests/Integration/Core/Fixtures/MiddlewareFramework.php index 932d6ae1f1..fc91952873 100644 --- a/tests/Integration/Core/Fixtures/MiddlewareFramework.php +++ b/tests/Integration/Core/Fixtures/MiddlewareFramework.php @@ -2,7 +2,7 @@ namespace Tests\Tempest\Integration\Core\Fixtures; -use Tempest\Core\Priority; +use Tempest\Support\Priority; #[Priority(Priority::FRAMEWORK)] final class MiddlewareFramework {} diff --git a/tests/Integration/Core/Fixtures/MiddlewareHigh.php b/tests/Integration/Core/Fixtures/MiddlewareHigh.php index b8831399d4..de5591a34c 100644 --- a/tests/Integration/Core/Fixtures/MiddlewareHigh.php +++ b/tests/Integration/Core/Fixtures/MiddlewareHigh.php @@ -2,7 +2,7 @@ namespace Tests\Tempest\Integration\Core\Fixtures; -use Tempest\Core\Priority; +use Tempest\Support\Priority; #[Priority(Priority::HIGH)] final class MiddlewareHigh {} diff --git a/tests/Integration/Core/Fixtures/MiddlewareHighest.php b/tests/Integration/Core/Fixtures/MiddlewareHighest.php index 0ddae4af66..84ef0a01fa 100644 --- a/tests/Integration/Core/Fixtures/MiddlewareHighest.php +++ b/tests/Integration/Core/Fixtures/MiddlewareHighest.php @@ -2,7 +2,7 @@ namespace Tests\Tempest\Integration\Core\Fixtures; -use Tempest\Core\Priority; +use Tempest\Support\Priority; #[Priority(Priority::HIGHEST)] final class MiddlewareHighest {} diff --git a/tests/Integration/Core/Fixtures/MiddlewareLow.php b/tests/Integration/Core/Fixtures/MiddlewareLow.php index 7dfff0f0f2..22185c2225 100644 --- a/tests/Integration/Core/Fixtures/MiddlewareLow.php +++ b/tests/Integration/Core/Fixtures/MiddlewareLow.php @@ -2,7 +2,7 @@ namespace Tests\Tempest\Integration\Core\Fixtures; -use Tempest\Core\Priority; +use Tempest\Support\Priority; #[Priority(Priority::LOW)] final class MiddlewareLow {} diff --git a/tests/Integration/Core/Fixtures/MiddlewareLowest.php b/tests/Integration/Core/Fixtures/MiddlewareLowest.php index 4302774b90..37a5e7d30a 100644 --- a/tests/Integration/Core/Fixtures/MiddlewareLowest.php +++ b/tests/Integration/Core/Fixtures/MiddlewareLowest.php @@ -2,7 +2,7 @@ namespace Tests\Tempest\Integration\Core\Fixtures; -use Tempest\Core\Priority; +use Tempest\Support\Priority; #[Priority(Priority::LOWEST)] final class MiddlewareLowest {} diff --git a/tests/Integration/Core/Fixtures/MiddlewareNormal.php b/tests/Integration/Core/Fixtures/MiddlewareNormal.php index 7201eca48e..65cd7779c4 100644 --- a/tests/Integration/Core/Fixtures/MiddlewareNormal.php +++ b/tests/Integration/Core/Fixtures/MiddlewareNormal.php @@ -2,7 +2,7 @@ namespace Tests\Tempest\Integration\Core\Fixtures; -use Tempest\Core\Priority; +use Tempest\Support\Priority; #[Priority(Priority::NORMAL)] final class MiddlewareNormal {} diff --git a/tests/Integration/Http/Exceptions/ExceptionRendererTest.php b/tests/Integration/Http/Exceptions/ExceptionRendererTest.php index c34268824f..a932440ded 100644 --- a/tests/Integration/Http/Exceptions/ExceptionRendererTest.php +++ b/tests/Integration/Http/Exceptions/ExceptionRendererTest.php @@ -11,7 +11,6 @@ use Tempest\Container\Container; use Tempest\Core\FrameworkKernel; use Tempest\Core\Kernel; -use Tempest\Core\Priority; use Tempest\Http\ContentType; use Tempest\Http\GenericRequest; use Tempest\Http\GenericResponse; @@ -25,6 +24,7 @@ use Tempest\Router\ResponseSender; use Tempest\Router\RouteConfig; use Tempest\Support\Json; +use Tempest\Support\Priority; use Tests\Tempest\Integration\FrameworkIntegrationTestCase; use Throwable; diff --git a/tests/Integration/Mapper/MapperContextTest.php b/tests/Integration/Mapper/MapperContextTest.php index 46117d97a3..3fbf0b712a 100644 --- a/tests/Integration/Mapper/MapperContextTest.php +++ b/tests/Integration/Mapper/MapperContextTest.php @@ -4,7 +4,6 @@ use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\Attributes\TestWith; -use Tempest\Core\Priority; use Tempest\Mapper; use Tempest\Mapper\Caster; use Tempest\Mapper\CasterFactory; @@ -14,6 +13,7 @@ use Tempest\Mapper\SerializerFactory; use Tempest\Reflection\PropertyReflector; use Tempest\Reflection\TypeReflector; +use Tempest\Support\Priority; use Tests\Tempest\Fixtures\Modules\Books\Models\Author; use Tests\Tempest\Integration\FrameworkIntegrationTestCase;