From 1043a0f1f5fb29b43fec098b6c3ac56074cd2517 Mon Sep 17 00:00:00 2001 From: brendt Date: Wed, 22 Jul 2026 09:00:24 +0200 Subject: [PATCH 1/2] wip --- composer.json | 18 +++++++++--------- packages/cache/composer.json | 2 +- packages/console/composer.json | 2 +- packages/core/composer.json | 2 +- packages/debug/composer.json | 2 +- packages/discovery/composer.json | 2 +- packages/http/composer.json | 2 +- packages/icon/composer.json | 2 +- .../MessageFormat/Functions/NumberFunction.php | 3 ++- packages/mail/composer.json | 6 +++--- packages/process/composer.json | 2 +- packages/router/composer.json | 2 +- .../router/src/RouteBindingInitializer.php | 3 ++- packages/support/composer.json | 2 +- packages/view/composer.json | 2 +- 15 files changed, 27 insertions(+), 25 deletions(-) diff --git a/composer.json b/composer.json index a7083bcdb8..ec21b056fb 100644 --- a/composer.json +++ b/composer.json @@ -36,13 +36,13 @@ "psr/http-message": "^1.0|^2.0", "psr/log": "^3.0.0", "rector/rector": "2.3.8", - "symfony/cache": "^7.3", - "symfony/filesystem": "^7.3", - "symfony/mailer": "^7.2.6", - "symfony/process": "^7.3", - "symfony/uid": "^7.1", - "symfony/var-dumper": "^7.1", - "symfony/var-exporter": "^7.1", + "symfony/cache": "^7.3|^8.0", + "symfony/filesystem": "^7.3|^8.0", + "symfony/mailer": "^7.2.6|^8.0", + "symfony/process": "^7.3|^8.0", + "symfony/uid": "^7.1|^8.0", + "symfony/var-dumper": "^7.1|^8.0", + "symfony/var-exporter": "^7.1|^8.0", "symfony/yaml": "^7.3|^8.0", "tempest/highlight": "^2.11.4", "vlucas/phpdotenv": "^5.6.1", @@ -85,8 +85,8 @@ "spatie/phpunit-snapshot-assertions": "^5.1.8", "spaze/phpstan-disallowed-calls": "^4.0", "stevenmaguire/oauth2-microsoft": "^2.2", - "symfony/amazon-mailer": "^7.2.0", - "symfony/postmark-mailer": "^7.2.6", + "symfony/amazon-mailer": "^7.2.0|^8.0", + "symfony/postmark-mailer": "^7.2.6|^8.0", "symplify/monorepo-builder": "^11.2", "tempest/blade": "dev-main", "thenetworg/oauth2-azure": "^2.2", diff --git a/packages/cache/composer.json b/packages/cache/composer.json index 3accc86576..b09bb78e11 100644 --- a/packages/cache/composer.json +++ b/packages/cache/composer.json @@ -4,7 +4,7 @@ "require": { "php": "^8.5", "psr/cache": "^3.0", - "symfony/cache": "^7.3", + "symfony/cache": "^7.3|^8.0", "tempest/core": "3.x-dev", "tempest/clock": "3.x-dev", "tempest/kv-store": "3.x-dev", diff --git a/packages/console/composer.json b/packages/console/composer.json index 21f4d7366e..66e7894867 100644 --- a/packages/console/composer.json +++ b/packages/console/composer.json @@ -5,7 +5,7 @@ "minimum-stability": "dev", "require": { "php": "^8.5", - "symfony/filesystem": "^7.3", + "symfony/filesystem": "^7.3|^8.0", "tempest/core": "3.x-dev", "tempest/container": "3.x-dev", "tempest/generation": "3.x-dev", diff --git a/packages/core/composer.json b/packages/core/composer.json index c30c168dd5..63db9d3755 100644 --- a/packages/core/composer.json +++ b/packages/core/composer.json @@ -10,7 +10,7 @@ "tempest/reflection": "3.x-dev", "tempest/support": "3.x-dev", "vlucas/phpdotenv": "^5.6.1", - "symfony/cache": "^7.3", + "symfony/cache": "^7.3|^8.0", "filp/whoops": "^2.15" }, "require-dev": { diff --git a/packages/debug/composer.json b/packages/debug/composer.json index 7f8fa9b5dc..df1cf96856 100644 --- a/packages/debug/composer.json +++ b/packages/debug/composer.json @@ -6,7 +6,7 @@ "require": { "php": "^8.5", "tempest/highlight": "^2.11.4", - "symfony/var-dumper": "^7.1" + "symfony/var-dumper": "^7.1|^8.0" }, "require-dev": { "tempest/console": "3.x-dev" diff --git a/packages/discovery/composer.json b/packages/discovery/composer.json index b1232690a7..35b8f927c6 100644 --- a/packages/discovery/composer.json +++ b/packages/discovery/composer.json @@ -8,7 +8,7 @@ "tempest/reflection": "3.x-dev", "tempest/support": "3.x-dev", "psr/container": "^2.0", - "symfony/cache": "^7.3" + "symfony/cache": "^7.3|^8.0" }, "require-dev": { "tempest/container": "3.x-dev", diff --git a/packages/http/composer.json b/packages/http/composer.json index f24005650b..aa1367bc8e 100644 --- a/packages/http/composer.json +++ b/packages/http/composer.json @@ -14,7 +14,7 @@ "laminas/laminas-diactoros": "^3.3", "psr/http-factory": "^1.0", "psr/http-message": "^1.0|^2.0", - "symfony/uid": "^7.1" + "symfony/uid": "^7.1|^8.0" }, "autoload": { "psr-4": { diff --git a/packages/icon/composer.json b/packages/icon/composer.json index 9d5cddcadd..d9fbb60d64 100644 --- a/packages/icon/composer.json +++ b/packages/icon/composer.json @@ -8,7 +8,7 @@ "tempest/container": "3.x-dev", "tempest/http-client": "3.x-dev", "tempest/support": "3.x-dev", - "symfony/cache": "^7.3" + "symfony/cache": "^7.3|^8.0" }, "suggest": { "tempest/event-bus": "For events support" diff --git a/packages/intl/src/MessageFormat/Functions/NumberFunction.php b/packages/intl/src/MessageFormat/Functions/NumberFunction.php index 67cb7a7e35..2df444d780 100644 --- a/packages/intl/src/MessageFormat/Functions/NumberFunction.php +++ b/packages/intl/src/MessageFormat/Functions/NumberFunction.php @@ -2,6 +2,7 @@ namespace Tempest\Intl\MessageFormat\Functions; +use MessageFormatter; use Tempest\Intl\Currency; use Tempest\Intl\IntlConfig; use Tempest\Intl\MessageFormat\Formatter\FormattedValue; @@ -50,7 +51,7 @@ private function getOrdinalCategory(float|int $number): string { $cacheKey = "{$this->intlConfig->currentLocale->value}:{$number}"; - return $this->ordinalCategories[$cacheKey] ??= \MessageFormatter::formatMessage( + return $this->ordinalCategories[$cacheKey] ??= MessageFormatter::formatMessage( $this->intlConfig->currentLocale->value, '{number, selectordinal, zero {zero} one {one} two {two} few {few} many {many} other {other}}', ['number' => $number], diff --git a/packages/mail/composer.json b/packages/mail/composer.json index 2ba5c844f2..96ec57a238 100644 --- a/packages/mail/composer.json +++ b/packages/mail/composer.json @@ -8,11 +8,11 @@ "tempest/reflection": "3.x-dev", "tempest/support": "3.x-dev", "tempest/event-bus": "3.x-dev", - "symfony/mailer": "^7.2.6" + "symfony/mailer": "^7.2.6|^8.0" }, "require-dev": { - "symfony/postmark-mailer": "^7.2.6", - "symfony/amazon-mailer": "^7.2.0" + "symfony/postmark-mailer": "^7.2.6|^8.0", + "symfony/amazon-mailer": "^7.2.0|^8.0" }, "suggest": { "tempest/storage": "For storage attachment support" diff --git a/packages/process/composer.json b/packages/process/composer.json index 119dc53286..70e199197c 100644 --- a/packages/process/composer.json +++ b/packages/process/composer.json @@ -5,7 +5,7 @@ "minimum-stability": "dev", "require": { "php": "^8.5", - "symfony/process": "^7.3", + "symfony/process": "^7.3|^8.0", "tempest/container": "3.x-dev", "tempest/support": "3.x-dev", "tempest/datetime": "3.x-dev" diff --git a/packages/router/composer.json b/packages/router/composer.json index a7afe785fb..8a176a5a80 100644 --- a/packages/router/composer.json +++ b/packages/router/composer.json @@ -8,7 +8,7 @@ "tempest/http": "3.x-dev", "tempest/view": "3.x-dev", "tempest/highlight": "^2.11.4", - "symfony/var-exporter": "^7.1" + "symfony/var-exporter": "^7.1|^8.0" }, "autoload": { "files": [ diff --git a/packages/router/src/RouteBindingInitializer.php b/packages/router/src/RouteBindingInitializer.php index a7c8518271..74c564f4d5 100644 --- a/packages/router/src/RouteBindingInitializer.php +++ b/packages/router/src/RouteBindingInitializer.php @@ -4,6 +4,7 @@ namespace Tempest\Router; +use Tempest\Reflection\ParameterReflector; use Tempest\Container\Container; use Tempest\Container\DynamicInitializer; use Tempest\Reflection\ClassReflector; @@ -43,7 +44,7 @@ public function initialize(ClassReflector $class, string|UnitEnum|null $tag, Con if ($withRelations !== null) { $resolve = $class->getMethod('resolve'); - if ($resolve->getParameter('relations') === null && ! $resolve->getReflection()->isVariadic()) { + if (!$resolve->getParameter('relations') instanceof ParameterReflector && ! $resolve->getReflection()->isVariadic()) { throw new RouteBindingDidNotSupportRelations($class->getName()); } } diff --git a/packages/support/composer.json b/packages/support/composer.json index c2b69a31b4..567400c7e1 100644 --- a/packages/support/composer.json +++ b/packages/support/composer.json @@ -6,7 +6,7 @@ "require": { "php": "^8.5", "voku/portable-ascii": "^2.0.3", - "symfony/uid": "^7.1" + "symfony/uid": "^7.1|^8.0" }, "autoload": { "psr-4": { diff --git a/packages/view/composer.json b/packages/view/composer.json index 36cd3b0c9d..ee1c114a32 100644 --- a/packages/view/composer.json +++ b/packages/view/composer.json @@ -10,7 +10,7 @@ "tempest/validation": "3.x-dev", "tempest/clock": "3.x-dev", "league/commonmark": "^2.7", - "symfony/cache": "^7.3" + "symfony/cache": "^7.3|^8.0" }, "autoload": { "files": [ From f0bc1fd12d64182a5743460b6ac0930a79e7ad68 Mon Sep 17 00:00:00 2001 From: brendt Date: Wed, 22 Jul 2026 10:13:39 +0200 Subject: [PATCH 2/2] wip --- packages/router/src/RouteBindingInitializer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/router/src/RouteBindingInitializer.php b/packages/router/src/RouteBindingInitializer.php index 74c564f4d5..a5249843fd 100644 --- a/packages/router/src/RouteBindingInitializer.php +++ b/packages/router/src/RouteBindingInitializer.php @@ -4,10 +4,10 @@ namespace Tempest\Router; -use Tempest\Reflection\ParameterReflector; use Tempest\Container\Container; use Tempest\Container\DynamicInitializer; use Tempest\Reflection\ClassReflector; +use Tempest\Reflection\ParameterReflector; use Tempest\Router\Exceptions\RouteBindingDidNotSupportRelations; use Tempest\Router\Exceptions\RouteBindingFailed; use UnitEnum; @@ -44,7 +44,7 @@ public function initialize(ClassReflector $class, string|UnitEnum|null $tag, Con if ($withRelations !== null) { $resolve = $class->getMethod('resolve'); - if (!$resolve->getParameter('relations') instanceof ParameterReflector && ! $resolve->getReflection()->isVariadic()) { + if (! $resolve->getParameter('relations') instanceof ParameterReflector && ! $resolve->getReflection()->isVariadic()) { throw new RouteBindingDidNotSupportRelations($class->getName()); } }