Allow Laravel 11

wouterj · Mar 23, 2024 · 79ffd0f · 79ffd0f
1 parent 83628f8
commit 79ffd0f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 15 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -27,21 +27,21 @@ jobs:
             composer: v2
 
           - deps: 'stable'
-            php: 8.3
+            php: '8.3'
             symfony: '6.x'
             laravel: '10.x'
             experimental: false
             composer: v2
 
           - deps: 'dev'
-            php: 8.3
+            php: '8.3'
             symfony: '7.x'
             laravel: '11.x'
             experimental: false
             composer: v2
 
           - deps: 'dev'
-            php: 8.4
+            php: '8.4'
             symfony: '7.x'
             laravel: '11.x'
             experimental: true
@@ -84,13 +84,13 @@ jobs:
               echo "LARAVEL_REQUIRE=$(echo '${{ matrix.laravel }}' | tr x \\*)" >> $GITHUB_ENV
           fi
 
-          if [ "${{ matrix.symfony }}" = "7.x" ]; then
-              # Psalm Symfony Plugin doesn't support Symfony 7 yet
-              composer remove --no-update --dev vimeo/psalm psalm/plugin-symfony
+          #if [ "${{ matrix.symfony }}" = "7.x" ]; then
+          #    # Psalm Symfony Plugin doesn't support Symfony 7 yet
+          #    composer remove --no-update --dev vimeo/psalm psalm/plugin-symfony
 
-              # Carbon needs version 3
-              composer require --no-update nesbot/carbon:"3.x-dev as 2.99.0"
-          fi
+          #    # Carbon needs version 3
+          #    composer require --no-update nesbot/carbon:"3.x-dev as 2.99.0"
+          #fi
 
           echo "PHP_VERSION=${{ matrix.php }}" >> $GITHUB_ENV
 

diff --git a/composer.json b/composer.json
@@ -7,9 +7,9 @@
 
     "require": {
         "php": "^8.0",
-        "illuminate/database": "^9.0 || ^10.0",
-        "illuminate/events": "^9.0 || ^10.0",
-        "illuminate/console": "^9.39 || ^10.0",
+        "illuminate/database": "^9.0 || ^10.0 || ^11.0",
+        "illuminate/events": "^9.0 || ^10.0 || ^11.0",
+        "illuminate/console": "^9.39 || ^10.0 || ^11.0",
         "symfony/framework-bundle": "^6.0 || ^7.0",
         "symfony/dependency-injection": "^6.0 || ^7.0",
         "jdorn/sql-formatter": "^1.2.17"
@@ -34,8 +34,8 @@
         "symfony/var-dumper": "^6.0 || ^7.0",
         "symfony/process": "^6.0 || ^7.0",
         "twig/twig": "^1.26 || ^2.0 || ^3.0",
-        "vimeo/psalm": "^3.18.2 || ^4.0",
-        "psalm/plugin-symfony": "^1.5.0 || ^2.0 || ^3.0"
+        "vimeo/psalm": "^3.18.2 || ^4.0 || ^5.0",
+        "psalm/plugin-symfony": "^1.5.0 || ^2.0 || ^3.0 || ^4.0 || ^5.0"
     },
     "conflict": {
         "illuminate/console": ">=9.21,<9.39"

diff --git a/psalm.xml b/psalm.xml
@@ -3,6 +3,8 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
     errorLevel="4"
 >
     <projectFiles>
@@ -22,8 +24,14 @@
         <UndefinedMethod>
             <errorLevel type="suppress">
                 <referencedMethod name="WouterJ\EloquentBundle\Seeder::run"/>
+                <referencedMethod name="Symfony\Component\Config\Definition\Builder\NodeDefinition::fixXmlConfig"/>
             </errorLevel>
         </UndefinedMethod>
+        <UndefinedInterfaceMethod>
+            <errorLevel type="suppress">
+                <referencedMethod name="Symfony\Component\Config\Definition\Builder\NodeParentInterface::scalarNode"/>
+            </errorLevel>
+        </UndefinedInterfaceMethod>
     </issueHandlers>
 
     <plugins>

diff --git a/src/Security/EloquentUserProvider.php b/src/Security/EloquentUserProvider.php
@@ -20,7 +20,8 @@
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 
 /**
- * @template TUserObject of Model&UserInterface
+ * @template-covariant TUserObject of Model&UserInterface
+ * @implements UserProviderInterface<TUserObject>
  *
  * @final
  * @author Wouter de Jong <wouter@wouterj.nl>