From b530a24f4d41ad16d8238afb0e62ad775a1cdfeb Mon Sep 17 00:00:00 2001
From: Ben Roberts <ben@headsnet.com>
Date: Sun, 2 Jun 2024 10:31:11 +0200
Subject: [PATCH] Update new default branch to "main", add latest Symfony & PHP
 versions (#37)

* Update new default branch to "main", add latest Symfony & PHP versions

* Support version 3.0 of nyholm/symfony-bundle-test

* Permit Symfony ^7.0

* Update to latest config syntax

* Require symfony/property-access component to support object normalizer
---
 .github/workflows/ci.yml | 24 +++++++++++++-----------
 composer.json            | 13 +++++++------
 phpstan.neon             |  4 ++--
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index da6179a..aa37f91 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,9 +2,9 @@ name: CI
 
 on:
     push:
-        branches: [master]
+        branches: [main]
     pull_request:
-        branches: [master]
+        branches: [main]
 
 jobs:
 
@@ -16,16 +16,18 @@ jobs:
             fail-fast: false
             matrix:
                 operating-system: [ ubuntu-latest, windows-latest ]
-                php: [ '7.4', '8.0', '8.1' ]
-                symfony: [ '4.4.*', '5.4.*', '6.0.*', '6.1.*' ]
+                php: [ '7.4', '8.0', '8.1', '8.2', '8.3' ]
+                symfony: [ '4.4.*', '5.4.*', '6.4.*', '7.1.*' ]
                 exclude:
-                    - { php: '7.4', symfony: '6.0.*' }
-                    - { php: '7.4', symfony: '6.1.*' }
-                    - { php: '8.0', symfony: '6.1.*' }
+                    - { php: '7.4', symfony: '6.4.*' }
+                    - { php: '8.0', symfony: '6.4.*' }
+                    - { php: '7.4', symfony: '7.1.*' }
+                    - { php: '8.0', symfony: '7.1.*' }
+                    - { php: '8.1', symfony: '7.1.*' }
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Setup PHP ${{ matrix.php }}
               uses: shivammathur/setup-php@v2
@@ -35,7 +37,7 @@ jobs:
                   coverage: none
 
             - name: Install composer dependencies
-              uses: ramsey/composer-install@v2
+              uses: ramsey/composer-install@v3
               env:
                   SYMFONY_REQUIRE: ${{ matrix.symfony }}
 
@@ -47,7 +49,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v3
-            - uses: ramsey/composer-install@v2
+            - uses: ramsey/composer-install@v3
             - run: vendor/bin/ecs
 
     phpstan:
@@ -55,5 +57,5 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v3
-            - uses: ramsey/composer-install@v2
+            - uses: ramsey/composer-install@v3
             - run: vendor/bin/phpstan
diff --git a/composer.json b/composer.json
index 272d402..52866d4 100644
--- a/composer.json
+++ b/composer.json
@@ -18,16 +18,17 @@
     "doctrine/orm": "^2.5",
     "doctrine/doctrine-bundle": "^1.0 || ^2.0",
     "ramsey/uuid-doctrine": "^1.5",
-    "symfony/framework-bundle": "^4.4 || ^5.0 || ^6.0",
-    "symfony/lock": "^4.4 || ^5.0 || ^6.0",
-    "symfony/serializer": "^4.4 || ^5.0 || ^6.0",
-    "symfony/messenger": "^4.4 || ^5.0 || ^6.0",
-    "symfony/event-dispatcher": "^4.4 || ^5.0 || ^6.0"
+    "symfony/event-dispatcher": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+    "symfony/framework-bundle": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+    "symfony/lock": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+    "symfony/messenger": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+    "symfony/property-access": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+    "symfony/serializer": "^4.4 || ^5.0 || ^6.0 || ^7.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.5",
     "symplify/easy-coding-standard": "^11.1",
-    "nyholm/symfony-bundle-test": "^2.0",
+    "nyholm/symfony-bundle-test": "^2.0 || ^3.0",
     "phpstan/phpstan": "^1.8"
   },
   "suggest": {
diff --git a/phpstan.neon b/phpstan.neon
index 5f00ee7..a90436b 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -13,7 +13,7 @@ parameters:
     bootstrapFiles:
         - vendor/autoload.php
 
-    checkGenericClassInNonGenericObjectType: false
-
     ignoreErrors:
+        -
+          identifier: missingType.generics
         - '#Class Doctrine\\DBAL\\Platforms\\PostgreSqlPlatform not found#'