From 3618ca94d18bf86b32b023f69a69d3871ce71065 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Niedzielski?= <pawel.niedzielski@ibexa.co>
Date: Tue, 23 Apr 2024 13:21:12 +0200
Subject: [PATCH 1/2] IBX-8119: Upgraded minimum PHP version to 8.3

---
 .github/workflows/ci.yaml | 22 ++++++++++------------
 composer.json             | 19 ++++++++++---------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 1e84876..a0c734b 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -10,13 +10,13 @@ on:
 jobs:
     cs-fix:
         name: Run code style check
-        runs-on: "ubuntu-20.04"
+        runs-on: "ubuntu-22.04"
         strategy:
             matrix:
                 php:
-                    - '8.0'
+                    - '8.3'
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
 
             - name: Setup PHP Action
               uses: shivammathur/setup-php@v2
@@ -26,9 +26,9 @@ jobs:
                   extensions: 'pdo_sqlite, gd'
                   tools: cs2pr
 
-            - uses: "ramsey/composer-install@v1"
+            - uses: ramsey/composer-install@v3
               with:
-                  dependency-versions: "highest"
+                  dependency-versions: highest
 
             - name: Run code style check
               run: composer run-script check-cs -- --format=checkstyle | cs2pr
@@ -38,19 +38,17 @@ jobs:
 
     tests:
         name: Unit tests
-        runs-on: "ubuntu-20.04"
+        runs-on: "ubuntu-22.04"
         timeout-minutes: 15
 
         strategy:
             fail-fast: false
             matrix:
                 php:
-                    - '7.4'
-                    - '8.0'
-                    - '8.1'
+                    - '8.3'
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
 
             - name: Setup PHP Action
               uses: shivammathur/setup-php@v2
@@ -60,9 +58,9 @@ jobs:
                   extensions: pdo_sqlite, gd
                   tools: cs2pr
 
-            - uses: "ramsey/composer-install@v1"
+            - uses: ramsey/composer-install@v3
               with:
-                  dependency-versions: "highest"
+                  dependency-versions: highest
 
             - name: Setup problem matchers for PHPUnit
               run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
diff --git a/composer.json b/composer.json
index 7bf37af..2ecdd73 100644
--- a/composer.json
+++ b/composer.json
@@ -26,26 +26,26 @@
         }
     },
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": " >=8.3",
         "ibexa/core": "~5.0.x-dev",
-        "symfony/dependency-injection": "^5.0",
-        "symfony/http-kernel": "^5.0",
-        "symfony/http-foundation": "^5.0",
+        "pagerfanta/pagerfanta": "^2.1",
         "symfony/config": "^5.0",
-        "symfony/form": "^5.0",
+        "symfony/dependency-injection": "^5.0",
         "symfony/event-dispatcher": "^5.0",
-        "pagerfanta/pagerfanta": "^2.1",
+        "symfony/form": "^5.0",
+        "symfony/http-foundation": "^5.0",
+        "symfony/http-kernel": "^5.0",
         "symfony/serializer": "^5.4"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.6",
         "friendsofphp/php-cs-fixer": "^3.0",
         "ibexa/code-style": "^1.0",
         "ibexa/doctrine-schema": "~5.0.x-dev",
+        "matthiasnoback/symfony-dependency-injection-test": "^4.3",
         "phpstan/phpstan": "^1.10",
         "phpstan/phpstan-phpunit": "^1.3",
         "phpstan/phpstan-symfony": "^1.3",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.3"
+        "phpunit/phpunit": "^9.6"
     },
     "scripts": {
         "fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php --show-progress=dots",
@@ -59,6 +59,7 @@
         }
     },
     "config": {
-        "allow-plugins": false
+        "allow-plugins": false,
+        "sort-packages": true
     }
 }

From 136d2d100332598d841e0b00742d9ac58394e591 Mon Sep 17 00:00:00 2001
From: Andrew Longosz <alongosz@users.noreply.github.com>
Date: Mon, 3 Jun 2024 11:32:39 +0200
Subject: [PATCH 2/2] Fixed iterable as array usage in
 PagerSearchContentToDataMapper

---
 src/lib/Mapper/PagerSearchContentToDataMapper.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/lib/Mapper/PagerSearchContentToDataMapper.php b/src/lib/Mapper/PagerSearchContentToDataMapper.php
index 356866c..6ab6486 100644
--- a/src/lib/Mapper/PagerSearchContentToDataMapper.php
+++ b/src/lib/Mapper/PagerSearchContentToDataMapper.php
@@ -144,9 +144,11 @@ protected function getContributor(ContentInfo $contentInfo): ?User
     protected function setTranslatedContentTypesNames(array &$data, array $contentTypeIds): void
     {
         // load list of content types with proper translated names
-        $contentTypes = $this->contentTypeService->loadContentTypeList(
-            array_unique($contentTypeIds),
-            $this->userLanguagePreferenceProvider->getPreferredLanguages()
+        $contentTypes = iterator_to_array(
+            $this->contentTypeService->loadContentTypeList(
+                array_unique($contentTypeIds),
+                $this->userLanguagePreferenceProvider->getPreferredLanguages()
+            )
         );
 
         foreach ($data as $idx => $item) {