Merge pull request #195 from aroskanalen/feature/369-feed-fixes

Fixed issues with feed following api platform upgrade
os2display · Mar 18, 2024 · c07101f · c07101f
2 parents 4d8c6ec + 2041ab2
commit c07101f
Show file tree

Hide file tree

Showing 23 changed files with 656 additions and 409 deletions.
diff --git a/.github/workflows/php_upgrade.yaml b/.github/workflows/php_upgrade.yaml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ["8.3"]
+        php: ["8.4"]
     name: Validate composer (PHP ${{ matrix.php}})
     steps:
       - name: Checkout
@@ -67,7 +67,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ["8.3"]
+        php: ["8.4"]
     name: PHP Unit tests (PHP ${{ matrix.php }})
     steps:
       - name: Checkout
@@ -110,7 +110,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ["8.3"]
+        php: ["8.4"]
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ["8.2"]
+        php: ["8.3"]
     name: Validate composer (PHP ${{ matrix.php}})
     steps:
       - name: Checkout
@@ -58,7 +58,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ["8.2"]
+        php: ["8.3"]
     name: Validate Doctrine Schema (PHP ${{ matrix.php}})
     services:
       mariadb:
@@ -109,7 +109,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ["8.2"]
+        php: ["8.3"]
     name: PHP Coding Standards Fixer (PHP ${{ matrix.php }})
     steps:
       - name: Checkout
@@ -144,7 +144,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ["8.2"]
+        php: ["8.3"]
     name: Psalm (PHP ${{ matrix.php }})
     steps:
       - name: Checkout
@@ -179,7 +179,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ["8.2"]
+        php: ["8.3"]
     name: Rector (PHP ${{ matrix.php }})
     steps:
       - name: Checkout
@@ -225,7 +225,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ["8.2"]
+        php: ["8.3"]
     name: PHP Unit tests (PHP ${{ matrix.php }})
     steps:
       - name: Checkout
@@ -285,7 +285,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ["8.2"]
+        php: ["8.3"]
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+- Fixed issues with feed following api platform upgrade.
 - [#192](https://github.com/os2display/display-api-service/pull/192)
   - Fix env value typo's
 - [#191](https://github.com/os2display/display-api-service/pull/191)

diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "license": "proprietary",
     "type": "project",
     "require": {
-        "php": ">=8.2",
+        "php": ">=8.3",
         "ext-ctype": "*",
         "ext-fileinfo": "*",
         "ext-gd": "*",
@@ -127,12 +127,12 @@
             "bin/console hautelook:fixtures:load --no-interaction"
         ],
         "prepare-code": [
+            "bin/console doctrine:schema:validate",
             "vendor/bin/rector",
+            "vendor/bin/psalm",
             "@coding-standards-apply",
             "@test-setup",
-            "@test",
-            "bin/console doctrine:schema:validate",
-            "vendor/bin/psalm"
+            "@test"
         ],
         "test": [
             "vendor/bin/phpunit --stop-on-failure"