Merge branch 'master' into sa/fix-some-issues

Author: tarlepp

composer.json

@@ -68,7 +68,7 @@
 	},
 	"require-dev": {
 		"bamarni/composer-bin-plugin": "1.8.2",
-		"doctrine/doctrine-fixtures-bundle": "3.5.0",
+		"doctrine/doctrine-fixtures-bundle": "3.5.1",
 		"roave/security-advisories": "dev-latest",
 		"symfony/browser-kit": "6.3.8",
 		"symfony/debug-bundle": "6.3.2",

composer.lock

@@ -73,12 +73,13 @@ public function getTimezones(): array
     /**
      * @throws Throwable
      *
-     * @return array<int, array{timezone: string, identifier: string,  offset: string, value: string}>
+     * @return array<int, array{timezone: string, identifier: non-empty-string,  offset: string, value: string}>
      */
     public function getFormattedTimezones(): array
     {
         $output = [];
 
+        /** @var array<int, non-empty-string> $identifiers */
         $identifiers = DateTimeZone::listIdentifiers();
 
         foreach ($identifiers as $identifier) {

src/Service/Localization.php

@@ -34,27 +34,35 @@
  * @throws Throwable
  */
 $InitializeFastestEnvironmentVariables = static function (string $readableChannel): void {
+    /**
+     * @var array<string, string> $cache
+     */
     static $cache = [];
 
     if (!array_key_exists($readableChannel, $cache)) {
-        // Parse current environment file
+        /**
+         * Parse current environment file
+         *
+         * @var array<string, string> $variables
+         */
         $variables = (new Dotenv())->parse((string)file_get_contents(dirname(__DIR__) . '/.env.test'));
 
+        /** @var array<string, string> $configuration */
         $configuration = JSON::decode((string)file_get_contents($variables['APPLICATION_CONFIG']), true);
 
-        if (!is_array($configuration) || !array_key_exists('DATABASE_URL', $configuration)) {
+        if (!array_key_exists('DATABASE_URL', $configuration)) {
             throw new RuntimeException('Cannot get `DATABASE_URL from specified env file.');
         }
 
         $originalDatabaseUrl = $configuration['DATABASE_URL'];
 
-        $databaseName = trim(((array)parse_url((string)$originalDatabaseUrl))['path'] ?? '', '/');
+        $databaseName = trim(((array)parse_url($originalDatabaseUrl))['path'] ?? '', '/');
 
         // Replace DATABASE_URL variable with proper database name
         $databaseUrl = str_replace(
             '/' . $databaseName . '?',
             '/' . $databaseName . '_' . $readableChannel . '?',
-            (string)$originalDatabaseUrl
+            $originalDatabaseUrl
         );
 
         $cache[$readableChannel] = $databaseUrl;
@@ -70,7 +78,10 @@
 $InitializeEnvironment = static function (): void {
     $localPhpEnvFile = dirname(__DIR__) . '/.env.local.php';
 
-    /** @psalm-suppress MissingFile */
+    /**
+     * @psalm-suppress MissingFile
+     * @var array<string, string>|null $env
+     */
     $env = is_readable($localPhpEnvFile) ? include $localPhpEnvFile : null;
 
     // Load cached env vars if the .env.local.php file exists

tests/bootstrap.php

@@ -6,7 +6,7 @@
 	},
 	"require-dev": {
 		"liuggio/fastest": "1.11.0",
-		"phpunit/php-code-coverage": "10.1.8",
+		"phpunit/php-code-coverage": "10.1.9",
 		"phpunit/phpcov": "9.0.2",
 		"phpunit/phpunit": "10.0.19",
 		"roave/security-advisories": "dev-latest",

tools/01_phpunit/composer.json

@@ -5,7 +5,7 @@
 		"php": "^8.2.0"
 	},
 	"require-dev": {
-		"phpstan/phpstan": "1.10.42",
+		"phpstan/phpstan": "1.10.44",
 		"phpstan/phpstan-phpunit": "1.3.15",
 		"phpstan/phpstan-symfony": "1.3.5",
 		"roave/security-advisories": "dev-latest"

tools/01_phpunit/composer.lock

@@ -8,7 +8,7 @@
 		"roave/security-advisories": "dev-latest",
 		"psalm/plugin-phpunit": "0.18.4",
 		"psalm/plugin-symfony": "5.1.0",
-		"vimeo/psalm": "5.15.0",
+		"vimeo/psalm": "5.16.0",
 		"weirdan/doctrine-psalm-plugin": "2.9.0"
 	},
 	"config": {