From e6f6efa42695d7b10d4097e9b85198e8ccc9350d Mon Sep 17 00:00:00 2001 From: Tatevik Date: Sun, 15 Dec 2024 20:52:38 +0400 Subject: [PATCH] ISSUE-337: force push --- .github/workflows/core-docs.yml | 2 +- composer.json | 1 + src/TestingSupport/Traits/SymfonyServerTrait.php | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/core-docs.yml b/.github/workflows/core-docs.yml index 4c7d0c8..a88fa4f 100644 --- a/.github/workflows/core-docs.yml +++ b/.github/workflows/core-docs.yml @@ -86,4 +86,4 @@ jobs: git config user.email "github-actions@restapi-docs.workflow" git add . git commit -s -m "phplist/core docs deployment `date`" - git push + git push origin main --force diff --git a/composer.json b/composer.json index 0a095b4..e4e906a 100644 --- a/composer.json +++ b/composer.json @@ -43,6 +43,7 @@ "symfony/monolog-bundle": "^3.10", "symfony/serializer-pack": "^1.3", "symfony/orm-pack": "^2.4", + "doctrine/orm": "^3.2", "symfony/asset": "^6.4", "symfony/security-csrf": "^6.4", "symfony/form": "^6.4", diff --git a/src/TestingSupport/Traits/SymfonyServerTrait.php b/src/TestingSupport/Traits/SymfonyServerTrait.php index 9775f89..5fbe615 100644 --- a/src/TestingSupport/Traits/SymfonyServerTrait.php +++ b/src/TestingSupport/Traits/SymfonyServerTrait.php @@ -19,8 +19,8 @@ trait SymfonyServerTrait private ?Process $serverProcess = null; private static string $lockFileName = '.web-server-pid'; - private static int $lockWaitTimeout = 5000000; - private static int $serverCommandTimeout = 50000; + private static int $lockWaitTimeout = 6000000; + private static int $serverCommandTimeout = 60000; private static ?ApplicationStructure $applicationStructure = null;