Merge pull request #2631 from tarlepp/chore(deps)/dependency-update

Chore(deps) - Dependency update

Makefile

@@ -361,7 +361,7 @@ ifeq ($(INSIDE_DOCKER_CONTAINER), 1)
 	@mkdir -p build
 	@@bin/console cache:clear
 	@php ./vendor/bin/psalm --version
-	@php ./vendor/bin/psalm --no-cache --show-info=true --report=./build/psalm.json
+	@php ./vendor/bin/psalm --no-cache --report=./build/psalm.json
 else ifeq ($(RUNNING_SOME_CONTAINERS), 0)
 	$(WARNING_DOCKER)
 else ifneq ($(RUNNING_ALL_CONTAINERS), 1)

composer.json

@@ -28,14 +28,14 @@
 		"ext-random": "*",
 		"doctrine/doctrine-bundle": "2.11.1",
 		"doctrine/doctrine-migrations-bundle": "3.3.0",
-		"doctrine/orm": "2.17.2",
+		"doctrine/orm": "2.17.3",
 		"friendsofphp/proxy-manager-lts": "1.0.16",
 		"gedmo/doctrine-extensions": "3.14.0",
 		"lexik/jwt-authentication-bundle": "2.20.3",
 		"mark-gerarts/automapper-plus-bundle": "1.4.1",
 		"matomo/device-detector": "6.2.1",
 		"matthiasnoback/symfony-console-form": "5.3.2",
-		"nelmio/api-doc-bundle": "4.16.2",
+		"nelmio/api-doc-bundle": "4.18.2",
 		"nelmio/cors-bundle": "2.4.0",
 		"phpdocumentor/reflection-docblock": "5.3.0",
 		"ramsey/uuid-doctrine": "2.0.0",

src/Entity/Traits/LogRequestProcessRequestTrait.php

@@ -24,7 +24,7 @@
 use function mb_strtolower;
 use function parse_str;
 use function preg_replace;
-use function strpos;
+use function str_contains;
 
 /**
  * Trait LogRequestProcessRequestTrait
@@ -349,7 +349,7 @@ private function processRequestBaseInfo(Request $request): void
     private function determineAction(Request $request): string
     {
         $rawAction = (string)($request->query->get('_controller') ?? $request->request->get('_controller', ''));
-        $rawAction = explode(strpos($rawAction, '::') ? '::' : ':', $rawAction);
+        $rawAction = explode(str_contains($rawAction, '::') ? '::' : ':', $rawAction);
 
         return $rawAction[1] ?? '';
     }

tests/E2E/TestCase/WebTestCase.php

@@ -142,7 +142,7 @@ public function getFastestHeaders(): array
     {
         $output = [];
 
-        if (getenv('ENV_TEST_CHANNEL_READABLE')) {
+        if (getenv('ENV_TEST_CHANNEL_READABLE') !== false) {
             $testChannel = (string)getenv('ENV_TEST_CHANNEL_READABLE');
 
             $output = [

tests/bootstrap.php

@@ -99,7 +99,10 @@
 
     /** @noinspection AdditionOperationOnArraysInspection */
     $_SERVER += $_ENV;
-    $_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? null) ?: 'dev';
+
+    $environment = $_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? null;
+
+    $_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = $environment ?? 'dev';
     $_SERVER['APP_DEBUG'] ??= $_ENV['APP_DEBUG'] ?? $_SERVER['APP_ENV'] !== 'prod';
 
     $debug = (int)$_SERVER['APP_DEBUG'] || filter_var($_SERVER['APP_DEBUG'], FILTER_VALIDATE_BOOLEAN) ? '1' : '0';