Merge branch '2.5' of https://github.com/sulu/sulu into 2.6

sulu · May 13, 2024 · 5f79200 · 5f79200
2 parents 61adf77 + b0d1f49
commit 5f79200
Show file tree

Hide file tree

Showing 11 changed files with 653 additions and 174 deletions.
diff --git a/.github/workflows/crowdin-upload.yaml b/.github/workflows/crowdin-upload.yaml
@@ -9,12 +9,17 @@ jobs:
     upload_sources:
         name: Upload Sources
         runs-on: ubuntu-18.04
+        timeout-minutes: 30
+
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v4
+
             - name: Merge all translation files
               run: jq -s '.|add' src/Sulu/Bundle/*/Resources/translations/admin.*.json > admin.en.json
+
             - name: Download Crowdin CLI
               run: curl "https://downloads.crowdin.com/cli/v3/crowdin-cli.zip" --output crowdin-cli.zip && unzip crowdin-cli.zip
+
             - name: Upload translations to crowdin
               env:
                   CROWDIN_TOKEN: ${{ secrets.CrowdinToken }}

diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -16,6 +16,7 @@ jobs:
     js-css:
         name: "Node ${{ matrix.node-version }}"
         runs-on: ubuntu-latest
+        timeout-minutes: 30
 
         strategy:
             fail-fast: false
@@ -82,6 +83,7 @@ jobs:
     js-lint:
         name: "Node Lint"
         runs-on: ubuntu-latest
+        timeout-minutes: 30
 
         env:
             COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -118,6 +120,7 @@ jobs:
     php:
         name: "PHP ${{ matrix.php-version }} (${{ matrix.database }}, ${{ matrix.phpcr-transport }}, ${{ matrix.dependency-versions }})"
         runs-on: ubuntu-latest
+        timeout-minutes: 30
 
         env:
             APP_ENV: test
@@ -247,6 +250,7 @@ jobs:
     php-lint:
         name: "PHP Lint"
         runs-on: ubuntu-latest
+        timeout-minutes: 30
 
         env:
             APP_ENV: test

diff --git a/.github/workflows/trigger-styleguide-build.yaml b/.github/workflows/trigger-styleguide-build.yaml
@@ -10,6 +10,8 @@ jobs:
     trigger-styleguide-build:
         name: Trigger styleguide build
         runs-on: ubuntu-latest
+        timeout-minutes: 30
+
         steps:
             - name: Trigger styleguide build
               uses: benc-uk/workflow-dispatch@v1

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -35,11 +35,6 @@ parameters:
 			count: 1
 			path: src/Sulu/Bundle/ActivityBundle/Tests/Functional/UserInterface/Controller/ActivityControllerTest.php
 
-		-
-			message: "#^Unsafe call to private method Sulu\\\\Bundle\\\\ActivityBundle\\\\Tests\\\\Functional\\\\UserInterface\\\\Controller\\\\ActivityControllerTest\\:\\:createActivity\\(\\) through static\\:\\:\\.$#"
-			count: 1
-			path: src/Sulu/Bundle/ActivityBundle/Tests/Functional/UserInterface/Controller/ActivityControllerTest.php
-
 		-
 			message: "#^Unsafe call to private method Sulu\\\\Bundle\\\\ActivityBundle\\\\Tests\\\\Functional\\\\UserInterface\\\\Controller\\\\ActivityControllerTest\\:\\:setUpUserRole\\(\\) through static\\:\\:\\.$#"
 			count: 1
@@ -41675,41 +41670,6 @@ parameters:
 			count: 1
 			path: src/Sulu/Component/Content/Tests/Unit/Document/Subscriber/FallbackLocalizationSubscriberTest.php
 
-		-
-			message: "#^Cannot call method willReturn\\(\\) on mixed\\.$#"
-			count: 1
-			path: src/Sulu/Component/Content/Tests/Unit/Document/Subscriber/PHPCR/SuluNodeTest.php
-
-		-
-			message: "#^Method Sulu\\\\Component\\\\Content\\\\Tests\\\\Unit\\\\Document\\\\Subscriber\\\\PHPCR\\\\SuluNodeTest\\:\\:provideDelegateData\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/Sulu/Component/Content/Tests/Unit/Document/Subscriber/PHPCR/SuluNodeTest.php
-
-		-
-			message: "#^Method Sulu\\\\Component\\\\Content\\\\Tests\\\\Unit\\\\Document\\\\Subscriber\\\\PHPCR\\\\SuluNodeTest\\:\\:testDelegate\\(\\) has parameter \\$arguments with no type specified\\.$#"
-			count: 1
-			path: src/Sulu/Component/Content/Tests/Unit/Document/Subscriber/PHPCR/SuluNodeTest.php
-
-		-
-			message: "#^Method Sulu\\\\Component\\\\Content\\\\Tests\\\\Unit\\\\Document\\\\Subscriber\\\\PHPCR\\\\SuluNodeTest\\:\\:testDelegate\\(\\) has parameter \\$functionName with no type specified\\.$#"
-			count: 1
-			path: src/Sulu/Component/Content/Tests/Unit/Document/Subscriber/PHPCR/SuluNodeTest.php
-
-		-
-			message: "#^Method Sulu\\\\Component\\\\Content\\\\Tests\\\\Unit\\\\Document\\\\Subscriber\\\\PHPCR\\\\SuluNodeTest\\:\\:testDelegate\\(\\) has parameter \\$returnValue with no type specified\\.$#"
-			count: 1
-			path: src/Sulu/Component/Content/Tests/Unit/Document/Subscriber/PHPCR/SuluNodeTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$callback of function call_user_func_array expects callable\\(\\)\\: mixed, array\\{Prophecy\\\\Prophecy\\\\ObjectProphecy\\<PHPCR\\\\NodeInterface\\>, mixed\\} given\\.$#"
-			count: 1
-			path: src/Sulu/Component/Content/Tests/Unit/Document/Subscriber/PHPCR/SuluNodeTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$callback of function call_user_func_array expects callable\\(\\)\\: mixed, array\\{Sulu\\\\Component\\\\Content\\\\Document\\\\Subscriber\\\\PHPCR\\\\SuluNode, mixed\\} given\\.$#"
-			count: 1
-			path: src/Sulu/Component/Content/Tests/Unit/Document/Subscriber/PHPCR/SuluNodeTest.php
-
 		-
 			message: "#^Class Sulu\\\\Component\\\\Content\\\\Document\\\\Subscriber\\\\RedirectTypeSubscriber does not have a constructor and must be instantiated without any parameters\\.$#"
 			count: 1
@@ -53005,11 +52965,6 @@ parameters:
 			count: 1
 			path: src/Sulu/Component/Webspace/Tests/Unit/EnvironmentTest.php
 
-		-
-			message: "#^Method Sulu\\\\Component\\\\Webspace\\\\Tests\\\\Unit\\\\EnvironmentTest\\:\\:getUrl\\(\\) has parameter \\$toArrayResult with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Sulu/Component/Webspace/Tests/Unit/EnvironmentTest.php
-
 		-
 			message: "#^Method Sulu\\\\Component\\\\Webspace\\\\Tests\\\\Unit\\\\EnvironmentTest\\:\\:testAddUrl\\(\\) has parameter \\$urls with no value type specified in iterable type array\\.$#"
 			count: 1

diff --git a/...undle/ActivityBundle/Tests/Functional/UserInterface/Controller/ActivityControllerTest.php b/...undle/ActivityBundle/Tests/Functional/UserInterface/Controller/ActivityControllerTest.php
@@ -50,7 +50,7 @@ public static function setUpBeforeClass(): void
                         $resourceSecurityObjectType = null !== $objectSecurity ? SecuredEntityInterface::class : null;
                         $resourceSecurityObjectId = null !== $objectSecurity ? $resourceId : null;
 
-                        static::createActivity(
+                        self::createActivity(
                             $resourceKey,
                             $resourceId,
                             $resourceLocale,