Merge branch 'main' into fix/invalid-closing-tag-commented-out-code

Author: brendt

.github/workflows/isolated-tests.yml

@@ -59,7 +59,7 @@ jobs:
           coverage: pcov
 
       - name: Install PHPUnit
-        run: composer global require phpunit/phpunit:^11.5.17
+        run: composer global require phpunit/phpunit:^12.2.3
 
       - name: Setup problem matchers
         run: |

bin/release

@@ -18,6 +18,7 @@ use Composer\Semver\VersionParser;
 use Tempest\Console\Console;
 use Tempest\Console\ConsoleApplication;
 use Tempest\Console\Exceptions\InterruptException;
+
 use function Tempest\get;
 use function Tempest\Support\arr;
 use function Tempest\Support\str;
@@ -282,10 +283,10 @@ function ensureTagDoesNotExist(string $version): void
 }
 
 /*
-|--------------------------------------------------------------------------
-| Script starts here.
-|--------------------------------------------------------------------------
-*/
+ * |--------------------------------------------------------------------------
+ * | Script starts here.
+ * |--------------------------------------------------------------------------
+ */
 
 try {
     ConsoleApplication::boot();
@@ -313,7 +314,7 @@ try {
 
     if (! $console->confirm("The next tag will be <em>{$tag}</em>. Release?")) {
         $console->error('Cancelled.');
-        exit;
+        exit();
     }
 
     // Bump PHP packages
@@ -364,6 +365,6 @@ try {
         $tag,
     ));
 
-    exit;
+    exit();
 } catch (InterruptException) {
 }

composer.json

@@ -35,12 +35,12 @@
         "symfony/uid": "^7.1",
         "symfony/var-dumper": "^7.1",
         "symfony/var-exporter": "^7.1",
+        "symfony/yaml": "^7.3",
         "tempest/highlight": "^2.11.4",
         "vlucas/phpdotenv": "^5.6",
         "voku/portable-ascii": "^2.0.3"
     },
     "require-dev": {
-        "aidan-casey/mock-client": "dev-master",
         "carthage-software/mago": "0.24.1",
         "guzzlehttp/psr7": "^2.6.1",
         "illuminate/view": "~11.7.0",
@@ -59,7 +59,7 @@
         "phpat/phpat": "^0.11.0",
         "phpbench/phpbench": "84.x-dev",
         "phpstan/phpstan": "^2.0",
-        "phpunit/phpunit": "^11.5.17",
+        "phpunit/phpunit": "^12.2.3",
         "rector/rector": "^2.0-rc2",
         "spatie/phpunit-snapshot-assertions": "^5.1.8",
         "spaze/phpstan-disallowed-calls": "^4.0",
@@ -83,6 +83,7 @@
         "tempest/generation": "self.version",
         "tempest/http": "self.version",
         "tempest/http-client": "self.version",
+        "tempest/intl": "self.version",
         "tempest/log": "self.version",
         "tempest/mapper": "self.version",
         "tempest/reflection": "self.version",
@@ -117,6 +118,7 @@
             "Tempest\\Generation\\": "packages/generation/src",
             "Tempest\\HttpClient\\": "packages/http-client/src",
             "Tempest\\Http\\": "packages/http/src",
+            "Tempest\\Intl\\": "packages/intl/src",
             "Tempest\\Log\\": "packages/log/src",
             "Tempest\\Mapper\\": "packages/mapper/src",
             "Tempest\\Reflection\\": "packages/reflection/src",
@@ -137,6 +139,8 @@
             "packages/datetime/src/functions.php",
             "packages/debug/src/functions.php",
             "packages/event-bus/src/functions.php",
+            "packages/intl/src/Number/functions.php",
+            "packages/intl/src/functions.php",
             "packages/mapper/src/functions.php",
             "packages/reflection/src/functions.php",
             "packages/router/src/functions.php",
@@ -145,11 +149,9 @@
             "packages/support/src/Filesystem/functions.php",
             "packages/support/src/Html/functions.php",
             "packages/support/src/Json/functions.php",
-            "packages/support/src/Language/functions.php",
             "packages/support/src/Math/constants.php",
             "packages/support/src/Math/functions.php",
             "packages/support/src/Namespace/functions.php",
-            "packages/support/src/Number/functions.php",
             "packages/support/src/Path/functions.php",
             "packages/support/src/Random/functions.php",
             "packages/support/src/Regex/functions.php",
@@ -174,6 +176,7 @@
             "Tempest\\Generation\\Tests\\": "packages/generation/tests",
             "Tempest\\HttpClient\\Tests\\": "packages/http-client/tests",
             "Tempest\\Http\\Tests\\": "packages/http/tests",
+            "Tempest\\Intl\\Tests\\": "packages/intl/tests",
             "Tempest\\Log\\Tests\\": "packages/log/tests",
             "Tempest\\Mapper\\Tests\\": "packages/mapper/tests",
             "Tempest\\Reflection\\Tests\\": "packages/reflection/tests",
@@ -202,6 +205,7 @@
         "phpstan": "vendor/bin/phpstan analyse src tests --memory-limit=1G",
         "rector": "vendor/bin/rector process --no-ansi",
         "merge": "php -d\"error_reporting = E_ALL & ~E_DEPRECATED\" vendor/bin/monorepo-builder merge",
+        "intl:plural": "./packages/intl/bin/plural-rules.php",
         "release": [
             "composer qa",
             "./bin/release"

packages/console/src/Middleware/ResolveOrRescueMiddleware.php

@@ -84,7 +84,7 @@ private function getSimilarCommands(ImmutableString $search): ImmutableArray
             $currentName = str($consoleCommand->getName());
 
             // Already added to suggestions
-            if ($suggestions->contains($currentName->toString())) {
+            if ($suggestions->hasValue($currentName->toString())) {
                 continue;
             }
 

packages/console/src/Middleware/ValidateNamedArgumentsMiddleware.php

@@ -29,7 +29,7 @@ public function __invoke(Invocation $invocation, ConsoleMiddlewareCallable $next
 
         $invalidInput = arr($invocation->argumentBag->arguments)
             ->filter(fn (ConsoleInputArgument $argument) => $argument->name !== null)
-            ->filter(fn (ConsoleInputArgument $argument) => ! $allowedParameterNames->contains(ltrim($argument->name, '-')))
+            ->filter(fn (ConsoleInputArgument $argument) => ! $allowedParameterNames->hasValue(ltrim($argument->name, '-')))
             ->filter(fn (ConsoleInputArgument $argument) => ! in_array($argument->name, GlobalFlags::values(), strict: true));
 
         if ($invalidInput->isNotEmpty()) {

packages/database/composer.json

@@ -9,6 +9,7 @@
         "tempest/container": "dev-main",
         "tempest/event-bus": "dev-main",
         "tempest/mapper": "dev-main",
+        "tempest/intl": "dev-main",
         "tempest/support": "dev-main"
     },
     "autoload": {

packages/database/src/Mappers/SelectModelMapper.php

@@ -103,7 +103,7 @@ public function normalizeRow(ModelInspector $model, array $row, MutableArray $da
 
                     $originalKey .= $relation->name . '.';
 
-                    if (! $data->has(trim($originalKey, '.'))) {
+                    if (! $data->hasKey(trim($originalKey, '.'))) {
                         $data->set(trim($originalKey, '.'), []);
                     }
 

packages/database/tests/Tables/PluralizedSnakeCaseStrategyTest.php

@@ -9,7 +9,7 @@
 use Tempest\Container\GenericContainer;
 use Tempest\Database\Migrations\Migration;
 use Tempest\Database\Tables\PluralizedSnakeCaseStrategy;
-use Tempest\Support\Pluralizer\PluralizerInitializer;
+use Tempest\Intl\Pluralizer\PluralizerInitializer;
 
 /**
  * @internal

packages/datetime/composer.json

@@ -5,6 +5,7 @@
     "minimum-stability": "dev",
     "require": {
         "php": "^8.4",
+        "tempest/intl": "dev-main",
         "tempest/support": "dev-main"
     },
     "autoload": {

packages/datetime/src/DateTime.php

@@ -6,7 +6,7 @@
 
 use DateTimeInterface as NativeDateTimeInterface;
 use IntlCalendar;
-use Tempest\Support\Language\Locale;
+use Tempest\Intl\Locale;
 
 /**
  * Represents a date and time in a specific timezone.